From 23d3ada73fbc757ef7b43eb2e5018a70d28a3ace Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 12 Jun 2014 17:54:46 +0200 Subject: [PATCH] Move reload icon from diff editor to core It is a generic icon, and will for example also be used in the Help plugin. Also make it more round and add a 2x variant for HiDPI. Change-Id: I2ad4fc1e2d2766042646a47483f129447c2c3c25 Reviewed-by: Alessandro Portale --- src/plugins/coreplugin/core.qrc | 2 ++ src/plugins/coreplugin/coreconstants.h | 1 + src/plugins/coreplugin/images/reload_gray.png | Bin 0 -> 299 bytes src/plugins/coreplugin/images/reload_gray@2x.png | Bin 0 -> 1029 bytes src/plugins/diffeditor/diffeditor.cpp | 2 +- src/plugins/diffeditor/diffeditor.qrc | 1 - src/plugins/diffeditor/diffeditorconstants.h | 1 - src/plugins/diffeditor/images/reload.png | Bin 250 -> 0 bytes 8 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 src/plugins/coreplugin/images/reload_gray.png create mode 100644 src/plugins/coreplugin/images/reload_gray@2x.png delete mode 100644 src/plugins/diffeditor/images/reload.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 8032e35c7df..ca54e34c30a 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -89,5 +89,7 @@ images/splitbutton_vertical@2x.png images/panel_manage_button.png images/pause.png + images/reload_gray.png + images/reload_gray@2x.png diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 9d531139d48..8066161e0ff 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -195,6 +195,7 @@ const char ICON_DIR[] = ":/core/images/dir.png"; const char ICON_CLEAN_PANE[] = ":/core/images/clean_pane_small.png"; const char ICON_CLEAR[] = ":/core/images/clear.png"; const char ICON_RESET[] = ":/core/images/reset.png"; +const char ICON_RELOAD_GRAY[] = ":/core/images/reload_gray.png"; const char ICON_MAGNIFIER[] = ":/core/images/magnifier.png"; const char ICON_TOGGLE_SIDEBAR[] = ":/core/images/sidebaricon.png"; const char ICON_CLOSE_DOCUMENT[] = ":/core/images/button_close.png"; diff --git a/src/plugins/coreplugin/images/reload_gray.png b/src/plugins/coreplugin/images/reload_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..90f8a2e3d10fb9f90bde8bf83fd4ac95d4ab0045 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+eDZX04AGdF{NsFse3Ia< zv*poj+nJuN&bi*5AG=e(!S&$W54Y9x>UaPBd+qz}|M{{z&h{;PaPCWV{`M`?+;ip@ z{I-`^_v3uWk_Tlk&h~G7$CJbpbN!ry=%4*}+m}4}wUYNPPfh|OFI%$46i1DOT_4l- zF?S_PDvBNOO)#DC$SJJA|NXbq|9vbDF|z1So43Cs<kDpMik^nPdQi zGiT0#X@=XkZ!<73JbwHb!iA7`@7}$C|2_i)!^4LUuU@^%z`$_t-aUv2M8WObx0RHX zu3x{-z`$_h#tn$z-Me=o3}jMBNQi-f;m(~q$bxV-D=RA(7Z)ENUt(h7?c2AdrKOdX zl}$}eEi5c<-@a{aZGG$3EiW&xkdTmDw{As7M#jd*rlzLu*|X>N?c0Tgg?H}UnLBsx zv17*?8yma2x+YGXIC=8q+qZAuxpQaEoH_I6&AW5w&Mh#wef##7EnC*FUw`}d?OnTe zZQs6q*REZ+Zr!>K1~+cpfU{4XI(7Z}^`l3Ro;`c^+_`hdj~_pI^5pH?w@;lq1u^a1 zxpSvap9br@efI3x3l}b&J9qB#<;xI}OP4O)zJ2@3l`A)H+_-)F_Vw%6A&hI+u3f!) z_4e)CSFc{Ze*HQ`@eMGzefu`Vc3kA`+qc!tB%2r*7^as5`2{mDGBPnSv#_$Vv9oh> za`W=>^9u+H3W04~=<4Yk7#bOyn3|efSX$XTI5@hv zdV2f%28M)&g~!Fkr{(4s7ME96*VMN4^!81jGH>~cRjb#n->`lA&Yin2uQ*A1vcAcDl95yIZ9sdwKtY3G14hwr=I%daLej)e-2xm0~$^R3lUUX4txU3?yOx0byBY&|`8hH1y7#M+`W z`{zE&n=P=&tv_P=t9d_{Y3n*goN43kP`~_bkvemxl*$ruHI?b*lFvWz>mI7z6BzSL Q7?g87UHx3vIVCg!0L!TWn*aa+ literal 0 HcmV?d00001 diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index b586aeeec75..2d0405666fc 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -333,7 +333,7 @@ QWidget *DiffEditor::toolBar() slotDescriptionVisibilityChanged(); QToolButton *reloadButton = new QToolButton(m_toolBar); - reloadButton->setIcon(QIcon(QLatin1String(Constants::ICON_RELOAD))); + reloadButton->setIcon(QIcon(QLatin1String(Core::Constants::ICON_RELOAD_GRAY))); reloadButton->setToolTip(tr("Reload Editor")); m_toolBar->addWidget(reloadButton); diff --git a/src/plugins/diffeditor/diffeditor.qrc b/src/plugins/diffeditor/diffeditor.qrc index e7c06f78ee1..d1a71197c72 100644 --- a/src/plugins/diffeditor/diffeditor.qrc +++ b/src/plugins/diffeditor/diffeditor.qrc @@ -1,6 +1,5 @@ - images/reload.png images/sidebysidediff.png images/unifieddiff.png images/topbar.png diff --git a/src/plugins/diffeditor/diffeditorconstants.h b/src/plugins/diffeditor/diffeditorconstants.h index ef07b4c1689..a59336eb066 100644 --- a/src/plugins/diffeditor/diffeditorconstants.h +++ b/src/plugins/diffeditor/diffeditorconstants.h @@ -42,7 +42,6 @@ const char G_TOOLS_DIFF[] = "QtCreator.Group.Tools.Options"; const char ICON_SIDE_BY_SIDE_DIFF[] = ":/diffeditor/images/sidebysidediff.png"; const char ICON_UNIFIED_DIFF[] = ":/diffeditor/images/unifieddiff.png"; -const char ICON_RELOAD[] = ":/diffeditor/images/reload.png"; const char ICON_TOP_BAR[] = ":/diffeditor/images/topbar.png"; } // namespace Constants diff --git a/src/plugins/diffeditor/images/reload.png b/src/plugins/diffeditor/images/reload.png deleted file mode 100644 index bd07fb34b039a36c447600aa620f5dbf67ef10af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^PXNr}OT51_lPs z0*}aI1_o|n5N2eUHAjMhfq}im)7O>#9*YDAi@Ns?{TU1l4DFsSjv*GO?*<*@J)ppG zWZCKsa?&pj_dTdE=lSc=EOxux+ezusTp5QimELv?51e}$&e$Y;d(fzU{xbX4`?BU~ zf+rb5Tt2OeVX&Iam+*NeOT$i~z^_4*ljE{#PvyHEIkQyV%RWAI%e7N1dj3+`Q;cUO u^2f~<>9@SYTzgyG{F$}m_E1*#znA?s2?wdY{O|G<