X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_option_editor.cc;h=1815db10567e21f60c288ae81011e5fe0f59c1e1;hb=04bf9d1e9594688db4a69c3660feef2efe23945b;hp=b3a19b3b428e71b2f892c821fe3e0609a8d8833e;hpb=4d49961c93fe23dc4f76a5bcb60c93d0c80bcd3c;p=ardour.git

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index b3a19b3b42..1815db1056 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -272,50 +272,61 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
 			    ));
 
-	add_option (_("Misc"), new OptionEditorHeading (_("Meterbridge Options")));
+	add_option (_("Meterbridge"), new OptionEditorHeading (_("Route Display")));
 
-	add_option (_("Misc"), new BoolOption (
+	add_option (_("Meterbridge"), new BoolOption (
 			    "show-midi-on-meterbridge",
-			    _("Include Midi Tracks on Meterbridge"),
+			    _("Show Midi Tracks"),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_midi_on_meterbridge),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_midi_on_meterbridge)
 			    ));
 
-	add_option (_("Misc"), new BoolOption (
+	add_option (_("Meterbridge"), new BoolOption (
 			    "show-busses-on-meterbridge",
-			    _("Include Busses on Meterbridge"),
+			    _("Show Busses"),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_busses_on_meterbridge),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_busses_on_meterbridge)
 			    ));
 
-	add_option (_("Misc"), new BoolOption (
+	add_option (_("Meterbridge"), new BoolOption (
 			    "show-master-on-meterbridge",
-			    _("Include Master Bus on Meterbridge"),
+			    _("Include Master Bus"),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_master_on_meterbridge),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_master_on_meterbridge)
 			    ));
 
-	add_option (_("Misc"), new BoolOption (
+	add_option (_("Meterbridge"), new OptionEditorHeading (_("Button Area")));
+
+	add_option (_("Meterbridge"), new BoolOption (
 			    "show-rec-on-meterbridge",
-			    _("Show Rec-enable Button on Meterbridge"),
+			    _("Rec-enable Button"),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_rec_on_meterbridge),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_rec_on_meterbridge)
 			    ));
 
-	add_option (_("Misc"), new BoolOption (
+	add_option (_("Meterbridge"), new BoolOption (
 			    "show-mute-on-meterbridge",
-			    _("Include Mute Button on Meterbridge"),
+			    _("Mute Button"),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_mute_on_meterbridge),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_mute_on_meterbridge)
 			    ));
 
-	add_option (_("Misc"), new BoolOption (
+	add_option (_("Meterbridge"), new BoolOption (
 			    "show-solo-on-meterbridge",
-			    _("Show Solo Button on Meterbridge"),
+			    _("Solo Button"),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_solo_on_meterbridge),
 			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_solo_on_meterbridge)
 			    ));
 
+	add_option (_("Meterbridge"), new OptionEditorHeading (_("Name Labels")));
+
+	add_option (_("Meterbridge"), new BoolOption (
+			    "show-name-on-meterbridge",
+			    _("Track Name"),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_name_on_meterbridge),
+			    sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_name_on_meterbridge)
+			    ));
+
 }
 
 void