From a864766472e43a098d3d94f56bf0ceec13315911 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 19 Feb 2017 18:31:51 -0500
Subject: [PATCH] Added new 32x32 icons.

---
 glabels/Icons.h                               |   2 +-
 glabels/icons.qrc                             |   8 +-
 glabels/icons/32x32/actions/file-print.png    | Bin 1462 -> 0 bytes
 .../32x32/actions/horizontal-orientation.png  | Bin 330 -> 0 bytes
 .../32x32/actions/label-orientation-horiz.svg |   7 ++
 .../32x32/actions/label-orientation-vert.svg  |   7 ++
 glabels/icons/32x32/actions/print.svg         |  31 ++++++
 .../icons/32x32/actions/select-product.png    | Bin 1996 -> 0 bytes
 .../icons/32x32/actions/select-product.svg    |  51 ++++++++++
 .../32x32/actions/vertical-orientation.png    | Bin 334 -> 0 bytes
 glabels/ui/PrintView.ui                       |  89 ++++++------------
 glabels/ui/PropertiesView.ui                  |  17 +---
 12 files changed, 136 insertions(+), 76 deletions(-)
 delete mode 100644 glabels/icons/32x32/actions/file-print.png
 delete mode 100644 glabels/icons/32x32/actions/horizontal-orientation.png
 create mode 100644 glabels/icons/32x32/actions/label-orientation-horiz.svg
 create mode 100644 glabels/icons/32x32/actions/label-orientation-vert.svg
 create mode 100644 glabels/icons/32x32/actions/print.svg
 delete mode 100644 glabels/icons/32x32/actions/select-product.png
 create mode 100644 glabels/icons/32x32/actions/select-product.svg
 delete mode 100644 glabels/icons/32x32/actions/vertical-orientation.png

diff --git a/glabels/Icons.h b/glabels/Icons.h
index 0a956ba..33fd99e 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -423,7 +423,7 @@ namespace glabels
 		public:
 			FilePrint()
 			{
-				addFile( ":icons/32x32/actions/file-print.png" );
+				addPixmap( QPixmap( ":icons/32x32/actions/print.svg" ) );
 			}
 		};
 
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index aa55898..2669126 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -92,10 +92,10 @@
 	<file>icons/24x24/actions/glabels-valign-text-top.svg</file>
 	<file>icons/24x24/apps/glabels.png</file>
 
-	<file>icons/32x32/actions/file-print.png</file>
-	<file>icons/32x32/actions/horizontal-orientation.png</file>
-	<file>icons/32x32/actions/select-product.png</file>
-	<file>icons/32x32/actions/vertical-orientation.png</file>
+	<file>icons/32x32/actions/label-orientation-horiz.svg</file>
+	<file>icons/32x32/actions/label-orientation-vert.svg</file>
+	<file>icons/32x32/actions/print.svg</file>
+	<file>icons/32x32/actions/select-product.svg</file>
 	<file>icons/32x32/apps/glabels.png</file>
 
 	<file>icons/48x48/apps/glabels.png</file>
diff --git a/glabels/icons/32x32/actions/file-print.png b/glabels/icons/32x32/actions/file-print.png
deleted file mode 100644
index dfa03bab09dbb38677c9789a876f421c06be1691..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1462
zcmV;n1xfmeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000GjNkl<ZcmeI#
zYfMvT7zgk|nc`5Rat~rv5Gs_m6xvf-z_#>WTA&v!<wCh2f_RC>=y1-9Q|D#s_QCmS
zZZm$^Wz37y;l&x<mbtj7*~MvQHg#SYXq+zFvK0P%&S_R1k_9%|zIc*fk3Fg9`R9G#
z=RF6W$z=LpJqf^lJPANYm{h^ME>$S|vY9+QjIKRa5;@aH=iO}0Pyk5|lV4b*zrVD7
z30~Q;9X+?Zapz7?$n61jKk9Z+&tLq=>FT<L7q@J}?AB(eXK3za$>oKi08%-#t=eB3
zXr4U_9UX5&r!RuZW`V7wm^)kTbhesd4C1aCEoP3vVhUYj|2;#ah0bV1kRhZ%qrvXo
zZ=kxi3Z-sWK%!uFJRIQ0()OjOsPy7c=K)xXskp<2g^L%`xfqL=ETRxLj>T@pf`#)@
z-%tn7OgG%+F4Q;Gp>2K}%oIYa*HIAj17;S5Bx}~LM!DC6hNcEkfII9o@Wc!=QLWYe
zvTS)fnp>Oj!p3!QlsQo5D#hFdZB)RGrshW2OYK1=cKE6)P*Yoj_GQn2owgc(4ZL)X
z4X7?qBSVxCl=*-}DnZAdcQ9vOD;j4tK%QUlvnVGgg(s2Aoh44!{kFMtuzck*tlRKB
z3?@B{CIiR7(FYlW^n?v)VW)?blsZsk&|$--_4wrUslT;i)pOi5=uD=2;#|hd4*%B5
z+M2$ax*BYGc{7fkI6SPV22Ddb?9Q@Y>WG(k)P851TU+3wx!m{u9-KXYW?1dr{~k(d
z^vZo+u(f$IChylpwAef|UHJC$C0x1s-LU%R;@4a)b{$CN%HMc0r7FOVfX!h?cTd-_
zyLsz6SIbvj1)2hI0p`qY<x(9!c5v7oI=r8&Ro74(3_#m$psulwZN2|209(uJ^9BRZ
zN5ETI!EPd<A4Nq)A)L<#|6hoRh+ywCU;wH`Axa>U<$@>7k^~C18ssvH5Za+08@k_s
z6skO=i^SliiNpbm-OfHBz~mQj;t~=N9UBV;BZo?zhdh;X(A4=V2s4BjJ8m3e<Kw}o
z^P!}BY7GYN`S7sR>6zdOQc?qK(P<eXWXW<lf|P08_qFTSVD*|6Sh?!iL1X{Vtd?e^
z3WZ2X7jpMY%gjPHqeQMs9g>r$0@VgDNig|D@{}o{sX&2F2W3G4(lRn3r{qUJ?4*t3
zU3BbyYtRmM?!#-lUIp#2$R_z34MfsxBu}1-q)CF1iGs;U5(tj*=$I6nn0QU5P(W`s
zBVVgUif}rNRvSJ)_Zfxw07s4=8nlxiAII^NN4b|7i7W>rMvS0oP(zS94O7z6`~Ea;
z!h~~dZNiI+iH$#?HRxe=*tusn{Q!+LjF&E7z^7+E8VU-18W%2oiEO0`GDZPWp&R-V
zFJj^oexmL;N;;{--lV$4B#Q9DViFS1l(}78Yp^dDQ)%utZrzNl*T2UX7tRjJR~OIY
zhZ|R*p+zRi&4EZ)fufQM#KgtlrCMT=L=wo;B#iL*v|8`_>-})L%cw`K5M|4-bJtFE
zb>I9)Zrr*CcZC-sNj97wC;Sb5BqmMlrCQ04yp+-r8JCdQ+qPgnyp=u}Y&J|6OCZiw
z44Fi(gjmjmzNcr3K#zJfx3nNBc@n5r#y|naj*pJ+t@8U}uv(#@mW&!bnr)FG$zn8U
z+kOfy+m1jeRRmXhaxyFq2RuF>qT}M(01V;x4-hkY%$UAXw+D8o3p$gTd#&<S`-a5n
z@nB{Hjbi;gu<NOUws*Ngj<WJ{3Q<ZM(|9(3os8@sAevU@-N;d+Ffwu!o}#u13k!QJ
z+b};O0>S%6B0M7Ece-XIk^KYkNdn0t(qWWA#*nZ9|1u)sgg=bJ*;@Vm0eqQV6)DG1
Qpa1{>07*qoM6N<$f(7@%9smFU

diff --git a/glabels/icons/32x32/actions/horizontal-orientation.png b/glabels/icons/32x32/actions/horizontal-orientation.png
deleted file mode 100644
index c08ad064c275ffc911c0942ca348b2c700f545bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<o%864!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhK*k>Tba4#v
z=zM#{p6if-MEgVYqxQUA&9PN{{STf5xx9EVb;$+p9lO5CHFbOECm3g#N4JOlkr7d6
zZ`a_cJjSzM+=;{D+<MIem!tG+?$2kKclP75%u~D8nI8zuTsu8bWbI=Mxm!I963Od4
zC%x%fG((u>pw?-lpKaT6Re25z&8SpL`nv00z=0RHCx*WXSKPh+Ol!;w;Y%x5WzAmp
z((-)q{cpPrpQ$OaKUmdZC%_oIAbV#i<2Q$O^Vn?@cz7ymB)8p}w{h}O-{<%5GBykL
Uu07Os7vv=dPgg&ebxsLQ02bkZ9smFU

diff --git a/glabels/icons/32x32/actions/label-orientation-horiz.svg b/glabels/icons/32x32/actions/label-orientation-horiz.svg
new file mode 100644
index 0000000..f9fdfad
--- /dev/null
+++ b/glabels/icons/32x32/actions/label-orientation-horiz.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="15" width="27" x="2.5" y="8.5" rx="2" ry="2" />
+
+</svg>
diff --git a/glabels/icons/32x32/actions/label-orientation-vert.svg b/glabels/icons/32x32/actions/label-orientation-vert.svg
new file mode 100644
index 0000000..c027cf9
--- /dev/null
+++ b/glabels/icons/32x32/actions/label-orientation-vert.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="27" width="15" x="8.5" y="2.5" rx="2" ry="2" />
+
+</svg>
diff --git a/glabels/icons/32x32/actions/print.svg b/glabels/icons/32x32/actions/print.svg
new file mode 100644
index 0000000..0768972
--- /dev/null
+++ b/glabels/icons/32x32/actions/print.svg
@@ -0,0 +1,31 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="13" width="26" x="3" y="12" rx="3" ry="3" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="2" width="2" x="23" y="15" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="2" width="2" x="20" y="15" />
+
+  <rect
+     style="fill:#fafafa;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="8" width="16" x="7.5" y="4.5" />
+
+  <rect
+     style="fill:#fafafa;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="5" width="16" x="7.5" y="22.5" />
+
+  <line
+     style="stroke:#999999;stroke-width:1;stroke-opacity:1"
+     x1="10" y1="7.5" x2="21" y2="7.5"/>
+
+  <line
+     style="stroke:#999999;stroke-width:1;stroke-opacity:1"
+     x1="10" y1="9.5" x2="21" y2="9.5"/>
+
+</svg>
diff --git a/glabels/icons/32x32/actions/select-product.png b/glabels/icons/32x32/actions/select-product.png
deleted file mode 100644
index 1ca76c3a2a8b2355ad51187f4c69ba77b90d6e46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1996
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

diff --git a/glabels/icons/32x32/actions/select-product.svg b/glabels/icons/32x32/actions/select-product.svg
new file mode 100644
index 0000000..c909284
--- /dev/null
+++ b/glabels/icons/32x32/actions/select-product.svg
@@ -0,0 +1,51 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="32" height="32" >
+
+  <rect
+     style="fill:#f8f8f8;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="18" width="14" x="4.5" y="2.5" />
+
+  <rect
+     style="fill:#fafafa;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     height="18" width="14" x="13.5" y="6.5" />
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 9.5,11.5 9.5,29.5 23.5,29.5 23.5,16.5 18.5,11.5 Z" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="13" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="17" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="21" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="11" y="25" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="3" x="17" y="13" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="17" y="17" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="17" y="21" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="17" y="25" />
+
+  <path
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1;stroke-linejoin:bevel"
+     d="M 23.5,16.5 18.5,11.5 18.5,16.5 Z" />
+
+</svg>
diff --git a/glabels/icons/32x32/actions/vertical-orientation.png b/glabels/icons/32x32/actions/vertical-orientation.png
deleted file mode 100644
index 05eebfb89292533e423ab8a4978ff4c78583fef5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNvy>=5uVX;%1EA1tPZ!4!kK=ErZS*?gAmVynXXA`F
zN-Qkmmu~C-mR%|4^L{x?PV>~S*D_fI|1=#i`z@Y$qhYS&2g8#$P9O7e$eDBb-tT*j
z;kHLDxYvHol{qf`{7w_+u65QOC%8XU>V+paN4<`nmipV~e0W8`w5Qdv*UJwWEBu(G
za<Vow^xX7C8Y~qo*V4~_zWj2=dDabo)}{up*e@jL;wS<}U*5Z3j8IU@KPHjAwzo!1
zGMViGvqak7=mVv*migD-zwh&fq2Qcp?rl4U^#?NhJQ%|di0zp3!s-AMZvo4%_pSQc
X73s=z=7|3QdXvG^)z4*}Q$iB}(G`V6

diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui
index 187ead0..eaa0673 100644
--- a/glabels/ui/PrintView.ui
+++ b/glabels/ui/PrintView.ui
@@ -109,16 +109,7 @@
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
-     <property name="leftMargin">
-      <number>12</number>
-     </property>
-     <property name="topMargin">
-      <number>12</number>
-     </property>
-     <property name="rightMargin">
-      <number>12</number>
-     </property>
-     <property name="bottomMargin">
+     <property name="margin">
       <number>12</number>
      </property>
      <item>
@@ -286,22 +277,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="printButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>300</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="layoutDirection">
-        <enum>Qt::LeftToRight</enum>
-       </property>
+      <widget class="QPushButton" name="printButton">
        <property name="styleSheet">
         <string notr="true">text-align:left; padding:3px;</string>
        </property>
@@ -310,7 +286,7 @@
        </property>
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/32x32/actions/file-print.png</normaloff>:/icons/32x32/actions/file-print.png</iconset>
+         <normaloff>:/icons/32x32/actions/print.svg</normaloff>:/icons/32x32/actions/print.svg</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -318,9 +294,6 @@
          <height>32</height>
         </size>
        </property>
-       <property name="toolButtonStyle">
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
       </widget>
      </item>
      <item>
@@ -359,22 +332,6 @@
   <include location="../icons.qrc"/>
  </resources>
  <connections>
-  <connection>
-   <sender>printButton</sender>
-   <signal>clicked()</signal>
-   <receiver>PrintView</receiver>
-   <slot>onPrintButtonClicked()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>45</x>
-     <y>56</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>4</x>
-     <y>50</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>copiesStartSpin</sender>
    <signal>valueChanged(int)</signal>
@@ -382,8 +339,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>170</x>
-     <y>317</y>
+     <x>221</x>
+     <y>124</y>
     </hint>
     <hint type="destinationlabel">
      <x>4</x>
@@ -398,8 +355,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>126</x>
-     <y>347</y>
+     <x>161</x>
+     <y>84</y>
     </hint>
     <hint type="destinationlabel">
      <x>2</x>
@@ -414,8 +371,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>87</x>
-     <y>407</y>
+     <x>114</x>
+     <y>220</y>
     </hint>
     <hint type="destinationlabel">
      <x>2</x>
@@ -430,8 +387,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>57</x>
-     <y>436</y>
+     <x>84</x>
+     <y>248</y>
     </hint>
     <hint type="destinationlabel">
      <x>6</x>
@@ -446,8 +403,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>61</x>
-     <y>466</y>
+     <x>88</x>
+     <y>276</y>
     </hint>
     <hint type="destinationlabel">
      <x>6</x>
@@ -462,8 +419,8 @@
    <slot>onFormChanged()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>569</x>
-     <y>536</y>
+     <x>645</x>
+     <y>745</y>
     </hint>
     <hint type="destinationlabel">
      <x>1</x>
@@ -471,6 +428,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>printButton</sender>
+   <signal>clicked()</signal>
+   <receiver>PrintView</receiver>
+   <slot>onPrintButtonClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>325</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>5</x>
+     <y>277</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>onPrintButtonClicked()</slot>
diff --git a/glabels/ui/PropertiesView.ui b/glabels/ui/PropertiesView.ui
index 42669a5..7f57efe 100644
--- a/glabels/ui/PropertiesView.ui
+++ b/glabels/ui/PropertiesView.ui
@@ -42,16 +42,7 @@
    </item>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="leftMargin">
-      <number>12</number>
-     </property>
-     <property name="topMargin">
-      <number>12</number>
-     </property>
-     <property name="rightMargin">
-      <number>12</number>
-     </property>
-     <property name="bottomMargin">
+     <property name="margin">
       <number>12</number>
      </property>
      <item>
@@ -245,7 +236,7 @@
           </property>
           <property name="icon">
            <iconset resource="../icons.qrc">
-            <normaloff>:/icons/32x32/actions/select-product.png</normaloff>:/icons/32x32/actions/select-product.png</iconset>
+            <normaloff>:/icons/32x32/actions/select-product.svg</normaloff>:/icons/32x32/actions/select-product.svg</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -295,7 +286,7 @@
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
-               <normaloff>:/icons/32x32/actions/horizontal-orientation.png</normaloff>:/icons/32x32/actions/horizontal-orientation.png</iconset>
+               <normaloff>:/icons/32x32/actions/label-orientation-horiz.svg</normaloff>:/icons/32x32/actions/label-orientation-horiz.svg</iconset>
              </property>
             </item>
             <item>
@@ -304,7 +295,7 @@
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
-               <normaloff>:/icons/32x32/actions/vertical-orientation.png</normaloff>:/icons/32x32/actions/vertical-orientation.png</iconset>
+               <normaloff>:/icons/32x32/actions/label-orientation-vert.svg</normaloff>:/icons/32x32/actions/label-orientation-vert.svg</iconset>
              </property>
             </item>
            </widget>