From 66605036825e32783d1b47ade28aa1133a2b11aa Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 5 Aug 2007 02:58:23 +0000 Subject: Clean up toolbar. git-svn-id: http://svn.drobilla.net/lad/patchage@676 a436a847-0d15-0410-975c-d299462d15a1 --- src/Patchage.cpp | 11 +- src/Patchage.hpp | 3 +- src/patchage.glade | 2151 ++++++++++++++++++++++------------------------------ 3 files changed, 896 insertions(+), 1269 deletions(-) diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 4c7959b..a52e9f2 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -152,8 +152,9 @@ Patchage::Patchage(int argc, char** argv) xml->get_widget("view_toolbar_menuitem", _menu_view_toolbar); xml->get_widget("help_about_menuitem", _menu_help_about); xml->get_widget("toolbar", _toolbar); + xml->get_widget("toolbars_hbox", _toolbars_box); xml->get_widget("canvas_scrolledwindow", _canvas_scrolledwindow); - xml->get_widget("zoom_scale", _zoom_slider); + //xml->get_widget("zoom_scale", _zoom_slider); xml->get_widget("status_text", _status_text); xml->get_widget("main_paned", _main_paned); xml->get_widget("messages_expander", _messages_expander); @@ -179,7 +180,7 @@ Patchage::Patchage(int argc, char** argv) _canvas->scroll_to(static_cast(_canvas->width()/2 - 320), static_cast(_canvas->height()/2 - 240)); // FIXME: hardcoded - _zoom_slider->signal_value_changed().connect(sigc::mem_fun(this, &Patchage::zoom_changed)); + //_zoom_slider->signal_value_changed().connect(sigc::mem_fun(this, &Patchage::zoom_changed)); //_jack_connect_toggle->signal_toggled().connect(sigc::mem_fun(this, &Patchage::jack_connect_changed)); @@ -428,7 +429,7 @@ Patchage::zoom_changed() static bool enable_signal = true; if (enable_signal) { enable_signal = false; - zoom(_zoom_slider->get_value()); + //zoom(_zoom_slider->get_value()); enable_signal = true; } } @@ -727,9 +728,9 @@ Patchage::view_toolbar_toggled() _update_pane_position = false; if (_menu_view_toolbar->get_active()) - _toolbar->show(); + _toolbars_box->show(); else - _toolbar->hide(); + _toolbars_box->hide(); _update_pane_position = true; } diff --git a/src/Patchage.hpp b/src/Patchage.hpp index 2117753..ab3cf18 100644 --- a/src/Patchage.hpp +++ b/src/Patchage.hpp @@ -141,6 +141,7 @@ protected: Gtk::MenuItem* _menu_jack_disconnect; Gtk::MenuItem* _menu_store_positions; Gtk::MenuItem* _menu_file_quit; + Gtk::Box* _toolbars_box; Gtk::CheckMenuItem* _menu_view_toolbar; Gtk::CheckMenuItem* _menu_view_messages; Gtk::MenuItem* _menu_view_refresh; @@ -148,7 +149,7 @@ protected: Gtk::MenuItem* _menu_help_about; Gtk::Toolbar* _toolbar; Gtk::ScrolledWindow* _canvas_scrolledwindow; - Gtk::HScale* _zoom_slider; + //Gtk::HScale* _zoom_slider; Gtk::TextView* _status_text; Gtk::Paned* _main_paned; Gtk::Expander* _messages_expander; diff --git a/src/patchage.glade b/src/patchage.glade index 835919c..daeabf9 100644 --- a/src/patchage.glade +++ b/src/patchage.glade @@ -1,543 +1,395 @@ - - - + + + - - - 1 - Patchage - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 640 - 480 - True - False - patchage.svg - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - _Open Project - True - - - - - - True - gtk-open - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Save Project - True - - - - - - True - gtk-save - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Save Project _As... - True - - - - - - True - gtk-save-as - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Close Project - True - - - - - True - gtk-close - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Store the current module positions as the defaults - _Save Layout as Default - True - - - - - True - gtk-save - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - gtk-quit - True - - - - - - - - - - - True - _System - True - - - - - - - True - Jack _Settings - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Connect to _JACK - True - - - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - Disconnect from JACK - True - - - - - - True - gtk-disconnect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Connect to _ALSA - True - - - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - Disconnect from ALSA - True - - - - - - True - gtk-disconnect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - - - - - - True - Connect to _LASH - True - - - - - - True - gtk-connect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - False - Disconnect from LASH - True - - - - - - True - gtk-disconnect - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - _View - True - - - - - - - True - _Toolbar - True - True - - - - - - - - True - View "console" messages - _Messages - True - False - - - - - - - - True - _Refresh - True - - - - - - True - gtk-refresh - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - Automatically organize canvas - _Arrange - True - - - - - - True - gtk-sort-ascending - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - - - - True - _Help - True - - - - - - - True - gtk-about - True - - - - - - - - - - 0 - False - False - - - - - - True - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS - True - True - - - - True - True - True - False - - - - True - 0.5 - 0.5 - 1 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 0 - - - - True - Latency: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 1 - True - 32 frames + + 1 + Patchage + 640 + 480 + patchage.svg + + + True + + + True + + + True + _File + True + + + + + True + _Open Project + True + + + + + True + gtk-open + 1 + + + + + + + True + _Save Project + True + + + + + True + gtk-save + 1 + + + + + + + True + Save Project _As... + True + + + + + True + gtk-save-as + 1 + + + + + + + True + _Close Project + True + + + + True + gtk-close + 1 + + + + + + + True + + + + + True + Store the current module positions as the defaults + _Save Layout as Default + True + + + + True + gtk-save + 1 + + + + + + + True + + + + + True + gtk-quit + True + True + + + + + + + + + + True + _System + True + + + + + True + Jack _Settings + True + + + + + True + gtk-preferences + 1 + + + + + + + True + + + + + True + Connect to _JACK + True + + + + + True + gtk-connect + 1 + + + + + + + True + False + Disconnect from JACK + True + + + + + True + gtk-disconnect + 1 + + + + + + + True + + + + + True + Connect to _ALSA + True + + + + + True + gtk-connect + 1 + + + + + + + True + False + Disconnect from ALSA + True + + + + + True + gtk-disconnect + 1 + + + + + + + True + + + + + True + Connect to _LASH + True + + + + + True + gtk-connect + 1 + + + + + + + True + False + Disconnect from LASH + True + + + + + True + gtk-disconnect + 1 + + + + + + + + + + + True + _View + True + + + + + True + _Toolbar + True + True + + + + + + + True + View "console" messages + _Messages + True + + + + + + + True + _Refresh + True + + + + + True + gtk-refresh + 1 + + + + + + + True + Automatically organize canvas + _Arrange + True + + + + + True + gtk-sort-ascending + 1 + + + + + + + + + + + True + _Help + True + + + + + True + gtk-about + True + True + + + + + + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + False + GTK_ICON_SIZE_SMALL_TOOLBAR + True + + + True + False + + + True + 0 + + + True + + + True + Latency: + + + False + False + + + + + True + 1 + 32 frames 64 frames 128 frames 256 frames @@ -545,533 +397,374 @@ 1024 frames 2048 frames 4096 frames - False - True - True - - - 1 - True - True - - - - - - 48 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - False - False - - - - - - kHz - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 1 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - False - False - - - - - - 8 - True - True - True - True - - - False - False - - - - - - True - gtk-clear - True - True - False - - - False - True - - - - - - True - True - True - False - - - - True - 0.5 - 0.5 - 1 - 0 - 0 - 0 - 0 - 0 - - - - True - Delay/XRun Indicator + + + + + + + 1 + 1 + + + + + 48 + + + False + False + 1 + 2 + + + + + 1 + kHz + + + False + False + 3 + + + + + + + + + False + False + + + + + True + 8 + + + False + False + + + + + True + gtk-clear + + + False + + + + + True + + + True + 0 + + + True + Delay/XRun Indicator The bar represents the maximum processing delay as a fraction of the time available for a cycle. If the bar reaches 100%, an XRun will occur. - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - 0 Dropouts - PANGO_ELLIPSIZE_NONE - - - - - - - False - False - - - - - - 8 - True - True - True - True - - - False - False - - - - - - True - gtk-zoom-100 - True - True - False - - - False - True - - - - - - True - gtk-zoom-fit - True - True - False - - - False - True - - - - - - True - True - True - False - - - - 180 - True - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - False - 1 0.10000000149 2 0 0 0 - - - - - False - False - - - - - 0 - False - True - - - - - - GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_ICONS - True - True - - - - True - True - True - False - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - gtk-media-previous - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - True - True - True - False - - - - 1 - True - True - GTK_RELIEF_NORMAL - True - - - - True - gtk-media-play - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - True - True - True - False - - - - 1 - True - True - GTK_RELIEF_NORMAL - True - - - - True - gtk-media-pause - 4 - 0.5 - 0.5 - 0 - 0 - - - - - - - False - False - - - - - - 1 - True - True - True - False - - - - True - False - True - False - True - 0 - 00:00:00.000 - True - * - False - 11 - - - - - False - False - - - - - - 4 - True - True - True - True - - - False - False - - - - - - - - - - True - True - True - False - - - - - - - False - False - - - - - - 1 - True - True - True - False - - - - - - - False - False - - - - - 0 - False - True - - - - - - True - True - 0 - - - - True - True - True - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - - - - False - True - - - - - - True - True - False - 0 - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - False - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - False - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - - - True - Messages - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - True - True - - - - - 2 - True - True - - - - - - - - True - Patchage - © 2007 Dave Robillard - A control centre for music/audio systems - Patchage is free software; you can redistribute it and/or modify + 0.10000000149 + 0 Dropouts + + + + + + + False + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + False + + + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_TOOLBAR_BOTH + False + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + GTK_ICON_SIZE_SMALL_TOOLBAR + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-zoom-100 + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-zoom-fit + + + False + + + + + False + 2 + + + + + False + 1 + + + + + + + True + + + True + True + 0 + + + True + gtk-media-previous + + + + + + + False + False + + + + + True + + + True + True + 1 + 0 + + + True + gtk-media-play + + + + + + + False + False + + + + + True + + + True + True + 1 + 0 + + + True + gtk-media-pause + + + + + + + False + False + + + + + True + 1 + + + True + False + True + False + * + 11 + 00:00:00.000 + + + + + False + False + + + + + True + 4 + + + False + False + + + + + True + + + + + + False + False + + + + + True + 1 + + + + + + False + False + + + + + False + 2 + + + + + True + True + + + True + True + True + True + True + GTK_SHADOW_IN + + + + + + True + False + + + + + True + True + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + False + True + False + GTK_WRAP_WORD + False + + + + + + + True + Messages + + + label_item + + + + + True + True + + + + + 2 + 3 + + + + + + + True + GDK_WINDOW_TYPE_HINT_NORMAL + Patchage + © 2007 Dave Robillard + A control centre for music/audio systems + http://drobilla.net/software/patchage + Patchage is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -1085,203 +778,135 @@ You should have received a copy of the GNU General Public License along with Patchage; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - False - http://drobilla.net/software/patchage - Dave Robillard <dave@drobilla.net> - translator-credits - patchage.svg - - - - 8 - 400 - 200 - JACK Settings - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - 400 - 200 - True - True - patchage.svg - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - <b>Command Line</b> - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 6 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - True - - - 0 - True - True - - - - - 0 - False - False - - - - - - 323 - 200 - True - Note: This will change your default setting in ~/.jackdrc - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 12 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - 0 - True - True - - - - - - + Dave Robillard <dave@drobilla.net> + translator-credits + patchage.svg + + + + + + + False + GTK_PACK_END + + + + + + + 400 + 200 + 8 + JACK Settings + GTK_WIN_POS_CENTER_ON_PARENT + 400 + 200 + True + patchage.svg + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + + + True + 0 + 6 + <b>Command Line</b> + True + True + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + True + * + True + + + 1 + + + + + False + False + 1 + + + + + 323 + 200 + True + 12 + Note: This will change your default setting in ~/.jackdrc + + + 2 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + -- cgit v1.2.1