1 files changed, 114 insertions, 162 deletions

diff --git a/src/ui/settings/SettingsDialog.cpp b/src/ui/settings/SettingsDialog.cpp
index 0ca188f7..fcef70c7 100644
--- a/src/ui/settings/SettingsDialog.cpp
+++ b/src/ui/settings/SettingsDialog.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,184 +22,136 @@
  *
  */
 
-#include "ui/SettingsDialog.h"
-#include "ui/WaitingDialog.h"
-
-SettingsDialog::SettingsDialog(GpgME::GpgContext *ctx, QWidget *parent)
-        : QDialog(parent) {
-    mCtx = ctx;
-    tabWidget = new QTabWidget;
-    generalTab = new GeneralTab(mCtx);
-    appearanceTab = new AppearanceTab;
-    sendMailTab = new SendMailTab;
-    keyserverTab = new KeyserverTab;
-    advancedTab = new AdvancedTab;
-    gpgPathsTab = new GpgPathsTab;
-
-    tabWidget->addTab(generalTab, tr("General"));
-    tabWidget->addTab(appearanceTab, tr("Appearance"));
-    tabWidget->addTab(sendMailTab, tr("Send Mail"));
-    tabWidget->addTab(keyserverTab, tr("Key Server"));
-    // tabWidget->addTab(gpgPathsTab, tr("Gpg paths"));
-    tabWidget->addTab(advancedTab, tr("Advanced"));
-
-    buttonBox =
-            new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(tabWidget);
-    mainLayout->stretch(0);
-    mainLayout->addWidget(buttonBox);
-    mainLayout->stretch(0);
-    setLayout(mainLayout);
-
-    setWindowTitle(tr("Settings"));
-
-    // slots for handling the restartneeded member
-    this->slotSetRestartNeeded(false);
-    connect(generalTab, SIGNAL(signalRestartNeeded(bool)), this,
-            SLOT(slotSetRestartNeeded(bool)));
-    connect(appearanceTab, SIGNAL(signalRestartNeeded(bool)), this,
-            SLOT(slotSetRestartNeeded(bool)));
-    connect(sendMailTab, SIGNAL(signalRestartNeeded(bool)), this,
-            SLOT(slotSetRestartNeeded(bool)));
-    connect(keyserverTab, SIGNAL(signalRestartNeeded(bool)), this,
-            SLOT(slotSetRestartNeeded(bool)));
-    connect(advancedTab, SIGNAL(signalRestartNeeded(bool)), this,
-            SLOT(slotSetRestartNeeded(bool)));
-
-    connect(this, SIGNAL(signalRestartNeeded(bool)), parent,
-            SLOT(slotSetRestartNeeded(bool)));
-
-    this->resize(480, 640);
-    this->show();
-}
+#include "SettingsDialog.h"
 
-bool SettingsDialog::getRestartNeeded() const { return this->restartNeeded; }
+#include "GlobalSettingStation.h"
+#include "SettingsAdvanced.h"
+#include "SettingsAppearance.h"
+#include "SettingsGeneral.h"
+#include "SettingsKeyServer.h"
 
-void SettingsDialog::slotSetRestartNeeded(bool needed) {
-    this->restartNeeded = needed;
-}
+#ifdef SMTP_SUPPORT
+#include "SettingsSendMail.h"
+#endif
 
-void SettingsDialog::slotAccept() {
-    generalTab->applySettings();
-    sendMailTab->applySettings();
-    appearanceTab->applySettings();
-    keyserverTab->applySettings();
-    advancedTab->applySettings();
-    gpgPathsTab->applySettings();
-    if (getRestartNeeded()) {
-        emit signalRestartNeeded(true);
-    }
-    close();
-}
+namespace GpgFrontend::UI {
 
-// http://www.informit.com/articles/article.aspx?p=1405555&seqNum=3
-// http://developer.qt.nokia.com/wiki/How_to_create_a_multi_language_application
-QHash<QString, QString> SettingsDialog::listLanguages() {
-    QHash<QString, QString> languages;
+SettingsDialog::SettingsDialog(QWidget* parent) : QDialog(parent) {
+  tabWidget = new QTabWidget;
+  generalTab = new GeneralTab();
+  appearanceTab = new AppearanceTab;
+#ifdef SMTP_SUPPORT
+  sendMailTab = new SendMailTab;
+#endif
+  keyserverTab = new KeyserverTab;
+#ifdef ADVANCED_SUPPORT
+  advancedTab = new AdvancedTab;
+#endif
 
-    languages.insert("", tr("System Default"));
+  tabWidget->addTab(generalTab, _("General"));
+  tabWidget->addTab(appearanceTab, _("Appearance"));
+#ifdef SMTP_SUPPORT
+  tabWidget->addTab(sendMailTab, _("Send Mail"));
+#endif
+  tabWidget->addTab(keyserverTab, _("Key Server"));
+  // tabWidget->addTab(gpgPathsTab, _("Gpg paths"));
+#ifdef ADVANCED_SUPPORT
+  tabWidget->addTab(advancedTab, _("Advanced"));
+#endif
 
-    QString appPath = qApp->applicationDirPath();
-    QDir qmDir = QDir(RESOURCE_DIR(appPath) + "/ts/");
-    QStringList fileNames = qmDir.entryList(QStringList("gpgfrontend_*.qm"));
+  buttonBox =
+      new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+
+  connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotAccept()));
+  connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+  auto* mainLayout = new QVBoxLayout;
+  mainLayout->addWidget(tabWidget);
+  mainLayout->stretch(0);
+  mainLayout->addWidget(buttonBox);
+  mainLayout->stretch(0);
+  setLayout(mainLayout);
+
+  setWindowTitle(_("Settings"));
+
+  // slots for handling the restartneeded member
+  this->slotSetRestartNeeded(false);
+  connect(generalTab, SIGNAL(signalRestartNeeded(bool)), this,
+          SLOT(slotSetRestartNeeded(bool)));
+  connect(appearanceTab, SIGNAL(signalRestartNeeded(bool)), this,
+          SLOT(slotSetRestartNeeded(bool)));
+#ifdef SMTP_SUPPORT
+  connect(sendMailTab, SIGNAL(signalRestartNeeded(bool)), this,
+          SLOT(slotSetRestartNeeded(bool)));
+#endif
+  connect(keyserverTab, SIGNAL(signalRestartNeeded(bool)), this,
+          SLOT(slotSetRestartNeeded(bool)));
+#ifdef ADVANCED_SUPPORT
+  connect(advancedTab, SIGNAL(signalRestartNeeded(bool)), this,
+          SLOT(slotSetRestartNeeded(bool)));
+#endif
 
-    for (int i = 0; i < fileNames.size(); ++i) {
-        QString locale = fileNames[i];
-        locale.truncate(locale.lastIndexOf('.'));
-        locale.remove(0, locale.indexOf('_') + 1);
+  connect(this, SIGNAL(signalRestartNeeded(bool)), parent,
+          SLOT(slotSetRestartNeeded(bool)));
 
-        // this works in qt 4.8
-        QLocale qloc(locale);
-#if QT_VERSION < 0x040800
-        QString language =
-            QLocale::languageToString(qloc.language()) + " (" + locale +
-            ")"; //+ " (" + QLocale::languageToString(qloc.language()) + ")";
-#else
-        QString language = qloc.nativeLanguageName() + " (" + locale + ")";
-#endif
-        languages.insert(locale, language);
-    }
-    return languages;
+  this->resize(480, 640);
+  this->show();
 }
 
-GpgPathsTab::GpgPathsTab(QWidget *parent)
-        : QWidget(parent), appPath(qApp->applicationDirPath()),
-          settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini",
-                   QSettings::IniFormat) {
-    setSettings();
-
-    /*****************************************
-     * Keydb Box
-     *****************************************/
-    auto *keydbBox = new QGroupBox(tr("Relative path to keydb"));
-    auto *keydbBoxLayout = new QGridLayout();
-
-    // Label containing the current keydbpath relative to default keydb path
-    keydbLabel = new QLabel(accKeydbPath, this);
-
-    auto *keydbButton = new QPushButton("Change keydb path", this);
-    connect(keydbButton, SIGNAL(clicked()), this, SLOT(chooseKeydbDir()));
-    auto *keydbDefaultButton = new QPushButton("Set keydb to default path", this);
-    connect(keydbDefaultButton, SIGNAL(clicked()), this,
-            SLOT(setKeydbPathToDefault()));
-
-    keydbBox->setLayout(keydbBoxLayout);
-    keydbBoxLayout->addWidget(new QLabel(tr("Current keydb path: ")), 1, 1);
-    keydbBoxLayout->addWidget(keydbLabel, 1, 2);
-    keydbBoxLayout->addWidget(keydbButton, 1, 3);
-    keydbBoxLayout->addWidget(keydbDefaultButton, 2, 3);
-    keydbBoxLayout->addWidget(
-            new QLabel(tr("<b>NOTE: </b> Gpg4usb will restart automatically if you "
-                          "change the keydb path!")),
-            3, 1, 1, 3);
-
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(keydbBox);
-    mainLayout->addStretch(1);
-    setLayout(mainLayout);
+bool SettingsDialog::getRestartNeeded() const { return this->restartNeeded; }
+
+void SettingsDialog::slotSetRestartNeeded(bool needed) {
+  this->restartNeeded = needed;
 }
 
-QString GpgPathsTab::getRelativePath(const QString &dir1, const QString &dir2) {
-    QDir dir(dir1);
-    QString s;
+void SettingsDialog::slotAccept() {
+  generalTab->applySettings();
+#ifdef SMTP_SUPPORT
+  sendMailTab->applySettings();
+#endif
+  appearanceTab->applySettings();
+  keyserverTab->applySettings();
+#ifdef ADVANCED_SUPPORT
+  advancedTab->applySettings();
+#endif
 
-    s = dir.relativeFilePath(dir2);
-    qDebug() << "relative path: " << s;
-    if (s.isEmpty()) {
-        s = ".";
-    }
-    return s;
-}
+  // write settings to filesystem
+  GlobalSettingStation::GetInstance().Sync();
 
-void GpgPathsTab::setKeydbPathToDefault() {
-    accKeydbPath = ".";
-    keydbLabel->setText(".");
+  if (getRestartNeeded()) {
+    emit signalRestartNeeded(true);
+  }
+  close();
 }
 
-QString GpgPathsTab::chooseKeydbDir() {
-    QString dir = QFileDialog::getExistingDirectory(
-            this, tr("Choose keydb directory"), accKeydbPath,
-            QFileDialog::ShowDirsOnly);
+QHash<QString, QString> SettingsDialog::listLanguages() {
+  QHash<QString, QString> languages;
 
-    accKeydbPath = getRelativePath(defKeydbPath, dir);
-    keydbLabel->setText(accKeydbPath);
-    return "";
-}
+  languages.insert(QString(), _("System Default"));
 
-void GpgPathsTab::setSettings() {
-    defKeydbPath = qApp->applicationDirPath() + "/keydb";
+  auto locale_path = GlobalSettingStation::GetInstance().GetLocaleDir();
 
-    accKeydbPath = settings.value("gpgpaths/keydbpath").toString();
-    if (accKeydbPath.isEmpty()) {
-        accKeydbPath = ".";
-    }
-}
+  auto locale_dir = QDir(QString::fromStdString(locale_path.string()) );
+  QStringList file_names = locale_dir.entryList(QStringList("*"));
+
+  for (int i = 0; i < file_names.size(); ++i) {
+    QString locale = file_names[i];
+    LOG(INFO) << "locale" << locale.toStdString();
+    if (locale == "." || locale == "..") continue;
 
-void GpgPathsTab::applySettings() {
-    settings.setValue("gpgpaths/keydbpath", accKeydbPath);
+    // this works in qt 4.8
+    QLocale q_locale(locale);
+    if (q_locale.nativeCountryName().isEmpty()) continue;
+#if QT_VERSION < 0x040800
+    QString language =
+        QLocale::languageToString(q_locale.language()) + " (" + locale +
+        ")";  //+ " (" + QLocale::languageToString(q_locale.language()) + ")";
+#else
+    auto language = q_locale.nativeLanguageName() + " (" + locale + ")";
+#endif
+    languages.insert(locale, language);
+  }
+  return languages;
 }
+
+}  // namespace GpgFrontend::UI