diff --git a/rtdata/images/themed/png/dark/hand-open.png b/rtdata/images/themed/png/dark/hand-open.png index 6e8138ffb..e5ab821d5 100644 Binary files a/rtdata/images/themed/png/dark/hand-open.png and b/rtdata/images/themed/png/dark/hand-open.png differ diff --git a/rtdata/images/themed/png/dark/wb-auto-small.png b/rtdata/images/themed/png/dark/wb-auto-small.png new file mode 100644 index 000000000..e557048eb Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-auto-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-camera-small.png b/rtdata/images/themed/png/dark/wb-camera-small.png new file mode 100644 index 000000000..69c869445 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-camera-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-cloudy-small.png b/rtdata/images/themed/png/dark/wb-cloudy-small.png new file mode 100644 index 000000000..175d88f1a Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-cloudy-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-custom-small.png b/rtdata/images/themed/png/dark/wb-custom-small.png new file mode 100644 index 000000000..2f3fcb517 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-custom-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-flash-small.png b/rtdata/images/themed/png/dark/wb-flash-small.png new file mode 100644 index 000000000..1bc051cd4 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-flash-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-fluorescent-small.png b/rtdata/images/themed/png/dark/wb-fluorescent-small.png new file mode 100644 index 000000000..3c7882252 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-fluorescent-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-lamp-small.png b/rtdata/images/themed/png/dark/wb-lamp-small.png new file mode 100644 index 000000000..ea5f790c3 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-lamp-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-led-small.png b/rtdata/images/themed/png/dark/wb-led-small.png new file mode 100644 index 000000000..dc4385c94 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-led-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-shade-small.png b/rtdata/images/themed/png/dark/wb-shade-small.png new file mode 100644 index 000000000..255c021a6 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-shade-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-sun-small.png b/rtdata/images/themed/png/dark/wb-sun-small.png new file mode 100644 index 000000000..a7de769df Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-sun-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-tungsten-small.png b/rtdata/images/themed/png/dark/wb-tungsten-small.png new file mode 100644 index 000000000..6f958cd59 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-tungsten-small.png differ diff --git a/rtdata/images/themed/png/dark/wb-water-small.png b/rtdata/images/themed/png/dark/wb-water-small.png new file mode 100644 index 000000000..2ecb58552 Binary files /dev/null and b/rtdata/images/themed/png/dark/wb-water-small.png differ diff --git a/rtdata/images/themed/png/dark/window-add.png b/rtdata/images/themed/png/dark/window-add.png index b5780953b..4364b1a13 100644 Binary files a/rtdata/images/themed/png/dark/window-add.png and b/rtdata/images/themed/png/dark/window-add.png differ diff --git a/rtdata/images/themed/png/light/hand-open.png b/rtdata/images/themed/png/light/hand-open.png index b3a0a6168..8a180934f 100644 Binary files a/rtdata/images/themed/png/light/hand-open.png and b/rtdata/images/themed/png/light/hand-open.png differ diff --git a/rtdata/images/themed/png/light/wb-auto-small.png b/rtdata/images/themed/png/light/wb-auto-small.png new file mode 100644 index 000000000..e7995b4ce Binary files /dev/null and b/rtdata/images/themed/png/light/wb-auto-small.png differ diff --git a/rtdata/images/themed/png/light/wb-camera-small.png b/rtdata/images/themed/png/light/wb-camera-small.png new file mode 100644 index 000000000..72d03db7b Binary files /dev/null and b/rtdata/images/themed/png/light/wb-camera-small.png differ diff --git a/rtdata/images/themed/png/light/wb-cloudy-small.png b/rtdata/images/themed/png/light/wb-cloudy-small.png new file mode 100644 index 000000000..131b28287 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-cloudy-small.png differ diff --git a/rtdata/images/themed/png/light/wb-custom-small.png b/rtdata/images/themed/png/light/wb-custom-small.png new file mode 100644 index 000000000..c0d2ebf09 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-custom-small.png differ diff --git a/rtdata/images/themed/png/light/wb-flash-small.png b/rtdata/images/themed/png/light/wb-flash-small.png new file mode 100644 index 000000000..cf44f0357 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-flash-small.png differ diff --git a/rtdata/images/themed/png/light/wb-fluorescent-small.png b/rtdata/images/themed/png/light/wb-fluorescent-small.png new file mode 100644 index 000000000..0362ebf02 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-fluorescent-small.png differ diff --git a/rtdata/images/themed/png/light/wb-lamp-small.png b/rtdata/images/themed/png/light/wb-lamp-small.png new file mode 100644 index 000000000..4c8516d30 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-lamp-small.png differ diff --git a/rtdata/images/themed/png/light/wb-led-small.png b/rtdata/images/themed/png/light/wb-led-small.png new file mode 100644 index 000000000..7b3d8504f Binary files /dev/null and b/rtdata/images/themed/png/light/wb-led-small.png differ diff --git a/rtdata/images/themed/png/light/wb-shade-small.png b/rtdata/images/themed/png/light/wb-shade-small.png new file mode 100644 index 000000000..397fcfdd4 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-shade-small.png differ diff --git a/rtdata/images/themed/png/light/wb-sun-small.png b/rtdata/images/themed/png/light/wb-sun-small.png new file mode 100644 index 000000000..70c139ab2 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-sun-small.png differ diff --git a/rtdata/images/themed/png/light/wb-tungsten-small.png b/rtdata/images/themed/png/light/wb-tungsten-small.png new file mode 100644 index 000000000..3dcbf947d Binary files /dev/null and b/rtdata/images/themed/png/light/wb-tungsten-small.png differ diff --git a/rtdata/images/themed/png/light/wb-water-small.png b/rtdata/images/themed/png/light/wb-water-small.png new file mode 100644 index 000000000..59e7bb836 Binary files /dev/null and b/rtdata/images/themed/png/light/wb-water-small.png differ diff --git a/rtdata/images/themed/png/light/window-add.png b/rtdata/images/themed/png/light/window-add.png index 132712779..6ccacd678 100644 Binary files a/rtdata/images/themed/png/light/window-add.png and b/rtdata/images/themed/png/light/window-add.png differ diff --git a/rtdata/images/themed/svg/hand-open.svg b/rtdata/images/themed/svg/hand-open.svg index b2ed1b6c3..d49d10d5f 100644 --- a/rtdata/images/themed/svg/hand-open.svg +++ b/rtdata/images/themed/svg/hand-open.svg @@ -112,17 +112,13 @@ id="path814" d="m 11.066359,42.319247 c 0.02103,2.179428 0.361946,4.343601 0.343124,6.524384 -0.705694,-2.097508 -1.7133931,-4.081554 -2.4020386,-6.183914 -0.308048,-1.25478 -2.3218595,-1.312801 -2.2953616,0.131995 0.1484682,1.51372 0.594459,2.99453 1.1453756,4.411873 0.5796458,1.525089 1.1947823,3.114026 1.0740212,4.776499 C 8.7200153,53.308132 7.126686,53.731266 6.2345901,52.561086 5.8181155,52.167522 5.6906617,51.907896 5.2741487,51.321342 4.8576356,50.734789 4.1520632,49.821307 3.4051693,50.101994 c -1.4976695,0.876326 -0.2941262,2.449671 0.3195361,3.475862 0.5291409,1.049899 1.265396,1.943333 2.0966285,2.765328 1.1394053,1.210646 2.0071456,2.792292 1.9277399,4.496496 0.044036,1.388514 1.5584783,2.053001 2.7640802,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.714012 0.291102,-1.056513 0.644584,-2.129256 0.641543,-3.233776 -0.26812,-1.182495 -1.908089,-1.132589 -2.209115,0.198776 -0.26876,0.946642 -0.365981,1.941262 -0.740551,2.857254 -0.253525,-1.958499 0.188884,-3.950415 -0.127447,-5.905767 0.04525,-1.528018 -2.153907,-1.449921 -2.411142,-0.140805 -0.251524,1.925974 -0.159678,3.881751 -0.400925,5.810037 -0.563883,-2.270808 -0.28889,-4.693484 -1.109574,-6.908379 -0.575162,-1.136295 -2.32306,-0.644964 -2.380125,0.579614 z" style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" /> - diff --git a/rtdata/images/themed/svg/wb-auto-small.svg b/rtdata/images/themed/svg/wb-auto-small.svg new file mode 100644 index 000000000..23e55f560 --- /dev/null +++ b/rtdata/images/themed/svg/wb-auto-small.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-camera-small.svg b/rtdata/images/themed/svg/wb-camera-small.svg new file mode 100644 index 000000000..2521d513e --- /dev/null +++ b/rtdata/images/themed/svg/wb-camera-small.svg @@ -0,0 +1,109 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-cloudy-small.svg b/rtdata/images/themed/svg/wb-cloudy-small.svg new file mode 100644 index 000000000..0197eab4e --- /dev/null +++ b/rtdata/images/themed/svg/wb-cloudy-small.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-custom-small.svg b/rtdata/images/themed/svg/wb-custom-small.svg new file mode 100644 index 000000000..f176458a8 --- /dev/null +++ b/rtdata/images/themed/svg/wb-custom-small.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-flash-small.svg b/rtdata/images/themed/svg/wb-flash-small.svg new file mode 100644 index 000000000..634912538 --- /dev/null +++ b/rtdata/images/themed/svg/wb-flash-small.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-fluorescent-small.svg b/rtdata/images/themed/svg/wb-fluorescent-small.svg new file mode 100644 index 000000000..67c86ec71 --- /dev/null +++ b/rtdata/images/themed/svg/wb-fluorescent-small.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-lamp-small.svg b/rtdata/images/themed/svg/wb-lamp-small.svg new file mode 100644 index 000000000..32c172d7f --- /dev/null +++ b/rtdata/images/themed/svg/wb-lamp-small.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-led-small.svg b/rtdata/images/themed/svg/wb-led-small.svg new file mode 100644 index 000000000..7e20c4576 --- /dev/null +++ b/rtdata/images/themed/svg/wb-led-small.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-shade-small.svg b/rtdata/images/themed/svg/wb-shade-small.svg new file mode 100644 index 000000000..78ed1e6c6 --- /dev/null +++ b/rtdata/images/themed/svg/wb-shade-small.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-sun-small.svg b/rtdata/images/themed/svg/wb-sun-small.svg new file mode 100644 index 000000000..94abad681 --- /dev/null +++ b/rtdata/images/themed/svg/wb-sun-small.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-tungsten-small.svg b/rtdata/images/themed/svg/wb-tungsten-small.svg new file mode 100644 index 000000000..dc4b62beb --- /dev/null +++ b/rtdata/images/themed/svg/wb-tungsten-small.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/wb-water-small.svg b/rtdata/images/themed/svg/wb-water-small.svg new file mode 100644 index 000000000..2cb62298a --- /dev/null +++ b/rtdata/images/themed/svg/wb-water-small.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/images/themed/svg/window-add.svg b/rtdata/images/themed/svg/window-add.svg index e769ff355..da0651444 100644 --- a/rtdata/images/themed/svg/window-add.svg +++ b/rtdata/images/themed/svg/window-add.svg @@ -31,7 +31,7 @@ inkscape:cy="12" inkscape:document-units="px" inkscape:current-layer="layer1" - showgrid="false" + showgrid="true" inkscape:window-width="1920" inkscape:window-height="1019" inkscape:window-x="0" @@ -44,7 +44,8 @@ inkscape:snap-others="false" inkscape:object-nodes="true" inkscape:snap-grids="true" - inkscape:snap-bbox-midpoints="false"> + inkscape:snap-bbox-midpoints="false" + inkscape:snap-nodes="true"> image/svg+xml - + Maciej Dworak @@ -100,16 +101,16 @@ inkscape:groupmode="layer" inkscape:label="Layer 1"> - + sodipodi:nodetypes="ccccccccccccccssssssssssssssssssss" /> + diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 3dc6569dc..315b53db4 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -43,19 +43,19 @@ Glib::RefPtr WhiteBalance::wbCameraPB, WhiteBalance::wbAutoPB, Whit void WhiteBalance::init () { - wbPixbufs[toUnderlying(WBEntry::Type::CAMERA)] = RTImage::createFromFile ("wb-camera.png"); - wbPixbufs[toUnderlying(WBEntry::Type::AUTO)] = RTImage::createFromFile ("wb-auto.png"); - wbPixbufs[toUnderlying(WBEntry::Type::DAYLIGHT)] = RTImage::createFromFile ("wb-sun.png"); - wbPixbufs[toUnderlying(WBEntry::Type::CLOUDY)] = RTImage::createFromFile ("wb-cloudy.png"); - wbPixbufs[toUnderlying(WBEntry::Type::SHADE)] = RTImage::createFromFile ("wb-shade.png"); - wbPixbufs[toUnderlying(WBEntry::Type::WATER)] = RTImage::createFromFile ("wb-water.png"); -// wbPixbufs[WBEntry::Type::WATER2] = RTImage::createFromFile ("wb-water.png"); - wbPixbufs[toUnderlying(WBEntry::Type::TUNGSTEN)] = RTImage::createFromFile ("wb-tungsten.png"); - wbPixbufs[toUnderlying(WBEntry::Type::FLUORESCENT)] = RTImage::createFromFile ("wb-fluorescent.png"); - wbPixbufs[toUnderlying(WBEntry::Type::LAMP)] = RTImage::createFromFile ("wb-lamp.png"); - wbPixbufs[toUnderlying(WBEntry::Type::FLASH)] = RTImage::createFromFile ("wb-flash.png"); - wbPixbufs[toUnderlying(WBEntry::Type::LED)] = RTImage::createFromFile ("wb-led.png"); - wbPixbufs[toUnderlying(WBEntry::Type::CUSTOM)] = RTImage::createFromFile ("wb-custom.png"); + wbPixbufs[toUnderlying(WBEntry::Type::CAMERA)] = RTImage::createFromFile ("wb-camera-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::AUTO)] = RTImage::createFromFile ("wb-auto-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::DAYLIGHT)] = RTImage::createFromFile ("wb-sun-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::CLOUDY)] = RTImage::createFromFile ("wb-cloudy-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::SHADE)] = RTImage::createFromFile ("wb-shade-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::WATER)] = RTImage::createFromFile ("wb-water-small.png"); + //wbPixbufs[WBEntry::Type::WATER2] = RTImage::createFromFile ("wb-water-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::TUNGSTEN)] = RTImage::createFromFile ("wb-tungsten-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::FLUORESCENT)] = RTImage::createFromFile ("wb-fluorescent-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::LAMP)] = RTImage::createFromFile ("wb-lamp-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::FLASH)] = RTImage::createFromFile ("wb-flash-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::LED)] = RTImage::createFromFile ("wb-led-small.png"); + wbPixbufs[toUnderlying(WBEntry::Type::CUSTOM)] = RTImage::createFromFile ("wb-custom-small.png"); } void WhiteBalance::cleanup ()