From 8b7df135b1cd4b09f67085cfbe0682229d19fae2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 15 Aug 2017 10:45:47 -0400 Subject: [PATCH] put a frame around template description, change background color --- gtk2_ardour/clearlooks.rc.in | 14 +++++++++++++- gtk2_ardour/session_dialog.cc | 9 ++++++--- gtk2_ardour/session_dialog.h | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in index 11f39ca67c..0d0e7a51ea 100644 --- a/gtk2_ardour/clearlooks.rc.in +++ b/gtk2_ardour/clearlooks.rc.in @@ -375,6 +375,11 @@ style "marker_text" = "small text" { } +style "text_on_bg" = "medium_text" +{ + base[NORMAL] = @background +} + style "midi_tracer_textview" = "medium_monospace_text" { @@ -408,6 +413,12 @@ style "base_frame" bg[NORMAL] = @background } +style "highlight_frame" +{ + fg[NORMAL] = @foreground + bg[NORMAL] = @foreground +} + style "transport_frame" { } @@ -1096,6 +1107,7 @@ widget "*zoomrange clock" style:highest "medium_text" widget "*timecodeoffset clock" style:highest "medium_text" widget "*BaseFrame" style:highest "base_frame" +widget "*HighlightFrame" style:highest "highlight_frame" widget "*TransportFrame" style:highest "transport_frame" widget "*TransportFrame*" style:highest "transport_frame" widget "*EditorWindow*" style:highest "editor_window" @@ -1228,4 +1240,4 @@ widget "*ooltip*" style:highest "tooltip" widget "*Pane" style:highest "pane" widget "*Pane.Divider" style:highest "pane" widget "*VCALabelBar*" style:highest "vca_label_bar" - +widget "*TextOnBackground" style:highest "text_on_bg" diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 9fd4b7c08b..4547b012f9 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -602,15 +602,18 @@ SessionDialog::setup_new_session_page () if ( load_template_override.empty() ) { template_hbox->set_spacing (8); template_hbox->pack_start (template_chooser, true, true); - template_hbox->pack_start (template_desc, true, true); + template_hbox->pack_start (template_desc_frame, true, true); } //template_desc is the textview that displays the currently selected template's description template_desc.set_editable (false); template_desc.set_wrap_mode (Gtk::WRAP_WORD); template_desc.set_size_request(300,400); - template_desc.set_left_margin(6); - template_desc.set_right_margin(6); + template_desc.set_name (X_("TextOnBackground")); + template_desc.set_border_width (6); + + template_desc_frame.set_name (X_("HighlightFrame")); + template_desc_frame.add (template_desc); //template_chooser is the treeview showing available templates template_model = TreeStore::create (session_template_columns); diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h index 5cb85a75ef..441e4c4c52 100644 --- a/gtk2_ardour/session_dialog.h +++ b/gtk2_ardour/session_dialog.h @@ -185,6 +185,7 @@ private: void template_row_selected (); Gtk::TextView template_desc; + Gtk::Frame template_desc_frame; Gtk::VBox session_new_vbox; Gtk::VBox session_existing_vbox;