Merge pull request #25 from saturneric/develop

Merge version 2.0.1 beta

1 files changed, 39 insertions, 34 deletions

diff --git a/src/ui/settings/SettingsAdvanced.cpp b/src/ui/settings/SettingsAdvanced.cpp
index 30414250..b64ec8e9 100644
--- a/src/ui/settings/SettingsAdvanced.cpp
+++ b/src/ui/settings/SettingsAdvanced.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -22,46 +22,51 @@
  *
  */
 
-#include "ui/SettingsDialog.h"
+#include "SettingsAdvanced.h"
 
-AdvancedTab::AdvancedTab(QWidget *parent)
-: QWidget(parent), appPath(qApp->applicationDirPath()),
-settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini",
-         QSettings::IniFormat) {
-    /*****************************************
-     * Steganography Box
-     *****************************************/
-    auto *steganoBox = new QGroupBox(tr("Show Steganography Options"));
-    auto *steganoBoxLayout = new QHBoxLayout();
-    steganoCheckBox = new QCheckBox(tr("Show Steganographic Options."), this);
-    steganoBoxLayout->addWidget(steganoCheckBox);
-    steganoBox->setLayout(steganoBoxLayout);
+namespace GpgFrontend::UI {
 
-    auto *pubkeyExchangeBox = new QGroupBox(tr("Pubkey Exchange"));
-    auto *pubkeyExchangeBoxLayout = new QHBoxLayout();
-    autoPubkeyExchangeCheckBox = new QCheckBox(tr("Auto Pubkey Exchange"), this);
-    pubkeyExchangeBoxLayout->addWidget(autoPubkeyExchangeCheckBox);
-    pubkeyExchangeBox->setLayout(pubkeyExchangeBoxLayout);
+AdvancedTab::AdvancedTab(QWidget* parent)
+    : QWidget(parent),
+      appPath(qApp->applicationDirPath()),
+      settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini",
+               QSettings::IniFormat) {
+  /*****************************************
+   * Steganography Box
+   *****************************************/
+  auto* steganoBox = new QGroupBox(_("Show Steganography Options"));
+  auto* steganoBoxLayout = new QHBoxLayout();
+  steganoCheckBox = new QCheckBox(_("Show Steganographic Options."), this);
+  steganoBoxLayout->addWidget(steganoCheckBox);
+  steganoBox->setLayout(steganoBoxLayout);
 
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(steganoBox);
-    mainLayout->addWidget(pubkeyExchangeBox);
-    setSettings();
-    mainLayout->addStretch(1);
-    setLayout(mainLayout);
+  auto* pubkeyExchangeBox = new QGroupBox(_("Pubkey Exchange"));
+  auto* pubkeyExchangeBoxLayout = new QHBoxLayout();
+  autoPubkeyExchangeCheckBox = new QCheckBox(_("Auto Pubkey Exchange"), this);
+  pubkeyExchangeBoxLayout->addWidget(autoPubkeyExchangeCheckBox);
+  pubkeyExchangeBox->setLayout(pubkeyExchangeBoxLayout);
+
+  auto* mainLayout = new QVBoxLayout;
+  mainLayout->addWidget(steganoBox);
+  mainLayout->addWidget(pubkeyExchangeBox);
+  setSettings();
+  mainLayout->addStretch(1);
+  setLayout(mainLayout);
 }
 
 void AdvancedTab::setSettings() {
-    if (settings.value("advanced/steganography").toBool()) {
-        steganoCheckBox->setCheckState(Qt::Checked);
-    }
-    if (settings.value("advanced/autoPubkeyExchange").toBool()) {
-        autoPubkeyExchangeCheckBox->setCheckState(Qt::Checked);
-    }
+  if (settings.value("advanced/steganography").toBool()) {
+    steganoCheckBox->setCheckState(Qt::Checked);
+  }
+  if (settings.value("advanced/autoPubkeyExchange").toBool()) {
+    autoPubkeyExchangeCheckBox->setCheckState(Qt::Checked);
+  }
 }
 
 void AdvancedTab::applySettings() {
-    settings.setValue("advanced/steganography", steganoCheckBox->isChecked());
-    settings.setValue("advanced/autoPubkeyExchange", autoPubkeyExchangeCheckBox->isChecked());
+  settings.setValue("advanced/steganography", steganoCheckBox->isChecked());
+  settings.setValue("advanced/autoPubkeyExchange",
+                    autoPubkeyExchangeCheckBox->isChecked());
 }
 
+}  // namespace GpgFrontend::UI