diff options
author | Janek Bevendorff <janek@jbev.net> | 2020-10-21 23:47:02 +0300 |
---|---|---|
committer | Janek Bevendorff <janek@jbev.net> | 2020-10-21 23:47:02 +0300 |
commit | e9b9582817affd7936d4b6b07c22c482d7d0d3a6 (patch) | |
tree | 6f454bca5b5dac5aedfb27c49cf65aaa7271c421 /src/gui/FileDialog.cpp | |
parent | 9a35bba3b702256e025af48260fb56a012676fe4 (diff) | |
parent | 4f61f57c14411a3a45398e9949e7754788fb5c36 (diff) |
Release 2.6.22.6.2
Added
- Add option to keep window always on top to view menu [#5542]
- Move show/hide usernames and passwords to view menu [#5542]
- Add command line options and environment variables for changing the config locations [#5452]
- Include TOTP settings in CSV import/export and add support for ISO datetimes [#5346]
Changed
- Mask sensitive information in command execution confirmation prompt [#5542]
- SSH Agent: Avoid shortcut conflict on macOS by changing "Add key" to Ctrl+H on all platforms [#5484]
Fixed
- Prevent data loss with drag and drop between databases [#5536]
- Fix crash when toggling Capslock rapidly [#5545]
- Don't mark URL references as invalid URL [#5380]
- Reset entry preview after search [#5483]
- Set Qt::Dialog flag on database open dialog [#5356]
- Fix sorting of database report columns [#5426]
- Fix IfDevice matching logic [#5344]
- Fix layout issues and a stray scrollbar appearing on top of the entry edit screen [#5424]
- Fix tabbing into the notes field [#5424]
- Fix password generator ignoring settings on load [#5340]
- Restore natural entry sort order on application load [#5438]
- Fix paperclip and TOTP columns not saving state [#5327]
- Enforce fixed password font in entry preview [#5454]
- Add scrollbar when new database wizard exceeds screen size [#5560]
- Do not mark database as modified when viewing Auto-Type associations [#5542]
- CLI: Fix two heap-use-after-free crashes [#5368,#5470]
- Browser: Fix key exchange not working with multiple simultaneous users on Windows [#5485]
- Browser: Fix entry retrieval when "only best matching" is enabled [#5316]
- Browser: Ignore recycle bin on KeePassHTTP migration [#5481]
- KeeShare: Fix import crash [#5542]
- macOS: Fix toolbar theming and breadcrumb display issues [#5482]
- macOS: Fix file dialog randomly closing [#5479]
- macOS: Fix being unable to select OPVault files for import [#5341]
Diffstat (limited to 'src/gui/FileDialog.cpp')
-rw-r--r-- | src/gui/FileDialog.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/gui/FileDialog.cpp b/src/gui/FileDialog.cpp index df713c44b..406fbe50c 100644 --- a/src/gui/FileDialog.cpp +++ b/src/gui/FileDialog.cpp @@ -21,20 +21,6 @@ #include <QDir> -namespace -{ - QString modFilter(const QString& filter) - { -#ifdef Q_OS_MACOS - // Fix macOS bug that causes the file dialog to freeze when a dot is included in the filters - // See https://github.com/keepassxreboot/keepassxc/issues/3895#issuecomment-586724167 - auto mod = filter; - return mod.replace("*.", "*"); -#endif - return filter; - } -} // namespace - FileDialog* FileDialog::m_instance(nullptr); QString FileDialog::getOpenFileName(QWidget* parent, @@ -51,7 +37,7 @@ QString FileDialog::getOpenFileName(QWidget* parent, } else { const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir; const auto result = QDir::toNativeSeparators( - QFileDialog::getOpenFileName(parent, caption, workingDir, modFilter(filter), selectedFilter, options)); + QFileDialog::getOpenFileName(parent, caption, workingDir, filter, selectedFilter, options)); #ifdef Q_OS_MACOS // on Mac OS X the focus is lost after closing the native dialog @@ -77,8 +63,7 @@ QStringList FileDialog::getOpenFileNames(QWidget* parent, return results; } else { const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir; - auto results = - QFileDialog::getOpenFileNames(parent, caption, workingDir, modFilter(filter), selectedFilter, options); + auto results = QFileDialog::getOpenFileNames(parent, caption, workingDir, filter, selectedFilter, options); for (auto& path : results) { path = QDir::toNativeSeparators(path); @@ -111,7 +96,7 @@ QString FileDialog::getSaveFileName(QWidget* parent, } else { const auto& workingDir = dir.isEmpty() ? config()->get(Config::LastDir).toString() : dir; const auto result = QDir::toNativeSeparators( - QFileDialog::getSaveFileName(parent, caption, workingDir, modFilter(filter), selectedFilter, options)); + QFileDialog::getSaveFileName(parent, caption, workingDir, filter, selectedFilter, options)); #ifdef Q_OS_MACOS // on Mac OS X the focus is lost after closing the native dialog |