summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Klinghed <the_jk@yahoo.com>2017-07-29 01:19:46 +0200
committerJoel Klinghed <the_jk@yahoo.com>2017-07-29 01:19:46 +0200
commit4c7efd97af6ca1028279d40ebe674dc88bdaafc4 (patch)
treee0a0b1fe70d81a0833c0f99710945673ce4ba285
parenta6fd1619d1187ae3554ebb443f90a4843e08674a (diff)
Cleanup file dialog filters and remove Monitor from app title
-rw-r--r--src/gui_qt.cc1
-rw-r--r--src/monitor-gui.cc17
2 files changed, 14 insertions, 4 deletions
diff --git a/src/gui_qt.cc b/src/gui_qt.cc
index 9ffdfc9..c47d8fc 100644
--- a/src/gui_qt.cc
+++ b/src/gui_qt.cc
@@ -370,6 +370,7 @@ QString show_file_dialog(QWidget* parent, std::string const& title,
for (auto const& f : filters) {
if (!filter.isEmpty()) filter.append(";;");
filter.append(QString::fromStdString(f.name));
+ if (!f.name.empty() && f.name.back() == ')') continue;
filter.append(" (");
bool first = true;
for (auto const& mask : f.masks) {
diff --git a/src/monitor-gui.cc b/src/monitor-gui.cc
index 602acce..8a2509d 100644
--- a/src/monitor-gui.cc
+++ b/src/monitor-gui.cc
@@ -37,7 +37,7 @@
namespace {
-std::string const APP_TITLE = "TransparentProxy Monitor";
+std::string const APP_TITLE = "TransparentProxy";
std::string const ACTION_SETUP = "setup";
std::string const ACTION_CONNECT = "connect";
@@ -653,12 +653,18 @@ public:
modified_(false)
{
pem_filter_.emplace_back();
- pem_filter_.back().name = "PEM";
+ pem_filter_.back().name = "PEM (*.pem)";
pem_filter_.back().masks.emplace_back("*.pem");
+ pem_filter_.emplace_back();
+ pem_filter_.back().name = "All files";
+ pem_filter_.back().masks.emplace_back("*.*");
crt_filter_.emplace_back();
- crt_filter_.back().name = "Certificates";
+ crt_filter_.back().name = "Certificates (*.crt)";
crt_filter_.back().masks.emplace_back("*.crt");
+ crt_filter_.emplace_back();
+ crt_filter_.back().name = "All files";
+ crt_filter_.back().masks.emplace_back("*.*");
auto file = menu_->add_menu("File");
file->add_item(ACTION_NEW, "New");
@@ -671,8 +677,11 @@ public:
menu_->enable_item(ACTION_SAVE, false);
file_filter_.emplace_back();
- file_filter_.back().name = "TransparentProxy Packages";
+ file_filter_.back().name = "TransparentProxy Packages (*.tpp)";
file_filter_.back().masks.emplace_back("*.tpp");
+ file_filter_.emplace_back();
+ file_filter_.back().name = "All files";
+ file_filter_.back().masks.emplace_back("*.*");
auto proxy = menu_->add_menu("Proxy");
proxy->add_item(ACTION_SETUP, "Setup...");