From 177aeaaf35218e85e574930288403166022d4c25 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 4 Apr 2019 14:33:08 +0200 Subject: [PATCH] Autotest: Move "sort alphabetically" icon to utils Make it available for others. Change-Id: I2f167b82127ea7142b8185f0ec0402f1d054d06c Reviewed-by: Christian Stenger --- .../utils/images/sort_alphabetically.png} | Bin .../utils/images/sort_alphabetically@2x.png} | Bin src/libs/utils/utils.qrc | 2 ++ src/libs/utils/utilsicons.cpp | 3 +++ src/libs/utils/utilsicons.h | 1 + src/plugins/autotest/autotest.qrc | 2 -- src/plugins/autotest/autotesticons.h | 2 -- src/plugins/autotest/testnavigationwidget.cpp | 2 +- src/tools/icons/qtcreatoricons.svg | 2 +- 9 files changed, 8 insertions(+), 6 deletions(-) rename src/{plugins/autotest/images/sort.png => libs/utils/images/sort_alphabetically.png} (100%) rename src/{plugins/autotest/images/sort@2x.png => libs/utils/images/sort_alphabetically@2x.png} (100%) diff --git a/src/plugins/autotest/images/sort.png b/src/libs/utils/images/sort_alphabetically.png similarity index 100% rename from src/plugins/autotest/images/sort.png rename to src/libs/utils/images/sort_alphabetically.png diff --git a/src/plugins/autotest/images/sort@2x.png b/src/libs/utils/images/sort_alphabetically@2x.png similarity index 100% rename from src/plugins/autotest/images/sort@2x.png rename to src/libs/utils/images/sort_alphabetically@2x.png diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 0f4efa870d6..dc576ca8062 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -217,6 +217,8 @@ images/macos_touchbar_clear@2x.png images/settings.png images/settings@2x.png + images/sort_alphabetically.png + images/sort_alphabetically@2x.png images/enum.png diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 43ceccd9267..fe040c63d52 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -186,6 +186,9 @@ const Icon LINK({ {QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint); const Icon LINK_TOOLBAR({ {QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}}); +const Icon SORT_ALPHABETICALLY_TOOLBAR({ + {QLatin1String(":/utils/images/sort_alphabetically.png"), Theme::IconsBaseColor}}); + const Icon WARNING({ {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, {QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningColor}}, Icon::Tint); diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 7d3c7a7647b..8cf7b21048f 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -108,6 +108,7 @@ QTCREATOR_UTILS_EXPORT extern const Icon CLOSE_SPLIT_RIGHT; QTCREATOR_UTILS_EXPORT extern const Icon FILTER; QTCREATOR_UTILS_EXPORT extern const Icon LINK; QTCREATOR_UTILS_EXPORT extern const Icon LINK_TOOLBAR; +QTCREATOR_UTILS_EXPORT extern const Icon SORT_ALPHABETICALLY_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon INFO; QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR; diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc index 0c3a24d7ace..0d816992074 100644 --- a/src/plugins/autotest/autotest.qrc +++ b/src/plugins/autotest/autotest.qrc @@ -2,8 +2,6 @@ images/settingscategory_autotest.png images/settingscategory_autotest@2x.png - images/sort.png - images/sort@2x.png images/leafsort.png images/leafsort@2x.png images/benchmark.png diff --git a/src/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h index 83bffffeb0e..c8bfb63bbf8 100644 --- a/src/plugins/autotest/autotesticons.h +++ b/src/plugins/autotest/autotesticons.h @@ -30,8 +30,6 @@ namespace Autotest { namespace Icons { -const Utils::Icon SORT_ALPHABETICALLY({ - {":/autotest/images/sort.png", Utils::Theme::IconsBaseColor}}); const Utils::Icon SORT_NATURALLY({ {":/autotest/images/leafsort.png", Utils::Theme::IconsBaseColor}}); const Utils::Icon RUN_SELECTED_OVERLAY({ diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index 363fd1a3b43..bb701ee4c59 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/src/plugins/autotest/testnavigationwidget.cpp @@ -237,7 +237,7 @@ void TestNavigationWidget::onItemActivated(const QModelIndex &index) void TestNavigationWidget::onSortClicked() { if (m_sortAlphabetically) { - m_sort->setIcon(Icons::SORT_ALPHABETICALLY.icon()); + m_sort->setIcon(Utils::Icons::SORT_ALPHABETICALLY_TOOLBAR.icon()); m_sort->setToolTip(tr("Sort Alphabetically")); m_sortFilterModel->setSortMode(TestTreeItem::Naturally); } else { diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index d7dc0172eb1..f9abb04b4ac 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5117,7 +5117,7 @@