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

Android: rephrase few UI elements in deployment settings

Browse Source 
Change-Id: Ief4cf44eda3342f35f828a4a1388ec45fafe8b4a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-12 14:25:14 +03:00
parent 7acb0d223c
commit 0bf5ca1b3e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -101,12 +101,19 @@ public:
setSummaryText(displayName()); setSummaryText(displayName());
auto uninstallPreviousPackage = new QCheckBox(this); auto uninstallPreviousPackage = new QCheckBox(this);
uninstallPreviousPackage->setText(AndroidDeployQtStep::tr("Uninstall previous package")); uninstallPreviousPackage->setText(AndroidDeployQtStep::tr("Uninstall the existing app first"));
uninstallPreviousPackage->setChecked(step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep); uninstallPreviousPackage->setChecked(step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
uninstallPreviousPackage->setEnabled(step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall); uninstallPreviousPackage->setEnabled(step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
connect(uninstallPreviousPackage, &QAbstractButton::toggled,
step, &AndroidDeployQtStep::setUninstallPreviousPackage);
auto resetDefaultDevices = new QPushButton(this); auto resetDefaultDevices = new QPushButton(this);
resetDefaultDevices->setText(AndroidDeployQtStep::tr("Reset Default Devices")); resetDefaultDevices->setText(AndroidDeployQtStep::tr("Reset Default Deployment Devices"));
connect(resetDefaultDevices, &QAbstractButton::clicked, this, [step] {
AndroidConfigurations::clearDefaultDevices(step->project());
});
auto installCustomApkButton = new QPushButton(this); auto installCustomApkButton = new QPushButton(this);
installCustomApkButton->setText(AndroidDeployQtStep::tr("Install an APK File")); installCustomApkButton->setText(AndroidDeployQtStep::tr("Install an APK File"));
@@ -121,13 +128,6 @@ public:
AndroidManager::installQASIPackage(step->target(), packagePath); AndroidManager::installQASIPackage(step->target(), packagePath);
}); });
connect(resetDefaultDevices, &QAbstractButton::clicked, this, [step] {
AndroidConfigurations::clearDefaultDevices(step->project());
});
connect(uninstallPreviousPackage, &QAbstractButton::toggled,
step, &AndroidDeployQtStep::setUninstallPreviousPackage);
auto layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);
layout->addWidget(uninstallPreviousPackage); layout->addWidget(uninstallPreviousPackage);
layout->addWidget(resetDefaultDevices); layout->addWidget(resetDefaultDevices);