make more or less all LHS treeviews use the same style

git-svn-id: svn://localhost/ardour2/branches/3.0@13056 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour2_ui_dark_sae.rc.in b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
index 9cf5cbd46b0fa4da71cb1a620f15be97f85c61fa..64ec9120b65d1a211efbd772aebef07afd4f3307 100644 (file)
--- a/gtk2_ardour/ardour2_ui_dark_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
@@ -1434,10 +1434,7 @@ widget "*NamedSelectionDisplay" style:highest "treeview_display"
 widget "*SnapshotDisplay" style:highest "treeview_display"
 widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
+widget "*LHSList" style:highest "treeview_display"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorSmallLabel" style:highest "small_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"

diff --git a/gtk2_ardour/ardour2_ui_light_sae.rc.in b/gtk2_ardour/ardour2_ui_light_sae.rc.in
index 2a6844c6d03baf9a5ff4c3ee5294ebf87e5e1476..2cd6360fc4c307f1232fffc8e040ec88dc13e1c4 100644 (file)
--- a/gtk2_ardour/ardour2_ui_light_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_light_sae.rc.in
@@ -1452,10 +1452,7 @@ widget "*NamedSelectionDisplay" style:highest "treeview_display"
 widget "*SnapshotDisplay" style:highest "treeview_display"
 widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
+widget "*LHSList" style:highest "treeview_display"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorSmallLabel" style:highest "small_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"

diff --git a/gtk2_ardour/ardour3_ui_dark_sae.rc.in b/gtk2_ardour/ardour3_ui_dark_sae.rc.in
index 1cb58e328540f830035705b7b28e9abc3d17f872..fa8d26f35518be6bcf0307fbfd8bd3b065023fac 100644 (file)
--- a/gtk2_ardour/ardour3_ui_dark_sae.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark_sae.rc.in
@@ -1449,10 +1449,7 @@ widget "*NamedSelectionDisplay" style:highest "treeview_display"
 widget "*SnapshotDisplay" style:highest "treeview_display"
 widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
+widget "*LHSList" style:highest "treeview_display"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorSmallLabel" style:highest "small_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"

diff --git a/gtk2_ardour/ardour3_ui_light_sae.rc.in b/gtk2_ardour/ardour3_ui_light_sae.rc.in
index c1b10a40bec43afe7431f74d5e9891d38a6602be..ccbafc9e9271d22a79a39915aafa335720dc6c62 100644 (file)
--- a/gtk2_ardour/ardour3_ui_light_sae.rc.in
+++ b/gtk2_ardour/ardour3_ui_light_sae.rc.in
@@ -1453,10 +1453,7 @@ widget "*NamedSelectionDisplay" style:highest "treeview_display"
 widget "*SnapshotDisplay" style:highest "treeview_display"
 widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
+widget "*LHSList" style:highest "treeview_display"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorSmallLabel" style:highest "small_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"

diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 25a48abbcd3e36361cf140c34c46b1544e7c9684..2d4ed2753081b5f0f35eddf76a02012b7e497ed4 100644 (file)
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -226,10 +226,7 @@ widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
 widget "*PluginSlider" style:highest "plugin_slider"
 widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
-widget "*MixerTrackDisplayList" style:highest "treeview_display"
-widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
-widget "*MixerAuxDisplayList" style:highest "treeview_display"
-widget "*MixerGroupList" style:highest "treeview_display"
+widget "*LHSList" style:highest "treeview_display"
 widget "*RegionEditorLabel" style:highest "medium_text"
 widget "*RegionEditorSmallLabel" style:highest "small_text"
 widget "*RegionEditorEntry" style:highest "medium_entry"

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index f733f3371241dc58bd5681116433c16ae5388930..fc857047813aa9f7ea42c7ee0124c380712f5631 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4394,7 +4394,7 @@ Editor::set_punch_range (framepos_t start, framepos_t end, string cmd)
        Location* tpl;
 
        if ((tpl = transport_punch_location()) == 0) {
-               Location* loc = new Location (*_session, start, end, _("Loop"),  Location::IsAutoPunch);
+               Location* loc = new Location (*_session, start, end, _("Punch"),  Location::IsAutoPunch);
                XMLNode &before = _session->locations()->get_state();
                _session->locations()->add (loc, true);
                _session->set_auto_loop_location (loc);

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index c57d07965f1dc4b58b04eb7a0b189ec0115564b1..bb9b0cf8d96b6e5c3e40166eba6c95bd0aa4dd92 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -79,6 +79,7 @@ EditorRegions::EditorRegions (Editor* e)
 {
        _display.set_size_request (100, -1);
        _display.set_rules_hint (true);
+       _display.set_name ("LHSList");
 
        /* Try to prevent single mouse presses from initiating edits.
           This relies on a hack in gtktreeview.c:gtk_treeview_button_press()

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 242a01358378c03e90ebe6b9f641676ec5b693ff..f453caf831b37576724bc187a9bc532abb2334bb 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -221,7 +221,7 @@ EditorRoutes::EditorRoutes (Editor* e)
        _display.get_selection()->set_mode (SELECTION_SINGLE);
        _display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorRoutes::selection_filter));
        _display.set_reorderable (true);
-       _display.set_name (X_("MixerTrackDisplayList"));
+       _display.set_name (X_("LHSList"));
        _display.set_rules_hint (true);
        _display.set_size_request (100, -1);
        _display.add_object_drag (_columns.route.index(), "routes");

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index a4175e7d911371891ce210dd5413fc250a898283..1babbca55696edb5542810939dd5f411b4ace2b9 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -121,7 +121,7 @@ Mixer_UI::Mixer_UI ()
        group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
        group_display.get_column (0)->set_expand(true);
        group_display.get_column (1)->set_expand(false);
-       group_display.set_name ("MixerGroupList");
+       group_display.set_name ("LHSList");
        group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
        group_display.set_reorderable (true);
        group_display.set_headers_visible (true);
@@ -1773,7 +1773,7 @@ Mixer_UI::setup_track_display ()
        track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
        track_display.get_column (0)->set_expand(true);
        track_display.get_column (1)->set_expand(false);
-       track_display.set_name (X_("MixerTrackDisplayList"));
+       track_display.set_name (X_("LHSList"));
        track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
        track_display.set_reorderable (true);
        track_display.set_headers_visible (true);