diff options
28 files changed, 78 insertions, 26 deletions
diff --git a/src/libs/qmleditorwidgets/images/eye_open.png b/src/libs/qmleditorwidgets/images/eye_open.png Binary files differdeleted file mode 100644 index 133378a8e7..0000000000 --- a/src/libs/qmleditorwidgets/images/eye_open.png +++ /dev/null diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc index 61c2fe4565..163402cffe 100644 --- a/src/libs/qmleditorwidgets/resources.qrc +++ b/src/libs/qmleditorwidgets/resources.qrc @@ -16,7 +16,6 @@ <file>images/checkbox_tr_unchecked@2x.png</file> <file>images/checkbox_tr_unchecked_pressed.png</file> <file>images/checkbox_tr_unchecked_pressed@2x.png</file> - <file>images/eye_open.png</file> <file>images/lock.png</file> <file>images/hole.png</file> <file>images/down_arrow.png</file> diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index a4fa04d2c0..171fa48839 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -111,5 +111,9 @@ <file>images/stop_small@2x.png</file> <file>images/boundingrect.png</file> <file>images/boundingrect@2x.png</file> + <file>images/eye_closed.png</file> + <file>images/eye_closed@2x.png</file> + <file>images/eye_open.png</file> + <file>images/eye_open@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index 1980a7779a..43952524c4 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 4b6e24f8a4..93669f4906 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 Binary files differindex e5a5dead1c..e5a5dead1c 100644 --- a/src/plugins/qmldesigner/components/navigator/eye_closed.png +++ b/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 Binary files differindex 327e70a138..327e70a138 100644 --- a/src/plugins/qmldesigner/components/navigator/eye_closed@2x.png +++ b/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 Binary files differindex 7cb34bf982..7cb34bf982 100644 --- a/src/plugins/qmldesigner/components/navigator/eye_open.png +++ b/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 Binary files differindex 1974307141..1974307141 100644 --- a/src/plugins/qmldesigner/components/navigator/eye_open@2x.png +++ b/src/plugins/coreplugin/images/eye_open@2x.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 91ff450ccb..699a0913de 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -25,8 +25,6 @@ <file>images/debugger_stepout_small@2x.png</file> <file>images/debugger_stepover_small.png</file> <file>images/debugger_stepover_small@2x.png</file> - <file>images/watchpoint.png</file> - <file>images/tracepoint.png</file> <file>images/breakpoint.png</file> <file>images/breakpoint@2x.png</file> <file>images/breakpoint_disabled.png</file> diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 1d98a1d40f..15cf5f114c 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 Binary files differdeleted file mode 100644 index c46e602a24..0000000000 --- a/src/plugins/debugger/images/tracepoint.png +++ /dev/null diff --git a/src/plugins/debugger/images/tracepointoverlay.png b/src/plugins/debugger/images/tracepointoverlay.png Binary files differnew file mode 100644 index 0000000000..e5c2819af4 --- /dev/null +++ b/src/plugins/debugger/images/tracepointoverlay.png diff --git a/src/plugins/debugger/images/tracepointoverlay@2x.png b/src/plugins/debugger/images/tracepointoverlay@2x.png Binary files differnew file mode 100644 index 0000000000..9f472fcde8 --- /dev/null +++ b/src/plugins/debugger/images/tracepointoverlay@2x.png diff --git a/src/plugins/debugger/images/watchpoint.png b/src/plugins/debugger/images/watchpoint.png Binary files differdeleted file mode 100644 index 133378a8e7..0000000000 --- a/src/plugins/debugger/images/watchpoint.png +++ /dev/null diff --git a/src/plugins/imageviewer/images/originalsize.png b/src/plugins/imageviewer/images/originalsize.png Binary files differdeleted file mode 100644 index 133378a8e7..0000000000 --- a/src/plugins/imageviewer/images/originalsize.png +++ /dev/null diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index 5710174a1d..ed47e06c43 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 60678a9ced..23266219fd 100644 --- a/src/plugins/imageviewer/imageviewer.qrc +++ b/src/plugins/imageviewer/imageviewer.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/imageviewer"> - <file>images/originalsize.png</file> <file>images/background.png</file> <file>ImageViewer.mimetypes.xml</file> </qresource> diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui index 4dec6dc66e..0ca8fe689a 100644 --- a/src/plugins/imageviewer/imageviewertoolbar.ui +++ b/src/plugins/imageviewer/imageviewertoolbar.ui @@ -69,10 +69,6 @@ <property name="toolTipBase"> <string>Original Size</string> </property> - <property name="icon"> - <iconset resource="imageviewer.qrc"> - <normaloff>:/imageviewer/images/originalsize.png</normaloff>:/imageviewer/images/originalsize.png</iconset> - </property> </widget> </item> <item> diff --git a/src/plugins/qmldesigner/components/navigator/navigator.qrc b/src/plugins/qmldesigner/components/navigator/navigator.qrc index f2451d00e8..41599b77be 100644 --- a/src/plugins/qmldesigner/components/navigator/navigator.qrc +++ b/src/plugins/qmldesigner/components/navigator/navigator.qrc @@ -12,10 +12,6 @@ <file>export_checked@2x.png</file> <file>export_unchecked.png</file> <file>export_unchecked@2x.png</file> - <file>eye_open.png</file> - <file>eye_open@2x.png</file> - <file>eye_closed.png</file> - <file>eye_closed@2x.png</file> <file>warning.png</file> </qresource> </RCC> diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index a8c06266a1..14ac2922a3 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -33,6 +33,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> +#include <coreplugin/coreicons.h> #include <utils/icon.h> @@ -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 c85c2a7692..e226143972 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 Binary files differdeleted file mode 100644 index 8c7ede732b..0000000000 --- a/src/plugins/valgrind/images/eye_crossed.png +++ /dev/null diff --git a/src/plugins/valgrind/images/suppressoverlay.png b/src/plugins/valgrind/images/suppressoverlay.png Binary files differnew file mode 100644 index 0000000000..20bc569b78 --- /dev/null +++ b/src/plugins/valgrind/images/suppressoverlay.png diff --git a/src/plugins/valgrind/images/suppressoverlay@2x.png b/src/plugins/valgrind/images/suppressoverlay@2x.png Binary files differnew file mode 100644 index 0000000000..29f18c734d --- /dev/null +++ b/src/plugins/valgrind/images/suppressoverlay@2x.png diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index a15d773133..19f3b11729 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -41,6 +41,8 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> #include <utils/qtcassert.h> +#include <utils/icon.h> +#include <utils/theme/theme.h> #include <QAction> @@ -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 f612c22f2e..33b69a88bc 100644 --- a/src/plugins/valgrind/valgrind.qrc +++ b/src/plugins/valgrind/valgrind.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/valgrind"> - <file>images/eye_crossed.png</file> + <file>images/suppressoverlay.png</file> + <file>images/suppressoverlay@2x.png</file> </qresource> </RCC> diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 0a080095b1..e0059d54ee 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2216,6 +2216,54 @@ height="100%" /> </g> <g + style="display:inline" + transform="translate(176,0)" + id="src/plugins/debugger/images/tracepointoverlay"> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none" + x="265" + y="568" + width="16" + height="16" + id="rect4810-1-2" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 273,571 8,0" + id="path4877" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 277,572 0,7" + id="path4879" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + </g> + <g + style="display:inline" + transform="translate(192,0)" + id="src/plugins/valgrind/images/suppressoverlay"> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none" + x="265" + y="568" + width="16" + height="16" + id="rect4810-1-2-2" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 272.5,582.5 7,-7" + id="path4907" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 272.5,575.5 7,7" + id="path4909" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + </g> + <g id="src/plugins/projectexplorer/images/debugger_overlay_small" transform="translate(16,0)"> <rect @@ -2439,7 +2487,7 @@ <g transform="translate(297,268)" style="display:inline" - id="src/plugins/qmldesigner/components/navigator/eye_open"> + id="src/plugins/coreplugin/images/eye_open"> <rect id="rect6782-9" height="16" @@ -2461,7 +2509,7 @@ </g> <g transform="translate(263,268)" - id="src/plugins/qmldesigner/components/navigator/eye_closed"> + id="src/plugins/coreplugin/images/eye_closed"> <rect id="rect6790-1" height="16" |
