new solo safe/lock button image from oofus (a tad ugly, dare might i say)

[ardour.git] / gtk2_ardour / mixer_strip.cc

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 3c04ca5d87e1f45d5ecff2b6da4736fd4ad42fda..6d5a2706202174a555d0249c36910854b7d42520 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -93,6 +93,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
        , midi_input_enable_button (0)
+       , _comment_button (_("Comments"))
        , _visibility (X_("mixer-strip-visibility"))
 {
        init ();
@@ -119,6 +120,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , bottom_button_table (1, 2)
        , meter_point_label (_("pre"))
        , midi_input_enable_button (0)
+       , _comment_button (_("Comments"))
        , _visibility (X_("mixer-strip-visibility"))
 {
        init ();
@@ -185,7 +187,7 @@ MixerStrip::init ()
 
        hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-       mute_button->set_name ("MixerMuteButton");
+       // mute_button->set_name ("MixerMuteButton");
        solo_button->set_name ("MixerSoloButton");
 
        monitor_input_button->set_diameter (3);
@@ -218,7 +220,7 @@ MixerStrip::init ()
         top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
        top_button_table.show ();
 
-       rec_solo_table.set_homogeneous (true);
+       rec_solo_table.set_homogeneous (false);
        rec_solo_table.set_row_spacings (2);
        rec_solo_table.set_col_spacings (2);
         rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1);
@@ -252,6 +254,9 @@ MixerStrip::init ()
        Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
        group_label.set_name ("MixerGroupButtonLabel");
 
+       _comment_button.set_name (X_("MixerCommentButton"));
+       _comment_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment));
+
        global_vpacker.set_border_width (0);
        global_vpacker.set_spacing (0);
 
@@ -278,6 +283,7 @@ MixerStrip::init ()
        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 (_comment_button, Gtk::PACK_SHRINK);
 
        global_frame.add (global_vpacker);
        global_frame.set_shadow_type (Gtk::SHADOW_IN);
@@ -320,10 +326,11 @@ MixerStrip::init ()
           in update_diskstream_display().
        */
 
-       if (is_midi_track())
+       if (is_midi_track()) {
                set_name ("MidiTrackStripBase");
-       else
+       } else {
                set_name ("AudioTrackStripBase");
+       }
 
        add_events (Gdk::BUTTON_RELEASE_MASK|
                    Gdk::ENTER_NOTIFY_MASK|
@@ -346,6 +353,9 @@ MixerStrip::init ()
        _visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"));
        _visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe"));
        _visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated"));
+       _visibility.add (&_comment_button, X_("Comments"), _("Comments"));
+       _visibility.add (&group_button, X_("Group"), _("Group"));
+       _visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point"));
 
        parameter_changed (X_("mixer-strip-visibility"));
 
@@ -534,6 +544,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        output_label.show();
        name_label.show();
        name_button.show();
+       _comment_button.show();
        group_button.show();
        group_label.show();
 
@@ -576,7 +587,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
        switch (w) {
        case Wide:
                if (show_sends_button)  {
-                       ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends"));
+                       show_sends_button->set_text (_("Sends"));
                }
 
                ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
@@ -600,7 +611,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        case Narrow:
                if (show_sends_button) {
-                       ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd"));
+                       show_sends_button->set_text (_("Snd"));
                }
 
                ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
@@ -627,6 +638,7 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
        update_input_display ();
        update_output_display ();
+       setup_comment_button ();
        route_group_changed ();
        name_changed ();
        WidthChanged ();
@@ -1207,34 +1219,58 @@ MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::wea
        boost::shared_ptr<Port> a = wa.lock ();
        boost::shared_ptr<Port> b = wb.lock ();
 
-       if (!a || !b) {
-               return;
-       }
-       
-       if (_route->input()->has_port (a) || _route->input()->has_port (b)) {
+       if ((a && _route->input()->has_port (a)) || (b && _route->input()->has_port (b))) {
                update_input_display ();
                set_width_enum (_width, this);
        }
 
-       if (_route->output()->has_port (a) || _route->output()->has_port (b)) {
+       if ((a && _route->output()->has_port (a)) || (b && _route->output()->has_port (b))) {
                update_output_display ();
                set_width_enum (_width, this);
        }
 }
 
 void
-MixerStrip::comment_editor_done_editing ()
+MixerStrip::setup_comment_button ()
 {
-       ignore_toggle = true;
-       _comment_menu_item->set_active (false);
-       ignore_toggle = false;
+       switch (_width) {
+
+       case Wide:
+               if (_route->comment().empty ()) {
+                       _comment_button.unset_bg (STATE_NORMAL);
+                       ((Gtk::Label *) _comment_button.get_child ())->set_text (_("Comments"));
+               } else {
+                       _comment_button.modify_bg (STATE_NORMAL, color ());
+                       ((Gtk::Label *) _comment_button.get_child ())->set_text (_("*Comments*"));
+               }
+               break;
+
+       case Narrow:
+               if (_route->comment().empty ()) {
+                       _comment_button.unset_bg (STATE_NORMAL);
+                       ((Gtk::Label *) _comment_button.get_child ())->set_text (_("Cmt"));
+               } else {
+                       _comment_button.modify_bg (STATE_NORMAL, color ());
+                       ((Gtk::Label *) _comment_button.get_child ())->set_text (_("*Cmt*"));
+               }
+               break;
+       }
 
+       ARDOUR_UI::instance()->set_tip (
+               _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
+               );
+}
+
+void
+MixerStrip::comment_editor_done_editing ()
+{
        string const str = comment_area->get_buffer()->get_text();
        if (str == _route->comment ()) {
                return;
        }
 
        _route->set_comment (str, this);
+       setup_comment_button ();
 }
 
 void
@@ -1367,14 +1403,15 @@ MixerStrip::build_route_ops_menu ()
        MenuList& items = route_ops_menu->items();
 
        items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment)));
-       _comment_menu_item = dynamic_cast<CheckMenuItem*> (&items.back ());
+       CheckMenuItem* i = dynamic_cast<CheckMenuItem*> (&items.back ());
+       i->set_active (comment_window && comment_window->is_visible ());
        items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
        items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
        rename_menu_item = &items.back();
 
        items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Active")));
-       CheckMenuItem* i = dynamic_cast<CheckMenuItem *> (&items.back());
+       i = dynamic_cast<CheckMenuItem *> (&items.back());
        i->set_active (_route->active());
        i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false));
 
@@ -1636,8 +1673,7 @@ MixerStrip::switch_io (boost::shared_ptr<Route> target)
                   since we're not the target.
                */
                send_blink_connection.disconnect ();
-               show_sends_button->set_active (false);
-               show_sends_button->set_state (STATE_NORMAL);
+               show_sends_button->unset_active_state ();
        }
 
        if (!target) {
@@ -1677,6 +1713,7 @@ MixerStrip::drop_send ()
        solo_safe_led->set_sensitive (true);
        monitor_input_button->set_sensitive (true);
        monitor_disk_button->set_sensitive (true);
+       _comment_button.set_sensitive (true);
 }
 
 void
@@ -1715,6 +1752,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send)
        solo_safe_led->set_sensitive (false);
        monitor_input_button->set_sensitive (false);
        monitor_disk_button->set_sensitive (false);
+       _comment_button.set_sensitive (false);
 
        if (boost::dynamic_pointer_cast<InternalSend>(send)) {
                output_button.set_sensitive (false);
@@ -1727,7 +1765,7 @@ void
 MixerStrip::revert_to_default_display ()
 {
        if (show_sends_button) {
-               show_sends_button->set_active (false);
+               show_sends_button->unset_active_state ();
        }
 
        drop_send ();
@@ -1749,7 +1787,7 @@ MixerStrip::set_button_names ()
        switch (_width) {
        case Wide:
                rec_enable_button_label.set_text (_("Rec"));
-               mute_button_label.set_text (_("Mute"));
+               mute_button->set_text (_("Mute"));
                monitor_input_button->set_text (_("In"));
                monitor_disk_button->set_text (_("Disk"));
 
@@ -1781,7 +1819,7 @@ MixerStrip::set_button_names ()
 
        default:
                rec_enable_button_label.set_text (_("R"));
-               mute_button_label.set_text (_("M"));
+               mute_button->set_text (_("M"));
                monitor_input_button->set_text (_("I"));
                monitor_disk_button->set_text (_("D"));
                if (_route && _route->solo_safe()) {