summaryrefslogtreecommitdiffstats
path: root/src/gui/LoadPluginWindow.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-11-16 03:43:34 +0000
committerDavid Robillard <d@drobilla.net>2009-11-16 03:43:34 +0000
commit720dc98574c6ec13f3d9c61d67a7144cb8200a2c (patch)
treee011f02ce6c16f5c1f4747fc73b6c92de6b0d62a /src/gui/LoadPluginWindow.cpp
parent3d89115a67a9c947a28539ffdd2399808a53279b (diff)
downloadingen-720dc98574c6ec13f3d9c61d67a7144cb8200a2c.tar.gz
ingen-720dc98574c6ec13f3d9c61d67a7144cb8200a2c.tar.bz2
ingen-720dc98574c6ec13f3d9c61d67a7144cb8200a2c.zip
Clean up load plugin window and add close button.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2268 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/LoadPluginWindow.cpp')
-rw-r--r--src/gui/LoadPluginWindow.cpp38
1 files changed, 12 insertions, 26 deletions
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index a4adf44e..312d735b 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -45,10 +45,8 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
xml->get_widget("load_plugin_plugins_treeview", _plugins_treeview);
xml->get_widget("load_plugin_polyphonic_checkbutton", _polyphonic_checkbutton);
xml->get_widget("load_plugin_name_entry", _node_name_entry);
- xml->get_widget("load_plugin_clear_button", _clear_button);
xml->get_widget("load_plugin_add_button", _add_button);
- //xml->get_widget("load_plugin_close_button", _close_button);
- //xml->get_widget("load_plugin_ok_button", _add_button);
+ xml->get_widget("load_plugin_close_button", _close_button);
xml->get_widget("load_plugin_filter_combo", _filter_combo);
xml->get_widget("load_plugin_search_entry", _search_entry);
@@ -83,14 +81,10 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
row[_criteria_columns._col_label] = "URI contains";
row[_criteria_columns._col_criteria] = CriteriaColumns::URI;
- _clear_button->signal_clicked().connect(
- sigc::mem_fun(this, &LoadPluginWindow::clear_clicked));
_add_button->signal_clicked().connect(
sigc::mem_fun(this, &LoadPluginWindow::add_clicked));
- //m_close_button->signal_clicked().connect(
- // sigc::mem_fun(this, &LoadPluginWindow::close_clicked));
- //m_add_button->signal_clicked().connect(
- // sigc::mem_fun(this, &LoadPluginWindow::ok_clicked));
+ _close_button->signal_clicked().connect(
+ sigc::mem_fun(this, &LoadPluginWindow::close_clicked));
_plugins_treeview->signal_row_activated().connect(
sigc::mem_fun(this, &LoadPluginWindow::plugin_activated));
_search_entry->signal_activate().connect(
@@ -99,6 +93,8 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
sigc::mem_fun(this, &LoadPluginWindow::filter_changed));
_node_name_entry->signal_changed().connect(
sigc::mem_fun(this, &LoadPluginWindow::name_changed));
+ _search_entry->signal_icon_release().connect(
+ sigc::mem_fun(this, &LoadPluginWindow::name_cleared));
_selection = _plugins_treeview->get_selection();
_selection->set_mode(Gtk::SELECTION_MULTIPLE);
@@ -144,6 +140,13 @@ LoadPluginWindow::name_changed()
}
+void
+LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event)
+{
+ _search_entry->set_text("");
+}
+
+
/** Sets the patch controller for this window and initializes everything.
*
* This function MUST be called before using the window in any way!
@@ -361,7 +364,6 @@ LoadPluginWindow::add_clicked()
}
-/*
void
LoadPluginWindow::close_clicked()
{
@@ -370,14 +372,6 @@ LoadPluginWindow::close_clicked()
void
-LoadPluginWindow::ok_clicked()
-{
- add_clicked();
- close_clicked();
-}
-*/
-
-void
LoadPluginWindow::filter_changed()
{
_rows.clear();
@@ -437,14 +431,6 @@ LoadPluginWindow::filter_changed()
}
-void
-LoadPluginWindow::clear_clicked()
-{
- _search_entry->set_text("");
- set_plugins(App::instance().store()->plugins());
-}
-
-
bool
LoadPluginWindow::on_key_press_event(GdkEventKey* event)
{