summaryrefslogtreecommitdiff
path: root/gtk2_ardour/session_option_editor.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-06-29 14:31:45 +0200
committerRobin Gareus <robin@gareus.org>2014-06-29 16:11:46 +0200
commitcbdeaefa1cb9a50eebb2f33aadca2758f4e208aa (patch)
tree429afae0f5f984a2c2cc646bfe008a65fef636fc /gtk2_ardour/session_option_editor.cc
parent367b64c1413e3dd3a8b0864b6fa78464ad962e3a (diff)
re-arrange tabs in Session > Properties dialog (Misc is last)
Diffstat (limited to 'gtk2_ardour/session_option_editor.cc')
-rw-r--r--gtk2_ardour/session_option_editor.cc100
1 files changed, 50 insertions, 50 deletions
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index defb2e59e8..51f30b6a61 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -265,56 +265,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
sigc::mem_fun (*this, &SessionOptionEditor::get_use_monitor_section),
sigc::mem_fun (*this, &SessionOptionEditor::set_use_monitor_section)
));
-
- /* Misc */
-
- add_option (_("Misc"), new OptionEditorHeading (_("MIDI Options")));
-
- add_option (_("Misc"), new BoolOption (
- "midi-copy-is-fork",
- _("MIDI region copies are independent"),
- sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_copy_is_fork),
- sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_copy_is_fork)
- ));
-
- ComboOption<InsertMergePolicy>* li = new ComboOption<InsertMergePolicy> (
- "insert-merge-policy",
- _("Policy for handling overlapping notes\n on the same MIDI channel"),
- sigc::mem_fun (*_session_config, &SessionConfiguration::get_insert_merge_policy),
- sigc::mem_fun (*_session_config, &SessionConfiguration::set_insert_merge_policy)
- );
-
- li->add (InsertMergeReject, _("never allow them"));
- li->add (InsertMergeRelax, _("don't do anything in particular"));
- li->add (InsertMergeReplace, _("replace any overlapped existing note"));
- li->add (InsertMergeTruncateExisting, _("shorten the overlapped existing note"));
- li->add (InsertMergeTruncateAddition, _("shorten the overlapping new note"));
- li->add (InsertMergeExtend, _("replace both overlapping notes with a single note"));
-
- add_option (_("Misc"), li);
-
- add_option (_("Misc"), new OptionEditorHeading (_("Glue to bars and beats")));
-
- add_option (_("Misc"), new BoolOption (
- "glue-new-markers-to-bars-and-beats",
- _("Glue new markers to bars and beats"),
- sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_markers_to_bars_and_beats),
- sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_markers_to_bars_and_beats)
- ));
-
- add_option (_("Misc"), new BoolOption (
- "glue-new-regions-to-bars-and-beats",
- _("Glue new regions to bars and beats"),
- sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_regions_to_bars_and_beats),
- sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
- ));
-
- add_option (_("Misc"), new OptionEditorHeading (_("Defaults")));
-
- Gtk::Button* btn = Gtk::manage (new Gtk::Button (_("Use these settings as defaults")));
- btn->signal_clicked().connect (sigc::mem_fun (*this, &SessionOptionEditor::save_defaults));
- add_option (_("Misc"), new FooOption (btn));
-
+ /* Meterbridge */
add_option (_("Meterbridge"), new OptionEditorHeading (_("Route Display")));
add_option (_("Meterbridge"), new BoolOption (
@@ -377,6 +328,55 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_name_on_meterbridge)
));
+ /* Misc */
+
+ add_option (_("Misc"), new OptionEditorHeading (_("MIDI Options")));
+
+ add_option (_("Misc"), new BoolOption (
+ "midi-copy-is-fork",
+ _("MIDI region copies are independent"),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_copy_is_fork),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_copy_is_fork)
+ ));
+
+ ComboOption<InsertMergePolicy>* li = new ComboOption<InsertMergePolicy> (
+ "insert-merge-policy",
+ _("Policy for handling overlapping notes\n on the same MIDI channel"),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::get_insert_merge_policy),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::set_insert_merge_policy)
+ );
+
+ li->add (InsertMergeReject, _("never allow them"));
+ li->add (InsertMergeRelax, _("don't do anything in particular"));
+ li->add (InsertMergeReplace, _("replace any overlapped existing note"));
+ li->add (InsertMergeTruncateExisting, _("shorten the overlapped existing note"));
+ li->add (InsertMergeTruncateAddition, _("shorten the overlapping new note"));
+ li->add (InsertMergeExtend, _("replace both overlapping notes with a single note"));
+
+ add_option (_("Misc"), li);
+
+ add_option (_("Misc"), new OptionEditorHeading (_("Glue to bars and beats")));
+
+ add_option (_("Misc"), new BoolOption (
+ "glue-new-markers-to-bars-and-beats",
+ _("Glue new markers to bars and beats"),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_markers_to_bars_and_beats),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_markers_to_bars_and_beats)
+ ));
+
+ add_option (_("Misc"), new BoolOption (
+ "glue-new-regions-to-bars-and-beats",
+ _("Glue new regions to bars and beats"),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_regions_to_bars_and_beats),
+ sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
+ ));
+
+ add_option (_("Misc"), new OptionEditorHeading (_("Defaults")));
+
+ Gtk::Button* btn = Gtk::manage (new Gtk::Button (_("Use these settings as defaults")));
+ btn->signal_clicked().connect (sigc::mem_fun (*this, &SessionOptionEditor::save_defaults));
+ add_option (_("Misc"), new FooOption (btn));
+
}
void