X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=47704c2fc8f7abe1ab614c33f684ba4a87f1d513;hp=3887717fb4e6c76931f245a3cfe9da89d0902969;hb=aca00b1e0d3483926c53dfd856483a397f1c29a5;hpb=ef7e3146c97eda68f38632cc60edf7a42e846610

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 3887717f..47704c2f 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -23,7 +23,10 @@
 
 #include <list>
 
+#include <boost/weak_ptr.hpp>
+
 #include <QMainWindow>
+#include <QSignalMapper>
 
 #include "sigsession.h"
 
@@ -37,7 +40,12 @@ class QWidget;
 
 namespace pv {
 
+class DeviceManager;
+
+namespace toolbars {
+class ContextBar;
 class SamplingBar;
+}
 
 namespace view {
 class View;
@@ -48,15 +56,27 @@ class MainWindow : public QMainWindow
 	Q_OBJECT
 
 public:
-	explicit MainWindow(const char *open_file_name = NULL,
+	explicit MainWindow(DeviceManager &device_manager,
+		const char *open_file_name = NULL,
 		QWidget *parent = 0);
 
 private:
 	void setup_ui();
-	void scan_devices();
 
 	void session_error(const QString text, const QString info_text);
 
+	/**
+	 * Updates the device list in the sampling bar, and updates the
+	 * selection.
+	 * @param selected_device The device to select, or NULL if the
+	 * first device in the device list should be selected.
+	 */
+	void update_device_list(
+		struct sr_dev_inst *selected_device = NULL);
+
+	static gint decoder_name_cmp(gconstpointer a, gconstpointer b);
+	void setup_add_decoders(QMenu *parent);
+
 private slots:
 	void load_file(QString file_name);
 
@@ -77,14 +97,16 @@ private slots:
 
 	void on_actionAbout_triggered();
 
+	void add_decoder(QObject *action);
+
 	void run_stop();
 
 	void capture_state_changed(int state);
 
 private:
+	DeviceManager &_device_manager;
 
 	SigSession _session;
-	std::list<sr_dev_inst*> _devices;
 
 	pv::view::View *_view;
 
@@ -99,6 +121,10 @@ private:
 	QAction *_action_view_zoom_out;
 	QAction *_action_view_show_cursors;
 
+	QMenu *_menu_decoders;
+	QMenu *_menu_decoders_add;
+	QSignalMapper _decoders_add_mapper;
+
 	QMenu *_menu_help;
 	QAction *_action_about;
 
@@ -106,7 +132,7 @@ private:
 	QVBoxLayout *_vertical_layout;
 
 	QToolBar *_toolbar;
-	SamplingBar *_sampling_bar;
+	toolbars::SamplingBar *_sampling_bar;
 };
 
 } // namespace pv