From 55285405c2870870bf53c8359f32b3c90e69567f Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 5 Feb 2017 22:19:11 -0500 Subject: [PATCH] Added glabels zoom icons. --- glabels/Icons.h | 34 ++++------------- glabels/MainWindow.cpp | 8 ++-- glabels/icons.qrc | 14 ++++--- glabels/icons/16x16/actions/edit-find.png | Bin 416 -> 0 bytes .../16x16/actions/glabels-bucket-fill.png | Bin 521 -> 0 bytes .../icons/16x16/actions/glabels-pencil.png | Bin 489 -> 0 bytes .../icons/16x16/actions/glabels-zoom-in.svg | 23 ++++++++++++ .../16x16/actions/glabels-zoom-one-to-one.svg | 27 ++++++++++++++ .../icons/16x16/actions/glabels-zoom-out.svg | 23 ++++++++++++ .../16x16/actions/glabels-zoom-to-fit.svg | 35 ++++++++++++++++++ .../icons/22x22/actions/glabels-zoom-in.svg | 23 ++++++++++++ .../22x22/actions/glabels-zoom-one-to-one.svg | 27 ++++++++++++++ .../icons/22x22/actions/glabels-zoom-out.svg | 23 ++++++++++++ .../22x22/actions/glabels-zoom-to-fit.svg | 35 ++++++++++++++++++ glabels/icons/24x24/actions/edit-find.png | Bin 569 -> 0 bytes .../24x24/actions/glabels-bucket-fill.png | Bin 589 -> 0 bytes .../icons/24x24/actions/glabels-pencil.png | Bin 618 -> 0 bytes 17 files changed, 236 insertions(+), 36 deletions(-) delete mode 100644 glabels/icons/16x16/actions/edit-find.png delete mode 100644 glabels/icons/16x16/actions/glabels-bucket-fill.png delete mode 100644 glabels/icons/16x16/actions/glabels-pencil.png create mode 100644 glabels/icons/16x16/actions/glabels-zoom-in.svg create mode 100644 glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg create mode 100644 glabels/icons/16x16/actions/glabels-zoom-out.svg create mode 100644 glabels/icons/16x16/actions/glabels-zoom-to-fit.svg create mode 100644 glabels/icons/22x22/actions/glabels-zoom-in.svg create mode 100644 glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg create mode 100644 glabels/icons/22x22/actions/glabels-zoom-out.svg create mode 100644 glabels/icons/22x22/actions/glabels-zoom-to-fit.svg delete mode 100644 glabels/icons/24x24/actions/edit-find.png delete mode 100644 glabels/icons/24x24/actions/glabels-bucket-fill.png delete mode 100644 glabels/icons/24x24/actions/glabels-pencil.png diff --git a/glabels/Icons.h b/glabels/Icons.h index 1d9209f..16c1fb3 100644 --- a/glabels/Icons.h +++ b/glabels/Icons.h @@ -348,28 +348,6 @@ namespace glabels }; - class BucketFill : public QIcon - { - public: - BucketFill() - { - addFile( ":icons/16x16/actions/glabels-bucket-fill.png" ); - addFile( ":icons/24x24/actions/glabels-bucket-fill.png" ); - } - }; - - - class Pencil : public QIcon - { - public: - Pencil() - { - addFile( ":icons/16x16/actions/glabels-pencil.png" ); - addFile( ":icons/24x24/actions/glabels-pencil.png" ); - } - }; - - class Glabels : public QIcon { public: @@ -470,7 +448,8 @@ namespace glabels public: ZoomBestFit() { - addFile( ":icons/24x24/actions/zoom-best-fit.png" ); + addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-to-fit.svg" ) ); + addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-to-fit.svg" ) ); } }; @@ -480,7 +459,8 @@ namespace glabels public: ZoomIn() { - addFile( ":icons/24x24/actions/zoom-in.png" ); + addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-in.svg" ) ); + addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-in.svg" ) ); } }; @@ -490,7 +470,8 @@ namespace glabels public: ZoomOriginal() { - addFile( ":icons/24x24/actions/zoom-original.png" ); + addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-one-to-one.svg" ) ); + addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-one-to-one.svg" ) ); } }; @@ -500,7 +481,8 @@ namespace glabels public: ZoomOut() { - addFile( ":icons/24x24/actions/zoom-out.png" ); + addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-out.svg" ) ); + addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-out.svg" ) ); } }; diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index 5845a92..b47ef4d 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -348,24 +348,24 @@ namespace glabels connect( viewMarkupAction, SIGNAL(toggled(bool)), this, SLOT(viewMarkup(bool)) ); viewZoomInAction = new QAction( tr("Zoom &In"), this ); - viewZoomInAction->setIcon( QIcon::fromTheme( "zoom-in", Icons::ZoomIn() ) ); + viewZoomInAction->setIcon( Icons::ZoomIn() ); viewZoomInAction->setShortcut( QKeySequence::ZoomIn ); viewZoomInAction->setStatusTip( tr("Increase magnification") ); connect( viewZoomInAction, SIGNAL(triggered()), this, SLOT(viewZoomIn()) ); viewZoomOutAction = new QAction( tr("Zoom &Out"), this ); - viewZoomOutAction->setIcon( QIcon::fromTheme( "zoom-out", Icons::ZoomOut() ) ); + viewZoomOutAction->setIcon( Icons::ZoomOut() ); viewZoomOutAction->setShortcut( QKeySequence::ZoomOut ); viewZoomOutAction->setStatusTip( tr("Decrease magnification") ); connect( viewZoomOutAction, SIGNAL(triggered()), this, SLOT(viewZoomOut()) ); viewZoom1To1Action = new QAction( tr("Zoom &1 to 1"), this ); - viewZoom1To1Action->setIcon( QIcon::fromTheme( "zoom-original", Icons::ZoomOriginal() ) ); + viewZoom1To1Action->setIcon( Icons::ZoomOriginal() ); viewZoom1To1Action->setStatusTip( tr("Restore scale to 100%") ); connect( viewZoom1To1Action, SIGNAL(triggered()), this, SLOT(viewZoom1To1()) ); viewZoomToFitAction = new QAction( tr("Zoom to &Fit"), this ); - viewZoomToFitAction->setIcon( QIcon::fromTheme( "zoom-fit-best", Icons::ZoomBestFit() ) ); + viewZoomToFitAction->setIcon( Icons::ZoomBestFit() ); viewZoomToFitAction->setStatusTip( tr("Set scale to fit window") ); connect( viewZoomToFitAction, SIGNAL(triggered()), this, SLOT(viewZoomToFit()) ); diff --git a/glabels/icons.qrc b/glabels/icons.qrc index 38c18c5..f2721a1 100644 --- a/glabels/icons.qrc +++ b/glabels/icons.qrc @@ -4,7 +4,6 @@ icons/16x16/actions/edit-clear.png - icons/16x16/actions/edit-find.png icons/16x16/actions/glabels-align-bottom.png icons/16x16/actions/glabels-align-hcenter.png icons/16x16/actions/glabels-align-left.png @@ -14,7 +13,6 @@ icons/16x16/actions/glabels-arrow.svg icons/16x16/actions/glabels-barcode.svg icons/16x16/actions/glabels-box.svg - icons/16x16/actions/glabels-bucket-fill.png icons/16x16/actions/glabels-center-horiz.png icons/16x16/actions/glabels-center-vert.png icons/16x16/actions/glabels-ellipse.svg @@ -26,10 +24,13 @@ icons/16x16/actions/glabels-object-properties.png icons/16x16/actions/glabels-order-bottom.png icons/16x16/actions/glabels-order-top.png - icons/16x16/actions/glabels-pencil.png icons/16x16/actions/glabels-rotate-left.png icons/16x16/actions/glabels-rotate-right.png icons/16x16/actions/glabels-text.svg + icons/16x16/actions/glabels-zoom-in.svg + 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/22x22/actions/glabels-align-text-center.svg @@ -48,16 +49,18 @@ icons/22x22/actions/glabels-valign-text-bottom.svg icons/22x22/actions/glabels-valign-text-middle.svg icons/22x22/actions/glabels-valign-text-top.svg + icons/22x22/actions/glabels-zoom-in.svg + 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/24x24/actions/edit-clear.png - icons/24x24/actions/edit-find.png icons/24x24/actions/glabels-align-text-center.svg icons/24x24/actions/glabels-align-text-left.svg icons/24x24/actions/glabels-align-text-right.svg icons/24x24/actions/glabels-arrow.svg icons/24x24/actions/glabels-barcode.svg icons/24x24/actions/glabels-box.svg - icons/24x24/actions/glabels-bucket-fill.png icons/24x24/actions/glabels-ellipse.svg icons/24x24/actions/glabels-format-text-bold.svg icons/24x24/actions/glabels-format-text-italic.svg @@ -66,7 +69,6 @@ icons/24x24/actions/glabels-line.svg icons/24x24/actions/glabels-merge.png icons/24x24/actions/glabels-object-properties.png - icons/24x24/actions/glabels-pencil.png icons/24x24/actions/glabels-text.svg icons/24x24/actions/glabels-valign-text-bottom.svg icons/24x24/actions/glabels-valign-text-middle.svg diff --git a/glabels/icons/16x16/actions/edit-find.png b/glabels/icons/16x16/actions/edit-find.png deleted file mode 100644 index 94e0ceca69dd918f91a3fd40d339ee80c9017f2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)6opsCA3G7TP&@6lveZftQL*+VEc6j9ECmsJYb(V{8@Cf{D{EVc{~AKRWiA8) zLs)k4Kp>f%^9}djnXiuu_y#adlhf(M?RLYZ&9C9}`Ao0ZBOZ^VmI8qQwOWncZl^)C z@a1x$P$)<+nM~4XG|1=k@*NI`S*=zmc>(BjI%00O+uZMW9L;7kg25oERLUu7qwQ{4 z7O_~2bUMxR`9!U`d(!Q81+HL9+V02WQ4FnCOEUn>=X3er@Aq|pQ@_vWqgX6z%>tNA zCIT3ZMmoSTl}aUntk-MYdORNFaygmE;c)N}RMHp~0{ z1~5Di&~mvXkw{3udHjAqnM_8#%V=M(mz3xUF${z0bjn~bU^pDI-|uDTX0s`fa=EOJ zQwM1>R4*!(ia_f1I!b@OCkj%nR*6QVT(4LDb=hp&mNMnAeL_D6)|(Xs54myx0000< KMNUMnLSTXn=ed&r diff --git a/glabels/icons/16x16/actions/glabels-bucket-fill.png b/glabels/icons/16x16/actions/glabels-bucket-fill.png deleted file mode 100644 index 2be70def0e8f8c63aaec3312062930221f5db6a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmV+k0`~ohP)`P?}ucqwT#DOS+yXgQt5Onx!3DiQSx*;m1eUk zfH;nGw-P#dc5qs2nM@`!pU(x5AP5AI!C(+pbGT`UqO~TU&yz?bFin$Ar$am*r(Un) z`#wLfuL1mZkw?FfOeP=va=DD_x>T!Gf*|0V<6zr1hGC4H_s5?fm7$b62wUj)`**(Y zi|e{F91f-1?TT&N5{tz|DfL?^^~<*Q7C+8DUIOeybSz+@wZ^h6(&;p#(TLe>My*y0 z-|hmp9>|+qj^x$VPPBz(Hk(Zsi$#{pC7$Q4lMUeZ*?mZ*Qm+9i6bgSMs~oKq59IrY zqnm9yyFg*(o9n^LxUu+?%gIX*4G-kY+r)h9F>S+FWjH727bd_xXgR59Ho$m*00000 LNkvXXu0mjfN@wU* diff --git a/glabels/icons/16x16/actions/glabels-pencil.png b/glabels/icons/16x16/actions/glabels-pencil.png deleted file mode 100644 index 83a14936e5000385daa5a2e8531e75e905cfb67a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmVvvpfdj~|5X0NdfTt-n&tb}7oNlO@I0UA4-cHLDqsWkuWKu1W=gUBz8GuVw)!v=;Risxh_?XGVQ*JNGO|qN=XnZ)( zmzW!VK!GIVDYsM9+5zy?%nB}5RRdqr+cXwi+4!!bIBOV9t^vHngkHaijiwUOW-&GF z7U`usA|8(mKwNi}UND-#rD>Y`+x`|xRxlh61Nf(tYbS=?7iWSZyZipixB!IjR-ApKHxvA{*eH-MQ(1qTrj~AQv^m<}E$`|^ z69n4bW&DsY0#JXmpC`d*0RHG~@{hZp`Ge!*6YMq{mr5M0d|Ku1&|~iTnu32j*crg* z10B8aD%Of>oV6Y%Lxalw(EO=sz}pWg(qB)hbT%+E5m35(kB;~UiJtB*0SK+3PUb%( f03k~j$!x(dk?xk4i>q%H00000NkvXXu0mjf=CR{v diff --git a/glabels/icons/16x16/actions/glabels-zoom-in.svg b/glabels/icons/16x16/actions/glabels-zoom-in.svg new file mode 100644 index 0000000..5e6e73c --- /dev/null +++ b/glabels/icons/16x16/actions/glabels-zoom-in.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg b/glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg new file mode 100644 index 0000000..0ac95e2 --- /dev/null +++ b/glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/glabels/icons/16x16/actions/glabels-zoom-out.svg b/glabels/icons/16x16/actions/glabels-zoom-out.svg new file mode 100644 index 0000000..fe11dc0 --- /dev/null +++ b/glabels/icons/16x16/actions/glabels-zoom-out.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/glabels/icons/16x16/actions/glabels-zoom-to-fit.svg b/glabels/icons/16x16/actions/glabels-zoom-to-fit.svg new file mode 100644 index 0000000..ba6e456 --- /dev/null +++ b/glabels/icons/16x16/actions/glabels-zoom-to-fit.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/22x22/actions/glabels-zoom-in.svg b/glabels/icons/22x22/actions/glabels-zoom-in.svg new file mode 100644 index 0000000..a9aef5c --- /dev/null +++ b/glabels/icons/22x22/actions/glabels-zoom-in.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg b/glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg new file mode 100644 index 0000000..0ba24e7 --- /dev/null +++ b/glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + diff --git a/glabels/icons/22x22/actions/glabels-zoom-out.svg b/glabels/icons/22x22/actions/glabels-zoom-out.svg new file mode 100644 index 0000000..097f8c9 --- /dev/null +++ b/glabels/icons/22x22/actions/glabels-zoom-out.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + diff --git a/glabels/icons/22x22/actions/glabels-zoom-to-fit.svg b/glabels/icons/22x22/actions/glabels-zoom-to-fit.svg new file mode 100644 index 0000000..1777f35 --- /dev/null +++ b/glabels/icons/22x22/actions/glabels-zoom-to-fit.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + diff --git a/glabels/icons/24x24/actions/edit-find.png b/glabels/icons/24x24/actions/edit-find.png deleted file mode 100644 index ae9787f72761e559778a834007b154378fa32ec0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 569 zcmV-90>=G`P)~2 zEIBzjLPA1FNJvXdOHxu&TU%RRUS42eU}IxrX=!O{YHDk1Yiw+6dU|?$dwYC*e13j@ zfq{X8gM);GgoTBLhK7cSh=_}ei;RqnkB^U&larN|m6@5DoSdAUot>hhqNb*%sHmu_ zs;aZIv$V9dxw*Nzy1Ki&yTQT1#KgqK#l_9d&Ct-$(b3V?*4EwK-QM2b;Naln%+;>gww2>+A0B?(gsK@bK{T^z`@l_xSku`uh6&`}_a@|3AD7(*OVf19VbOQvkuj zUHySg0002&Nkl1_JUDC#lG+VFfti#8OwNn zW%Aw3X6FX~B$}4_`TA~WZKK)!Mxsd(fb4w77tzxkgYws&Xp)0Me0dQ~!o-8R4`yNE zQ~SNn!J-9i!}N!wXI}CQJ!K3uU{43n6*yD_%Wz}h1R@Ko&^B-k4GY`QG_Vdw77{4D zrxWFQjNzWx-z`GvP5bp`U`gGAw<9nWpPxnJz?NHG^lB7axa-S(34m<59zxw0?Hp99 ztw+@u*tB9UN&-ox=7~E|gRrH+FH(gSADrx$yFNHcr~TO%NkA!k`SqYL00000NkvXX Hu0mjf$<_|c diff --git a/glabels/icons/24x24/actions/glabels-bucket-fill.png b/glabels/icons/24x24/actions/glabels-bucket-fill.png deleted file mode 100644 index 1ee5993efb5d76c199a432c70069240006ca5d09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T0$tkOc;p{?1*6D3jzl1QuvIf3c=dO#uTZnBBZzTPnbfRKo~ZV zbRz-5Fo+0_O$M@At&$=TgDwsk$7+v-vtbRZCfVI;{hD*&p8I|0#l3J?a37G^9tZ?D zy~ECpqw@wDhVedjuk2gel}hErb_KOsO#n%!(~tJ00^7D#;0GX%Q&sh|2lDR0-50xY9r=R* zVHlnQzBrCUB9Xu_40^pDyt$A{kz8ND41D@$i^4Dj_-dNwYCfN5 zGMV6c-YmHSyaL{S(2jqPubx?`Ri$(X@E|;6cL%kgfOgrF#c)!kWExb;;t^;Vm z6W}^+m9aQ^Yrl>_@Mo@pxpSAm=S b$Kk_ID!IwIC@mWz00000NkvXXu0mjfnD+#g diff --git a/glabels/icons/24x24/actions/glabels-pencil.png b/glabels/icons/24x24/actions/glabels-pencil.png deleted file mode 100644 index a36ce93049a0216921dcb3dc90f4d9ccbf148632..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmV-w0+s!VP)k*V^nj8?>zhfc!0`k4Wf#ooGNCg5hfncQ_m-{bZ8PjvYvDkOD)TzYxOf7Vl{l;}cM`Dqxpj1!-%dL8~hS(c^8qM1d_K|EopiNi`hF(K(17! zDs9KtwU