Merge pull request #4007 from TooWaBoo/dev

Update TooWaBlue themes and new Average Surround theme.

rtdata/themes/TooWaBlue-Bright-GTK3-20_.css

@@ -31,19 +31,19 @@
 @define-color bg-highlighted-text-color rgb(43,119,196); /*** Highlighted text color background* Default: rgb(35,99,166) ***/
 @define-color highlighted-text-color rgb(255,255,255);  /*** Highlighted text color * Default: rgb(210,210,210) ***/
 
-@define-color bg-image rgb(90,90,90);                   /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
+@define-color bg-image rgb(95,95,95);                   /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
 
 @define-color accent-color2 rgb(43,119,196);             /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(35,99,166) ***/
-@define-color accent-color4 rgb(128,128,128);           /*** Slider knob * Default: rgb(115,115,115) ***/
+@define-color accent-color4 rgb(135,135,135);           /*** Slider knob * Default: rgb(115,115,115) ***/
 
 @define-color accent-color3 rgb(43,119,196);             /*** Selected thumbnail background color * Default: rgb(35,99,166) ***/
 @define-color text-hl-color3 rgb(255,255,255);          /*** Selected thumbnail text color * Default: rgb(210,210,210) ***/
 
 /*** Change me end *****************************************************************************/
 
-@define-color bg-light-grey rgb(110,110,110);
+@define-color bg-light-grey rgb(115,115,115);
-@define-color bg-grey rgb(90,90,90);
+@define-color bg-grey rgb(95,95,95);
-@define-color bg-dark-grey rgb(50,50,50);
+@define-color bg-dark-grey rgb(55,55,55);
 
 @define-color bg-button-hover rgba(0,0,0,.25);
 @define-color bg-button-active rgba(0,0,0,.60);
@@ -58,12 +58,15 @@
 @define-color text-color rgb(210,210,210);
 @define-color text-tbEntry rgb(230,230,230);
 @define-color border-color rgba(255,255,255,.35);
-@define-color bg-list-hover rgb(60,60,60);
+@define-color bg-list-hover rgb(68,68,68);
 @define-color bg-scale-entry rgba(0,0,0,.14);
-@define-color bg-button-border rgba(0,0,0,.60);
+@define-color bg-button-border rgba(0,0,0,.5);
 @define-color bg-entry-border rgba(0,0,0,.40);
 @define-color view-grid-border rgba(255,255,255,0.25);
 @define-color headline-big rgb(210,210,210);
 @define-color headline-hl rgb(255,255,255);
 @define-color headline-frame rgb(245,245,245);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(145,145,145);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.3);
 /***********************************************************************************************/

rtdata/themes/TooWaBlue-Dark-GTK3-20_.css

@@ -43,7 +43,7 @@
 
 @define-color bg-light-grey rgb(75,75,75);
 @define-color bg-grey rgb(58,58,58);
-@define-color bg-dark-grey rgb(36,36,36);
+@define-color bg-dark-grey rgb(30,30,30);
 
 @define-color bg-button-hover rgba(0,0,0,.3);
 @define-color bg-button-active rgba(0,0,0,.7);
@@ -66,4 +66,7 @@
 @define-color headline-big rgb(187,187,187);
 @define-color headline-hl rgb(215,215,215);
 @define-color headline-frame rgb(210,210,210);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(128,128,128);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.35);
 /***********************************************************************************************/

rtdata/themes/TooWaBlue-GTK3-20_.css

@@ -2,7 +2,7 @@
   This file is part of RawTherapee.
 
   Copyright (c) 2016-2017 TooWaBoo
-  Version 2.51 - requires RT 5.0 (Gtk+ >= 3.20)
+  Version 2.53 - requires RT 5.0 (Gtk+ >= 3.20)
 
   RawTherapee is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 @define-color bg-highlighted-text-color rgb(35,99,166); /*** Highlighted text color background* Default: rgb(35,99,166) ***/
 @define-color highlighted-text-color rgb(210,210,210);  /*** Highlighted text color * Default: rgb(210,210,210) ***/
 
-@define-color bg-image rgb(70,70,70);                   /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
+@define-color bg-image rgb(75,75,75);                   /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
 
 @define-color accent-color2 rgb(35,99,166);             /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(35,99,166) ***/
 @define-color accent-color4 rgb(115,115,115);           /*** Slider knob * Default: rgb(115,115,115) ***/
@@ -36,9 +36,9 @@
 
 /*** Change me end *****************************************************************************/
 
-@define-color bg-light-grey rgb(90,90,90);
+@define-color bg-light-grey rgb(95,95,95);
-@define-color bg-grey rgb(70,70,70);
+@define-color bg-grey rgb(75,75,75);
-@define-color bg-dark-grey rgb(36,36,36);
+@define-color bg-dark-grey rgb(40,40,40);
 
 @define-color bg-button-hover rgba(0,0,0,.25);
 @define-color bg-button-active rgba(0,0,0,.60);
@@ -47,8 +47,8 @@
 @define-color winTitle rgb(190,190,190);
 
 @define-color bg-tooltip rgb(185,185,185);
-@define-color border-tooltip rgb(36,36,36);
+@define-color border-tooltip rgb(40,40,40);
-@define-color text-tooltip rgb(36,36,36);
+@define-color text-tooltip rgb(40,40,40);
 /***********************************************/
 @define-color text-color rgb(186,186,186);
 @define-color text-tbEntry rgb(192,192,192);
@@ -61,6 +61,9 @@
 @define-color headline-big rgb(195,195,195);
 @define-color headline-hl rgb(230,230,230);
 @define-color headline-frame rgb(215,215,215);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(128,128,128);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.33);
 /***********************************************************************************************/
 
 * {
@@ -72,7 +75,7 @@
 }
 
 *:disabled {
-    color: rgb(128,128,128);
+    color: @fg-disabled;
 }
 
 #ToolPanelNotebook {
@@ -422,6 +425,7 @@ paned.horizontal > separator {
 }
 
 paned.vertical > separator {
+	background-image: image(@bg-dark-grey);
     background-color: @bg-light-grey;
     min-height: 0.5em;
     border-top: 1px solid @bg-light-grey;
@@ -594,7 +598,7 @@ scale slider {
     margin: calc(-0.33334em - 1px);
     border-radius: 0.83334em;
     background-image: linear-gradient(to bottom, shade (@accent-color4,1.15), shade (@accent-color4,.85));
-    border: 0.08334em solid @bg-dark-grey;
+    border: 0.08334em solid @bg-button-border;
     box-shadow: none;
 }
 scale slider:hover {
@@ -604,13 +608,13 @@ scale slider:hover {
 scale trough {
     margin: 0.5em; /* has to be half of "scale slider / min-width min-height*/
     background-color: @bg-scale-entry;
-    border: 0.08334em solid @bg-dark-grey;
+    border: 0.08334em solid @bg-button-border;
     box-shadow: inset 0 0.08334em rgba(255, 255, 255, 0.11), 0 0.08334em rgba(242, 242, 242, 0.11);
     border-radius: 0.5em;
 }
 scale:not(:disabled) trough highlight {
     background-color: @accent-color2;
-    border: 0.08334em solid @bg-dark-grey;
+    border: 0.08334em solid @bg-button-border;
     box-shadow: inset 0 0.08334em shade(@accent-color2, 1.3);
     border-radius: 0.5em;
 }
@@ -1639,7 +1643,7 @@ radiobutton {
 
 check,
 radio {
-    border: calc(0.083334em + 0.18px) solid shade(@text-color, .9);
+    border: calc(0.083334em + 0.18px) solid @text-color;
     background-image: none;
     background-color: transparent;
     margin: 0;
@@ -1649,6 +1653,7 @@ radio {
     box-shadow: none;
     background-repeat: no-repeat;
     -gtk-icon-shadow: none;
+	color: @text-color;
 }
 radiobutton label,
 checkbutton label {
@@ -1664,7 +1669,7 @@ radio{
 }
 check:disabled,
 radio:disabled {
-    border-color: rgb(120,120,120);
+    border-color: @fg-disabled;
 }
 
 frame > checkbutton check{
@@ -1717,7 +1722,7 @@ spinbutton {
     min-width: 0;
     border-top-left-radius: 1.83334em;
     border-bottom-left-radius: 1.83334em;
-    background-color: shade(@bg-grey, 1.33);
+    background-color: @bg-tb-spinbutton;
     border: 0.08334em solid @bg-button-border;
     color: @text-tbEntry;
     box-shadow: inset 0.08334em  0.08334em rgba(0, 0, 0, .12), 0 0.08334em rgba(255, 255, 255, 0.12);

rtdata/themes/TooWaGrey-ExtraBright-GTK3-20_.css

@@ -0,0 +1,72 @@
+/*
+  This file is part of RawTherapee.
+
+  Copyright (c) 2016-2017 TooWaBoo
+  Requires RT 5.0 (Gtk+ >= 3.20)
+
+  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 <http://www.gnu.org/licenses/>.
+*/
+
+
+/*****************************************/
+/**/ @import "TooWaBlue-GTK3-20_.css"; /**/
+/*****************************************/
+
+/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
+
+@define-color accent-color rgb(110,110,110);              /*** Active color for Lists, Menu, Borders ... * Default: rgb(35,99,166) ***/
+@define-color text-hl-color rgb(255,255,255);           /*** Active text color * Default: rgb(210,210,210) ***/
+
+@define-color bg-highlighted-text-color rgb(49,132,220); /*** Highlighted text color background* Default: rgb(35,99,166) ***/
+@define-color highlighted-text-color rgb(255,255,255);  /*** Highlighted text color * Default: rgb(210,210,210) ***/
+
+@define-color bg-image rgb(120,120,120);                   /*** Image area & File Browser background * Default: rgb(70,70,70) ***/
+
+@define-color accent-color2 rgb(49,132,220);             /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(35,99,166) ***/
+@define-color accent-color4 rgb(155,155,155);           /*** Slider knob * Default: rgb(115,115,115) ***/
+
+@define-color accent-color3 rgb(85,85,85);             /*** Selected thumbnail background color * Default: rgb(35,99,166) ***/
+@define-color text-hl-color3 rgb(230,230,230);          /*** Selected thumbnail text color * Default: rgb(210,210,210) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(135,135,135);
+@define-color bg-grey rgb(120,120,120);
+@define-color bg-dark-grey rgb(85,85,85);
+
+@define-color bg-button-hover rgba(0,0,0,.15);
+@define-color bg-button-active rgba(0,0,0,.5);
+
+@define-color winHeaderbar rgb(75,75,75);
+@define-color winTitle rgb(210,210,210);
+
+@define-color bg-tooltip rgb(210,210,210);
+@define-color border-tooltip rgb(50,50,50);
+@define-color text-tooltip rgb(50,50,50);
+/***********************************************/
+@define-color text-color rgb(230,230,230);
+@define-color text-tbEntry rgb(245,245,245);
+@define-color border-color rgba(255,255,255,.35);
+@define-color bg-list-hover rgb(95,95,95);
+@define-color bg-scale-entry rgba(0,0,0,.14);
+@define-color bg-button-border rgba(0,0,0,.45);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color view-grid-border rgba(255,255,255,0.25);
+@define-color headline-big rgb(210,210,210);
+@define-color headline-hl rgb(255,255,255);
+@define-color headline-frame rgb(245,245,245);
+/*** New Color Variable v2.53 ************************************************************************/
+@define-color fg-disabled rgb(180,180,180);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.20);
+/***********************************************************************************************/