diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro index 3e8d577740b..f0a952c622a 100644 --- a/src/plugins/android/android.pro +++ b/src/plugins/android/android.pro @@ -101,7 +101,6 @@ FORMS += \ addnewavddialog.ui \ androidcreatekeystorecertificate.ui \ androiddevicedialog.ui \ - androidbuildapkwidget.ui \ adbcommandswidget.ui \ androidsdkmanagerwidget.ui diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index bcdb8a2e619..1c6ed28a414 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -36,7 +36,6 @@ Project { "androidbuildapkstep.h", "androidbuildapkwidget.cpp", "androidbuildapkwidget.h", - "androidbuildapkwidget.ui", "androiddeployqtstep.cpp", "androiddeployqtstep.h", "androiddebugsupport.cpp", diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp index d0d44d70bfc..516685e14fa 100644 --- a/src/plugins/android/androidbuildapkwidget.cpp +++ b/src/plugins/android/androidbuildapkwidget.cpp @@ -24,14 +24,15 @@ ** ****************************************************************************/ -#include "androidbuildapkstep.h" #include "androidbuildapkwidget.h" + +#include "androidbuildapkstep.h" #include "androidconfigurations.h" +#include "androidextralibrarylistmodel.h" #include "androidcreatekeystorecertificate.h" #include "androidmanager.h" #include "androidsdkmanager.h" #include "createandroidmanifestwizard.h" -#include "ui_androidbuildapkwidget.h" #include #include @@ -45,8 +46,10 @@ #include #include -#include +#include +#include #include +#include #include #include #include @@ -56,100 +59,275 @@ #include using namespace ProjectExplorer; +using namespace Utils; namespace Android { namespace Internal { -AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step) - : ProjectExplorer::BuildStepConfigWidget(step), - m_ui(new Ui::AndroidBuildApkWidget), - m_step(step) +AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) + : BuildStepConfigWidget(step), m_step(step) { - m_ui->setupUi(this); setDisplayName("" + tr("Build Android APK") + ""); setSummaryText(displayName()); - // Target sdk combobox + auto vbox = new QVBoxLayout(this); + vbox->addWidget(createSignPackageGroup()); + vbox->addWidget(createApplicationGroup()); + vbox->addWidget(createAdvancedGroup()); + vbox->addWidget(createCreateTemplatesGroup()); + vbox->addWidget(createAdditionalLibrariesGroup()); + + connect(m_step->buildConfiguration(), &BuildConfiguration::buildTypeChanged, + this, &AndroidBuildApkWidget::updateSigningWarning); + + connect(m_signPackageCheckBox, &QAbstractButton::clicked, + m_addDebuggerCheckBox, &QWidget::setEnabled); + + signPackageCheckBoxToggled(m_step->signPackage()); + updateSigningWarning(); +} + +QWidget *AndroidBuildApkWidget::createApplicationGroup() +{ const int minApiSupported = AndroidManager::apiLevelRange().first; QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::sdkManager()-> filteredSdkPlatforms(minApiSupported)); targets.removeDuplicates(); - m_ui->targetSDKComboBox->addItems(targets); - m_ui->targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::buildTargetSDK(step->target()))); - // Ministro - if (m_step->useMinistro()) - m_ui->ministroOption->setChecked(true); + auto group = new QGroupBox(tr("Application"), this); - // signing - m_ui->signPackageCheckBox->setChecked(m_step->signPackage()); - m_ui->KeystoreLocationPathChooser->setExpectedKind(Utils::PathChooser::File); - m_ui->KeystoreLocationPathChooser->lineEdit()->setReadOnly(true); - m_ui->KeystoreLocationPathChooser->setPath(m_step->keystorePath().toUserOutput()); - m_ui->KeystoreLocationPathChooser->setInitialBrowsePathBackup(QDir::homePath()); - m_ui->KeystoreLocationPathChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)")); - m_ui->KeystoreLocationPathChooser->setPromptDialogTitle(tr("Select Keystore File")); - m_ui->signingDebugWarningIcon->setPixmap(Utils::Icons::WARNING.pixmap()); - m_ui->signingDebugWarningIcon->hide(); - m_ui->signingDebugWarningLabel->hide(); - signPackageCheckBoxToggled(m_step->signPackage()); + auto targetSDKComboBox = new QComboBox(group); + targetSDKComboBox->addItems(targets); + targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::buildTargetSDK(step()->target()))); - m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput()); - m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation()); - m_ui->addDebuggerCheckBox->setChecked(m_step->addDebugger()); - - // target sdk const auto cbActivated = QOverload::of(&QComboBox::activated); - const auto cbCurrentIndexChanged = QOverload::of(&QComboBox::currentIndexChanged); - connect(m_ui->targetSDKComboBox, cbActivated, this, [this](int idx) { - const QString sdk = m_ui->targetSDKComboBox->itemText(idx); - m_step->setBuildTargetSdk(sdk); + connect(targetSDKComboBox, cbActivated, this, [this, targetSDKComboBox](int idx) { + const QString sdk = targetSDKComboBox->itemText(idx); + m_step->setBuildTargetSdk(sdk); + }); + + auto hbox = new QHBoxLayout(group); + hbox->addWidget(new QLabel(tr("Android build SDK:"), group)); + hbox->addWidget(targetSDKComboBox); + + return group; +} + +QWidget *AndroidBuildApkWidget::createSignPackageGroup() +{ + QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + + auto group = new QGroupBox(tr("Sign package"), this); + + auto keystoreLocationLabel = new QLabel(tr("Keystore:"), group); + keystoreLocationLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + + auto keystoreLocationChooser = new PathChooser(group); + keystoreLocationChooser->setExpectedKind(PathChooser::File); + keystoreLocationChooser->lineEdit()->setReadOnly(true); + keystoreLocationChooser->setPath(m_step->keystorePath().toUserOutput()); + keystoreLocationChooser->setInitialBrowsePathBackup(QDir::homePath()); + keystoreLocationChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)")); + keystoreLocationChooser->setPromptDialogTitle(tr("Select Keystore File")); + connect(keystoreLocationChooser, &PathChooser::pathChanged, this, [this](const QString &path) { + FileName file = FileName::fromString(path); + m_step->setKeystorePath(file); + m_signPackageCheckBox->setChecked(!file.isEmpty()); + if (!file.isEmpty()) + setCertificates(); }); - // deployment options - connect(m_ui->ministroOption, &QAbstractButton::clicked, - m_step, &AndroidBuildApkStep::setUseMinistro); + auto keystoreCreateButton = new QPushButton(tr("Create..."), group); + connect(keystoreCreateButton, &QAbstractButton::clicked, this, [this, keystoreLocationChooser] { + AndroidCreateKeystoreCertificate d; + if (d.exec() != QDialog::Accepted) + return; + keystoreLocationChooser->setPath(d.keystoreFilePath().toUserOutput()); + m_step->setKeystorePath(d.keystoreFilePath()); + m_step->setKeystorePassword(d.keystorePassword()); + m_step->setCertificateAlias(d.certificateAlias()); + m_step->setCertificatePassword(d.certificatePassword()); + setCertificates(); + }); - connect(m_ui->openPackageLocationCheckBox, &QAbstractButton::toggled, - this, &AndroidBuildApkInnerWidget::openPackageLocationCheckBoxToggled); - connect(m_ui->verboseOutputCheckBox, &QAbstractButton::toggled, - this, &AndroidBuildApkInnerWidget::verboseOutputCheckBoxToggled); - connect(m_ui->addDebuggerCheckBox, &QAbstractButton::toggled, - m_step, &AndroidBuildApkStep::setAddDebugger); + m_signPackageCheckBox = new QCheckBox(tr("Sign package"), group); + m_signPackageCheckBox->setChecked(m_step->signPackage()); - //signing - connect(m_ui->signPackageCheckBox, &QAbstractButton::toggled, - this, &AndroidBuildApkInnerWidget::signPackageCheckBoxToggled); - connect(m_ui->KeystoreCreatePushButton, &QAbstractButton::clicked, - this, &AndroidBuildApkInnerWidget::createKeyStore); - connect(m_ui->KeystoreLocationPathChooser, &Utils::PathChooser::pathChanged, - this, &AndroidBuildApkInnerWidget::updateKeyStorePath); + m_signingDebugWarningIcon = new QLabel(group); + m_signingDebugWarningIcon->setSizePolicy(sizePolicy); + m_signingDebugWarningIcon->setPixmap(Icons::WARNING.pixmap()); + m_signingDebugWarningIcon->hide(); + + m_signingDebugWarningLabel = new QLabel(tr("Signing a debug package"), group); + m_signingDebugWarningLabel->setSizePolicy(sizePolicy); + m_signingDebugWarningLabel->hide(); + + auto certificateAliasLabel = new QLabel(tr("Certificate alias:"), group); + certificateAliasLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); + + m_certificatesAliasComboBox = new QComboBox(group); + m_certificatesAliasComboBox->setEnabled(false); + QSizePolicy sizePolicy2(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + m_certificatesAliasComboBox->setSizePolicy(sizePolicy2); + m_certificatesAliasComboBox->setMinimumSize(QSize(300, 0)); + + auto horizontalLayout_2 = new QHBoxLayout; + horizontalLayout_2->addWidget(keystoreLocationLabel); + horizontalLayout_2->addWidget(keystoreLocationChooser); + horizontalLayout_2->addWidget(keystoreCreateButton); + + auto horizontalLayout_3 = new QHBoxLayout; + horizontalLayout_3->addWidget(m_signingDebugWarningIcon); + horizontalLayout_3->addWidget(m_signingDebugWarningLabel); + horizontalLayout_3->addWidget(certificateAliasLabel); + horizontalLayout_3->addWidget(m_certificatesAliasComboBox); + + auto vbox = new QVBoxLayout(group); + vbox->addLayout(horizontalLayout_2); + vbox->addWidget(m_signPackageCheckBox); + vbox->addLayout(horizontalLayout_3); + + connect(m_signPackageCheckBox, &QAbstractButton::toggled, + this, &AndroidBuildApkWidget::signPackageCheckBoxToggled); auto updateAlias = [this](int idx) { - QString alias = m_ui->certificatesAliasComboBox->itemText(idx); + QString alias = m_certificatesAliasComboBox->itemText(idx); if (alias.length()) m_step->setCertificateAlias(alias); }; - connect(m_ui->certificatesAliasComboBox, cbActivated, this, updateAlias); - connect(m_ui->certificatesAliasComboBox, cbCurrentIndexChanged, this, updateAlias); + const auto cbActivated = QOverload::of(&QComboBox::activated); + const auto cbCurrentIndexChanged = QOverload::of(&QComboBox::currentIndexChanged); - connect(m_step->buildConfiguration(), &ProjectExplorer::BuildConfiguration::buildTypeChanged, - this, &AndroidBuildApkInnerWidget::updateSigningWarning); + connect(m_certificatesAliasComboBox, cbActivated, this, updateAlias); + connect(m_certificatesAliasComboBox, cbCurrentIndexChanged, this, updateAlias); - updateSigningWarning(); + return group; } -AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget() +QWidget *AndroidBuildApkWidget::createAdvancedGroup() { - delete m_ui; + auto group = new QGroupBox(tr("Advanced Actions"), this); + + auto openPackageLocationCheckBox = new QCheckBox(tr("Open package location after build"), group); + openPackageLocationCheckBox->setChecked(m_step->openPackageLocation()); + connect(openPackageLocationCheckBox, &QAbstractButton::toggled, + this, [this](bool checked) { m_step->setOpenPackageLocation(checked); }); + + m_addDebuggerCheckBox = new QCheckBox(tr("Add debug server"), group); + m_addDebuggerCheckBox->setEnabled(false); + m_addDebuggerCheckBox->setToolTip(tr("Packages debug server with " + "the APK to enable debugging. For the signed APK this option is unchecked by default.")); + m_addDebuggerCheckBox->setChecked(m_step->addDebugger()); + connect(m_addDebuggerCheckBox, &QAbstractButton::toggled, + m_step, &AndroidBuildApkStep::setAddDebugger); + + auto verboseOutputCheckBox = new QCheckBox(tr("Verbose output"), group); + verboseOutputCheckBox->setChecked(m_step->verboseOutput()); + + auto ministroOption = new QCheckBox(tr("Use Ministro service to install Qt"), group); + ministroOption->setToolTip(tr("Uses the external Ministro application to download and maintain Qt libraries.")); + ministroOption->setChecked(m_step->useMinistro()); + connect(ministroOption, &QAbstractButton::clicked, + m_step, &AndroidBuildApkStep::setUseMinistro); + + auto vbox = new QVBoxLayout(group); + vbox->addWidget(openPackageLocationCheckBox); + vbox->addWidget(verboseOutputCheckBox); + vbox->addWidget(m_addDebuggerCheckBox); + vbox->addWidget(ministroOption); + + connect(verboseOutputCheckBox, &QAbstractButton::toggled, + this, [this](bool checked) { m_step->setVerboseOutput(checked); }); + + return group; } -void AndroidBuildApkInnerWidget::signPackageCheckBoxToggled(bool checked) +QWidget *AndroidBuildApkWidget::createCreateTemplatesGroup() { - m_ui->certificatesAliasComboBox->setEnabled(checked); + auto createTemplatesGroupBox = new QGroupBox(tr("Android")); + createTemplatesGroupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + + auto createAndroidTemplatesButton = new QPushButton(tr("Create Templates")); + connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] { + CreateAndroidManifestWizard wizard(m_step->target()); + wizard.exec(); + }); + + auto horizontalLayout = new QHBoxLayout(createTemplatesGroupBox); + horizontalLayout->addWidget(createAndroidTemplatesButton); + horizontalLayout->addStretch(1); + + return createTemplatesGroupBox; +} + +QWidget *AndroidBuildApkWidget::createAdditionalLibrariesGroup() +{ + auto group = new QGroupBox(tr("Additional Libraries")); + group->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); + + auto libsModel = new AndroidExtraLibraryListModel(m_step->target(), this); + connect(libsModel, &AndroidExtraLibraryListModel::enabledChanged, + group, &QWidget::setEnabled); + + auto libsView = new QListView; + libsView->setSelectionMode(QAbstractItemView::ExtendedSelection); + libsView->setToolTip(tr("List of extra libraries to include in Android package and load on startup.")); + libsView->setModel(libsModel); + + auto addLibButton = new QToolButton; + addLibButton->setText(tr("Add...")); + addLibButton->setToolTip(tr("Select library to include in package.")); + addLibButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + addLibButton->setToolButtonStyle(Qt::ToolButtonTextOnly); + connect(addLibButton, &QAbstractButton::clicked, this, [this, libsModel] { + QStringList fileNames = QFileDialog::getOpenFileNames(this, + tr("Select additional libraries"), + QDir::homePath(), + tr("Libraries (*.so)")); + if (!fileNames.isEmpty()) + libsModel->addEntries(fileNames); + }); + + auto removeLibButton = new QToolButton; + removeLibButton->setText(tr("Remove")); + removeLibButton->setToolTip(tr("Remove currently selected library from list.")); + connect(removeLibButton, &QAbstractButton::clicked, this, [libsModel, libsView] { + QModelIndexList removeList = libsView->selectionModel()->selectedIndexes(); + libsModel->removeEntries(removeList); + }); + + auto libsButtonLayout = new QVBoxLayout; + libsButtonLayout->addWidget(addLibButton); + libsButtonLayout->addWidget(removeLibButton); + libsButtonLayout->addStretch(1); + + auto hbox = new QHBoxLayout(group); + hbox->addWidget(libsView); + hbox->addLayout(libsButtonLayout); + + QItemSelectionModel *libSelection = libsView->selectionModel(); + connect(libSelection, &QItemSelectionModel::selectionChanged, this, [libSelection, removeLibButton] { + removeLibButton->setEnabled(libSelection->hasSelection()); + }); + + Target *target = m_step->target(); + RunConfiguration *rc = target->activeRunConfiguration(); + const ProjectNode *node = rc ? target->project()->findNodeForBuildKey(rc->buildKey()) : nullptr; + group->setEnabled(node && !node->parseInProgress()); + + return group; +} + +void AndroidBuildApkWidget::signPackageCheckBoxToggled(bool checked) +{ + m_certificatesAliasComboBox->setEnabled(checked); m_step->setSignPackage(checked); - m_ui->addDebuggerCheckBox->setChecked(!checked); + m_addDebuggerCheckBox->setChecked(!checked); updateSigningWarning(); if (!checked) return; @@ -157,159 +335,21 @@ void AndroidBuildApkInnerWidget::signPackageCheckBoxToggled(bool checked) setCertificates(); } -void AndroidBuildApkInnerWidget::createKeyStore() -{ - AndroidCreateKeystoreCertificate d; - if (d.exec() != QDialog::Accepted) - return; - m_ui->KeystoreLocationPathChooser->setPath(d.keystoreFilePath().toUserOutput()); - m_step->setKeystorePath(d.keystoreFilePath()); - m_step->setKeystorePassword(d.keystorePassword()); - m_step->setCertificateAlias(d.certificateAlias()); - m_step->setCertificatePassword(d.certificatePassword()); - setCertificates(); -} - -void AndroidBuildApkInnerWidget::setCertificates() +void AndroidBuildApkWidget::setCertificates() { QAbstractItemModel *certificates = m_step->keystoreCertificates(); if (certificates) { - m_ui->signPackageCheckBox->setChecked(certificates); - m_ui->certificatesAliasComboBox->setModel(certificates); + m_signPackageCheckBox->setChecked(certificates); + m_certificatesAliasComboBox->setModel(certificates); } } -void AndroidBuildApkInnerWidget::updateKeyStorePath(const QString &path) +void AndroidBuildApkWidget::updateSigningWarning() { - Utils::FileName file = Utils::FileName::fromString(path); - m_step->setKeystorePath(file); - m_ui->signPackageCheckBox->setChecked(!file.isEmpty()); - if (!file.isEmpty()) - setCertificates(); -} - -void AndroidBuildApkInnerWidget::openPackageLocationCheckBoxToggled(bool checked) -{ - m_step->setOpenPackageLocation(checked); -} - -void AndroidBuildApkInnerWidget::verboseOutputCheckBoxToggled(bool checked) -{ - m_step->setVerboseOutput(checked); -} - -void AndroidBuildApkInnerWidget::updateSigningWarning() -{ - bool nonRelease = m_step->buildConfiguration()->buildType() - != ProjectExplorer::BuildConfiguration::Release; - if (m_step->signPackage() && nonRelease) { - m_ui->signingDebugWarningIcon->setVisible(true); - m_ui->signingDebugWarningLabel->setVisible(true); - } else { - m_ui->signingDebugWarningIcon->setVisible(false); - m_ui->signingDebugWarningLabel->setVisible(false); - } -} - - -// AndroidBuildApkWidget - -AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) : - BuildStepConfigWidget(step), - m_step(step) -{ - setDisplayName("" + tr("Build Android APK") + ""); - setSummaryText("" + tr("Build Android APK") + ""); - - m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this); - - auto base = new AndroidBuildApkInnerWidget(step); - base->layout()->setContentsMargins(0, 0, 0, 0); - - auto createTemplatesGroupBox = new QGroupBox(tr("Android")); - createTemplatesGroupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - - auto createAndroidTemplatesButton = new QPushButton(tr("Create Templates")); - - auto horizontalLayout = new QHBoxLayout(createTemplatesGroupBox); - horizontalLayout->addWidget(createAndroidTemplatesButton); - horizontalLayout->addStretch(1); - - auto additionalLibrariesGroupBox = new QGroupBox(tr("Additional Libraries")); - additionalLibrariesGroupBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); - - m_androidExtraLibsListView = new QListView; - m_androidExtraLibsListView->setSelectionMode(QAbstractItemView::ExtendedSelection); - m_androidExtraLibsListView->setToolTip(tr("List of extra libraries to include in Android package and load on startup.")); - m_androidExtraLibsListView->setModel(m_extraLibraryListModel); - - auto addAndroidExtraLibButton = new QToolButton; - addAndroidExtraLibButton->setText(tr("Add...")); - addAndroidExtraLibButton->setToolTip(tr("Select library to include in package.")); - addAndroidExtraLibButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - addAndroidExtraLibButton->setToolButtonStyle(Qt::ToolButtonTextOnly); - - m_removeAndroidExtraLibButton = new QToolButton; - m_removeAndroidExtraLibButton->setText(tr("Remove")); - m_removeAndroidExtraLibButton->setToolTip(tr("Remove currently selected library from list.")); - - auto androidExtraLibsButtonLayout = new QVBoxLayout(); - androidExtraLibsButtonLayout->addWidget(addAndroidExtraLibButton); - androidExtraLibsButtonLayout->addWidget(m_removeAndroidExtraLibButton); - androidExtraLibsButtonLayout->addStretch(1); - - auto androidExtraLibsLayout = new QHBoxLayout(additionalLibrariesGroupBox); - androidExtraLibsLayout->addWidget(m_androidExtraLibsListView); - androidExtraLibsLayout->addLayout(androidExtraLibsButtonLayout); - - auto topLayout = new QVBoxLayout(this); - topLayout->addWidget(base); - topLayout->addWidget(createTemplatesGroupBox); - topLayout->addWidget(additionalLibrariesGroupBox); - - connect(createAndroidTemplatesButton, &QAbstractButton::clicked, this, [this] { - CreateAndroidManifestWizard wizard(m_step->target()); - wizard.exec(); - }); - - connect(addAndroidExtraLibButton, &QAbstractButton::clicked, - this, &AndroidBuildApkWidget::addAndroidExtraLib); - - connect(m_removeAndroidExtraLibButton, &QAbstractButton::clicked, - this, &AndroidBuildApkWidget::removeAndroidExtraLib); - - connect(m_androidExtraLibsListView->selectionModel(), &QItemSelectionModel::selectionChanged, - this, &AndroidBuildApkWidget::checkEnableRemoveButton); - - connect(m_extraLibraryListModel, &AndroidExtraLibraryListModel::enabledChanged, - additionalLibrariesGroupBox, &QWidget::setEnabled); - - Target *target = m_step->target(); - RunConfiguration *rc = target->activeRunConfiguration(); - const ProjectNode *node = rc ? target->project()->findNodeForBuildKey(rc->buildKey()) : nullptr; - additionalLibrariesGroupBox->setEnabled(node && !node->parseInProgress()); -} - -void AndroidBuildApkWidget::addAndroidExtraLib() -{ - QStringList fileNames = QFileDialog::getOpenFileNames(this, - tr("Select additional libraries"), - QDir::homePath(), - tr("Libraries (*.so)")); - - if (!fileNames.isEmpty()) - m_extraLibraryListModel->addEntries(fileNames); -} - -void AndroidBuildApkWidget::removeAndroidExtraLib() -{ - QModelIndexList removeList = m_androidExtraLibsListView->selectionModel()->selectedIndexes(); - m_extraLibraryListModel->removeEntries(removeList); -} - -void AndroidBuildApkWidget::checkEnableRemoveButton() -{ - m_removeAndroidExtraLibButton->setEnabled(m_androidExtraLibsListView->selectionModel()->hasSelection()); + bool nonRelease = m_step->buildConfiguration()->buildType() != BuildConfiguration::Release; + bool visible = m_step->signPackage() && nonRelease; + m_signingDebugWarningIcon->setVisible(visible); + m_signingDebugWarningLabel->setVisible(visible); } } // Internal diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h index 0a51ba59853..4c35b5dcd7c 100644 --- a/src/plugins/android/androidbuildapkwidget.h +++ b/src/plugins/android/androidbuildapkwidget.h @@ -29,42 +29,18 @@ #include "android_global.h" #include "androidbuildapkstep.h" -#include "androidextralibrarylistmodel.h" #include -#include -#include - QT_BEGIN_NAMESPACE -namespace Ui { class AndroidBuildApkWidget; } +class QCheckBox; +class QComboBox; +class QLabel; QT_END_NAMESPACE namespace Android { namespace Internal { -class AndroidBuildApkInnerWidget : public ProjectExplorer::BuildStepConfigWidget -{ - Q_OBJECT - -public: - AndroidBuildApkInnerWidget(AndroidBuildApkStep *step); - ~AndroidBuildApkInnerWidget() override; - -private: - void createKeyStore(); - void updateSigningWarning(); - void openPackageLocationCheckBoxToggled(bool checked); - void verboseOutputCheckBoxToggled(bool checked); - void updateKeyStorePath(const QString &path); - void signPackageCheckBoxToggled(bool checked); - - void setCertificates(); - - Ui::AndroidBuildApkWidget *m_ui; - AndroidBuildApkStep *m_step; -}; - class AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget { Q_OBJECT @@ -72,21 +48,24 @@ class AndroidBuildApkWidget : public ProjectExplorer::BuildStepConfigWidget public: explicit AndroidBuildApkWidget(AndroidBuildApkStep *step); -signals: - void requestAndroidTemplates(); +private: + void setCertificates(); + void updateSigningWarning(); + void signPackageCheckBoxToggled(bool checked); + + QWidget *createApplicationGroup(); + QWidget *createSignPackageGroup(); + QWidget *createAdvancedGroup(); + QWidget *createCreateTemplatesGroup(); + QWidget *createAdditionalLibrariesGroup(); private: - void addAndroidExtraLib(); - void removeAndroidExtraLib(); - void checkEnableRemoveButton(); - -private: - QListView *m_androidExtraLibsListView = nullptr; - QToolButton *m_removeAndroidExtraLibButton = nullptr; - AndroidBuildApkStep *m_step = nullptr; - Android::AndroidExtraLibraryListModel *m_extraLibraryListModel = nullptr; - bool m_ignoreChange = false; + QCheckBox *m_signPackageCheckBox = nullptr; + QLabel *m_signingDebugWarningIcon = nullptr; + QLabel *m_signingDebugWarningLabel = nullptr; + QComboBox *m_certificatesAliasComboBox = nullptr; + QCheckBox *m_addDebuggerCheckBox = nullptr; }; } // namespace Internal diff --git a/src/plugins/android/androidbuildapkwidget.ui b/src/plugins/android/androidbuildapkwidget.ui deleted file mode 100644 index 98c53b64b7f..00000000000 --- a/src/plugins/android/androidbuildapkwidget.ui +++ /dev/null @@ -1,217 +0,0 @@ - - - AndroidBuildApkWidget - - - - 0 - 0 - 641 - 349 - - - - - - - - - - Sign package - - - - - - - - Keystore: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Create... - - - - - - - - - - - Sign package - - - - - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Signing a debug package - - - - - - - - 0 - 0 - - - - Certificate alias: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - false - - - - 0 - 0 - - - - - 300 - 0 - - - - - - - - - - - - - Application - - - - - - Android build SDK: - - - - - - - - - - - - - Advanced Actions - - - - - - Open package location after build - - - - - - - false - - - Packages debug server with the APK to enable debugging. For the signed APK this option is unchecked by default. - - - Add debug server - - - - - - - Verbose output - - - - - - - Uses the external Ministro application to download and maintain Qt libraries. - - - Use Ministro service to install Qt - - - - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - - - - - signPackageCheckBox - clicked(bool) - addDebuggerCheckBox - setEnabled(bool) - - - 113 - 178 - - - 510 - 452 - - - - -