From 0ce06b691f8ab69cdf561c7475af9b6564e7ad4a Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Mon, 7 Mar 2016 18:49:09 +0100 Subject: [PATCH 1/4] Fixed theme selection --- rtgui/main.cc | 20 +------------------- rtgui/preferences.cc | 13 ------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/rtgui/main.cc b/rtgui/main.cc index 5bf81caaa..b0b45c601 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -16,12 +16,6 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -// generated 2004/6/3 19:15:32 CEST by gabor@darkstar.(none) -// using glademm V2.5.0 -// -// newer (non customized) versions of this file go to raw.cc_new - -// This file is for your program, I won't touch it again! #ifdef __GNUC__ #if defined(__FAST_MATH__) @@ -62,7 +56,6 @@ Glib::ustring creditsPath; Glib::ustring licensePath; Glib::ustring argv1; bool simpleEditor; -Glib::RefPtr cssBase; Glib::RefPtr cssForced; Glib::RefPtr cssRT; //Glib::Threads::Thread* mainThread; @@ -124,11 +117,6 @@ static void myGdkLockLeave() * -3 if at least one required procparam file was not found */ int processLineParams( int argc, char **argv ); -/* - * - * M A I N - * - */ int main(int argc, char **argv) { setlocale(LC_ALL, ""); @@ -321,15 +309,9 @@ int main(int argc, char **argv) Gtk::Settings::get_for_screen(screen)->property_gtk_theme_name() = "Adwaita"; Gtk::Settings::get_for_screen(screen)->property_gtk_application_prefer_dark_theme() = true; - Glib::ustring filename = argv0 + "/themes/RawTherapee.css"; + Glib::ustring filename = Glib::build_filename(argv0 + "/themes/", options.theme + ".css"); cssRT = Gtk::CssProvider::create(); - /* TODO - * Make theme selection work again. All themes should be applied below here, - * in other words after the base Adwaita Dark theme has been applied. This - * makes for smaller custom theme files. - */ - try { cssRT->load_from_path (filename); Gtk::StyleContext::add_provider_for_screen(screen, cssRT, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 3e842b52c..d6b98e689 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -2014,19 +2014,6 @@ void Preferences::switchThemeTo(Glib::ustring newTheme) printf("Error: Can't load css file \"%s\"\n", filename.c_str()); loaded = false; } - - // TODO remove rtcommon - if (!loaded && options.theme != "rtcommon") { - try { - printf("Trying with \"rtcommon.css\"\n"); - filename = argv0 + "/themes/rtcommon.css"; - css->load_from_path (filename); - } catch (Glib::Error &err) { - printf("Error: Can't load css file \"rtcommon.css\"\nMessage: %s\n", err.what().c_str()); - } catch (...) { - printf("Error: Can't load css file \"%s\"\n", filename.c_str()); - } - } } void Preferences::workflowUpdate () From f4b1e4a837a2ee6a404f5a947daabddc88c2a4ae Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Mon, 7 Mar 2016 18:50:44 +0100 Subject: [PATCH 2/4] Added TooWaBlue theme. #2980 --- rtdata/themes/TooWaBlue.css | 653 ++++++++++++++++++++++++++++++++++++ 1 file changed, 653 insertions(+) create mode 100644 rtdata/themes/TooWaBlue.css diff --git a/rtdata/themes/TooWaBlue.css b/rtdata/themes/TooWaBlue.css new file mode 100644 index 000000000..cb9aeb468 --- /dev/null +++ b/rtdata/themes/TooWaBlue.css @@ -0,0 +1,653 @@ +/* + This file is part of RawTherapee. + + Copyright (c) 2016 TooWaBoo (v1.07) + Many thanks to the RawTherapee Developer Team for this great piece of software + + RawTherapee is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + RawTherapee is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with RawTherapee. If not, see . +*/ + +/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/ + +@define-color accent-color rgb(35,99,166); /*** Highlight/selected color for List, Dropdown menu, Borders ... ***/ +@define-color text-hl-color rgb(210,210,210); /*** Highlight/selected text color ***/ + +@define-color accent-color2 rgb(35,99,166); /*** Slider, Progressbar, Scrollbar, Tab indicator ***/ + +@define-color accent-color3 rgb(35,99,166); /*** Selected thumbnail background color ***/ +@define-color text-hl-color3 rgb(210,210,210); /*** Selected thumbnail text color ***/ + +/*** Change me end ************************************************************************/ + +@define-color text-color #B0B0B0; +@define-color text-hl-color2 #C0C0C0; +@define-color text-tbEntry #C0C0C0; +@define-color bg-dark-grey #262626; +@define-color bg-grey #474747; +@define-color bg-light-grey #595959; +@define-color border-color rgba(255,255,255,.25); +@define-color bg-list-hover rgba(255,255,255,.065); +@define-color bg-button rgba(0,0,0,.14); +@define-color bg-button-border rgba(0,0,0,.20); +@define-color bg-button-hover rgba(0,0,0,.28); +@define-color bg-button-checked @bg-dark-grey; + +* { + color: @text-color; + -GtkDialog-action-area-border: 6; + transition: none; + text-shadow: none; + icon-shadow: none; + box-shadow: none; + outline-style: none; /* removes the ugly dotted focus line */ + border-image: none; +} +.undershoot.top, +.undershoot.right, +.undershoot.bottom, +.undershoot.left { + background-image: none; /* removes the dotted scrollbar line */ +} +GtkWindow { + background-color: @bg-grey; +} +GtkFrame { + border: none; +} + +/*** Left panel file browser ***/ +.plainback GtkBox:nth-child(2) { + background-color: @bg-dark-grey; +} + +/*** Menu bubble box ***/ +GtkPopover { + background-color: @bg-dark-grey; + border: 1px solid @accent-color; + border-radius: 0; +} +.menu { + background-color: @bg-dark-grey; + border: 1px solid @accent-color; +} +.menuitem { + padding: 3px 4px; +} +.menuitem:hover { + background-color: @accent-color; +} +.menuitem:hover * { + color: @text-hl-color; +} + +GtkNotebook { + padding: 4px; + background-color: @bg-light-grey; +} + +GtkPaned { + -GtkPaned-handle-size: 4px; + background-color: transparent; +} +.pane-separator { + background-color: @bg-light-grey; +} + +.separator { + color: transparent; +} +.mainNotebook .separator, +GtkDialog .separator { + color: @bg-light-grey; +} + +/*** Background color picture area***/ +GtkFrame GtkDrawingArea { + background-color: @bg-grey; +} +/*** Histogram ***/ +GtkGrid GtkContainer GtkDrawingArea:nth-child(1) { + background-color: @bg-dark-grey; + border: 1px solid #787878; +} +/*** Histogram RGB-Bar***/ +GtkGrid GtkContainer GtkDrawingArea:nth-child(2) { + background-color: #787878; + border: none; +} +.rightNotebook GtkDrawingArea { + background-color: @bg-dark-grey; + border: none; +} + +/*** Label ***/ +.label { + padding: 0px 4px; +} +GtkDialog .label, +.toolPanelNotebook .label, +.notebook tab .label { + padding: 0; +} +.toolPanelNotebook .button .label { + padding: 0 0 2px; +} +.notebook tab .label { + padding: 0 2px; +} +.frame > .label { + padding: 4px 5px; +} +/*** end ***/ + +.tooltip { + background-color: @bg-dark-grey; + border: 1px solid @accent-color; + border-radius: 0; + padding: 0; +} + +#partialPasteHeaderSep {color: @accent-color;} +#partialPasteHeader * {color: @text-hl-color2;} + +.rightNotebook { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; +} +.rightNotebook.frame { + padding-top: 0; + padding-right: 0; + padding-bottom: 0; + border-top: none; + border-right: none; + border-bottom: none; +} + +/*** Scrollbar ***/ +.scrollbar.trough { + background-color: rgba(0,0,0,.38); + background-image: none; + border: none; +} +.scrollbar.slider:active { + background-color: shade(@accent-color2,1.12); +} + +/*** end ***/ + +/*** Scale & Progressbar ***/ +.scale { + -GtkRange-trough-border: 6; + -GtkScale-slider-length: 15; + -GtkRange-slider-width: 15; +} +.scale.trough { + background-color: @bg-button; + border-color: @bg-dark-grey; +} +.scale.slider, .scale.trough.highlight { + background-image: none; + background-color: @accent-color2; + border-color: @bg-dark-grey; + color: @text-hl-color2; +} +.scale.slider:active { + border-color: shade (@accent-color2,.55); +} +.scale.fine-tune { + -GtkRange-trough-border: 5; +} + +GtkProgressBar { + -GtkProgressBar-min-vertical-bar-width: 8; + -GtkProgressBar-min-horizontal-bar-height: 8; + -GtkProgressBar-yspacing: 6px; + border-radius: 10px; +} +.progressbar { + background-image: none; + background-color: @accent-color2; + border-color: @bg-dark-grey; +} +GtkProgressBar.trough { + background-image: none; + background-color: @bg-button; +} +.mainNotebook > GtkGrid GtkProgressBar.trough { + background-image: none; + background-color: @bg-dark-grey; + border-color: @bg-dark-grey; +} +/*** end ***/ + +/*** Load/Save ***/ +GtkFileChooserWidget { + background-color: transparent; +} +GtkFileChooserWidget GtkBox { + background-color: transparent; +} +GtkFileChooserWidget GtkListBox * { + padding-top: 1px; + padding-bottom: 1px; +} +GtkFileChooserWidget GtkListBox { + background-color: @bg-dark-grey; +} +GtkFileChooserWidget .list-row * { + padding: 1px 4px; +} +GtkFileChooserWidget .list-row:hover { + background-color: @bg-list-hover; +} +GtkFileChooserWidget .list-row:hover * { + color: @text-hl-color2; +} +GtkFileChooserWidget .list-row:selected { + background-color: @accent-color; +} +GtkFileChooserWidget .list-row:selected * { + color: @text-hl-color; +} +/*** end ***/ + +/*** Tab Bars ***/ +.notebook tab, .notebook.header { + background-color: @bg-dark-grey; + border-color: @bg-dark-grey; +} +.notebook tab.top { + border-width: 0 0 4px 0; +} +.notebook tab.left { + border-width: 0 4px 0 0; +} +.rightNotebook tab.left, GtkDialog tab { + padding: 8px; +} +.toolPanelNotebook > tab{ + padding: 10px 4px 7px; +} +.metaPanelNotebook tab { + background-color: @bg-dark-grey; + padding: 6px 4px; +} + +.notebook tab:active { + border-color: @accent-color2; +} +/*** end ***/ + +/*** File Browser ***/ +.toolBarPanelFileBrowser .separator { + color: transparent; +} +.filebrowser .filebrowserFrame { + background-color: @bg-grey; + border-top: 4px solid @bg-light-grey; +} +.filmstripPanel { + background-color: @bg-grey; + padding: 0; +} +.filebrowserFrame GtkDrawingArea { + background-color: @bg-grey; + border-top: 4px solid @bg-light-grey; +} +.filebrowserFrame GtkDrawingArea:selected { + background-color: @accent-color3; + color: @text-hl-color3; +} +/*** end ***/ + +/*** Image ***/ +GtkImage { + padding: 0; +} +.mainNotebook > GtkGrid GtkImage { + padding: 1px; +} +.toolPanelNotebook GtkImage{ + padding: 4px; +} +.toolPanelNotebook tab GtkImage, +.toolPanelNotebook .button GtkImage { + padding: 1px 0; +} + +#MyExpanderTitle GtkImage { + padding: 0; +} +GtkDialog .button GtkImage{ + padding: 0; +} +GtkFileChooserWidget .button GtkImage{ + padding: 0 4px; +} +/*** end ***/ + +/*** Toolpanel ***/ +.toolPanelNotebook { + background-color: @bg-dark-grey; + padding: 0; + border-top: 4px solid @bg-dark-grey; +} + +.toolPanelNotebook GtkScrolledWindow GtkViewport.frame { + padding: 0 6px; +} +.toolPanelNotebook .separator { + color: transparent; +} +.toolPanelNotebook GtkFrame, .prefNotebook GtkFrame { + border: 1px solid @border-color; + border-radius: 0; + padding: 5px; +} + +.toolPanelNotebook GtkDrawingArea { + background-color: @bg-dark-grey; + border-color: @bg-light-grey; + border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */ +} +/*** Need this for Retinex Mask Method curve. It's grey not black -> Bug ***/ +.toolPanelNotebook GtkFrame GtkDrawingArea { + background-color: @bg-dark-grey; + border-color: @bg-light-grey; +} + +#ExpanderBox #ExpanderBox, #ExpanderBox2, #ExpanderBox3 { + border: 1px solid @border-color; +} + +#ExpanderBox, #ExpanderBox2, #ExpanderBox3 { + background-color: @bg-grey; + border-radius: 0; +} + +#MyExpanderTitle GtkLabel { + color: @text-color; + padding: 3px 0; +} +#MyExpanderTitle:hover GtkLabel { + color: @text-hl-color2; +} +/*** end ***/ + +/*** Metadata ***/ +.metaPanelNotebook { + padding: 0; + border-top: 4px solid @bg-dark-grey; +} +.metaPanelNotebook.frame { + background-color: @bg-grey; + border: 4px solid @bg-dark-grey; + border-bottom: 0px; +} +.metaPanelNotebook.header { + background-color: @bg-dark-grey; +} +/*** end ***/ + +/*** View ***/ +.view { + background-color: @bg-dark-grey; +} +.prefNotebook .view { + background-color: @bg-grey; +} +.mainNotebook .view.cell:nth-child(2) { + padding: 1px 0px 1px 4px; +} +.view:hover { + background-color: @bg-list-hover; + color: @text-hl-color2; +} +.view:selected { + color: @text-hl-color; + background-color: @accent-color; +} +.view .button { + background-color: #181818; + padding: 2px 6px; +} +/*** end ***/ + +/*** Entry ***/ +.entry { + background-image: none; + background-color: @bg-button; + border: 1px solid @bg-button-border; + border-radius: 0; + padding: 2px 4px; + color: @text-color; +} +.entry:focused:selected { + color: @text-hl-color; + background-color: @accent-color; +} +.entry:not(:focused):not(:insensitive) {/*Workaround*/ + color: @text-color; + background-color: transparent; +} +.entry:not(:selected):not(:insensitive) { + color: @text-color; + background-color: @bg-button; +} +.toolPanelNotebook .entry { + padding: 0 4px 0 7px; + border-radius: 20px 0 0 20px; + background-color: rgba(255,255,255,.12); + border: 1px solid rgba(0,0,0,.40); +} +.toolPanelNotebook .entry { + color: @text-tbEntry; +} +.toolPanelNotebook .entry:focused:selected { + color: @text-hl-color; + background-color: @accent-color; +} +.toolPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/ + color: @text-tbEntry; + background-color: transparent; +} +.toolPanelNotebook .entry:not(:selected):not(:insensitive) { + color: @text-tbEntry; + background-color: rgba(255,255,255,.12); +} + +.metaPanelNotebook .entry { + padding: 0 4px; + border-radius: 0; + background-color: @bg-dark-grey; + border: 1px solid rgba(0,0,0,.40); +} +/*** end ***/ + +/*** Buttons ***/ +.button { + background-image: none; + background-color: @bg-button; + border: 1px solid @bg-button-border; + border-radius: 0; + padding: 3px 4px; +} +GtkComboBox .button { + padding: 4px 3px; +} +.toolPanelNotebook .button, +GtkDialog .button { + padding: 0px 3px; +} + +.toolPanelNotebook GtkComboBox { + padding-left: 4px; /*** Distance between label and Dropbox ***/ +} + +.text-button { + padding: 0 5px 0 0; + -GtkButton-child-displacement-x: 0; + -GtkButton-child-displacement-y: 0; + -GtkCheckButton-indicator-size: 16; + -GtkCheckButton-indicator-spacing: 3; +} +.button.text-button { + padding: 4px 10px; +} +.toolPanelNotebook .button.text-button { + padding: 0px 3px; +} +GtkFileChooserWidget .button.text-button { + padding: 4px; +} + +.spinbutton .button { + background-image: none; + background-color: transparent; + border: none; + border-radius: 0; + padding: 2px; +} +.toolPanelNotebook .spinbutton .button { + padding: 0; +} + +#fullButton, +#histButton { + padding: 4px; +} +.button:hover { + background-color: @bg-button-hover; +} +.button:active, +.button:checked { + background-color: @bg-button-checked; +} + +.mainNotebook > GtkGrid .button { + padding: 2px; + border: 4px solid @bg-dark-grey; + background-color: transparent; +} +.mainNotebook tab .button { + padding: 2px; + border-top: 4px solid @bg-dark-grey; + border-bottom: 4px solid @bg-dark-grey; + border-left: 2px solid @bg-dark-grey; + border-right: none; + background-color: transparent; +} +.mainNotebook > GtkGrid .button:hover, .mainNotebook tab .button:hover { + background-color: rgba(255,255,255,.1); +} +.mainNotebook > GtkGrid .button:active, .mainNotebook tab .button:active { + background-color: transparent; +} +/*** end ***/ + +/*** Check & Radio buttons ***/ +.check, +.check row { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (1, @bg-dark-grey)); +} +.check:checked, +.check row:checked { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (0.22, @text-color), + color-stop (0.30, @bg-dark-grey), + color-stop (0.50, @bg-dark-grey)); +} +.check:insensitive, +.check row:insensitive { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (1, rgba(0,0,0,.24))); +} +.check:checked:insensitive, +.check row:checked:insensitive { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (0.22, rgba(255,255,255,.08)), + color-stop (0.30, rgba(0,0,0,.24)), + color-stop (0.50, rgba(0,0,0,.24))); +} + +.radio, +.radio row { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (0.44, @bg-dark-grey), + color-stop (0.5, transparent)); +} +.radio:checked, +.radio row:checked { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (0.14, @text-color), + color-stop (0.21, @bg-dark-grey), + color-stop (0.44, @bg-dark-grey), + color-stop (0.5, transparent)); +} +.radio:insensitive, +.radio row:insensitive { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (0.44, rgba(0,0,0,.24)), + color-stop (0.5, transparent)); +} +.radio:checked:insensitive, +.radio row:checked:insensitive { + -gtk-icon-source: + -gtk-gradient (radial, + center center, 0, + center center, 1, + color-stop (0.14, rgba(255,255,255,.08)), + color-stop (0.21, rgba(0, 0, 0,.24)), + color-stop (0.44, rgba(0, 0, 0,.24)), + color-stop (0.5, transparent)); +} +/*** end ***/ + +/*** Disabled Items ***/ + +*:insensitive { + color: #808080; +} +.toolPanelNotebook .entry:insensitive { + color: #999999; + background-color: rgba(255,255,255,.04); +} +.scale.slider:insensitive, .scale.trough.highlight:insensitive, .scale.trough:insensitive { + background-color: #393939; +} +/*** end ***/ + From 8b9c6cc527118eb54e32681d4202c66bf2ec420c Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Mon, 7 Mar 2016 23:59:09 +0100 Subject: [PATCH 3/4] Simplified build_filename --- rtgui/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtgui/main.cc b/rtgui/main.cc index b0b45c601..5dd233f23 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -309,7 +309,7 @@ int main(int argc, char **argv) Gtk::Settings::get_for_screen(screen)->property_gtk_theme_name() = "Adwaita"; Gtk::Settings::get_for_screen(screen)->property_gtk_application_prefer_dark_theme() = true; - Glib::ustring filename = Glib::build_filename(argv0 + "/themes/", options.theme + ".css"); + Glib::ustring filename = Glib::build_filename(argv0, "themes", options.theme + ".css"); cssRT = Gtk::CssProvider::create(); try { From 0fc2fed1b50fe8c539e477d8c46e6e8882ef1152 Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Fri, 11 Mar 2016 18:07:18 +0100 Subject: [PATCH 4/4] Updated TooWaBlue theme to 1.09 --- rtdata/themes/TooWaBlue.css | 181 +++++++++++++++++------------------- 1 file changed, 84 insertions(+), 97 deletions(-) diff --git a/rtdata/themes/TooWaBlue.css b/rtdata/themes/TooWaBlue.css index cb9aeb468..c3eebbe18 100644 --- a/rtdata/themes/TooWaBlue.css +++ b/rtdata/themes/TooWaBlue.css @@ -1,7 +1,7 @@ /* This file is part of RawTherapee. - Copyright (c) 2016 TooWaBoo (v1.07) + Copyright (c) 2016 TooWaBoo (v1.09) Many thanks to the RawTherapee Developer Team for this great piece of software RawTherapee is free software: you can redistribute it and/or modify @@ -45,7 +45,8 @@ * { color: @text-color; - -GtkDialog-action-area-border: 6; + -GtkDialog-action-area-border: 0; + -GtkDialog-content-area-border: 10; transition: none; text-shadow: none; icon-shadow: none; @@ -60,15 +61,15 @@ background-image: none; /* removes the dotted scrollbar line */ } GtkWindow { + background-color: @bg-light-grey; +} +GtkDialog { background-color: @bg-grey; } GtkFrame { border: none; -} - -/*** Left panel file browser ***/ -.plainback GtkBox:nth-child(2) { - background-color: @bg-dark-grey; + border-top: 3px solid transparent; + border-bottom: 4px solid transparent; } /*** Menu bubble box ***/ @@ -105,15 +106,11 @@ GtkPaned { } .separator { - color: transparent; -} -.mainNotebook .separator, -GtkDialog .separator { color: @bg-light-grey; } /*** Background color picture area***/ -GtkFrame GtkDrawingArea { +GtkDrawingArea { background-color: @bg-grey; } /*** Histogram ***/ @@ -126,7 +123,7 @@ GtkGrid GtkContainer GtkDrawingArea:nth-child(2) { background-color: #787878; border: none; } -.rightNotebook GtkDrawingArea { +#RightNotebook GtkDrawingArea { background-color: @bg-dark-grey; border: none; } @@ -136,17 +133,18 @@ GtkGrid GtkContainer GtkDrawingArea:nth-child(2) { padding: 0px 4px; } GtkDialog .label, -.toolPanelNotebook .label, +#ToolPanelNotebook .label, .notebook tab .label { padding: 0; } -.toolPanelNotebook .button .label { +#ToolPanelNotebook .button .label { padding: 0 0 2px; } .notebook tab .label { padding: 0 2px; } -.frame > .label { +.frame > .label, +#ToolPanelNotebook .frame > .label { padding: 4px 5px; } /*** end ***/ @@ -161,12 +159,12 @@ GtkDialog .label, #partialPasteHeaderSep {color: @accent-color;} #partialPasteHeader * {color: @text-hl-color2;} -.rightNotebook { +#RightNotebook { padding-top: 0; padding-right: 0; padding-bottom: 0; } -.rightNotebook.frame { +#RightNotebook .frame { padding-top: 0; padding-right: 0; padding-bottom: 0; @@ -197,7 +195,8 @@ GtkDialog .label, background-color: @bg-button; border-color: @bg-dark-grey; } -.scale.slider, .scale.trough.highlight { +.scale.slider, .scale.trough.highlight, +#ToolPanelNotebook .scale.slider { background-image: none; background-color: @accent-color2; border-color: @bg-dark-grey; @@ -225,7 +224,7 @@ GtkProgressBar.trough { background-image: none; background-color: @bg-button; } -.mainNotebook > GtkGrid GtkProgressBar.trough { +#MainNotebook > GtkGrid GtkProgressBar.trough { background-image: none; background-color: @bg-dark-grey; border-color: @bg-dark-grey; @@ -263,6 +262,17 @@ GtkFileChooserWidget .list-row:selected * { } /*** end ***/ +/*** Metadata ***/ +#MetaPanelNotebook { + background-color: @bg-grey; + +} +#MetaPanelNotebook .header { + background-color: @bg-dark-grey; +} + +/*** end ***/ + /*** Tab Bars ***/ .notebook tab, .notebook.header { background-color: @bg-dark-grey; @@ -274,15 +284,15 @@ GtkFileChooserWidget .list-row:selected * { .notebook tab.left { border-width: 0 4px 0 0; } -.rightNotebook tab.left, GtkDialog tab { +#RightNotebook tab.left, GtkDialog tab { padding: 8px; } -.toolPanelNotebook > tab{ +#ToolPanelNotebook > tab{ padding: 10px 4px 7px; } -.metaPanelNotebook tab { - background-color: @bg-dark-grey; +#MetaPanelNotebook tab { padding: 6px 4px; + background-color: @bg-dark-grey; } .notebook tab:active { @@ -291,22 +301,10 @@ GtkFileChooserWidget .list-row:selected * { /*** end ***/ /*** File Browser ***/ -.toolBarPanelFileBrowser .separator { - color: transparent; -} -.filebrowser .filebrowserFrame { +#FileBrowser GtkDrawingArea { background-color: @bg-grey; - border-top: 4px solid @bg-light-grey; } -.filmstripPanel { - background-color: @bg-grey; - padding: 0; -} -.filebrowserFrame GtkDrawingArea { - background-color: @bg-grey; - border-top: 4px solid @bg-light-grey; -} -.filebrowserFrame GtkDrawingArea:selected { +#FileBrowser GtkDrawingArea:selected { background-color: @accent-color3; color: @text-hl-color3; } @@ -316,20 +314,19 @@ GtkFileChooserWidget .list-row:selected * { GtkImage { padding: 0; } -.mainNotebook > GtkGrid GtkImage { +#MainNotebook > GtkGrid GtkImage { padding: 1px; } -.toolPanelNotebook GtkImage{ - padding: 4px; + +#ToolPanelNotebook GtkImage{ + padding: 0 4px; } -.toolPanelNotebook tab GtkImage, -.toolPanelNotebook .button GtkImage { + +#ToolPanelNotebook tab GtkImage, +#ToolPanelNotebook .button GtkImage { padding: 1px 0; } -#MyExpanderTitle GtkImage { - padding: 0; -} GtkDialog .button GtkImage{ padding: 0; } @@ -339,33 +336,30 @@ GtkFileChooserWidget .button GtkImage{ /*** end ***/ /*** Toolpanel ***/ -.toolPanelNotebook { +#ToolPanelNotebook { background-color: @bg-dark-grey; padding: 0; border-top: 4px solid @bg-dark-grey; } -.toolPanelNotebook GtkScrolledWindow GtkViewport.frame { - padding: 0 6px; +#ToolPanelNotebook GtkScrolledWindow GtkViewport.frame { + padding: 0 4px; } -.toolPanelNotebook .separator { +#ToolPanelNotebook .separator { color: transparent; } -.toolPanelNotebook GtkFrame, .prefNotebook GtkFrame { +#ToolPanelNotebook GtkFrame, #PrefNotebook GtkFrame { border: 1px solid @border-color; border-radius: 0; padding: 5px; } -.toolPanelNotebook GtkDrawingArea { +#ToolPanelNotebook GtkDrawingArea { background-color: @bg-dark-grey; border-color: @bg-light-grey; - border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */ } -/*** Need this for Retinex Mask Method curve. It's grey not black -> Bug ***/ -.toolPanelNotebook GtkFrame GtkDrawingArea { - background-color: @bg-dark-grey; - border-color: @bg-light-grey; +#ToolPanelNotebook GtkDrawingArea { + border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */ } #ExpanderBox #ExpanderBox, #ExpanderBox2, #ExpanderBox3 { @@ -377,48 +371,41 @@ GtkFileChooserWidget .button GtkImage{ border-radius: 0; } -#MyExpanderTitle GtkLabel { +#MyExpanderTitle .label { color: @text-color; - padding: 3px 0; + padding: 2px 0; } -#MyExpanderTitle:hover GtkLabel { +#MyExpanderTitle:hover .label { color: @text-hl-color2; } /*** end ***/ -/*** Metadata ***/ -.metaPanelNotebook { - padding: 0; - border-top: 4px solid @bg-dark-grey; -} -.metaPanelNotebook.frame { - background-color: @bg-grey; - border: 4px solid @bg-dark-grey; - border-bottom: 0px; -} -.metaPanelNotebook.header { - background-color: @bg-dark-grey; -} -/*** end ***/ - /*** View ***/ .view { background-color: @bg-dark-grey; } -.prefNotebook .view { +#PrefNotebook .view { background-color: @bg-grey; } -.mainNotebook .view.cell:nth-child(2) { +#MainNotebook .view.cell:nth-child(2) { padding: 1px 0px 1px 4px; } .view:hover { background-color: @bg-list-hover; color: @text-hl-color2; } +#PrefNotebook .view:hover { + background-color: @bg-light-grey; + color: @text-hl-color2; +} .view:selected { color: @text-hl-color; background-color: @accent-color; } +#PrefNotebook .view:selected { + color: @text-hl-color; + background-color: @accent-color; +} .view .button { background-color: #181818; padding: 2px 6px; @@ -446,33 +433,34 @@ GtkFileChooserWidget .button GtkImage{ color: @text-color; background-color: @bg-button; } -.toolPanelNotebook .entry { +#ToolPanelNotebook .entry { padding: 0 4px 0 7px; border-radius: 20px 0 0 20px; background-color: rgba(255,255,255,.12); border: 1px solid rgba(0,0,0,.40); } -.toolPanelNotebook .entry { +#ToolPanelNotebook .entry { color: @text-tbEntry; } -.toolPanelNotebook .entry:focused:selected { +#ToolPanelNotebook .entry:focused:selected { color: @text-hl-color; background-color: @accent-color; } -.toolPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/ +#ToolPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/ color: @text-tbEntry; background-color: transparent; } -.toolPanelNotebook .entry:not(:selected):not(:insensitive) { +#ToolPanelNotebook .entry:not(:selected):not(:insensitive) { color: @text-tbEntry; background-color: rgba(255,255,255,.12); } -.metaPanelNotebook .entry { - padding: 0 4px; - border-radius: 0; - background-color: @bg-dark-grey; +#MetaPanelNotebook .entry:not(:selected):not(:insensitive), +#MetaPanelNotebook GtkTextView { + color: @text-color; + background-color: @bg-light-grey; border: 1px solid rgba(0,0,0,.40); + border-radius: 0; } /*** end ***/ @@ -482,17 +470,17 @@ GtkFileChooserWidget .button GtkImage{ background-color: @bg-button; border: 1px solid @bg-button-border; border-radius: 0; - padding: 3px 4px; + padding: 3px 4px;margin: 1px; } GtkComboBox .button { padding: 4px 3px; } -.toolPanelNotebook .button, +#ToolPanelNotebook .button, GtkDialog .button { padding: 0px 3px; } -.toolPanelNotebook GtkComboBox { +#ToolPanelNotebook GtkComboBox { padding-left: 4px; /*** Distance between label and Dropbox ***/ } @@ -506,7 +494,7 @@ GtkDialog .button { .button.text-button { padding: 4px 10px; } -.toolPanelNotebook .button.text-button { +#ToolPanelNotebook .button.text-button { padding: 0px 3px; } GtkFileChooserWidget .button.text-button { @@ -520,7 +508,7 @@ GtkFileChooserWidget .button.text-button { border-radius: 0; padding: 2px; } -.toolPanelNotebook .spinbutton .button { +#ToolPanelNotebook .spinbutton .button { padding: 0; } @@ -536,12 +524,12 @@ GtkFileChooserWidget .button.text-button { background-color: @bg-button-checked; } -.mainNotebook > GtkGrid .button { +#MainNotebook > GtkGrid .button { padding: 2px; border: 4px solid @bg-dark-grey; background-color: transparent; } -.mainNotebook tab .button { +#MainNotebook tab .button { padding: 2px; border-top: 4px solid @bg-dark-grey; border-bottom: 4px solid @bg-dark-grey; @@ -549,10 +537,10 @@ GtkFileChooserWidget .button.text-button { border-right: none; background-color: transparent; } -.mainNotebook > GtkGrid .button:hover, .mainNotebook tab .button:hover { +#MainNotebook > GtkGrid .button:hover, #MainNotebook tab .button:hover { background-color: rgba(255,255,255,.1); } -.mainNotebook > GtkGrid .button:active, .mainNotebook tab .button:active { +#MainNotebook > GtkGrid .button:active, #MainNotebook tab .button:active { background-color: transparent; } /*** end ***/ @@ -642,7 +630,7 @@ GtkFileChooserWidget .button.text-button { *:insensitive { color: #808080; } -.toolPanelNotebook .entry:insensitive { +#ToolPanelNotebook .entry:insensitive { color: #999999; background-color: rgba(255,255,255,.04); } @@ -650,4 +638,3 @@ GtkFileChooserWidget .button.text-button { background-color: #393939; } /*** end ***/ -