X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fscript_selector.cc;h=94233021dc74f955df3d2c1c5b972c8594077e4a;hb=78f749ef65e725eee82938df76f24c2b6811a519;hp=bd2ebf9844b57ab1b53be9706e5d51cd3a324c58;hpb=ba2b136af2c05dcc61aef712b2387796d497c781;p=ardour.git diff --git a/gtk2_ardour/script_selector.cc b/gtk2_ardour/script_selector.cc index bd2ebf9844..94233021dc 100644 --- a/gtk2_ardour/script_selector.cc +++ b/gtk2_ardour/script_selector.cc @@ -79,7 +79,7 @@ ScriptSelector::ScriptSelector (std::string title, LuaScriptInfo::ScriptType typ setup_list (); show_all (); - + script_combo_changed(); } @@ -88,27 +88,29 @@ ScriptSelector::script_separator (const Glib::RefPtr &, const Gt { _script_combo.set_active (i); - return _script_combo.get_active_text () == "separator"; + return _script_combo.get_active_text () == "--separator--"; } void ScriptSelector::setup_list () { _combocon.block(); - + vector script_names; for (LuaScriptList::const_iterator s = _scripts.begin(); s != _scripts.end(); ++s) { - if ((*s)->name != "Shortcut") { + if ((*s)->name != "Shortcut" || _script_type != LuaScriptInfo::EditorAction) { script_names.push_back ((*s)->name); } } - + _script_combo.clear(); _script_combo.set_row_separator_func (sigc::mem_fun (*this, &ScriptSelector::script_separator)); - _script_combo.append_text ("Shortcut"); - _script_combo.append_text ("separator"); - + if (_script_type == LuaScriptInfo::EditorAction) { + _script_combo.append_text ("Shortcut"); + _script_combo.append_text ("--separator--"); + } + vector::const_iterator i; for (i = script_names.begin(); i != script_names.end(); ++i) { _script_combo.append_text (*i); @@ -132,7 +134,7 @@ ScriptSelector::script_combo_changed () } if (_script) { - + if (_script->name == "Shortcut") { _type.hide(); _type_label.hide();