X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.h;h=6f3c8d56344d601d90628578ac1da419ac3f7e71;hb=1aef69f9792d8c032269afd6cfb2122b125aea4d;hp=d34db1bffaa6d4a4a53acf88f9b1d39617b2afdf;hpb=03ce95a9bb81c05bae0da9de189d280214db67c3;p=pulseview.git

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index d34db1bf..6f3c8d56 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -26,21 +26,17 @@
 #include <boost/weak_ptr.hpp>
 
 #include <QMainWindow>
-#include <QSignalMapper>
 
 #include "sigsession.h"
 
-class QAction;
-class QMenuBar;
-class QMenu;
+struct srd_decoder;
+
 class QVBoxLayout;
-class QStatusBar;
-class QToolBar;
-class QWidget;
 
 namespace pv {
 
 class DeviceManager;
+class DevInst;
 
 namespace toolbars {
 class ContextBar;
@@ -51,6 +47,10 @@ namespace view {
 class View;
 }
 
+namespace widgets {
+class DecoderMenu;
+}
+
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -72,10 +72,8 @@ private:
 	 * 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);
+		boost::shared_ptr<pv::DevInst> selected_device =
+			boost::shared_ptr<pv::DevInst>());
 
 private slots:
 	void load_file(QString file_name);
@@ -85,6 +83,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();
@@ -93,13 +92,15 @@ 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(QObject *action);
+	void add_decoder(srd_decoder *decoder);
 
 	void run_stop();
 
@@ -112,28 +113,9 @@ private:
 
 	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_decoders;
-	QMenu *_menu_decoders_add;
-	QSignalMapper _decoders_add_mapper;
-
-	QMenu *_menu_help;
-	QAction *_action_about;
-
 	QWidget *_central_widget;
 	QVBoxLayout *_vertical_layout;
 
-	QToolBar *_toolbar;
 	toolbars::SamplingBar *_sampling_bar;
 };