From 97ac63b4012ab55def11a58ee6bd7b6878dc37e1 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 26 Jun 2020 12:23:01 +0200 Subject: [PATCH] Android, McuSupport: Change "download" icons to "online" The download icon might suggest that clicking that button causes an automated download/installation. Since we have similar automation in the Android settings, that could be misleading. Change-Id: Ia1e4f1cfe15f79daf090546ee7c991f93b23fd13 Reviewed-by: Assam Boudjelthia --- src/libs/utils/utilsicons.cpp | 2 ++ src/libs/utils/utilsicons.h | 1 + src/plugins/android/androidsettingswidget.cpp | 2 +- src/plugins/mcusupport/mcusupportoptions.cpp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 704ffd9e3cf..04d35829626 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -198,6 +198,8 @@ const Icon SORT_ALPHABETICALLY_TOOLBAR({ {QLatin1String(":/utils/images/sort_alphabetically.png"), Theme::IconsBaseColor}}); const Icon TOGGLE_PROGRESSDETAILS_TOOLBAR({ {QLatin1String(":/utils/images/toggleprogressdetails.png"), Theme::IconsBaseColor}}); +const Icon ONLINE({ + {QLatin1String(":/utils/images/online.png"), Theme::PanelTextColorMid}}, Icon::Tint); const Icon ONLINE_TOOLBAR({ {QLatin1String(":/utils/images/online.png"), Theme::IconsBaseColor}}); const Icon DOWNLOAD({ diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 0bd317fbbb6..0f7c9d654b5 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -115,6 +115,7 @@ 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 TOGGLE_PROGRESSDETAILS_TOOLBAR; +QTCREATOR_UTILS_EXPORT extern const Icon ONLINE; QTCREATOR_UTILS_EXPORT extern const Icon ONLINE_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon DOWNLOAD; diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 9cd90087ef5..404d3e1952c 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -456,7 +456,7 @@ AndroidSettingsWidget::AndroidSettingsWidget() m_ui.downloadOpenJDKToolButton->setVisible(!HostOsInfo::isLinuxHost()); - const QIcon downloadIcon = Icons::DOWNLOAD.icon(); + const QIcon downloadIcon = Icons::ONLINE.icon(); m_ui.downloadSDKToolButton->setIcon(downloadIcon); m_ui.downloadNDKToolButton->setIcon(downloadIcon); m_ui.downloadOpenJDKToolButton->setIcon(downloadIcon); diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 5eec0e4bbf2..ce182bd070f 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -120,7 +120,7 @@ QWidget *McuPackage::widget() if (!m_downloadUrl.isEmpty()) { auto downLoadButton = new QToolButton; - downLoadButton->setIcon(Utils::Icons::DOWNLOAD.icon()); + downLoadButton->setIcon(Utils::Icons::ONLINE.icon()); downLoadButton->setToolTip(tr("Download from \"%1\"").arg(m_downloadUrl)); QObject::connect(downLoadButton, &QToolButton::pressed, [this]{ QDesktopServices::openUrl(m_downloadUrl);