X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.h;h=8895a5e7341242099557ba96782fc2cdd6532fc4;hb=ca46b5342f79e4786b973c83ed6a4cde5a51908d;hp=d34db1bffaa6d4a4a53acf88f9b1d39617b2afdf;hpb=03ce95a9bb81c05bae0da9de189d280214db67c3;p=pulseview.git

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index d34db1b..8895a5e 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -26,17 +26,10 @@
 #include <boost/weak_ptr.hpp>
 
 #include <QMainWindow>
-#include <QSignalMapper>
 
 #include "sigsession.h"
 
-class QAction;
-class QMenuBar;
-class QMenu;
 class QVBoxLayout;
-class QStatusBar;
-class QToolBar;
-class QWidget;
 
 namespace pv {
 
@@ -51,6 +44,10 @@ namespace view {
 class View;
 }
 
+namespace widgets {
+class DecoderMenu;
+}
+
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -75,7 +72,6 @@ private:
 		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);
@@ -93,13 +89,13 @@ private slots:
 
 	void on_actionViewZoomOut_triggered();
 
+	void on_actionViewZoomFit_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 +108,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;
 };