X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=ac098b21ae3580b9a8350d377f74e5773e0b6faa;hp=8ebf4a50bd3344518b991aea4bf9322ebeaa1835;hb=9eae6de4dd0a3c628026eca6ca55cef8b70bfa86;hpb=3231fbf9374113d07d3d544a4822ae46032062a2
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 8ebf4a50..ac098b21 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@ -29,6 +28,7 @@
#include
#include
#include
+#include
#include "session.hpp"
#include "views/viewbase.hpp"
@@ -71,8 +71,6 @@ public:
~MainWindow();
- QAction* action_view_sticky_scrolling() const;
- QAction* action_view_coloured_bg() const;
QAction* action_about() const;
std::shared_ptr get_active_view() const;
@@ -80,6 +78,8 @@ public:
std::shared_ptr add_view(const QString &title,
views::ViewType type, Session &session);
+ void remove_view(std::shared_ptr view);
+
std::shared_ptr add_session();
void remove_session(std::shared_ptr session);
@@ -101,9 +101,9 @@ private:
void session_error(const QString text, const QString info_text);
+private Q_SLOTS:
void show_session_error(const QString text, const QString info_text);
-private Q_SLOTS:
void on_add_view(const QString &title, views::ViewType type,
Session *session);
@@ -122,33 +122,40 @@ private Q_SLOTS:
void on_tab_changed(int index);
void on_tab_close_requested(int index);
- void on_actionViewStickyScrolling_triggered();
+ void on_view_sticky_scrolling_shortcut();
- void on_actionViewColouredBg_triggered();
+ void on_view_coloured_bg_shortcut();
void on_actionAbout_triggered();
+ void on_close_current_tab();
+
private:
DeviceManager &device_manager_;
std::list< std::shared_ptr > sessions_;
+ std::shared_ptr last_focused_session_;
std::map< QDockWidget*, std::shared_ptr > view_docks_;
std::map< std::shared_ptr, QMainWindow*> session_windows_;
QWidget *static_tab_widget_;
- QToolButton *new_session_button_, *run_stop_button_;
+ QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
QTabWidget session_selector_;
QSignalMapper session_state_mapper_;
- QAction *const action_view_sticky_scrolling_;
- QAction *const action_view_coloured_bg_;
QAction *const action_about_;
QIcon icon_red_;
QIcon icon_green_;
QIcon icon_grey_;
+
+ QShortcut *view_sticky_scrolling_shortcut_;
+ QShortcut *view_coloured_bg_shortcut_;
+ QShortcut *run_stop_shortcut_;
+ QShortcut *close_application_shortcut_;
+ QShortcut *close_current_tab_shortcut_;
};
} // namespace pv