X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=f907f09cce33f118b0c830dbc0ee564f50a76501;hp=81112aba805ffa688fbef84bc91708c38ab569b6;hb=3917ba77254318c3518555f164983d4d92183fba;hpb=e93f553816d1938ab1917dff497a36acec4257e3

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 81112aba..f907f09c 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -27,6 +27,8 @@
 #include <algorithm>
 #include <iterator>
 
+#include <boost/algorithm/string/join.hpp>
+
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
@@ -66,6 +68,9 @@ using std::list;
 using std::map;
 using std::shared_ptr;
 using std::string;
+using std::vector;
+
+using boost::algorithm::join;
 
 using sigrok::Device;
 using sigrok::Error;
@@ -96,8 +101,10 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	action_view_zoom_fit_(new QAction(this)),
 	action_view_zoom_one_to_one_(new QAction(this)),
 	action_view_show_cursors_(new QAction(this)),
-	action_about_(new QAction(this)),
-	menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+	action_about_(new QAction(this))
+#ifdef ENABLE_DECODE
+	, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+#endif
 {
 	setup_ui();
 	restore_ui_settings();
@@ -159,10 +166,12 @@ QAction* MainWindow::action_about() const
 	return action_about_;
 }
 
+#ifdef ENABLE_DECODE
 QMenu* MainWindow::menu_decoder_add() const
 {
 	return menu_decoders_add_;
 }
+#endif
 
 void MainWindow::run_stop()
 {
@@ -203,10 +212,21 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
 	QSettings settings;
 	const QString dir = settings.value(SettingSaveDirectory).toString();
 
+	// Construct the filter
+	const vector<string> exts = format->extensions();
+	QString filter = tr("%1 files ").arg(
+		QString::fromStdString(format->description()));
+
+	if (exts.empty())
+		filter += "(*.*)";
+	else
+		filter += QString("(*.%1);;%2 (*.*)").arg(
+			QString::fromStdString(join(exts, ", *."))).arg(
+			tr("All Files"));
+
 	// Show the file dialog
 	const QString file_name = QFileDialog::getSaveFileName(
-		this, tr("Save File"), dir, tr("%1 files (*.*)").arg(
-			QString::fromStdString(format->description())));
+		this, tr("Save File"), dir, filter);
 
 	if (file_name.isEmpty())
 		return;