From 0bf5ca1b3e6e2e3d48eb038177aba9621386f02d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 12 Jun 2020 14:25:14 +0300 Subject: [PATCH] Android: rephrase few UI elements in deployment settings Change-Id: Ief4cf44eda3342f35f828a4a1388ec45fafe8b4a Reviewed-by: Alessandro Portale Reviewed-by: hjk Reviewed-by: Leena Miettinen --- src/plugins/android/androiddeployqtstep.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index c908e121d47..d5ebc691554 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -101,12 +101,19 @@ public: setSummaryText(displayName()); 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->setEnabled(step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall); + connect(uninstallPreviousPackage, &QAbstractButton::toggled, + step, &AndroidDeployQtStep::setUninstallPreviousPackage); + 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); installCustomApkButton->setText(AndroidDeployQtStep::tr("Install an APK File")); @@ -121,13 +128,6 @@ public: 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); layout->addWidget(uninstallPreviousPackage); layout->addWidget(resetDefaultDevices);