feat(ui): use relative path in portable build if possible (fixes #956)

Applicable only to the subdirectories within path to the executable.
zealdocs · Sep 28, 2018 · 00f2993 · 00f2993
1 parent 83a8bb7
commit 00f2993
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/libs/ui/settingsdialog.cpp b/src/libs/ui/settingsdialog.cpp
@@ -143,12 +143,21 @@ void SettingsDialog::chooseCustomCssFile()
 
 void SettingsDialog::chooseDocsetStoragePath()
 {
-    const QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
-                                                          ui->docsetStorageEdit->text());
-    if (dir.isEmpty())
+    QString path = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+                                                     ui->docsetStorageEdit->text());
+    if (path.isEmpty()) {
         return;
+    }
+
+#ifdef PORTABLE_BUILD
+    // Use relative path if selected directory is under the application binary path.
+    if (path.startsWith(QCoreApplication::applicationDirPath() + QLatin1String("/"))) {
+        const QDir appDirPath(QCoreApplication::applicationDirPath());
+        path = appDirPath.relativeFilePath(path);
+    }
+#endif
 
-    ui->docsetStorageEdit->setText(QDir::toNativeSeparators(dir));
+    ui->docsetStorageEdit->setText(QDir::toNativeSeparators(path));
 }
 
 void SettingsDialog::loadSettings()