diff options
author | Robin Gareus <robin@gareus.org> | 2016-12-29 23:34:51 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2016-12-29 23:34:51 +0100 |
commit | 0abc970ced53322096d0bf88a3d0c27d5206afd6 (patch) | |
tree | bea0aaafe5d46a32a3d888fe3dce8091242a290a /gtk2_ardour | |
parent | a3b72d52a603e0da7ba94d5650d793f497cc6ac1 (diff) |
re-group preferences part one of 27 (probably)
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 51 | ||||
-rw-r--r-- | gtk2_ardour/theme_manager.cc | 28 |
2 files changed, 40 insertions, 39 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index f0b7be4829..757663b327 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3339,14 +3339,6 @@ if (!ARDOUR::Profile->get_mixbus()) { )); add_option (S_("Preferences|GUI"), - new BoolOption ( - "show-name-highlight", - _("Use name highlight bars in region displays (requires a restart)"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_name_highlight), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight) - )); - - add_option (S_("Preferences|GUI"), new BoolOption ( "super-rapid-clock-update", _("Update transport clock display at FPS instead of every 100ms"), @@ -3354,6 +3346,15 @@ if (!ARDOUR::Profile->get_mixbus()) { sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_super_rapid_clock_update) )); + add_option (S_("Preferences|GUI"), + new BoolOption ( + "blink-rec-arm", + _("Blink Rec-Arm buttons"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_rec_arm), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm) + )); + + #ifndef __APPLE__ /* font scaling does nothing with GDK/Quartz */ add_option (S_("Preferences|GUI"), new FontScalingOptions ()); @@ -3389,6 +3390,33 @@ if (!ARDOUR::Profile->get_mixbus()) { add_option (S_("Preferences|GUI"), slts); } // !mixbus + add_option (_("GUI/Editor"), new OptionEditorHeading (_("Editor UI Options"))); + add_option (_("GUI/Editor"), + new BoolOption ( + "show-name-highlight", + _("Use name highlight bars in region displays (requires a restart)"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_name_highlight), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight) + )); + + add_option (_("GUI/Editor"), + new BoolOption ( + "color-regions-using-track-color", + _("Color regions using their track's color"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_color_regions_using_track_color), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color) + )); + + add_option (_("GUI/Editor"), + new BoolOption ( + "show-waveform-clipping", + _("Show waveform clipping"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveform_clipping), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping) + )); + + add_option (_("GUI/Editor"), new OptionEditorBlank ()); + /* The names of these controls must be the same as those given in MixerStrip for the actual widgets being controlled. */ @@ -3400,8 +3428,7 @@ if (!ARDOUR::Profile->get_mixbus()) { _mixer_strip_visibility.add (0, X_("Comments"), _("Comments")); _mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns")); - add_option ( - S_("Preferences|GUI"), + add_option (_("GUI/Mixer"), new VisibilityOption ( _("Mixer Strip"), &_mixer_strip_visibility, @@ -3410,7 +3437,7 @@ if (!ARDOUR::Profile->get_mixbus()) { ) ); - add_option (S_("Preferences|GUI"), + add_option (_("GUI/Mixer"), new BoolOption ( "default-narrow_ms", _("Use narrow strips in the mixer by default"), @@ -3418,6 +3445,8 @@ if (!ARDOUR::Profile->get_mixbus()) { sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms) )); + add_option (_("GUI/Mixer"), new OptionEditorBlank ()); + #ifdef ENABLE_NLS OptionEditorHeading* i18n_head = new OptionEditorHeading (_("Internationalization")); diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index cc1ba62898..8c33627dc4 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -51,7 +51,6 @@ using namespace ARDOUR_UI_UTILS; ThemeManager::ThemeManager() { - Gtk::HBox* hbox; BoolOption* bo; #ifndef __APPLE__ @@ -96,33 +95,6 @@ ThemeManager::ThemeManager() } bo = new BoolOption ( - "blink-rec-arm", - _("Blink Rec-Arm buttons"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_rec_arm), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm) - ); - bo->add_to_page (this); - bo->set_state_from_config (); - - bo = new BoolOption ( - "color-regions-using-track-color", - _("Color regions using their track's color"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_color_regions_using_track_color), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_color_regions_using_track_color) - ); - bo->add_to_page (this); - bo->set_state_from_config (); - - bo = new BoolOption ( - "show-waveform-clipping", - _("Show waveform clipping"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_waveform_clipping), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_waveform_clipping) - ); - bo->add_to_page (this); - bo->set_state_from_config (); - - bo = new BoolOption ( "flat-buttons", _("Draw \"flat\" buttons"), sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_flat_buttons), |