X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.h;h=d5ac35ee92c68fc92dcf14651efa91167702a6d9;hb=269528f55e7fd77f762c2008d257921cd30e1519;hp=b4b64f779de1419ac4686defedd67566c942aa5c;hpb=7dd093df9796d08c9b15d494eeeb0f8cd3570591;p=pulseview.git

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index b4b64f7..d5ac35e 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -26,17 +26,12 @@
 #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 {
 
@@ -51,6 +46,10 @@ namespace view {
 class View;
 }
 
+namespace widgets {
+class DecoderMenu;
+}
+
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -74,9 +73,6 @@ private:
 	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);
 
@@ -93,20 +89,20 @@ 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();
 
 	void capture_state_changed(int state);
 
-	void view_selection_changed();
-
 private:
 	DeviceManager &_device_manager;
 
@@ -114,30 +110,10 @@ 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;
-	toolbars::ContextBar *_context_bar;
 };
 
 } // namespace pv