From e98cf169ebe49a0ca5705ed6f059c41edd117ac8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 5 Nov 2010 16:53:57 +0000 Subject: [PATCH] take control of colors in text cell entry-editing widgets (region & route lists) git-svn-id: svn://localhost/ardour2/branches/3.0@7974 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour3_ui_dark.rc.in | 18 +++++++++++++----- gtk2_ardour/editor_regions.cc | 8 ++++++++ gtk2_ardour/editor_routes.cc | 8 ++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index fc33b9327f..0e4a1ff634 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -103,8 +103,8 @@ style "white_tree_view" GtkButton::button_relief = GTK_RELIEF_NONE GtkTreeView::vertical-padding = 0 GtkTreeView::horizontal-padding = 0 -#GtkTreeView::even-row-color = { 0.70, 0.70, 0.70 } -#GtkTreeView::odd-row-color = { 0.64, 0.64, 0.64 } + GtkTreeView::even-row-color = { 0.70, 0.70, 0.70 } + GtkTreeView::odd-row-color = { 0.64, 0.64, 0.64 } fg[NORMAL] = { 0.30, 0.30, 0.40 } fg[ACTIVE] = { 0.30, 0.30, 0.40 } @@ -144,9 +144,6 @@ style "default_base" = "medium_text" GtkButton::button_relief = GTK_RELIEF_NONE GtkTreeView::vertical-padding = 0 GtkTreeView::horizontal-padding = 0 -# GtkTreeView::even-row-color = { 0, 0, 0 } -# GtkTreeView::odd-row-color = { 0.08, 0.10, 0.14 } -# GtkTreeView::even-row-color = { 0.901, 0.870, 0.976} GtkTreeView::even-row-color = { 0.188, 0.208, 0.235} GtkTreeView::odd-row-color = { 0.08, 0.10, 0.14 } @@ -245,6 +242,14 @@ style "default_generic" bg[SELECTED] = { 0.11, 0.15, 0.20 } } +style "text_cell_entry" +{ + font_name = "@FONT_NORMAL@" + GtkWidget::cursor_color = {0, 0, 0 } + text[NORMAL] = { 0.26, 0.26, 0.26 } + base[NORMAL] = { 0.89, 0.89, 0.89 } +} + style "very_small_button" = "default_button" { font_name = "@FONT_SMALLER@" @@ -1849,3 +1854,6 @@ widget "*MidiTracerTextView" style:highest "midi_tracer_textview" widget "*SoloIsolatedLED" style:highest "solo_isolate_led" widget "*SoloSafeLED" style:highest "solo_safe_led" widget "*SoloLEDLabel" style:highest "very_small_text" + +widget "*RouteNameEditorEntry" style:highest "text_cell_entry" +widget "*RegionNameEditorEntry" style:highest "text_cell_entry" diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index fdd5aaae8e..66bb65a740 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -1348,6 +1348,14 @@ void EditorRegions::name_editing_started (CellEditable* ce, const Glib::ustring&) { name_editable = ce; + + /* give it a special name */ + + Gtk::Entry *e = dynamic_cast (ce); + + if (e) { + e->set_name (X_("RegionNameEditorEntry")); + } } void diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 5e037056e7..f8bd503244 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -1319,6 +1319,14 @@ void EditorRoutes::name_edit_started (CellEditable* ce, const Glib::ustring&) { name_editable = ce; + + /* give it a special name */ + + Gtk::Entry *e = dynamic_cast (ce); + + if (e) { + e->set_name (X_("RouteNameEditorEntry")); + } } void -- 2.30.2