Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow setting default file open directory with env var #9192

Merged
merged 1 commit into from
Apr 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/topics/UserInterface.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ Additionally, the following environment variables may be useful when running the

|KPXC_CONFIG | Override default path to roaming configuration file
|KPXC_CONFIG_LOCAL | Override default path to local configuration file
|KPXC_INITIAL_DIR | Override initial location picking for databases
|SSH_AUTH_SOCKET | Path of the unix file socket that the agent uses for communication with other processes (SSH Agent)
|QT_SCALE_FACTOR [numeric] | Defines a global scale factor for the whole application, including point-sized fonts.
|QT_SCREEN_SCALE_FACTORS [list] | Specifies scale factors for each screen. See https://doc.qt.io/qt-5/highdpi.html#high-dpi-support-in-qt
Expand Down
6 changes: 3 additions & 3 deletions src/gui/DatabaseWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2031,7 +2031,7 @@ bool DatabaseWidget::saveAs()
if (!QFileInfo::exists(oldFilePath)) {
QString defaultFileName = config()->get(Config::DefaultDatabaseFileName).toString();
oldFilePath =
QDir::toNativeSeparators(config()->get(Config::LastDir).toString() + "/"
QDir::toNativeSeparators(FileDialog::getLastDir("db") + "/"
+ (defaultFileName.isEmpty() ? tr("Passwords").append(".kdbx") : defaultFileName));
}
const QString newFilePath = fileDialog()->getSaveFileName(
Expand Down Expand Up @@ -2121,13 +2121,13 @@ bool DatabaseWidget::saveBackup()
if (!QFileInfo::exists(oldFilePath)) {
QString defaultFileName = config()->get(Config::DefaultDatabaseFileName).toString();
oldFilePath = QDir::toNativeSeparators(
config()->get(Config::LastDir).toString() + "/"
FileDialog::getLastDir("db") + "/"
+ (defaultFileName.isEmpty() ? tr("Passwords").append(".kdbx") : defaultFileName));
}

const QString newFilePath = fileDialog()->getSaveFileName(this,
tr("Save database backup"),
FileDialog::getLastDir("backup"),
FileDialog::getLastDir("backup", oldFilePath),
tr("KeePass 2 Database").append(" (*.kdbx)"),
nullptr,
nullptr);
Expand Down
20 changes: 15 additions & 5 deletions src/gui/FileDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#include "core/Config.h"

#include <QProcessEnvironment>

FileDialog* FileDialog::m_instance(nullptr);

FileDialog::FileDialog() = default;
Expand All @@ -35,7 +37,7 @@ QString FileDialog::getOpenFileName(QWidget* parent,
m_nextFileName.clear();
return result;
} else {
const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir;
const auto& workingDir = dir.isEmpty() ? getLastDir("default") : dir;
const auto result = QDir::toNativeSeparators(
QFileDialog::getOpenFileName(parent, caption, workingDir, filter, selectedFilter, options));

Expand All @@ -61,7 +63,7 @@ QStringList FileDialog::getOpenFileNames(QWidget* parent,
m_nextFileNames.clear();
return results;
} else {
const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir;
const auto& workingDir = dir.isEmpty() ? getLastDir("default") : dir;
auto results = QFileDialog::getOpenFileNames(parent, caption, workingDir, filter, selectedFilter, options);

for (auto& path : results) {
Expand Down Expand Up @@ -90,7 +92,7 @@ QString FileDialog::getSaveFileName(QWidget* parent,
m_nextFileName.clear();
return result;
} else {
const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir;
const auto& workingDir = dir.isEmpty() ? getLastDir("default") : dir;
const auto result = QDir::toNativeSeparators(
QFileDialog::getSaveFileName(parent, caption, workingDir, filter, selectedFilter, options));

Expand All @@ -114,7 +116,7 @@ QString FileDialog::getExistingDirectory(QWidget* parent,
m_nextDirName.clear();
return result;
} else {
const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir;
const auto& workingDir = dir.isEmpty() ? getLastDir("default") : dir;
const auto result =
QDir::toNativeSeparators(QFileDialog::getExistingDirectory(parent, caption, workingDir, options));

Expand Down Expand Up @@ -158,7 +160,15 @@ void FileDialog::saveLastDir(const QString& role, const QString& path, bool sens
QString FileDialog::getLastDir(const QString& role, const QString& defaultDir)
{
auto lastDirs = config()->get(Config::LastDir).toHash();
return lastDirs.value(role, defaultDir).toString();
auto fallbackDir = defaultDir;

if (fallbackDir.isEmpty()) {
// Fallback to the environment variable, if it exists, otherwise use the home directory
const auto& env = QProcessEnvironment::systemEnvironment();
fallbackDir = env.value("KPXC_INITIAL_DIR", QDir::homePath());
}

return lastDirs.value(role, fallbackDir).toString();
}

FileDialog* FileDialog::instance()
Expand Down
2 changes: 1 addition & 1 deletion src/gui/FileDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class FileDialog
void setNextDirectory(const QString& path);

static void saveLastDir(const QString& role, const QString& path, bool sensitive = false);
static QString getLastDir(const QString& role, const QString& defaultDir = QDir::homePath());
static QString getLastDir(const QString& role, const QString& defaultDir = QString());

static FileDialog* instance();

Expand Down