X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=06eba40ac212760373defba5fbdac8b7c46b9037;hb=c8a6db0e46202d49b47158e902e1afb8b1d5fbcf;hp=ea549c502a27c841001569bfe20b43d1d065f111;hpb=476ca5f48e8a528d529f36b8b0c8471c655415ad;p=pulseview.git diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index ea549c50..06eba40a 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -30,7 +30,6 @@ #include #include -#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 get_active_view() const; - shared_ptr add_view(const QString &title, - views::ViewType type, Session &session); + shared_ptr add_view(views::ViewType type, Session &session); void remove_view(shared_ptr 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 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); @@ -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,10 +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_close_current_tab(); private: