towards scaleable meter and mixer UI

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 566c01cdc827c5bfd962d71bd98faf1a9f161373..ac0cb80dc3eaa459f7f6ff5b411cd4788a573c87 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -151,10 +151,12 @@ MixerStrip::init ()
                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"));
+       width_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       width_button.set_icon (ArdourButton::StripWidth);
        ARDOUR_UI::instance()->set_tip (width_button, t);
 
-       hide_button.set_image(::get_icon("hide"));
+       hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+       hide_button.set_icon (ArdourButton::CloseCross);
        ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
        input_button_box.set_spacing(2);
@@ -518,7 +520,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                if (midi_input_enable_button == 0) {
                        midi_input_enable_button = manage (new ArdourButton);
                        midi_input_enable_button->set_name ("midi input button");
-                       midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small")));
+                       midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+                       midi_input_enable_button->set_icon (ArdourButton::DinMidi);
                        midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
                        midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
                        ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input"));
@@ -681,6 +684,8 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        set_button_names ();
 
+       const double scale = std::max(1.0, ARDOUR_UI::config()->get_font_scale() / 102400.);
+
        switch (w) {
        case Wide:
 
@@ -701,7 +706,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
                }
 
 
-               set_size_request (max (110, gpm.get_gm_width()+5), -1);
+               set_size_request (max (110 * scale, gpm.get_gm_width() + 5 * scale), -1);
                break;
 
        case Narrow:
@@ -723,7 +728,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
                        panners.short_astate_string(_route->panner()->automation_state()));
                }
 
-               set_size_request (max (60, gpm.get_gm_width() + 10), -1);
+               set_size_request (max (60 * scale, gpm.get_gm_width() + 10 * scale), -1);
                break;
        }
 
@@ -1540,7 +1545,23 @@ MixerStrip::build_route_ops_menu ()
        }
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
+
+       if (_route) {
+               /* note that this relies on selection being shared across editor and
+                  mixer (or global to the backend, in the future), which is the only
+                  sane thing for users anyway.
+               */
+
+               RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id());
+               if (rtav) {
+                       Selection& selection (PublicEditor::instance().get_selection());
+                       if (!selection.selected (rtav)) {
+                               selection.set (rtav);
+                       }
+                       
+                       items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+               }
+       }
 }
 
 gboolean