X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=06eba40ac212760373defba5fbdac8b7c46b9037;hb=fae7037ab7ba0422c9f6d8a0523fd53a1b9cedfe;hp=aa325e7373c0f3c21a414e35c0f045b07c8ffd9a;hpb=c2d0c4848c574365a028e68d0c28831f088b4405;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index aa325e73..06eba40a 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -30,7 +30,6 @@
 #include <QTabWidget>
 #include <QToolButton>
 
-#include "globalsettings.hpp"
 #include "session.hpp"
 #include "subwindows/subwindowbase.hpp"
 #include "views/viewbase.hpp"
@@ -63,7 +62,7 @@ class DecoderMenu;
 #endif
 }
 
-class MainWindow : public QMainWindow, public GlobalSettingsInterface
+class MainWindow : public QMainWindow
 {
 	Q_OBJECT
 
@@ -80,8 +79,7 @@ public:
 
 	shared_ptr<views::ViewBase> get_active_view() const;
 
-	shared_ptr<views::ViewBase> add_view(const QString &title,
-		views::ViewType type, Session &session);
+	shared_ptr<views::ViewBase> add_view(views::ViewType type, Session &session);
 
 	void remove_view(shared_ptr<views::ViewBase> view);
 
@@ -100,17 +98,12 @@ public:
 	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();
 
-	void zoom_current_view(double steps);
-	void scroll_to_start_or_end(bool start);
-
 	shared_ptr<Session> get_tab_session(int index) const;
 
 	void closeEvent(QCloseEvent *event);
@@ -120,8 +113,7 @@ private:
 	virtual bool restoreState(const QByteArray &state, int version = 0);
 
 private Q_SLOTS:
-	void on_add_view(const QString &title, views::ViewType type,
-		Session *session);
+	void on_add_view(views::ViewType type, Session *session);
 
 	void on_focus_changed();
 	void on_focused_session_changed(shared_ptr<Session> session);
@@ -133,7 +125,7 @@ private Q_SLOTS:
 	void on_session_name_changed();
 	void on_capture_state_changed(QObject *obj);
 
-	void on_new_view(Session *session);
+	void on_new_view(Session *session, int view_type);
 	void on_view_close_clicked();
 
 	void on_tab_changed(int index);
@@ -147,15 +139,6 @@ private Q_SLOTS:
 	void on_view_show_sampling_points_shortcut();
 	void on_view_show_analog_minor_grid_shortcut();
 
-	void on_settingViewColoredBg_changed(const QVariant new_value);
-	void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
-	void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
-
-	void on_zoom_out_shortcut_triggered();
-	void on_zoom_in_shortcut_triggered();
-	void on_scroll_to_start_triggered();
-	void on_scroll_to_end_triggered();
-
 	void on_close_current_tab();
 
 private:
@@ -185,12 +168,6 @@ private:
 	QShortcut *run_stop_shortcut_;
 	QShortcut *close_application_shortcut_;
 	QShortcut *close_current_tab_shortcut_;
-	QShortcut *zoom_in_shortcut_;
-	QShortcut *zoom_in_shortcut_2_;
-	QShortcut *zoom_out_shortcut_;
-	QShortcut *zoom_out_shortcut_2_;
-	QShortcut *home_shortcut_;
-	QShortcut *end_shortcut_;
 };
 
 } // namespace pv