X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=0e971ce06cc7373f6da132479483101f187aa3c7;hb=98bac9636ee62a8863760a8b8381019a6a546173;hp=02df0ad510e3fb38be0b108daf444804e1fbfcfc;hpb=7dd093df9796d08c9b15d494eeeb0f8cd3570591;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 02df0ad..0e971ce 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -39,6 +39,7 @@
 #include "devicemanager.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "dialogs/decoder.h"
 #include "toolbars/contextbar.h"
 #include "toolbars/samplingbar.h"
 #include "view/view.h"
@@ -304,14 +305,14 @@ void MainWindow::setup_add_decoders(QMenu *parent)
 {
 	GSList *l = g_slist_sort(g_slist_copy(
 		(GSList*)srd_decoder_list()), decoder_name_cmp);
-	while ((l = l->next)) {
+	do {
 		QAction *const action = parent->addAction(QString(
 			((srd_decoder*)l->data)->name));
 		action->setData(qVariantFromValue(l->data));
 		_decoders_add_mapper.setMapping(action, action);
 		connect(action, SIGNAL(triggered()),
 			&_decoders_add_mapper, SLOT(map()));
-	}
+	} while ((l = l->next));
 	g_slist_free(l);
 }
 
@@ -382,7 +383,24 @@ void MainWindow::device_selected()
 
 void MainWindow::add_decoder(QObject *action)
 {
-	(void)action;
+	assert(action);
+	srd_decoder *const dec =
+		(srd_decoder*)((QAction*)action)->data().value<void*>();
+	assert(dec);
+
+	const std::vector< boost::shared_ptr<view::Signal> > &sigs =
+		_session.get_signals();
+
+	GHashTable *const options = g_hash_table_new_full(g_str_hash,
+		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+	dialogs::Decoder dlg(this, dec, sigs, options);
+	if(dlg.exec() != QDialog::Accepted) {
+		g_hash_table_destroy(options);
+		return;
+	}
+
+	_session.add_decoder(dec, dlg.get_probes(), options);
 }
 
 void MainWindow::run_stop()