From 27383f0756f47ca241af630cdf73005835aa6936 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 14 Apr 2016 14:15:38 +0200 Subject: [PATCH] Moving desktopdevicesmall.png from projectexplorer to core It is also needed by imageviewer Change-Id: Idd489ebc71768e293790e4b8f8ae9f5ede38e80d Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 2 ++ .../images/desktopdevicesmall.png | Bin .../images/desktopdevicesmall@2x.png | Bin src/plugins/imageviewer/images/background.png | Bin 1050 -> 0 bytes src/plugins/imageviewer/imageviewer.cpp | 3 +++ src/plugins/imageviewer/imageviewer.qrc | 1 - src/plugins/imageviewer/imageviewertoolbar.ui | 4 ---- src/plugins/projectexplorer/projectexplorer.qrc | 2 -- .../projectexplorer/projectexplorericons.h | 2 +- src/tools/icons/qtcreatoricons.svg | 2 +- 10 files changed, 7 insertions(+), 9 deletions(-) rename src/plugins/{projectexplorer => coreplugin}/images/desktopdevicesmall.png (100%) rename src/plugins/{projectexplorer => coreplugin}/images/desktopdevicesmall@2x.png (100%) delete mode 100644 src/plugins/imageviewer/images/background.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 171fa48839e..6d8c5faa584 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -115,5 +115,7 @@ images/eye_closed@2x.png images/eye_open.png images/eye_open@2x.png + images/desktopdevicesmall.png + images/desktopdevicesmall@2x.png diff --git a/src/plugins/projectexplorer/images/desktopdevicesmall.png b/src/plugins/coreplugin/images/desktopdevicesmall.png similarity index 100% rename from src/plugins/projectexplorer/images/desktopdevicesmall.png rename to src/plugins/coreplugin/images/desktopdevicesmall.png diff --git a/src/plugins/projectexplorer/images/desktopdevicesmall@2x.png b/src/plugins/coreplugin/images/desktopdevicesmall@2x.png similarity index 100% rename from src/plugins/projectexplorer/images/desktopdevicesmall@2x.png rename to src/plugins/coreplugin/images/desktopdevicesmall@2x.png diff --git a/src/plugins/imageviewer/images/background.png b/src/plugins/imageviewer/images/background.png deleted file mode 100644 index 93a092ab13dfecfe099db859a6f56bcbed44a92a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1050 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+nD=%qMxz6xrYtZe3aLbiG7n>JhT-d=8H8x*15 zc6Duu_5GUrXWq#zR4d$+E%wzl>hLsWEh zbU|q;tGT(kfn2}*mBP(8TmJs7wXm{!blaVWq2q+*{5>_iU)B8=E;H50ZsBMvGO3_idd$muvJ+SDg7{+~&^QaqQ>K0Lh+x{~Hb;c4pULdT`?FV>6AVbBc3$ z-{znCx9pOD$bHpitCZ&&^Cquio>b(Z%-~XDu99F;H1FZXyUVo&TI;J8XSr{2>3U#n z#PCR9>hW_EKimAjcviSs&|&3C_Dj{D1Tq92K1L=qY~{0GC9wDjgVdL242A|p$tGHi zoGP5bF5D6xj31PwO8>ck>Wfuc#D0LY_2F)V<|zz{j7oi-X|5~T5;jjep*H^#XDHJF z!-0M;A}YEv-r7J!OeM37}cK6U>3||>G8jHfMc4&nhDH24w+9G zJ;Wvioc8Mx6f=6fmdPc>W!~yb^?D5Jd}A3ICNBCmk5xF*A-O0rX_8vbgZ~~0jAzmn zCMrfLu`ctBI@7weRw4BOBZq9?l39`rCl9f4PfS-8=xd$8uCa6{kHd=pObs_KI#n+8 zNc^-(CqmEh)PX(PKXe!hgj%>fqSl{ozOX1+PsQ@#oXsppvm&lc&}RIg_xzDR!;x=V zMlJ%Eq?ME#|A{V|&p1I%(LH{e!h3edt|LA#?cDa?3O&_$CjYoAtJhrJmo*!Iv!-RF zKEKLSpd3_Z9v*mb!^W1F12w1pCKfX-%2(G+a9Gv&X`g`1v#Rya zYMdo6bfsB8{PxZ4OWS@~ZvM)vS*AB`R*DJFWxR9ySAOa4*c-QRN1yJTG57SuH~P#K z)-rtdw>Iv6_Pr_onw>`ZFV30I*Q%W{i7>MBJY7C-Juh4H{O&MYTie=$tBU-J6C-D< z94l6{ubXtfv5R@FUjvJQ&8z0-=G2L%EDk49M3!4|PU5O%cs75{>1F!*`unHy?SCq~ zV_IeG$3JT(TMC)9{5tE>^y}u$o7%s_F2{@PJG=b6xVSiTr&WNx*y$sSSavui_toolbar.setupUi(d->toolbar); d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"), Core::Icons::SAVEFILE.icon())); + const Utils::Icon backgroundIcon({ + {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}}); + d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon()); d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon()); d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon()); d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon()); diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index 23266219fd5..c62bf29a21e 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,6 +1,5 @@ - images/background.png ImageViewer.mimetypes.xml diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index 0ca8fe689ab..0a230946d3c 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -29,10 +29,6 @@ Show Background - - - :/imageviewer/images/background.png:/imageviewer/images/background.png - true diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 6d9310c46fc..15513cd5645 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -69,7 +69,5 @@ images/targetchangebutton2@2x.png images/desktopdevice.png images/desktopdevice@2x.png - images/desktopdevicesmall.png - images/desktopdevicesmall@2x.png diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index 384be59100f..55c8baffb67 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -70,7 +70,7 @@ const Utils::Icon BUILDSTEP_REMOVE({ const Utils::Icon DESKTOP_DEVICE({ {QLatin1String(":/projectexplorer/images/desktopdevice.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon DESKTOP_DEVICE_SMALL({ - {QLatin1String(":/projectexplorer/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); + {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); const Utils::Icon MODE_PROJECT_CLASSIC( QLatin1String(":/projectexplorer/images/mode_project.png")); diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e0059d54ee3..e6e92070754 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5025,7 +5025,7 @@ x="0" y="0" xlink:href="#src/plugins/projectexplorer/images/desktopdevice" - id="src/plugins/projectexplorer/images/desktopdevicesmall" + id="src/plugins/coreplugin/images/desktopdevicesmall" transform="matrix(0.5,0,0,0.5,285,189.5)" width="100%" height="100%" />