now using the new settings everywhere

1 files changed, 220 insertions, 309 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 40a522a6..4b8f4b26 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -24,7 +24,6 @@
 #include "ui_mainwindow.h"
 #include "usersdialog.h"
 #include "util.h"
-#include "qpushbuttonwithclipboard.h"
 #include "settingsconstants.h"
 #include "qtpasssettings.h"
 
@@ -94,7 +93,7 @@ void MainWindow::focusInput() {
  */
 MainWindow::~MainWindow() {
 #ifdef Q_OS_WIN
-  if (useWebDav)
+  if (QtPassSettings::isUseWebDav())
     WNetCancelConnection2A(passStore.toUtf8().constData(), 0, 1);
 #else
   if (fusedav.state() == QProcess::Running) {
@@ -128,15 +127,15 @@ void MainWindow::mountWebDav() {
   memset(&netres, 0, sizeof(netres));
   netres.dwType = RESOURCETYPE_DISK;
   netres.lpLocalName = 0;
-  netres.lpRemoteName = webDavUrl.toUtf8().data();
+  netres.lpRemoteName = QtPassSettings::getWebDavUrl().toUtf8().data();
   DWORD size = sizeof(dst);
   DWORD r = WNetUseConnectionA(
       reinterpret_cast<HWND>(effectiveWinId()), &netres,
-      webDavPassword.toUtf8().constData(), webDavUser.toUtf8().constData(),
+      QtPassSettings::getWebDavPassword().toUtf8().constData(), QtPassSettings::getWebDavUser().toUtf8().constData(),
       CONNECT_TEMPORARY | CONNECT_INTERACTIVE | CONNECT_REDIRECT, dst, &size,
       0);
   if (r == NO_ERROR) {
-    passStore = dst;
+   passStore = dst;
   } else {
     char message[256] = {0};
     FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, r, 0, message,
@@ -146,11 +145,11 @@ void MainWindow::mountWebDav() {
                              " (0x" + QString::number(r, 16) + ")");
   }
 #else
-  fusedav.start("fusedav -o nonempty -u \"" + webDavUser + "\" " + webDavUrl +
-                " \"" + passStore + '"');
+  fusedav.start("fusedav -o nonempty -u \"" + QtPassSettings::getWebDavUser() + "\" " + QtPassSettings::getWebDavUrl() +
+                " \"" + QtPassSettings::getPassStore() + '"');
   fusedav.waitForStarted();
   if (fusedav.state() == QProcess::Running) {
-    QString pwd = webDavPassword;
+    QString pwd = QtPassSettings::getWebDavPassword();
     bool ok = true;
     if (pwd.isEmpty()) {
       pwd = QInputDialog::getText(this, tr("QtPass WebDAV password"),
@@ -208,107 +207,73 @@ bool MainWindow::checkConfig() {
     }
   }
 
-  usePass = QtPassSettings::isUsePass();
-
-  useAutoclear = QtPassSettings::isUseAutoclear();
-  autoclearSeconds = QtPassSettings::getAutoclearSeconds();
-  useAutoclearPanel = QtPassSettings::isUseAutoclearPanel();
-  autoclearPanelSeconds = QtPassSettings::getAutoclearPanelSeconds();
-  hidePassword = QtPassSettings::isHidePassword();
-  hideContent = QtPassSettings::isHideContent();
-  addGPGId = QtPassSettings::isAddGPGId(true);
-
-  passStore = QtPassSettings::getPassStore(Util::findPasswordStore());
-  passStore = Util::normalizeFolderPath(passStore);
+  QString passStore = QtPassSettings::getPassStore(Util::findPasswordStore());
   QtPassSettings::setPassStore(passStore);
 
-  passExecutable = QtPassSettings::getPassExecutable(Util::findBinaryInPath("pass"));
-
-  gitExecutable = QtPassSettings::getGitExecutable(Util::findBinaryInPath("git"));
-
-  gpgExecutable = QtPassSettings::getGpgExecutable(Util::findBinaryInPath("gpg2"));
+  QString passExecutable = QtPassSettings::getPassExecutable(Util::findBinaryInPath("pass"));
+  QtPassSettings::setPassExecutable(passExecutable);
 
-  pwgenExecutable = QtPassSettings::getPwgenExecutable(Util::findBinaryInPath("pwgen"));
+  QString gitExecutable = QtPassSettings::getGitExecutable(Util::findBinaryInPath("git"));
+  QtPassSettings::setGitExecutable(gitExecutable);
 
-  gpgHome = QtPassSettings::getGpgHome();
+  QString gpgExecutable = QtPassSettings::getGpgExecutable(Util::findBinaryInPath("gpg2"));
+  QtPassSettings::setGpgExecutable(gpgExecutable);
 
-  useWebDav = QtPassSettings::isUseWebDav();
-  webDavUrl = QtPassSettings::getWebDavUrl();
-  webDavUser = QtPassSettings::getWebDavUser();
-  webDavPassword = QtPassSettings::getWebDavPassword();
+  QString pwgenExecutable = QtPassSettings::getPwgenExecutable(Util::findBinaryInPath("pwgen"));
+  QtPassSettings::setPwgenExecutable(pwgenExecutable);
 
-  profile = QtPassSettings::getProfile();
-  profiles = QtPassSettings::getProfiles();
 
-  useGit = QtPassSettings::isUseGit();
-  usePwgen = QtPassSettings::isUsePwgen();
-  avoidCapitals = QtPassSettings::isAvoidCapitals();
-  avoidNumbers = QtPassSettings::isAvoidNumbers();
-  lessRandom = QtPassSettings::isLessRandom();
-  useSymbols = QtPassSettings::isUseSymbols();
   pwdConfig.selected = QtPassSettings::getPasswordCharsSelected();
   pwdConfig.length = QtPassSettings::getPasswordLength();
   pwdConfig.selected = QtPassSettings::getPasswordCharsselection();
   pwdConfig.Characters[3] = QtPassSettings::getPasswordChars();
 
-  useTrayIcon = QtPassSettings::isUseTrayIcon();
-  hideOnClose = QtPassSettings::isHideOnClose();
-  startMinimized = QtPassSettings::isStartMinimized();
-  alwaysOnTop = QtPassSettings::isAlwaysOnTop();
-
-  if (alwaysOnTop) {
+  if (QtPassSettings::isAlwaysOnTop()) {
     Qt::WindowFlags flags = windowFlags();
     this->setWindowFlags(flags | Qt::WindowStaysOnTopHint);
     this->show();
   }
 
-  autoPull = QtPassSettings::isAutoPull();
-  autoPush = QtPassSettings::isAutoPush();
-
-  if (useTrayIcon && tray == NULL) {
+  if (QtPassSettings::isUseTrayIcon() && tray == NULL) {
     initTrayIcon();
-    if (freshStart && startMinimized) {
+    if (freshStart && QtPassSettings::isStartMinimized()) {
       // since we are still in constructor, can't directly hide
       QTimer::singleShot(10, this, SLOT(hide()));
     }
-  } else if (!useTrayIcon && tray != NULL) {
+  } else if (!QtPassSettings::isUseTrayIcon() && tray != NULL) {
     destroyTrayIcon();
   }
 
-  passTemplate = QtPassSettings::getPassTemplate();
-  useTemplate = QtPassSettings::isUseTemplate();
-  templateAllFields = QtPassSettings::isTemplateAllFields();
-
   // qDebug() << version;
 
   // Config updates
   if (version.isEmpty()) {
     qDebug() << "assuming fresh install";
-    if (autoclearSeconds < 5)
-      autoclearSeconds = 10;
-    if (autoclearPanelSeconds < 5)
-      autoclearPanelSeconds = 10;
-    if (!pwgenExecutable.isEmpty())
-      usePwgen = true;
+    if (QtPassSettings::getAutoclearSeconds() < 5)
+      QtPassSettings::setAutoclearSeconds(10);
+    if (QtPassSettings::getAutoclearPanelSeconds()< 5)
+      QtPassSettings::setAutoclearPanelSeconds(10);
+    if (!QtPassSettings::getPwgenExecutable().isEmpty())
+      QtPassSettings::setUsePwgen(true);
     else
-      usePwgen = false;
-    passTemplate = "login\nurl";
+      QtPassSettings::setUsePwgen(false);
+    QtPassSettings::setPassTemplate("login\nurl");
   } else {
     // QStringList ver = version.split(".");
     // qDebug() << ver;
     // if (ver[0] == "0" && ver[1] == "8") {
     //// upgrade to 0.9
     // }
-    if (passTemplate.isEmpty())
-      passTemplate = "login\nurl";
+    if (QtPassSettings::getPassTemplate().isEmpty())
+      QtPassSettings::setPassTemplate("login\nurl");
   }
 
   QtPassSettings::setVersion(VERSION);
 
-  if (Util::checkConfig(passStore, passExecutable, gpgExecutable)) {
+  if (Util::checkConfig()) {
     config();
     if (freshStart &&
-        Util::checkConfig(passStore, passExecutable, gpgExecutable))
+        Util::checkConfig())
       return false;
   }
 
@@ -317,21 +282,21 @@ bool MainWindow::checkConfig() {
   // TODO(annejan): this needs to be before we try to access the store,
   // but it would be better to do it after the Window is shown,
   // as the long delay it can cause is irritating otherwise.
-  if (useWebDav)
+  if (QtPassSettings::isUseWebDav())
     mountWebDav();
 
   model.setNameFilters(QStringList() << "*.gpg");
   model.setNameFilterDisables(false);
 
   proxyModel.setSourceModel(&model);
-  proxyModel.setModelAndStore(&model, passStore);
+  proxyModel.setModelAndStore(&model, QtPassSettings::getPassStore());
   selectionModel.reset(new QItemSelectionModel(&proxyModel));
-  model.fetchMore(model.setRootPath(passStore));
+  model.fetchMore(model.setRootPath(QtPassSettings::getPassStore()));
   model.sort(0, Qt::AscendingOrder);
 
   ui->treeView->setModel(&proxyModel);
   ui->treeView->setRootIndex(
-      proxyModel.mapFromSource(model.setRootPath(passStore)));
+      proxyModel.mapFromSource(model.setRootPath(QtPassSettings::getPassStore())));
   ui->treeView->setColumnHidden(1, true);
   ui->treeView->setColumnHidden(2, true);
   ui->treeView->setColumnHidden(3, true);
@@ -350,8 +315,8 @@ bool MainWindow::checkConfig() {
   updateProfileBox();
 
   env = QProcess::systemEnvironment();
-  if (!gpgHome.isEmpty()) {
-    QDir absHome(gpgHome);
+  if (!QtPassSettings::getGpgHome().isEmpty()) {
+    QDir absHome(QtPassSettings::getGpgHome());
     absHome.makeAbsolute();
     env << "GNUPGHOME=" + absHome.path();
   }
@@ -368,7 +333,7 @@ bool MainWindow::checkConfig() {
 
   updateEnv();
 
-  if (!useGit || (gitExecutable.isEmpty() && passExecutable.isEmpty())) {
+  if (!QtPassSettings::isUseGit() || (QtPassSettings::getGitExecutable().isEmpty() && QtPassSettings::getPassExecutable().isEmpty())) {
     ui->pushButton->hide();
     ui->updateButton->hide();
     ui->horizontalSpacer->changeSize(0, 20, QSizePolicy::Maximum,
@@ -392,116 +357,90 @@ void MainWindow::config() {
   QScopedPointer<ConfigDialog> d(new ConfigDialog(this));
   d->setModal(true);
   // Automatically default to pass if it's available
-  usePass = freshStart ? QFile(passExecutable).exists() : usePass;
-
-  d->setPassPath(passExecutable);
-  d->setGitPath(gitExecutable);
-  d->setGpgPath(gpgExecutable);
-  d->setStorePath(passStore);
-  d->usePass(usePass);
-  d->useClipboard(useClipboard);
-  d->useAutoclear(useAutoclear);
-  d->setAutoclear(autoclearSeconds);
-  d->useAutoclearPanel(useAutoclearPanel);
-  d->setAutoclearPanel(autoclearPanelSeconds);
-  d->hidePassword(hidePassword);
-  d->hideContent(hideContent);
-  d->addGPGId(addGPGId);
-  d->useTrayIcon(useTrayIcon);
-  d->hideOnClose(hideOnClose);
-  d->startMinimized(startMinimized);
-  d->setProfiles(profiles, profile);
-  d->useGit(useGit);
-  d->setPwgenPath(pwgenExecutable);
-  d->usePwgen(usePwgen);
-  d->avoidCapitals(avoidCapitals);
-  d->avoidNumbers(avoidNumbers);
-  d->lessRandom(lessRandom);
-  d->useSymbols(useSymbols);
+  if (freshStart && QFile(QtPassSettings::getPassExecutable()).exists()){
+      QtPassSettings::setUsePass(true);
+  }
+
+
+  d->setPassPath(QtPassSettings::getPassExecutable());
+  d->setGitPath(QtPassSettings::getGitExecutable());
+  d->setGpgPath(QtPassSettings::getGpgExecutable());
+  d->setStorePath(QtPassSettings::getPassStore());
+  d->usePass(QtPassSettings::isUsePass());
+  d->useClipboard(QtPassSettings::getClipBoardType());
+  d->useAutoclear(QtPassSettings::isUseAutoclear());
+  d->setAutoclear(QtPassSettings::getAutoclearSeconds());
+  d->useAutoclearPanel(QtPassSettings::isUseAutoclearPanel());
+  d->setAutoclearPanel(QtPassSettings::getAutoclearPanelSeconds());
+  d->hidePassword(QtPassSettings::isHidePassword());
+  d->hideContent(QtPassSettings::isHideContent());
+  d->addGPGId(QtPassSettings::isAddGPGId(true));
+  d->useTrayIcon(QtPassSettings::isUseTrayIcon());
+  d->hideOnClose(QtPassSettings::isHideOnClose());
+  d->startMinimized(QtPassSettings::isStartMinimized());
+  d->setProfiles(QtPassSettings::getProfiles(), QtPassSettings::getProfile());
+  d->useGit(QtPassSettings::isUseGit());
+  d->setPwgenPath(QtPassSettings::getPwgenExecutable());
+  d->usePwgen(QtPassSettings::isUsePwgen());
+  d->avoidCapitals(QtPassSettings::isAvoidCapitals());
+  d->avoidNumbers(QtPassSettings::isAvoidNumbers());
+  d->lessRandom(QtPassSettings::isLessRandom());
+  d->useSymbols(QtPassSettings::isUseSymbols());
   d->setPasswordLength(pwdConfig.length);
   d->setPwdTemplateSelector(pwdConfig.selected);
   if (pwdConfig.selected != 3)
     d->setLineEditEnabled(false);
   d->setPasswordChars(pwdConfig.Characters[pwdConfig.selected]);
-  d->useTemplate(useTemplate);
-  d->setTemplate(passTemplate);
-  d->templateAllFields(templateAllFields);
-  d->autoPull(autoPull);
-  d->autoPush(autoPush);
-  d->alwaysOnTop(alwaysOnTop);
+  d->useTemplate(QtPassSettings::isUseTemplate());
+  d->setTemplate(QtPassSettings::getPassTemplate());
+  d->templateAllFields(QtPassSettings::isTemplateAllFields());
+  d->autoPull(QtPassSettings::isAutoPull());
+  d->autoPush(QtPassSettings::isAutoPush());
+  d->alwaysOnTop(QtPassSettings::isAlwaysOnTop());
   if (startupPhase)
     d->wizard(); // does shit
   if (d->exec()) {
     if (d->result() == QDialog::Accepted) {
-      passExecutable = d->getPassPath();
-      gitExecutable = d->getGitPath();
-      gpgExecutable = d->getGpgPath();
-      passStore = Util::normalizeFolderPath(d->getStorePath());
-      usePass = d->usePass();
-      useClipboard = d->useClipboard();
-      useAutoclear = d->useAutoclear();
-      autoclearSeconds = d->getAutoclear();
-      useAutoclearPanel = d->useAutoclearPanel();
-      autoclearPanelSeconds = d->getAutoclearPanel();
-      hidePassword = d->hidePassword();
-      hideContent = d->hideContent();
-      addGPGId = d->addGPGId();
-      useTrayIcon = d->useTrayIcon();
-      hideOnClose = d->hideOnClose();
-      startMinimized = d->startMinimized();
-      profiles = d->getProfiles();
-      useGit = d->useGit();
-      pwgenExecutable = d->getPwgenPath();
-      usePwgen = d->usePwgen();
-      avoidCapitals = d->avoidCapitals();
-      avoidNumbers = d->avoidNumbers();
-      lessRandom = d->lessRandom();
-      useSymbols = d->useSymbols();
+      QtPassSettings::setPassExecutable(d->getPassPath());
+      QtPassSettings::setGitExecutable(d->getGitPath());
+      QtPassSettings::setGpgExecutable(d->getGpgPath());
+      QtPassSettings::setPassStore(Util::normalizeFolderPath(d->getStorePath()));
+      QtPassSettings::setUsePass(d->usePass());
+      QtPassSettings::setClipBoardType(d->useClipboard());
+      QtPassSettings::setUseAutoclear(d->useAutoclear());
+      QtPassSettings::setAutoclearSeconds(d->getAutoclear());
+      QtPassSettings::setUseAutoclearPanel(d->useAutoclearPanel());
+      QtPassSettings::setAutoclearPanelSeconds(d->getAutoclearPanel());
+      QtPassSettings::setHidePassword(d->hidePassword());
+      QtPassSettings::setHideContent(d->hideContent());
+      QtPassSettings::setAddGPGId(d->addGPGId());
+      QtPassSettings::setUseTrayIcon(d->useTrayIcon());
+      QtPassSettings::setHideOnClose(d->hideOnClose());
+      QtPassSettings::setStartMinimized(d->startMinimized());
+      QtPassSettings::setProfiles(d->getProfiles());
+      QtPassSettings::setUseGit(d->useGit());
+      QtPassSettings::setPwgenExecutable(d->getPwgenPath());
+      QtPassSettings::setUsePwgen(d->usePwgen());
+      QtPassSettings::setAvoidCapitals(d->avoidCapitals());
+      QtPassSettings::setAvoidNumbers(d->avoidNumbers());
+      QtPassSettings::setLessRandom(d->lessRandom());
+      QtPassSettings::setUseSymbols(d->useSymbols());
       pwdConfig.length = d->getPasswordLength();
       pwdConfig.selected = d->getPwdTemplateSelector();
       pwdConfig.Characters[3] = d->getPasswordChars();
-      useTemplate = d->useTemplate();
-      passTemplate = d->getTemplate();
-      templateAllFields = d->templateAllFields();
-      autoPush = d->autoPush();
-      autoPull = d->autoPull();
-      alwaysOnTop = d->alwaysOnTop();
+      QtPassSettings::setUseTemplate(d->useTemplate());
+      QtPassSettings::setPassTemplate(d->getTemplate());
+      QtPassSettings::setTemplateAllFields(d->templateAllFields());
+      QtPassSettings::setAutoPush(d->autoPush());
+      QtPassSettings::setAutoPull(d->autoPull());
+      QtPassSettings::setAlwaysOnTop(d->alwaysOnTop());
 
       QtPassSettings::setVersion(VERSION);
-      QtPassSettings::setPassExecutable(passExecutable);
-      QtPassSettings::setGitExecutable(gitExecutable);
-      QtPassSettings::setGpgExecutable(gpgExecutable);
-      QtPassSettings::setPassStore(passStore);
-      QtPassSettings::setUsePass(usePass);
-      QtPassSettings::setClipBoardType(useClipboard);
-      QtPassSettings::setUseAutoclear(useAutoclear);
-      QtPassSettings::setAutoclearSeconds(autoclearSeconds);
-      QtPassSettings::setUseAutoclearPanel(useAutoclearPanel);
-      QtPassSettings::setAutoclearPanelSeconds(autoclearPanelSeconds);
-      QtPassSettings::setHidePassword(hidePassword);
-      QtPassSettings::setHideContent(hideContent);
-      QtPassSettings::setAddGPGId(addGPGId);
-      QtPassSettings::setUseTrayIcon(useTrayIcon);
-      QtPassSettings::setHideOnClose(hideOnClose);
-      QtPassSettings::setStartMinimized(startMinimized);
-      QtPassSettings::setUseGit(useGit);
-      QtPassSettings::setPwgenExecutable(pwgenExecutable);
-      QtPassSettings::setUsePwgen(usePwgen);
-      QtPassSettings::setAvoidCapitals(avoidCapitals);
-      QtPassSettings::setAvoidNumbers(avoidNumbers);
-      QtPassSettings::setLessRandom(lessRandom);
-      QtPassSettings::setUseSymbols(useSymbols);
       QtPassSettings::setPasswordLength(pwdConfig.length);
       QtPassSettings::setPasswordCharsselection(pwdConfig.selected);
       QtPassSettings::setPasswordChars(pwdConfig.Characters[3]);
-      QtPassSettings::setUseTemplate(useTemplate);
-      QtPassSettings::setPassTemplate(passTemplate);
-      QtPassSettings::setTemplateAllFields(templateAllFields);
-      QtPassSettings::setAutoPull(autoPull);
-      QtPassSettings::setAutoPush(autoPush);
-      QtPassSettings::setAlwaysOnTop(alwaysOnTop);
-
-      if (alwaysOnTop) {
+
+      if (QtPassSettings::isAlwaysOnTop()) {
         Qt::WindowFlags flags = windowFlags();
         this->setWindowFlags(flags | Qt::WindowStaysOnTopHint);
         this->show();
@@ -510,16 +449,15 @@ void MainWindow::config() {
         this->show();
       }
 
-      QtPassSettings::setProfiles(profiles);
       updateProfileBox();
       ui->treeView->setRootIndex(
-          proxyModel.mapFromSource(model.setRootPath(passStore)));
+          proxyModel.mapFromSource(model.setRootPath(QtPassSettings::getPassStore())));
 
       if (freshStart &&
-          Util::checkConfig(passStore, passExecutable, gpgExecutable))
+          Util::checkConfig())
         config();
       updateEnv();
-      if (!useGit || (gitExecutable.isEmpty() && passExecutable.isEmpty())) {
+      if (!QtPassSettings::isUseGit() || (QtPassSettings::getGitExecutable().isEmpty() && QtPassSettings::getPassExecutable().isEmpty())) {
         ui->pushButton->hide();
         ui->updateButton->hide();
         ui->horizontalSpacer->changeSize(0, 20, QSizePolicy::Maximum,
@@ -530,9 +468,9 @@ void MainWindow::config() {
         ui->horizontalSpacer->changeSize(24, 24, QSizePolicy::Minimum,
                                          QSizePolicy::Minimum);
       }
-      if (useTrayIcon && tray == NULL)
+      if (QtPassSettings::isUseTrayIcon() && tray == NULL)
         initTrayIcon();
-      else if (!useTrayIcon && tray != NULL)
+      else if (!QtPassSettings::isUseTrayIcon() && tray != NULL)
         destroyTrayIcon();
     }
     freshStart = false;
@@ -545,10 +483,10 @@ void MainWindow::config() {
 void MainWindow::on_updateButton_clicked() {
   ui->statusBar->showMessage(tr("Updating password-store"), 2000);
   currentAction = GIT;
-  if (usePass)
+  if (QtPassSettings::isUsePass())
     executePass("git pull");
   else
-    executeWrapper(gitExecutable, "pull");
+    executeWrapper(QtPassSettings::getGitExecutable(), "pull");
 }
 
 /**
@@ -557,10 +495,10 @@ void MainWindow::on_updateButton_clicked() {
 void MainWindow::on_pushButton_clicked() {
   ui->statusBar->showMessage(tr("Updating password-store"), 2000);
   currentAction = GIT;
-  if (usePass)
+  if (QtPassSettings::isUsePass())
     executePass("git push");
   else
-    executeWrapper(gitExecutable, "push");
+    executeWrapper(QtPassSettings::getGitExecutable(), "push");
 }
 
 /**
@@ -570,7 +508,7 @@ void MainWindow::on_pushButton_clicked() {
  * @return path
  */
 QString MainWindow::getDir(const QModelIndex &index, bool forPass) {
-  QString abspath = QDir(passStore).absolutePath() + '/';
+  QString abspath = QDir(QtPassSettings::getPassStore()).absolutePath() + '/';
   if (!index.isValid())
     return forPass ? "" : abspath;
   QFileInfo info = model.fileInfo(proxyModel.mapToSource(index));
@@ -596,7 +534,7 @@ QString MainWindow::getFile(const QModelIndex &index, bool forPass) {
     return QString();
   QString filePath = model.filePath(proxyModel.mapToSource(index));
   if (forPass) {
-    filePath = QDir(passStore).relativeFilePath(filePath);
+    filePath = QDir(QtPassSettings::getPassStore()).relativeFilePath(filePath);
     filePath.replace(QRegExp("\\.gpg$"), "");
   }
   return filePath;
@@ -611,16 +549,16 @@ void MainWindow::on_treeView_clicked(const QModelIndex &index) {
   currentDir = getDir(ui->treeView->currentIndex(), false);
   lastDecrypt = "Could not decrypt";
   clippedText = "";
-  QString file = getFile(index, usePass);
+  QString file = getFile(index, QtPassSettings::isUsePass());
   QFileInfo fileinfo =
       model.fileInfo(proxyModel.mapToSource(ui->treeView->currentIndex()));
   ui->passwordName->setText(getFile(index, true));
   if (!file.isEmpty() && !cleared) {
     currentAction = GPG;
-    if (usePass)
+    if (QtPassSettings::isUsePass())
       executePass("show \"" + file + '"');
     else
-      executeWrapper(gpgExecutable,
+      executeWrapper(QtPassSettings::getGpgExecutable(),
                      "-d --quiet --yes --no-encrypt-to --batch --use-agent \"" +
                          file + '"');
   } else {
@@ -642,7 +580,7 @@ void MainWindow::on_treeView_doubleClicked(const QModelIndex &index) {
   QString file = "";
 
   if (fileOrFolder.isFile()) {
-    QString file = getFile(index, usePass);
+    QString file = getFile(index, QtPassSettings::isUsePass());
     if (file.isEmpty()) {
       QMessageBox::critical(
           this, tr("Can not edit"),
@@ -668,7 +606,7 @@ void MainWindow::deselect() {
  * @param args
  */
 void MainWindow::executePass(QString args, QString input) {
-  executeWrapper(passExecutable, args, input);
+  executeWrapper(QtPassSettings::getPassExecutable(), args, input);
 }
 
 /**
@@ -676,10 +614,10 @@ void MainWindow::executePass(QString args, QString input) {
  */
 void MainWindow::executePassGitInit() {
   qDebug() << "Pass git init called";
-  if (usePass)
+  if (QtPassSettings::isUsePass())
     executePass("git init");
   else
-    executeWrapper(gitExecutable, "init \"" + passStore + '"');
+    executeWrapper(QtPassSettings::getGitExecutable(), "init \"" + QtPassSettings::getPassStore() + '"');
 }
 
 /**
@@ -710,7 +648,7 @@ void MainWindow::executeWrapper(QString app, QString args, QString input) {
     return;
   }
   wrapperRunning = true;
-  process->setWorkingDirectory(passStore);
+  process->setWorkingDirectory(QtPassSettings::getPassStore());
   process->setEnvironment(env);
   clearTemplateWidgets();
   ui->textBrowser->clear();
@@ -745,23 +683,23 @@ void MainWindow::readyRead(bool finished = false) {
       QStringList tokens = output.split("\n");
       QString password = tokens.at(0);
 
-      if (useClipboard != Enums::CLIPBOARD_NEVER && !output.isEmpty()) {
+      if (QtPassSettings::getClipBoardType() != Enums::CLIPBOARD_NEVER && !output.isEmpty()) {
         clippedText=tokens[0];
-        if (useClipboard == Enums::CLIPBOARD_ALWAYS)
+        if (QtPassSettings::getClipBoardType() == Enums::CLIPBOARD_ALWAYS)
           copyTextToClipboard(tokens[0]);
-        if (useAutoclearPanel) {
-          QTimer::singleShot(1000 * autoclearPanelSeconds, this,
+        if (QtPassSettings::isUseAutoclearPanel()) {
+          QTimer::singleShot(1000 * QtPassSettings::getAutoclearPanelSeconds(), this,
                              SLOT(clearPanel()));
         }
-        if (hidePassword && !useTemplate) {
+        if (QtPassSettings::isHidePassword() && !QtPassSettings::isUseTemplate()) {
           tokens[0] = "***" + tr("Password hidden") + "***";
           output = tokens.join("\n");
         }
-        if (hideContent)
+        if (QtPassSettings::isHideContent())
           output = "***" + tr("Content hidden") + "***";
       }
 
-      if (useTemplate && !hideContent) {
+      if (QtPassSettings::isUseTemplate() && !QtPassSettings::isHideContent()) {
         while (ui->gridLayout->count() > 0) {
           QLayoutItem *item = ui->gridLayout->takeAt(0);
           delete item->widget();
@@ -773,9 +711,9 @@ void MainWindow::readyRead(bool finished = false) {
           if (token.contains(':')) {
             int colon = token.indexOf(':');
             QString field = token.left(colon);
-            if (templateAllFields || passTemplate.contains(field)) {
+            if (QtPassSettings::isTemplateAllFields() || QtPassSettings::getPassTemplate().contains(field)) {
               QString value = token.right(token.length() - colon - 1);
-              if (!passTemplate.contains(field) && value.startsWith("//")) {
+              if (!QtPassSettings::getPassTemplate().contains(field) && value.startsWith("//")) {
                 remainingTokens.append(token);
                 continue; // colon is probably from a url
               }
@@ -793,16 +731,16 @@ void MainWindow::readyRead(bool finished = false) {
       } else {
         clearTemplateWidgets();
       }
-      if (!hideContent && !password.isEmpty()) {
+      if (!QtPassSettings::isHideContent() && !password.isEmpty()) {
         // now set the password. If we set it earlier, the layout will be
         // cleared
         addToGridLayout(0, tr("Password"), password);
       }
-      if (useAutoclearPanel) {
+      if (QtPassSettings::isUseAutoclearPanel()) {
         autoclearPass = output;
         autoclearTimer = new QTimer(this);
         autoclearTimer->setSingleShot(true);
-        autoclearTimer->setInterval(1000 * autoclearPanelSeconds);
+        autoclearTimer->setInterval(1000 * QtPassSettings::getAutoclearPanelSeconds());
         connect(autoclearTimer, SIGNAL(timeout()), this, SLOT(clearPanel()));
         autoclearTimer->start();
       }
@@ -939,32 +877,8 @@ void MainWindow::processError(QProcess::ProcessError error) {
     enableUiElements(true);
 }
 
-/**
- * @brief MainWindow::setPassExecutable set the executable for pass eg:
- * /usr/local/bin/pass
- * @param path
- */
-void MainWindow::setPassExecutable(QString path) { passExecutable = path; }
-
-/**
- * @brief MainWindow::setGitExecutable set the executable for git eg:
- * /usr/local/bin/git
- * @param path
- */
-void MainWindow::setGitExecutable(QString path) { gitExecutable = path; }
 
-/**
- * @brief MainWindow::setGpgExecutable set the executable for gpg eg:
- * /usr/local/bin/gig
- * @param path
- */
-void MainWindow::setGpgExecutable(QString path) { gpgExecutable = path; }
 
-/**
- * @brief MainWindow::getGpgExecutable
- * @return path to the gpg executable
- */
-QString MainWindow::getGpgExecutable() { return gpgExecutable; }
 
 /**
  * @brief MainWindow::on_configButton_clicked run Mainwindow::config
@@ -984,7 +898,7 @@ void MainWindow::on_lineEdit_textChanged(const QString &arg1) {
   QRegExp regExp(query, Qt::CaseInsensitive);
   proxyModel.setFilterRegExp(regExp);
   ui->treeView->setRootIndex(
-      proxyModel.mapFromSource(model.setRootPath(passStore)));
+      proxyModel.mapFromSource(model.setRootPath(QtPassSettings::getPassStore())));
   selectFirstFile();
 }
 
@@ -1003,7 +917,7 @@ void MainWindow::on_lineEdit_returnPressed() {
  * @brief MainWindow::selectFirstFile select the first possible file in the tree
  */
 void MainWindow::selectFirstFile() {
-  QModelIndex index = proxyModel.mapFromSource(model.setRootPath(passStore));
+  QModelIndex index = proxyModel.mapFromSource(model.setRootPath(QtPassSettings::getPassStore()));
   index = firstFile(index);
   ui->treeView->setCurrentIndex(index);
 }
@@ -1032,12 +946,12 @@ QModelIndex MainWindow::firstFile(QModelIndex parentIndex) {
  * @return recepients gpg-id contents
  */
 QStringList MainWindow::getRecipientList(QString for_file) {
-  QDir gpgIdPath(QFileInfo(for_file.startsWith(passStore)
+  QDir gpgIdPath(QFileInfo(for_file.startsWith(QtPassSettings::getPassStore())
                                ? for_file
-                               : passStore + for_file)
+                               : QtPassSettings::getPassStore() + for_file)
                      .absoluteDir());
   bool found = false;
-  while (gpgIdPath.exists() && gpgIdPath.absolutePath().startsWith(passStore)) {
+  while (gpgIdPath.exists() && gpgIdPath.absolutePath().startsWith(QtPassSettings::getPassStore())) {
     if (QFile(gpgIdPath.absoluteFilePath(".gpg-id")).exists()) {
       found = true;
       break;
@@ -1046,7 +960,7 @@ QStringList MainWindow::getRecipientList(QString for_file) {
       break;
   }
   QFile gpgId(found ? gpgIdPath.absoluteFilePath(".gpg-id")
-                    : passStore + ".gpg-id");
+                    : QtPassSettings::getPassStore() + ".gpg-id");
   if (!gpgId.open(QIODevice::ReadOnly | QIODevice::Text))
     return QStringList();
   QStringList recipients;
@@ -1091,10 +1005,10 @@ void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false) {
   }
   PasswordDialog d(this);
   d.setFile(file);
-  d.usePwgen(usePwgen);
-  d.setTemplate(passTemplate);
-  d.useTemplate(useTemplate);
-  d.templateAll(templateAllFields);
+  d.usePwgen(QtPassSettings::isUsePwgen());
+  d.setTemplate(QtPassSettings::getPassTemplate());
+  d.useTemplate(QtPassSettings::isUseTemplate());
+  d.templateAll(QtPassSettings::isTemplateAllFields());
   d.setPassword(lastDecrypt);
   d.setLength(pwdConfig.length);
   d.setPasswordCharTemplate(pwdConfig.selected);
@@ -1110,7 +1024,7 @@ void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false) {
     newValue += "\n";
 
   currentAction = EDIT;
-  if (usePass) {
+  if (QtPassSettings::isUsePass()) {
     QString force(overwrite ? " -f " : " ");
     executePass("insert" + force + "-m \"" + file + '"', newValue);
   } else {
@@ -1122,18 +1036,18 @@ void MainWindow::setPassword(QString file, bool overwrite, bool isNew = false) {
       return;
     }
     QString force(overwrite ? " --yes " : " ");
-    executeWrapper(gpgExecutable, force + "--batch -eq --output \"" + file +
+    executeWrapper(QtPassSettings::getGpgExecutable(), force + "--batch -eq --output \"" + file +
                                       "\" " + recipients + " -",
                    newValue);
-    if (!useWebDav && useGit) {
+    if (!QtPassSettings::isUseWebDav() && QtPassSettings::isUseGit()) {
       if (!overwrite)
-        executeWrapper(gitExecutable, "add \"" + file + '"');
-      QString path = QDir(passStore).relativeFilePath(file);
+        executeWrapper(QtPassSettings::getGitExecutable(), "add \"" + file + '"');
+      QString path = QDir(QtPassSettings::getPassStore()).relativeFilePath(file);
       path.replace(QRegExp("\\.gpg$"), "");
-      executeWrapper(gitExecutable, "commit \"" + file + "\" -m \"" +
+      executeWrapper(QtPassSettings::getGitExecutable(), "commit \"" + file + "\" -m \"" +
                                         (overwrite ? "Edit" : "Add") + " for " +
                                         path + " using QtPass.\"");
-      if (autoPush)
+      if (QtPassSettings::isAutoPush())
         on_pushButton_clicked();
     }
   }
@@ -1161,16 +1075,16 @@ void MainWindow::on_addButton_clicked() {
   //    return;
   //  }
   bool ok;
-  QString dir = getDir(ui->treeView->currentIndex(), usePass);
+  QString dir = getDir(ui->treeView->currentIndex(), QtPassSettings::isUsePass());
   QString file = QInputDialog::getText(
       this, tr("New file"),
       tr("New password file: \n(Will be placed in %1 )")
-          .arg(passStore + getDir(ui->treeView->currentIndex(), true)),
+          .arg(QtPassSettings::getPassStore() + getDir(ui->treeView->currentIndex(), true)),
       QLineEdit::Normal, "", &ok);
   if (!ok || file.isEmpty())
     return;
   file = dir + file;
-  if (!usePass)
+  if (!QtPassSettings::isUsePass())
     file += ".gpg";
   lastDecrypt = "";
   setPassword(file, false, true);
@@ -1185,7 +1099,7 @@ void MainWindow::on_deleteButton_clicked() {
   QString file = "";
 
   if (fileOrFolder.isFile()) {
-    file = getFile(ui->treeView->currentIndex(), usePass);
+    file = getFile(ui->treeView->currentIndex(), QtPassSettings::isUsePass());
     if (QMessageBox::question(
             this, tr("Delete password?"),
             tr("Are you sure you want to delete %1?")
@@ -1193,26 +1107,26 @@ void MainWindow::on_deleteButton_clicked() {
                      getFile(ui->treeView->currentIndex(), true)),
             QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
       return;
-    if (usePass) {
+    if (QtPassSettings::isUsePass()) {
       currentAction = DELETE;
       executePass("rm -f \"" + file + '"');
-      if (useGit && autoPush)
+      if (QtPassSettings::isUseGit() && QtPassSettings::isAutoPush())
         on_pushButton_clicked();
     } else {
-      if (useGit) {
-        executeWrapper(gitExecutable, "rm -f \"" + file + '"');
-        executeWrapper(gitExecutable,
+      if (QtPassSettings::isUseGit()) {
+        executeWrapper(QtPassSettings::getGitExecutable(), "rm -f \"" + file + '"');
+        executeWrapper(QtPassSettings::getGitExecutable(),
                        "commit \"" + file + "\" -m \"Remove for " +
                            getFile(ui->treeView->currentIndex(), true) +
                            " using QtPass.\"");
-        if (autoPush)
+        if (QtPassSettings::isAutoPush())
           on_pushButton_clicked();
       } else {
         QFile(file).remove();
       }
     }
   } else {
-    file = getDir(ui->treeView->currentIndex(), usePass);
+    file = getDir(ui->treeView->currentIndex(), QtPassSettings::isUsePass());
     // TODO: message box should accept enter key
     if (QMessageBox::question(
             this, tr("Delete folder?"),
@@ -1222,26 +1136,26 @@ void MainWindow::on_deleteButton_clicked() {
             QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {
       return;
     } else {
-      if (usePass) {
+      if (QtPassSettings::isUsePass()) {
         currentAction = DELETE;
         executePass("rm -rf \"" + file + '"');
-        if (useGit && autoPush) {
+        if (QtPassSettings::isUseGit() && QtPassSettings::isAutoPush()) {
           on_pushButton_clicked();
         }
       } else {
-        if (useGit) {
-          executeWrapper(gitExecutable, "rm -rf \"" + file + '"');
+        if (QtPassSettings::isUseGit()) {
+          executeWrapper(QtPassSettings::getGitExecutable(), "rm -rf \"" + file + '"');
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
           QDir dir(file);
           dir.removeRecursively();
 #else
-          removeDir(passStore + file);
+          removeDir(QtPassSettings::getPassStore() + file);
 #endif
-          executeWrapper(gitExecutable,
+          executeWrapper(QtPassSettings::getGitExecutable(),
                          "commit \"" + file + "\" -m \"Remove for " +
                              getFile(ui->treeView->currentIndex(), true) +
                              " using QtPass.\"");
-          if (autoPush) {
+          if (QtPassSettings::isAutoPush()) {
             on_pushButton_clicked();
           }
         } else {
@@ -1249,7 +1163,7 @@ void MainWindow::on_deleteButton_clicked() {
           QDir dir(file);
           dir.removeRecursively();
 #else
-          removeDir(passStore + file);
+          removeDir(QtPassSettings::getPassStore() + file);
 #endif
         }
       }
@@ -1289,7 +1203,7 @@ bool MainWindow::removeDir(const QString &dirName) {
  * @brief MainWindow::on_editButton_clicked try and edit (selected) password.
  */
 void MainWindow::on_editButton_clicked() {
-  QString file = getFile(ui->treeView->currentIndex(), usePass);
+  QString file = getFile(ui->treeView->currentIndex(), QtPassSettings::isUsePass());
   if (file.isEmpty()) {
     QMessageBox::critical(
         this, tr("Can not edit"),
@@ -1310,7 +1224,7 @@ QList<UserInfo> MainWindow::listKeys(QString keystring, bool secret) {
   QList<UserInfo> users;
   currentAction = GPG_INTERNAL;
   QString listopt = secret ? "--list-secret-keys " : "--list-keys ";
-  executeWrapper(gpgExecutable,
+  executeWrapper(QtPassSettings::getGpgExecutable(),
                  "--no-tty --with-colons " + listopt + keystring);
   process->waitForFinished(2000);
   if (process->exitStatus() != QProcess::NormalExit)
@@ -1405,7 +1319,7 @@ void MainWindow::on_usersButton_clicked() {
   }
   d.setUsers(NULL);
 
-  if (usePass) {
+  if (QtPassSettings::isUsePass()) {
     QString gpgIds = "";
     foreach (const UserInfo &user, users) {
       if (user.enabled) {
@@ -1415,13 +1329,13 @@ void MainWindow::on_usersButton_clicked() {
     // remove the passStore directory otherwise,
     // pass would create a passStore/passStore/dir
     // but you want passStore/dir
-    QString dirWithoutPassdir = dir.remove(0, passStore.size());
+    QString dirWithoutPassdir = dir.remove(0, QtPassSettings::getPassStore().size());
     executePass("init --path=" + dirWithoutPassdir + " " + gpgIds);
   } else {
     QString gpgIdFile = dir + ".gpg-id";
     QFile gpgId(gpgIdFile);
     bool addFile = false;
-    if (addGPGId) {
+    if (QtPassSettings::isAddGPGId(true)) {
       QFileInfo checkFile(gpgIdFile);
       if (!checkFile.exists() || !checkFile.isFile())
         addFile = true;
@@ -1446,14 +1360,14 @@ void MainWindow::on_usersButton_clicked() {
              "You will not be able to decrypt any newly added passwords!"));
     }
 
-    if (!useWebDav && useGit && !gitExecutable.isEmpty(