Autotest: Move "sort alphabetically" icon to utils

Make it available for others.

Change-Id: I2f167b82127ea7142b8185f0ec0402f1d054d06c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Alessandro Portale
2019-04-04 14:33:08 +02:00
parent 9970861060
commit 177aeaaf35
9 changed files with 8 additions and 6 deletions

View File

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 139 B

View File

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

View File

@@ -217,6 +217,8 @@
<file>images/macos_touchbar_clear@2x.png</file> <file>images/macos_touchbar_clear@2x.png</file>
<file>images/settings.png</file> <file>images/settings.png</file>
<file>images/settings@2x.png</file> <file>images/settings@2x.png</file>
<file>images/sort_alphabetically.png</file>
<file>images/sort_alphabetically@2x.png</file>
</qresource> </qresource>
<qresource prefix="/codemodel"> <qresource prefix="/codemodel">
<file>images/enum.png</file> <file>images/enum.png</file>

View File

@@ -186,6 +186,9 @@ const Icon LINK({
{QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint); {QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint);
const Icon LINK_TOOLBAR({ const Icon LINK_TOOLBAR({
{QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}}); {QLatin1String(":/utils/images/linkicon.png"), Theme::IconsBaseColor}});
const Icon SORT_ALPHABETICALLY_TOOLBAR({
{QLatin1String(":/utils/images/sort_alphabetically.png"), Theme::IconsBaseColor}});
const Icon WARNING({ const Icon WARNING({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},
{QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningColor}}, Icon::Tint); {QLatin1String(":/utils/images/warning.png"), Theme::IconsWarningColor}}, Icon::Tint);

View File

@@ -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 FILTER;
QTCREATOR_UTILS_EXPORT extern const Icon LINK; QTCREATOR_UTILS_EXPORT extern const Icon LINK;
QTCREATOR_UTILS_EXPORT extern const Icon LINK_TOOLBAR; 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;
QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR;

View File

@@ -2,8 +2,6 @@
<qresource prefix="/autotest"> <qresource prefix="/autotest">
<file>images/settingscategory_autotest.png</file> <file>images/settingscategory_autotest.png</file>
<file>images/settingscategory_autotest@2x.png</file> <file>images/settingscategory_autotest@2x.png</file>
<file>images/sort.png</file>
<file>images/sort@2x.png</file>
<file>images/leafsort.png</file> <file>images/leafsort.png</file>
<file>images/leafsort@2x.png</file> <file>images/leafsort@2x.png</file>
<file>images/benchmark.png</file> <file>images/benchmark.png</file>

View File

@@ -30,8 +30,6 @@
namespace Autotest { namespace Autotest {
namespace Icons { namespace Icons {
const Utils::Icon SORT_ALPHABETICALLY({
{":/autotest/images/sort.png", Utils::Theme::IconsBaseColor}});
const Utils::Icon SORT_NATURALLY({ const Utils::Icon SORT_NATURALLY({
{":/autotest/images/leafsort.png", Utils::Theme::IconsBaseColor}}); {":/autotest/images/leafsort.png", Utils::Theme::IconsBaseColor}});
const Utils::Icon RUN_SELECTED_OVERLAY({ const Utils::Icon RUN_SELECTED_OVERLAY({

View File

@@ -237,7 +237,7 @@ void TestNavigationWidget::onItemActivated(const QModelIndex &index)
void TestNavigationWidget::onSortClicked() void TestNavigationWidget::onSortClicked()
{ {
if (m_sortAlphabetically) { 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_sort->setToolTip(tr("Sort Alphabetically"));
m_sortFilterModel->setSortMode(TestTreeItem::Naturally); m_sortFilterModel->setSortMode(TestTreeItem::Naturally);
} else { } else {

View File

@@ -5117,7 +5117,7 @@
</g> </g>
<g <g
style="display:inline" style="display:inline"
id="src/plugins/autotest/images/sort" id="src/libs/utils/images/sort_alphabetically"
transform="translate(32,0)"> transform="translate(32,0)">
<rect <rect
y="568" y="568"

Before

Width:  |  Height:  |  Size: 374 KiB

After

Width:  |  Height:  |  Size: 374 KiB