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

Android: Hide AndroidManifestEditorWidget definition in .cpp

Browse Source 
Smaller visible interface.

Change-Id: I3baae92bbc13f6ad4231b21b074d030877a701a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2024-07-29 17:42:15 +02:00
parent 23ff4e838a
commit 0811754fb9
2 changed files with 120 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/plugins/android/androidmanifesteditor.cpp
View File

@@ -65,6 +65,8 @@ using namespace Utils;
namespace Android::Internal { namespace Android::Internal {
class AndroidManifestEditor;
const char infoBarId[] = "Android.AndroidManifestEditor.InfoBar"; const char infoBarId[] = "Android.AndroidManifestEditor.InfoBar";
static bool checkPackageName(const QString &packageName) static bool checkPackageName(const QString &packageName)
@@ -103,6 +105,119 @@ private:
QStringList m_permissions; QStringList m_permissions;
}; };
// AndroidManifestEditorWidget
class AndroidManifestEditorWidget : public QStackedWidget
{
Q_OBJECT
public:
enum EditorPage {
General = 0,
Source = 1
};
explicit AndroidManifestEditorWidget();
bool isModified() const;
EditorPage activePage() const;
bool setActivePage(EditorPage page);
void preSave();
void postSave();
Core::IEditor *editor() const;
TextEditor::TextEditorWidget *textEditorWidget() const;
void setDirty(bool dirty = true);
signals:
void guiChanged();
protected:
void focusInEvent(QFocusEvent *event) override;
private:
void defaultPermissionOrFeatureCheckBoxClicked();
void addPermission();
void removePermission();
void updateAddRemovePermissionButtons();
void setPackageName();
void updateInfoBar();
void updateSdkVersions();
void startParseCheck();
void delayedParseCheck();
void initializePage();
bool syncToWidgets();
void syncToWidgets(const QDomDocument &doc);
void syncToEditor();
void updateAfterFileLoad();
bool checkDocument(const QDomDocument &doc, QString *errorMessage,
int *errorLine, int *errorColumn);
void updateInfoBar(const QString &errorMessage, int line, int column);
void hideInfoBar();
void parseManifest(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseApplication(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseSplashScreen(QXmlStreamWriter &writer);
void parseActivity(QXmlStreamReader &reader, QXmlStreamWriter &writer);
bool parseMetaData(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseUsesSdk(QXmlStreamReader &reader, QXmlStreamWriter &writer);
QString parseUsesPermission(QXmlStreamReader &reader,
QXmlStreamWriter &writer,
const QSet<QString> &permissions);
QString parseComment(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer);
QGroupBox *createPermissionsGroupBox(QWidget *parent);
QGroupBox *createPackageFormLayout(QWidget *parent);
QGroupBox *createApplicationGroupBox(QWidget *parent);
QGroupBox *createAdvancedGroupBox(QWidget *parent);
bool m_dirty = false; // indicates that we need to call syncToEditor()
bool m_stayClean = false;
int m_errorLine;
int m_errorColumn;
QString m_currentsplashImageName[3];
bool m_currentsplashSticky = false;
QLineEdit *m_packageNameLineEdit;
QLabel *m_packageNameWarningIcon;
QLabel *m_packageNameWarning;
QLineEdit *m_versionCodeLineEdit;
QLineEdit *m_versionNameLinedit;
QComboBox *m_androidMinSdkVersion;
QComboBox *m_androidTargetSdkVersion;
// Application
QLineEdit *m_appNameLineEdit;
QLineEdit *m_activityNameLineEdit;
QComboBox *m_styleExtractMethod;
QComboBox *m_screenOrientation;
AndroidManifestEditorIconContainerWidget *m_iconButtons;
SplashScreenContainerWidget *m_splashButtons;
// Permissions
QCheckBox *m_defaultPermissonsCheckBox;
QCheckBox *m_defaultFeaturesCheckBox;
PermissionsModel *m_permissionsModel;
QListView *m_permissionsListView;
QPushButton *m_addPermissionButton;
QPushButton *m_removePermissionButton;
QComboBox *m_permissionsComboBox;
QTimer m_timerParseCheck;
TextEditor::TextEditorWidget *m_textEditorWidget;
AndroidManifestEditor *m_editor;
QString m_androidNdkPlatform;
QTabWidget *m_advanvedTabWidget = nullptr;
};
// AndroidManifestEditor
class AndroidManifestEditor : public Core::IEditor class AndroidManifestEditor : public Core::IEditor
{ {
public: public:
@@ -746,8 +861,8 @@ void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int
void AndroidManifestEditorWidget::hideInfoBar() void AndroidManifestEditorWidget::hideInfoBar()
{ {
InfoBar *infoBar = m_textEditorWidget->textDocument()->infoBar(); InfoBar *infoBar = m_textEditorWidget->textDocument()->infoBar();
infoBar->removeInfo(infoBarId); infoBar->removeInfo(infoBarId);
m_timerParseCheck.stop(); m_timerParseCheck.stop();
} }
void setApiLevel(QComboBox *box, const QDomElement &element, const QString &attribute) void setApiLevel(QComboBox *box, const QDomElement &element, const QString &attribute)
@@ -1571,3 +1686,6 @@ void setupAndroidManifestEditor()
} }
} // Android::Internal } // Android::Internal
#include "androidmanifesteditor.moc"

135
src/plugins/android/androidmanifesteditor.h
View File

@@ -3,143 +3,8 @@
#pragma once #pragma once
#include <texteditor/texteditor.h>
#include <QStackedWidget>
#include <QTimer>
QT_BEGIN_NAMESPACE
class QCheckBox;
class QDomDocument;
class QComboBox;
class QGroupBox;
class QPushButton;
class QLabel;
class QLineEdit;
class QListView;
class QTabWidget;
class QXmlStreamReader;
class QXmlStreamWriter;
QT_END_NAMESPACE
namespace Core { class IEditor; }
namespace Android::Internal { namespace Android::Internal {
class AndroidManifestEditor;
class AndroidManifestEditorIconContainerWidget;
class PermissionsModel;
class SplashScreenContainerWidget;
class AndroidManifestEditorWidget : public QStackedWidget
{
Q_OBJECT
public:
enum EditorPage {
General = 0,
Source = 1
};
explicit AndroidManifestEditorWidget();
bool isModified() const;
EditorPage activePage() const;
bool setActivePage(EditorPage page);
void preSave();
void postSave();
Core::IEditor *editor() const;
TextEditor::TextEditorWidget *textEditorWidget() const;
void setDirty(bool dirty = true);
signals:
void guiChanged();
protected:
void focusInEvent(QFocusEvent *event) override;
private:
void defaultPermissionOrFeatureCheckBoxClicked();
void addPermission();
void removePermission();
void updateAddRemovePermissionButtons();
void setPackageName();
void updateInfoBar();
void updateSdkVersions();
void startParseCheck();
void delayedParseCheck();
void initializePage();
bool syncToWidgets();
void syncToWidgets(const QDomDocument &doc);
void syncToEditor();
void updateAfterFileLoad();
bool checkDocument(const QDomDocument &doc, QString *errorMessage,
int *errorLine, int *errorColumn);
void updateInfoBar(const QString &errorMessage, int line, int column);
void hideInfoBar();
void parseManifest(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseApplication(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseSplashScreen(QXmlStreamWriter &writer);
void parseActivity(QXmlStreamReader &reader, QXmlStreamWriter &writer);
bool parseMetaData(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseUsesSdk(QXmlStreamReader &reader, QXmlStreamWriter &writer);
QString parseUsesPermission(QXmlStreamReader &reader,
QXmlStreamWriter &writer,
const QSet<QString> &permissions);
QString parseComment(QXmlStreamReader &reader, QXmlStreamWriter &writer);
void parseUnknownElement(QXmlStreamReader &reader, QXmlStreamWriter &writer);
QGroupBox *createPermissionsGroupBox(QWidget *parent);
QGroupBox *createPackageFormLayout(QWidget *parent);
QGroupBox *createApplicationGroupBox(QWidget *parent);
QGroupBox *createAdvancedGroupBox(QWidget *parent);
bool m_dirty = false; // indicates that we need to call syncToEditor()
bool m_stayClean = false;
int m_errorLine;
int m_errorColumn;
QString m_currentsplashImageName[3];
bool m_currentsplashSticky = false;
QLineEdit *m_packageNameLineEdit;
QLabel *m_packageNameWarningIcon;
QLabel *m_packageNameWarning;
QLineEdit *m_versionCodeLineEdit;
QLineEdit *m_versionNameLinedit;
QComboBox *m_androidMinSdkVersion;
QComboBox *m_androidTargetSdkVersion;
// Application
QLineEdit *m_appNameLineEdit;
QLineEdit *m_activityNameLineEdit;
QComboBox *m_styleExtractMethod;
QComboBox *m_screenOrientation;
AndroidManifestEditorIconContainerWidget *m_iconButtons;
SplashScreenContainerWidget *m_splashButtons;
// Permissions
QCheckBox *m_defaultPermissonsCheckBox;
QCheckBox *m_defaultFeaturesCheckBox;
PermissionsModel *m_permissionsModel;
QListView *m_permissionsListView;
QPushButton *m_addPermissionButton;
QPushButton *m_removePermissionButton;
QComboBox *m_permissionsComboBox;
QTimer m_timerParseCheck;
TextEditor::TextEditorWidget *m_textEditorWidget;
AndroidManifestEditor *m_editor;
QString m_androidNdkPlatform;
QTabWidget *m_advanvedTabWidget = nullptr;
};
void setupAndroidManifestEditor(); void setupAndroidManifestEditor();
} // Android::Internal } // Android::Internal