X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=22df24cfe4278ce1c271accfbf80db97bda09f6a;hp=8129020348109ec6c395672f27bfa98995f9f9c3;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=5ac961e325a9d2cbafdd8fae3a6704d7348cf19a

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 81290203..22df24cf 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -22,22 +22,26 @@
 #define PULSEVIEW_PV_MAINWINDOW_H
 
 #include <list>
+#include <memory>
 
 #include <QMainWindow>
 
 #include "sigsession.h"
 
-class QAction;
-class QMenuBar;
-class QMenu;
+struct srd_decoder;
+
 class QVBoxLayout;
-class QStatusBar;
-class QToolBar;
-class QWidget;
 
 namespace pv {
 
+class DeviceManager;
+
+namespace device {
+class DevInst;
+}
+
 namespace toolbars {
+class ContextBar;
 class SamplingBar;
 }
 
@@ -45,20 +49,29 @@ namespace view {
 class View;
 }
 
+namespace widgets {
+class DecoderMenu;
+}
+
 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
+	 */
+	void update_device_list();
+
 private slots:
 	void load_file(QString file_name);
 
@@ -67,6 +80,7 @@ private slots:
 		const QString text, const QString info_text);
 
 	void on_actionOpen_triggered();
+	void on_actionSaveAs_triggered();
 	void on_actionQuit_triggered();
 
 	void on_actionConnect_triggered();
@@ -75,41 +89,30 @@ private slots:
 
 	void on_actionViewZoomOut_triggered();
 
+	void on_actionViewZoomFit_triggered();
+
+	void on_actionViewZoomOneToOne_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
 
-	void device_selected();
+	void add_decoder(srd_decoder *decoder);
 
 	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;
 
-	QMenuBar *_menu_bar;
-	QMenu *_menu_file;
-	QAction *_action_open;
-	QAction *_action_connect;
-	QAction *_action_quit;
-
-	QMenu *_menu_view;
-	QAction *_action_view_zoom_in;
-	QAction *_action_view_zoom_out;
-	QAction *_action_view_show_cursors;
-
-	QMenu *_menu_help;
-	QAction *_action_about;
-
 	QWidget *_central_widget;
 	QVBoxLayout *_vertical_layout;
 
-	QToolBar *_toolbar;
 	toolbars::SamplingBar *_sampling_bar;
 };