X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=6d92b270dc6394f4fd5c2a66bb604766044b8c98;hp=6541ccc6dff181e2cf386ed75657f5c0ecf11d1c;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hpb=8ad61f4071a69445a6917d214b6592878447ddb1

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 6541ccc..6d92b27 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -30,6 +30,7 @@
 #include <QTabWidget>
 #include <QToolButton>
 
+#include "globalsettings.hpp"
 #include "session.hpp"
 #include "views/viewbase.hpp"
 
@@ -61,7 +62,7 @@ class DecoderMenu;
 #endif
 }
 
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, public GlobalSettingsInterface
 {
 	Q_OBJECT
 
@@ -70,12 +71,12 @@ private:
 
 public:
 	explicit MainWindow(DeviceManager &device_manager,
-		string open_file_name = string(),
-		string open_file_format = string(),
 		QWidget *parent = nullptr);
 
 	~MainWindow();
 
+	static void show_session_error(const QString text, const QString info_text);
+
 	shared_ptr<views::ViewBase> get_active_view() const;
 
 	shared_ptr<views::ViewBase> add_view(const QString &title,
@@ -87,11 +88,19 @@ public:
 
 	void remove_session(shared_ptr<Session> session);
 
+	void add_session_with_file(string open_file_name, string open_file_format);
+
+	void add_default_session();
+
+	void save_sessions();
+	void restore_sessions();
+
+	void on_setting_changed(const QString &key, const QVariant &value);
+
 private:
 	void setup_ui();
 
 	void save_ui_settings();
-
 	void restore_ui_settings();
 
 	shared_ptr<Session> get_tab_session(int index) const;
@@ -102,11 +111,7 @@ private:
 
 	virtual bool restoreState(const QByteArray &state, int version = 0);
 
-	void session_error(const QString text, const QString info_text);
-
 private Q_SLOTS:
-	void show_session_error(const QString text, const QString info_text);
-
 	void on_add_view(const QString &title, views::ViewType type,
 		Session *session);
 
@@ -126,12 +131,12 @@ private Q_SLOTS:
 	void on_tab_changed(int index);
 	void on_tab_close_requested(int index);
 
-	void on_view_coloured_bg_shortcut();
+	void on_view_colored_bg_shortcut();
 	void on_view_sticky_scrolling_shortcut();
 	void on_view_show_sampling_points_shortcut();
 	void on_view_show_analog_minor_grid_shortcut();
 
-	void on_settingViewColouredBg_changed(const QVariant new_value);
+	void on_settingViewColoredBg_changed(const QVariant new_value);
 	void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
 	void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
 
@@ -159,7 +164,7 @@ private:
 	QShortcut *view_sticky_scrolling_shortcut_;
 	QShortcut *view_show_sampling_points_shortcut_;
 	QShortcut *view_show_analog_minor_grid_shortcut_;
-	QShortcut *view_coloured_bg_shortcut_;
+	QShortcut *view_colored_bg_shortcut_;
 	QShortcut *run_stop_shortcut_;
 	QShortcut *close_application_shortcut_;
 	QShortcut *close_current_tab_shortcut_;