X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=1f9dd528af7a22d152adace7342cb827882197da;hp=51577bdb742d9a53303ed260bfc77075e17a8aa8;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hpb=404aad0ed6bd90566739af6ecb57475bc02a7c8e

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 51577bdb..1f9dd528 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -23,22 +23,24 @@
 
 #include <list>
 
+#include <boost/weak_ptr.hpp>
+
 #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;
@@ -48,6 +50,10 @@ namespace view {
 class View;
 }
 
+namespace widgets {
+class DecoderMenu;
+}
+
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -63,13 +69,9 @@ private:
 	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.
+	 * Updates the device list in the sampling bar
 	 */
-	void update_device_list(
-		struct sr_dev_inst *selected_device = NULL);
+	void update_device_list();
 
 private slots:
 	void load_file(QString file_name);
@@ -79,6 +81,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();
@@ -87,11 +90,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(srd_decoder *decoder);
 
 	void run_stop();
 
@@ -104,26 +111,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_help;
-	QAction *_action_about;
-
 	QWidget *_central_widget;
 	QVBoxLayout *_vertical_layout;
 
-	QToolBar *_toolbar;
 	toolbars::SamplingBar *_sampling_bar;
-	toolbars::ContextBar *_context_bar;
 };
 
 } // namespace pv