projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the "new session" button to the main window's tab area
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index e9cecfb1deab73c4fcf3cb81578b3d5829c71c65..8dfe1bd00e5beaac8bcdaaea694c15618a24e01c 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-26,6
+26,7
@@
#include <memory>
#include <QMainWindow>
#include <memory>
#include <QMainWindow>
+#include <QToolButton>
#include <QTabWidget>
#include "session.hpp"
#include <QTabWidget>
#include "session.hpp"
@@
-102,11
+103,13
@@
private Q_SLOTS:
void on_focus_changed();
void on_focus_changed();
- void on_new_session();
+ void on_new_session
_clicked
();
void on_session_name_changed();
void on_new_view(Session *session);
void on_view_close_clicked();
void on_session_name_changed();
void on_new_view(Session *session);
void on_view_close_clicked();
+ void on_tab_close_requested(int index);
+
void on_actionViewStickyScrolling_triggered();
void on_actionViewColouredBg_triggered();
void on_actionViewStickyScrolling_triggered();
void on_actionViewColouredBg_triggered();
@@
-118,11
+121,11
@@
private:
std::list< std::shared_ptr<Session> > sessions_;
std::list< std::shared_ptr<Session> > sessions_;
- std::map< std::shared_ptr<QDockWidget>,
- std::shared_ptr<views::ViewBase> > view_docks_;
+ std::map< QDockWidget*, std::shared_ptr<views::ViewBase> > view_docks_;
std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
+ QToolButton *new_session_button_;
QTabWidget session_selector_;
QAction *const action_view_sticky_scrolling_;
QTabWidget session_selector_;
QAction *const action_view_sticky_scrolling_;