From f748a5b5939bc84b9a224071200bcdcbd8afae5f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 13 Apr 2018 14:43:59 +0200 Subject: [PATCH] TextEditor: Move the fixit light bulb to Utils Change-Id: I3128c0363737980a77fa780601f0b245d01540ad Reviewed-by: Ivan Donchevskii --- .../texteditor => libs/utils}/images/lightbulb.png | Bin .../utils}/images/lightbulb@2x.png | Bin .../utils}/images/lightbulbcap.png | Bin .../utils}/images/lightbulbcap@2x.png | Bin src/libs/utils/utils.qrc | 4 ++++ src/libs/utils/utilsicons.cpp | 9 ++++----- src/plugins/texteditor/refactoroverlay.cpp | 6 ++---- src/plugins/texteditor/texteditor.qrc | 4 ---- src/tools/icons/qtcreatoricons.svg | 4 ++-- 9 files changed, 12 insertions(+), 15 deletions(-) rename src/{plugins/texteditor => libs/utils}/images/lightbulb.png (100%) rename src/{plugins/texteditor => libs/utils}/images/lightbulb@2x.png (100%) rename src/{plugins/texteditor => libs/utils}/images/lightbulbcap.png (100%) rename src/{plugins/texteditor => libs/utils}/images/lightbulbcap@2x.png (100%) diff --git a/src/plugins/texteditor/images/lightbulb.png b/src/libs/utils/images/lightbulb.png similarity index 100% rename from src/plugins/texteditor/images/lightbulb.png rename to src/libs/utils/images/lightbulb.png diff --git a/src/plugins/texteditor/images/lightbulb@2x.png b/src/libs/utils/images/lightbulb@2x.png similarity index 100% rename from src/plugins/texteditor/images/lightbulb@2x.png rename to src/libs/utils/images/lightbulb@2x.png diff --git a/src/plugins/texteditor/images/lightbulbcap.png b/src/libs/utils/images/lightbulbcap.png similarity index 100% rename from src/plugins/texteditor/images/lightbulbcap.png rename to src/libs/utils/images/lightbulbcap.png diff --git a/src/plugins/texteditor/images/lightbulbcap@2x.png b/src/libs/utils/images/lightbulbcap@2x.png similarity index 100% rename from src/plugins/texteditor/images/lightbulbcap@2x.png rename to src/libs/utils/images/lightbulbcap@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 859883bd706..c3537648e37 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -203,5 +203,9 @@ images/codemodelerror@2x.png images/codemodelwarning.png images/codemodelwarning@2x.png + images/lightbulb.png + images/lightbulb@2x.png + images/lightbulbcap.png + images/lightbulbcap@2x.png diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 96dd9e36fef..66798a9449d 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -250,10 +250,9 @@ const Icon CODEMODEL_DISABLED_ERROR({ {":/utils/images/codemodelerror.png", Theme::IconsDisabledColor}}, Icon::Tint); const Icon CODEMODEL_DISABLED_WARNING({ {":/utils/images/codemodelwarning.png", Theme::IconsDisabledColor}}, Icon::Tint); -const Icon CODEMODEL_FIXIT({{QLatin1String(":/texteditor/images/lightbulbcap.png"), - Utils::Theme::PanelTextColorMid}, - {QLatin1String(":/texteditor/images/lightbulb.png"), - Utils::Theme::IconsWarningColor}}, - Utils::Icon::Tint); +const Icon CODEMODEL_FIXIT({ + {":/utils/images/lightbulbcap.png", Theme::PanelTextColorMid}, + {":/utils/images/lightbulb.png", Theme::IconsWarningColor}}, Icon::Tint); + } // namespace Icons } // namespace Utils diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp index dbce3755981..fce06803fd4 100644 --- a/src/plugins/texteditor/refactoroverlay.cpp +++ b/src/plugins/texteditor/refactoroverlay.cpp @@ -27,7 +27,7 @@ #include "textdocumentlayout.h" #include "texteditor.h" -#include +#include #include @@ -39,9 +39,7 @@ RefactorOverlay::RefactorOverlay(TextEditor::TextEditorWidget *editor) : QObject(editor), m_editor(editor), m_maxWidth(0), - m_icon(Utils::Icon({ - {QLatin1String(":/texteditor/images/lightbulbcap.png"), Utils::Theme::PanelTextColorMid}, - {QLatin1String(":/texteditor/images/lightbulb.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::Tint).icon()) + m_icon(Utils::Icons::CODEMODEL_FIXIT.icon()) { } diff --git a/src/plugins/texteditor/texteditor.qrc b/src/plugins/texteditor/texteditor.qrc index 76c8254e8c1..83e4497630d 100644 --- a/src/plugins/texteditor/texteditor.qrc +++ b/src/plugins/texteditor/texteditor.qrc @@ -1,10 +1,6 @@ images/finddocuments.png - images/lightbulb.png - images/lightbulb@2x.png - images/lightbulbcap.png - images/lightbulbcap@2x.png images/snippet.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 90a1fee6cf3..be1d84907ae 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -4599,7 +4599,7 @@