diff options
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 56 | ||||
-rw-r--r-- | gtk2_ardour/theme_manager.cc | 41 |
2 files changed, 49 insertions, 48 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 757663b327..e5dffed0ab 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3314,13 +3314,6 @@ if (!ARDOUR::Profile->get_mixbus()) { add_option (S_("Preferences|GUI"), bgo); #endif add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Graphical User Interface"))); - add_option (S_("Preferences|GUI"), - new BoolOption ( - "use-wm-visibility", - _("Use Window Manager/Desktop visibility information"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_wm_visibility), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_wm_visibility) - )); add_option (S_("Preferences|GUI"), new BoolOption ( @@ -3527,6 +3520,55 @@ if (!ARDOUR::Profile->get_mixbus()) { ); add_option (_("GUI/Toolbar"), new OptionEditorBlank ()); + add_option (_("GUI/Quirks"), new OptionEditorHeading (_("Various Quirks for Windowing systems"))); + add_option (_("GUI/Quirks"), + new BoolOption ( + "use-wm-visibility", + _("Use Window Manager/Desktop visibility information"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_wm_visibility), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_wm_visibility) + )); + +#ifndef __APPLE__ + bo = new BoolOption ( + "all-floating-windows-are-dialogs", + _("All floating windows are dialogs"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_all_floating_windows_are_dialogs), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_all_floating_windows_are_dialogs) + ); + Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose ( + _("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\n" + "This may help with some window managers. This requires a restart of %1 to take effect"), + PROGRAM_NAME)); + add_option (_("GUI/Quirks"), bo); + + bo = new BoolOption ( + "transients-follow-front", + _("Transient windows follow front window."), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_transients_follow_front), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_transients_follow_front) + ); + Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose ( + _("Make transient windows follow the front window when toggling between the editor and mixer.\n" + "This requires a restart of %1 to take effect"), PROGRAM_NAME)); + add_option (_("GUI/Quirks"), bo); +#endif + + if (!Profile->get_mixbus()) { + bo = new BoolOption ( + "floating-monitor-section", + _("Float detached monitor-section window"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_floating_monitor_section), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_floating_monitor_section) + ); + Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose ( + _("When detaching the monitoring section, mark it as \"Utility\" window to stay in front.\n" + "This requires a restart of %1 to take effect"), PROGRAM_NAME)); + add_option (_("GUI/Quirks"), bo); + } + + add_option (_("GUI/Quirks"), new OptionEditorBlank ()); + add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering"))); ComboOption<float>* mht = new ComboOption<float> ( diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 8c33627dc4..6a9853717d 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -53,47 +53,6 @@ ThemeManager::ThemeManager() { BoolOption* bo; -#ifndef __APPLE__ - bo = new BoolOption ( - "all-floating-windows-are-dialogs", - _("All floating windows are dialogs"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_all_floating_windows_are_dialogs), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_all_floating_windows_are_dialogs) - ); - bo->add_to_page (this); - bo->set_state_from_config (); - Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose ( - _("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\n" - "This may help with some window managers. This requires a restart of %1 to take effect"), - PROGRAM_NAME)); - - bo = new BoolOption ( - "transients-follow-front", - _("Transient windows follow front window."), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_transients_follow_front), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_transients_follow_front) - ); - bo->add_to_page (this); - bo->set_state_from_config (); - Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose ( - _("Make transient windows follow the front window when toggling between the editor and mixer.\n" - "This requires a restart of %1 to take effect"), PROGRAM_NAME)); -#endif - - if (!Profile->get_mixbus()) { - bo = new BoolOption ( - "floating-monitor-section", - _("Float detached monitor-section window"), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_floating_monitor_section), - sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_floating_monitor_section) - ); - bo->add_to_page (this); - bo->set_state_from_config (); - Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget (), string_compose ( - _("When detaching the monitoring section, mark it as \"Utility\" window to stay in front.\n" - "This requires a restart of %1 to take effect"), PROGRAM_NAME)); - } - bo = new BoolOption ( "flat-buttons", _("Draw \"flat\" buttons"), |