X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=6f3676c214f24c7343ed62bde29fe1446d1d036f;hb=8ba6f8b7541409dd33fd4ddd1b51494f555773c9;hp=2a2dabcdc542cfd0d71490c99f3842e6852dc0c6;hpb=97378470ded88af84edaa0f1063d10d834475665;p=pulseview.git diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 2a2dabcd..6f3676c2 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 @@ -92,15 +91,14 @@ public: void remove_session(shared_ptr session); - void add_session_with_file(string open_file_name, string open_file_format); + void add_session_with_file(string open_file_name, string open_file_format, + string open_setup_file_name); void add_default_session(); void save_sessions(); void restore_sessions(); - void on_setting_changed(const QString &key, const QVariant &value); - private: void setup_ui(); @@ -143,10 +141,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: