Browse Source

Keep original AAPT1/AAPT2 setting label

Alexander Gorishnyak 7 months ago
parent
commit
e2c0e4b1ef
2 changed files with 6 additions and 6 deletions
  1. 5 5
      src/windows/optionsdialog.cpp
  2. 1 1
      src/windows/optionsdialog.h

+ 5 - 5
src/windows/optionsdialog.cpp

@@ -105,7 +105,7 @@ void OptionsDialog::load()
     fileboxApktool->setCurrentPath(app->settings->getApktoolPath());
     fileboxOutput->setCurrentPath(app->settings->getOutputDirectory());
     fileboxFrameworks->setCurrentPath(app->settings->getFrameworksDirectory());
-    checkboxAapt1->setChecked(app->settings->getUseAapt1());
+    checkboxAapt2->setChecked(!app->settings->getUseAapt1());
     checkboxDebuggable->setChecked(app->settings->getMakeDebuggable());
     checkboxSources->setChecked(app->settings->getDecompileSources());
     checkboxOnlyMainClasses->setChecked(app->settings->getDecompileOnlyMainClasses());
@@ -162,7 +162,7 @@ void OptionsDialog::save()
     app->settings->setApktoolPath(fileboxApktool->getCurrentPath());
     app->settings->setOutputDirectory(fileboxOutput->getCurrentPath());
     app->settings->setFrameworksDirectory(fileboxFrameworks->getCurrentPath());
-    app->settings->setUseAapt1(checkboxAapt1->isChecked());
+    app->settings->setUseAapt1(!checkboxAapt2->isChecked());
     app->settings->setMakeDebuggable(checkboxDebuggable->isChecked());
     app->settings->setDecompileSources(checkboxSources->isChecked());
     app->settings->setDecompileOnlyMainClasses(checkboxOnlyMainClasses->isChecked());
@@ -336,11 +336,11 @@ void OptionsDialog::initialize()
     layoutUnpacking->addWidget(checkboxBrokenResources);
 
     auto groupPacking = new QGroupBox(tr("Packing"), this);
-    //: "AAPT1" is the name of the tool, don't translate it.
-    checkboxAapt1 = new QCheckBox(tr("Use AAPT1"), this);
+    //: "AAPT2" is the name of the tool, don't translate it.
+    checkboxAapt2 = new QCheckBox(tr("Use AAPT2"), this);
     checkboxDebuggable = new QCheckBox(tr("Pack for debugging"), this);
     auto layoutPacking = new QVBoxLayout(groupPacking);
-    layoutPacking->addWidget(checkboxAapt1);
+    layoutPacking->addWidget(checkboxAapt2);
     layoutPacking->addWidget(checkboxDebuggable);
 
     pageApktool->addLayout(formApktool, 0, 0, 1, 2);

+ 1 - 1
src/windows/optionsdialog.h

@@ -63,7 +63,7 @@ private:
     FileBox *fileboxApktool;
     FileBox *fileboxOutput;
     FileBox *fileboxFrameworks;
-    QCheckBox *checkboxAapt1;
+    QCheckBox *checkboxAapt2;
     QCheckBox *checkboxDebuggable;
     QCheckBox *checkboxSources;
     QCheckBox *checkboxNoDebugInfo;