X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=d2653d26952c51f5078a18a17695deab5cfb01fe;hp=8ebf4a50bd3344518b991aea4bf9322ebeaa1835;hb=763945bb95fb3f5871d8b8241c8d9db2f0f66d4c;hpb=3231fbf9374113d07d3d544a4822ae46032062a2

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 8ebf4a50..d2653d26 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@ -29,6 +28,7 @@
 #include <QSignalMapper>
 #include <QToolButton>
 #include <QTabWidget>
+#include <QShortcut>
 
 #include "session.hpp"
 #include "views/viewbase.hpp"
@@ -80,6 +80,8 @@ public:
 	std::shared_ptr<views::ViewBase> add_view(const QString &title,
 		views::ViewType type, Session &session);
 
+	void remove_view(std::shared_ptr<views::ViewBase> view);
+
 	std::shared_ptr<Session> add_session();
 
 	void remove_session(std::shared_ptr<Session> session);
@@ -101,9 +103,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);
 
@@ -128,17 +130,20 @@ private Q_SLOTS:
 
 	void on_actionAbout_triggered();
 
+	void on_close_current_tab();
+
 private:
 	DeviceManager &device_manager_;
 
 	std::list< std::shared_ptr<Session> > sessions_;
+	std::shared_ptr<Session> last_focused_session_;
 
 	std::map< QDockWidget*,	std::shared_ptr<views::ViewBase> > view_docks_;
 
 	std::map< std::shared_ptr<Session>, 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_;
 
@@ -149,6 +154,10 @@ private:
 	QIcon icon_red_;
 	QIcon icon_green_;
 	QIcon icon_grey_;
+
+	QShortcut *run_stop_shortcut_;
+	QShortcut *close_application_shortcut_;
+	QShortcut *close_current_tab_shortcut_;
 };
 
 } // namespace pv