From 09f02013e5b28e8bc1d74f593b7580c7e9f131c0 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 15 Nov 2017 11:57:25 +0100 Subject: [PATCH] Utils: move 2 images to utils select.png is used by the designer Change-Id: Icfa0ab4c931de7365c8bd252de0a0f972beb2c6c Reviewed-by: Alessandro Portale --- .../images/qml => libs/utils/images}/app-on-top.png | Bin .../qml => libs/utils/images}/app-on-top@2x.png | Bin .../images/qml => libs/utils/images}/select.png | Bin .../images/qml => libs/utils/images}/select@2x.png | Bin src/libs/utils/utils.qrc | 4 ++++ src/plugins/debugger/debugger.qrc | 4 ---- src/plugins/debugger/debuggericons.cpp | 8 ++++---- .../components/componentcore/abstractaction.cpp | 2 +- src/tools/icons/qtcreatoricons.svg | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) rename src/{plugins/debugger/images/qml => libs/utils/images}/app-on-top.png (100%) rename src/{plugins/debugger/images/qml => libs/utils/images}/app-on-top@2x.png (100%) rename src/{plugins/debugger/images/qml => libs/utils/images}/select.png (100%) rename src/{plugins/debugger/images/qml => libs/utils/images}/select@2x.png (100%) diff --git a/src/plugins/debugger/images/qml/app-on-top.png b/src/libs/utils/images/app-on-top.png similarity index 100% rename from src/plugins/debugger/images/qml/app-on-top.png rename to src/libs/utils/images/app-on-top.png diff --git a/src/plugins/debugger/images/qml/app-on-top@2x.png b/src/libs/utils/images/app-on-top@2x.png similarity index 100% rename from src/plugins/debugger/images/qml/app-on-top@2x.png rename to src/libs/utils/images/app-on-top@2x.png diff --git a/src/plugins/debugger/images/qml/select.png b/src/libs/utils/images/select.png similarity index 100% rename from src/plugins/debugger/images/qml/select.png rename to src/libs/utils/images/select.png diff --git a/src/plugins/debugger/images/qml/select@2x.png b/src/libs/utils/images/select@2x.png similarity index 100% rename from src/plugins/debugger/images/qml/select@2x.png rename to src/libs/utils/images/select@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 95a473da2ab..27ebd15a9c8 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -180,5 +180,9 @@ images/project@2x.png images/home.png images/home@2x.png + images/select.png + images/select@2x.png + images/app-on-top.png + images/app-on-top@2x.png diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 36d33438620..0031175a1cb 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -38,10 +38,6 @@ images/mode_debug_mask.png images/mode_debug_mask@2x.png images/pin.xpm - images/qml/select.png - images/qml/select@2x.png - images/qml/app-on-top.png - images/qml/app-on-top@2x.png images/debugger_restart_small.png images/debugger_restart_small@2x.png images/recordfill.png diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp index 3fc7fd50b99..006bee3ee7b 100644 --- a/src/plugins/debugger/debuggericons.cpp +++ b/src/plugins/debugger/debuggericons.cpp @@ -82,13 +82,13 @@ const Icon REVERSE_MODE({ {":/debugger/images/debugger_reversemode_background.png", Theme::IconsCodeModelOverlayForegroundColor}, {":/debugger/images/debugger_reversemode.png", Theme::IconsInfoColor}}, Icon::Tint); const Icon APP_ON_TOP({ - {":/debugger/images/qml/app-on-top.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); + {":/utils/images/app-on-top.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); const Icon APP_ON_TOP_TOOLBAR({ - {":/debugger/images/qml/app-on-top.png", Theme::IconsBaseColor}}); + {":/utils/images/app-on-top.png", Theme::IconsBaseColor}}); const Icon SELECT({ - {":/debugger/images/qml/select.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); + {":/utils/images/select.png", Theme::PanelTextColorMid}}, Icon::MenuTintedStyle); const Icon SELECT_TOOLBAR({ - {":/debugger/images/qml/select.png", Theme::IconsBaseColor}}); + {":/utils/images/select.png", Theme::IconsBaseColor}}); const Icon EMPTY( ":/debugger/images/debugger_empty_14.png"); const Icon RECORD_ON({ diff --git a/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp index b439abbf23c..4ad3d73b021 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.cpp @@ -33,7 +33,7 @@ AbstractAction::AbstractAction(const QString &description) : m_defaultAction(new DefaultAction(description)) { const Utils::Icon prevIcon({ - {QLatin1String(":/debugger/images/qml/select.png"), Utils::Theme::QmlDesigner_FormEditorForegroundColor}}, Utils::Icon::MenuTintedStyle); + {QLatin1String(":/utils/images/select.png"), Utils::Theme::QmlDesigner_FormEditorForegroundColor}}, Utils::Icon::MenuTintedStyle); action()->setIcon(prevIcon.icon()); } diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 2cfb5042d24..330f803af61 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -4166,7 +4166,7 @@