From 07115ad5e6fa4af82b4efd06ce1d3f60cc2d07bb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 20 Dec 2007 02:04:55 +0000 Subject: Use fancy Widget class for Glade widgets. Somewhat consistently rename glade widgets. Fix about dialog program name, icon (when run from source tree), and close button. git-svn-id: http://svn.drobilla.net/lad/patchage@989 a436a847-0d15-0410-975c-d299462d15a1 --- src/JackSettingsDialog.hpp | 30 +++-- src/Makefile.am | 1 + src/Patchage.cpp | 275 ++++++++++++++++++++++----------------------- src/Patchage.hpp | 101 ++++++++--------- src/Widget.hpp | 42 +++++++ src/patchage.glade | 68 +++++------ src/patchage.svg | 1 + 7 files changed, 274 insertions(+), 244 deletions(-) create mode 100644 src/Widget.hpp create mode 120000 src/patchage.svg (limited to 'src') diff --git a/src/JackSettingsDialog.hpp b/src/JackSettingsDialog.hpp index a3e544d..1acb191 100644 --- a/src/JackSettingsDialog.hpp +++ b/src/JackSettingsDialog.hpp @@ -28,25 +28,24 @@ class JackSettingsDialog : public Gtk::Dialog { public: JackSettingsDialog(BaseObjectType* cobject, const Glib::RefPtr& xml) - : Gtk::Dialog(cobject) + : Gtk::Dialog(cobject) { xml->get_widget("jack_settings_command_entry", _command_entry); - xml->get_widget("jack_settings_cancel_button", _cancel_button); - xml->get_widget("jack_settings_ok_button", _ok_button); - - _cancel_button->signal_clicked().connect(sigc::mem_fun(this, &JackSettingsDialog::on_cancel)); - _ok_button->signal_clicked().connect(sigc::mem_fun(this, &JackSettingsDialog::on_ok)); + xml->get_widget("jack_settings_cancel_but", _cancel_but); + xml->get_widget("jack_settings_ok_but", _ok_but); + + _cancel_but->signal_clicked().connect( + sigc::mem_fun(this, &JackSettingsDialog::on_cancel)); + _ok_but->signal_clicked().connect( + sigc::mem_fun(this, &JackSettingsDialog::on_ok)); + _command_entry->set_text(current_jack_command()); } private: - void on_cancel() - { - hide(); - } + void on_cancel() { hide(); } - string current_jack_command() - { + string current_jack_command() { std::string result; const char* const home = getenv("HOME"); @@ -62,8 +61,7 @@ private: return result; } - void on_ok() - { + void on_ok() { hide(); const char* const home = getenv("HOME"); if (home) { @@ -78,8 +76,8 @@ private: Gtk::Entry* _command_entry; - Gtk::Button* _cancel_button; - Gtk::Button* _ok_button; + Gtk::Button* _cancel_but; + Gtk::Button* _ok_but; }; diff --git a/src/Makefile.am b/src/Makefile.am index 6d7a63d..a87563b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,7 @@ patchage_SOURCES = \ PatchagePort.hpp \ StateManager.cpp \ StateManager.hpp \ + Widget.hpp \ main.cpp if WITH_LASH diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 0991380..0cd7328 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -71,14 +71,23 @@ gtkmm_set_width_for_given_text (Gtk::Widget &w, const gchar *text, /* end Gtk helpers */ +#define INIT_WIDGET(x) x(xml, ((const char*)#x) + 1) Patchage::Patchage(int argc, char** argv) : xml(GladeFile::open("patchage")) #ifdef HAVE_LASH , _lash_driver(NULL) + , INIT_WIDGET(_menu_open_session) + , INIT_WIDGET(_menu_save_session) + , INIT_WIDGET(_menu_save_session_as) + , INIT_WIDGET(_menu_close_session) + , INIT_WIDGET(_menu_lash_connect) + , INIT_WIDGET(_menu_lash_disconnect) #endif #ifdef HAVE_ALSA , _alsa_driver(NULL) + , INIT_WIDGET(_menu_alsa_connect) + , INIT_WIDGET(_menu_alsa_disconnect) #endif , _jack_driver(NULL) , _state_manager(NULL) @@ -87,12 +96,40 @@ Patchage::Patchage(int argc, char** argv) , _pane_closed(false) , _update_pane_position(true) , _user_pane_position(0) + , _jack_settings_dialog(NULL) + , INIT_WIDGET(_about_win) + , INIT_WIDGET(_buffer_size_combo) + , INIT_WIDGET(_clear_load_but) + , INIT_WIDGET(_main_paned) + , INIT_WIDGET(_main_scrolledwin) + , INIT_WIDGET(_main_win) + , INIT_WIDGET(_main_xrun_progress) + , INIT_WIDGET(_menu_file_quit) + , INIT_WIDGET(_menu_help_about) + , INIT_WIDGET(_menu_jack_connect) + , INIT_WIDGET(_menu_jack_disconnect) + , INIT_WIDGET(_menu_jack_settings) + , INIT_WIDGET(_menu_store_positions) + , INIT_WIDGET(_menu_view_arrange) + , INIT_WIDGET(_menu_view_messages) + , INIT_WIDGET(_menu_view_refresh) + , INIT_WIDGET(_menu_view_toolbar) + , INIT_WIDGET(_messages_expander) + , INIT_WIDGET(_play_but) + , INIT_WIDGET(_rewind_but) + , INIT_WIDGET(_sample_rate_label) + , INIT_WIDGET(_status_text) + , INIT_WIDGET(_stop_but) + , INIT_WIDGET(_toolbar) + , INIT_WIDGET(_toolbars_box) + , INIT_WIDGET(_zoom_full_but) + , INIT_WIDGET(_zoom_normal_but) { _settings_filename = getenv("HOME"); _settings_filename += "/.patchagerc"; - _state_manager = new StateManager(); _canvas = boost::shared_ptr(new PatchageCanvas(this, 1600*2, 1200*2)); + _jack_driver = new JackDriver(this); _jack_driver->signal_detached.connect(sigc::mem_fun(this, &Patchage::queue_refresh)); @@ -106,54 +143,12 @@ Patchage::Patchage(int argc, char** argv) _lash_driver = new LashDriver(this, argc, argv); #endif - xml->get_widget("patchage_win", _main_window); xml->get_widget_derived("jack_settings_win", _jack_settings_dialog); - xml->get_widget("about_win", _about_window); - xml->get_widget("jack_settings_menuitem", _menu_jack_settings); - xml->get_widget("connect_to_jack_menuitem", _menu_jack_connect); - xml->get_widget("disconnect_from_jack_menuitem", _menu_jack_disconnect); -#ifdef HAVE_LASH - xml->get_widget("open_session_menuitem", _menu_open_session); - xml->get_widget("save_session_menuitem", _menu_save_session); - xml->get_widget("save_session_as_menuitem", _menu_save_session_as); - xml->get_widget("close_session_menuitem", _menu_close_session); - xml->get_widget("connect_to_lash_menuitem", _menu_lash_connect); - xml->get_widget("disconnect_from_lash_menuitem", _menu_lash_disconnect); -#endif -#ifdef HAVE_ALSA - xml->get_widget("connect_to_alsa_menuitem", _menu_alsa_connect); - xml->get_widget("disconnect_from_alsa_menuitem", _menu_alsa_disconnect); -#endif - xml->get_widget("store_positions_menuitem", _menu_store_positions); - xml->get_widget("file_quit_menuitem", _menu_file_quit); - xml->get_widget("view_refresh_menuitem", _menu_view_refresh); - xml->get_widget("view_arrange_menuitem", _menu_view_arrange); - xml->get_widget("view_messages_menuitem", _menu_view_messages); - 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("status_text", _status_text); - xml->get_widget("main_paned", _main_paned); - xml->get_widget("messages_expander", _messages_expander); - xml->get_widget("rewind_but", _rewind_button); - xml->get_widget("play_but", _play_button); - xml->get_widget("stop_but", _stop_button); - xml->get_widget("zoom_full_but", _zoom_full_button); - xml->get_widget("zoom_normal_but", _zoom_normal_button); - //xml->get_widget("main_statusbar", _status_bar); - //xml->get_widget("main_load_progress", _load_progress_bar); - //xml->get_widget("main_jack_connect_toggle", _jack_connect_toggle); - //xml->get_widget("main_jack_realtime_check", _jack_realtime_check); - xml->get_widget("main_buffer_size_combo", _buffer_size_combo); - xml->get_widget("main_xrun_progress", _xrun_progress_bar); - xml->get_widget("main_clear_load_button", _clear_load_button); + _about_win->property_program_name() = "Patchage"; gtkmm_set_width_for_given_text(*_buffer_size_combo, "4096 frames", 40); - _canvas_scrolledwindow->add(*_canvas); + _main_scrolledwin->add(*_canvas); _canvas->scroll_to(static_cast(_canvas->width()/2 - 320), static_cast(_canvas->height()/2 - 240)); // FIXME: hardcoded @@ -164,17 +159,17 @@ Patchage::Patchage(int argc, char** argv) _buffer_size_combo->signal_changed().connect( sigc::mem_fun(this, &Patchage::buffer_size_changed)); - _rewind_button->signal_clicked().connect( + _rewind_but->signal_clicked().connect( sigc::mem_fun(_jack_driver, &JackDriver::rewind_transport)); - _play_button->signal_clicked().connect( + _play_but->signal_clicked().connect( sigc::mem_fun(_jack_driver, &JackDriver::start_transport)); - _stop_button->signal_clicked().connect( + _stop_but->signal_clicked().connect( sigc::mem_fun(_jack_driver, &JackDriver::stop_transport)); - _clear_load_button->signal_clicked().connect( + _clear_load_but->signal_clicked().connect( sigc::mem_fun(this, &Patchage::clear_load)); - _zoom_normal_button->signal_clicked().connect(sigc::bind( + _zoom_normal_but->signal_clicked().connect(sigc::bind( sigc::mem_fun(this, &Patchage::zoom), 1.0)); - _zoom_full_button->signal_clicked().connect( + _zoom_full_but->signal_clicked().connect( sigc::mem_fun(_canvas.get(), &PatchageCanvas::zoom_full)); _menu_jack_settings->signal_activate().connect(sigc::hide_return( sigc::mem_fun(_jack_settings_dialog, &JackSettingsDialog::run))); @@ -206,29 +201,29 @@ Patchage::Patchage(int argc, char** argv) #endif _menu_store_positions->signal_activate().connect( - sigc::mem_fun(this, &Patchage::menu_store_positions)); + sigc::mem_fun(this, &Patchage::on_store_positions)); _menu_file_quit->signal_activate().connect( - sigc::mem_fun(this, &Patchage::menu_file_quit)); + sigc::mem_fun(this, &Patchage::on_quit)); _menu_view_refresh->signal_activate().connect( sigc::mem_fun(this, &Patchage::refresh)); _menu_view_arrange->signal_activate().connect( - sigc::mem_fun(this, &Patchage::menu_view_arrange)); + sigc::mem_fun(this, &Patchage::on_arrange)); _menu_view_toolbar->signal_activate().connect( - sigc::mem_fun(this, &Patchage::view_toolbar_toggled)); + sigc::mem_fun(this, &Patchage::on_view_toolbar)); _menu_view_messages->signal_toggled().connect( - sigc::mem_fun(this, &Patchage::show_messages_toggled)); + sigc::mem_fun(this, &Patchage::on_show_messages)); _menu_help_about->signal_activate().connect( - sigc::mem_fun(this, &Patchage::menu_help_about)); + sigc::mem_fun(this, &Patchage::on_help_about)); connect_widgets(); update_state(); _canvas->show(); - _main_window->present(); + _main_win->present(); _update_pane_position = false; _main_paned->set_position(max_pane_position()); - _user_pane_position = max_pane_position() - _main_window->get_height()/8; + _user_pane_position = max_pane_position() - _main_win->get_height()/8; _messages_expander->set_expanded(false); _pane_closed = true; @@ -355,15 +350,15 @@ Patchage::update_load() const float buffer_size = _jack_driver->buffer_size(); const float period = buffer_size / sample_rate * 1000000; // usec - _xrun_progress_bar->set_fraction(max_delay / period); + _main_xrun_progress->set_fraction(max_delay / period); char tmp_buf[8]; snprintf(tmp_buf, 8, "%zd", _jack_driver->xruns()); - _xrun_progress_bar->set_text(string(tmp_buf) + " Dropouts"); + _main_xrun_progress->set_text(string(tmp_buf) + " Dropouts"); if (max_delay > period) { - _xrun_progress_bar->set_fraction(1.0); + _main_xrun_progress->set_fraction(1.0); _jack_driver->reset_delay(); } @@ -393,18 +388,36 @@ Patchage::zoom_changed() } } - + void -Patchage::update_state() +Patchage::refresh() { - for (ItemList::iterator i = _canvas->items().begin(); i != _canvas->items().end(); ++i) { - SharedPtr module = PtrCast(*i); - if (module) - module->load_location(); + assert(_canvas); + + if (_enable_refresh) { + + _canvas->destroy(); + + if (_jack_driver) + _jack_driver->refresh(); + +#ifdef HAVE_ALSA + if (_alsa_driver) + _alsa_driver->refresh(); +#endif } } +void +Patchage::clear_load() +{ + _main_xrun_progress->set_fraction(0.0); + _jack_driver->reset_xruns(); + _jack_driver->reset_delay(); +} + + void Patchage::status_message(const string& msg) { @@ -416,6 +429,17 @@ Patchage::status_message(const string& msg) } +void +Patchage::update_state() +{ + for (ItemList::iterator i = _canvas->items().begin(); i != _canvas->items().end(); ++i) { + SharedPtr module = PtrCast(*i); + if (module) + module->load_location(); + } +} + + /** Update the sensitivity status of menus to reflect the present. * * (eg. disable "Connect to Jack" when Patchage is already connected to Jack) @@ -425,40 +449,40 @@ Patchage::connect_widgets() { #ifdef HAVE_LASH _lash_driver->signal_attached.connect(sigc::bind( - sigc::mem_fun(_menu_lash_connect, &Gtk::MenuItem::set_sensitive), false)); + sigc::mem_fun(*_menu_lash_connect, &Gtk::MenuItem::set_sensitive), false)); _lash_driver->signal_attached.connect(sigc::bind( - sigc::mem_fun(_menu_lash_disconnect, &Gtk::MenuItem::set_sensitive), true)); + sigc::mem_fun(*_menu_lash_disconnect, &Gtk::MenuItem::set_sensitive), true)); _lash_driver->signal_detached.connect(sigc::bind( - sigc::mem_fun(_menu_lash_connect, &Gtk::MenuItem::set_sensitive), true)); + sigc::mem_fun(*_menu_lash_connect, &Gtk::MenuItem::set_sensitive), true)); _lash_driver->signal_detached.connect(sigc::bind( - sigc::mem_fun(_menu_lash_disconnect, &Gtk::MenuItem::set_sensitive), false)); + sigc::mem_fun(*_menu_lash_disconnect, &Gtk::MenuItem::set_sensitive), false)); #endif _jack_driver->signal_attached.connect( sigc::mem_fun(this, &Patchage::update_toolbar)); _jack_driver->signal_attached.connect(sigc::bind( - sigc::mem_fun(_menu_jack_connect, &Gtk::MenuItem::set_sensitive), false)); + sigc::mem_fun(*_menu_jack_connect, &Gtk::MenuItem::set_sensitive), false)); _jack_driver->signal_attached.connect( sigc::mem_fun(this, &Patchage::refresh)); _jack_driver->signal_attached.connect(sigc::bind( - sigc::mem_fun(_menu_jack_disconnect, &Gtk::MenuItem::set_sensitive), true)); + sigc::mem_fun(*_menu_jack_disconnect, &Gtk::MenuItem::set_sensitive), true)); _jack_driver->signal_detached.connect(sigc::bind( - sigc::mem_fun(_menu_jack_connect, &Gtk::MenuItem::set_sensitive), true)); + sigc::mem_fun(*_menu_jack_connect, &Gtk::MenuItem::set_sensitive), true)); _jack_driver->signal_detached.connect(sigc::bind( - sigc::mem_fun(_menu_jack_disconnect, &Gtk::MenuItem::set_sensitive), false)); + sigc::mem_fun(*_menu_jack_disconnect, &Gtk::MenuItem::set_sensitive), false)); #ifdef HAVE_ALSA _alsa_driver->signal_attached.connect(sigc::bind( - sigc::mem_fun(_menu_alsa_connect, &Gtk::MenuItem::set_sensitive), false)); + sigc::mem_fun(*_menu_alsa_connect, &Gtk::MenuItem::set_sensitive), false)); _alsa_driver->signal_attached.connect(sigc::bind( - sigc::mem_fun(_menu_alsa_disconnect, &Gtk::MenuItem::set_sensitive), true)); + sigc::mem_fun(*_menu_alsa_disconnect, &Gtk::MenuItem::set_sensitive), true)); _alsa_driver->signal_detached.connect(sigc::bind( - sigc::mem_fun(_menu_alsa_connect, &Gtk::MenuItem::set_sensitive), true)); + sigc::mem_fun(*_menu_alsa_connect, &Gtk::MenuItem::set_sensitive), true)); _alsa_driver->signal_detached.connect(sigc::bind( - sigc::mem_fun(_menu_alsa_disconnect, &Gtk::MenuItem::set_sensitive), false)); + sigc::mem_fun(*_menu_alsa_disconnect, &Gtk::MenuItem::set_sensitive), false)); #endif } @@ -467,7 +491,7 @@ Patchage::connect_widgets() void Patchage::menu_open_session() { - Gtk::FileChooserDialog dialog(*_main_window, "Open LASH Session", + Gtk::FileChooserDialog dialog(*_main_win, "Open LASH Session", Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER); dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); @@ -495,7 +519,7 @@ Patchage::menu_save_session_as() if (!_lash_driver) return; - Gtk::FileChooserDialog dialog(*_main_window, "Save LASH Session", + Gtk::FileChooserDialog dialog(*_main_win, "Save LASH Session", Gtk::FILE_CHOOSER_ACTION_SAVE); dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); @@ -547,30 +571,12 @@ Patchage::menu_alsa_disconnect() } #endif -void -Patchage::menu_store_positions() -{ - _state_manager->save(_settings_filename); -} - - -void -Patchage::menu_file_quit() -{ -#ifdef HAVE_ALSA - _alsa_driver->detach(); -#endif - _jack_driver->detach(); - _main_window->hide(); -} - void Patchage::on_pane_position_changed() { - // avoid infinite recursion... if (!_update_pane_position) - return; + return; // avoid infinite recursion ... _update_pane_position = false; @@ -591,7 +597,7 @@ Patchage::on_pane_position_changed() _main_paned->set_position(max_pane_position()); // ... here _menu_view_messages->set_active(false); - _user_pane_position = max_pane_position() - _main_window->get_height()/8; + _user_pane_position = max_pane_position() - _main_win->get_height()/8; } _update_pane_position = true; @@ -621,44 +627,49 @@ Patchage::on_messages_expander_changed() void -Patchage::show_messages_toggled() +Patchage::on_arrange() { - if (_update_pane_position) - _messages_expander->set_expanded(_menu_view_messages->get_active()); + assert(_canvas); + + _canvas->arrange(); } - + void -Patchage::refresh() +Patchage::on_help_about() { - assert(_canvas); - - if (_enable_refresh) { - - _canvas->destroy(); - - if (_jack_driver) - _jack_driver->refresh(); + _about_win->run(); + _about_win->hide(); +} +void +Patchage::on_quit() +{ #ifdef HAVE_ALSA - if (_alsa_driver) - _alsa_driver->refresh(); + _alsa_driver->detach(); #endif - } + _jack_driver->detach(); + _main_win->hide(); } - + void -Patchage::menu_view_arrange() +Patchage::on_show_messages() { - assert(_canvas); + if (_update_pane_position) + _messages_expander->set_expanded(_menu_view_messages->get_active()); +} + - _canvas->arrange(); +void +Patchage::on_store_positions() +{ + _state_manager->save(_settings_filename); } void -Patchage::view_toolbar_toggled() +Patchage::on_view_toolbar() { _update_pane_position = false; @@ -671,22 +682,6 @@ Patchage::view_toolbar_toggled() } -void -Patchage::menu_help_about() -{ - _about_window->show(); -} - - -void -Patchage::clear_load() -{ - _xrun_progress_bar->set_fraction(0.0); - _jack_driver->reset_xruns(); - _jack_driver->reset_delay(); -} - - void Patchage::buffer_size_changed() { @@ -697,8 +692,6 @@ Patchage::buffer_size_changed() } else { jack_nframes_t buffer_size = 1 << (selected+5); - //cerr << "BS Changed: " << selected << ": " << buffer_size << endl; - if ( ! _jack_driver->set_buffer_size(buffer_size)) update_toolbar(); // reset combo box to actual value } diff --git a/src/Patchage.hpp b/src/Patchage.hpp index 96aa35d..752510b 100644 --- a/src/Patchage.hpp +++ b/src/Patchage.hpp @@ -23,6 +23,7 @@ #include #include #include CONFIG_H_PATH +#include "Widget.hpp" class PatchageCanvas; class JackDriver; @@ -40,8 +41,9 @@ public: boost::shared_ptr canvas() const { return _canvas; } + Gtk::Window* window() { return _main_win.get(); } + StateManager* state_manager() const { return _state_manager; } - Gtk::Window* window() const { return _main_window; } JackDriver* jack_driver() const { return _jack_driver; } #ifdef HAVE_ALSA AlsaDriver* alsa_driver() const { return _alsa_driver; } @@ -51,7 +53,7 @@ public: #endif void attach(); - void quit() { _main_window->hide(); } + void quit() { _main_win->hide(); } void refresh(); inline void queue_refresh() { _refresh = true; } @@ -62,28 +64,26 @@ public: int max_pane_position() { return _main_paned->property_max_position() - - _messages_expander->get_label_widget()->get_height() - 10; + - _messages_expander->get_label_widget()->get_height() - 10; } protected: void connect_widgets(); - void menu_store_positions(); - void menu_file_quit(); - void show_messages_toggled(); - void view_toolbar_toggled(); - void menu_view_arrange(); - void menu_help_about(); + void on_arrange(); + void on_help_about(); + void on_quit(); + void on_show_messages(); + void on_store_positions(); + void on_view_toolbar(); + void zoom(double z); void zoom_changed(); bool idle_callback(); bool update_load(); void update_toolbar(); - //void jack_connect_changed(); void buffer_size_changed(); - //void sample_rate_changed(); - //void realtime_changed(); void on_pane_position_changed(); void on_messages_expander_changed(); @@ -92,26 +92,24 @@ protected: #ifdef HAVE_LASH LashDriver* _lash_driver; - Gtk::MenuItem* _menu_open_session; - Gtk::MenuItem* _menu_save_session; - Gtk::MenuItem* _menu_save_session_as; - Gtk::MenuItem* _menu_close_session; - Gtk::MenuItem* _menu_lash_launch; - Gtk::MenuItem* _menu_lash_connect; - Gtk::MenuItem* _menu_lash_disconnect; + Widget _menu_open_session; + Widget _menu_save_session; + Widget _menu_save_session_as; + Widget _menu_close_session; + Widget _menu_lash_connect; + Widget _menu_lash_disconnect; void menu_open_session(); void menu_save_session(); void menu_save_session_as(); void menu_close_session(); - void menu_lash_launch(); void menu_lash_connect(); void menu_lash_disconnect(); #endif #ifdef HAVE_ALSA AlsaDriver* _alsa_driver; - Gtk::MenuItem* _menu_alsa_connect; - Gtk::MenuItem* _menu_alsa_disconnect; + Widget _menu_alsa_connect; + Widget _menu_alsa_disconnect; void menu_alsa_connect(); void menu_alsa_disconnect(); #endif @@ -130,38 +128,35 @@ protected: bool _update_pane_position; int _user_pane_position; - Gtk::Window* _main_window; JackSettingsDialog* _jack_settings_dialog; - Gtk::AboutDialog* _about_window; - Gtk::MenuItem* _menu_jack_settings; - Gtk::MenuItem* _menu_jack_launch; - Gtk::MenuItem* _menu_jack_connect; - 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; - Gtk::MenuItem* _menu_view_arrange; - Gtk::MenuItem* _menu_help_about; - Gtk::Toolbar* _toolbar; - Gtk::ScrolledWindow* _canvas_scrolledwindow; - //Gtk::HScale* _zoom_slider; - Gtk::TextView* _status_text; - Gtk::Paned* _main_paned; - Gtk::Expander* _messages_expander; - Gtk::Button* _rewind_button; - Gtk::Button* _play_button; - Gtk::Button* _stop_button; - Gtk::ToolButton* _zoom_normal_button; - Gtk::ToolButton* _zoom_full_button; - //Gtk::ProgressBar* _load_progress_bar; - Gtk::ComboBox* _buffer_size_combo; - Gtk::Label* _sample_rate_label; - Gtk::ProgressBar* _xrun_progress_bar; - Gtk::ToolButton* _clear_load_button; - //Gtk::Statusbar* _status_bar; + + Widget _about_win; + Widget _buffer_size_combo; + Widget _clear_load_but; + Widget _main_paned; + Widget _main_scrolledwin; + Widget _main_win; + Widget _main_xrun_progress; + Widget _menu_file_quit; + Widget _menu_help_about; + Widget _menu_jack_connect; + Widget _menu_jack_disconnect; + Widget _menu_jack_settings; + Widget _menu_store_positions; + Widget _menu_view_arrange; + Widget _menu_view_messages; + Widget _menu_view_refresh; + Widget _menu_view_toolbar; + Widget _messages_expander; + Widget _play_but; + Widget _rewind_but; + Widget _sample_rate_label; + Widget _status_text; + Widget _stop_but; + Widget _toolbar; + Widget _toolbars_box; + Widget _zoom_full_but; + Widget _zoom_normal_but; }; #endif // PATCHAGE_H diff --git a/src/Widget.hpp b/src/Widget.hpp new file mode 100644 index 0000000..ea8a218 --- /dev/null +++ b/src/Widget.hpp @@ -0,0 +1,42 @@ +/* This file is part of Patchage + * Copyright (C) 2007 Dave Robillard + * + * 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 3 of the License, or (at your option) + * any later version. + * + * Patchage is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with Patchage. If not, see . + */ + +#ifndef WIDGET_HPP +#define WIDGET_HPP + +#include +#include + +template +class Widget : public boost::noncopyable { +public: + Widget(Glib::RefPtr xml, const std::string& name) { + xml->get_widget(name.c_str(), _me); + } + + W* get() { return _me; } + const W* get() const { return _me; } + W* operator->() { return _me; } + const W* operator->() const { return _me; } + W& operator*() { return *_me; } + const W& operator*() const { return *_me; } + +private: + W* _me; +}; + +#endif // WIDGET_HPP diff --git a/src/patchage.glade b/src/patchage.glade index daeabf9..8ab3068 100644 --- a/src/patchage.glade +++ b/src/patchage.glade @@ -2,7 +2,7 @@ - + 1 Patchage 640 @@ -22,7 +22,7 @@ - + True _Open Project True @@ -38,7 +38,7 @@ - + True _Save Project True @@ -54,7 +54,7 @@ - + True Save Project _As... True @@ -70,7 +70,7 @@ - + True _Close Project True @@ -90,7 +90,7 @@ - + True Store the current module positions as the defaults _Save Layout as Default @@ -111,7 +111,7 @@ - + True gtk-quit True @@ -124,14 +124,14 @@ - + True _System True - + True Jack _Settings True @@ -152,11 +152,11 @@ - + True Connect to _JACK True - + @@ -168,7 +168,7 @@ - + True False Disconnect from JACK @@ -190,11 +190,11 @@ - + True Connect to _ALSA True - + @@ -206,12 +206,12 @@ - + True False Disconnect from ALSA True - + @@ -228,11 +228,11 @@ - + True Connect to _LASH True - + @@ -244,12 +244,12 @@ - + True False Disconnect from LASH True - + @@ -272,17 +272,17 @@ - + True _Toolbar True True - + - + True View "console" messages _Messages @@ -292,7 +292,7 @@ - + True _Refresh True @@ -308,12 +308,12 @@ - + True Automatically organize canvas _Arrange True - + @@ -336,7 +336,7 @@ - + True gtk-about True @@ -355,7 +355,7 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -386,7 +386,7 @@ - + True 1 32 frames @@ -408,7 +408,7 @@ - + 48 @@ -450,7 +450,7 @@ - + True gtk-clear @@ -694,7 +694,7 @@ The bar represents the maximum processing delay as a fraction of the time availa True True - + True True True @@ -878,7 +878,7 @@ along with Patchage; if not, write to the Free Software Foundation, Inc., True GTK_BUTTONBOX_END - + True True gtk-cancel @@ -887,7 +887,7 @@ along with Patchage; if not, write to the Free Software Foundation, Inc., - + True True True diff --git a/src/patchage.svg b/src/patchage.svg new file mode 120000 index 0000000..88500da --- /dev/null +++ b/src/patchage.svg @@ -0,0 +1 @@ +../icons/48x48/patchage.svg \ No newline at end of file -- cgit v1.2.1