From 15638548154a5514f983578fe48beea1e15f0c07 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Sun, 2 Dec 2018 02:02:53 +0100
Subject: [PATCH] Lensfun crop factor warning icon

Replaced inconsistnent stock "dialog-warning" icon with custom warning.png
---
 rtdata/images/themed/png/dark/warning.png  | Bin 0 -> 560 bytes
 rtdata/images/themed/png/light/warning.png | Bin 0 -> 579 bytes
 rtdata/images/themed/svg/warning.svg       | 134 +++++++++++++++++++++
 rtgui/lensprofile.cc                       |   7 +-
 4 files changed, 137 insertions(+), 4 deletions(-)
 create mode 100644 rtdata/images/themed/png/dark/warning.png
 create mode 100644 rtdata/images/themed/png/light/warning.png
 create mode 100644 rtdata/images/themed/svg/warning.svg

diff --git a/rtdata/images/themed/png/dark/warning.png b/rtdata/images/themed/png/dark/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bc60b95a74a7a08ded216959f195f7210830a9c
GIT binary patch
literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr
zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6j<r&Cl{qAmSmQtCg<no=I0gb<rk&v=VT_Q
z<`t(F>nBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(<rP
zja6N9fC@!G3LQ&JGV+TUd=ry1Q?nFY%JYj7vyJl?`vT=9LGr=*X(i=A2QieFm+NKb
zWfvy{%>lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}ub5#STz>R#Y;=FFK(mo5RxvuDr#
z|NkGzfUqHqbLY<8x^)Z421-EyG8-oLzh=rhRiK#?B|(0{46z&wi=XvwR$JpB!S5}m
zs@b$I%wzAJ#gh+iF9oWZ=jq}YqH%udq}xKx3Op`>2Y9)(;{N~l_s((E*i$l#J)tbI
zSgl#$f5`Q#rR+Oq<?$xu91Zv&x9SRKngq`Z0~;wtDUrX`C%)N4cm6v)p<wZ~#oTqv
zijS@Ns$=DMCZMzTWzvZNW_9=4KFzEfeUIy8+Q0C{P1_yYbn5r6Prnq7U*4Ab{n72t
ym6M)WDC~Z3mKylfL%%aXS12WG*TVbt$GGk0v4z{;TdoFlDTAl0pUXO@geCyU(exYu

literal 0
HcmV?d00001

diff --git a/rtdata/images/themed/png/light/warning.png b/rtdata/images/themed/png/light/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bc43cfe20fa8fc164a2c288191258a336ce45ea
GIT binary patch
literal 579
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA1(mo)lsM-XR2F5XXOu8FJ1aPr
zloVwqm6l}Y=jjG#Bo?JQ=4584DrA(D6j<r&Cl{qAmSmQtCg<no=I0gb<rk&v=VT_Q
z<`t(F>nBy}7ANYP=o#oA4oPAKnl1}6-6gd+xhS&$WFSLOVtGhLYEfcAYN|qJa(<rP
zja6N9fC@!G3LQ&JGV+TUd=ry1Q?nFY%JYj7vyJl?`vT=9LGr=*X(i=A2QieFm+NKb
zWfvy{%>lV!_B$IXpd!u!kH}&M2EHR8%s5q>PZ}r~7~m7)>R#X@Cnu+>s;Z)*0wn+c
z{|{jR+3M=*5OFm%HMkT|0R#Y*!I&UgNl6L9O}k@!8ECk4NswPK1INPr)z5l2tBJbA
zR|K!vAf~F>#Ix7qj!kIz_q~z=KxIokT^vI+&M%#GlCRl-$Ax{<jYQ8I3;+J-*L4)|
znCu-Yzb50@>B*uG=3lT{zuhI*&wP@{tRBS-8P6qF*6BUUemxVj7A#Bo@0OaF8+b|V
z_3ofjuhOgU>KA75c=28^{M2{q-iw2Vn-;KrSlsZevu4`b*H>lwo&+*x*VZY-YrMbC
zTCrHJKeh9fQ~vvva+42l%bd4-^3lp^YPK&O&rjiHJ3UA5=lA&^88^&fJDMY_dmQLs
N22WQ%mvv4FO#pM3<SzgK

literal 0
HcmV?d00001

diff --git a/rtdata/images/themed/svg/warning.svg b/rtdata/images/themed/svg/warning.svg
new file mode 100644
index 000000000..c24ba0653
--- /dev/null
+++ b/rtdata/images/themed/svg/warning.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="warning.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.833333"
+     inkscape:cx="7.684729"
+     inkscape:cy="12.059113"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       sodipodi:type="star"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="path851"
+       sodipodi:sides="3"
+       sodipodi:cx="12"
+       sodipodi:cy="15"
+       sodipodi:r1="12"
+       sodipodi:r2="6"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.52359878"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 12,3 22.392305,21 1.6076952,21 Z"
+       inkscape:transform-center-y="-3" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssc"
+       id="path4562-5"
+       d="m 13.207467,10.82925 c 0,2.185129 -0.540947,5.087874 -1.207468,5.087874 -0.666523,0 -1.207467,-2.902745 -1.207467,-5.087874 0,-2.1851257 0.540944,-2.8292503 1.207467,-2.8292503 0.666521,0 1.207468,0.6441246 1.207468,2.8292503 z"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988" />
+    <ellipse
+       ry="1.2399021"
+       rx="1.2388306"
+       cy="17.753935"
+       cx="12"
+       id="path4565-0"
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.18797946" />
+  </g>
+</svg>
diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index ae8bbb7fe..a3dbc2e63 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -55,7 +55,7 @@ LensProfilePanel::LensProfilePanel() :
     lensfunCameras(Gtk::manage((new MyComboBox()))),
     lensfunLensesLbl(Gtk::manage((new Gtk::Label(M("EXIFFILTER_LENS"))))),
     lensfunLenses(Gtk::manage((new MyComboBox()))),
-    warning(Gtk::manage((new Gtk::Image()))),
+    warning(Gtk::manage(new RTImage("warning.png"))),
     ckbUseDist(Gtk::manage((new Gtk::CheckButton(M("TP_LENSPROFILE_USE_GEOMETRIC"))))),
     ckbUseVign(Gtk::manage((new Gtk::CheckButton(M("TP_LENSPROFILE_USE_VIGNETTING"))))),
     ckbUseCA(Gtk::manage((new Gtk::CheckButton(M("TP_LENSPROFILE_USE_CA")))))
@@ -65,12 +65,12 @@ LensProfilePanel::LensProfilePanel() :
     }
 
     // Main containers:
-    
+
     Gtk::Frame *nodesFrame = Gtk::manage(new Gtk::Frame(M("TP_LENSPROFILE_MODE_HEADER")));
 
     modesGrid->get_style_context()->add_class("grid-spacing");
     setExpandAlignProperties(modesGrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
-    
+
     Gtk::Frame *distFrame = Gtk::manage(new Gtk::Frame(M("TP_LENSPROFILE_USE_HEADER")));
 
     distGrid->get_style_context()->add_class("grid-spacing");
@@ -104,7 +104,6 @@ LensProfilePanel::LensProfilePanel() :
     lensesCellRenderer->property_ellipsize() = Pango::ELLIPSIZE_MIDDLE;
     lensesCellRenderer->property_ellipsize_set() = true;
 
-    warning->set_from_icon_name("dialog-warning", Gtk::ICON_SIZE_LARGE_TOOLBAR);
     warning->set_tooltip_text(M("TP_LENSPROFILE_LENS_WARNING"));
     warning->hide();