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

Android: make icon removal actually work

Browse Source 
Also adjusts icon preview sizes and adds a master icon from which
the other icons are generated.

Task-number: QTCREATORBUG-23283
Change-Id: I21c3d11f9b5d4d815dc6d9ad7c2363b67767d03a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Ville Voutilainen
2020-02-19 12:02:44 +02:00
parent bc62269304
commit 82dab12acd
2 changed files with 224 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/android/androidmanifesteditorwidget.h
View File

@@ -116,6 +116,8 @@ protected:
void focusInEvent(QFocusEvent *event) override;
private:
void setMasterIcon();
void clearMasterIcon();
void setLDPIIcon();
void setMDPIIcon();
void setHDPIIcon();
@@ -124,8 +126,11 @@ private:
void clearHDPIIcon();
void createDPIButton(QHBoxLayout *layout,
QWidget *parent,
QToolButton *&button, QToolButton *&clearButton,
const QString &title, const QString &tooltip);
QToolButton *&button, const QSize &buttonSize,
const QString &title, const QString &tooltip,
QToolButton **clearButton = nullptr,
QLabel **scaleWarningLabel = nullptr
);
void defaultPermissionOrFeatureCheckBoxClicked();
void addPermission();
void removePermission();
@@ -146,7 +151,11 @@ private:
enum IconDPI { LowDPI, MediumDPI, HighDPI };
QIcon icon(const QString &baseDir, IconDPI dpi);
QString iconPath(IconDPI dpi);
QSize iconSize(IconDPI dpi);
void updateIconPath(const QString &newPath, IconDPI dpi);
void copyIcon(IconDPI dpi, const QString &baseDir, const QString &filePath);
void removeIcon(IconDPI dpi, const QString &baseDir);
void toggleIconScaleWarning(IconDPI dpi, bool visible);
void updateInfoBar(const QString &errorMessage, int line, int column);
void hideInfoBar();
@@ -180,13 +189,17 @@ private:
QLineEdit *m_appNameLineEdit;
QLineEdit *m_activityNameLineEdit;
QComboBox *m_targetLineEdit;
QToolButton *m_masterIconButton;
QToolButton *m_lIconButton;
QToolButton *m_lIconClearButton;
QLabel *m_lIconScaleWarningLabel;
QToolButton *m_mIconButton;
QToolButton *m_mIconClearButton;
QLabel *m_mIconScaleWarningLabel;
QToolButton *m_hIconButton;
QToolButton *m_hIconClearButton;
QString m_lIconPath; // only set if the user changed the icon
QLabel *m_hIconScaleWarningLabel;
QString m_lIconPath;
QString m_mIconPath;
QString m_hIconPath;