diff --git a/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css b/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css
index 888533053..d1bb4fdbc 100644
--- a/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue - Bright-GTK3-20_.css
@@ -41,7 +41,7 @@
/*** Change me end *****************************************************************************/
-@define-color bg-light-grey rgb(115,115,115);
+@define-color bg-light-grey rgb(119,119,119);
@define-color bg-grey rgb(95,95,95);
@define-color bg-dark-grey rgb(55,55,55);
diff --git a/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css b/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css
index 23e32e1ec..581549750 100644
--- a/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue - Dark-GTK3-20_.css
@@ -25,7 +25,7 @@
/*** Change me *** rgb(red,green,blue) *** allowed values from 0 to 255 for each color ***/
-@define-color accent-color rgb(33,82,145); /*** Active color for Lists, Menu, Borders ... * Default: rgb(33,82,145) ***/
+@define-color accent-color rgb(33,82,150); /*** Active color for Lists, Menu, Borders ... * Default: rgb(33,82,145) ***/
@define-color text-hl-color rgb(200,200,200); /*** Active text color * Default: rgb(200,200,200) ***/
@define-color bg-highlighted-text-color rgb(33,82,145); /*** Highlighted text color background* Default: rgb(33,82,145) ***/
@@ -33,7 +33,7 @@
@define-color bg-image rgb(58,58,58); /*** Image area & File Browser background * Default: rgb(58,58,58) ***/
-@define-color accent-color2 rgb(33,82,145); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(33,82,145) ***/
+@define-color accent-color2 rgb(33,82,150); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(33,82,145) ***/
@define-color accent-color4 rgb(98,98,98); /*** Slider knob * Default: rgb(98,98,98) ***/
@define-color accent-color3 rgb(33,82,145); /*** Selected thumbnail background color * Default: rgb(33,82,145) ***/
diff --git a/rtdata/themes/TooWaBlue-GTK3-20_.css b/rtdata/themes/TooWaBlue-GTK3-20_.css
index 68e54c966..0b00f77a9 100644
--- a/rtdata/themes/TooWaBlue-GTK3-20_.css
+++ b/rtdata/themes/TooWaBlue-GTK3-20_.css
@@ -2,7 +2,7 @@
This file is part of RawTherapee.
Copyright (c) 2016-2017 TooWaBoo
- Version 2.66
+ Version 2.67
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -72,6 +72,7 @@
outline-style: none; /* removes the ugly dashed focus line */
border-image: none;
transition: none;
+ -gtk-icon-shadow: none;
}
*:disabled {
@@ -361,6 +362,7 @@ filechooser list row:selected {
#HistogramPanel {
min-height: 0;
margin: -2px 0;
+ padding: 0;
border: none;
background-color: transparent;
}
@@ -401,18 +403,21 @@ filechooser list row:selected {
background-color: @bg-dark-grey;
background-image: none;
box-shadow: none;
- min-height: 1.58334em;
- min-width: 1.5em;
+ min-height: 1.5em;
+ min-width: 1.83334em;
border-radius: 0;
}
#histButton:first-child {
- margin-top: 1px;
+ margin-top: 0.16667em;
}
#histButton:last-child {
- margin-bottom: 1px;
+ margin-bottom: 0.16667em;
}
+#HistogramPanel image {
+ -gtk-icon-transform: scale(calc(14/16));
+}
/*** end ***************************************************************************************/
/*** Separator *********************************************************************************/
@@ -762,18 +767,18 @@ notebook header.left tab {
padding: 0.33334em 0;
}
notebook header tab > grid > image {
- min-height: 2.33334em;
+ min-height: 2.5em;
min-width: 0;
padding: 0 0.16667em 0 0;
margin: 0;
}
notebook header.left tab > grid > image {
min-height: 0;
- min-width: 2.33334em;
+ min-width: 2.5em;
padding: 0.16667em 0 0;
}
notebook header tab label {
- margin: 0.33334em;
+ margin: 0.08334em;
}
notebook header tab:hover label {
color: @headline-hl;
@@ -855,6 +860,10 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
background-color: @bg-grey;
padding: 0;
}
+#RightNotebook header tab label {
+ padding-left: 0.16667em;
+ padding-right: 0.16667em;
+}
#RightNotebook > stack > :nth-child(1) > * > box,
#RightNotebook > stack > :nth-child(4) > * > box {
@@ -865,6 +874,11 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#PrefNotebook header {
margin: -0.66667em -0.66667em 0.33334em;
}
+#PrefNotebook header tab label {
+ padding-top: 0.16667em;
+ padding-bottom: 0.16667em;
+}
+
#AboutNotebook header {
margin: -0.66667em -0.66667em 0.66667em;
}
@@ -960,7 +974,7 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#MetaPanelNotebook > stack > box > grid > button {
margin-top: 0.08334em;
margin-bottom: 0.08334em;
- min-height: 2.16667em;
+ min-height: 2.33334em;
}
#MetaPanelNotebook label {
@@ -996,16 +1010,20 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#ToolBarPanelFileBrowser > button {
margin: 0 0.08334em;
}
+/* Filter */
#ToolBarPanelFileBrowser > box > box > button {
- min-height: 0.91667em;
- min-width: 1.33333em;
+ min-height: 1.16667em;
+ min-width: 1.16667em;
padding: 0;
- margin: 0.16667em 0 0 0;
+ margin: 0 0.08334em -1px;
border: none;
background-color: transparent;
background-image: none;
box-shadow: none;
}
+#ToolBarPanelFileBrowser > box > box image{
+ -gtk-icon-transform: scale(calc(15/16));
+}
#ToolBarPanelFileBrowser entry + button.flat,
#FileBrowser entry + button.flat {
@@ -1057,8 +1075,14 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#BeforeAfterContainer button {
min-height: 1.66667em;
min-width: 1.75em;
- margin: 0.25em;
- padding: 0 0 0 0.08334em;
+ margin: 0.25em 0.25em 0.25em 0;
+ padding: 0;
+}
+#BeforeAfterContainer button image{
+ margin-left: 0.083334em;
+}
+#BeforeAfterContainer button:checked image{
+ margin-left: 0.41667em;
}
/**/
@@ -1069,8 +1093,8 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
}
#EditorTopPanel button {
margin: 0 0.08334em;
- min-height: 2.16667em;
- min-width: 2.16667em;
+ min-height: 2.33334em;
+ min-width: 2.33334em;
}
/* Removes margin from the last button. Otherwise the filmstrip will cut of the right border. */
#EditorTopPanel :last-child > button:last-child {
@@ -1155,13 +1179,13 @@ window.csd:not(.fullscreen) #MainNotebook > header.top {
#MyExpanderTitle > box {
margin: 0;
- padding: 0.33334em 0;
+ padding: 0.25em 0;
}
#MyExpanderTitle label {
color: @headline-big;
padding: 0;
- margin: 0 0.25em 0 0.5em;
+ margin: 0.08334em 0.25em 0 0.5em;
}
#MyExpanderTitle:hover label {
@@ -1263,7 +1287,7 @@ popover.background modelbutton:hover {
/*** Switch ***********************************************************************************/
switch {
- min-height: 2.16667em;
+ min-height: 2.33334em;
min-width: 11em;
margin: 0;
padding: 0;
@@ -1308,8 +1332,8 @@ switch:disabled:not(:checked) {
/*** Buttons ***********************************************************************************/
button {
- min-height: 2.16667em;
- min-width: 2.16667em;
+ min-height: 2.33334em;
+ min-width: 2.33334em;
margin: 0;
padding: 0; /* x */
border-radius: 0.2em;
@@ -1336,7 +1360,7 @@ button.text-button label {
filechooser button image,
#MyFileChooserButton image {
- opacity: .8;
+ opacity: .70;
-gtk-icon-style: symbolic;
}
@@ -1347,23 +1371,15 @@ button.flat {
background-image: none;
background-color: transparent;
}
-/* Resetbutton Queue & Save as*/
-dialog scale + button.flat,
-scale + button.flat {
- min-height: 1.33334em;
- min-width: 1.25em;
- margin: 0.25em 0 0.16667em 0.16667em;
- padding: 0 0 0 0.08334em;
- -gtk-icon-shadow: none;
-}
/* Resetbutton */
-#MyExpander button.flat {
- min-height: 1.33334em;
- min-width: 1.25em;
+#MyExpander button.flat,
+dialog scale + button.flat,
+scale + button.flat {
+ min-height: 1.16667em;
+ min-width: 1.66667em;
margin: 0.08334em 0 0.08334em 0.16667em;
- padding: 0 0 0 0.08334em;
- -gtk-icon-shadow: none;
+ padding: 0;
}
#MyExpander scale + button.flat {
@@ -1381,8 +1397,8 @@ scale + button.flat {
/* Buttons Curve drawingarea*/
#MyExpander button.flat + button.flat,
#MyExpander button.flat:first-child {
- min-height: 2.16667em;
- min-width: 2.16667em;
+ min-height: 2.33334em;
+ min-width: 2.33334em;
margin: 0.08334em;
padding: 0;
}
@@ -1428,7 +1444,12 @@ button.MiddleH {
}
#ProfilePanel combobox {
margin-left: 0.16667em;
+ margin-right: 0.16667em;
}
+#ProfilePanel button.Left {
+ margin-left: -2px;
+}
+
#PlacesPaned button.Left,
#PlacesPaned button.Right {
margin-top: 3px;
@@ -1452,6 +1473,7 @@ dialog button,
min-width: 1.66667em;
padding: 0;
}
+
combobox .combo,
dialog combobox .combo,
#ToolPanelNotebook combobox .combo,
@@ -1490,16 +1512,17 @@ buttonbox:not(.dialog-action-area) button{
#MyExpander button:not(.flat).Left + button:not(.flat).Right {
border-left: none;
margin-left: 0;
- padding-left: 0.33334em;
- padding-right: 0.33334em;
+ padding-left: 0;
+ padding-right: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
+ min-width: 1.33334em;
}
#IopsPanel button:not(.flat).Left,
#MyExpander button:not(.flat).Left {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
- min-width: 2.16667em;
+ min-width: 2.33334em;
}
/**/
@@ -1509,8 +1532,8 @@ buttonbox:not(.dialog-action-area) button{
}
/* Graduated filter big button */
#ExpanderBox > box > box:first-child > button:not(.flat):not(.text-button):first-child {
- min-height: 2.16667em;
- min-width: 2.16667em;
+ min-height: 2.33334em;
+ min-width: 2.33334em;
padding: 0;
margin: 0 0 0.5em;
}
@@ -1526,7 +1549,7 @@ button.color {
/* Save, Cancel, OK ... buttons */
.dialog-action-area button {
- min-height: 2.16667em;
+ min-height: 2.33334em;
margin-top: 0.33334em;
}
messagedialog .dialog-action-area button {
@@ -1672,7 +1695,7 @@ messagedialog headerbar button.titlebutton {
#MainNotebook tab #CloseButton {
padding: 0;
- margin: 0.33334em -3px 0.33334em 0.08334em;
+ margin: 0.33334em -3px 0.33334em 0.16667em;
min-width: 1.5em;
min-height: 1.5em;
}
@@ -1731,7 +1754,6 @@ radio {
min-width: 1.16667em;
box-shadow: none;
background-repeat: no-repeat;
- -gtk-icon-shadow: none;
color: @text-color;
}
radiobutton label,
@@ -1829,7 +1851,6 @@ spinbutton button {
border: none;
border-radius: 0;
box-shadow: none;
- -gtk-icon-shadow: none;
}
#MyExpander spinbutton entry,
spinbutton entry {
diff --git a/rtdata/themes/TooWaGrey - Bright-GTK3-20_.css b/rtdata/themes/TooWaGrey - Bright-GTK3-20_.css
new file mode 100644
index 000000000..74dd5c7f0
--- /dev/null
+++ b/rtdata/themes/TooWaGrey - Bright-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 .
+*/
+
+
+/*****************************************/
+/**/ @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(112,112,112); /*** 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(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(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(135,135,135); /*** Slider knob * Default: rgb(115,115,115) ***/
+
+@define-color accent-color3 rgb(55,55,55); /*** Selected thumbnail background color * Default: rgb(35,99,166) ***/
+@define-color text-hl-color3 rgb(210,210,210); /*** Selected thumbnail text color * Default: rgb(210,210,210) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(119,119,119);
+@define-color bg-grey rgb(95,95,95);
+@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);
+
+@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(36,36,36);
+@define-color text-tooltip rgb(36,36,36);
+/***********************************************/
+@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(75,75,75);
+@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(160,160,160);
+@define-color bg-tb-spinbutton shade(@bg-grey, 1.3);
+/***********************************************************************************************/
diff --git a/rtdata/themes/TooWaGrey - Dark-GTK3-20_.css b/rtdata/themes/TooWaGrey - Dark-GTK3-20_.css
new file mode 100644
index 000000000..0f61e0935
--- /dev/null
+++ b/rtdata/themes/TooWaGrey - Dark-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 .
+*/
+
+
+/*****************************************/
+/**/ @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(65,65,65); /*** Active color for Lists, Menu, Borders ... * Default: rgb(33,82,145) ***/
+@define-color text-hl-color rgb(200,200,200); /*** Active text color * Default: rgb(200,200,200) ***/
+
+@define-color bg-highlighted-text-color rgb(33,82,150); /*** Highlighted text color background* Default: rgb(33,82,145) ***/
+@define-color highlighted-text-color rgb(200,200,200); /*** Highlighted text color * Default: rgb(200,200,200) ***/
+
+@define-color bg-image rgb(58,58,58); /*** Image area & File Browser background * Default: rgb(58,58,58) ***/
+
+@define-color accent-color2 rgb(33,82,150); /*** Scale, Progressbar, Scrollbar, Tabs * Default: rgb(33,82,145) ***/
+@define-color accent-color4 rgb(98,98,98); /*** Slider knob * Default: rgb(98,98,98) ***/
+
+@define-color accent-color3 rgb(30,30,30); /*** Selected thumbnail background color * Default: rgb(33,82,145) ***/
+@define-color text-hl-color3 rgb(200,200,200); /*** Selected thumbnail text color * Default: rgb(200,200,200) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(75,75,75);
+@define-color bg-grey rgb(58,58,58);
+@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);
+
+@define-color winHeaderbar rgb(50,50,50);
+@define-color winTitle rgb(190,190,190);
+
+@define-color bg-tooltip rgb(170,170,170);
+@define-color border-tooltip rgb(36,36,36);
+@define-color text-tooltip rgb(36,36,36);
+/***********************************************/
+@define-color text-color rgb(176,176,176);
+@define-color text-tbEntry rgb(192,192,192);
+@define-color border-color rgba(255,255,255,.30);
+@define-color bg-list-hover rgb(50,50,50);
+@define-color bg-scale-entry rgba(0,0,0,.14);
+@define-color bg-button-border rgba(0,0,0,.60);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color view-grid-border rgba(255,255,255,0.15);
+@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);
+/***********************************************************************************************/
diff --git a/rtdata/themes/TooWaGrey-GTK3-20_.css b/rtdata/themes/TooWaGrey-GTK3-20_.css
new file mode 100644
index 000000000..f681ef374
--- /dev/null
+++ b/rtdata/themes/TooWaGrey-GTK3-20_.css
@@ -0,0 +1,72 @@
+/*
+ This file is part of RawTherapee.
+
+ Copyright (c) 2016-2017 TooWaBoo
+ Version 2.66
+
+ 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 .
+*/
+
+
+/*****************************************/
+/**/ @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(88,88,88); /*** Active color for Lists, Menu, Borders ... * Default: rgb(35,99,166) ***/
+@define-color text-hl-color rgb(210,210,210); /*** Active text color * Default: rgb(210,210,210) ***/
+
+@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(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) ***/
+
+@define-color accent-color3 rgb(40,40,40); /*** Selected thumbnail background color * Default: rgb(35,99,166) ***/
+@define-color text-hl-color3 rgb(210,210,210); /*** Selected thumbnail text color * Default: rgb(210,210,210) ***/
+
+/*** Change me end *****************************************************************************/
+
+@define-color bg-light-grey rgb(95,95,95);
+@define-color bg-grey rgb(75,75,75);
+@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);
+
+@define-color winHeaderbar rgb(55,55,55);
+@define-color winTitle rgb(190,190,190);
+
+@define-color bg-tooltip rgb(185,185,185);
+@define-color border-tooltip rgb(40,40,40);
+@define-color text-tooltip rgb(40,40,40);
+/***********************************************/
+@define-color text-color rgb(186,186,186);
+@define-color text-tbEntry rgb(192,192,192);
+@define-color border-color rgba(255,255,255,.30);
+@define-color bg-list-hover rgb(50,50,50);
+@define-color bg-scale-entry rgba(0,0,0,.14);
+@define-color bg-button-border rgba(0,0,0,.60);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color view-grid-border rgba(255,255,255,0.15);
+@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);
+/***********************************************************************************************/