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

diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 8895a5e..94a6c42 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -22,13 +22,14 @@
 #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 {
@@ -60,27 +61,27 @@ public:
 private:
 	void setup_ui();
 
+	void save_ui_settings();
+
+	void restore_ui_settings();
+
 	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();
 
-	static gint decoder_name_cmp(gconstpointer a, gconstpointer b);
+	void closeEvent(QCloseEvent *event);
 
-private slots:
+private Q_SLOTS:
 	void load_file(QString file_name);
 
-
 	void show_session_error(
 		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 +92,8 @@ private slots:
 
 	void on_actionViewZoomFit_triggered();
 
+	void on_actionViewZoomOneToOne_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
@@ -102,16 +105,28 @@ private slots:
 	void capture_state_changed(int state);
 
 private:
-	DeviceManager &_device_manager;
+	/**
+	 * 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;
+	SigSession session_;
 
-	pv::view::View *_view;
+	pv::view::View *view_;
 
-	QWidget *_central_widget;
-	QVBoxLayout *_vertical_layout;
+	QWidget *central_widget_;
+	QVBoxLayout *vertical_layout_;
 
-	toolbars::SamplingBar *_sampling_bar;
+	toolbars::SamplingBar *sampling_bar_;
 };
 
 } // namespace pv