Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / stereo_panner.cc

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 506ce3664576e6e5a65345f592054c1e347a314a..4e5c6de95945ab135929d56cd80d95c9222754f6 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -105,7 +105,7 @@ StereoPanner::set_tooltip ()
        */
 
        char buf[64];
-       snprintf (buf, sizeof (buf), "L:%3d R:%3d Width:%d%%", (int) rint (100.0 * (1.0 - pos)),
+       snprintf (buf, sizeof (buf), _("L:%3d R:%3d Width:%d%%"), (int) rint (100.0 * (1.0 - pos)),
                  (int) rint (100.0 * pos),
                  (int) floor (100.0 * width_control->get_value()));
        _tooltip.set_tip (buf);
@@ -275,6 +275,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
        dragging_left = false;
        dragging_right = false;
        _dragging = false;
+       _tooltip.target_stop_drag ();
        accumulated_delta = 0;
        detented = false;
 
@@ -352,6 +353,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                }
 
                _dragging = false;
+               _tooltip.target_stop_drag ();
 
        } else if (ev->type == GDK_BUTTON_PRESS) {
 
@@ -613,23 +615,23 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 void
 StereoPanner::set_colors ()
 {
-       colors[Normal].fill = ARDOUR_UI::config()->canvasvar_StereoPannerFill.get();
-       colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get();
-       colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get();
-       colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get();
-       colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-       colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get();
-       colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get();
-       colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get();
-       colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get();
-       colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
-
-       colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get();
-       colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get();
-       colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get();
-       colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get();
-       colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+       colors[Normal].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerFill();
+       colors[Normal].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerOutline();
+       colors[Normal].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerText();
+       colors[Normal].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerBackground();
+       colors[Normal].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+
+       colors[Mono].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoFill();
+       colors[Mono].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoOutline();
+       colors[Mono].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoText();
+       colors[Mono].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoBackground();
+       colors[Mono].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
+
+       colors[Inverted].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedFill();
+       colors[Inverted].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedOutline();
+       colors[Inverted].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedText();
+       colors[Inverted].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedBackground();
+       colors[Inverted].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule();
 }
 
 void