feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: parse image file names from manifest

Browse Source 
Also scales splash images without stretching and reflects them
to other orientations.

Task-number: QTCREATORBUG-24149
Task-number: QTCREATORBUG-24150
Change-Id: Ie23a8ba5f75132971673d3232807e941dfd50f97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Ville Voutilainen
2020-06-09 16:25:13 +03:00
parent 03f6517a6a
commit 64896a9436
7 changed files with 411 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/android/androidmanifesteditoriconcontainerwidget.cpp
View File

@@ -35,9 +35,10 @@ namespace Android {
namespace Internal {
namespace {
const QString highDpiIconPath = "/res/drawable-hdpi/icon.png";
const QString mediumDpiIconPath = "/res/drawable-mdpi/icon.png";
const QString lowDpiIconPath = "/res/drawable-ldpi/icon.png";
const QString highDpiIconPath = QLatin1String("/res/drawable-hdpi/");
const QString mediumDpiIconPath = QLatin1String("/res/drawable-mdpi/");
const QString lowDpiIconPath = QLatin1String("/res/drawable-ldpi/");
const QString imageSuffix = QLatin1String(".png");
const QSize lowDpiIconSize{32, 32};
const QSize mediumDpiIconSize{48, 48};
const QSize highDpiIconSize{72, 72};
@@ -63,11 +64,15 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
iconLayout->addWidget(line);
iconLayout->addStretch(1);
QString iconFileName = m_iconFileName + imageSuffix;
auto lIconButton = new AndroidManifestEditorIconWidget(this,
lowDpiIconSize,
lowDpiIconSize,
tr("Low DPI icon"), tr("Select low DPI icon"),
textEditorWidget, lowDpiIconPath);
textEditorWidget,
lowDpiIconPath,
iconFileName);
iconLayout->addWidget(lIconButton);
m_iconButtons.push_back(lIconButton);
iconLayout->addStretch(1);
@@ -76,7 +81,9 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
mediumDpiIconSize,
mediumDpiIconSize,
tr("Medium DPI icon"), tr("Select medium DPI icon"),
textEditorWidget, mediumDpiIconPath);
textEditorWidget,
mediumDpiIconPath,
iconFileName);
iconLayout->addWidget(mIconButton);
m_iconButtons.push_back(mIconButton);
iconLayout->addStretch(1);
@@ -85,7 +92,9 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
highDpiIconSize,
highDpiIconSize,
tr("High DPI icon"), tr("Select high DPI icon"),
textEditorWidget, highDpiIconPath);
textEditorWidget,
highDpiIconPath,
iconFileName);
iconLayout->addWidget(hIconButton);
m_iconButtons.push_back(hIconButton);
iconLayout->addStretch(6);
@@ -96,13 +105,25 @@ AndroidManifestEditorIconContainerWidget::AndroidManifestEditorIconContainerWidg
}
}
void AndroidManifestEditorIconContainerWidget::loadIcons()
void AndroidManifestEditorIconContainerWidget::setIconFileName(const QString &name)
{
for (auto &&iconButton : m_iconButtons)
iconButton->loadIcon();
m_iconFileName = name;
}
bool AndroidManifestEditorIconContainerWidget::hasIcons()
QString AndroidManifestEditorIconContainerWidget::iconFileName() const
{
return m_iconFileName;
}
void AndroidManifestEditorIconContainerWidget::loadIcons()
{
for (auto &&iconButton : m_iconButtons) {
iconButton->setTargetIconFileName(m_iconFileName + imageSuffix);
iconButton->loadIcon();
}
}
bool AndroidManifestEditorIconContainerWidget::hasIcons() const
{
for (auto &&iconButton : m_iconButtons) {
if (iconButton->hasIcon())