X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.h;h=f026e8f3f38e0326304283c62164d76638c32803;hp=8b7973744a881a19f421d91c1046394d3c6938f8;hb=643f65f96d3996c32569e9ee7cd4aa29adc2819a;hpb=f2edb55712e1f295935582558f694077da8d81e6

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 8b797374..f026e8f3 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -22,67 +22,55 @@
 #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;
+}
 
 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);
 
-private:
-
-	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;
-	SamplingBar *_sampling_bar;
+	/**
+	 * Updates the device list in the sampling bar
+	 */
+	void update_device_list();
 
 private slots:
 	void load_file(QString file_name);
@@ -92,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();
@@ -100,13 +89,43 @@ private slots:
 
 	void on_actionViewZoomOut_triggered();
 
+	void on_actionViewZoomFit_triggered();
+
+	void on_actionViewZoomOneToOne_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
 
+	void add_decoder(srd_decoder *decoder);
+
 	void run_stop();
 
 	void capture_state_changed(int state);
+
+private:
+	/**
+	 * Name of the setting used to remember the directory
+	 * containing the last file that was opened.
+	 */
+	static const char *SettingOpenDirectory;
+
+	/**
+	 * Name of the setting used to remember the directory
+	 * containing the last file that was saved.
+	 */
+	static const char *SettingSaveDirectory;
+
+	DeviceManager &_device_manager;
+
+	SigSession _session;
+
+	pv::view::View *_view;
+
+	QWidget *_central_widget;
+	QVBoxLayout *_vertical_layout;
+
+	toolbars::SamplingBar *_sampling_bar;
 };
 
 } // namespace pv