From 4f77bf201ec36d04305421202ba1c971862c579a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 20 Jul 2012 01:47:27 +0000 Subject: 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 --- gtk2_ardour/ardour2_ui_dark_sae.rc.in | 5 +---- gtk2_ardour/ardour2_ui_light_sae.rc.in | 5 +---- gtk2_ardour/ardour3_ui_dark_sae.rc.in | 5 +---- gtk2_ardour/ardour3_ui_light_sae.rc.in | 5 +---- gtk2_ardour/ardour3_widget_list.rc | 5 +---- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor_regions.cc | 1 + gtk2_ardour/editor_routes.cc | 2 +- gtk2_ardour/mixer_ui.cc | 4 ++-- 9 files changed, 10 insertions(+), 24 deletions(-) diff --git a/gtk2_ardour/ardour2_ui_dark_sae.rc.in b/gtk2_ardour/ardour2_ui_dark_sae.rc.in index 9cf5cbd46b..64ec9120b6 100644 --- 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 2a6844c6d0..2cd6360fc4 100644 --- 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 1cb58e3285..fa8d26f355 100644 --- 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 c1b10a40be..ccbafc9e92 100644 --- 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 25a48abbcd..2d4ed27530 100644 --- 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 f733f33712..fc85704781 100644 --- 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 c57d07965f..bb9b0cf8d9 100644 --- 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 242a013583..f453caf831 100644 --- 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 a4175e7d91..1babbca556 100644 --- 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); -- cgit v1.2.3