From 5b7e031c52d3ec96c76e75d4f46bbc0d986ba733 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sat, 26 Mar 2016 21:42:40 -0400
Subject: [PATCH] Some refactoring of icon names.

---
 glabels/Icons.h                               |  25 +++++++++---------
 glabels/icons.qrc                             |  25 +++++++++---------
 .../{fallback-edit-copy.png => edit-copy.png} | Bin
 .../{fallback-edit-cut.png => edit-cut.png}   | Bin
 ...fallback-edit-paste.png => edit-paste.png} | Bin
 .../{fallback-file-new.png => file-new.png}   | Bin
 .../{fallback-file-open.png => file-open.png} | Bin
 ...fallback-file-print.png => file-print.png} | Bin
 ...back-file-save-as.png => file-save-as.png} | Bin
 .../{fallback-file-save.png => file-save.png} | Bin
 ...ck-zoom-best-fit.png => zoom-best-fit.png} | Bin
 .../{fallback-zoom-in.png => zoom-in.png}     | Bin
 ...ck-zoom-original.png => zoom-original.png} | Bin
 .../{fallback-zoom-out.png => zoom-out.png}   | Bin
 glabels/icons/32x32/actions/file-print.png    | Bin 0 -> 1462 bytes
 glabels/ui/PrintView.ui                       |   8 +++++-
 16 files changed, 33 insertions(+), 25 deletions(-)
 rename glabels/icons/24x24/actions/{fallback-edit-copy.png => edit-copy.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-edit-cut.png => edit-cut.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-edit-paste.png => edit-paste.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-file-new.png => file-new.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-file-open.png => file-open.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-file-print.png => file-print.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-file-save-as.png => file-save-as.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-file-save.png => file-save.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-zoom-best-fit.png => zoom-best-fit.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-zoom-in.png => zoom-in.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-zoom-original.png => zoom-original.png} (100%)
 rename glabels/icons/24x24/actions/{fallback-zoom-out.png => zoom-out.png} (100%)
 create mode 100644 glabels/icons/32x32/actions/file-print.png

diff --git a/glabels/Icons.h b/glabels/Icons.h
index 4bf69fa..292d9d5 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -350,7 +350,7 @@ namespace glabels
 			public:
 				EditCopy()
 				{
-					addFile( ":icons/24x24/actions/fallback-edit-copy.png" );
+					addFile( ":icons/24x24/actions/edit-copy.png" );
 				}
 			};
 
@@ -360,7 +360,7 @@ namespace glabels
 			public:
 				EditCut()
 				{
-					addFile( ":icons/24x24/actions/fallback-edit-cut.png" );
+					addFile( ":icons/24x24/actions/edit-cut.png" );
 				}
 			};
 
@@ -370,7 +370,7 @@ namespace glabels
 			public:
 				EditPaste()
 				{
-					addFile( ":icons/24x24/actions/fallback-edit-paste.png" );
+					addFile( ":icons/24x24/actions/edit-paste.png" );
 				}
 			};
 
@@ -380,7 +380,7 @@ namespace glabels
 			public:
 				FileNew()
 				{
-					addFile( ":icons/24x24/actions/fallback-file-new.png" );
+					addFile( ":icons/24x24/actions/file-new.png" );
 				}
 			};
 
@@ -390,7 +390,7 @@ namespace glabels
 			public:
 				FileOpen()
 				{
-					addFile( ":icons/24x24/actions/fallback-file-open.png" );
+					addFile( ":icons/24x24/actions/file-open.png" );
 				}
 			};
 
@@ -400,7 +400,8 @@ namespace glabels
 			public:
 				FilePrint()
 				{
-					addFile( ":icons/24x24/actions/fallback-file-print.png" );
+					addFile( ":icons/24x24/actions/file-print.png" );
+					addFile( ":icons/32x32/actions/file-print.png" );
 				}
 			};
 
@@ -410,7 +411,7 @@ namespace glabels
 			public:
 				FileSave()
 				{
-					addFile( ":icons/24x24/actions/fallback-file-save.png" );
+					addFile( ":icons/24x24/actions/file-save.png" );
 				}
 			};
 
@@ -420,7 +421,7 @@ namespace glabels
 			public:
 				FileSaveAs()
 				{
-					addFile( ":icons/24x24/actions/fallback-file-save-as.png" );
+					addFile( ":icons/24x24/actions/file-save-as.png" );
 				}
 			};
 
@@ -430,7 +431,7 @@ namespace glabels
 			public:
 				ZoomBestFit()
 				{
-					addFile( ":icons/24x24/actions/fallback-zoom-best-fit.png" );
+					addFile( ":icons/24x24/actions/zoom-best-fit.png" );
 				}
 			};
 
@@ -440,7 +441,7 @@ namespace glabels
 			public:
 				ZoomIn()
 				{
-					addFile( ":icons/24x24/actions/fallback-zoom-in.png" );
+					addFile( ":icons/24x24/actions/zoom-in.png" );
 				}
 			};
 
@@ -450,7 +451,7 @@ namespace glabels
 			public:
 				ZoomOriginal()
 				{
-					addFile( ":icons/24x24/actions/fallback-zoom-original.png" );
+					addFile( ":icons/24x24/actions/zoom-original.png" );
 				}
 			};
 
@@ -460,7 +461,7 @@ namespace glabels
 			public:
 				ZoomOut()
 				{
-					addFile( ":icons/24x24/actions/fallback-zoom-out.png" );
+					addFile( ":icons/24x24/actions/zoom-out.png" );
 				}
 			};
 
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index a12dea9..8729ca3 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -52,20 +52,21 @@
 	<file>icons/24x24/actions/glabels-valign-text-bottom.png</file>
 	<file>icons/24x24/actions/glabels-valign-text-middle.png</file>
 	<file>icons/24x24/actions/glabels-valign-text-top.png</file>
-	<file>icons/24x24/actions/fallback-edit-copy.png</file>
-	<file>icons/24x24/actions/fallback-edit-cut.png</file>
-	<file>icons/24x24/actions/fallback-edit-paste.png</file>
-	<file>icons/24x24/actions/fallback-file-new.png</file>
-	<file>icons/24x24/actions/fallback-file-open.png</file>
-	<file>icons/24x24/actions/fallback-file-print.png</file>
-	<file>icons/24x24/actions/fallback-file-save-as.png</file>
-	<file>icons/24x24/actions/fallback-file-save.png</file>
-	<file>icons/24x24/actions/fallback-zoom-best-fit.png</file>
-	<file>icons/24x24/actions/fallback-zoom-in.png</file>
-	<file>icons/24x24/actions/fallback-zoom-original.png</file>
-	<file>icons/24x24/actions/fallback-zoom-out.png</file>
+	<file>icons/24x24/actions/edit-copy.png</file>
+	<file>icons/24x24/actions/edit-cut.png</file>
+	<file>icons/24x24/actions/edit-paste.png</file>
+	<file>icons/24x24/actions/file-new.png</file>
+	<file>icons/24x24/actions/file-open.png</file>
+	<file>icons/24x24/actions/file-print.png</file>
+	<file>icons/24x24/actions/file-save-as.png</file>
+	<file>icons/24x24/actions/file-save.png</file>
+	<file>icons/24x24/actions/zoom-best-fit.png</file>
+	<file>icons/24x24/actions/zoom-in.png</file>
+	<file>icons/24x24/actions/zoom-original.png</file>
+	<file>icons/24x24/actions/zoom-out.png</file>
 	<file>icons/24x24/apps/glabels.png</file>
 	<file>icons/32x32/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>
diff --git a/glabels/icons/24x24/actions/fallback-edit-copy.png b/glabels/icons/24x24/actions/edit-copy.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-edit-copy.png
rename to glabels/icons/24x24/actions/edit-copy.png
diff --git a/glabels/icons/24x24/actions/fallback-edit-cut.png b/glabels/icons/24x24/actions/edit-cut.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-edit-cut.png
rename to glabels/icons/24x24/actions/edit-cut.png
diff --git a/glabels/icons/24x24/actions/fallback-edit-paste.png b/glabels/icons/24x24/actions/edit-paste.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-edit-paste.png
rename to glabels/icons/24x24/actions/edit-paste.png
diff --git a/glabels/icons/24x24/actions/fallback-file-new.png b/glabels/icons/24x24/actions/file-new.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-file-new.png
rename to glabels/icons/24x24/actions/file-new.png
diff --git a/glabels/icons/24x24/actions/fallback-file-open.png b/glabels/icons/24x24/actions/file-open.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-file-open.png
rename to glabels/icons/24x24/actions/file-open.png
diff --git a/glabels/icons/24x24/actions/fallback-file-print.png b/glabels/icons/24x24/actions/file-print.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-file-print.png
rename to glabels/icons/24x24/actions/file-print.png
diff --git a/glabels/icons/24x24/actions/fallback-file-save-as.png b/glabels/icons/24x24/actions/file-save-as.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-file-save-as.png
rename to glabels/icons/24x24/actions/file-save-as.png
diff --git a/glabels/icons/24x24/actions/fallback-file-save.png b/glabels/icons/24x24/actions/file-save.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-file-save.png
rename to glabels/icons/24x24/actions/file-save.png
diff --git a/glabels/icons/24x24/actions/fallback-zoom-best-fit.png b/glabels/icons/24x24/actions/zoom-best-fit.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-zoom-best-fit.png
rename to glabels/icons/24x24/actions/zoom-best-fit.png
diff --git a/glabels/icons/24x24/actions/fallback-zoom-in.png b/glabels/icons/24x24/actions/zoom-in.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-zoom-in.png
rename to glabels/icons/24x24/actions/zoom-in.png
diff --git a/glabels/icons/24x24/actions/fallback-zoom-original.png b/glabels/icons/24x24/actions/zoom-original.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-zoom-original.png
rename to glabels/icons/24x24/actions/zoom-original.png
diff --git a/glabels/icons/24x24/actions/fallback-zoom-out.png b/glabels/icons/24x24/actions/zoom-out.png
similarity index 100%
rename from glabels/icons/24x24/actions/fallback-zoom-out.png
rename to glabels/icons/24x24/actions/zoom-out.png
diff --git a/glabels/icons/32x32/actions/file-print.png b/glabels/icons/32x32/actions/file-print.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfa03bab09dbb38677c9789a876f421c06be1691
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/glabels/ui/PrintView.ui b/glabels/ui/PrintView.ui
index 4a919c9..178d373 100644
--- a/glabels/ui/PrintView.ui
+++ b/glabels/ui/PrintView.ui
@@ -414,7 +414,13 @@
        </property>
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/24x24/actions/fallback-file-print.png</normaloff>:/icons/24x24/actions/fallback-file-print.png</iconset>
+         <normaloff>:/icons/32x32/actions/file-print.png</normaloff>:/icons/32x32/actions/file-print.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
        </property>
        <property name="toolButtonStyle">
         <enum>Qt::ToolButtonTextBesideIcon</enum>