diff --git a/src/libs/qmleditorwidgets/images/eye_open.png b/src/libs/qmleditorwidgets/images/eye_open.png deleted file mode 100644 index 133378a8e7d..00000000000 Binary files a/src/libs/qmleditorwidgets/images/eye_open.png and /dev/null differ 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 c46e602a24a..00000000000 Binary files a/src/plugins/debugger/images/tracepoint.png and /dev/null differ diff --git a/src/plugins/debugger/images/tracepointoverlay.png b/src/plugins/debugger/images/tracepointoverlay.png new file mode 100644 index 00000000000..e5c2819af4a Binary files /dev/null and b/src/plugins/debugger/images/tracepointoverlay.png differ diff --git a/src/plugins/debugger/images/tracepointoverlay@2x.png b/src/plugins/debugger/images/tracepointoverlay@2x.png new file mode 100644 index 00000000000..9f472fcde87 Binary files /dev/null and b/src/plugins/debugger/images/tracepointoverlay@2x.png differ diff --git a/src/plugins/debugger/images/watchpoint.png b/src/plugins/debugger/images/watchpoint.png deleted file mode 100644 index 133378a8e7d..00000000000 Binary files a/src/plugins/debugger/images/watchpoint.png and /dev/null differ diff --git a/src/plugins/imageviewer/images/originalsize.png b/src/plugins/imageviewer/images/originalsize.png deleted file mode 100644 index 133378a8e7d..00000000000 Binary files a/src/plugins/imageviewer/images/originalsize.png and /dev/null differ 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 8c7ede732bb..00000000000 Binary files a/src/plugins/valgrind/images/eye_crossed.png and /dev/null differ diff --git a/src/plugins/valgrind/images/suppressoverlay.png b/src/plugins/valgrind/images/suppressoverlay.png new file mode 100644 index 00000000000..20bc569b786 Binary files /dev/null and b/src/plugins/valgrind/images/suppressoverlay.png differ diff --git a/src/plugins/valgrind/images/suppressoverlay@2x.png b/src/plugins/valgrind/images/suppressoverlay@2x.png new file mode 100644 index 00000000000..29f18c734d4 Binary files /dev/null and b/src/plugins/valgrind/images/suppressoverlay@2x.png differ 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">