X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=1879693d57a31c01bc87458f556d67dd01db7506;hp=76cd8ea17632d689a675d1d089d26549e30a0028;hb=ca1d6d5f466272ac7e906b589e2804b12568fa96;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 76cd8ea1..1879693d 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -35,6 +35,7 @@
 
 #include <boost/algorithm/string/join.hpp>
 
+#include <pv/data/decodesignal.hpp>
 #include <pv/devicemanager.hpp>
 #include <pv/devices/hardwaredevice.hpp>
 #include <pv/devices/inputfile.hpp>
@@ -87,7 +88,7 @@ const char *MainBar::SettingOpenDirectory = "MainWindow/OpenDirectory";
 const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainBar::MainBar(Session &session, QWidget *parent,
-		pv::views::TraceView::View *view) :
+		pv::views::trace::View *view) :
 	StandardBar(session, parent, view, false),
 	action_new_view_(new QAction(this)),
 	action_open_(new QAction(this)),
@@ -479,12 +480,6 @@ void MainBar::update_device_config_widgets()
 	if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::SET))
 		sample_count_supported_ = true;
 
-	if (sr_dev->config_check(ConfigKey::LIMIT_FRAMES, Capability::SET)) {
-		sr_dev->config_set(ConfigKey::LIMIT_FRAMES,
-			Glib::Variant<guint64>::create(1));
-			on_config_changed();
-	}
-
 	// Add notification of reconfigure events
 	disconnect(this, SLOT(on_config_changed()));
 	connect(&opts->binding(), SIGNAL(config_changed()),
@@ -575,7 +570,9 @@ void MainBar::add_decoder(srd_decoder *decoder)
 {
 #ifdef ENABLE_DECODE
 	assert(decoder);
-	session_.add_decoder(decoder);
+	shared_ptr<data::DecodeSignal> signal = session_.add_decode_signal();
+	if (signal)
+		signal->stack_decoder(decoder);
 #else
 	(void)decoder;
 #endif
@@ -595,8 +592,8 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
 
 	// Selection only? Verify that the cursors are active and fetch their values
 	if (selection_only) {
-		views::TraceView::View *trace_view =
-			qobject_cast<views::TraceView::View*>(session_.main_view().get());
+		views::trace::View *trace_view =
+			qobject_cast<views::trace::View*>(session_.main_view().get());
 
 		if (!trace_view->cursors()->enabled()) {
 			show_session_error(tr("Missing Cursors"), tr("You need to set the " \
@@ -671,16 +668,19 @@ void MainBar::import_file(shared_ptr<InputFormat> format)
 
 	// Construct the filter
 	const vector<string> exts = format->extensions();
-	const QString filter = exts.empty() ? "" :
-		tr("%1 files (*.%2)").arg(
-			QString::fromStdString(format->description()),
-			QString::fromStdString(join(exts, ", *.")));
+	const QString filter_exts = exts.empty() ? "" : QString::fromStdString("%1 (%2)").arg(
+		tr("%1 files").arg(QString::fromStdString(format->description())),
+		QString::fromStdString("*.%1").arg(QString::fromStdString(join(exts, " *."))));
+	const QString filter_all = QString::fromStdString("%1 (%2)").arg(
+		tr("All Files"), QString::fromStdString("*"));
+	const QString filter = QString::fromStdString("%1%2%3").arg(
+		exts.empty() ? "" : filter_exts,
+		exts.empty() ? "" : ";;",
+		filter_all);
 
 	// Show the file dialog
 	const QString file_name = QFileDialog::getOpenFileName(
-		this, tr("Import File"), dir, tr(
-			"%1 files (*);;All Files (*)").arg(
-			QString::fromStdString(format->description())));
+		this, tr("Import File"), dir, filter);
 
 	if (file_name.isEmpty())
 		return;