diff --git a/src/libs/utils/images/download_arrow.png b/src/libs/utils/images/download_arrow.png new file mode 100644 index 00000000000..c73bf628f4b Binary files /dev/null and b/src/libs/utils/images/download_arrow.png differ diff --git a/src/libs/utils/images/download_arrow@2x.png b/src/libs/utils/images/download_arrow@2x.png new file mode 100644 index 00000000000..aabf6fce787 Binary files /dev/null and b/src/libs/utils/images/download_arrow@2x.png differ diff --git a/src/libs/utils/images/download_base.png b/src/libs/utils/images/download_base.png new file mode 100644 index 00000000000..25163bef64c Binary files /dev/null and b/src/libs/utils/images/download_base.png differ diff --git a/src/libs/utils/images/download_base@2x.png b/src/libs/utils/images/download_base@2x.png new file mode 100644 index 00000000000..a5e7405ac3d Binary files /dev/null and b/src/libs/utils/images/download_base@2x.png differ diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 3cfb55a4bab..1a1edbef5af 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -225,6 +225,10 @@ images/dir.png images/online.png images/online@2x.png + images/download_arrow.png + images/download_arrow@2x.png + images/download_base.png + images/download_base@2x.png ../3rdparty/xdg/freedesktop.org.xml diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp index 0f6417bd7fa..c83f74a5ced 100644 --- a/src/libs/utils/utilsicons.cpp +++ b/src/libs/utils/utilsicons.cpp @@ -196,6 +196,9 @@ const Icon TOGGLE_PROGRESSDETAILS_TOOLBAR({ {QLatin1String(":/utils/images/toggleprogressdetails.png"), Theme::IconsBaseColor}}); const Icon ONLINE_TOOLBAR({ {QLatin1String(":/utils/images/online.png"), Theme::IconsBaseColor}}); +const Icon DOWNLOAD({ + {QLatin1String(":/utils/images/download_arrow.png"), Theme::IconsRunColor}, + {QLatin1String(":/utils/images/download_base.png"), Theme::PanelTextColorDark}}, Icon::Tint); const Icon WARNING({ {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index c0657d19cb2..8505aed941c 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -114,6 +114,7 @@ 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_TOOLBAR; +QTCREATOR_UTILS_EXPORT extern const Icon DOWNLOAD; QTCREATOR_UTILS_EXPORT extern const Icon INFO; QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR; diff --git a/src/plugins/android/android.qrc b/src/plugins/android/android.qrc index 26b9b148d3c..8c7bbb9ec80 100644 --- a/src/plugins/android/android.qrc +++ b/src/plugins/android/android.qrc @@ -4,6 +4,5 @@ images/androiddevice@2x.png images/androiddevicesmall.png images/androiddevicesmall@2x.png - images/download.png diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 0233e940fb9..965483ab165 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -288,6 +288,11 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent) m_ui->downloadOpenJDKToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost()); + const QIcon downloadIcon = Utils::Icons::DOWNLOAD.icon(); + m_ui->downloadSDKToolButton->setIcon(downloadIcon); + m_ui->downloadNDKToolButton->setIcon(downloadIcon); + m_ui->downloadOpenJDKToolButton->setIcon(downloadIcon); + connect(&m_virtualDevicesWatcher, &QFutureWatcherBase::finished, this, &AndroidSettingsWidget::updateAvds); connect(&m_futureWatcher, &QFutureWatcherBase::finished, diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui index ee9b9a8433b..037e304c76e 100644 --- a/src/plugins/android/androidsettingswidget.ui +++ b/src/plugins/android/androidsettingswidget.ui @@ -53,10 +53,6 @@ Download JDK - - - :/android/images/download.png:/android/images/download.png - @@ -112,10 +108,6 @@ Download Android NDK - - - :/android/images/download.png:/android/images/download.png - @@ -155,10 +147,6 @@ Download Android SDK - - - :/android/images/download.png:/android/images/download.png - diff --git a/src/plugins/android/images/download.png b/src/plugins/android/images/download.png deleted file mode 100644 index 366a2913bc1..00000000000 Binary files a/src/plugins/android/images/download.png and /dev/null differ diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index ffec8a02a89..a846a4e26ee 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3760,6 +3760,42 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc" /> + + + + + + + +