From e90a297c8004af22f04c65eec361dcf30ae25220 Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Sat, 23 Nov 2019 15:55:40 +0800
Subject: [PATCH 1/7] Enable closing a tab by middle button click

---
 shell/shell.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index 5a7113fa7..a97139e39 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -171,6 +171,18 @@ bool Shell::eventFilter(QObject *obj, QEvent *event)
         dEvent->setAccepted(true);
         return true;
     }
+
+    // Handle middle button click events on the tab bar
+    if (obj == m_tabWidget && event->type() == QEvent::MouseButtonRelease) {
+        QMouseEvent* mEvent = static_cast<QMouseEvent*>(event);
+        if (mEvent->button() == Qt::MiddleButton) {
+            int tabIndex = m_tabWidget->tabBar()->tabAt(mEvent->pos());
+            if (tabIndex != -1) {
+                m_tabWidget->removeTab(tabIndex);
+                return true;
+            }
+        }
+    }
     return false;
 }
 
-- 
GitLab


From aa3bbfbc9847968bb9ef8b5d1da2683cd7fec1ac Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Tue, 26 Nov 2019 12:46:35 +0800
Subject: [PATCH 2/7] Fix removeTab => closeTab

---
 shell/shell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index a97139e39..3a75764a7 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -178,7 +178,7 @@ bool Shell::eventFilter(QObject *obj, QEvent *event)
         if (mEvent->button() == Qt::MiddleButton) {
             int tabIndex = m_tabWidget->tabBar()->tabAt(mEvent->pos());
             if (tabIndex != -1) {
-                m_tabWidget->removeTab(tabIndex);
+                closeTab(tabIndex);
                 return true;
             }
         }
-- 
GitLab


From 0b5accbcbeccc09596c55fc10a7e7e1144eeb0bc Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Tue, 26 Nov 2019 20:48:19 +0800
Subject: [PATCH 3/7] Add undo close tab menu item

---
 shell/shell.cpp | 23 +++++++++++++++++++++++
 shell/shell.h   |  4 ++++
 shell/shell.rc  |  1 +
 3 files changed, 28 insertions(+)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index 3a75764a7..a27529f5f 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -374,6 +374,13 @@ void Shell::setupActions()
   actionCollection()->setDefaultShortcuts(m_prevTabAction, KStandardShortcut::tabPrev());
   m_prevTabAction->setEnabled( false );
   connect( m_prevTabAction, &QAction::triggered, this, &Shell::activatePrevTab );
+
+  m_undoCloseTab = actionCollection()->addAction(QStringLiteral("undo-close-tab"));
+  m_undoCloseTab->setText( i18n("Undo close tab") );
+  actionCollection()->setDefaultShortcut(m_undoCloseTab, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_T));
+  m_undoCloseTab->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));
+  m_undoCloseTab->setEnabled( false );
+  connect( m_undoCloseTab, &QAction::triggered, this, &Shell::undoCloseTab );
 }
 
 void Shell::saveProperties(KConfigGroup &group)
@@ -639,6 +646,7 @@ void Shell::setActiveTab( int tab )
 void Shell::closeTab( int tab )
 {
     KParts::ReadWritePart* const part = m_tabs[tab].part;
+    QUrl url = part->url();
     if( part->closeUrl() && m_tabs.count() > 1 )
     {
         if( part->factory() )
@@ -647,6 +655,8 @@ void Shell::closeTab( int tab )
         part->deleteLater();
         m_tabs.removeAt( tab );
         m_tabWidget->removeTab( tab );
+        m_undoCloseTab->setEnabled( true );
+        m_closedTabUrls.push_back( url );
 
         if( m_tabWidget->count() == 1 )
         {
@@ -762,6 +772,19 @@ void Shell::activatePrevTab()
     setActiveTab( prevTab );
 }
 
+void Shell::undoCloseTab()
+{
+    if ( m_closedTabUrls.size() == 0 )
+        return;
+
+    const QUrl lastTabUrl = m_closedTabUrls.takeLast();
+
+    if ( m_closedTabUrls.size() == 0 )
+        m_undoCloseTab->setEnabled(false);
+
+    openUrl(lastTabUrl);
+}
+
 void Shell::setTabIcon( const QMimeType& mimeType )
 {
     int i = findTabIndex( sender() );
diff --git a/shell/shell.h b/shell/shell.h
index 5b8e6cfe3..6dd13e546 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -21,6 +21,7 @@
 #include <QMimeType>
 #include <QMimeDatabase>
 #include <QAction>
+#include <QLinkedList>
 
 #include <QtDBus> // krazy:exclude=includes
 
@@ -124,6 +125,7 @@ private Q_SLOTS:
   void closeTab( int tab );
   void activateNextTab();
   void activatePrevTab();
+  void undoCloseTab();
   void moveTabData( int from, int to );
 
   void slotFitWindowToPage( const QSize& pageViewSize, const QSize& pageSize );
@@ -168,8 +170,10 @@ private:
     bool closeEnabled;
   };
   QList<TabState> m_tabs;
+  QLinkedList<QUrl> m_closedTabUrls;
   QAction* m_nextTabAction;
   QAction* m_prevTabAction;
+  QAction* m_undoCloseTab;
 
 #ifndef Q_OS_WIN
   KActivities::ResourceInstance* m_activityResource;
diff --git a/shell/shell.rc b/shell/shell.rc
index 93fbc4175..0452b3f23 100644
--- a/shell/shell.rc
+++ b/shell/shell.rc
@@ -5,6 +5,7 @@
    <DefineGroup append="open_merge" name="file_open" />
    <DefineGroup append="save_merge" name="file_save" />
    <DefineGroup append="print_merge" name="file_print" />
+   <Action name="undo-close-tab" group="file_open" />
   </Menu>
   <!--Menu name="view" >
    <Action name="fullscreen" />
-- 
GitLab


From 5b5097b96765cf9485de1d1ba3191933e4618642 Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Tue, 26 Nov 2019 21:57:24 +0800
Subject: [PATCH 4/7] Add middle button close, undo tab close test

---
 autotests/mainshelltest.cpp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/autotests/mainshelltest.cpp b/autotests/mainshelltest.cpp
index 2d14ed698..686abf9d9 100644
--- a/autotests/mainshelltest.cpp
+++ b/autotests/mainshelltest.cpp
@@ -12,6 +12,7 @@
 #include <qprintdialog.h>
 #include <qwidget.h>
 #include <qtabwidget.h>
+#include <QTabBar>
 #include <QStandardPaths>
 #include <kconfiggroup.h>
 #include <klineedit.h>
@@ -85,6 +86,7 @@ private slots:
     void testFileRemembersPagePosition();
     void test2FilesError_data();
     void test2FilesError();
+    void testMiddleButtonCloseUndo();
     void testSessionRestore_data();
     void testSessionRestore();
 
@@ -599,5 +601,28 @@ void MainShellTest::testSessionRestore()
     QCOMPARE( shells.size(), useTabsRestore ? numWindows : paths.size() );
 }
 
+void MainShellTest::testMiddleButtonCloseUndo()
+{
+    const QStringList paths = { QStringLiteral(KDESRCDIR "data/file1.pdf"), QStringLiteral(KDESRCDIR "data/file2.pdf") };
+    QString serializedOptions;
+    serializedOptions = ShellUtils::serializeOptions(false, false, false, false, false, QString(), QString());
+
+    Okular::Settings::self()->setShellOpenFileInTabs(true);
+    Okular::Status status = Okular::main(paths, serializedOptions);
+    QCOMPARE(status, Okular::Success);
+    Shell *s = findShell();
+    QVERIFY(s);
+
+    QCOMPARE(s->m_tabWidget->count(), paths.size());
+    // Close a tab using middle key
+    QWidget *firstTab = s->m_tabWidget->tabBar()->tabButton(0, QTabBar::RightSide);
+    QVERIFY(firstTab);
+    QTest::mouseClick(firstTab, Qt::MiddleButton);
+    QCOMPARE(s->m_tabWidget->count(), paths.size() - 1);
+    // Undo tab close
+    s->undoCloseTab();
+    QCOMPARE(s->m_tabWidget->count(), paths.size());
+}
+
 QTEST_MAIN( MainShellTest )
 #include "mainshelltest.moc"
-- 
GitLab


From c868b91ec54b1c1f573dace96bb97d703b63f62b Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Wed, 27 Nov 2019 08:22:24 +0800
Subject: [PATCH 5/7] Fix code styles

---
 shell/shell.cpp | 10 +++++++---
 shell/shell.h   |  4 ++--
 shell/shell.rc  |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index a27529f5f..80165687c 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -656,7 +656,7 @@ void Shell::closeTab( int tab )
         m_tabs.removeAt( tab );
         m_tabWidget->removeTab( tab );
         m_undoCloseTab->setEnabled( true );
-        m_closedTabUrls.push_back( url );
+        m_closedTabUrls.append( url );
 
         if( m_tabWidget->count() == 1 )
         {
@@ -774,13 +774,17 @@ void Shell::activatePrevTab()
 
 void Shell::undoCloseTab()
 {
-    if ( m_closedTabUrls.size() == 0 )
+    if ( m_closedTabUrls.isEmpty() )
+    {
         return;
+    }
 
     const QUrl lastTabUrl = m_closedTabUrls.takeLast();
 
-    if ( m_closedTabUrls.size() == 0 )
+    if ( m_closedTabUrls.isEmpty() )
+    {
         m_undoCloseTab->setEnabled(false);
+    }
 
     openUrl(lastTabUrl);
 }
diff --git a/shell/shell.h b/shell/shell.h
index 6dd13e546..10573345e 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -21,7 +21,7 @@
 #include <QMimeType>
 #include <QMimeDatabase>
 #include <QAction>
-#include <QLinkedList>
+#include <QList>
 
 #include <QtDBus> // krazy:exclude=includes
 
@@ -170,7 +170,7 @@ private:
     bool closeEnabled;
   };
   QList<TabState> m_tabs;
-  QLinkedList<QUrl> m_closedTabUrls;
+  QList<QUrl> m_closedTabUrls;
   QAction* m_nextTabAction;
   QAction* m_prevTabAction;
   QAction* m_undoCloseTab;
diff --git a/shell/shell.rc b/shell/shell.rc
index 0452b3f23..4cfa7fd62 100644
--- a/shell/shell.rc
+++ b/shell/shell.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="7" name="okular_shell" >
+<kpartgui version="8" name="okular_shell" >
  <MenuBar>
   <Menu name="file" >
    <DefineGroup append="open_merge" name="file_open" />
-- 
GitLab


From 1c3090155707f1e9bc5c269cea36da542c48c25a Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Tue, 3 Dec 2019 13:15:59 +0800
Subject: [PATCH 6/7] Get closing url directly from part->url()

---
 shell/shell.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index 80165687c..25539665f 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -646,7 +646,6 @@ void Shell::setActiveTab( int tab )
 void Shell::closeTab( int tab )
 {
     KParts::ReadWritePart* const part = m_tabs[tab].part;
-    QUrl url = part->url();
     if( part->closeUrl() && m_tabs.count() > 1 )
     {
         if( part->factory() )
@@ -656,7 +655,7 @@ void Shell::closeTab( int tab )
         m_tabs.removeAt( tab );
         m_tabWidget->removeTab( tab );
         m_undoCloseTab->setEnabled( true );
-        m_closedTabUrls.append( url );
+        m_closedTabUrls.append( part->url() );
 
         if( m_tabWidget->count() == 1 )
         {
-- 
GitLab


From e257d8e0b5693ae0bdcd3cae6a4a88b100875198 Mon Sep 17 00:00:00 2001
From: Bob Bai <bdbaiapp@163.com>
Date: Tue, 3 Dec 2019 16:36:44 +0800
Subject: [PATCH 7/7] Revert "Get closing url directly from part->url()"

This reverts commit 0d4a90674d9e8fad9c4185d0a5fa583a3aace8e5.
---
 shell/shell.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index 25539665f..80165687c 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -646,6 +646,7 @@ void Shell::setActiveTab( int tab )
 void Shell::closeTab( int tab )
 {
     KParts::ReadWritePart* const part = m_tabs[tab].part;
+    QUrl url = part->url();
     if( part->closeUrl() && m_tabs.count() > 1 )
     {
         if( part->factory() )
@@ -655,7 +656,7 @@ void Shell::closeTab( int tab )
         m_tabs.removeAt( tab );
         m_tabWidget->removeTab( tab );
         m_undoCloseTab->setEnabled( true );
-        m_closedTabUrls.append( part->url() );
+        m_closedTabUrls.append( url );
 
         if( m_tabWidget->count() == 1 )
         {
-- 
GitLab