tweak spacings in the mixer strip, tweak tooltip text for input and output buttons

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 3e829074c86cf77dd58fbc57a40a5af67372222e..a77cc87d8b5e56214c6487d8ac41f0698f802673 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -147,7 +147,7 @@ MixerStrip::init ()
 
        string t = _("Click to toggle the width of this mixer strip.");
        if (_mixer_owned) {
-               t += string_compose (_("\n%1-click to toggle the width of all strips."), Keyboard::tertiary_modifier_name ());
+               t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
        }
        
        width_button.set_image (::get_icon("strip_width"));
@@ -219,7 +219,7 @@ MixerStrip::init ()
         rec_solo_table.show ();
 
        button_table.set_homogeneous (false);
-       button_table.set_spacings (0);
+       button_table.set_spacings (2);
 
        if (solo_isolated_led) {
                button_size_group->add_widget (*solo_isolated_led);
@@ -244,7 +244,7 @@ MixerStrip::init ()
        middle_button_table.set_homogeneous (true);
        middle_button_table.set_spacings (2);
 
-       bottom_button_table.set_col_spacings (0);
+       bottom_button_table.set_spacings (2);
        bottom_button_table.set_homogeneous (true);
        bottom_button_table.attach (group_button, 0, 1, 0, 1);
 
@@ -283,7 +283,7 @@ MixerStrip::init ()
        global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK, 2);
        global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
        global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
-       global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
+       global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK, 2);
        global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK);
 
        global_frame.add (global_vpacker);
@@ -1070,14 +1070,15 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
        ostringstream tooltip;
        char * tooltip_cstr;
 
-       tooltip << route->name();
-
        if (for_input) {
                io_count = route->n_inputs().n_total();
+               tooltip << string_compose (_("<b>INPUT</b> to %1"), route->name());
        } else {
                io_count = route->n_outputs().n_total();
+               tooltip << string_compose (_("<b>OUTPUT</b> from %1"), route->name());
        }
 
+
        for (io_index = 0; io_index < io_count; ++io_index) {
                if (for_input) {
                        port = route->input()->nth (io_index);
@@ -1517,7 +1518,7 @@ MixerStrip::width_button_pressed (GdkEventButton* ev)
                return false;
        }
        
-       if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::TertiaryModifier)) && _mixer_owned) {
+       if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
                switch (_width) {
                case Wide:
                        _mixer.set_strip_width (Narrow);