diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-07 17:43:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-07 17:43:55 +0000 |
| commit | b08d13706f9e98fc75a727822209942c00d8f1b3 (patch) | |
| tree | 4a6fd2881755a340cabcd4a79657f6bb682625de /gtk2_ardour/editor_routes.cc | |
| parent | 86a9d45ad072809c06e41e3c10683f0f0ee6a4a6 (diff) | |
remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_routes.cc')
| -rw-r--r-- | gtk2_ardour/editor_routes.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 8f7dd23abf..17a5c5b440 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -121,9 +121,9 @@ EditorRoutes::EditorRoutes (Editor* e) // Mute enable toggle CellRendererPixbufMulti* mute_col_renderer = manage (new CellRendererPixbufMulti()); - mute_col_renderer->set_pixbuf (ActiveState(0), ::get_icon("mute-disabled")); - mute_col_renderer->set_pixbuf (Mid, ::get_icon("muted-by-others")); - mute_col_renderer->set_pixbuf (Active, ::get_icon("mute-enabled")); + mute_col_renderer->set_pixbuf (Gtkmm2ext::Off, ::get_icon("mute-disabled")); + mute_col_renderer->set_pixbuf (Gtkmm2ext::ImplicitActive, ::get_icon("muted-by-others")); + mute_col_renderer->set_pixbuf (Gtkmm2ext::ExplicitActive, ::get_icon("mute-enabled")); mute_col_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_tv_mute_enable_toggled)); TreeViewColumn* mute_state_column = manage (new TreeViewColumn("M", *mute_col_renderer)); @@ -137,9 +137,9 @@ EditorRoutes::EditorRoutes (Editor* e) // Solo enable toggle CellRendererPixbufMulti* solo_col_renderer = manage (new CellRendererPixbufMulti()); - solo_col_renderer->set_pixbuf (ActiveState(0), ::get_icon("solo-disabled")); - solo_col_renderer->set_pixbuf (Active, ::get_icon("solo-enabled")); - solo_col_renderer->set_pixbuf (Mid, ::get_icon("soloed-by-others")); + solo_col_renderer->set_pixbuf (Gtkmm2ext::Off, ::get_icon("solo-disabled")); + solo_col_renderer->set_pixbuf (Gtkmm2ext::ExplicitActive, ::get_icon("solo-enabled")); + solo_col_renderer->set_pixbuf (Gtkmm2ext::ImplicitActive, ::get_icon("soloed-by-others")); solo_col_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_tv_solo_enable_toggled)); TreeViewColumn* solo_state_column = manage (new TreeViewColumn("S", *solo_col_renderer)); @@ -641,7 +641,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) row[_columns.is_midi] = false; } - row[_columns.mute_state] = (*x)->route()->muted() ? Active : ActiveState (0); + row[_columns.mute_state] = (*x)->route()->muted() ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off; row[_columns.solo_state] = RouteUI::solo_active_state ((*x)->route()); row[_columns.solo_visible] = !(*x)->route()->is_master (); row[_columns.solo_isolate_state] = (*x)->route()->solo_isolated(); |