fixed path bug.. when search for user specified methods folder

eugenemel · Feb 28, 2019 · 1afa505 · 1afa505
1 parent 51328ff
commit 1afa505
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/maven/mainwindow.cpp b/src/maven/mainwindow.cpp
@@ -54,8 +54,10 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
             << QApplication::applicationDirPath() + "/../Resources/methods";
 
     QString defaultModelFile =   settings->value("clsfModelFilename").value<QString>();
+    defaultModelFile.replace(QRegExp(".*/"),"");  //clear pathtname..
+    qDebug() << "Searching for method folder:";
     foreach (QString d, dirs) {
-        qDebug() << "Checking dir: " + d;
+        qDebug() << " Checking dir: " + d;
         QFile test(d+ "/" + defaultModelFile);
         if (test.exists()) { methodsFolder=d; settings->setValue("methodsFolder", methodsFolder); break;}
     }

diff --git a/src/maven/settingsform.cpp b/src/maven/settingsform.cpp
@@ -191,8 +191,11 @@ void SettingsForm::getFormValues() {
 }
 
 void SettingsForm::selectFolder(QString key) {
-    QString oFolder = ".";
-    if(settings->contains(key)) oFolder =  settings->value(key).toString();
+    QString oFolder =  QApplication::applicationDirPath() + "../";
+    if(settings->contains(key)) {
+        oFolder =  settings->value(key).toString();
+    }
+
     QString newFolder = QFileDialog::getExistingDirectory(this,oFolder);
     if (! newFolder.isEmpty()) {
         settings->setValue(key,newFolder);

diff --git a/src/maven_core b/src/maven_core