From f2c31a3098addc1ef2731e4db7132a821302bbc4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 24 Jan 2017 17:35:07 +0100 Subject: re-fine preferences dialog part 13 of 27 (probably): * expose try-autostart engine * move Session settings to sub-menu (general was getting to large) --- gtk2_ardour/rc_option_editor.cc | 93 +++++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 41 deletions(-) (limited to 'gtk2_ardour/rc_option_editor.cc') diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 45f0f97845..d724e208f5 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2163,50 +2163,14 @@ RCOptionEditor::RCOptionEditor () _("Increasing the cache size uses more memory to store waveform images, which can improve graphical performance.")); add_option (_("General"), sics); - add_option (_("General"), new OptionEditorHeading (S_("Options|Undo"))); - - add_option (_("General"), new UndoOptions (_rc_config)); - - add_option (_("General"), - new BoolOption ( - "verify-remove-last-capture", - _("Verify removal of last capture"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_verify_remove_last_capture), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture) - )); - - add_option (_("General"), new OptionEditorHeading (_("Session Management"))); + add_option (_("General"), new OptionEditorHeading (_("Engine"))); add_option (_("General"), new BoolOption ( - "periodic-safety-backups", - _("Make periodic backups of the session file"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_periodic_safety_backups), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups) - )); - - add_option (_("General"), - new BoolOption ( - "only-copy-imported-files", - _("Always copy imported files"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_only_copy_imported_files), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files) - )); - - add_option (_("General"), new DirectoryOption ( - X_("default-session-parent-dir"), - _("Default folder for new sessions:"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir) - )); - - add_option (_("General"), - new SpinOption ( - "max-recent-sessions", - _("Maximum number of recent sessions"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions), - 0, 1000, 1, 20 + "try-autostart-engine", + _("Try to auto-launch audio/midi engine"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_try_autostart_engine), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_try_autostart_engine) )); add_option (_("General"), new OptionEditorHeading (_("Automation"))); @@ -2260,6 +2224,53 @@ RCOptionEditor::RCOptionEditor () add_option (_("General"), slts); } // !mixbus + add_option (_("General/Session"), new OptionEditorHeading (S_("Options|Undo"))); + + add_option (_("General/Session"), new UndoOptions (_rc_config)); + + add_option (_("General/Session"), + new BoolOption ( + "verify-remove-last-capture", + _("Verify removal of last capture"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_verify_remove_last_capture), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture) + )); + + add_option (_("General/Session"), new OptionEditorHeading (_("Session Management"))); + + add_option (_("General/Session"), + new BoolOption ( + "periodic-safety-backups", + _("Make periodic backups of the session file"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_periodic_safety_backups), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups) + )); + + add_option (_("General/Session"), + new BoolOption ( + "only-copy-imported-files", + _("Always copy imported files"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_only_copy_imported_files), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_only_copy_imported_files) + )); + + add_option (_("General/Session"), new DirectoryOption ( + X_("default-session-parent-dir"), + _("Default folder for new sessions:"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_default_session_parent_dir), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir) + )); + + add_option (_("General/Session"), + new SpinOption ( + "max-recent-sessions", + _("Maximum number of recent sessions"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions), + 0, 1000, 1, 20 + )); + + #ifdef ENABLE_NLS add_option (_("General/Translation"), new OptionEditorHeading (_("Internationalization"))); -- cgit v1.2.3