ark: implement session restoration

altough there are bits for that in main() the URL the part loaded was not
saved and restored when that had to happen, now it is

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/ark/app/main.cpp b/ark/app/main.cpp
index 435e1de..4321195 100644 (file)
--- a/ark/app/main.cpp
+++ b/ark/app/main.cpp
@@ -124,12 +124,12 @@ int main(int argc, char **argv)
             return -1;
         }
 
-        MainWindow* window = new MainWindow;
-        window->restore(1);
+        MainWindow* window = new MainWindow();
         if (!window->loadPart()) {
             delete window;
             return -1;
         }
+        window->restore(1);
     } else { //new ark window (no restored session)
         // open any given URLs
         KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -194,7 +194,7 @@ int main(int argc, char **argv)
 
             batchJob->start();
         } else {
-            MainWindow *window = new MainWindow;
+            MainWindow *window = new MainWindow();
             if (!window->loadPart()) { // if loading the part fails
                 delete window;
                 return -1;

diff --git a/ark/app/mainwindow.cpp b/ark/app/mainwindow.cpp
index 873f176..4723e4a 100644 (file)
--- a/ark/app/mainwindow.cpp
+++ b/ark/app/mainwindow.cpp
@@ -50,7 +50,8 @@ static bool isValidArchiveDrag(const QMimeData *data)
 }
 
 MainWindow::MainWindow(QWidget *)
-        : KParts::MainWindow()
+    : KParts::MainWindow(),
+    m_part(nullptr)
 {
     setXMLFile(QLatin1String( "arkui.rc" ));
 
@@ -72,7 +73,7 @@ MainWindow::~MainWindow()
     }
     guiFactory()->removeClient(m_part);
     delete m_part;
-    m_part = 0;
+    m_part = nullptr;
 }
 
 void MainWindow::dragEnterEvent(QDragEnterEvent * event)
@@ -261,3 +262,15 @@ void MainWindow::newArchive()
     m_openArgs.metaData().remove(QLatin1String( "showExtractDialog" ));
     m_openArgs.metaData().remove(QLatin1String( "createNewArchive" ));
 }
+
+void MainWindow::saveProperties(KConfigGroup &group)
+{
+    if (m_part) {
+        group.writePathEntry("URL", m_part->url().url());
+    }
+}
+
+void MainWindow::readProperties(const KConfigGroup &group)
+{
+    openUrl(group.readPathEntry("URL", QString()));
+}

diff --git a/ark/app/mainwindow.h b/ark/app/mainwindow.h
index 5dd7fb8..b3281a7 100644 (file)
--- a/ark/app/mainwindow.h
+++ b/ark/app/mainwindow.h
@@ -32,13 +32,13 @@ class MainWindow: public KParts::MainWindow
 {
     Q_OBJECT
 public:
-    MainWindow(QWidget *parent = 0);
+    MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
     bool loadPart();
 
-    void dragEnterEvent(class QDragEnterEvent * event);
-    void dropEvent(class QDropEvent * event);
-    void dragMoveEvent(class QDragMoveEvent * event);
+    void dragEnterEvent(class QDragEnterEvent *event);
+    void dropEvent(class QDropEvent *event);
+    void dragMoveEvent(class QDragMoveEvent *event);
 
 public slots:
     void openUrl(const KUrl& url);
@@ -53,6 +53,11 @@ private slots:
     void editKeyBindings();
     void editToolbars();
 
+protected:
+    // KMainWindow reimplementations
+    void saveProperties(KConfigGroup &group) final;
+    void readProperties(const KConfigGroup &group) final;
+
 private:
     void setupActions();
 

diff --git a/ark/part/part.h b/ark/part/part.h
index c573494..1b324b1 100644 (file)
--- a/ark/part/part.h
+++ b/ark/part/part.h
@@ -29,7 +29,10 @@
 #include <KParts/StatusBarExtension>
 #include <KTempDir>
 
-#include <QtCore/qabstractitemmodel.h>
+#include <QModelIndex>
+#include <QAction>
+#include <QSplitter>
+#include <QTreeView>
 
 class ArchiveModel;
 class InfoPanel;
@@ -39,10 +42,6 @@ class KAboutData;
 class KAction;
 class KJob;
 
-#include <QAction>
-#include <QSplitter>
-#include <QTreeView>
-
 namespace Ark
 {