diff --git a/rtdata/themes/TooWaBlue.css b/rtdata/themes/TooWaBlue.css
index fa4369894..59c12bb7f 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.13)
+ Copyright (c) 2016 TooWaBoo (v1.19.1)
Many thanks to the RawTherapee Developer Team for this great piece of software
RawTherapee is free software: you can redistribute it and/or modify
@@ -20,97 +20,109 @@
/*** 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 accent-color rgb(35,99,166); /*** Highlight/selected color for Tab indicator, 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-color2 rgb(35,99,166); /*** Slider, Progressbar, Scrollbar ***/
@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-color #B4B4B4;
@define-color text-hl-color2 #C0C0C0;
@define-color text-tbEntry #C0C0C0;
@define-color bg-dark-grey #242424;
-@define-color bg-grey #474747;
-@define-color bg-light-grey #595959;
+@define-color bg-grey #464646;
+@define-color bg-light-grey #585858;
@define-color border-color rgba(255,255,255,.25);
@define-color bg-list-hover rgba(255,255,255,.065);
@define-color bg-scale-entry rgba(0,0,0,.14);
-@define-color bg-button-border rgba(0,0,0,.38);
-@define-color bg-entry-border rgba(0,0,0,.26);
-@define-color bg-button-hover rgba(0,0,0,.15);
+@define-color bg-button-border rgba(0,0,0,.48);
+@define-color bg-button-border-hover rgba(0,0,0,.58);
+@define-color bg-entry-border rgba(0,0,0,.40);
+@define-color bg-button-hover rgba(0,0,0,.22);
@define-color bg-spin-button-hover rgba(0,0,0,.25);
@define-color bg-entry-IPTC @bg-dark-grey;
+@define-color view-grid-border #404040;
* {
color: @text-color;
- transition: none;
- text-shadow: none;
- icon-shadow: none;
- box-shadow: none;
- outline-style: none; /* removes the ugly dotted focus line */
- border-image: none;
+ transition: none;
+ text-shadow: none;
+ icon-shadow: none;
+ box-shadow: none;
+ outline-style: none; /* removes the ugly dotted focus line */
+ border-image: none;
+ -GtkCheckButton-indicator-size: 16;
+ -GtkCheckMenuItem-indicator-size: 16;
+ -GtkCheckButton-indicator-spacing: 2;
}
-.undershoot.top,
-.undershoot.right,
-.undershoot.bottom,
-.undershoot.left {
- background-image: none; /* removes the dotted scrollbar line */
+
+.undershoot {
+ background-image: none; /* removes the dotted scrollbar line */
}
GtkWindow {
- background-color: @bg-light-grey;
+ background-color: @bg-light-grey;
}
GtkDialog {
- background-color: @bg-grey;
- -GtkDialog-content-area-spacing: 4;
- -GtkDialog-action-area-border: 0;
- -GtkDialog-content-area-border: 8;
+ background-color: @bg-grey;
+ -GtkDialog-content-area-spacing: 7;
+ -GtkDialog-action-area-border: 0;
+ -GtkDialog-content-area-border: 8;
}
GtkFontChooser,
GtkColorChooser {
- -GtkDialog-action-area-border: 4;
- -GtkDialog-content-area-border: 0;
+ -GtkDialog-action-area-border: 4;
+ -GtkDialog-content-area-border: 0;
}
+
.frame {
border: none;
}
-
-GtkPaned .frame .frame {
- border-top: 2px solid transparent;
- border-bottom: 4px solid transparent;
+#PrefNotebook > .frame {
+ border: 1px solid rgba(0,0,0,.50);
+ border-top: none;
}
-GtkDialog GtkPaned .frame .frame {
- border-top: none;
- border-bottom: none;
+#BatchQueueButtonsMainContainer GtkFrame {
+ padding: 4px 4px 4px 10px;
+}
+
+/*** Add space between buttons and image area***/
+#BeforeAfterContainer GtkFrame {
+ padding: 2px 0 4px;
+}
+/*** Add space between before/after image ***/
+#BeforeAfterContainer GtkContainer:nth-child(1) > GtkContainer:nth-child(2) GtkFrame {
+ padding-right: 14px;
}
/*** Menu bubble box ***/
GtkPopover {
- background-color: @bg-dark-grey;
+ background-color: @bg-dark-grey;
border: 1px solid @accent-color;
- border-radius: 0;
+ border-radius: 0;
}
+
.menu {
background-color: @bg-dark-grey;
border: 1px solid @accent-color;
}
-.menuitem {
- padding: 3px 4px;
+.menu .menuitem {
+ padding: 2px 4px;
}
-.menuitem:hover {
- background-color: @accent-color;
+.menu .menuitem:hover {
+ background-color: @accent-color;
}
-.menuitem:hover * {
- color: @text-hl-color;
+.menu .menuitem:hover * {
+ color: @text-hl-color;
}
GtkNotebook {
padding: 4px;
- background-color: @bg-light-grey;
+ background-color: @bg-light-grey;
}
GtkDialog GtkNotebook {
padding: 2px 0 0;
@@ -119,173 +131,228 @@ GtkDialog GtkNotebook {
padding: 4px 8px;
}
#RightNotebook {
- padding: 0 0 0 4px;
+ padding: 0 0 0 4px;
}
GtkPaned {
- -GtkPaned-handle-size: 4px;
- background-color: transparent;
+ -GtkPaned-handle-size: 4px;
+ background-color: transparent;
}
.pane-separator {
- background-color: @bg-light-grey;
+ background-color: @bg-light-grey;
}
GtkDialog .pane-separator {
- background-color: @bg-grey;
+ background-color: @bg-grey;
}
+/*** Separator ***/
.separator {
- color: @bg-light-grey;
+ color: @bg-light-grey;
}
GtkDialog .separator {
- color: @border-color;
+ color: @border-color;
}
#RightNotebook .separator {
- color: @bg-dark-grey;
+ color: @bg-dark-grey;
}
+ /*** Navigator ***/
+#Navigator .separator {
+ color: @view-grid-border;
+}
+/*** end ***/
/*** Background color image area***/
GtkDrawingArea {
- background-color: @bg-grey;
+ background-color: @bg-grey;
+ border: 1px solid rgba(0,0,0,.32);
}
/*** Histogram ***/
-GtkGrid GtkContainer GtkDrawingArea:nth-child(1) {
- background-color: @bg-dark-grey;
- border: none;
+#HistogramPanel,
+#HistogramArea {
+ background-color: @bg-dark-grey;
+ border: none;
}
/*** Histogram RGB-Bar***/
-GtkGrid GtkContainer GtkDrawingArea:nth-child(2) {
- background-color: #747474;
- border: none;
+#HistogramRGBArea {
+ background-color: #808080;
+ border: none;
}
/*** Navigator ***/
-GtkWindow GtkPaned:nth-child(1) GtkFrame GtkVBox:nth-child(2) GtkDrawingArea {
- background-color: @bg-dark-grey;
+#Navigator GtkDrawingArea {
+ background-color: @bg-dark-grey;
+ border: 1px solid @bg-dark-grey;
}
+#Navigator {
+ background-color: @bg-dark-grey;
+ border-top: 156px solid @bg-light-grey;
+}
+
#RightNotebook GtkDrawingArea {
- background-color: @bg-dark-grey;
+ background-color: @bg-dark-grey;
}
/*** Label ***/
-.label {
- padding: 0 4px;
+ .label {
+ padding: 0 4px;
}
-GtkTable .label {
- padding: 0;
+ /*** Increase space between labels in navigater ***/
+#Navigator .label {
+ padding: 6px 0 3px;
}
+#Navigator GtkTable .label {
+ padding: 0 0 4px;
+}
+ /***/
GtkDialog .label,
#ToolPanelNotebook .label,
.notebook tab .label {
- padding: 0 1px;
+ padding: 0 1px;
}
-.button .label,
-#ToolPanelNotebook .button .label {
- padding: 0 0 2px;
+.button .label {
+ padding: 0;
}
+
+ /*** Add left and right space between frame and labels ***/
.frame > .label,
#ToolPanelNotebook .frame > .label {
- padding: 4px 5px;
+ padding: 4px;
}
+#BatchQueueButtonsMainContainer GtkFrame:nth-child(3) > .label{
+ padding: 2px 0px 4px;
+}
+
#MyExpanderTitle .label {
- padding: 2px 3px;
+ padding: 2px 3px;
}
/*** end ***/
.tooltip {
- background-color: @bg-dark-grey;
- border: 1px solid @accent-color;
- border-radius: 0;
- padding: 0;
+ border-radius: 0;
+ padding: 0;
+}
+.tooltip.background {
+ background-color: @bg-dark-grey;
+ border: 1px solid @accent-color;
}
-#partialPasteHeaderSep {color: @accent-color;}
-#partialPasteHeader * {color: #E0E0E0;}
+/*** PartialPaste ***/
+#PartialPaste:nth-child(2) {
+ background-color: @bg-light-grey;
+ border: 1px solid rgba(0,0,0,.50);
+}
+#PartialPaste > .frame {
+ padding: 8px 10px;
+}
+#PartialPasteHeaderSep {
+ color: #C0C0C0;
+}
+#PartialPasteHeader .label {
+ color: #D5D5D5;
+}
+/*** end ***/
/*** Scrollbar ***/
.scrollbar.trough {
- background-color: rgba(0,0,0,.38);
- background-image: none;
- border: none;
+ background-color: rgba(0,0,0,.38);
+ background-image: none;
+ border: none;
}
.scrollbar.slider:active {
- background-color: shade(@accent-color2,1.12);
+ background-color: shade(@accent-color2,1.12);
}
/*** end ***/
/*** Scale & Progressbar ***/
.scale {
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
-GtkRange-trough-border: 6;
- -GtkScale-slider-length: 15;
+ -GtkScale-slider-length: 15;
-GtkRange-slider-width: 15;
}
-.scale.trough {
+.scale.trough,
+#ToolPanelNotebook .scale.trough {
background-color: @bg-scale-entry;
- border-color: @bg-dark-grey;
+ border-color: @bg-dark-grey;
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
+}
+.scale.trough.highlight,
+#ToolPanelNotebook .scale.trough.highlight {
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
+ background-image: none;
+ background-color: @accent-color2;
+ border: 1px solid @bg-dark-grey;
+ color: @text-hl-color2;
}
.scale.slider,
-.scale.trough.highlight,
-#ToolPanelNotebook .scale.trough.highlight,
#ToolPanelNotebook .scale.slider {
- background-image: none;
- background-color: @accent-color2;
- border: 1px solid @bg-dark-grey;
- color: @text-hl-color2;
+ box-shadow: inset 0 2px rgba(255, 255, 255, 0.08), inset 0 -2px rgba(0, 0, 0, 0.09);
+ background-image: none;
+ background-color: @accent-color2;
+ border: 1px solid shade(@bg-dark-grey, 1.12);
}
.scale.fine-tune {
-GtkRange-trough-border: 5;
}
-GtkFontChooser .scale {
+.scale.scale-has-marks-below {
-GtkRange-trough-border: 6;
- -GtkScale-slider-length: 6;
+ -GtkScale-slider-length: 6;
-GtkRange-slider-width: 19;
}
-GtkFontChooser .scale.slider {
- border-radius: 0 0 20px 20px;
- border: 1px solid @bg-dark-grey;
+.scale.slider.scale-has-marks-below {
+ border-radius: 0 0 20px 20px;
+ border: 1px solid @bg-dark-grey;
}
-GtkFontChooser .scale.fine-tune {
+.scale.fine-tune.scale-has-marks-below {
-GtkRange-trough-border: 5;
}
.scale.slider:active,
#ToolPanelNotebook .scale.slider:active {
- border-color: shade (@accent-color2,.55);
+ border-color: shade (@accent-color2,.55);
}
GtkProgressBar {
-GtkProgressBar-min-vertical-bar-width: 8;
-GtkProgressBar-min-horizontal-bar-height: 8;
- -GtkProgressBar-yspacing: 6px;
- border-radius: 10px;
+ -GtkProgressBar-yspacing: 4px;
+ border-radius: 10px;
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(242, 242, 242, 0.1);
}
.progressbar {
background-image: none;
background-color: @accent-color2;
- border-color: @bg-dark-grey;
+ border-color: @bg-dark-grey;
}
GtkProgressBar.trough {
background-image: none;
background-color: @bg-scale-entry;
}
+#MainNotebook > GtkGrid GtkProgressBar {
+ box-shadow: none;
+}
#MainNotebook > GtkGrid GtkProgressBar.trough {
background-image: none;
background-color: @bg-dark-grey;
- border-color: @bg-dark-grey;
+ border-color: @bg-dark-grey;
}
/*** end ***/
/*** Load/Save ***/
GtkFileChooserWidget {
- background-color: transparent;
+ background-color: @bg-grey;
+}
+GtkFileChooserWidget > GtkBox {
+ border-bottom-color: @bg-dark-grey;
}
GtkFileChooserWidget GtkBox {
- background-color: transparent;
+ background-color: transparent;
}
GtkFileChooserWidget GtkListBox * {
- padding-top: 1px;
- padding-bottom: 1px;
+ padding-top: 1px;
+ padding-bottom: 1px;
}
GtkFileChooserWidget GtkListBox {
- background-color: @bg-dark-grey;
+ background-color: @bg-dark-grey;
}
GtkFileChooserWidget .list-row * {
padding: 1px 4px;
@@ -294,7 +361,7 @@ GtkFileChooserWidget .list-row:hover {
background-color: @bg-list-hover;
}
GtkFileChooserWidget .list-row:hover * {
- color: @text-hl-color2;
+ color: @text-hl-color2;
}
GtkFileChooserWidget .list-row:selected {
background-color: @accent-color;
@@ -307,98 +374,99 @@ GtkFileChooserWidget .list-row:selected * {
/*** Tab Bars ***/
.notebook tab, .notebook.header {
background-color: @bg-dark-grey;
- border-color: @bg-dark-grey;
+ border-color: @bg-dark-grey;
}
#MainNotebook tab {
- padding: 5px;
+ padding: 5px;
}
.notebook tab.top {
- border-width: 0 0 5px 0;
+ border-width: 0 0 5px 0;
}
.notebook tab.left {
- border-width: 0 5px 0 0;
+ border-width: 0 5px 0 0;
}
#RightNotebook tab.left,
#PrefNotebook tab,
GtkDialog tab {
- padding: 9px;
+ padding: 9px;
}
#ToolPanelNotebook tab {
- padding: 10px 4px 7px;
+ padding: 10px 4px 7px;
}
#MetaPanelNotebook tab {
- padding: 8px 4px;
+ padding: 8px 4px;
}
.notebook tab:active {
- border-color: @accent-color2;
+ border-color: @accent-color;
}
/*** end ***/
/*** File Browser ***/
#FileBrowser GtkDrawingArea {
- background-color: @bg-grey;
+ background-color: @bg-grey;
}
#FileBrowser GtkDrawingArea:selected {
background-color: @accent-color3;
- color: @text-hl-color3;
+ color: @text-hl-color3;
}
/*** end ***/
/*** Image ***/
GtkImage {
- padding: 0;
+ padding: 0;
}
#MainNotebook > GtkGrid GtkImage {
padding: 1px;
}
#ToolPanelNotebook GtkImage{
- padding: 0 4px;
+ padding: 0 4px;
}
#MyExpanderTitle GtkImage{
- padding: 0;
+ padding: 0;
}
#ToolPanelNotebook tab GtkImage,
#ToolPanelNotebook .button GtkImage {
- padding: 1px 0;
+ padding: 1px 0;
}
GtkDialog .button GtkImage{
- padding: 0;
+ padding: 0;
}
GtkFileChooserWidget .button GtkImage{
- padding: 0 4px;
+ padding: 0 4px;
}
/*** end ***/
/*** Toolpanel ***/
#ToolPanelNotebook {
- background-color: @bg-dark-grey;
- padding: 0;
- border-top: 4px solid @bg-dark-grey;
+ background-color: @bg-dark-grey;
+ padding: 0;
+ border-top: 4px solid @bg-dark-grey;
}
#ToolPanelNotebook GtkScrolledWindow GtkViewport.frame {
- padding: 0 4px;
+ padding: 0 4px;
}
#ToolPanelNotebook .separator {
- color: transparent;
+ color: transparent;
}
#ToolPanelNotebook GtkFrame, #PrefNotebook GtkFrame {
border: 1px solid @border-color;
border-radius: 0;
- padding: 5px;
+ padding: 5px;
}
#ToolPanelNotebook GtkDrawingArea {
- background-color: @bg-dark-grey;
- border-color: @bg-light-grey;
+ background-color: @bg-dark-grey;
+ border-color: @bg-light-grey;
+ color: @text-color;
}
#ToolPanelNotebook GtkDrawingArea {
- border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */
+ border-radius: 1px; /* BUG: if 0, scale mini sliders look funny */
}
#ExpanderBox #ExpanderBox, #ExpanderBox2, #ExpanderBox3 {
@@ -421,26 +489,27 @@ GtkFileChooserWidget .button GtkImage{
/*** View ***/
.view {
background-color: @bg-dark-grey;
+ border-color: @view-grid-border;
}
#PrefNotebook .view {
background-color: @bg-grey;
}
#MainNotebook .view.cell:nth-child(2) {
- padding: 1px 0px 1px 4px;
+ padding: 1px 0px 1px 4px;
}
-.view:hover {
+.view row:hover {
background-color: @bg-list-hover;
- color: @text-hl-color2;
+ color: @text-hl-color2;
}
-#PrefNotebook .view:hover {
+#PrefNotebook .view row:hover {
background-color: @bg-light-grey;
- color: @text-hl-color2;
+ color: @text-hl-color2;
}
-.view:selected {
+.view row:selected {
color: @text-hl-color;
background-color: @accent-color;
}
-#PrefNotebook .view:selected {
+#PrefNotebook .view row:selected {
color: @text-hl-color;
background-color: @accent-color;
}
@@ -448,37 +517,37 @@ GtkFileChooserWidget .button GtkImage{
/*** Metadata ***/
#MetaPanelNotebook {
- padding: 8px 11px 0;
+ padding: 8px 11px 0;
}
#MetaPanelNotebook GtkScrolledWindow GtkViewport.frame {
- padding: 8px 10px;
+ padding: 8px 10px;
}
#MetaPanelNotebook.frame {
- background-color: @bg-grey;
- border-bottom: none;
- border-top: 4px solid @bg-dark-grey;
- border-left: 9px solid @bg-dark-grey;
- border-right: 9px solid @bg-dark-grey;
+ background-color: @bg-grey;
+ border-bottom: none;
+ border-top: 4px solid @bg-dark-grey;
+ border-left: 9px solid @bg-dark-grey;
+ border-right: 9px solid @bg-dark-grey;
}
#MetaPanelNotebook .separator {
- color: @border-color;
+ color: @border-color;
}
#MetaPanelNotebook.header {
- background-color: @bg-dark-grey;
+ background-color: @bg-dark-grey;
}
#MetaPanelNotebook GtkTreeView {
- padding: 1px;
- background-color: @bg-grey;
+ padding: 1px;
+ background-color: @bg-grey;
}
#MetaPanelNotebook .frame GtkTreeView {
- padding: 0px;
- background-color: @bg-entry-IPTC;
+ padding: 0px;
+ background-color: @bg-entry-IPTC;
}
#MetaPanelNotebook GtkTreeView:hover,
#MetaPanelNotebook .frame GtkTreeView:hover {
background-color: @bg-list-hover;
- color: @text-hl-color;
+ color: @text-hl-color;
}
#MetaPanelNotebook GtkTreeView:selected,
#MetaPanelNotebook .frame GtkTreeView:selected {
@@ -488,18 +557,19 @@ GtkFileChooserWidget .button GtkImage{
#MetaPanelNotebook GtkTextView {
color: @text-color;
background-color: @bg-entry-IPTC;
- padding: 2px 4px;
+ padding: 2px 4px;
}
/*** end ***/
/*** Entry ***/
.entry {
- background-image: none;
- background-color: @bg-scale-entry;
- border: 1px solid @bg-entry-border;
- border-radius: 0;
- padding: 2px 4px;
- color: @text-color;
+ background-image: none;
+ background-color: @bg-scale-entry;
+ border: 1px solid @bg-entry-border;
+ border-radius: 0;
+ padding: 3px 4px;
+ color: @text-color;
+ box-shadow: inset 1px 1px rgba(0, 0, 0, 0.08), 0 1px rgba(242 , 242, 242, 0.1);
}
.entry:focused:selected {
color: @text-hl-color;
@@ -515,10 +585,11 @@ GtkFileChooserWidget .button GtkImage{
}
#ToolPanelNotebook .entry {
padding: 0 4px 0 8px;
- border-radius: 20px 0 0 20px;
- background-color: rgba(255,255,255,.12);
- border: 1px solid rgba(0,0,0,.48);
- color: @text-tbEntry;
+ border-radius: 20px 0 0 20px;
+ background-color: rgba(255,255,255,.12);
+ border: 1px solid rgba(0,0,0,.46);
+ color: @text-tbEntry;
+ box-shadow: inset 1px 1px rgba(0, 0, 0, .12), 0 1px rgba(255 , 255, 255, 0.12);
}
#ToolPanelNotebook .entry:focused:selected {
color: @text-hl-color;
@@ -533,202 +604,226 @@ GtkFileChooserWidget .button GtkImage{
background-color: rgba(255,255,255,.12);
}
-#MetaPanelNotebook .entry:not(:selected):not(:insensitive) {
+#MetaPanelNotebook .entry {
color: @text-color;
background-color: @bg-entry-IPTC;
- border: 1px solid rgba(0,0,0,.50);
- border-radius: 0;
- padding: 2px 4px;
+ border: none;
+ border-radius: 0;
+ padding: 2px 4px;
+ box-shadow: none;
}
#MetaPanelNotebook .entry:focused:selected {
color: @text-hl-color;
background-color: @accent-color;
+ box-shadow: none;
}
#MetaPanelNotebook .entry:not(:focused):not(:insensitive) {/*Workaround*/
color: @text-color;
background-color: transparent;
+ box-shadow: none;
}
#MetaPanelNotebook .entry:not(:selected):not(:insensitive) {
color: @text-color;
background-color: @bg-entry-IPTC;
+ box-shadow: none;
}
/*** end ***/
/*** Buttons ***/
.button {
- background-image: linear-gradient(to bottom, rgba(0,0,0,.07), rgba(0,0,0,.22));
- background-color: transparent;
- border: 1px solid @bg-button-border;
- border-radius: 0;
- padding: 3px 4px;
+ background-color: transparent;
+ border: 1px solid @bg-button-border;
+ border-radius: 0;
+ padding: 3px 4px;
+ box-shadow: inset 0 1px rgba(242, 242, 242, 0.1), 0 1px rgba(242, 242, 242, 0.1);
+ background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.14) 40%, rgba(0,0,0,.26));
+}
+.message-dialog .dialog-action-area .button {
+ padding: 6px;
+ }
+
+.button.Left + .button:not(.image-button).Right {
+ border-left: none;
}
GtkComboBox .button {
- padding: 4px 3px;
+ padding: 4px 3px;
}
#ToolPanelNotebook .button,
-GtkDialog .button {
+GtkDialog .button,
+#BatchQueueButtonsMainContainer .button {
padding: 0px 3px;
}
-
-#ToolPanelNotebook GtkComboBox {
- padding-left: 4px; /*** Space between label and Dropbox ***/
+#BatchQueueButtons .button {
+ padding-top: 6px;
+ padding-bottom: 6px
}
-#MetaPanelNotebook GtkComboBox {
- padding-left: 0;
+#BeforeAfterContainer .button {
+ padding: 2px;
+}
+
+ /*** Fix: Space between first Retinex Comboboxes ***/
+GtkLabel + GtkComboBox + GtkComboBox {
+ padding-left: 4px;
}
.text-button {
- padding: 1px 0;
- -GtkButton-child-displacement-x: 0;
- -GtkButton-child-displacement-y: 0;
- -GtkCheckButton-indicator-size: 16;
- -GtkCheckButton-indicator-spacing: 3;
+ padding: 0 2px 0 0;
}
-#ToolPanelNotebook .text-button {
- padding: 0 5px 0 0;
+#PartialPaste .text-button {
+ padding: 0 8px 0 2px;
+ -GtkCheckButton-indicator-spacing: 1;
}
+#ToolPanelNotebook GtkFrame > .text-button {
+ padding: 0 3px 0 0;
+}
+
.button.text-button {
- padding: 4px 10px;
+ padding: 5px 12px;
}
-#ToolPanelNotebook .button.text-button {
- padding: 0px 3px;
+#ToolPanelNotebook .button.text-button,
+#PrefNotebook .button.text-button,
+GtkFileChooserWidget .button.text-button,
+#RightNotebook .button.text-button {
+ padding: 3px 4px;
}
.spinbutton .button {
- background-image: none;
- background-color: transparent;
- border: none;
- border-radius: 0;
- padding: 2px;
+ background-image: none;
+ background-color: transparent;
+ border: none;
+ border-radius: 0;
+ padding: 2px;
+ box-shadow: none;
}
#ToolPanelNotebook .spinbutton .button {
- padding: 0;
+ padding: 0;
}
-#fullButton,
-#histButton {
- padding: 4px;
-}
.button:hover {
- background-color: @bg-button-hover;
+ background-color: rgba(0, 0, 0,.18);
}
#ToolPanelNotebook .spinbutton .button:hover {
- background-color: @bg-spin-button-hover;
+ background-color: @bg-spin-button-hover;
}
.button:active,
.button:checked {
- background-image: linear-gradient(to bottom, #292929, #202020);
- background-color: transparent;
- border-color: black;
+ background-image: linear-gradient(to bottom, #292929, #252525 40%, #191919);
+ background-color: transparent;
+ border-color: black;
}
#MainNotebook > GtkGrid .button {
- padding: 2px;
- border: 4px solid @bg-dark-grey;
- background-color: transparent;
- background-image: none;
+ padding: 2px;
+ border: 4px solid @bg-dark-grey;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
}
#MainNotebook tab .button {
- padding: 1px;
- border-top: 4px solid @bg-dark-grey;
- border-bottom: 4px solid @bg-dark-grey;
- border-left: none;
- border-right: none;
- background-color: transparent;
- background-image: none;
+ padding: 1px;
+ border-top: 4px solid @bg-dark-grey;
+ border-bottom: 4px solid @bg-dark-grey;
+ border-left: none;
+ border-right: none;
+ background-color: transparent;
+ background-image: none;
+ box-shadow: none;
}
#MainNotebook > GtkGrid .button:hover,
#MainNotebook tab .button:hover {
- background-color: rgba(255,255,255,.14);
+ background-color: rgba(255,255,255,.20);
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0.12);
+ background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.12) 40%, rgba(0,0,0,.24));
}
#MainNotebook > GtkGrid .button:active,
#MainNotebook tab .button:active {
- background-color: rgba(255,255,255,.2);
+ background-color: rgba(255,255,255,.27);
+ box-shadow: inset 0 1px rgba(255, 255, 255, 0.12);
+ background-image: linear-gradient(to bottom, rgba(0,0,0,.05), rgba(0,0,0,.12) 40%, rgba(0,0,0,.24));
}
.view .button {
- background-color: #181818;
- padding: 2px 6px;
+ background-color: #141414;
+ padding: 1px 5px 2px;
+ background-image: none;
+ border-color: black;
+ box-shadow: none;
+}
+.menu .button.bottom,
+.menu .button.bottom:insensitive {
+ background-color: #141414;
+ border-color: @accent-color;
+ border-width: 0 1px 1px 1px;
+ background-image: none;
+ box-shadow: none;
+}
+.menu .button.top,
+.menu .button.top:insensitive {
+ background-color: #141414;
+ border-color: @accent-color;
+ border-width: 1px 1px 0 1px;
+ background-image: none;
+ box-shadow: none;
+}
+#fullButton,
+#histButton {
+ padding: 5px;
+ border: none;
+ background-color: @bg-dark-grey;
+ background-image: none;
+ box-shadow: none;
}
/*** 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));
+ -gtk-icon-source: url("images/twb/checkbox-unchecked.png");
}
.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));
+ -gtk-icon-source: url("images/twb/checkbox-checked.png");
}
.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)));
+ -gtk-icon-source: url("images/twb/checkbox-unchecked-disabled.png");
}
.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)));
+ -gtk-icon-source: url("images/twb/checkbox-checked-disabled.png");
+}
+.check:inconsistent,
+.check row:inconsistent {
+ -gtk-icon-source: url("images/twb/checkbox-inconsistent.png");
+}
+.check:inconsistent:insensitive,
+.check row:inconsistent:insensitive {
+ -gtk-icon-source: url("images/twb/checkbox-inconsistent-disabled.png");
}
.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));
+ -gtk-icon-source: url("images/twb/radio-unchecked.png");
}
.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));
+ -gtk-icon-source: url("images/twb/radio-checked.png");
}
.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));
+ -gtk-icon-source: url("images/twb/radio-unchecked-disabled.png");
}
.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));
+ -gtk-icon-source: url("images/twb/radio-checked-disabled.png");
+}
+.radio:inconsistent,
+.radio row:inconsistent {
+ -gtk-icon-source: url("images/twb/radio-inconsistent.png");
+}
+.radio:inconsistent:insensitive,
+.radio row:inconsistent:insensitive {
+ -gtk-icon-source: url("images/twb/radio-inconsistent-disabled.png");
}
/*** end ***/
@@ -736,21 +831,25 @@ GtkDialog .button {
*:insensitive,
#ToolPanelNotebook *:insensitive {
- color: #808080;
+ color: #808080;
+ box-shadow: none;
}
#ToolPanelNotebook .entry:insensitive {
- color: #909090;
- background-color: rgba(255,255,255,.04);
+ color: #909090;
+ background-color: rgba(255,255,255,.06);
+ box-shadow: none;
}
.button:insensitive {
- background-image: none;
- background-color: rgba(0,0,0,.07);
- border-color: rgba(0,0,0,.22);
+ background-image: none;
+ background-color: rgba(0,0,0,.10);
+ border-color: rgba(0,0,0,.30);
+ box-shadow: none;
}
.spinbutton .button:insensitive {
- background-image: none;
- background-color: transparent;
- border: none;
+ background-image: none;
+ background-color: transparent;
+ border: none;
+ box-shadow: none;
}
.scale.slider:insensitive,
.scale.trough.highlight:insensitive,
@@ -758,6 +857,7 @@ GtkDialog .button {
#ToolPanelNotebook .scale.slider:insensitive,
#ToolPanelNotebook .scale.trough.highlight:insensitive,
#ToolPanelNotebook .scale.trough:insensitive {
- background-color: #414141;
+ background-color: #414141;
+ box-shadow: none;
}
/*** end ***/
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked.file b/rtdata/themes/images/svg/twb/checkbox-checked.file
new file mode 100644
index 000000000..e73336e49
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-checked.file
@@ -0,0 +1 @@
+checkbox-checked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/checkbox-checked.svg b/rtdata/themes/images/svg/twb/checkbox-checked.svg
new file mode 100644
index 000000000..dfb8cdb1d
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-checked.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/rtdata/themes/images/svg/twb/checkbox-inconsistent.file b/rtdata/themes/images/svg/twb/checkbox-inconsistent.file
new file mode 100644
index 000000000..3cf556015
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-inconsistent.file
@@ -0,0 +1 @@
+checkbox-inconsistent.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg b/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
new file mode 100644
index 000000000..6f84862ab
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-inconsistent.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/rtdata/themes/images/svg/twb/checkbox-unchecked.file b/rtdata/themes/images/svg/twb/checkbox-unchecked.file
new file mode 100644
index 000000000..830b9580f
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-unchecked.file
@@ -0,0 +1 @@
+checkbox-unchecked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/checkbox-unchecked.svg b/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
new file mode 100644
index 000000000..fbff9883e
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/checkbox-unchecked.svg
@@ -0,0 +1,118 @@
+
+
+
+
diff --git a/rtdata/themes/images/svg/twb/radio-checked.file b/rtdata/themes/images/svg/twb/radio-checked.file
new file mode 100644
index 000000000..c6fda7ded
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-checked.file
@@ -0,0 +1 @@
+radio-checked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/radio-checked.svg b/rtdata/themes/images/svg/twb/radio-checked.svg
new file mode 100644
index 000000000..338a9927a
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-checked.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/rtdata/themes/images/svg/twb/radio-inconsistent.file b/rtdata/themes/images/svg/twb/radio-inconsistent.file
new file mode 100644
index 000000000..811aad4e3
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-inconsistent.file
@@ -0,0 +1 @@
+radio-inconsistent.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/radio-inconsistent.svg b/rtdata/themes/images/svg/twb/radio-inconsistent.svg
new file mode 100644
index 000000000..45da3f39e
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-inconsistent.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/rtdata/themes/images/svg/twb/radio-unchecked.file b/rtdata/themes/images/svg/twb/radio-unchecked.file
new file mode 100644
index 000000000..bc2ab4d30
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-unchecked.file
@@ -0,0 +1 @@
+radio-unchecked.png,w16,actions
diff --git a/rtdata/themes/images/svg/twb/radio-unchecked.svg b/rtdata/themes/images/svg/twb/radio-unchecked.svg
new file mode 100644
index 000000000..07e824660
--- /dev/null
+++ b/rtdata/themes/images/svg/twb/radio-unchecked.svg
@@ -0,0 +1,116 @@
+
+
+
+
diff --git a/rtdata/themes/images/twb/checkbox-checked-disabled.png b/rtdata/themes/images/twb/checkbox-checked-disabled.png
new file mode 100644
index 000000000..e7f38c713
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-checked-disabled.png differ
diff --git a/rtdata/themes/images/twb/checkbox-checked.png b/rtdata/themes/images/twb/checkbox-checked.png
new file mode 100644
index 000000000..50958a578
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-checked.png differ
diff --git a/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png b/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png
new file mode 100644
index 000000000..3391c847a
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-inconsistent-disabled.png differ
diff --git a/rtdata/themes/images/twb/checkbox-inconsistent.png b/rtdata/themes/images/twb/checkbox-inconsistent.png
new file mode 100644
index 000000000..d235d9bb1
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-inconsistent.png differ
diff --git a/rtdata/themes/images/twb/checkbox-unchecked-disabled.png b/rtdata/themes/images/twb/checkbox-unchecked-disabled.png
new file mode 100644
index 000000000..9a9dec468
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-unchecked-disabled.png differ
diff --git a/rtdata/themes/images/twb/checkbox-unchecked.png b/rtdata/themes/images/twb/checkbox-unchecked.png
new file mode 100644
index 000000000..82ff8d595
Binary files /dev/null and b/rtdata/themes/images/twb/checkbox-unchecked.png differ
diff --git a/rtdata/themes/images/twb/radio-checked-disabled.png b/rtdata/themes/images/twb/radio-checked-disabled.png
new file mode 100644
index 000000000..439c99845
Binary files /dev/null and b/rtdata/themes/images/twb/radio-checked-disabled.png differ
diff --git a/rtdata/themes/images/twb/radio-checked.png b/rtdata/themes/images/twb/radio-checked.png
new file mode 100644
index 000000000..a18c5d57b
Binary files /dev/null and b/rtdata/themes/images/twb/radio-checked.png differ
diff --git a/rtdata/themes/images/twb/radio-inconsistent-disabled.png b/rtdata/themes/images/twb/radio-inconsistent-disabled.png
new file mode 100644
index 000000000..6fd7019d0
Binary files /dev/null and b/rtdata/themes/images/twb/radio-inconsistent-disabled.png differ
diff --git a/rtdata/themes/images/twb/radio-inconsistent.png b/rtdata/themes/images/twb/radio-inconsistent.png
new file mode 100644
index 000000000..a983331e1
Binary files /dev/null and b/rtdata/themes/images/twb/radio-inconsistent.png differ
diff --git a/rtdata/themes/images/twb/radio-unchecked-disabled.png b/rtdata/themes/images/twb/radio-unchecked-disabled.png
new file mode 100644
index 000000000..6f2cea18e
Binary files /dev/null and b/rtdata/themes/images/twb/radio-unchecked-disabled.png differ
diff --git a/rtdata/themes/images/twb/radio-unchecked.png b/rtdata/themes/images/twb/radio-unchecked.png
new file mode 100644
index 000000000..aba74b65b
Binary files /dev/null and b/rtdata/themes/images/twb/radio-unchecked.png differ
diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index 3734f509b..ab3a60589 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -60,6 +60,8 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
// construct batch queue panel with the extra "start" and "stop" button
Gtk::VBox* batchQueueButtonBox = Gtk::manage (new Gtk::VBox);
+ batchQueueButtonBox->set_name("BatchQueueButtons");
+
start = Gtk::manage (new Gtk::ToggleButton ());
stop = Gtk::manage (new Gtk::ToggleButton ());
autoStart = Gtk::manage (new Gtk::CheckButton (M("BATCHQUEUE_AUTOSTART")));
@@ -147,6 +149,7 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
// setup button bar
topBox = Gtk::manage (new Gtk::HBox ());
pack_start (*topBox, Gtk::PACK_SHRINK);
+ topBox->set_name("BatchQueueButtonsMainContainer");
topBox->pack_start (*batchQueueButtonBox, Gtk::PACK_SHRINK, 4);
topBox->pack_start (*fdir, Gtk::PACK_EXPAND_WIDGET, 4);
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index dab0e1e61..bbbbbcbf4 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -350,6 +350,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
afterBox->pack_start (*iareapanel);
beforeAfterBox = Gtk::manage (new Gtk::HBox());
+ beforeAfterBox->set_name("BeforeAfterContainer");
beforeAfterBox->pack_start (*afterBox);
editbox->pack_start (*toolBarPanel, Gtk::PACK_SHRINK, 2);
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index 7459903ab..fac537157 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -1198,6 +1198,8 @@ TextOrIcon::TextOrIcon (Glib::ustring fname, Glib::ustring labelTx, Glib::ustrin
labelText = labelTx;
tooltipText = tooltipTx;
+ set_name("TextOrIcon");
+
switchTo(type);
}
diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc
index 356c469d7..188135558 100644
--- a/rtgui/histogrampanel.cc
+++ b/rtgui/histogrampanel.cc
@@ -42,6 +42,7 @@ HistogramPanel::HistogramPanel ()
set_hexpand(true);
set_valign(Gtk::ALIGN_START);
set_halign(Gtk::ALIGN_FILL);
+ set_name("HistogramPanel");
histogramArea = Gtk::manage (new HistogramArea (this));
histogramArea->set_hexpand(true);
@@ -397,10 +398,10 @@ void HistogramPanel::toggle_button_full ()
//
// HistogramRGBArea
HistogramRGBArea::HistogramRGBArea () ://needChroma unactive by default
- frozen(false), valid(false), needRed(true), needGreen(true), needBlue(true), needLuma(true), rawMode(false), showMode(options.histogramBar), barDisplayed(options.histogramBar), needChroma(false)
+ val(0), r(0), g(0), b(0), frozen(false), valid(false), needRed(true), needGreen(true), needBlue(true), needLuma(true), rawMode(false), showMode(options.histogramBar), barDisplayed(options.histogramBar), needChroma(false), parent(NULL)
{
- //set_size_request(60, 12);
+ set_name("HistogramRGBArea");
harih = new HistogramRGBAreaIdleHelper;
harih->harea = this;
@@ -821,7 +822,7 @@ HistogramArea::HistogramArea (FullModeListener *fml) : //needChroma unactive by
bhist(256);
chist(256);
- Glib::RefPtr style = get_style_context();
+ set_name("HistogramArea");
haih = new HistogramAreaIdleHelper;
haih->harea = this;
diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc
index c2e6dffd7..a88005822 100644
--- a/rtgui/navigator.cc
+++ b/rtgui/navigator.cc
@@ -33,6 +33,7 @@ Navigator::Navigator ()
set_label (M("MAIN_MSG_NAVIGATOR"));
Gtk::VBox* mbox = Gtk::manage (new Gtk::VBox ());
+ mbox->set_name("Navigator");
previewWindow = Gtk::manage (new PreviewWindow ());
mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);
position = Gtk::manage (new Gtk::Label ());
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index edd0b8e4a..2a68fe695 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -26,31 +26,31 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
set_default_size(700, 600);
everything = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EVERYTHING")));
- everything ->set_name("partialPasteHeader");
+ everything ->set_name("PartialPasteHeader");
basic = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_BASICGROUP")));
- basic ->set_name("partialPasteHeader");
+ basic ->set_name("PartialPasteHeader");
detail = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DETAILGROUP")));
- detail ->set_name("partialPasteHeader");
+ detail ->set_name("PartialPasteHeader");
color = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORGROUP")));
- color ->set_name("partialPasteHeader");
+ color ->set_name("PartialPasteHeader");
lens = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LENSGROUP")));
- lens ->set_name("partialPasteHeader");
+ lens ->set_name("PartialPasteHeader");
composition = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMPOSITIONGROUP")));
- composition ->set_name("partialPasteHeader");
- meta = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_METAGROUP")));
- meta ->set_name("partialPasteHeader");
+ composition ->set_name("PartialPasteHeader");
+ meta = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_METAGROUP")));
+ meta ->set_name("PartialPasteHeader");
raw = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWGROUP")));
- raw ->set_name("partialPasteHeader");
+ raw ->set_name("PartialPasteHeader");
wav = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WAVELETGROUP")));
- wav ->set_name("partialPasteHeader");
+ wav ->set_name("PartialPasteHeader");
// options in basic:
wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE")));
exposure = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EXPOSURE")));
sh = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_SHADOWSHIGHLIGHTS")));
epd = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EPD")));
- retinex = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RETINEX")));
+ retinex = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RETINEX")));
pcvignette = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PCVIGNETTE")));
gradient = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_GRADIENT")));
labcurve = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LABCURVE")));
@@ -65,14 +65,14 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
defringe = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DEFRINGE")));
// options in wavelet:
- wavelet = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EQUALIZER"))); //TODO - rename to wavelet
+ wavelet = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EQUALIZER"))); //TODO - rename to wavelet
// options in color:
icm = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ICMSETTINGS")));
//gam = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ICMGAMMA")));
vibrance = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_VIBRANCE")));
chmixer = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CHANNELMIXER")));
- blackwhite = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CHANNELMIXERBW")));
+ blackwhite = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CHANNELMIXERBW")));
dirpyrden = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DIRPYRDENOISE")));
hsveq = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_HSVEQUALIZER")));
filmSimulation = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_FILMSIMULATION")) );
@@ -86,13 +86,13 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
lcp = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_LENSPROFILE")));
// options in composition:
- coarserot = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COARSETRANS")));
- finerot = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ROTATION")));
- crop = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CROP")));
- resize = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RESIZE")));
- prsharpening = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PRSHARPENING")));
- perspective = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PERSPECTIVE")));
- commonTrans = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMMONTRANSFORMPARAMS")));
+ coarserot = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COARSETRANS")));
+ finerot = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ROTATION")));
+ crop = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CROP")));
+ resize = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RESIZE")));
+ prsharpening = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PRSHARPENING")));
+ perspective = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PERSPECTIVE")));
+ commonTrans = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMMONTRANSFORMPARAMS")));
// options in meta:
exifch = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_EXIFCHANGES")));
@@ -129,8 +129,9 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
for (int i = 0; i < 8; i++) {
vboxes[i] = Gtk::manage (new Gtk::VBox ());
+ vboxes[i]->set_name("PartialPasteGroupContainer");
hseps[i] = Gtk::manage (new Gtk::HSeparator ());
- hseps[i]->set_name("partialPasteHeaderSep");
+ hseps[i]->set_name("PartialPasteHeaderSep");
}
//BASIC
@@ -261,6 +262,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
hbmain->pack_start (*vbCol3);
scrolledwindow = Gtk::manage ( new Gtk::ScrolledWindow() );
+ scrolledwindow->set_name("PartialPaste");
scrolledwindow->set_can_focus(true);
scrolledwindow->set_shadow_type(Gtk::SHADOW_NONE);
scrolledwindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -281,7 +283,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
colorConn = color->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::colorToggled));
lensConn = lens->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::lensToggled));
compositionConn = composition->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::compositionToggled));
- metaConn = meta->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::metaToggled));
+ metaConn = meta->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::metaToggled));
rawConn = raw->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::rawToggled));
wavConn = wav->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::wavToggled));
@@ -289,7 +291,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
exposureConn = exposure->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
shConn = sh->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
epdConn = epd->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
- retinexConn = retinex->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
+ retinexConn = retinex->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
pcvignetteConn = pcvignette->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
gradientConn = gradient->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
labcurveConn = labcurve->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
@@ -324,7 +326,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
finerotConn = finerot->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
cropConn = crop->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
resizeConn = resize->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
- prsharpeningConn = prsharpening->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
+ prsharpeningConn = prsharpening->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
perspectiveConn = perspective->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
commonTransConn = commonTrans->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
diff --git a/rtgui/previewwindow.cc b/rtgui/previewwindow.cc
index bc30754a4..d8d535d85 100644
--- a/rtgui/previewwindow.cc
+++ b/rtgui/previewwindow.cc
@@ -24,9 +24,7 @@
PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), imageArea(NULL), imgX(0), imgY(0), imgW(0), imgH(0),
zoom(0.0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined)
{
- Glib::RefPtr style = get_style_context();
- style->add_class(GTK_STYLE_CLASS_BACKGROUND);
- style->add_class(GTK_STYLE_CLASS_FLAT);
+ set_name("PreviewWindow");
rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );
}
diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc
index e3d0d390d..562556528 100644
--- a/rtgui/profilepanel.cc
+++ b/rtgui/profilepanel.cc
@@ -42,6 +42,8 @@ void ProfilePanel::cleanup ()
ProfilePanel::ProfilePanel () : storedPProfile(NULL), lastFilename(""), imagePath("")
{
+ set_name("ProfilePanel");
+
tpc = NULL;
profileFillModeOnImage = new RTImage("profile-filled.png");