13
0

fixes for plugin selector and open session

git-svn-id: svn://localhost/trunk/ardour2@169 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Doug McLain 2005-12-05 12:07:34 +00:00
parent efaa5cfa79
commit 0b6adda6f2
3 changed files with 14 additions and 16 deletions

View File

@ -98,13 +98,13 @@ style "default_base" = "medium_text"
text[ACTIVE] = { 0.80, 0.80, 0.70 } text[ACTIVE] = { 0.80, 0.80, 0.70 }
text[PRELIGHT] = { 0.80, 0.80, 0.70 } text[PRELIGHT] = { 0.80, 0.80, 0.70 }
text[INSENSITIVE] = { 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] = "#2f272f"
base[ACTIVE] = { 0.00, 0.00, 0.00 } base[NORMAL] = "#1c1e21"
base[PRELIGHT] = { 0.00, 0.00, 0.00 } base[PRELIGHT] = "#2f272f"
base[INSENSITIVE] = { 0.00, 0.00, 0.00 } base[INSENSITIVE] = "#4c5159"
base[SELECTED] = { 0.00, 0.00, 0.00 } base[SELECTED] = "#2f272f"
} }
style "base_frame" style "base_frame"

View File

@ -1801,9 +1801,11 @@ ARDOUR_UI::open_session ()
case RESPONSE_OK: case RESPONSE_OK:
break; break;
default: default:
open_session_selector->hide();
return; return;
} }
open_session_selector->hide();
string session_path = open_session_selector->get_filename(); string session_path = open_session_selector->get_filename();
string path, name; string path, name;
bool isnew; bool isnew;

View File

@ -277,16 +277,12 @@ PluginSelector::btn_add_clicked()
void void
PluginSelector::btn_remove_clicked() PluginSelector::btn_remove_clicked()
{ {
if (o_selected_plug > -1){ list<PluginInfo*>::iterator i;
gint row = 0; Gtk::TreeModel::iterator iter = added_list.get_selection()->get_selected();
list<PluginInfo*>::iterator i = added_plugins.begin(); for (i = added_plugins.begin(); (*i) != (*iter)[acols.plugin]; ++i);
while(row < o_selected_plug){
i++; added_plugins.erase(i);
row++; amodel->erase(iter);
}
added_plugins.erase(i);
o_selected_plug = -1;
}
} }
void void