From a84fe0b762b00f6e6fadc0b807ebff3b702114a8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sun, 10 Apr 2016 20:32:28 +0200 Subject: [PATCH] Icons: Removing several duplicates and variations of the eye_open icon Change-Id: I598005ac81bd847d3d5e88c3d78a0e945c8026c5 Reviewed-by: hjk --- src/libs/qmleditorwidgets/images/eye_open.png | Bin 593 -> 0 bytes src/libs/qmleditorwidgets/resources.qrc | 1 - src/plugins/coreplugin/core.qrc | 4 ++ src/plugins/coreplugin/coreicons.cpp | 4 ++ src/plugins/coreplugin/coreicons.h | 2 + .../images}/eye_closed.png | Bin .../images}/eye_closed@2x.png | Bin .../images}/eye_open.png | Bin .../images}/eye_open@2x.png | Bin src/plugins/debugger/debugger.qrc | 2 - src/plugins/debugger/debuggericons.h | 9 +-- src/plugins/debugger/images/tracepoint.png | Bin 309 -> 0 bytes .../debugger/images/tracepointoverlay.png | Bin 0 -> 96 bytes .../debugger/images/tracepointoverlay@2x.png | Bin 0 -> 101 bytes src/plugins/debugger/images/watchpoint.png | Bin 593 -> 0 bytes .../imageviewer/images/originalsize.png | Bin 593 -> 0 bytes src/plugins/imageviewer/imageviewer.cpp | 1 + src/plugins/imageviewer/imageviewer.qrc | 1 - src/plugins/imageviewer/imageviewertoolbar.ui | 4 -- .../components/navigator/navigator.qrc | 4 -- .../components/navigator/navigatorview.cpp | 5 +- src/plugins/qmldesigner/qmldesignericons.h | 4 -- src/plugins/valgrind/images/eye_crossed.png | Bin 731 -> 0 bytes .../valgrind/images/suppressoverlay.png | Bin 0 -> 135 bytes .../valgrind/images/suppressoverlay@2x.png | Bin 0 -> 260 bytes src/plugins/valgrind/memcheckerrorview.cpp | 8 ++- src/plugins/valgrind/valgrind.qrc | 3 +- src/tools/icons/qtcreatoricons.svg | 52 +++++++++++++++++- 28 files changed, 78 insertions(+), 26 deletions(-) delete mode 100644 src/libs/qmleditorwidgets/images/eye_open.png rename src/plugins/{qmldesigner/components/navigator => coreplugin/images}/eye_closed.png (100%) rename src/plugins/{qmldesigner/components/navigator => coreplugin/images}/eye_closed@2x.png (100%) rename src/plugins/{qmldesigner/components/navigator => coreplugin/images}/eye_open.png (100%) rename src/plugins/{qmldesigner/components/navigator => coreplugin/images}/eye_open@2x.png (100%) delete mode 100644 src/plugins/debugger/images/tracepoint.png create mode 100644 src/plugins/debugger/images/tracepointoverlay.png create mode 100644 src/plugins/debugger/images/tracepointoverlay@2x.png delete mode 100644 src/plugins/debugger/images/watchpoint.png delete mode 100644 src/plugins/imageviewer/images/originalsize.png delete mode 100644 src/plugins/valgrind/images/eye_crossed.png create mode 100644 src/plugins/valgrind/images/suppressoverlay.png create mode 100644 src/plugins/valgrind/images/suppressoverlay@2x.png diff --git a/src/libs/qmleditorwidgets/images/eye_open.png b/src/libs/qmleditorwidgets/images/eye_open.png deleted file mode 100644 index 133378a8e7dd3a82296c0fd4b2093efce0e26972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFn;!QaSW-rb!77H?x;Y4WBap3Tt2Q<5VK1X>0BUa zt*yK5nnS|I8%h(>xc|>Ek>=10V(kuD*<#Yvx~R3asCENOxJawUzK??PGc9K%WOeiW zu{dsQe1Gom%5^1Ha|?Vm3Q{$MJC8hlZ+^t~W0!$&|B*L)>eTlM+W!~aapV5&oNesu zuX8saWSHvJdNu27(*FCOrDS{EwjX{du>0;i+pBd7QFm01J}$iYrf8?!ojmhdXVugu zbBa4HzwEd+>~N0R;fDnswcBrtnzkQ)sQa}xjj`Wt@lU~Cw?G}Sg#j7|s{4M{=(Q}n ztU2wp>X#~8rbY(y?x?8wn>)9!iCY=s5Ueoyq{Hf~PAfwWy(~GDv~j`p*PSs25-tk^ z4kT@Cxc^>!^5%v!>~j6=D?_|&cHV!Vy!)=w{PW7wPajM%S{S3JEYztm*Du*XVuOCn zuM!&u^=A*vVzY|P{-4+MtZohpa$E>Nq zqUU1;&+fZ=4{9|;e$8GVwtB|dv_;P)XP4N>&E6XIw(nkeqKQ=N<3CYz{oH3f|NK*+ z`)Et0O{Cdu+Y8O_JJdV7&lft^C>77i5wp(Q8s*ybuHlD!N~GKBtFJCy-2M6Jp`{1r zSJZ};3+bOvH#*oG-?4uB(M$FJXRH(Zp?iSg%$Aqs3v!nDFfcGMc)I$ztaD0e0svTC B5tsk~ diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 61c2fe4565b..163402cffe3 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -16,7 +16,6 @@ images/checkbox_tr_unchecked@2x.png images/checkbox_tr_unchecked_pressed.png images/checkbox_tr_unchecked_pressed@2x.png - images/eye_open.png images/lock.png images/hole.png images/down_arrow.png diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a4fa04d2c0f..171fa48839e 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -111,5 +111,9 @@ images/stop_small@2x.png images/boundingrect.png images/boundingrect@2x.png + images/eye_closed.png + images/eye_closed@2x.png + images/eye_open.png + images/eye_open@2x.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 1980a7779aa..43952524c49 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -148,6 +148,10 @@ const Utils::Icon INTERRUPT_SMALL({ {QLatin1String(":/core/images/interrupt_small.png"), Utils::Theme::IconsInterruptColor}}); const Icon BOUNDING_RECT({ {QLatin1String(":/core/images/boundingrect.png"), Theme::IconsBaseColor}}); +const Icon EYE_OPEN_TOOLBAR({ + {QLatin1String(":/core/images/eye_open.png"), Theme::IconsBaseColor}}); +const Icon EYE_CLOSED_TOOLBAR({ + {QLatin1String(":/core/images/eye_closed.png"), Theme::IconsBaseColor}}); const Icon MODE_EDIT_CLASSIC( QLatin1String(":/fancyactionbar/images/mode_Edit.png")); diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index 4b6e24f8a4d..93669f49060 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -91,6 +91,8 @@ CORE_EXPORT extern const Utils::Icon RUN_SMALL; CORE_EXPORT extern const Utils::Icon STOP_SMALL; CORE_EXPORT extern const Utils::Icon INTERRUPT_SMALL; CORE_EXPORT extern const Utils::Icon BOUNDING_RECT; +CORE_EXPORT extern const Utils::Icon EYE_OPEN_TOOLBAR; +CORE_EXPORT extern const Utils::Icon EYE_CLOSED_TOOLBAR; CORE_EXPORT extern const Utils::Icon MODE_EDIT_CLASSIC; CORE_EXPORT extern const Utils::Icon MODE_EDIT_FLAT; diff --git a/src/plugins/qmldesigner/components/navigator/eye_closed.png b/src/plugins/coreplugin/images/eye_closed.png similarity index 100% rename from src/plugins/qmldesigner/components/navigator/eye_closed.png rename to src/plugins/coreplugin/images/eye_closed.png diff --git a/src/plugins/qmldesigner/components/navigator/eye_closed@2x.png b/src/plugins/coreplugin/images/eye_closed@2x.png similarity index 100% rename from src/plugins/qmldesigner/components/navigator/eye_closed@2x.png rename to src/plugins/coreplugin/images/eye_closed@2x.png diff --git a/src/plugins/qmldesigner/components/navigator/eye_open.png b/src/plugins/coreplugin/images/eye_open.png similarity index 100% rename from src/plugins/qmldesigner/components/navigator/eye_open.png rename to src/plugins/coreplugin/images/eye_open.png diff --git a/src/plugins/qmldesigner/components/navigator/eye_open@2x.png b/src/plugins/coreplugin/images/eye_open@2x.png similarity index 100% rename from src/plugins/qmldesigner/components/navigator/eye_open@2x.png rename to src/plugins/coreplugin/images/eye_open@2x.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 91ff450ccbc..699a0913de0 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -25,8 +25,6 @@ images/debugger_stepout_small@2x.png images/debugger_stepover_small.png images/debugger_stepover_small@2x.png - images/watchpoint.png - images/tracepoint.png images/breakpoint.png images/breakpoint@2x.png images/breakpoint_disabled.png diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 1d98a1d40fd..15cf5f114c1 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -40,10 +40,11 @@ const Utils::Icon BREAKPOINT_PENDING({ {QLatin1String(":/debugger/images/breakpoint_pending_overlay.png"), Utils::Theme::PanelTextColorDark}}, Utils::Icon::IconStyleOptions(Utils::Icon::Tint | Utils::Icon::PunchEdges)); const Utils::Icon BREAKPOINTS( QLatin1String(":/debugger/images/debugger_breakpoints.png")); -const Utils::Icon WATCHPOINT( - QLatin1String(":/debugger/images/watchpoint.png")); -const Utils::Icon TRACEPOINT( - QLatin1String(":/debugger/images/tracepoint.png")); +const Utils::Icon WATCHPOINT({ + {QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal}}, Utils::Icon::Tint); +const Utils::Icon TRACEPOINT({ + {QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal}, + {QLatin1String(":/debugger/images/tracepointoverlay.png"), Utils::Theme::TextColorNormal}}, Utils::Icon::Tint | Utils::Icon::PunchEdges); const Utils::Icon CONTINUE( QLatin1String(":/debugger/images/debugger_continue.png")); const Utils::Icon CONTINUE_FLAT({ diff --git a/src/plugins/debugger/images/tracepoint.png b/src/plugins/debugger/images/tracepoint.png deleted file mode 100644 index c46e602a24a8c5196fcfa429ee601fb5dbb4e9c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+{PA>g4AD5hcH(|7W=4s_ zpCvx=I;j_K)_ZitKYR6C1&(>`-q9c47dD4j#T*P0aTH-$?o?|1qR4rAHJ4*e`@WWD zkvcus0*w*_Nns|>C9DTz^ztUSGjj5CTzou>E%eXP@VcjJwN9%z1Pc!8_8*z@ahi($ zm6scxr|LP)5e!gXa-KJJkAlD7&BrZss#`p6Jeg#@ZKu+q`A>c;3R+qUI;{yzpF79A zFXO@UPfKItPM*+Ea+zr5YGmZLrp|lPG<)kMOST9sI>zQ36l8T{x5`N`vs~j818Yv{K$gHw--wJWl^?w-{ P7#KWV{an^LB{Ts5BVvCB diff --git a/src/plugins/debugger/images/tracepointoverlay.png b/src/plugins/debugger/images/tracepointoverlay.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c2819af4a5a1474ea70b47bf6d1738940ec3cb GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltwg8_HR|W=#|Ns9ly*d9b y0|SGor;B3Mc*`YyTHJ}z~JfX=d#Wzp$P!v=NQfa literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/tracepointoverlay@2x.png b/src/plugins/debugger/images/tracepointoverlay@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9f472fcde872584df96c79557b44037ed46c4145 GIT binary patch literal 101 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;IMrH;E2G1=owlgp=um$*pxH2#>{Qv)d>CO3f z85kI(JY5_^IHHq(@U!qpurM>LeLOx-ipA{q2LXoY*E#nSnVkPHfb_fixvX{(JaZG%Q-e|yQz{EjrrIztFn;!QaSW-rb!77H?x;Y4WBap3Tt2Q<5VK1X>0BUa zt*yK5nnS|I8%h(>xc|>Ek>=10V(kuD*<#Yvx~R3asCENOxJawUzK??PGc9K%WOeiW zu{dsQe1Gom%5^1Ha|?Vm3Q{$MJC8hlZ+^t~W0!$&|B*L)>eTlM+W!~aapV5&oNesu zuX8saWSHvJdNu27(*FCOrDS{EwjX{du>0;i+pBd7QFm01J}$iYrf8?!ojmhdXVugu zbBa4HzwEd+>~N0R;fDnswcBrtnzkQ)sQa}xjj`Wt@lU~Cw?G}Sg#j7|s{4M{=(Q}n ztU2wp>X#~8rbY(y?x?8wn>)9!iCY=s5Ueoyq{Hf~PAfwWy(~GDv~j`p*PSs25-tk^ z4kT@Cxc^>!^5%v!>~j6=D?_|&cHV!Vy!)=w{PW7wPajM%S{S3JEYztm*Du*XVuOCn zuM!&u^=A*vVzY|P{-4+MtZohpa$E>Nq zqUU1;&+fZ=4{9|;e$8GVwtB|dv_;P)XP4N>&E6XIw(nkeqKQ=N<3CYz{oH3f|NK*+ z`)Et0O{Cdu+Y8O_JJdV7&lft^C>77i5wp(Q8s*ybuHlD!N~GKBtFJCy-2M6Jp`{1r zSJZ};3+bOvH#*oG-?4uB(M$FJXRH(Zp?iSg%$Aqs3v!nDFfcGMc)I$ztaD0e0svTC B5tsk~ diff --git a/src/plugins/imageviewer/images/originalsize.png b/src/plugins/imageviewer/images/originalsize.png deleted file mode 100644 index 133378a8e7dd3a82296c0fd4b2093efce0e26972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFn;!QaSW-rb!77H?x;Y4WBap3Tt2Q<5VK1X>0BUa zt*yK5nnS|I8%h(>xc|>Ek>=10V(kuD*<#Yvx~R3asCENOxJawUzK??PGc9K%WOeiW zu{dsQe1Gom%5^1Ha|?Vm3Q{$MJC8hlZ+^t~W0!$&|B*L)>eTlM+W!~aapV5&oNesu zuX8saWSHvJdNu27(*FCOrDS{EwjX{du>0;i+pBd7QFm01J}$iYrf8?!ojmhdXVugu zbBa4HzwEd+>~N0R;fDnswcBrtnzkQ)sQa}xjj`Wt@lU~Cw?G}Sg#j7|s{4M{=(Q}n ztU2wp>X#~8rbY(y?x?8wn>)9!iCY=s5Ueoyq{Hf~PAfwWy(~GDv~j`p*PSs25-tk^ z4kT@Cxc^>!^5%v!>~j6=D?_|&cHV!Vy!)=w{PW7wPajM%S{S3JEYztm*Du*XVuOCn zuM!&u^=A*vVzY|P{-4+MtZohpa$E>Nq zqUU1;&+fZ=4{9|;e$8GVwtB|dv_;P)XP4N>&E6XIw(nkeqKQ=N<3CYz{oH3f|NK*+ z`)Et0O{Cdu+Y8O_JJdV7&lft^C>77i5wp(Q8s*ybuHlD!N~GKBtFJCy-2M6Jp`{1r zSJZ};3+bOvH#*oG-?4uB(M$FJXRH(Zp?iSg%$Aqs3v!nDFfcGMc)I$ztaD0e0svTC B5tsk~ diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 5710174a1d5..ed47e06c438 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -106,6 +106,7 @@ void ImageViewer::ctor() d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon()); d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon()); d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon()); + d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::Icons::EYE_OPEN_TOOLBAR.icon()); // icons update - try to use system theme updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in")); updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out")); diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc index 60678a9cede..23266219fd5 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,6 +1,5 @@ - images/originalsize.png images/background.png ImageViewer.mimetypes.xml diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index 4dec6dc66ec..0ca8fe689ab 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -69,10 +69,6 @@ Original Size - - - :/imageviewer/images/originalsize.png:/imageviewer/images/originalsize.png - diff --git a/src/plugins/qmldesigner/components/navigator/navigator.qrc b/src/plugins/qmldesigner/components/navigator/navigator.qrc index f2451d00e8c..41599b77be1 100644 --- a/src/plugins/qmldesigner/components/navigator/navigator.qrc +++ b/src/plugins/qmldesigner/components/navigator/navigator.qrc @@ -12,10 +12,6 @@ export_checked@2x.png export_unchecked.png export_unchecked@2x.png - eye_open.png - eye_open@2x.png - eye_closed.png - eye_closed@2x.png warning.png diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index a8c06266a17..14ac2922a3b 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -33,6 +33,7 @@ #include #include +#include #include @@ -86,8 +87,8 @@ NavigatorView::NavigatorView(QObject* parent) : m_treeModel.data()); IconCheckboxItemDelegate *showDelegate = new IconCheckboxItemDelegate(this, - Icons::EYE_OPEN.pixmap(), - Icons::EYE_CLOSED.pixmap(), + Core::Icons::EYE_OPEN_TOOLBAR.pixmap(), + Core::Icons::EYE_CLOSED_TOOLBAR.pixmap(), m_treeModel.data()); IconCheckboxItemDelegate *exportDelegate = diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index c85c2a76926..e2261439727 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -39,10 +39,6 @@ const Utils::Icon ARROW_DOWN({ {QLatin1String(":/navigator/icon/arrowdown.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon ARROW_LEFT({ {QLatin1String(":/navigator/icon/arrowleft.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon EYE_OPEN({ - {QLatin1String(":/navigator/icon/eye_open.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon EYE_CLOSED({ - {QLatin1String(":/navigator/icon/eye_closed.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EXPORT_CHECKED({ {QLatin1String(":/navigator/icon/export_checked.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon EXPORT_UNCHECKED({ diff --git a/src/plugins/valgrind/images/eye_crossed.png b/src/plugins/valgrind/images/eye_crossed.png deleted file mode 100644 index 8c7ede732bb0a82d9637b443459abec30ff1cdf2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 731 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFx7gxIEGZ*S`vKTTRKso_UBT=w7WZYnVwWMbXy_d zy|qzEB0fSLlFQLQ8YJ+>^@G4#Mt-$fNfV@mx48Kv zP3l#P+-}_6`rv3YbASG~+duDpfA)5b<7JZ=b)LtMAFn;{&#}2hu*tZ^bSp9Wm}zS6?M;zWKzoqNGH`&cecBZ(P0m*7uzIqeahD?Y);# zUvD3@QiQ9ON!&?*C1P!u$0U~Rx7R+O>EpIOF!ZbH+}{US>}H?cCd|Vo*nKp?MCzdB z@slSz{X%ra0#}AyxO%m9;X*~bHP5*lz30x%1l{rh9z-rK|SisF1pvTEOb7B~4SOitdQf6Dcn*T)&prc=BY8(A7UI z%$M)47vyqOY4Y#xRuq;Dzj^Oo-IEflSe@yy=}Knauimy+=JT7cbe$=}EA%oq=+w`` zl`U7->dv^a>p%h&$SV*A&2zWJ9Hq@MW7s5JRynDo}q-+xHVpFVBD zoVl((ceIb{DNgfIlYjI6efOS=*RQv4+-O*GIXtke%)m#jY=+N;3Oy0l&Kxn`(7%Zf zZtERQKE!h{`QnxXhtn=g$;r0nY*+T5Kk0G(ztmdUw6Z@zHM<$+m6zWaWlg;5r^T1K zW1pH()xpaT6FJ_#70BGc6aLr7<UDtSmFc{{|Nnb!mr?uR+V1%Lskg#M)@6^T>NT%YYd%)oBDvl~QX*vDe|O=EHi3q$ m%C_4V_!d+;r1H+-V`kvpb35Se>}l*E8$4b8T-G@yGywqD!Y*3? literal 0 HcmV?d00001 diff --git a/src/plugins/valgrind/images/suppressoverlay@2x.png b/src/plugins/valgrind/images/suppressoverlay@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..29f18c734d4822c7c7d581255ede6c76d31135ab GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT81_3@Ht_%zeOiWD7%*-q- zEam0p_4V})4GkR~9g7z)Ub1A#iWMtXty;Bu_3F!)FJHNG<^TWxv-FmBFfcImd%8G= zXiQB0(a$E)w)jA`z(;kS8A{r`WI=gjv+Ek0v| zum8;wF0^F-Og^w+XG-IJ1>L_M zOtT%^vJ_Yx@)&lq>M;~CpU~YgH;$p`uspNbj%n{_B|Lxjm`}lif#Kh_T}QjDIY3Th N@O1TaS?83{1OVUjW)=Vd literal 0 HcmV?d00001 diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index a15d7731337..19f3b117297 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include @@ -55,7 +57,11 @@ MemcheckErrorView::MemcheckErrorView(QWidget *parent) { m_suppressAction = new QAction(this); m_suppressAction->setText(tr("Suppress Error")); - m_suppressAction->setIcon(QIcon(QLatin1String(":/valgrind/images/eye_crossed.png"))); + const QIcon icon = Utils::Icon({ + {QLatin1String(":/core/images/eye_open.png"), Utils::Theme::TextColorNormal}, + {QLatin1String(":/valgrind/images/suppressoverlay.png"), Utils::Theme::IconsErrorColor}}, + Utils::Icon::Tint | Utils::Icon::PunchEdges).icon(); + m_suppressAction->setIcon(icon); m_suppressAction->setShortcut(QKeySequence(Qt::Key_Delete)); m_suppressAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); connect(m_suppressAction, &QAction::triggered, this, &MemcheckErrorView::suppressError); diff --git a/src/plugins/valgrind/valgrind.qrc b/src/plugins/valgrind/valgrind.qrc index f612c22f2e6..33b69a88bca 100644 --- a/src/plugins/valgrind/valgrind.qrc +++ b/src/plugins/valgrind/valgrind.qrc @@ -1,5 +1,6 @@ - images/eye_crossed.png + images/suppressoverlay.png + images/suppressoverlay@2x.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 0a080095b1a..e0059d54ee3 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2215,6 +2215,54 @@ width="100%" height="100%" /> + + + + + + + + + + @@ -2439,7 +2487,7 @@ + id="src/plugins/coreplugin/images/eye_open"> + id="src/plugins/coreplugin/images/eye_closed">