Merging from trunk

[ardour.git] / gtk2_ardour / meter_bridge_strip.cc

diff --git a/gtk2_ardour/meter_bridge_strip.cc b/gtk2_ardour/meter_bridge_strip.cc
index 774b27d4c6065acd10427e850a9b5399b20bf347..ea3b6097206b1f2f9ff31a418b8bc9fe726aab6e 100644 (file)
--- a/gtk2_ardour/meter_bridge_strip.cc
+++ b/gtk2_ardour/meter_bridge_strip.cc
@@ -40,6 +40,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
@@ -137,13 +138,13 @@ MeterBridgeStrip::update ()
                        meter.set (log_meter (power));
 
                        if (over_short != last_over_short) {
-                               buf = compose("%1", over_short);
+                               buf = string_compose("%1", over_short);
                                over_short_label.set_text (buf);
                                last_over_short = over_short;
                        }
                        
                        if (over_long != last_over_long) {
-                               buf = compose("%1", over_long);
+                               buf = string_compose("%1", over_long);
                                over_long_label.set_text (buf);
                                last_over_long = over_long;
                        }
@@ -218,8 +219,10 @@ MeterBridgeStrip::label_button_press_release (GdkEventButton *ev)
        string name;
        ArdourPrompter prompter (true);
 
-       prompter.set_prompt (_("New name for meter:"));
+       prompter.set_prompt (_("New Name for Meter:"));
        prompter.set_initial_text (label.get_text());
+       prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+       prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
        prompter.show_all();
        
        switch (prompter.run ()) {