summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-10-10 22:46:21 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-10-10 22:46:21 +0000
commitd5b5c78e0ed9379ea72f6699c3a45c3f7f87a4e9 (patch)
treef390135d49d4a4797a0853fe618114afca3d5093
parent80079398397f6a89fa8054ffc7732511bf8a70df (diff)
move sync-frame-rate option to Transport tab, rename "Interface" tab as "GUI"
git-svn-id: svn://localhost/ardour2/branches/3.0@13234 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/rc_option_editor.cc38
1 files changed, 19 insertions, 19 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index b298e79880..52033356e7 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -885,17 +885,6 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Misc"), procs);
}
- add_option (_("Misc"), new OptionEditorHeading (S_("Sync/Slave")));
-
- BoolOption* tsf = new BoolOption (
- "timecode-sync-frame-rate",
- _("Force Ardour's timecode rate to match timecode master"),
- sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
- sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
- );
- tsf->set_note (_("If off, Ardour will chase the master but will use its own timecode frame rate"));
- add_option (_("Misc"), tsf);
-
add_option (_("Misc"), new OptionEditorHeading (S_("Options|Undo")));
add_option (_("Misc"), new UndoOptions (_rc_config));
@@ -1023,6 +1012,17 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
));
+ add_option (_("Transport"), new OptionEditorHeading (S_("Sync/Slave")));
+
+ BoolOption* tsf = new BoolOption (
+ "timecode-sync-frame-rate",
+ _("Force Ardour's timecode rate to match timecode master"),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::get_timecode_sync_frame_rate),
+ sigc::mem_fun (*_rc_config, &RCConfiguration::set_timecode_sync_frame_rate)
+ );
+ tsf->set_note (_("If off, Ardour will chase the master but will use its own timecode frame rate"));
+ add_option (_("Transport"), tsf);
+
/* EDITOR */
add_option (_("Editor"),
@@ -1565,7 +1565,7 @@ RCOptionEditor::RCOptionEditor ()
/* INTERFACE */
- add_option (S_("Visual|Interface"),
+ add_option (S_("GUI"),
new BoolOption (
"widget-prelight",
_("Graphically indicate mouse pointer hovering over various widgets"),
@@ -1575,9 +1575,9 @@ RCOptionEditor::RCOptionEditor ()
#ifndef GTKOSX
/* font scaling does nothing with GDK/Quartz */
- add_option (S_("Visual|Interface"), new FontScalingOptions (_rc_config));
+ add_option (S_("GUI"), new FontScalingOptions (_rc_config));
#endif
- add_option (S_("Visual|Interface"),
+ add_option (S_("GUI"),
new BoolOption (
"use-own-plugin-gui",
_("Use plugins' own interfaces instead of Ardour's"),
@@ -1596,7 +1596,7 @@ RCOptionEditor::RCOptionEditor ()
_mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
add_option (
- S_("Visual|Interface"),
+ S_("GUI"),
new VisibilityOption (
_("Mixer Strip"),
&_mixer_strip_visibility,
@@ -1605,7 +1605,7 @@ RCOptionEditor::RCOptionEditor ()
)
);
- add_option (S_("Visual|Interface"),
+ add_option (S_("GUI"),
new BoolOption (
"default-narrow_ms",
_("Use narrow strips in the mixer by default"),
@@ -1613,7 +1613,7 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
));
- add_option (S_("Visual|Interface"), new OptionEditorHeading (_("Metering")));
+ add_option (S_("GUI"), new OptionEditorHeading (_("Metering")));
ComboOption<float>* mht = new ComboOption<float> (
"meter-hold",
@@ -1627,7 +1627,7 @@ RCOptionEditor::RCOptionEditor ()
mht->add (MeterHoldMedium, _("medium"));
mht->add (MeterHoldLong, _("long"));
- add_option (S_("Visual|Interface"), mht);
+ add_option (S_("GUI"), mht);
ComboOption<float>* mfo = new ComboOption<float> (
"meter-falloff",
@@ -1644,7 +1644,7 @@ RCOptionEditor::RCOptionEditor ()
mfo->add (METER_FALLOFF_FASTER, _("faster"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
- add_option (S_("Visual|Interface"), mfo);
+ add_option (S_("GUI"), mfo);
}
void