zealdocs/zeal
1
1
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2024-11-23 14:26:12 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Applicable only to the subdirectories within path to the executable.
This commit is contained in:
Oleg Shparber 2018-09-27 21:25:39 -04:00
parent 83a8bb75fe
commit 00f299345c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/ui/settingsdialog.cpp
View File

@ -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;
}
ui->docsetStorageEdit->setText(QDir::toNativeSeparators(dir));
#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(path));
}
void SettingsDialog::loadSettings()