From 91abfd521a1c719d7dc68e562a5486fc206b1f32 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 19 Nov 2012 16:52:47 +0100 Subject: [PATCH] Clean up diagramscene example's toolbutton icons. Remove artefacts from pointer.png. Replace several PNGs with images without artefacts (used FreeSerif as the font). Stopped scaling images up in MainWindow::createColorToolButtonIcon. Change-Id: I7adf2deea73b89c631d39d575804e8d3f58c9fe1 Reviewed-by: Geir Vattekar --- .../graphicsview/diagramscene/images/bold.png | Bin 274 -> 353 bytes .../graphicsview/diagramscene/images/italic.png | Bin 247 -> 299 bytes .../diagramscene/images/pointer.png | Bin 173 -> 230 bytes .../diagramscene/images/textpointer.png | Bin 753 -> 893 bytes .../diagramscene/images/underline.png | Bin 250 -> 307 bytes .../graphicsview/diagramscene/mainwindow.cpp | 8 ++++---- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/widgets/graphicsview/diagramscene/images/bold.png b/examples/widgets/graphicsview/diagramscene/images/bold.png index 986e65e25084f3d313652b8dd248c1d7cae8f6e4..47e75913c62c3aae380e6fb005d05fd7f6e45cd5 100644 GIT binary patch delta 326 zcmV-M0lEH?0^tIXB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01ejw01ejxLMWSf0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Q-bqA3R49>+(J?EIltl)atlofEVKLebvRjyyiNz$bD1XBh9mD1pN1j|Egt6?We z29x1)Ow7yXm-cXs-?ZKIx*8N5(Q#G1VhQuuPjWVz`LM~ijuuvMig)ZK8EYOCZ1^p@ zX#JHL?)7fa9zQlukGiUA2CI0+UH^iM*l0WlRkeUQ?C7m@Gs#CKQB`YWHq*spl9xXC Y0WqCi*a;y5GXMYp07*qoM6N<$f-J$0>Hq)$ delta 246 zcmVB2l>h($ diff --git a/examples/widgets/graphicsview/diagramscene/images/italic.png b/examples/widgets/graphicsview/diagramscene/images/italic.png index 9a438b57ad4369dfd110d2f2bdc126890e1aec8e..9a9b53518c0d3085b7f642f4f16a7adc1d51d3d4 100644 GIT binary patch delta 285 zcmey)xSDB#cs(x%8v_GF{nshhK#HZ<$uool2x>S|I)Hr60*}aI1_s{iAk65bF}ngN zC|TkfQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosASw(F#u&#}JK)y_XEVnjJ-4 zAHMf$VpLqpEubyEJz@IY9U|W+nBH*lwyv(fZL*71Q9$MVA&tX-gg+cKD0u(ytfpG% z)BVP;n^g|x3fG2Sm7epp;IED8aqW2^Webq4u^HVNHKlz@ovh#@V h<=T*|+gio;Gye1J5K%VraR<7Z!PC{xWt~$(69CEPbcp}} delta 232 zcmV;01^@s6w5dm)0002KNkl(s< zUUaHGicVB}fUR|IpwVpS62zAou_0Me{9^vR{F%%M0D^QJ2c~I)5W*?X^Dgk#IF6{Q zid7T^14)ut?*%{AbsfW6YtU5koFFypx@LG?SKR(*a+;=y<6#(2&k1hZ2H*ElmZe?6 z2~%^PXI?={`JX%t1H($G|Kzr98D5s_>6IaNGZx^prw85kHi1AIbU85q+4|Njr<*`sf9d2PhIr;O=3$_4-JUv|; zLpZJ{ConMb2^?fqvXFLgVe05$5KL5XR@%boqSDa8At1=6)X+3%VI;SNg|eg2Ooc_9 t8mEtnFdF4coiH$1c#A>#fS3a#!^??0Cuaq-KLDD_;OXk;vd$@?2>_h=H(~$) delta 145 zcmaFHxR!B(NH%{*Sw6J##OT7f+N5pV#2H^K+BK>l03TDGKT8TRmczu&vzeeRa~We<^4B v?}*=Q{wDY2#@)v^WQ!B^w)ClgV81FMDE-z~`3nOB7XyQ*tDnm{r-UW|g$6zV diff --git a/examples/widgets/graphicsview/diagramscene/images/textpointer.png b/examples/widgets/graphicsview/diagramscene/images/textpointer.png index b25832cada22845efb19650500edf1ceb522a8b4..5a2ca2e5fd9e588cf9a6ad64f721de27eae5b14b 100644 GIT binary patch delta 883 zcmV-(1C0Ff1^ot)7k?`V1^@s64xbwS00004b3#c}2nYxWdjNqZ09rMpGW9*G$Hqot~Y}u3|y6vpv;+ece6P)QqSq z|AJMN8^G26Pf!W0OGFxd>H?su-WsqGP~eJBT~+nI^*Qs~Dk6)03VQ<;k$PZL{x5LQ zmp1r)M)ybbc7KYOafjTkdvYQS->|7?6Goz?l1r&K!1JY-Z=~C+x)7R8uY#axN5n# zIwq<1mJ}3d3I%UXm`J!iD>Z0-Yo7xZ36Dm!Z72z7Bv}p@@CzqfxLqq1=us2!3os+W zx7z|b0yK;(s5#JInt*2<{Of=p7TD9{4Z1B9Y^CFvOBT@2NxP91^p**9H^rEin560) z7f@hDD1S(M$_YNTfDQmvt{PRiTfXM}1UwOuh7@Bj14|-(wFK4Hc_#(O6`4+u<+d%% z((bvgsB7W83#fMVO=C?Wvc|bXq9x+2c*$$i~;S#B)6>~r+WC#2DDjsaC*ofD`L`57Ac5vcSGy1oEt zKWs2H78IC5@U_EseDnhIJpfh%O9?*z6siGk1Izya1$JYv#G~yEMVzMwaDd=7Bu&xs z4pX3usv;t_z{1#!8*78A+UMvC{H_<8(~Jq(LsfmBSd{!N_6zwkDHe8NJ=6dI002ov JPDHLkV1mhzg7g3Y delta 742 zcmVE} z0|Ntca&k#YN&Ni$6B82z1O%U-pTxw(si~<21qD}ER~Hu-_J8*F78Vw!rlz2vpkQEN zBqSt0K0YHOBe%D=O-)Vs`1ruUz%Vc{2?+`8?Cc;QAc~5L+S=Oj@$n4}4Vjsl85tS* z`T5Pw&Ghv2IXO8kEiF4cI}#ESLqkKt!osAaq}<%xRaI4JXlPnmT2N3>@bK^k1_mD= zA9Qqdv9YmTU4LC6At5$4HV6m^>gwv-+uMPGft;M2i;IhOb#?Oc@+BoD&d$zANJwL2 zW4gM!Q&UqoI5_wB_vGZ{qN1WoN=ozd^IudZ4E%Ptt{x;8sfF|)ZKBvp$!y!8|?|uy8{iA4eCwUK`S$YZZ51f z!#TT^<-4idr@g>O&SXa?ela_zafjN`ECBfE+7``z7a0k|h?LP?)wK5EZol6)HtCX( ztLvrr34hy!Vd~Gj?q|^)9YbKI(OrqVm{ZfZ@2PHF{gGgN-D*TgnTzabF6H?ke2Co}~y&DfWYwGHLUN>ECB+w+ga*=wh-X z*@Ob}V=m+b+3A^No>RkxNH1yW3PgHsQ4GPr;Te}oFLJ9HLtcKZbI$o2ef`ccAK+ljC#_{|Ow1C(yiOw%IYEhe!B92)e(V3r Y7gcc}yVtue$^ZZW07*qoM6N<$g3(NA!vFvP diff --git a/examples/widgets/graphicsview/diagramscene/images/underline.png b/examples/widgets/graphicsview/diagramscene/images/underline.png index 9b8209f5252f74c3af386430d17b60f7eeda7ce3..5f8ecb4b3853cc71f4721e68dce4e5f0e7005475 100644 GIT binary patch delta 293 zcmeyxxS45!cs(x%8v_GF{nshhK#HZ<$uool2x>S|I)Hr60*}aI1_s{iAk65bF}ngN zC|TkfQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosASw(FRW!#}JK)b1y3TIR^@~ zK72n(O_f80bJdka8+e6|%NbOB3%t#GWwBQMX*LeI{tSVH*-cD`58iQKU-76lS#9Re z^m8f8R18Ddn@_IdUbEq_^18_@`ob#?ap&!RqS~~ZFGnhGgGW-x^7<=3Za)6gHF=>m zyS?*6`@h`()_vU2Zh0u2d;itDX|^9K*Jk^FY2bD9&FiV|nXGYlx3{LSPGMK+R{O&? pCyl=qESC#9Ww@-ue^YMu{>65FXN=ib&jPxh!PC{xWt~$(69AZDb>RR2 delta 235 zcmV;01^@s6w5dm)0002NNklSTXP?z&FQ*L4LC(1Z7V z?~}16z$(b@rYSH#A=|e3WT>ud8I)zoZQF8HRnj+2!`51#{Ky!? lS(b?@NfO3i&hvb4=>{_(IL!zicy<5)002ovPDHLkV1kdBX>I@j diff --git a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp index 3e158489c1..39ebe48488 100644 --- a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp +++ b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp @@ -340,8 +340,7 @@ void MainWindow::createToolBox() QToolButton *textButton = new QToolButton; textButton->setCheckable(true); buttonGroup->addButton(textButton, InsertTextButton); - textButton->setIcon(QIcon(QPixmap(":/images/textpointer.png") - .scaled(30, 30))); + textButton->setIcon(QIcon(QPixmap(":/images/textpointer.png"))); textButton->setIconSize(QSize(50, 50)); QGridLayout *textLayout = new QGridLayout; textLayout->addWidget(textButton, 0, 0, Qt::AlignHCenter); @@ -639,8 +638,9 @@ QIcon MainWindow::createColorToolButtonIcon(const QString &imageFile, pixmap.fill(Qt::transparent); QPainter painter(&pixmap); QPixmap image(imageFile); - QRect target(0, 0, 50, 60); - QRect source(0, 0, 42, 42); + // Draw icon centred horizontally on button. + QRect target(4, 0, 42, 43); + QRect source(0, 0, 42, 43); painter.fillRect(QRect(0, 60, 50, 80), color); painter.drawPixmap(target, image, source);