From 030f9eb5e08fc804cdb51904630d4f23614e1967 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 25 Feb 2017 15:54:13 -0500 Subject: [PATCH] Updated glabels, file-save and file-save-as icons. --- glabels/Icons.h | 18 +- glabels/MainWindow.cpp | 2 + glabels/icons.qrc | 8 +- glabels/icons/16x16/actions/file-save-as.svg | 4 +- glabels/icons/16x16/actions/file-save.svg | 4 +- glabels/icons/16x16/apps/glabels.png | Bin 669 -> 0 bytes glabels/icons/16x16/apps/glabels.svg | 43 + glabels/icons/22x22/actions/file-save-as.svg | 4 +- glabels/icons/22x22/actions/file-save.svg | 4 +- glabels/icons/22x22/apps/glabels.svg | 43 + glabels/icons/24x24/actions/file-save-as.svg | 4 +- glabels/icons/24x24/actions/file-save.svg | 4 +- glabels/icons/24x24/apps/glabels.png | Bin 997 -> 0 bytes glabels/icons/32x32/apps/glabels.png | Bin 1411 -> 0 bytes glabels/icons/32x32/apps/glabels.svg | 43 + glabels/icons/48x48/apps/glabels.png | Bin 2524 -> 0 bytes glabels/icons/48x48/apps/glabels.svg | 43 + glabels/icons/scalable/apps/glabels.svg | 784 +------------------ 18 files changed, 230 insertions(+), 778 deletions(-) delete mode 100644 glabels/icons/16x16/apps/glabels.png create mode 100644 glabels/icons/16x16/apps/glabels.svg create mode 100644 glabels/icons/22x22/apps/glabels.svg delete mode 100644 glabels/icons/24x24/apps/glabels.png delete mode 100644 glabels/icons/32x32/apps/glabels.png create mode 100644 glabels/icons/32x32/apps/glabels.svg delete mode 100644 glabels/icons/48x48/apps/glabels.png create mode 100644 glabels/icons/48x48/apps/glabels.svg diff --git a/glabels/Icons.h b/glabels/Icons.h index 33fd99e..7d5acf1 100644 --- a/glabels/Icons.h +++ b/glabels/Icons.h @@ -118,16 +118,6 @@ namespace glabels }; - class Merge : public QIcon - { - public: - Merge() - { - addFile( ":icons/24x24/actions/glabels-merge.png" ); - } - }; - - class ObjectProperties : public QIcon { public: @@ -349,10 +339,10 @@ namespace glabels public: Glabels() { - addFile( ":icons/16x16/apps/glabels.png" ); - addFile( ":icons/24x24/apps/glabels.png" ); - addFile( ":icons/32x32/apps/glabels.png" ); - addFile( ":icons/48x48/apps/glabels.png" ); + addFile( ":icons/16x16/apps/glabels.svg" ); + addFile( ":icons/22x22/apps/glabels.svg" ); + addFile( ":icons/32x32/apps/glabels.svg" ); + addFile( ":icons/48x48/apps/glabels.svg" ); addFile( ":icons/scalable/apps/glabels.svg" ); } }; diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index c84eac5..aff3f26 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -61,6 +61,8 @@ namespace glabels MainWindow::MainWindow() : mModel(0) { + setWindowIcon( Icons::Glabels() ); + createActions(); createMenus(); createToolBars(); diff --git a/glabels/icons.qrc b/glabels/icons.qrc index 2669126..2eb4de3 100644 --- a/glabels/icons.qrc +++ b/glabels/icons.qrc @@ -36,7 +36,7 @@ icons/16x16/actions/glabels-zoom-one-to-one.svg icons/16x16/actions/glabels-zoom-out.svg icons/16x16/actions/glabels-zoom-to-fit.svg - icons/16x16/apps/glabels.png + icons/16x16/apps/glabels.svg icons/22x22/actions/edit-copy.svg icons/22x22/actions/edit-cut.svg @@ -65,6 +65,7 @@ icons/22x22/actions/glabels-zoom-one-to-one.svg icons/22x22/actions/glabels-zoom-out.svg icons/22x22/actions/glabels-zoom-to-fit.svg + icons/22x22/apps/glabels.svg icons/24x24/actions/edit-copy.svg icons/24x24/actions/edit-cut.svg @@ -90,15 +91,14 @@ icons/24x24/actions/glabels-valign-text-bottom.svg icons/24x24/actions/glabels-valign-text-middle.svg icons/24x24/actions/glabels-valign-text-top.svg - icons/24x24/apps/glabels.png icons/32x32/actions/label-orientation-horiz.svg icons/32x32/actions/label-orientation-vert.svg icons/32x32/actions/print.svg icons/32x32/actions/select-product.svg - icons/32x32/apps/glabels.png + icons/32x32/apps/glabels.svg - icons/48x48/apps/glabels.png + icons/48x48/apps/glabels.svg icons/scalable/apps/glabels.svg diff --git a/glabels/icons/16x16/actions/file-save-as.svg b/glabels/icons/16x16/actions/file-save-as.svg index 40b468c..33e25f9 100644 --- a/glabels/icons/16x16/actions/file-save-as.svg +++ b/glabels/icons/16x16/actions/file-save-as.svg @@ -1,7 +1,7 @@ diff --git a/glabels/icons/16x16/apps/glabels.png b/glabels/icons/16x16/apps/glabels.png deleted file mode 100644 index 3c6abd8dbe5933f6357ee408ca7ba43624857f20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)bY*F7Wpd{G_b&hd03mcmSaefw zb#h~60BCe{a5^t9YH4k4VPh_Bb#rNBXklz@E@OIWX5(G}00GTOL_t(IjkS}(OB+EL z#ox?sHroxGY9d9dtm*b3O6nq1N}}+fxt4Krg`@^$>as^pwA$g?fr0 zfgB1=auI}dt!Nf1D(0>$dr8qh+gN=E{J3W1|_# zKajQ#8|xoFA63K75Y9OOAfL}K#A30jz&PFC9DJlZb5`Rk-xa4ndGg3l&-0dYxf}}x zR4SEiUDxk2cH!68R&YoDj;f_%_Vq_Jn@wh#rd=wP#*4+`Q2-Ew4P%V8+ike6i<4su z{ZSWolXaeqCizuv|6q6umn_+B*?Oi$IstFQ4|nDE{oEO*9w9FQ53~4 zK)GDb*6a1jOWL0c!TPsc*ZpA_#=m2{u6q83{|@*KQO3&q%PC~`00000NkvXXu0mjf Dova#k diff --git a/glabels/icons/16x16/apps/glabels.svg b/glabels/icons/16x16/apps/glabels.svg new file mode 100644 index 0000000..4032790 --- /dev/null +++ b/glabels/icons/16x16/apps/glabels.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/22x22/actions/file-save-as.svg b/glabels/icons/22x22/actions/file-save-as.svg index 4b8eed2..39dc182 100644 --- a/glabels/icons/22x22/actions/file-save-as.svg +++ b/glabels/icons/22x22/actions/file-save-as.svg @@ -1,7 +1,7 @@ diff --git a/glabels/icons/22x22/apps/glabels.svg b/glabels/icons/22x22/apps/glabels.svg new file mode 100644 index 0000000..81d6a41 --- /dev/null +++ b/glabels/icons/22x22/apps/glabels.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/24x24/actions/file-save-as.svg b/glabels/icons/24x24/actions/file-save-as.svg index 42f8d71..f3db905 100644 --- a/glabels/icons/24x24/actions/file-save-as.svg +++ b/glabels/icons/24x24/actions/file-save-as.svg @@ -1,7 +1,7 @@ diff --git a/glabels/icons/24x24/apps/glabels.png b/glabels/icons/24x24/apps/glabels.png deleted file mode 100644 index 3add4f6945664e6c441aef28182dee90818dc921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 997 zcmVbY*F7Wpd{G_b&hd03mcmSaefw zb#h~60BCe{a5^t9YH4k4VPh_Bb#rNBXklz@E@OIWX5(G}00R|CL_t(YiRG0`XcJKs zhW~pf8S`@5#AeL28pRh?6D%zhA1Fq|w;(7Higl$TB0|-bigYh7M5rKz(uGj8o9afX zx`>F?wpQx{Ew&J(qDDK3ohF%NX08jJnAE1WMOPj;%-lQoobR0fz+5oKFcWWV1f9w` ziW%7X`h_RgE4w~j+ELaM4vDVG&Q2Q;-d5t-zGlz4O>as$1^ zOOC|T*;7-AE0Cz8qhqZg2nQ*pB!6GeW=ZABnte`dnnq(^p<2pQ2Tor+(bm@HHw@!w zU0q$#IS|HJZqeDu{@m;FagN|4hc_LoF!xFGqKGH*{Uk z$g+I7zP|qSM1TT`5{bl|Y&MHTB7x!I;haZb+(D^5i&!j%jMWd`;f1d2@OV531Oj|T zMMXnvYwMLi0vKZ;gn;8XP)fmZ9HOrySh2{1)R(vDe@{@m{aEfBV+<~r3!*4eNs^8< zH#hH}6ktk{?;i&rVPWl7XwG@a@P0@OR^|Yjrom>jK@>%}-EJxfLQ7LqQ^BvJV917H zfKm!dDF`8;l)}R4$i$=QA5^e$-x-XKjzU#cjE#+fF@{Ja0##L^C<=I@u{s-NMqfhwve$AesD(($Z3RyKpU(%L=P@!e0zycxFo(mDE39Y-W^%?D;_*0E?`%Lx*?c&i zPPpA}SgqEagr=L){_LC-1?akNSS%I@f&f7fAW0H}!C--8`H9DydC3$7w70k49vT|5 znbqXWHU53P6oz2{00ssI`a+@5ub6xyA;b?L_*-eyvnXTi<%EELVKcgu|1ZFI%ur~C Tn#aPx00000NkvXXu0mjf;oi5d diff --git a/glabels/icons/32x32/apps/glabels.png b/glabels/icons/32x32/apps/glabels.png deleted file mode 100644 index 9c69e2c80335f1539448a4d7008174306514cbf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1411 zcmV-}1$_F6P)bY*F7Wpd{G_b&hd03mcmSaefw zb#h~60BCe{a5^t9YH4k4VPh_Bb#rNBXklz@E@OIWX5(G}00gs1L_t(oh3%J5Y!p=- z$G`8*&YRsGW_NbC6;}Qv?b3ElfJ;NEB-9{UDu@YQj1hwxBPAY)2gAXb8WUqGaPVMD zNQ|Nv5;XCEhES1eh^2?}$J8R(ZIPmNL6%*+-I;ka-FY5xCoL_og{EHkB`hSsn=eOiYzaRTW`T~PWBt(m-9PV$3QsmK0IzQeZF~9Y9Y>zHI2k;9 z=~yG#iZFmTE7?ou17L|>y>A1l4dVQHlm@v^=3-r?dmk9!wawa-TibTk4rvjLELwz- zNC`G0=N1g0N)PV~MicUlSPX;h?HF3FWKCo8-30-7WwYAYP*+pCi1s3sejiqP5I0nQ z;oX&)+z5-hI~LI40l2)M3`hSlrVv^3W)w(^(3EgQf7LG6|o z4@7%IF19;G+~-148uS^mqp?FZ>X+{!OW&GJjM~KP9PYnMyXT+r4*W`L6&8N z!(k+o$*`)b$GW<@)>aHKB^z*E7o2l%44nEBO>36J%3lGu3=CytG`8*r=X@GCV+^t^ zLs1kYlgSWc?3+V}4#{%{pp-(ABuJ73pU;QCubf5A`Fvh* z!!QsC1fc6WVzC$)V_30bMO>1kFJ_A~qX=Es^@6La3dWcR6bvdTS$R;V;+nk#Z7;ot zXfz7jwqaQo48y?Ht5=aqrJ!jV0H9DPU}9o|aL!-o?Cktx@7}$q?+PG<@T%UnZ5W2( zy@nDcFm7DN$rC>z(fle5N5at15Nz9qs;Y=YB1j|>;GCmaETUK}A{vb%9*+Y685kJY z51_fC3;@97P;QJU zrReMHlL#SXYPWR9j))KfNs=JTw`!-5`wQQG{W)5;?FQ2m7#|-8V+@f<#0zfQHZqy% zA3{}Cq3ims3`)`rVVd;{%BCm^2qADB2l<=Vu<7|dSXRFt01yZSplKQ+kq8)Lo={B{ zFCm2ILz(=<`_Xai#LddRYjU@!>3-w#SDN~IDk%kr{T9#apaC`$SH zy#a&}kR%C|QuzIT#9}e8C@H1W0+p>ipT)oDv*HZ&_V#|y7;6j!0-kWp=J@utI|VNT zxUMTMT)6P_3_rKG?}U(Q02=|!s$36X0>Cdqh{3x8EVRwbf5Ah5hX4;^{{n+`^+qIc RgmeG^002ovPDHLkV1n5uZ0`U7 diff --git a/glabels/icons/32x32/apps/glabels.svg b/glabels/icons/32x32/apps/glabels.svg new file mode 100644 index 0000000..7b538c8 --- /dev/null +++ b/glabels/icons/32x32/apps/glabels.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/48x48/apps/glabels.png b/glabels/icons/48x48/apps/glabels.png deleted file mode 100644 index 9058e057e418227cf46396366df35487cc6fb83b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2524 zcmV<22_yE2P)bY*F7Wpd{G_b&hd03mcmSaefw zb#h~60BCe{a5^t9YH4k4VPh_Bb#rNBXklz@E@OIWX5(G}00|69L_t(&f$f=lj9g_E zz<=Mpb072Copv8Aw6&!c+U@R^VgcK&P0P|+~?o{XXklm?(6f9ojc5Iceh=3w}ga~oP6Kh zx%WHgch319cScAl`7n!esSQ4GvoM4ZVy?y$mofu8w>E6hRQ08ZV#JHSb*AjfyMOU= z_Rws`ykr3P^u)F=zI@ql9^Q0c*nIscgD3yO_sr2k!E-k~`%2+o?|0lwRzjMlJoUgW zJHzJb6eN=<$ue7Vp{UT+ugqrLO9F8BO|eg}_}Ep8+A=XnCLx(*z;Vc19!O?2A3}5F z^HJkD0 zH3RqD81Ib6%=OKQ0ih^^Si^tBNZv+q;g$3`BV{iXd1|&c<`qEK#rJ!<*BGj*QA+<8 z-!I{mentOliyU8iPdxYg!NP29%v%ZFwJot+2yOc{U8@!Fu|`e;&^J)x_`tEUtLsnB zg`If=2n+w=&E1`vrWusRPT{*2sjSC4!*&Ve-d`RZ$%ch##oya${p*j=~Ty~ z-v>b7*)k(J#}jVoiMg^hF91Rl4{cbtS~bluzcAhA;8(LZ_CW+dx)zU1+_w0FT(sJFLQ({)`1h(@E;Z9kn(SNq{` zxY}1t_1o(@SE$iw3_Eug&(4v~dz>07+o6#0>|vZ3I}bU_pMzjvd~-06g=| zGiEp(KDcDbl6Fng2#)YUyKv#c>b=2<)-GE@QPkG%>(>f^V(Q<(c=SgLLc4X>Q(rWr ziO*L85KpJm=KlTre`{IR1AF%DIWwmKK-;oq%hq&tbu~GTQ|J6-B81>iFZ9x}>Pi|L z8?p0)c;yV4g2y`}J{z~)DYkCEwKV`fckUdozWOT7&CRzD4i4V@^wUp&efRF&`)3L; z?Hmw7D8*utbUMx0*jTj#etb_~3&N9u-0ynGRw`B@~TD>oOpOK>9wJ(Q{n=sfTciBk0z0(y0NG zLoTbY-NNE!E30EgB9Uqaq?F`xISj)f6bfOQCbn%Or6d-Mv2^KD!}GisckI~F0gS$H zfWTQ8FRR)N2qDOg4bj}v3?UuWY$UvR9qzlsoXZ?x`__B0EUS9Is;X$3hT}Mljg8^^ zKDk_uL?VH%>qsd%efl)1REpNtRx+8)Wu2X!j|m}mODQMa@TLU_G8X{E<8eICtGkv> zC24L-;1yE%j)jv?@wcOA_+-zQSbp^yeBZ~mZ7j>evaIUdDijLj^LY*&I6x>ALQxc? zlz5(p>$*XpL?V&c)!p6wxDcXWO6k9^3N@Hiy7qqkG_HSX8O1Q3z z>$>>9Pbd^Z*L8#t7=}SO97fl5R8<9_rKJVaGzo{pb>rvrd2#sg;Z~qg2w_jm!ju4| z(s{7ta=G*7Kx*KByi<1h$Dub_d(9d;H}0fAnZ&XzN~KbDS@Rtewts~L+#B19q) zVzC&}XcS%7tCM#!d#b7ukH_l(6h%=14bJ}&Y({e+o6X`lP8GniEK)-QtZMJ1bMyU- zjEv&CE{dXHnkI%})M>DnOn2M~0BVDzs;a^i=eCQ=Kp>5cjW~{jloHFb&~=^WMXR`B z+pg*_grQIfP17(<6}j3I1ZlY zRimV78oI8Z7wL)7o+|p2*$euWIWXn1f7-*G<2b%y7}UOz1#+R!7y2%6uJ&{7y+P~y zegH7D63XZE=Z+sg-q+vX-(Fb-U_6DQVlc2Sg7=1?AABEN17yW1Sy3il3pi@819EI^ z%sq1C$eT=3K7qkW0fZ0=(Av<@aHkOBaw(+=Xi`d}(&~UNrPKhu=9*T~5D + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/scalable/apps/glabels.svg b/glabels/icons/scalable/apps/glabels.svg index 2671510..1b5f314 100644 --- a/glabels/icons/scalable/apps/glabels.svg +++ b/glabels/icons/scalable/apps/glabels.svg @@ -1,755 +1,43 @@ - - + - - - - - + + + + + - - - + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - image/svg+xml - - - - - text - plaintext - regular - document - - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - +