Utils/Android: Add themable, DPI-endabled Download icon to Utils::Icons

And use it in AdroidSettingsDialog

Change-Id: Ia847b6df0e5ab26fc02157f888565a3e6d86bb34
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2019-08-23 19:13:51 +02:00
parent 2cad0733c2
commit b98596490e
12 changed files with 49 additions and 13 deletions

View File

@@ -4,6 +4,5 @@
<file>images/androiddevice@2x.png</file>
<file>images/androiddevicesmall.png</file>
<file>images/androiddevicesmall@2x.png</file>
<file>images/download.png</file>
</qresource>
</RCC>

View File

@@ -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,

View File

@@ -53,10 +53,6 @@
<property name="toolTip">
<string>Download JDK</string>
</property>
<property name="icon">
<iconset resource="android.qrc">
<normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0">
@@ -112,10 +108,6 @@
<property name="toolTip">
<string>Download Android NDK</string>
</property>
<property name="icon">
<iconset resource="android.qrc">
<normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset>
</property>
</widget>
</item>
<item row="1" column="0">
@@ -155,10 +147,6 @@
<property name="toolTip">
<string>Download Android SDK</string>
</property>
<property name="icon">
<iconset resource="android.qrc">
<normaloff>:/android/images/download.png</normaloff>:/android/images/download.png</iconset>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B