From 9ad888e6a62002ff9fbb07c46c48090449cbcd27 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 9 Sep 2017 21:29:32 +0200 Subject: [PATCH] QmlDesigner: Replace redundant images + remove unused files Replaces some redundant icons files with already available, themeble and HighDPI-able Utils::Icons. The removed files are mostly images which haven't been used since a while. Change-Id: I1c17eb176a0d3d0a80335b43909012eab822c6b1 Reviewed-by: Thomas Hartmann --- .../easingpane/easingcontextpane.cpp | 9 ++++----- .../qmleditorwidgets/easingpane/easingpane.qrc | 2 -- .../qmleditorwidgets/easingpane/playicon.png | Bin 100 -> 0 bytes .../qmleditorwidgets/easingpane/stopicon.png | Bin 78 -> 0 bytes src/libs/qmleditorwidgets/images/hole.png | Bin 116 -> 0 bytes src/libs/qmleditorwidgets/images/lock.png | Bin 525 -> 0 bytes src/libs/qmleditorwidgets/resources.qrc | 2 -- .../components/navigator/navigator.qrc | 1 - .../components/navigator/navigatorview.cpp | 6 ++++-- .../qmldesigner/components/navigator/warning.png | Bin 287 -> 0 bytes .../propertyeditor/images/button2_hovered.png | Bin 898 -> 0 bytes .../propertyeditor/images/button2_normal.png | Bin 898 -> 0 bytes .../propertyeditor/images/button2_pressed.png | Bin 898 -> 0 bytes .../propertyeditor/images/button_hovered.png | Bin 390 -> 0 bytes .../propertyeditor/images/button_normal.png | Bin 379 -> 0 bytes .../propertyeditor/images/button_pressed.png | Bin 1328 -> 0 bytes .../components/propertyeditor/images/frame.png | Bin 4826 -> 0 bytes .../propertyeditor/images/gradient.png | Bin 533 -> 0 bytes .../components/propertyeditor/propertyeditor.pri | 2 -- .../components/propertyeditor/propertyeditor.qrc | 12 ------------ .../propertyeditor/propertyeditorqmlbackend.cpp | 2 -- .../components/resources/resources.qrc | 1 - .../resources/templates/Standard/Form.xml | 10 ---------- 23 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 src/libs/qmleditorwidgets/easingpane/playicon.png delete mode 100644 src/libs/qmleditorwidgets/easingpane/stopicon.png delete mode 100644 src/libs/qmleditorwidgets/images/hole.png delete mode 100644 src/libs/qmleditorwidgets/images/lock.png delete mode 100644 src/plugins/qmldesigner/components/navigator/warning.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/frame.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/images/gradient.png delete mode 100644 src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc delete mode 100644 src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp index 86b83ef85a4..3a7c929d305 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp @@ -26,6 +26,7 @@ #include "easingcontextpane.h" #include "ui_easingcontextpane.h" #include +#include #include #include @@ -124,9 +125,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) : m_easingGraph->raise(); setLinear(); - ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png"))); - - + ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon()); setGraphDisplayMode(GraphMode); @@ -228,14 +227,14 @@ void EasingContextPane::startAnimation() m_simulation->stop(); } else { m_simulation->animate(ui->durationSpinBox->value(), m_easingGraph->easingCurve()); - ui->playButton->setIcon(QIcon(QLatin1String(":/stopicon.png"))); + ui->playButton->setIcon(Utils::Icons::STOP_SMALL.icon()); } } void EasingContextPane::switchToGraph() { - ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png"))); + ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon()); setGraphDisplayMode(GraphMode); } diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.qrc b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc index f6e69536806..f90ab25d145 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingpane.qrc +++ b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc @@ -1,7 +1,5 @@ qt_logo.png - playicon.png - stopicon.png diff --git a/src/libs/qmleditorwidgets/easingpane/playicon.png b/src/libs/qmleditorwidgets/easingpane/playicon.png deleted file mode 100644 index ba4f36b5bf56e490d1fc9592b5e9c159a40389b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+XnVRihG?8mPFNuQgTIAE z^g-wsc}}5_hR}=kIujN!iMXoFcG#zXg5UEKBf|k{_nrIx9gAaNU|{fc^>bP0l+XkK D-XhG+yQCoGWu(a+ka frQpuU%gE3#lRS6zIg9%Y3=9mOu6{1-oD!M<^vJSr+T|&uzyWsVxi)VY1>E VpLZKpGB7YOc)I$ztaD0e0sy&ZD}(?5 diff --git a/src/libs/qmleditorwidgets/images/lock.png b/src/libs/qmleditorwidgets/images/lock.png deleted file mode 100644 index 8f1b546c8dce785e0390754c93365e4ecede80d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznU=ZYBV_;yovR>y10|SF(iEBhjaDG}zd16s2 zgJVj5QmTSyZen_BP->aLNvrT3PdCdC5qPW(#N%Qg#@gR)|mV-(W8jU7qRUI<(?#It8uhJ#N*R>3jZ>k+NcK#PLzN}%G?*6ps=T!c>_Ib($d!yE_xSDm7JEfH820vSK zOWP;j*iX}T<||3PaCLcg`spN{(?wN<72J77O%p^t41UOduIe-sRR?>|P!=uOAEy3=E#GelF{r5}E*0dgp!s diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 5c7164c7b8e..5ac07864815 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -4,8 +4,6 @@ images/checkbox_indicator@2x.png images/tr.png images/tr@2x.png - images/lock.png - images/hole.png images/scrollbar-borderimage-horizontal.png images/scrollbar-borderimage-vertical.png images/aspectlockset.png diff --git a/src/plugins/qmldesigner/components/navigator/navigator.qrc b/src/plugins/qmldesigner/components/navigator/navigator.qrc index 41599b77be1..aa28a4aaeec 100644 --- a/src/plugins/qmldesigner/components/navigator/navigator.qrc +++ b/src/plugins/qmldesigner/components/navigator/navigator.qrc @@ -12,6 +12,5 @@ export_checked@2x.png export_unchecked.png export_unchecked@2x.png - warning.png diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 3db86f70091..107e2a9bdb6 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -102,8 +102,10 @@ NavigatorView::NavigatorView(QObject* parent) : Icons::EXPORT_UNCHECKED.pixmap()); #ifdef _LOCK_ITEMS_ - IconCheckboxItemDelegate *lockDelegate = new IconCheckboxItemDelegate(this,":/qmldesigner/images/lock.png", - ":/qmldesigner/images/hole.png",m_treeModel.data()); + IconCheckboxItemDelegate *lockDelegate = + new IconCheckboxItemDelegate(this, + Utils::Icons::LOCKED_TOOLBAR.pixmap(), + Utils::Icons::UNLOCKED_TOOLBAR.pixmap()); #endif diff --git a/src/plugins/qmldesigner/components/navigator/warning.png b/src/plugins/qmldesigner/components/navigator/warning.png deleted file mode 100644 index 38a80acc1ec9519ada87e5477b9554b6fb0ca8ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdrU~ojgN0I5=)U^nbv>z`$AH z5n0T@zRzNS3%plmzFem6RtIr81P4m+NKbWfvzW7NqLs7p2dBXCuYH zz@Q%B6XN>+|NnF6&K*5^l!1XkUS9s_(WAF--#&Ki*ujGbCr+Gr`}XY{H*Va%eOu&_ z%Si?X2A+~2zhDL_9b-#7hk&5m1BZQNgdG?d7=k=q978y+Cnp?W+acy4X?c7>kL_|r zliPyxSqz$gFF3>2G0E9Vz_q&XScB-sxt4LoY)d+R^9VGEJe^}{`JBh&;yh#Zs&fq@ ka~YWx4omO|m@zYOyDBnmd3$Io0|Nttr>mdKI;Vst0JFGeJ^%m! diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png deleted file mode 100644 index b82f1fd0060595892b13c4a1d83889314b1fc516..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 898 zcmeAS@N?(olHy`uVBq!ia0y~yV9*6&4mJh`1}mvYvlti{v`btgN}P*Q6H7Al^Atid zb5j}IiZT_<6&y>`6^slFEENn*tqcsTj13gD4Gawow!dB5#=yY9UgGKN%6^lBotIOb zuiNqw0|NtRfk$L91B2Wl5N6D~P-@4(z`&C3=&ISh>k5UeInPAAnv(gavbONemfUT(*D}xa zTYfibW5MQ|XDZ*{O))B5e);6zRvS6~>n6Va$u@GkpMQSI*WSGQZXR#X&(~jH-P-oH z?&#h3<>hwss}G-k%H+kjuHK7bMhWkMLyR98O(wn*Pk#K6U5h!x;=wtAHEbp~vhwwo zawj{eJYcwcG2_d!M=OmN%(K4Gk!ohLYXS3-#sf3Yar9LFXm-yNNa3G*Jwf(wV9kox zD}y+@L)Ks8`8enJ|Glanc^_h;{f=~Jo^HC#biqi%`}B+uZ+;fx%gZgZR$4e-2%9J- z`&ajBLZ0{~$A?$nOufAFm7oyMDap;7GGcpN7pQI!Q;@3lT)+OZ+7iw-lb4Ro(MbXI zH+_oT@9Zn93Yar5?gG;krYy0r6Z4MqO%#07u}3v}#^bV@D$`z-tGAkcg4xB6Srl-3 zHO{Sjt!VXcMrS4h*EAqUJCo*XzI`r6P+*x1L_K-)qfKN><#B249 zvn@FOxm86@D>bCi9*Ep86ea*IKP3!(fHNIl?j?2_u{%vKhmTmU7E%VBx z>}GIVl<2nS?h9jB-7k54)kQJSw;$NJH>SK-Gz`+VU6dPht2(10Tdbh>i$sH;<*#qI zmoIw8Bvj3IrKebyH^NtIWqkM5xPqPEma*Ud&+zN*!EeD1_R}t#ipBVtRIb`s%N(n; z@w=E*!nB$&;`FA!V_zTHpxxBBt(1X*fx*+&&t;ucLK6UH C2!`6^slFEENn*tqcsTj13gD4Gawow!dB5#=yY9UgGKN%6^lBomav- zzpG4;fq{Xuz$3DlfkEyd2s0ke3<+jnU|>mi^mSxl*x1kgCy|wbf$5f~i(^Q|t+SEd zeTNKqd=*(6BMMlLOsg((&^s`TRa@+j^6pNHsIrwSf6ZU zl|h`{A?vU4e4KOq|6Wy(ybm$aen+}9Pd8m=x?m*XeR@WSH$RK;<>i)HD=i!^giREa z{i}O5Ay530GUBl;q}38L>UC3sg6VDM;0Nu3vvyZ3$*n#5_(3=;6`Im*6Y@~YDov&IV*FMGRvyhRyit`l4{?Oa3V$se;DOm;CZ zQ%%jz-o9)K+lnn5lNadfv_=)4^l@43zGmCArgeX#8eg$`$7O0S|F$w$%Qk!4mU(4T zb~CswN_5+E_k}U6?w7p2>Y|wE+YfBq8&lpZ8U|_GF3OF$Rh`k0EmqL`MWVsa^4GW9 z%NIRk5~^mq(o-zU8{w<9GQRt2T*1z7%h+%KXZZE@;J080`)QX=#bSI+Dpzf+WsX(a z_+3mYVOmX?@!VAmUm6{6)jYlOTO;H3-D@0qU)$O1YO8Z+EOFQVBlGPooAOO&yNdX` z`7>TjkNk0=BiM8K&XOwcw}Luz7}v+I4Lh5+{q=)p<)&i_xwpj(L%bQJ(+*ed&8u2w zKHGQm{r9^cf3!$owfp>!z0qdg`R9BbaeC9=vEMt=(7KwbzJh^)fx*+&&t;ucLK6Uv C7ltta diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png deleted file mode 100644 index 305530afaf6baf843bc32656ed129c0057617114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 898 zcmeAS@N?(olHy`uVBq!ia0y~yV9*6&4mJh`1}mvYvlti{v`btgN}P*Q6H7Al^Atid zb5j}IiZT_<6&y>`6^slFEENn*tqcsTj13gD4Gawow!dB5#=yY9UgGKN%6^lBotM+_ zPTL-N1_lPs0*}aI1_rr9Ak3I|q129nfq^C6(btiIVPik{pF~y$2Buq{E{-7;x6Vd- z_Z>3e@l|APj3{6|GVOIik=}t>tlDCKtRH*1tt%9=<~$SeYD(sx%G$y=TXMJEUduew zZ~5J%jRl);o~e9)H^r!M`Q?*;TW#d{ubcSxC)>#Fe*XC-UwiZJyLr4lKVN@+b!*$( zx}$gBmzUekuReVGDU%o9x_U2$86~_24l#aYG@1BLJo)iMb}i-%iwEZf*07n}$jaAS z%AM?>@_^y)#f&e@9<4N9FwgozN2;00t_93T8V}4o$I(;yquD)AAccSK^#s|!fi){$ zuMFbs4q1PV=i{8?|M#kT|foh33=j|93NhNGxhSySAs%3rzAIT%82c8U7)%_OhKyFbN%|uYD+lVOkO%RM<)f; z-}EVVzq7BbDqzmMxC=~En6kvePRu*bH&O6S#~#(_8IQ|qs!V%TuHI_)31$~NW>LWD zk!Qcau9l;qcaD$lHJN(m3p+%4mbz;NtjO~=p2(z?=+I-Eac6x|+e04d0zNgd5UsyL_chy|HLd#_)%c3lJ1$du`L~t1TDIBSw#+M& zvYWweQKH+PyDyAkb-(2GRTsrP-+o}@-k9=U(J)Bcc2RE3t?G=1Y_WpgFA@!YmcPE; zUcTrVlTbC=m7Zc*-Uwfofe$h|FQ7~;(!op!itZ(h|h z^VzG!{{4~v6T=x87#KWV{an^LB{Ts5 DwG)U5 diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png deleted file mode 100644 index 2dc66ec3e395026c49c40218f624113dae55df6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmeAS@N?(olHy`uVBq!ia0y~yV9)?z4kiW$2Ie{XRtyXb+9j?LCC){ui6xo&c?uz! zxv30pMVSib3XY}e3PuJ7mI{VORtBb4rp5}|28IR(w+)IL7#JAXOFVsD*>7^NbBh~4 za+w#$z`(#+;1OBOz#w-BgcZ ze1{cySiD_X|JR2}cTO+Js&;S);+{Q8{EghEpe0XCA~)Z75aea~Jm?hfQURy6SLK5Z zHayxhyQxw1c(KlTI~Hbc?*-*5pU!LxQvSI5$`4bs<549N5z0@edU!Jcap zd-~6QJnFUAf1&JmMU{xcIny+AvQ~av8P}JYP_UAB&B3-t-K)184y-iW@P}zr@yy3| zt!&1Jk7g>Isazv(uwlj4WAl!;2zTTq9s2m~e;dpCjUE1`&$nev-*#M}M@uJL!O(3< p{z1+ww(-(DmD8&0_lbPq=V1DO@6TGl;|vT844$rjF6*2UngBbZlu`fy diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png deleted file mode 100644 index ca29772319608f8ea9e269a947c2071244c7c1aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 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 diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png b/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png deleted file mode 100644 index ae48afbd7aa1f8d6929f2dd364c05b9da2b4934d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 533 zcmeAS@N?(olHy`uVBq!ia0y~yV31>AU=ZP8VqjnpJt;Mrfr0Ukr;B5V#p%*1v3b&t zJk9p3+*`^s8Wb9fXWM=KRT#A3t!hxu5xa~!lkD=120W)1S;z!^`+mH9-VyDXii)S7 zrR{smKl0^&XkUNOIOf4kxwxM-PY#!e$`?F6oga6ERqw;0!^-oIweL72{m06u(c!?4 zE&rM)1SmLf=1^c>@^7BpYX_?{b6 z#nc^N&$#PX3HB)65D7l?DXTi4XRUX<-Ni`l%*9MJr*v!-=~y0Zx>l&8snWkt(y7Kf!kJviDDP5UT@=6 zQoeFL@4{BoNb~zgeA2(2Sdlw1P*?ltt%Yk(RO&n~O0yL%-*-%6BIlvq4ZE)HN_!O2 zW4z^>>+y~=4QaF2Ec}}3dF7(5(bBzdbo0x@e3sR0_@?yi*&fj^jJk+sP&$Ikzu - - images/button_hovered.png - images/button_normal.png - images/button_pressed.png - images/button2_hovered.png - images/button2_normal.png - images/button2_pressed.png - images/frame.png - images/gradient.png - - diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 80b3dc29249..4fa195b3c57 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -94,8 +94,6 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE m_view(new Quick2PropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()), m_contextObject(new PropertyEditorContextObject()) { - Q_ASSERT(QFileInfo(QLatin1String(":/images/button_normal.png")).exists()); - m_view->engine()->setOutputWarningsToStandardError(QmlDesignerPlugin::instance() ->settings().value(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool()); diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources.qrc index 5b75f585a28..4100b9da6bc 100644 --- a/src/plugins/qmldesigner/components/resources/resources.qrc +++ b/src/plugins/qmldesigner/components/resources/resources.qrc @@ -1,6 +1,5 @@ - templates/Standard/Form.xml stylesheet.css scrollbar.css formeditorstylesheet.css diff --git a/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml b/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml deleted file mode 100644 index 4a9aa660d51..00000000000 --- a/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - Form - - - Hello world - - - -