Introduced Restore Tab Function

User can now restore tabs opened before close in the same order and same url with a pop-up box on startup. Fix #186

src/kiwixapp.cpp

@@ -15,6 +15,8 @@
 #include <QPrintDialog>
 #include <thread>
 #include <QMessageBox>
+#include <QSettings>
+#include <QStringList>
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders\QWindowsWindowFunctions>
 #endif
@@ -111,6 +113,7 @@ void KiwixApp::init()
             m_library.asyncUpdateFromDir(dir);
         }
     }
+    restoreTabs();
 }
 
 KiwixApp::~KiwixApp()
@@ -164,6 +167,72 @@ QString KiwixApp::findLibraryDirectory()
   return currentDataDir;
 }
 
+void KiwixApp::restoreTabs() {
+    QSettings state;
+    QStringList tabs = state.value("tabs/").value<QStringList>();
+
+    if (!tabs.empty())
+    {
+      QMessageBox msgBox(
+          QMessageBox::Question,                                 // Icon
+          gt("Restore Pages?"),                                  // Title
+          gt("You have tabs opened from your previous session"), // Text
+          QMessageBox::Yes | QMessageBox::Cancel                 // Buttons
+      );
+      msgBox.setButtonText(QMessageBox::Yes, "Restore");
+      msgBox.setDefaultButton(QMessageBox::Yes);
+
+      /* Restart a new session to prevent duplicate records in openURL */
+      state.setValue("tabs/", QStringList{});
+      if (msgBox.exec() == QMessageBox::Cancel)
+        return;
+
+      for (const auto &zimFile : tabs)
+        if (!zimFile.isEmpty())
+          openUrl(zimFile);
+    }
+}
+
+void KiwixApp::changeTabUrlInSave(int index, const QString &url) {
+    if (index < 0)
+        return;
+    QSettings state;
+    QStringList tabs = state.value("tabs/").value<QStringList>();
+
+    tabs[index] = url;
+    state.setValue("tabs/", tabs);
+}
+
+void KiwixApp::insertTabToSave(int index, const QString &url) {
+    if (index < 0)
+        return;
+    QSettings state;
+    QStringList tabs = state.value("tabs/").value<QStringList>();
+
+    tabs.insert(index, url);
+    state.setValue("tabs/", tabs);
+}
+
+void KiwixApp::removeTabFromSave(int index) {
+    if (index < 0)
+        return;
+    QSettings state;
+    QStringList tabs = state.value("tabs/").value<QStringList>();
+
+    tabs.removeAt(index);
+    state.setValue("tabs/", tabs);
+}
+
+void KiwixApp::swapTabInSave(int from, int to) {
+    QSettings state;
+    QStringList tabs = state.value("tabs/").value<QStringList>();
+
+    QString tabUrl = tabs[from];
+    tabs.removeAt(from);
+    tabs.insert(to, tabUrl);
+    state.setValue("tabs/", tabs);
+}
+
 KiwixApp *KiwixApp::instance()
 {
     return static_cast<KiwixApp*>(QApplication::instance());

src/kiwixapp.h

@@ -87,6 +87,11 @@ class KiwixApp : public QtSingleApplication
     void setMonitorDir(const QString &dir);
     bool isCurrentArticleBookmarked();
     QString parseStyleFromFile(QString filePath);
+    void restoreTabs();
+    void changeTabUrlInSave(int index, const QString& url);
+    void insertTabToSave(int index, const QString& url);
+    void removeTabFromSave(int index);
+    void swapTabInSave(int from, int to);
 
 public slots:
     void openZimFile(const QString& zimfile="");

src/main.cpp

@@ -26,6 +26,9 @@ int main(int argc, char *argv[])
     QWebEngineUrlScheme scheme("zim");
     QWebEngineUrlScheme::registerScheme(scheme);
 #endif
+    QCoreApplication::setOrganizationName("Kiwix");
+    QCoreApplication::setApplicationName("kiwix-desktop");
+
     KiwixApp a(argc, argv);
 
     QCommandLineParser parser;

src/tabbar.cpp

@@ -172,6 +172,7 @@ ZimView* TabBar::createNewTab(bool setCurrent, bool adjacentToCurrentTab)
     connect(tab, &ZimView::webActionEnabledChanged,
             this, &TabBar::onWebviewHistoryActionChanged);
 
+    KiwixApp::instance()->insertTabToSave(index - 1, "");
     return tab;
 }
 
@@ -276,6 +277,17 @@ void TabBar::closeTabsByZimId(const QString &id)
     }
 }
 
+int TabBar::indexOfWebView(QObject *object) const
+{
+  for (int index = 0; index <= mp_stackedWidget->count(); index++)
+  {
+    if (ZimView* zv = qobject_cast<ZimView*>(mp_stackedWidget->widget(index)))
+        if (zv->getWebView() == object)
+            return index;
+  }
+  return -1;
+}
+
 void TabBar::closeTab(int index)
 {
     // the last tab is + button, cannot be closed
@@ -289,6 +301,8 @@ void TabBar::closeTab(int index)
     // library tab cannot be closed
     if (qobject_cast<ContentManagerView*>(view)) {
         return;
+    } else if (qobject_cast<ZimView*>(view)) {
+        KiwixApp::instance()->removeTabFromSave(index - 1);
     }
 
     mp_stackedWidget->removeWidget(view);
@@ -486,4 +500,6 @@ void TabBar::onTabMoved(int from, int to)
     QWidget *w_from = mp_stackedWidget->widget(from);
     mp_stackedWidget->removeWidget(w_from);
     mp_stackedWidget->insertWidget(to, w_from);
+
+    KiwixApp::instance()->swapTabInSave(from - 1, to - 1);
 }

src/tabbar.h

@@ -49,6 +49,7 @@ class TabBar : public QTabBar
     virtual QSize tabSizeHint(int index) const;
     void openFindInPageBar();
     void closeTabsByZimId(const QString &id);
+    int indexOfWebView(QObject *object) const;
 
 protected:
     void mousePressEvent(QMouseEvent *event);

src/webpage.cpp

@@ -20,5 +20,10 @@ bool WebPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::Navigatio
         QDesktopServices::openUrl(url);
         return false;
     }
+
+    KiwixApp::instance()->changeTabUrlInSave(
+        KiwixApp::instance()->getTabWidget()->indexOfWebView(this->parent()) -
+            1,
+        url.url());
     return true;
 }

src/webview.cpp

@@ -190,6 +190,9 @@ void WebView::onUrlChanged(const QUrl& url) {
         m_icon = QIcon(pixmap);
         emit iconChanged(m_icon);
     } catch (zim::EntryNotFound& e) {}
+
+    app->changeTabUrlInSave(app->getTabWidget()->indexOfWebView(this) - 1,
+                            url.url());
 }
 
 void WebView::wheelEvent(QWheelEvent *event) {