MainWindow: Allow tabs to be closed

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 775f9dec90a53d628271f5580a829b60b2027035..31e9f2f9764e8b4603b0264401e065153b597278 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -307,6 +307,11 @@ void MainWindow::setup_ui()
        action_about_->setObjectName(QString::fromUtf8("actionAbout"));
        action_about_->setText(tr("&About..."));
 
+       session_selector_.setTabsClosable(true);
+
+       connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
+               this, SLOT(on_tab_close_requested(int)));
+
        setDockNestingEnabled(true);
 
        connect(static_cast<QApplication *>(QCoreApplication::instance()),
@@ -486,6 +491,18 @@ void MainWindow::on_view_close_clicked()
        }
 }
 
+void MainWindow::on_tab_close_requested(int index)
+{
+       // TODO Ask user if this is intended in case data is unsaved
+
+       // Find the session that belongs to this main window and remove it
+       for (auto entry : session_windows_)
+               if (entry.second == session_selector_.widget(index)) {
+                       remove_session(entry.first);
+                       break;
+               }
+}
+
 void MainWindow::on_actionViewStickyScrolling_triggered()
 {
        shared_ptr<views::ViewBase> viewbase = get_active_view();

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 2448a3570d45b9f10187a480d6ef7a85dcf5a83d..37954fe85ac8e0006c78916737fe8aadbe47ac6d 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -107,6 +107,8 @@ private Q_SLOTS:
        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();