diff options
-rw-r--r-- | src/Patchage.cpp | 13 | ||||
-rw-r--r-- | src/Patchage.h | 3 | ||||
-rw-r--r-- | src/patchage.glade | 44 |
3 files changed, 43 insertions, 17 deletions
diff --git a/src/Patchage.cpp b/src/Patchage.cpp index ad0feb1..a15823f 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -153,7 +153,9 @@ Patchage::Patchage(int argc, char** argv) xml->get_widget("file_quit_menuitem", _menu_file_quit); xml->get_widget("view_refresh_menuitem", _menu_view_refresh); xml->get_widget("view_messages_menuitem", _menu_view_messages); + xml->get_widget("view_jack_toolbar_menuitem", _menu_view_jack_toolbar); xml->get_widget("help_about_menuitem", _menu_help_about); + xml->get_widget("jack_toolbar", _jack_toolbar); xml->get_widget("canvas_scrolledwindow", _canvas_scrolledwindow); xml->get_widget("zoom_scale", _zoom_slider); xml->get_widget("status_text", _status_text); @@ -227,6 +229,7 @@ Patchage::Patchage(int argc, char** argv) _menu_store_positions->signal_activate().connect(sigc::mem_fun(this, &Patchage::menu_store_positions)); _menu_file_quit->signal_activate().connect( sigc::mem_fun(this, &Patchage::menu_file_quit)); _menu_view_refresh->signal_activate().connect( sigc::mem_fun(this, &Patchage::menu_view_refresh)); + _menu_view_jack_toolbar->signal_activate().connect(sigc::mem_fun(this, &Patchage::view_jack_toolbar_toggled)); _menu_view_messages->signal_toggled().connect( sigc::mem_fun(this, &Patchage::show_messages_toggled)); _menu_help_about->signal_activate().connect( sigc::mem_fun(this, &Patchage::menu_help_about)); @@ -674,6 +677,16 @@ Patchage::menu_view_refresh() void +Patchage::view_jack_toolbar_toggled() +{ + if (_menu_view_jack_toolbar->get_active()) + _jack_toolbar->show(); + else + _jack_toolbar->hide(); +} + + +void Patchage::menu_help_about() { _about_window->show(); diff --git a/src/Patchage.h b/src/Patchage.h index 485f36f..6727a45 100644 --- a/src/Patchage.h +++ b/src/Patchage.h @@ -71,6 +71,7 @@ protected: void menu_store_positions(); void menu_file_quit(); void show_messages_toggled(); + void view_jack_toolbar_toggled(); void menu_view_refresh(); void menu_help_about(); void zoom(double z); @@ -134,9 +135,11 @@ protected: Gtk::MenuItem* _menu_jack_disconnect; Gtk::MenuItem* _menu_store_positions; Gtk::MenuItem* _menu_file_quit; + Gtk::CheckMenuItem* _menu_view_jack_toolbar; Gtk::CheckMenuItem* _menu_view_messages; Gtk::MenuItem* _menu_view_refresh; Gtk::MenuItem* _menu_help_about; + Gtk::Toolbar* _jack_toolbar; Gtk::ScrolledWindow* _canvas_scrolledwindow; Gtk::HScale* _zoom_slider; Gtk::TextView* _status_text; diff --git a/src/patchage.glade b/src/patchage.glade index 8354d18..4e60be5 100644 --- a/src/patchage.glade +++ b/src/patchage.glade @@ -52,7 +52,7 @@ <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image662"> + <widget class="GtkImage" id="image701"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -74,7 +74,7 @@ <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image663"> + <widget class="GtkImage" id="image702"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -96,7 +96,7 @@ <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image664"> + <widget class="GtkImage" id="image703"> <property name="visible">True</property> <property name="stock">gtk-save-as</property> <property name="icon_size">1</property> @@ -124,7 +124,7 @@ <signal name="activate" handler="on_save_settings1_activate" last_modification_time="Mon, 13 Sep 2004 02:42:14 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image665"> + <widget class="GtkImage" id="image704"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -174,7 +174,7 @@ <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image666"> + <widget class="GtkImage" id="image705"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> <property name="icon_size">1</property> @@ -202,7 +202,7 @@ <accelerator key="J" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image667"> + <widget class="GtkImage" id="image706"> <property name="visible">True</property> <property name="stock">gtk-execute</property> <property name="icon_size">1</property> @@ -224,7 +224,7 @@ <accelerator key="J" modifiers="GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image668"> + <widget class="GtkImage" id="image707"> <property name="visible">True</property> <property name="stock">gtk-connect</property> <property name="icon_size">1</property> @@ -247,7 +247,7 @@ <accelerator key="J" modifiers="GDK_SHIFT_MASK | GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image669"> + <widget class="GtkImage" id="image708"> <property name="visible">True</property> <property name="stock">gtk-disconnect</property> <property name="icon_size">1</property> @@ -275,7 +275,7 @@ <accelerator key="A" modifiers="GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image670"> + <widget class="GtkImage" id="image709"> <property name="visible">True</property> <property name="stock">gtk-connect</property> <property name="icon_size">1</property> @@ -298,7 +298,7 @@ <accelerator key="A" modifiers="GDK_SHIFT_MASK | GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image671"> + <widget class="GtkImage" id="image710"> <property name="visible">True</property> <property name="stock">gtk-disconnect</property> <property name="icon_size">1</property> @@ -326,7 +326,7 @@ <accelerator key="L" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image672"> + <widget class="GtkImage" id="image711"> <property name="visible">True</property> <property name="stock">gtk-execute</property> <property name="icon_size">1</property> @@ -348,7 +348,7 @@ <accelerator key="L" modifiers="GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image673"> + <widget class="GtkImage" id="image712"> <property name="visible">True</property> <property name="stock">gtk-connect</property> <property name="icon_size">1</property> @@ -371,7 +371,7 @@ <accelerator key="L" modifiers="GDK_SHIFT_MASK | GDK_MOD1_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image674"> + <widget class="GtkImage" id="image713"> <property name="visible">True</property> <property name="stock">gtk-disconnect</property> <property name="icon_size">1</property> @@ -398,6 +398,16 @@ <widget class="GtkMenu" id="view_menu_menu"> <child> + <widget class="GtkCheckMenuItem" id="view_jack_toolbar_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Jack Toolbar</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <signal name="activate" handler="on_view_jack_toolbar_menuitem_activate" last_modification_time="Thu, 15 Feb 2007 19:41:28 GMT"/> + </widget> + </child> + + <child> <widget class="GtkCheckMenuItem" id="view_messages_menuitem"> <property name="visible">True</property> <property name="tooltip" translatable="yes">View "console" messages</property> @@ -418,7 +428,7 @@ <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image675"> + <widget class="GtkImage" id="image714"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -465,7 +475,7 @@ </child> <child> - <widget class="GtkToolbar" id="toolbar2"> + <widget class="GtkToolbar" id="jack_toolbar"> <property name="visible">True</property> <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property> <property name="toolbar_style">GTK_TOOLBAR_BOTH</property> @@ -1099,7 +1109,7 @@ The bar represents the maximum processing delay as a fraction of the time availa </child> </widget> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -1217,7 +1227,7 @@ The bar represents the maximum processing delay as a fraction of the time availa <widget class="GtkAboutDialog" id="about_win"> <property name="destroy_with_parent">True</property> <property name="name" translatable="yes">Patchage</property> - <property name="copyright" translatable="yes">© 2006 Dave Robillard</property> + <property name="copyright" translatable="yes">© 2007 Dave Robillard</property> <property name="comments" translatable="yes">A control centre for music/audio systems</property> <property name="license" translatable="yes">Patchage is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |