Fix #3203 and restore the hover color for the 'Enabled' buttons

rtdata/themes/RawTherapee.css

@@ -290,6 +290,10 @@ GtkMenu {
 #MyExpanderTitle:hover {
     background-color: #202020;
 }
+#MyExpanderTitle GtkEventBox:hover GtkImage {
+    background-color: #202020;
+    border-radius: 3px;
+}
 #MyExpanderTitle:hover GtkLabel {
     color: #D8D8D8;
 }

rtgui/guiutils.cc

@@ -619,6 +619,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) :
     if (useEnabled) {
         statusImage = Gtk::manage(new Gtk::Image(disabledPBuf));
         imageEvBox = Gtk::manage(new Gtk::EventBox());
+        imageEvBox->set_name("MyExpanderStatus");
         imageEvBox->add(*statusImage);
         imageEvBox->set_above_child(true);
         imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) );
@@ -645,6 +646,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) :
 
     titleEvBox = Gtk::manage(new Gtk::EventBox());
     titleEvBox->set_name("MyExpanderTitle");
+    titleEvBox->set_border_width(2);
     titleEvBox->add(*headerHBox);
     titleEvBox->set_above_child(false);  // this is the key! By make it below the child, they will get the events first.
     titleEvBox->set_can_focus(false);

tools/source_icons/scalable/expanderClosed.file

@@ -1 +1 @@
-expanderClosed.png,w18,actions
+expanderClosed.png,w14,actions

tools/source_icons/scalable/expanderClosed.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1300"
+   width="1000"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="expanderClosed.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
@@ -637,13 +637,13 @@
          id="stop4223-6" />
     </linearGradient>
     <filter
-       color-interpolation-filters="sRGB"
        inkscape:collect="always"
        id="filter4026"
        x="-0.20649599"
        width="1.412992"
        y="-0.1836427"
-       height="1.3672854">
+       height="1.3672854"
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="26.799307"
@@ -677,9 +677,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.839"
+     inkscape:zoom="0.5"
-     inkscape:cx="650"
+     inkscape:cx="390.64722"
-     inkscape:cy="500"
+     inkscape:cy="384.55567"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -700,7 +700,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -717,12 +717,12 @@
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <g
            id="g3165"
-           transform="matrix(0,-1.0901186,1.0901183,0,-142.93877,128.71258)">
+           transform="matrix(0,-1.0901186,1.0901183,0,-116.40447,102.17828)">
           <path
              sodipodi:nodetypes="cccc"
              inkscape:connector-curvature="0"
              id="rect3181"
-             d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 z"
+             d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 Z"
              style="opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none" />
           <path
              transform="matrix(0,0.80956693,-0.80956693,0,58.115009,75.206602)"

tools/source_icons/scalable/expanderDisabled.file

@@ -1 +1 @@
-expanderDisabled.png,w18,actions
+expanderDisabled.png,w14,actions

tools/source_icons/scalable/expanderDisabled.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1300"
+   width="1000"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="expanderDisabled.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
@@ -580,9 +580,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.839"
+     inkscape:zoom="0.4195"
-     inkscape:cx="650"
+     inkscape:cx="950.98525"
-     inkscape:cy="500"
+     inkscape:cy="563.6275"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -603,7 +603,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -619,12 +619,12 @@
          id="g4060"
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <path
-           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:33.1678772;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.65098039;stroke-dasharray:none"
+           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:33.1678772;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65098039"
            d="m 30.011141,-21.405379 c 0,-160.199321 0,-203.496441 0,-203.496441"
            id="path3062"
            inkscape:connector-curvature="0" />
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#2a7fff;fill-opacity:0.65158374;stroke:none;stroke-width:50.6696434;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:0.65158374;stroke:none;stroke-width:50.6696434;marker:none;enable-background:accumulate"
            d="m -88.73454,-132.23737 c -76.58256,42.130688 -128.60399,123.6612321 -128.60399,217.10952 0,136.48913 110.97734,247.55344 247.359582,247.55344 136.382238,0 247.384578,-111.06431 247.384578,-247.55344 0,-93.4496955 -52.04453,-174.9794 -128.62899,-217.10952 l 0,46.803955 c 53.62053,37.471077 88.61052,99.700722 88.61052,170.305565 0,114.85813 -92.59794,207.52864 -207.366108,207.52864 -114.768164,0 -207.366112,-92.67051 -207.366112,-207.52864 0,-70.604843 34.98281,-132.834488 88.61052,-170.305565 l 0,-46.803955 z"
            id="path3832"
            inkscape:connector-curvature="0" />

tools/source_icons/scalable/expanderEnabled.file

@@ -1 +1 @@
-expanderEnabled.png,w18,actions
+expanderEnabled.png,w14,actions

tools/source_icons/scalable/expanderEnabled.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1300"
+   width="1000"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="expanderEnabled.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
@@ -555,7 +555,7 @@
     <filter
        inkscape:collect="always"
        id="filter4171"
-       color-interpolation-filters="sRGB">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="10.145805"
@@ -568,7 +568,7 @@
        width="1.8545147"
        y="-0.11401727"
        height="1.2280345"
-       color-interpolation-filters="sRGB">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="10.79173"
@@ -632,9 +632,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.839"
+     inkscape:zoom="0.59326259"
-     inkscape:cx="650"
+     inkscape:cx="654.18125"
-     inkscape:cy="500"
+     inkscape:cy="558.50335"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -672,7 +672,7 @@
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <path
            inkscape:connector-curvature="0"
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:110;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:110;marker:none;enable-background:accumulate"
            d="m -87.653525,-158.75326 c -87.136425,43.5003 -147.275765,133.659853 -147.275765,237.280341 0,145.822809 119.11747,264.940279 264.940276,264.940279 145.822804,0 264.964674,-119.11748 264.964674,-264.940279 0,-103.620488 -60.15661,-193.780031 -147.30016,-237.280341 l 0,101.883222 c 37.71413,32.757839 61.44214,81.144873 61.44214,135.397119 0,99.421679 -79.68498,179.082259 -179.106654,179.082259 -99.421681,0 -179.082266,-79.66058 -179.082266,-179.082259 0,-54.252237 23.71023,-102.63928 61.417755,-135.397119 l 0,-101.883222 z"
            id="path3977" />
         <path
@@ -681,7 +681,7 @@
            d="m 30.013512,-273.7939 c 28.485098,0 51.417145,22.93204 51.417145,51.41714 l 0,197.392642 c 0,28.485098 -22.932047,51.417145 -51.417145,51.417145 -28.4850987,0 -51.417145,-22.932047 -51.417145,-51.417145 l 0,-197.392642 c 0,-28.4851 22.9320463,-51.41714 51.417145,-51.41714 z"
            id="rect3983" />
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.4;color:#000000;fill:url(#linearGradient5308);fill-opacity:1;stroke:none;stroke-width:110;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4171);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:url(#linearGradient5308);fill-opacity:1;stroke:none;stroke-width:110;marker:none;filter:url(#filter4171);enable-background:accumulate"
            d="m -84.608103,-105.4371 c -69.642327,44.661782 -109.181527,132.532075 -93.258607,214.29637 13.44009,76.22164 71.66655,143.2426 146.284938,164.94906 63.759636,19.74658 137.047852,7.32543 189.485042,-34.04264 52.7998,-40.15991 85.69439,-105.52517 83.40508,-172.233816 -1.10889,-66.410105 -35.55286,-131.377207 -90.58266,-168.808374 -4.78391,-4.26562 -8.27846,-5.48626 -6.58379,2.558154 0,16.385417 0,32.770833 0,49.15625 56.14382,50.91672 69.13892,143.45002 28.40625,207.718746 C 138.78498,214.62906 69.263351,247.80003 4.0071204,236.11437 -56.222649,226.76969 -110.23476,182.44137 -127.97661,123.61087 -146.551,66.724854 -132.57655,-0.395256 -90.264353,-43.093346 c 2.88248,-3.521257 8.08026,-5.790521 6.35861,-11.187433 -0.11159,-17.197889 0.33825,-34.397473 -0.0461,-51.593821 l -0.65625,0.4375 z"
            id="path4023"
            inkscape:connector-curvature="0"

tools/source_icons/scalable/expanderInconsistent.file

@@ -1 +1 @@
-expanderInconsistent.png,w18,actions
+expanderInconsistent.png,w14,actions

tools/source_icons/scalable/expanderInconsistent.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1300"
+   width="1000"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="expanderInconsistent.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
@@ -579,7 +579,7 @@
        x="-0.42725736"
        id="filter4183"
        inkscape:collect="always"
-       color-interpolation-filters="sRGB">
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          id="feGaussianBlur4185"
          stdDeviation="10.79173"
@@ -1183,9 +1183,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.839"
+     inkscape:zoom="0.4195"
-     inkscape:cx="444.99404"
+     inkscape:cx="196.06451"
-     inkscape:cy="500"
+     inkscape:cy="577.59142"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -1206,7 +1206,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -1222,7 +1222,7 @@
          id="g4060"
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <path
-           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#2a7fff;fill-opacity:0.65158374;stroke:none;stroke-width:50.6696434;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:0.65158374;stroke:none;stroke-width:50.6696434;marker:none;enable-background:accumulate"
            d="M -88.785465,-132.68836 C -165.40086,-90.572569 -217.44459,-9.0709456 -217.44459,84.344206 c 0,136.440714 111.02492,247.465634 247.465635,247.465634 136.440715,0 247.490635,-111.02492 247.490635,-247.465634 0,-93.41656 -52.06684,-174.917327 -128.68413,-217.032566 l 0,46.787414 c 53.64352,37.457766 88.64852,99.665345 88.64852,170.245152 0,114.817384 -92.63765,207.455024 -207.455025,207.455024 -114.817372,0 -207.455025,-92.63764 -207.455025,-207.455024 0,-70.579807 34.99781,-132.787386 88.648515,-170.245152 l 0,-46.787414 z"
            id="path3832"
            inkscape:connector-curvature="0" />

tools/source_icons/scalable/expanderOpened.file

@@ -1 +1 @@
-expanderOpened.png,w18,actions
+expanderOpened.png,w14,actions

tools/source_icons/scalable/expanderOpened.svg

@@ -10,11 +10,11 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1300"
+   width="1000"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="expanderOpened.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
@@ -637,13 +637,13 @@
          id="stop4223-6" />
     </linearGradient>
     <filter
-       color-interpolation-filters="sRGB"
        inkscape:collect="always"
        id="filter4026"
        x="-0.20649599"
        width="1.412992"
        y="-0.1836427"
-       height="1.3672854">
+       height="1.3672854"
+       style="color-interpolation-filters:sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="26.799307"
@@ -687,9 +687,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.839"
+     inkscape:zoom="0.5"
-     inkscape:cx="650"
+     inkscape:cx="858.38935"
-     inkscape:cy="500"
+     inkscape:cy="410.64627"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -710,7 +710,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -727,12 +727,12 @@
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <g
            id="g3165"
-           transform="matrix(1.0901186,0,0,1.0901184,-69.04139,11.516234)">
+           transform="matrix(1.0901186,0,0,1.0901184,-42.507088,11.516234)">
           <path
              sodipodi:nodetypes="cccc"
              inkscape:connector-curvature="0"
              id="rect3181"
-             d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 z"
+             d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 Z"
              style="opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none" />
           <path
              transform="matrix(0,0.80956693,-0.80956693,0,58.115009,75.206602)"