From 45fc1b48adf9e8c75fa992646cd04d29a2eb0b10 Mon Sep 17 00:00:00 2001 From: bieber Date: Fri, 25 Jun 2010 06:56:15 +0000 Subject: [PATCH] Theme Editor: Added a reset zoom button, made icons for all the zoom buttons git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27129 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/gui/skinviewer.cpp | 7 ++++ utils/themeeditor/gui/skinviewer.h | 1 + utils/themeeditor/gui/skinviewer.ui | 41 +++++++++++++++++++++++- utils/themeeditor/resources.qrc | 3 ++ utils/themeeditor/resources/COPYING | 4 +-- utils/themeeditor/resources/magnifyingglass.xcf | Bin 0 -> 2685 bytes utils/themeeditor/resources/zoomeven.png | Bin 0 -> 1035 bytes utils/themeeditor/resources/zoomin.png | Bin 0 -> 1024 bytes utils/themeeditor/resources/zoomout.png | Bin 0 -> 1002 bytes 9 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 utils/themeeditor/resources/magnifyingglass.xcf create mode 100644 utils/themeeditor/resources/zoomeven.png create mode 100644 utils/themeeditor/resources/zoomin.png create mode 100644 utils/themeeditor/resources/zoomout.png diff --git a/utils/themeeditor/gui/skinviewer.cpp b/utils/themeeditor/gui/skinviewer.cpp index ade4c7fd6..95caf1e39 100644 --- a/utils/themeeditor/gui/skinviewer.cpp +++ b/utils/themeeditor/gui/skinviewer.cpp @@ -32,6 +32,8 @@ SkinViewer::SkinViewer(QWidget *parent) : this, SLOT(zoomOut())); QObject::connect(ui->zoomInButton, SIGNAL(pressed()), this, SLOT(zoomIn())); + QObject::connect(ui->zoomEvenButton, SIGNAL(pressed()), + this, SLOT(zoomEven())); ui->viewer->setDragMode(QGraphicsView::ScrollHandDrag); } @@ -67,3 +69,8 @@ void SkinViewer::zoomOut() { ui->viewer->scale(1/1.2, 1/1.2); } + +void SkinViewer::zoomEven() +{ + ui->viewer->resetTransform(); +} diff --git a/utils/themeeditor/gui/skinviewer.h b/utils/themeeditor/gui/skinviewer.h index 599a204fd..64ad219aa 100644 --- a/utils/themeeditor/gui/skinviewer.h +++ b/utils/themeeditor/gui/skinviewer.h @@ -40,6 +40,7 @@ public: public slots: void zoomIn(); void zoomOut(); + void zoomEven(); protected: void changeEvent(QEvent *e); diff --git a/utils/themeeditor/gui/skinviewer.ui b/utils/themeeditor/gui/skinviewer.ui index a5373de16..d1116888b 100644 --- a/utils/themeeditor/gui/skinviewer.ui +++ b/utils/themeeditor/gui/skinviewer.ui @@ -33,10 +33,37 @@ + + + Zoom Even + + + + :/resources/resources/zoomeven.png:/resources/resources/zoomeven.png + + + + 24 + 24 + + + + + Zoom In + + + :/resources/resources/zoomin.png:/resources/resources/zoomin.png + + + + 24 + 24 + + true @@ -47,6 +74,16 @@ Zoom Out + + + :/resources/resources/zoomout.png:/resources/resources/zoomout.png + + + + 24 + 24 + + true @@ -56,6 +93,8 @@ - + + + diff --git a/utils/themeeditor/resources.qrc b/utils/themeeditor/resources.qrc index 27d808c24..dbaeea318 100644 --- a/utils/themeeditor/resources.qrc +++ b/utils/themeeditor/resources.qrc @@ -6,6 +6,9 @@ resources/document-save.png resources/configkeys resources/deviceoptions + resources/zoomeven.png + resources/zoomin.png + resources/zoomout.png resources/render/scenebg.png diff --git a/utils/themeeditor/resources/COPYING b/utils/themeeditor/resources/COPYING index 02389762b..2b6a94c0e 100644 --- a/utils/themeeditor/resources/COPYING +++ b/utils/themeeditor/resources/COPYING @@ -1,5 +1,5 @@ -The files appicon.xcf and windowicon.png are authored by Robert Bieber, and -made available in the public domain. +The files appicon.xcf and windowicon.png, and all the magnifying glass +graphics are authored by Robert Bieber, and made available in the public domain. The files document-new.png, document-open.png, and document-save.png came from the Tango Desktop Project (http://www.tango.freedesktop.org) and are also in diff --git a/utils/themeeditor/resources/magnifyingglass.xcf b/utils/themeeditor/resources/magnifyingglass.xcf new file mode 100644 index 0000000000000000000000000000000000000000..50babd6c1f7c9e38454e1732c01a7c4fdba55823 GIT binary patch literal 2685 zcwX(6UuaWj6u?iCE`QqFs*AC)b>_xUXc$Ra(^bYEme{eX;OZC(f@st9CSJ%NZBn!_ zh#PEs*pR^}2pfa>vQ_XOV-LP;pzB~h>|uyLiau#Tx5}ui_kQ2!IXCwrvWJd?*`CrnqjD zZ_Q-V+donYO17$&ONPk`qcoSvhAn*xAa%~|MRsoQ4D!_78($Hp#ic`O{&~QNIRTKq zKVaBXCqFrwzCFI5_}9z7jiulDYubnzcloS+(zP$wr+zwc*5EHjOR4WKY(mDp9HV&c z%wy-VY`IueN>!`g*GHz5OjVhbkEzwe^61Xpd&sla2vv)jyb{Y#sgq{31Ntk~nSvr$ z$^~^Y+TNebXUm21l-zGzVpI8vj64t@FxCn%XhIZICss%ud@}H9pw#1)BblsP%FBb+ z&S;!j$!OYQ(e_lRa8R_sRAq?7{uMr{VU;GdRJ^ltqMd#i) zK2a=jRQLs(NDzlE5}ynaOV^3#Bx2_+;^@^B&Hs&pydoo9oqZUk&$V9&T}dfeXGcUqnBf)r3bd zZ5ET+P+fEgR^Ns@voVgRGX5bR%7!?V!?$5MypA>VIu^-iu`fQ0#dD2F!@^$%OUgl#?c z*_)?%KlWf!0-? z3Ba4M)OGC6Kc5943J=>3-Vvg~Y~-qN2;Ee6JyS_6K1*3;&MG~t40|5WD#J{V@){~j YsE8}?;`Fp#SFeoVG}+s4;bWA9$1YKgu>b%7 literal 0 HcwPel00001 diff --git a/utils/themeeditor/resources/zoomeven.png b/utils/themeeditor/resources/zoomeven.png new file mode 100644 index 0000000000000000000000000000000000000000..6da2a744e885710261174a04b8968d732ca547df GIT binary patch literal 1035 zcwPYu1oZofP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igW1 z1}qP7BXZFI000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000AKNklzI9LK-o9~@?$Fz`$iMP??0#XvhbOuN!k59>jC&=y3*lOXLyJ$T4n0=?!U zf)p>F;&=%jJbGGJWksrP7KI|lLk|XqCW?b0&HQ>Xr7Vi8n@r+5ADGL)!28Vi_ulXK zfPjF27lH7Uk4)2?6$D{CpU;2oI8M9kx`HH0#5uoG6eUAMt4Bvi3k@q`S=M4UoBdVS z^_HQbAq)%*ARG>(SS%u&&EoLz5C;bb*xlWQD2o4Rn)dtt{{D2s#1@G}zBLRZ7Yc(==_M?h?^xbc8YHjf{*?KA)$@P%4!u9*+}a%DH{ID>1Yvx1bQFSccbhprKE~eO9+JuANr zU}9ndf*_3hl8CCRh4uCIPpbXLBtk@#OeRTH)q*dHIF8fa*Vk8*pVZUS1IKaNeGze8 zSCD17CL%2@EpS~|@I^$DBq|gNH4(YKzJ?@8EeYU-=@UC`x8) zYpW(AJ3Bj26eZ(}2obH?whhnos$N!`o0}k_RbM;1ZQE5newUV({O#-91c@Dou+cR{Gh9q%naGKO_@xFa=9FxpP$qA_BJgnEYRTK zAaTx1|J&Fx0B%FcRPHOWSnRE;ss+ZF*VNQRj4@AD)j}*5dwb7)<3|AR8cybkd{Htr zDYND}h+F{p1He}RdT!r|0KU0h&-+`^mzhj+9Yum<8ZD8kCez#?sr(7xub|8tD3KR; z0Q>@=^|?;~Zvgy&XG&!@djsG#o;lwG_znR90RdkW{{o%8mv&6&!0`Y8002ovPDHLk FV1kF))ky#V literal 0 HcwPel00001 diff --git a/utils/themeeditor/resources/zoomin.png b/utils/themeeditor/resources/zoomin.png new file mode 100644 index 0000000000000000000000000000000000000000..2903eb3f5e800d9bf9c1191eeffc7ce356bb972f GIT binary patch literal 1024 zcwPYj1poVqP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igW1 z1}X{98gOC&000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000A9Nkl9pHEe#b(y^g_b(7Z ziW^sP++^j_)%B_rq-s+TiWnDNG%$3cWH6+ew~HFEHhvN(@j4Hj%{dJ7KK#xn5E2sd zDqv6f$TZD)#@LkWx=F`zx;)QgvMiGj;zCu`91*P_9UU#TtcYb<%lUl%2VK`YMn^|6 zG&F>0G>US$jC?+i!^1-y92{V8Zx50r{jF)*Py74(KekM4@p$}8!!QbwNQAQ4EZv9a zd9=2+Mw+IPVHgEX(}tQZkw_%QIp_ZP_&B+)Teolkb^9xo3Z>I&;+*?~gM;5SH3`nS zKRY{1zVF{EQERu6$z+Ig?l&zN!!QbylasefJXC~;XklT248te{E@4^La&K=hou8lI zS>QuOs?{nPhC!BPEe9$hgs5z6Y}~uBA1Xpbw7I!SLWoLW5~gX+_xJbTIi;Q=;`=^H zl0>Fy&NsT|wz`K4V^b3o6JU%r^kaRW_!#y0F+84$g)gPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igW1 z1}hEGY=t@i000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0009;Nkl&3uAvxquQ;yNFg%Y!%bKJWY9yx#*N zA|hS{(nC6#rnw|Z(yZ&c8OL#YJ$@20t2_ed%OIVh*HZU+iS65dQ1dT?6gb-v| z)>^0{ob&qj_BI8{&dv^T&g-E`n5MZjG&B^*lKK?i_eqvzGEH+S=rMP-JX|Dcc6xdm zk|YKCF-ejzH#Y}Kl4e5@aa}hvHa7MoX=gGSxUQQC`n|DMjgI5=4i68voYDJ0ME`3W z92|t>IK81H;(4B=s_LU8KG!D}i^20eDHIV!QK(X>+&Q}sNu*k>LQxb7MTB#HeRg)% za$xs)T5*1U4$k>?C?cAs75Db`o@BEh92`K?v|=bCM6_kwHhkX?^kda(6}!8;Afl~M zPj=h313eJe*Vn^6*_*XiJRT>{^8%5m)oRq&*B5@R)vSK!=jQ_v$>nln7)BL9JaiGm zFkUgn{FRlJM@i)Kc~VuCdU|@U0K9FBOgf$Zv3a?=xw*Nw#Ky)3sj5nhF#GJZD_V@Q`b#;}-$H$3tUjJlcX90K}CDXjGWV6}#$z-y^81uWjx`;96CzHua zHk*C_nft~Y0Ka#f%mewNWS(T1b+o7?exxD|bw$#l0-Bub{! z5(zY!?hZ-iPXK>K%dCSEd2v60p8