randomfixes

beefcurtains · May 27, 2015 · 45b7744 · 45b7744
1 parent cbb5027
commit 45b7744
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/dialog.cpp b/dialog.cpp
@@ -4,6 +4,7 @@
 #include "keygendialog.h"
 #include <QDebug>
 #include <QMessageBox>
+#include <QDir>
 
 /**
  * @brief Dialog::Dialog
@@ -164,6 +165,7 @@ QString Dialog::selectExecutable() {
 QString Dialog::selectFolder() {
     QFileDialog dialog(this);
     dialog.setFileMode(QFileDialog::Directory);
+    dialog.setFilter(QDir::NoFilter);
     dialog.setOption(QFileDialog::ShowDirsOnly);
     if (dialog.exec()) {
         return dialog.selectedFiles().first();
@@ -386,6 +388,7 @@ void Dialog::wizard()
             tr("The folder %1 doesn't seem to be a password store or is not yet initialised.").arg(passStore));
         while(!QFile(passStore).exists()) {
             on_toolButtonStore_clicked();
+            passStore = ui->storePath->text();
         }
         if (!QFile(passStore + ".gpg-id").exists()) {
             // apears not to be store

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -269,10 +269,10 @@ void MainWindow::config() {
             settings.setValue("hideContent", hideContent ? "true" : "false");
             settings.setValue("addGPGId", addGPGId ? "true" : "false");
 
-            ui->treeView->setRootIndex(model.setRootPath(passStore));
+            ui->treeView->setRootIndex(proxyModel.mapFromSource(model.setRootPath(passStore)));
 
             if (firstRun && Util::checkConfig(passStore, passExecutable, gpgExecutable)) {
-                config(); // loop !!
+                config();
             }
             updateEnv();
         }