From 9a7e1cd6c69edab7e5992f9fe59b29672922bb2b Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 6 Oct 2017 17:58:08 +0200 Subject: [PATCH] VcsBase: Modernize the icons Use themable, HighDPI enabled icons for commit and diff. Re-use an existing red cross for the removesubmitfield. Change-Id: I43f46db96d07de9a7e166937d470d48e45d7f3fb Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/images/diff.png | Bin 204 -> 0 bytes src/plugins/vcsbase/images/diff_arrows.png | Bin 0 -> 155 bytes src/plugins/vcsbase/images/diff_arrows@2x.png | Bin 0 -> 232 bytes src/plugins/vcsbase/images/diff_documents.png | Bin 0 -> 159 bytes .../vcsbase/images/diff_documents@2x.png | Bin 0 -> 192 bytes .../vcsbase/images/removesubmitfield.png | Bin 578 -> 0 bytes src/plugins/vcsbase/images/submit.png | Bin 309 -> 0 bytes src/plugins/vcsbase/images/submit_arrow.png | Bin 0 -> 123 bytes .../vcsbase/images/submit_arrow@2x.png | Bin 0 -> 155 bytes src/plugins/vcsbase/images/submit_db.png | Bin 0 -> 167 bytes src/plugins/vcsbase/images/submit_db@2x.png | Bin 0 -> 292 bytes src/plugins/vcsbase/submitfieldwidget.cpp | 4 +- src/plugins/vcsbase/vcsbase.qbs | 3 - src/plugins/vcsbase/vcsbase.qrc | 11 +- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 14 ++- src/tools/icons/qtcreatoricons.svg | 111 ++++++++++++++++++ 16 files changed, 134 insertions(+), 9 deletions(-) delete mode 100644 src/plugins/vcsbase/images/diff.png create mode 100644 src/plugins/vcsbase/images/diff_arrows.png create mode 100644 src/plugins/vcsbase/images/diff_arrows@2x.png create mode 100644 src/plugins/vcsbase/images/diff_documents.png create mode 100644 src/plugins/vcsbase/images/diff_documents@2x.png delete mode 100644 src/plugins/vcsbase/images/removesubmitfield.png delete mode 100644 src/plugins/vcsbase/images/submit.png create mode 100644 src/plugins/vcsbase/images/submit_arrow.png create mode 100644 src/plugins/vcsbase/images/submit_arrow@2x.png create mode 100644 src/plugins/vcsbase/images/submit_db.png create mode 100644 src/plugins/vcsbase/images/submit_db@2x.png diff --git a/src/plugins/vcsbase/images/diff.png b/src/plugins/vcsbase/images/diff.png deleted file mode 100644 index b3597f9ff850d9f2ddc10b1ff73162d85a48e8db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7CVRR#hFJ72ophJ?fC5KL z|1xI7o@A>Y<{jL%yV@27U5-n7BriXK`G+PWL#S!}%_!k_yawMR4JNOOdjB_0&|^Y- z;BlUaY}r*w-#BJ6h0WSp@Q&^GnLFGHw?&Vnzvfhq zorFwcr1rgMllP|Trbxw9oSw%Nc6nN+gi6%YcGer4e@@oBvOeJPqqCv83=9kmp00i_ I>zopr05Ypj^#A|> diff --git a/src/plugins/vcsbase/images/diff_arrows.png b/src/plugins/vcsbase/images/diff_arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..f3c89ca292d9a6ca053d73fa05dfb2647dcd6e05 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqBzd|xhDc0J{?X4Skzmrk zAm&W5O5=a~`*-#EoWvNK%$qcr_@_!pNIZF`w34Cg#68!GpAP)9TP3M+O^Ms4WJkBs zhXBD0vq=nB%tVY??k$p(3Ml%2H$SEE`NmI8Z+QL}L~t|AxP9M1eX+%9kgcAselF{r G5}E*23^uO- literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/images/diff_arrows@2x.png b/src/plugins/vcsbase/images/diff_arrows@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d2fa19278f68b17e39250093370f32917554d291 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=^`0({Ar_~TfA}*POjyyt z$ibpw+AJ0SAdrD=&g8=AkMC|S4K?)XQUADm;T%Qr{Y}9^;@&!_Hp9Bn&=-(9i4@%WKz j@Pal8eL2>Y<7y1^zt_C^v~==KkQY2%{an^LB{Ts5(`{If literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/images/diff_documents.png b/src/plugins/vcsbase/images/diff_documents.png new file mode 100644 index 0000000000000000000000000000000000000000..5db2b6ccbfd0e18505e1e203d7c211fd146c5118 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu3Nd_r7(eSK?dYwPOj8X6j! zo0}g$e*Em&vtPe{{r>&?|Ns9@4VwcQ7#M6kT^vI=qLXKEvhoN^*evK_dFrL1d_nkB z!h;rrOP4knI9N5_lC*HNl5{wvFgJjWS-piZq`mtfLnt#7!^JGCi>AE4br={J7(8A5 KT-G@yGywoNH#r~x literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/images/diff_documents@2x.png b/src/plugins/vcsbase/images/diff_documents@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cf5d2ce551715cdfee86efd42aeab6ed44fbe421 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8(g8jpuD-s$85tRwnVC5` zIX7?KeD>_wyLazCeE9JH|Novvx|V!3?jB`6O0r vHca1Un_H=O_N$Cs0!+rfR(?DT42;KO|p}-@cXQDHG5+e5;DEpzx}FZT-eMKbHwpge1c32OZ%$@|69r~A5@KQS9ts2 zl|pDiMv$}fLcSuly~fk0Tv+mw_j>>NqcR`o-h244@%!=BoQhwh4}1$<^eSKTx^(X` zbDv&;Lz)7zZb8?W61u1HK7L!Pxtjm^^M`%M%TI2K+V_6<|3gzl6P_>4e6{j&@N;(& z!>Bp4Z|}bQGC`T6zu)4x(8#iCiu<}C|a`gE~!#b3LqnLUfAT9&W-TD7~} zX8o6xG`77Oscg-c)a#NQuJ-m>(FlwgHk`+J8q?oJ%(ixTDK z7u(4!%DbJBzS%+G!L^K*qfUy~F27s5W<~m4y=!jDdnOxQV`%8Sm#nnKNOI4)=Z+1LhFJ6-ourt3#6h5S zzl`9*MHAu!ieT|tGfd`f*ezP9ezv8wd-p~8TyU))ZYmK@2w zs;645^6bGpskD35XKu^xFxg}2G;3Maozt7ny!vCgQQ*-P59!HA|G!Jyex>}R*ZB@X zryFPI@Gi1o2-~$v%Uf=-j`x{6_uowOJEp-mVT+2V)4b<>juLI#zA@(It(OTBVYf;D zo^!o=*Sf{I(ZBX>-+J&+V4qLiJ^5uCm)SN++*tR0GMn9j?;o$5`N%}_*eqRd;%l7y z;oFbY{zEn^blB?nu1|JiR&UZ_v-{-lulaQDFUE#l>jJ$h3)+JB+5BVJ7@6=-%|Squ Qfq{X+)78&qol`;+0Ah@Z0ssI2 diff --git a/src/plugins/vcsbase/images/submit_arrow.png b/src/plugins/vcsbase/images/submit_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..5d849210c359fb206b41e497a6ef817b749e0556 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdqsCd_r6q7#QT_#z@Xyk;uyj)Gnu26iS3evV%M?&LG?rf<%Y(_iz2Oz)188RE~GH< YiKspQa$EHf0|Nttr>mdKI;Vst0O3p}IRF3v literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/images/submit_arrow@2x.png b/src/plugins/vcsbase/images/submit_arrow@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..78064174dbd49f01f04bfcadf21b8bfb273f0f88 GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8LIFM@t_%ze<>lq|_4N%6 z4ILdF|NsAg?_Io}fq}ur)5S4FV`4IgD>ILCv_eaxpl>U4v&JfhO+p=#9$peok_Q?D zV;R=5=p}Ti9q7qg!4$*jqQJ3`L8)O0gHFSmgbOX243n?V=3JK+WX{0Az~JfX=d#Wz Gp$Pzrdo73n literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/images/submit_db.png b/src/plugins/vcsbase/images/submit_db.png new file mode 100644 index 0000000000000000000000000000000000000000..2796c6576f82d56e4ef1a93aa8688b4587cbe189 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)Rq^xLVf^?s;hz!bj00RBH~Ahno7%a)#rki^4w>CCM>K8bH8V4ObUt}r S>nODNbFP1DYKy?hjbnSbIa11P^tEuD^BRkzEeY)K^|QNB7s>UljDd zen&lL9YbGlMTf?ejCo5Q2pzZfyv-@bvh;?mk=Yv&(TW)yet8+2uNu3Fm54cTwu*}L z?qUe(sWfm3U=U!GQ8?c`heaWKkNnI=mK_hzm$UWo-kQa)!szzpbKu6EED_h1$OXpg znMTcznkMq$r@z3FzWMpGr!NIQc4QT0oWuF+q3ONpj@u$EpE)kLc7MjRUE!e*Vy(QZ teQV1m?(@v9&s06^@-XD|zq>CxD;e%xRck)hHgzA!`<||TF6*2UngCbIagYE2 literal 0 HcmV?d00001 diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp index 201f260e6b1..95127f7357b 100644 --- a/src/plugins/vcsbase/submitfieldwidget.cpp +++ b/src/plugins/vcsbase/submitfieldwidget.cpp @@ -25,6 +25,8 @@ #include "submitfieldwidget.h" +#include + #include #include #include @@ -139,7 +141,7 @@ struct SubmitFieldWidgetPrivate { }; SubmitFieldWidgetPrivate::SubmitFieldWidgetPrivate() : - removeFieldIcon(QLatin1String(":/vcsbase/images/removesubmitfield.png")), + removeFieldIcon(Utils::Icons::BROKEN.icon()), completer(0), hasBrowseButton(false), allowDuplicateFields(false), diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs index db5c5a37393..bfaf329f6e4 100644 --- a/src/plugins/vcsbase/vcsbase.qbs +++ b/src/plugins/vcsbase/vcsbase.qbs @@ -74,9 +74,6 @@ QtcPlugin { "vcsplugin.h", "vcsprojectcache.cpp", "vcsprojectcache.h", - "images/diff.png", - "images/removesubmitfield.png", - "images/submit.png", "wizard/vcsconfigurationpage.cpp", "wizard/vcsconfigurationpage.h", "wizard/vcscommandpage.cpp", diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc index 4234890c3a5..101764d9f21 100644 --- a/src/plugins/vcsbase/vcsbase.qrc +++ b/src/plugins/vcsbase/vcsbase.qrc @@ -1,8 +1,13 @@ images/category_vcs.png - images/diff.png - images/removesubmitfield.png - images/submit.png + images/diff_arrows.png + images/diff_arrows@2x.png + images/diff_documents.png + images/diff_documents@2x.png + images/submit_arrow.png + images/submit_arrow@2x.png + images/submit_db.png + images/submit_db@2x.png diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index a1c01d7a96e..02a4b4783fd 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include #include @@ -715,12 +717,20 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript QIcon VcsBaseSubmitEditor::diffIcon() { - return QIcon(QLatin1String(":/vcsbase/images/diff.png")); + using namespace Utils; + return Icon({ + {":/vcsbase/images/diff_documents.png", Theme::PanelTextColorDark}, + {":/vcsbase/images/diff_arrows.png", Theme::IconsStopColor} + }, Icon::Tint).icon(); } QIcon VcsBaseSubmitEditor::submitIcon() { - return QIcon(QLatin1String(":/vcsbase/images/submit.png")); + using namespace Utils; + return Icon({ + {":/vcsbase/images/submit_db.png", Theme::PanelTextColorDark}, + {":/vcsbase/images/submit_arrow.png", Theme::IconsRunColor} + }, Icon::Tint | Icon::PunchEdges).icon(); } // Reduce a list of untracked files reported by a VCS down to the files diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 1703885bc5b..86c713da25e 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -8754,4 +8754,115 @@ x="0" /> + + + + + + + + + + + + + + + + + + + + + + + +