diff options
| -rw-r--r-- | gtk2_ardour/ardour2_ui.rc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/plugin_selector.cc | 16 |
3 files changed, 14 insertions, 16 deletions
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc index 4c4b5a763c..0564d821bc 100644 --- a/gtk2_ardour/ardour2_ui.rc +++ b/gtk2_ardour/ardour2_ui.rc @@ -98,13 +98,13 @@ style "default_base" = "medium_text" text[ACTIVE] = { 0.80, 0.80, 0.70 } text[PRELIGHT] = { 0.80, 0.80, 0.70 } text[INSENSITIVE] = { 0.80, 0.80, 0.70 } - text[SELECTED] = { 0, 0, 0 } + text[SELECTED] = { 1.0, 1.0, 1.0 } - base[NORMAL] = { 0.00, 0.00, 0.00 } - base[ACTIVE] = { 0.00, 0.00, 0.00 } - base[PRELIGHT] = { 0.00, 0.00, 0.00 } - base[INSENSITIVE] = { 0.00, 0.00, 0.00 } - base[SELECTED] = { 0.00, 0.00, 0.00 } + base[ACTIVE] = "#2f272f" + base[NORMAL] = "#1c1e21" + base[PRELIGHT] = "#2f272f" + base[INSENSITIVE] = "#4c5159" + base[SELECTED] = "#2f272f" } style "base_frame" diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b9342bcdb1..4f1382b1c6 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1801,9 +1801,11 @@ ARDOUR_UI::open_session () case RESPONSE_OK: break; default: + open_session_selector->hide(); return; } + open_session_selector->hide(); string session_path = open_session_selector->get_filename(); string path, name; bool isnew; diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 3e6320f4d5..01d04235cf 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -277,16 +277,12 @@ PluginSelector::btn_add_clicked() void PluginSelector::btn_remove_clicked() { - if (o_selected_plug > -1){ - gint row = 0; - list<PluginInfo*>::iterator i = added_plugins.begin(); - while(row < o_selected_plug){ - i++; - row++; - } - added_plugins.erase(i); - o_selected_plug = -1; - } + list<PluginInfo*>::iterator i; + Gtk::TreeModel::iterator iter = added_list.get_selection()->get_selected(); + for (i = added_plugins.begin(); (*i) != (*iter)[acols.plugin]; ++i); + + added_plugins.erase(i); + amodel->erase(iter); } void |