projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate the about dialog into the settings dialog
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index fdb3c88886d2ce05c0816e437ef4fbdb41f2983d..e3a51c6d88f5b32a62c2801eed7c743e3b33d4bf 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-71,8
+71,6
@@
public:
~MainWindow();
~MainWindow();
- QAction* action_about() const;
-
std::shared_ptr<views::ViewBase> get_active_view() const;
std::shared_ptr<views::ViewBase> add_view(const QString &title,
std::shared_ptr<views::ViewBase> get_active_view() const;
std::shared_ptr<views::ViewBase> add_view(const QString &title,
@@
-128,8
+126,6
@@
private Q_SLOTS:
void on_settingViewColouredBg_changed(const QVariant new_value);
void on_settingViewColouredBg_changed(const QVariant new_value);
- void on_actionAbout_triggered();
-
void on_close_current_tab();
private:
void on_close_current_tab();
private:
@@
-147,8
+143,6
@@
private:
QTabWidget session_selector_;
QSignalMapper session_state_mapper_;
QTabWidget session_selector_;
QSignalMapper session_state_mapper_;
- QAction *const action_about_;
-
QIcon icon_red_;
QIcon icon_green_;
QIcon icon_grey_;
QIcon icon_red_;
QIcon icon_green_;
QIcon icon_grey_;