diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-22 03:46:09 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-22 03:46:09 +0000 |
commit | 0015553c4a1e24386df60a7a1dc49c2da19794da (patch) | |
tree | f65db5dbf5c2c08e651818b6aeb33d3b3751e2b7 /gtk2_ardour | |
parent | 7689d72875e77e15c87f6c49e8a509cd37925435 (diff) |
tweak startup dialog a bit to correctly save ardour.rc when need; get PROGRAM_NAME into window title bars
git-svn-id: svn://localhost/ardour2/branches/3.0@6781 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/startup.cc | 17 | ||||
-rw-r--r-- | gtk2_ardour/startup.h | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 1a5daf08c3..a6236b2038 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -115,7 +115,7 @@ sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock; ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) - : Gtkmm2ext::UI (X_("gui"), argcp, argvp), + : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp), primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true), secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true), diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 62f57e140c..fb3e950ba2 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -261,6 +261,12 @@ void ArdourStartup::default_dir_changed () { Config->set_default_session_parent_dir (default_dir_chooser->get_current_folder()); + config_changed (); +} + +void +ArdourStartup::config_changed () +{ config_modified = true; } @@ -355,6 +361,15 @@ ArdourStartup::setup_monitor_section_choice_page () VBox* vbox = manage (new VBox); RadioButton::Group g (use_monitor_section_button.get_group()); no_monitor_section_button.set_group (g); + + if (Config->get_use_monitor_bus()) { + use_monitor_section_button.set_active (true); + } else { + no_monitor_section_button.set_active (true); + } + + use_monitor_section_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed)); + no_monitor_section_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed)); monitor_section_label.set_markup("\ When connecting speakers to Ardour, would you prefer to use a monitor bus,\n\ @@ -503,6 +518,8 @@ ArdourStartup::on_apply () Config->set_monitoring_model (SoftwareMonitoring); } + Config->set_use_monitor_bus (use_monitor_section_button.get_active()); + Config->save_state (); } diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h index ae4b17b163..d2aadd62b1 100644 --- a/gtk2_ardour/startup.h +++ b/gtk2_ardour/startup.h @@ -80,6 +80,7 @@ class ArdourStartup : public Gtk::Assistant { bool splash_expose (GdkEventExpose* ev); void setup_first_time_config_page (); + void config_changed (); /* first page */ Gtk::FileChooserButton* default_dir_chooser; |