Add options to add sends from buses as well as tracks; remainder of #3637.

[ardour.git] / gtk2_ardour / stereo_panner.cc

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 86d9055373f6e2bf84b11a550b7c9890540bd6a6..2bb53e9c2344b6745fdbdede4d05f26b9c392f01 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -90,19 +90,23 @@ void
 StereoPanner::set_tooltip ()
 {
         double pos = position_control->get_value(); // 0..1
-        double w = width_control->get_value (); // -1..+1
-        int lpos = (int) lrint ((pos - (w/2.0)) * 100.0);
-        int rpos = (int) lrint ((pos + (w/2.0)) * 100.0);
-                                
-        Gtkmm2ext::UI::instance()->set_tip (this, string_compose (_("L:%1 R:%2 Width: %3%%"), 
-                                                                  lpos, rpos,
-                                                                  (int) floor (w * 100.0)).c_str());
+        
+        /* the values displayed show the position of the center of the image, expressed as a stereo pair
+           that ranges from (100,0) (hard left) through (50,50) (hard center) to (0,100) (hard right).
+           the center of the image is halfway between the left and right positions.
+        */
+
+        Gtkmm2ext::UI::instance()->set_tip (this, 
+                                            string_compose (_("L:%1 R:%2 Width: %3%%\n\n0 -> set width to zero\n%4-uparrow -> set width to 1.0\n%4-downarrow -> set width to -1.0"), 
+                                                            (int) rint (100.0 * (1.0 - pos)),
+                                                            (int) rint (100.0 * pos),
+                                                            (int) floor (100.0 * width_control->get_value()),
+                                                            Keyboard::secondary_modifier_name()).c_str());
 }
 
 void
 StereoPanner::value_change ()
 {
-        cerr << this << " Value change, pos = " << position_control->get_value() << " w = " << width_control->get_value() << endl;
         set_tooltip ();
         queue_draw ();
 }
@@ -151,16 +155,14 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box
         int right = lrint (center +  (fswidth * usable_width / 2.0)); // center of rightmost box
 
-        cerr << this << " pos " << pos << " width = " << width << " swidth = " << swidth << " center @ " << center << " L = " << left << " R = " << right << endl;
-
         /* compute & draw the line through the box */
         
         cairo_set_line_width (cr, 2);
         cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
-        cairo_move_to (cr, left, top_step+(pos_box_size/2)+step_down);
-        cairo_line_to (cr, left, top_step+(pos_box_size/2));
-        cairo_line_to (cr, right, top_step+(pos_box_size/2));
-        cairo_line_to (cr, right, top_step+(pos_box_size/2) + step_down);
+        cairo_move_to (cr, left-(lr_box_size/2), top_step+(pos_box_size/2)+step_down);
+        cairo_line_to (cr, left-(lr_box_size/2), top_step+(pos_box_size/2));
+        cairo_line_to (cr, right+(lr_box_size/2)+1, top_step+(pos_box_size/2));
+        cairo_line_to (cr, right+(lr_box_size/2)+1, top_step+(pos_box_size/2) + step_down);
         cairo_stroke (cr);
 
         if (swidth < 0.0) {
@@ -168,11 +170,12 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
                 swap (left, right);
         }
 
-        /* left box */
-
+        /* make left/right be the left edge of each box */
         left -= lr_box_size/2;
         right -= lr_box_size/2;
 
+        /* left box */
+
         cairo_rectangle (cr, 
                          left,
                          (lr_box_size/2)+step_down, 
@@ -190,7 +193,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         cairo_select_font_face (cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
         if (state != Mono) {
                 cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
-                cairo_show_text (cr, "L");
+                cairo_show_text (cr, _("L"));
         }
 
         /* right box */
@@ -211,9 +214,9 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
                        (lr_box_size/2)+step_down + 13);
         cairo_set_source_rgba (cr, UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
         if (state == Mono) {
-                cairo_show_text (cr, "M");
+                cairo_show_text (cr, _("M"));
         } else {
-                cairo_show_text (cr, "R");
+                cairo_show_text (cr, _("R"));
         }
 
         /* draw the central box */
@@ -246,10 +249,8 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
 
         if (ev->type == GDK_2BUTTON_PRESS) {
                 if (dragging_position) {
-                        cerr << "Reset pos\n";
                         position_control->set_value (0.5); // reset position to center
                 } else {
-                        cerr << "Reset width\n";
                         width_control->set_value (1.0); // reset position to full, LR
                 }
                 dragging = false;