aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidmanifesteditoriconwidget.h
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2020-06-09 16:25:13 +0300
committerVille Voutilainen <ville.voutilainen@qt.io>2020-06-26 08:39:56 +0000
commit64896a94368aa88dafe098f7a69e10e8a3a66317 (patch)
tree165cc4953b29d8b26cca6bebd13422ac88448e90 /src/plugins/android/androidmanifesteditoriconwidget.h
parent03f6517a6a5a07fc14377f8d7c1433c9c1683869 (diff)
Android: parse image file names from manifest
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>
Diffstat (limited to 'src/plugins/android/androidmanifesteditoriconwidget.h')
-rw-r--r--src/plugins/android/androidmanifesteditoriconwidget.h19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/plugins/android/androidmanifesteditoriconwidget.h b/src/plugins/android/androidmanifesteditoriconwidget.h
index c1049cff3e..63b23d3ca0 100644
--- a/src/plugins/android/androidmanifesteditoriconwidget.h
+++ b/src/plugins/android/androidmanifesteditoriconwidget.h
@@ -50,14 +50,21 @@ public:
const QString &title,
const QString &tooltip,
TextEditor::TextEditorWidget *textEditorWidget = nullptr,
- const QString &targetIconPath = {});
+ const QString &targetIconPath = {},
+ const QString &targetIconFileName = {});
void setIcon(const QIcon &icon);
+ void clearIcon();
void loadIcon();
void setIconFromPath(const QString &iconPath);
- bool hasIcon();
- void setScaled(bool scaled);
+ bool hasIcon() const;
+ void setScaledToOriginalAspectRatio(bool scaled);
+ void setScaledWithoutStretching(bool scaled);
+ void setTargetIconFileName(const QString &targetIconFileName);
+ void setTargetIconPath(const QString &targetIconPath);
+ QString targetIconFileName() const;
+ QString targetIconPath() const;
signals:
- void iconSelected(const QString &path);
+ void iconSelected(const QString &path, AndroidManifestEditorIconWidget* iconWidget);
void iconRemoved();
private:
@@ -73,8 +80,10 @@ private:
TextEditor::TextEditorWidget *m_textEditorWidget = nullptr;
QString m_iconPath;
QString m_targetIconPath;
+ QString m_targetIconFileName;
QString m_iconSelectionText;
- bool m_scaled = true;
+ bool m_scaledToOriginalAspectRatio = false;
+ bool m_scaledWithoutStretching = false;
};
} // namespace Internal