From efac90c9bb6b2e2efdd1626ee67b695095db3ae8 Mon Sep 17 00:00:00 2001
From: Ronan Le Tiec <ronanletiec@gmail.com>
Date: Fri, 20 Nov 2020 16:24:53 +0100
Subject: [PATCH] Icons for templates

---
 src/app/puzzle/share/resources/puzzleicon.qrc |   2 +
 .../share/resources/puzzleicon/16x16/roll.png | Bin 0 -> 241 bytes
 .../resources/puzzleicon/16x16/template.png   | Bin 0 -> 372 bytes
 src/app/puzzle/vpsheet.cpp                    |  44 +++++++++++-------
 4 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 src/app/puzzle/share/resources/puzzleicon/16x16/roll.png
 create mode 100644 src/app/puzzle/share/resources/puzzleicon/16x16/template.png

diff --git a/src/app/puzzle/share/resources/puzzleicon.qrc b/src/app/puzzle/share/resources/puzzleicon.qrc
index 12c2a72ee..83dde8c8e 100644
--- a/src/app/puzzle/share/resources/puzzleicon.qrc
+++ b/src/app/puzzle/share/resources/puzzleicon.qrc
@@ -14,5 +14,7 @@
         <file>puzzleicon/svg/icon_scissors.svg</file>
         <file>puzzleicon/svg/icon_scissors_vertical.svg</file>
         <file>puzzleicon/svg/icon_scissors_horizontal.svg</file>
+        <file>puzzleicon/16x16/roll.png</file>
+        <file>puzzleicon/16x16/template.png</file>
     </qresource>
 </RCC>
diff --git a/src/app/puzzle/share/resources/puzzleicon/16x16/roll.png b/src/app/puzzle/share/resources/puzzleicon/16x16/roll.png
new file mode 100644
index 0000000000000000000000000000000000000000..49c30dff11916a06b3aa06d2404b94c0f255ceae
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zg78t&m77ygF@N{tu
z(FlHeW}}xABZJ#R{aBe+w&3Z~EQ-3i5AQvZvXcJ7WVV}=*RN04vDx`^>=hk$LDt<I
zP3sj!_#S0=$LUltpTAkhXD_odYxd0BH=<@9tK(Ym@Zi#FUr|@(@Uj-BBBd+3wGq~#
z7yiq#?AxQQy|Zv_TH+6Lj=3wVFMfUD_icZ|{4b4cmH8hTjvw=@d&9Y4@lz)zP1l8u
o*KhEs+^sSa?6k4IzyGoH>l2Rt3;DTffo^8-boFyt=akR{03vf*A^-pY

literal 0
HcmV?d00001

diff --git a/src/app/puzzle/share/resources/puzzleicon/16x16/template.png b/src/app/puzzle/share/resources/puzzleicon/16x16/template.png
new file mode 100644
index 0000000000000000000000000000000000000000..c29755d29dd988896cbc17477f6adabc2d10b693
GIT binary patch
literal 372
zcmV-)0gL{LP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001xP)t-s0001p
ziiL=Zg@}rU|NsBP#KO<e&dSQl%gf8m%*?pBxa{ogyuG^3&CR8yrMkMhyuG{6&(F}%
z(B|gm?d|Qpzr2-~lZ%ar&d$!@;Na2G&cDFE($dnYsj2Jh>%hRk?(XjP_V)Pr_~_{9
z(b3WB>gw<B@6^=P^78Wc_xJhv`SbJh`uh6Q)6?+q@b&feoyqQH00003bW%=J09=`6
ztNmsG0059lL_t(2&t=cs5`r)cMbScof{2$A@3d(V5k>0%|D6o9@Zf%2b0#xkEa1M7
z4RIKYU=cc4#!0eD*WiRhoMju>?)nuUA=`@_FghGh4$ea4d5V|o&4DPSB2A{eJE$sz
z2h>pd8^sfqYMR%30;yAKTl#qD5Uhpoyy(zcYmAvdVy&qc@-R2R{4M7J`|k&<uM0^m
S&AN~P0000<MNUMnLSTaV<ILs&

literal 0
HcmV?d00001

diff --git a/src/app/puzzle/vpsheet.cpp b/src/app/puzzle/vpsheet.cpp
index 475584860..59018f0bb 100644
--- a/src/app/puzzle/vpsheet.cpp
+++ b/src/app/puzzle/vpsheet.cpp
@@ -204,25 +204,28 @@ QString VPSheet::GetTemplateName(PaperSizeTemplate tmpl)
 //---------------------------------------------------------------------------------------------------------------------
 PaperSizeTemplate VPSheet::GetTemplate(QSizeF size)
 {
-    const int max = static_cast<int>(PaperSizeTemplate::Custom);
+    // TODO, float comparision not safe and problems with
+    // inch / cm
 
-    for (int i=0; i < max; i++)
-    {
-        PaperSizeTemplate tmpl = static_cast<PaperSizeTemplate>(i);
-        const QSizeF tmplSize = GetTemplateSize(tmpl);
+//    const int max = static_cast<int>(PaperSizeTemplate::Custom);
 
-        if(size.width() == tmplSize.width())
-        {
-            if(isRollTemplate(tmpl))
-            {
-                return tmpl;
-            }
-            else if(size.height() == tmplSize.height())
-            {
-                return tmpl;
-            }
-        }
-    }
+//    for (int i=0; i < max; i++)
+//    {
+//        PaperSizeTemplate tmpl = static_cast<PaperSizeTemplate>(i);
+//        const QSizeF tmplSize = GetTemplateSize(tmpl);
+
+//        if(size.width() == tmplSize.width())
+//        {
+//            if(isRollTemplate(tmpl))
+//            {
+//                return tmpl;
+//            }
+//            else if(size.height() == tmplSize.height())
+//            {
+//                return tmpl;
+//            }
+//        }
+//    }
 
     return PaperSizeTemplate::Custom;
 }
@@ -248,9 +251,14 @@ bool VPSheet::isRollTemplate(PaperSizeTemplate tmpl)
 //---------------------------------------------------------------------------------------------------------------------
 void VPSheet::PopulateComboBox(QVector<PaperSizeTemplate> *tmpls, QComboBox* comboBox)
 {
+    const QIcon icoPaper("://puzzleicon/16x16/template.png");
+    const QIcon icoRoll("://puzzleicon/16x16/roll.png");
+
+    QIcon icon;
     for (auto tmpl : *tmpls)
     {
-       comboBox->addItem(GetTemplateName(tmpl), QVariant(static_cast<int>(tmpl)));
+        icon = (isRollTemplate(tmpl))? icoRoll : icoPaper;
+        comboBox->addItem(icon, GetTemplateName(tmpl), QVariant(static_cast<int>(tmpl)));
     }
 }