re-group preferences part one of 27 (probably)
This commit is contained in:
parent
a3b72d52a6
commit
0abc970ced
|
@ -3338,14 +3338,6 @@ if (!ARDOUR::Profile->get_mixbus()) {
|
||||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_tooltips)
|
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_tooltips)
|
||||||
));
|
));
|
||||||
|
|
||||||
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"),
|
add_option (S_("Preferences|GUI"),
|
||||||
new BoolOption (
|
new BoolOption (
|
||||||
"super-rapid-clock-update",
|
"super-rapid-clock-update",
|
||||||
|
@ -3354,6 +3346,15 @@ if (!ARDOUR::Profile->get_mixbus()) {
|
||||||
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_super_rapid_clock_update)
|
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__
|
#ifndef __APPLE__
|
||||||
/* font scaling does nothing with GDK/Quartz */
|
/* font scaling does nothing with GDK/Quartz */
|
||||||
add_option (S_("Preferences|GUI"), new FontScalingOptions ());
|
add_option (S_("Preferences|GUI"), new FontScalingOptions ());
|
||||||
|
@ -3389,6 +3390,33 @@ if (!ARDOUR::Profile->get_mixbus()) {
|
||||||
add_option (S_("Preferences|GUI"), slts);
|
add_option (S_("Preferences|GUI"), slts);
|
||||||
} // !mixbus
|
} // !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
|
/* The names of these controls must be the same as those given in MixerStrip
|
||||||
for the actual widgets being controlled.
|
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_("Comments"), _("Comments"));
|
||||||
_mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns"));
|
_mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns"));
|
||||||
|
|
||||||
add_option (
|
add_option (_("GUI/Mixer"),
|
||||||
S_("Preferences|GUI"),
|
|
||||||
new VisibilityOption (
|
new VisibilityOption (
|
||||||
_("Mixer Strip"),
|
_("Mixer Strip"),
|
||||||
&_mixer_strip_visibility,
|
&_mixer_strip_visibility,
|
||||||
|
@ -3410,7 +3437,7 @@ if (!ARDOUR::Profile->get_mixbus()) {
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
add_option (S_("Preferences|GUI"),
|
add_option (_("GUI/Mixer"),
|
||||||
new BoolOption (
|
new BoolOption (
|
||||||
"default-narrow_ms",
|
"default-narrow_ms",
|
||||||
_("Use narrow strips in the mixer by default"),
|
_("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)
|
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_default_narrow_ms)
|
||||||
));
|
));
|
||||||
|
|
||||||
|
add_option (_("GUI/Mixer"), new OptionEditorBlank ());
|
||||||
|
|
||||||
#ifdef ENABLE_NLS
|
#ifdef ENABLE_NLS
|
||||||
OptionEditorHeading* i18n_head = new OptionEditorHeading (_("Internationalization"));
|
OptionEditorHeading* i18n_head = new OptionEditorHeading (_("Internationalization"));
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,6 @@ using namespace ARDOUR_UI_UTILS;
|
||||||
|
|
||||||
ThemeManager::ThemeManager()
|
ThemeManager::ThemeManager()
|
||||||
{
|
{
|
||||||
Gtk::HBox* hbox;
|
|
||||||
BoolOption* bo;
|
BoolOption* bo;
|
||||||
|
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
|
@ -95,33 +94,6 @@ ThemeManager::ThemeManager()
|
||||||
"This requires a restart of %1 to take effect"), PROGRAM_NAME));
|
"This requires a restart of %1 to take effect"), PROGRAM_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
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 (
|
bo = new BoolOption (
|
||||||
"flat-buttons",
|
"flat-buttons",
|
||||||
_("Draw \"flat\" buttons"),
|
_("Draw \"flat\" buttons"),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user