X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fmainwindow.h;h=41c55ba5ca9c11f2d6282c497831c9ad83985d4f;hb=7db87de3cf2079f49ad395fba3a0b16f2b0f8ce5;hp=8895a5e7341242099557ba96782fc2cdd6532fc4;hpb=ca46b5342f79e4786b973c83ed6a4cde5a51908d;p=pulseview.git

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 8895a5e7..41c55ba5 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -22,19 +22,24 @@
 #define PULSEVIEW_PV_MAINWINDOW_H
 
 #include <list>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
 
 #include <QMainWindow>
 
 #include "sigsession.h"
 
+struct srd_decoder;
+
 class QVBoxLayout;
 
 namespace pv {
 
 class DeviceManager;
 
+namespace device {
+class DevInst;
+}
+
 namespace toolbars {
 class ContextBar;
 class SamplingBar;
@@ -63,17 +68,11 @@ 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);
-
-	static gint decoder_name_cmp(gconstpointer a, gconstpointer b);
+	void update_device_list();
 
-private slots:
+private Q_SLOTS:
 	void load_file(QString file_name);
 
 
@@ -81,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();
@@ -91,6 +91,8 @@ private slots:
 
 	void on_actionViewZoomFit_triggered();
 
+	void on_actionViewZoomOneToOne_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
@@ -102,6 +104,18 @@ private slots:
 	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;