From b249234a26f3a424fcf977b1a3b8fed4d5ac7d39 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 23 Dec 2006 03:40:22 +0000 Subject: Minor GUI touch-ups. Updated inclusion guards to match filenames. git-svn-id: http://svn.drobilla.net/lad/ingen@225 a436a847-0d15-0410-975c-d299462d15a1 --- src/progs/ingenuity/App.h | 6 +- src/progs/ingenuity/LoadPluginWindow.cpp | 12 +- src/progs/ingenuity/LoadPluginWindow.h | 4 +- src/progs/ingenuity/NodeModule.h | 8 +- src/progs/ingenuity/PatchCanvas.h | 6 +- src/progs/ingenuity/PatchPortModule.h | 6 +- src/progs/ingenuity/ingenuity.glade | 549 ++++++++++++++----------------- 7 files changed, 275 insertions(+), 316 deletions(-) (limited to 'src/progs') diff --git a/src/progs/ingenuity/App.h b/src/progs/ingenuity/App.h index 4d7e8e79..e21432dd 100644 --- a/src/progs/ingenuity/App.h +++ b/src/progs/ingenuity/App.h @@ -14,8 +14,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef OMGTKAPP_H -#define OMGTKAPP_H +#ifndef APP_H +#define APP_H #include #include @@ -122,5 +122,5 @@ protected: } // namespace Ingenuity -#endif // OMGTKAPP_H +#endif // APP_H diff --git a/src/progs/ingenuity/LoadPluginWindow.cpp b/src/progs/ingenuity/LoadPluginWindow.cpp index d909ac67..c5a51d4d 100644 --- a/src/progs/ingenuity/LoadPluginWindow.cpp +++ b/src/progs/ingenuity/LoadPluginWindow.cpp @@ -42,7 +42,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtrget_widget("load_plugin_name_entry", m_node_name_entry); xml->get_widget("load_plugin_clear_button", m_clear_button); xml->get_widget("load_plugin_add_button", m_add_button); - xml->get_widget("load_plugin_close_button", m_close_button); + //xml->get_widget("load_plugin_close_button", m_close_button); //xml->get_widget("load_plugin_ok_button", m_add_button); xml->get_widget("load_plugin_filter_combo", m_filter_combo); @@ -71,14 +71,14 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtrset_model(m_criteria_liststore); Gtk::TreeModel::iterator iter = m_criteria_liststore->append(); Gtk::TreeModel::Row row = *iter; - row[m_criteria_columns.m_col_label] = "Name contains: "; + row[m_criteria_columns.m_col_label] = "Name contains"; row[m_criteria_columns.m_col_criteria] = CriteriaColumns::NAME; m_filter_combo->set_active(iter); iter = m_criteria_liststore->append(); row = *iter; - row[m_criteria_columns.m_col_label] = "Type contains: "; + row[m_criteria_columns.m_col_label] = "Type contains"; row[m_criteria_columns.m_col_criteria] = CriteriaColumns::TYPE; iter = m_criteria_liststore->append(); row = *iter; - row[m_criteria_columns.m_col_label] = "URI contains: "; + row[m_criteria_columns.m_col_label] = "URI contains"; row[m_criteria_columns.m_col_criteria] = CriteriaColumns::URI; /*iter = m_criteria_liststore->append(); row = *iter; row[m_criteria_columns.m_col_label] = "Library contains: "; @@ -89,7 +89,7 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtrsignal_clicked().connect( sigc::mem_fun(this, &LoadPluginWindow::clear_clicked)); m_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_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)); m_plugins_treeview->signal_row_activated().connect(sigc::mem_fun(this, &LoadPluginWindow::plugin_activated)); m_search_entry->signal_activate().connect( sigc::mem_fun(this, &LoadPluginWindow::add_clicked)); @@ -316,6 +316,7 @@ LoadPluginWindow::add_clicked() } +/* void LoadPluginWindow::close_clicked() { @@ -323,7 +324,6 @@ LoadPluginWindow::close_clicked() } -/* void LoadPluginWindow::ok_clicked() { diff --git a/src/progs/ingenuity/LoadPluginWindow.h b/src/progs/ingenuity/LoadPluginWindow.h index afa3be85..ec416f15 100644 --- a/src/progs/ingenuity/LoadPluginWindow.h +++ b/src/progs/ingenuity/LoadPluginWindow.h @@ -102,7 +102,7 @@ protected: private: void add_clicked(); - void close_clicked(); + //void close_clicked(); //void ok_clicked(); void filter_changed(); void clear_clicked(); @@ -133,7 +133,7 @@ private: Gtk::Entry* m_node_name_entry; Gtk::Button* m_clear_button; Gtk::Button* m_add_button; - Gtk::Button* m_close_button; + //Gtk::Button* m_close_button; //Gtk::Button* m_ok_button; Gtk::ComboBox* m_filter_combo; Gtk::Entry* m_search_entry; diff --git a/src/progs/ingenuity/NodeModule.h b/src/progs/ingenuity/NodeModule.h index 6b973f2b..625241e7 100644 --- a/src/progs/ingenuity/NodeModule.h +++ b/src/progs/ingenuity/NodeModule.h @@ -14,8 +14,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef OMMODULE_H -#define OMMODULE_H +#ifndef NODEMODULE_H +#define NODEMODULE_H #include #include @@ -80,10 +80,10 @@ protected: void remove_port(SharedPtr port) { Module::remove_port(port->path().name()); } SharedPtr m_node; - NodeMenu m_menu; + NodeMenu m_menu; }; } // namespace Ingenuity -#endif // OMMODULE_H +#endif // NODEMODULE_H diff --git a/src/progs/ingenuity/PatchCanvas.h b/src/progs/ingenuity/PatchCanvas.h index c91bb6ec..72f79a9b 100644 --- a/src/progs/ingenuity/PatchCanvas.h +++ b/src/progs/ingenuity/PatchCanvas.h @@ -14,8 +14,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef OMPATCHBAYAREA_H -#define OMPATCHBAYAREA_H +#ifndef PATCHCANVAS_H +#define PATCHCANVAS_H #include #include @@ -112,4 +112,4 @@ private: } // namespace Ingenuity -#endif // OMPATCHBAYAREA_H +#endif // PATCHCANVAS_H diff --git a/src/progs/ingenuity/PatchPortModule.h b/src/progs/ingenuity/PatchPortModule.h index 516d912d..619b8ecf 100644 --- a/src/progs/ingenuity/PatchPortModule.h +++ b/src/progs/ingenuity/PatchPortModule.h @@ -14,8 +14,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef OMPORTMODULE_H -#define OMPORTMODULE_H +#ifndef PATCHPORTMODULE_H +#define PATCHPORTMODULE_H #include #include @@ -73,4 +73,4 @@ protected: } // namespace Ingenuity -#endif // OMPORTMODULE_H +#endif // PATCHPORTMODULE_H diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade index 7fef84d5..cdbee7d9 100644 --- a/src/progs/ingenuity/ingenuity.glade +++ b/src/progs/ingenuity/ingenuity.glade @@ -489,297 +489,140 @@ False - + True False - 10 + 1 - + + 2 True - False - 10 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - + + 2 True - False - 5 - - - - True - False - 1 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - All plugins available for loading - True - True - True - True - True - False - False - False - - - - - 0 - True - True - - - - - - True - 3 - 3 - False - 12 - 0 - - - - True - Clear filter text (show all plugins) - True - gtk-clear - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - Module Name: - False - True - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - Close dialog - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - - - 1 - 2 - 1 - 2 - fill - - - - - - True - - - 0 - 1 - 1 - 2 - fill - fill - - + All plugins available for loading + True + True + True + True + True + False + False + False + + + + + 0 + True + True + + - - - True - - - 2 - 3 - 1 - 2 - fill - fill - - + + + True + 3 + 3 + False + 12 + 0 - - - True - False - 0 + + + True + Node Name: + False + True + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + - - - True - Name of new Module - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + + + True + + + 1 + 2 + 1 + 2 + fill + + - - - True - True - Polyphonic - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 8 - False - False - - + + + True + + + 0 + 1 + 1 + 2 + fill + fill + + - - - True - Add selected plugin to patch - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 1 - 2 - 2 - 3 - 6 - fill - fill - - + + + True + + + 2 + 3 + 1 + 2 + fill + fill + + - - - True - Search string to filter plugin list - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - 6 - - - + + + True + False + 0 - - - True - Name contains: - False - True - - - 0 - 1 - 0 - 1 - fill - fill - - - - - 0 - False - False - - + + + True + Name of new Module + True + True + True + 0 + + True + * + False 0 @@ -787,18 +630,120 @@ True + + + + True + True + Polyphonic + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 8 + False + False + + - 0 - True - True + 1 + 2 + 2 + 3 + 6 + fill + fill + + + + + + True + Add selected plugin to patch + True + gtk-add + True + GTK_RELIEF_NORMAL + True + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + Search string to filter plugin list + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + 6 + + + + + + True + Name contains: + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Clear filter text (show all plugins) + True + gtk-clear + True + GTK_RELIEF_NORMAL + True + + + 2 + 3 + 0 + 1 + fill + 0 - True - True + False + False @@ -1918,7 +1863,8 @@ True - Polyphony (Patch must be disabled to modify) + False + Polyphony True 1 0 @@ -1950,12 +1896,10 @@ - + True - Clear (Destroy all children nodes, click twice to clear ports as well) - - True - gtk-clear + Save patch to a file + gtk-save True True False @@ -1967,17 +1911,15 @@ - + True - Destroy this patch - gtk-delete + True True True - False False - True + False @@ -1997,10 +1939,27 @@ - + True - Save patch to a file - gtk-save + Clear (Destroy all children) + + True + gtk-clear + True + True + False + + + False + True + + + + + + True + Destroy this patch + gtk-delete True True False -- cgit v1.2.1