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

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 B

View File

@@ -225,6 +225,10 @@
<file>images/dir.png</file> <file>images/dir.png</file>
<file>images/online.png</file> <file>images/online.png</file>
<file>images/online@2x.png</file> <file>images/online@2x.png</file>
<file>images/download_arrow.png</file>
<file>images/download_arrow@2x.png</file>
<file>images/download_base.png</file>
<file>images/download_base@2x.png</file>
<file alias="mimetypes/freedesktop.org.xml" compression-algorithm="best">../3rdparty/xdg/freedesktop.org.xml</file> <file alias="mimetypes/freedesktop.org.xml" compression-algorithm="best">../3rdparty/xdg/freedesktop.org.xml</file>
</qresource> </qresource>
<qresource prefix="/codemodel"> <qresource prefix="/codemodel">

View File

@@ -196,6 +196,9 @@ const Icon TOGGLE_PROGRESSDETAILS_TOOLBAR({
{QLatin1String(":/utils/images/toggleprogressdetails.png"), Theme::IconsBaseColor}}); {QLatin1String(":/utils/images/toggleprogressdetails.png"), Theme::IconsBaseColor}});
const Icon ONLINE_TOOLBAR({ const Icon ONLINE_TOOLBAR({
{QLatin1String(":/utils/images/online.png"), Theme::IconsBaseColor}}); {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({ const Icon WARNING({
{QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal}, {QLatin1String(":/utils/images/warningfill.png"), Theme::BackgroundColorNormal},

View File

@@ -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 SORT_ALPHABETICALLY_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon TOGGLE_PROGRESSDETAILS_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon TOGGLE_PROGRESSDETAILS_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon ONLINE_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;
QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon INFO_TOOLBAR;

View File

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

View File

@@ -288,6 +288,11 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
m_ui->downloadOpenJDKToolButton->setVisible(!Utils::HostOsInfo::isLinuxHost()); 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, connect(&m_virtualDevicesWatcher, &QFutureWatcherBase::finished,
this, &AndroidSettingsWidget::updateAvds); this, &AndroidSettingsWidget::updateAvds);
connect(&m_futureWatcher, &QFutureWatcherBase::finished, connect(&m_futureWatcher, &QFutureWatcherBase::finished,

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

View File

@@ -3760,6 +3760,42 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" /> sodipodi:nodetypes="cccccc" />
</g> </g>
<g
id="src/libs/utils/images/download_arrow">
<use
style="display:inline"
transform="translate(1932,132)"
height="100%"
width="100%"
id="use2519"
xlink:href="#backgroundRect"
y="0"
x="0" />
<path
id="use2530"
style="fill:#000000"
d="m 1925,578 h -2 v -8 h 2 z m -1,-0.5 4,-4 v 2 l -4,4 -4,-4 v -2 z"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccc" />
</g>
<g
id="src/libs/utils/images/download_base">
<use
x="0"
y="0"
xlink:href="#backgroundRect"
id="use2547"
width="100%"
height="100%"
transform="translate(1948,132)"
style="display:inline" />
<path
style="fill:none;stroke:#000000"
d="m 1934.5,579 v 2.5 h 11 V 579"
id="path2553"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
</g>
</g> </g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"

Before

Width:  |  Height:  |  Size: 380 KiB

After

Width:  |  Height:  |  Size: 381 KiB