diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-01 16:31:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-01 16:31:21 +0000 |
| commit | 0fb08e9bc3919135bc12426593cb2acb2ac8d025 (patch) | |
| tree | 0a75a51a05f557c4d37e493573fbff53d76fc349 | |
| parent | 67e21fd82ee3a2bf326b652b99484941bbb7efbb (diff) | |
switch to basic round icon for MIDI input enable in editor track list; use StatefulButton to avoid visual ugliness with midi input button in mixer strip
git-svn-id: svn://localhost/ardour2/branches/3.0@9780 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_routes.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/icons/midi-input-active.png | bin | 0 -> 395 bytes | |||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.h | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index a8fbb58d32..126d44c178 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -96,8 +96,8 @@ EditorRoutes::EditorRoutes (Editor* e) // MIDI Input Active CellRendererPixbufMulti* input_active_col_renderer = manage (new CellRendererPixbufMulti()); - input_active_col_renderer->set_pixbuf (0, ::get_icon("midi_socket_small")); - input_active_col_renderer->set_pixbuf (1, ::get_icon("midi_socket_small")); + input_active_col_renderer->set_pixbuf (0, ::get_icon("act-disabled")); + input_active_col_renderer->set_pixbuf (1, ::get_icon("midi-input-active")); input_active_col_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_input_active_changed)); TreeViewColumn* input_active_column = manage (new TreeViewColumn ("I", *input_active_col_renderer)); diff --git a/gtk2_ardour/icons/midi-input-active.png b/gtk2_ardour/icons/midi-input-active.png Binary files differnew file mode 100644 index 0000000000..6537d9dffe --- /dev/null +++ b/gtk2_ardour/icons/midi-input-active.png diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index fe9ad7d1c6..2b260bcb5a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -404,7 +404,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) if (is_midi_track()) { if (midi_input_enable_button == 0) { Image* img = manage (new Image (get_icon (X_("midi_socket_small")))); - midi_input_enable_button = manage (new ToggleButton); + midi_input_enable_button = manage (new StatefulToggleButton); midi_input_enable_button->set_name ("MixerMidiInputEnableButton"); midi_input_enable_button->set_image (*img); midi_input_enable_button->signal_toggled().connect (sigc::mem_fun (*this, &MixerStrip::midi_input_toggled)); diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index fa101513b9..de907a3607 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -37,6 +37,7 @@ #include "gtkmm2ext/auto_spin.h" #include "gtkmm2ext/click_box.h" #include "gtkmm2ext/bindable_button.h" +#include "gtkmm2ext/stateful_button.h" #include "pbd/stateful.h" @@ -178,7 +179,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox Gtk::Label diskstream_label; Gtk::Button input_button; - Gtk::ToggleButton* midi_input_enable_button; + Gtkmm2ext::StatefulToggleButton* midi_input_enable_button; Gtk::HBox input_button_box; Gtk::Label input_label; Gtk::Button output_button; |
