From 0ad33bf9aca45ad2cbdb93bd683c7b4872db3003 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 7 May 2016 23:27:24 +0800 Subject: [PATCH] Let user able to specifiy a filter when choosing an IP filter file --- src/gui/optionsdlg.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/gui/optionsdlg.cpp b/src/gui/optionsdlg.cpp index 686d14493..3777ef95e 100644 --- a/src/gui/optionsdlg.cpp +++ b/src/gui/optionsdlg.cpp @@ -1420,15 +1420,11 @@ void OptionsDialog::on_browseExportDirFinButton_clicked() void OptionsDialog::on_browseFilterButton_clicked() { - const QString filter_path = Utils::Fs::expandPathAbs(m_ui->textFilterPath->text()); - QDir filterDir(filter_path); - QString ipfilter; - if (!filter_path.isEmpty() && filterDir.exists()) - ipfilter = QFileDialog::getOpenFileName(this, tr("Choose an IP filter file"), filterDir.absolutePath(), tr("Filters") + QString(" (*.dat *.p2p *.p2b)")); - else - ipfilter = QFileDialog::getOpenFileName(this, tr("Choose an IP filter file"), QDir::homePath(), tr("Filters") + QString(" (*.dat *.p2p *.p2b)")); - if (!ipfilter.isNull()) - m_ui->textFilterPath->setText(Utils::Fs::toNativePath(ipfilter)); + QDir lastDir(Utils::Fs::fromNativePath(m_ui->textFilterPath->text())); + QString lastPath = lastDir.exists() ? lastDir.absolutePath() : QDir::homePath(); + QString newPath = QFileDialog::getOpenFileName(this, tr("Choose an IP filter file"), lastPath, tr("All supported filters") + QString(" (*.dat *.p2p *.p2b);;.dat (*.dat);;.p2p (*.p2p);;.p2b (*.p2b)")); + if (!newPath.isEmpty()) + m_ui->textFilterPath->setText(Utils::Fs::toNativePath(newPath)); } // Display dialog to choose save dir