Started implementing serialization and deserialization

Author: Uwe Kindler

demo/mainwindow.cpp

@@ -2,6 +2,8 @@
 
 #include "ui_mainwindow.h"
 
+#include <iostream>
+
 #include <QTime>
 #include <QLabel>
 #include <QTextEdit>
@@ -10,6 +12,7 @@
 #include <QTreeView>
 #include <QFileSystemModel>
 #include <QBoxLayout>
+#include <QSettings>
 
 #include "DockManager.h"
 #include "DockWidget.h"
@@ -40,6 +43,7 @@ static ads::CDockWidget* createLongTextLabelDockWidget(QMenu* ViewMenu)
 
 	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Label %1").arg(LabelCount++));
 	DockWidget->setWidget(l);
+	DockWidget->setObjectName(DockWidget->windowTitle());
 	ViewMenu->addAction(DockWidget->toggleViewAction());
 	return DockWidget;
 }
@@ -50,6 +54,7 @@ static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu)
 	QCalendarWidget* w = new QCalendarWidget();
 	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Calendar %1").arg(CalendarCount++));
 	DockWidget->setWidget(w);
+	DockWidget->setObjectName(DockWidget->windowTitle());
 	ViewMenu->addAction(DockWidget->toggleViewAction());
 	return DockWidget;
 }
@@ -64,6 +69,7 @@ static ads::CDockWidget* createFileSystemTreeDockWidget(QMenu* ViewMenu)
 	w->setModel(m);
 	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Filesystem %1").arg(FileSystemCount++));
 	DockWidget->setWidget(w);
+	DockWidget->setObjectName(DockWidget->windowTitle());
 	ViewMenu->addAction(DockWidget->toggleViewAction());
     return DockWidget;
 }
@@ -113,3 +119,29 @@ void MainWindow::createContent()
 }
 
 
+void MainWindow::closeEvent(QCloseEvent* event)
+{
+	QSettings Settings("Settings.ini", QSettings::IniFormat);
+	Settings.setValue("mainWindow/Geometry", saveGeometry());
+	Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());
+	QMainWindow::closeEvent(event);
+}
+
+
+void MainWindow::on_actionSaveState_triggered(bool)
+{
+	std::cout << "MainWindow::on_actionSaveState_triggered" << std::endl;
+	QSettings Settings("Settings.ini", QSettings::IniFormat);
+	Settings.setValue("mainWindow/Geometry", saveGeometry());
+	Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());
+}
+
+
+void MainWindow::on_actionRestoreState_triggered(bool)
+{
+	std::cout << "MainWindow::on_actionRestoreState_triggered" << std::endl;
+	QSettings Settings("Settings.ini", QSettings::IniFormat);
+	restoreGeometry(Settings.value("mainWindow/Geometry").toByteArray());
+	m_DockManager->restoreState(Settings.value("mainWindow/DockingState").toByteArray());
+}
+

demo/mainwindow.h

@@ -11,7 +11,8 @@ class MainWindow;
 class MainWindow : public QMainWindow
 {
 	Q_OBJECT
-
+protected:
+	virtual void closeEvent(QCloseEvent* event) override;
 public:
 	explicit MainWindow(QWidget *parent = 0);
 	virtual ~MainWindow();
@@ -20,6 +21,10 @@ class MainWindow : public QMainWindow
 	Ui::MainWindow *ui;
 	ads::CDockManager* m_DockManager;
 	void createContent();
+
+private slots:
+	void on_actionSaveState_triggered(bool);
+	void on_actionRestoreState_triggered(bool);
 };
 
 #endif // MAINWINDOW_H

demo/mainwindow.ui

@@ -29,6 +29,8 @@
      <string>File</string>
     </property>
     <addaction name="actionExit"/>
+    <addaction name="actionSaveState"/>
+    <addaction name="actionRestoreState"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
@@ -49,6 +51,16 @@
     <string>Exit</string>
    </property>
   </action>
+  <action name="actionSaveState">
+   <property name="text">
+    <string>Save State</string>
+   </property>
+  </action>
+  <action name="actionRestoreState">
+   <property name="text">
+    <string>Restore State</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>

src/DockAreaWidget.cpp

@@ -706,6 +706,17 @@ void CDockAreaWidget::onDockWidgetViewToggled(bool Open)
 	auto DockWidget = dynamic_cast<CDockWidget*>(sender());
 }
 
+
+//============================================================================
+void CDockAreaWidget::saveState(QDataStream& stream) const
+{
+	stream << d->ContentsLayout->count() << d->ContentsLayout->currentIndex();
+	for (int i = 0; i < d->ContentsLayout->count(); ++i)
+	{
+		dockWidget(i)->saveState(stream);
+	}
+}
+
 } // namespace ads
 
 //---------------------------------------------------------------------------

src/DockAreaWidget.h

@@ -161,6 +161,11 @@ private slots:
 	 */
 	void setCurrentDockWidget(CDockWidget* DockWidget);
 
+	/**
+	 * Saves the state into the given stream
+	 */
+	void saveState(QDataStream& Stream) const;
+
 public slots:
 	/**
 	 * This sets the index position of the current tab page.

src/DockContainerWidget.cpp

@@ -41,6 +41,7 @@
 #include "DockWidget.h"
 #include "FloatingDockContainer.h"
 #include "DockOverlay.h"
+#include "DockStateSerialization.h"
 #include "ads_globals.h"
 
 #include <iostream>
@@ -113,6 +114,16 @@ struct DockContainerWidgetPrivate
 	 * Adds new dock areas to the internal dock area list
 	 */
 	void addDockAreasToList(const QList<CDockAreaWidget*> NewDockAreas);
+
+	/**
+	 * Save state of child nodes
+	 */
+	void saveChildNodesState(QDataStream& Stream, QWidget* Widget);
+
+	/**
+	 * Restore state of child nodes
+	 */
+	void restoreChildNodes(QDataStream& Stream, QWidget* Parent);
 }; // struct DockContainerWidgetPrivate
 
 
@@ -284,6 +295,74 @@ void DockContainerWidgetPrivate::addDockAreasToList(const QList<CDockAreaWidget*
 }
 
 
+//============================================================================
+void DockContainerWidgetPrivate::saveChildNodesState(QDataStream& stream, QWidget* Widget)
+{
+	QSplitter* Splitter = dynamic_cast<QSplitter*>(Widget);
+	if (Splitter)
+	{
+		stream << NodeSplitter << Splitter->orientation() << Splitter->count();
+		std::cout << "NodeSplitter " << Splitter->orientation() << std::endl;
+		for (int i = 0; i < Splitter->count(); ++i)
+		{
+			saveChildNodesState(stream, Splitter->widget(i));
+		}
+	}
+	else
+	{
+		CDockAreaWidget* DockArea = dynamic_cast<CDockAreaWidget*>(Widget);
+		if (DockArea)
+		{
+			std::cout << "NodeDockArea " << std::endl;
+			DockArea->saveState(stream);
+		}
+	}
+}
+
+
+//============================================================================
+void DockContainerWidgetPrivate::restoreChildNodes(QDataStream& stream, QWidget* Parent)
+{
+	int NodeType;
+	stream >> NodeType;
+	QSplitter* ParentSplitter = dynamic_cast<QSplitter*>(Parent);
+	if (NodeSplitter == NodeType)
+	{
+		int Orientation;
+		int Count;
+		stream >> Orientation >> Count;
+		std::cout << "Restore NodeSplitter " << Orientation << std::endl;
+		QSplitter* Splitter = internal::newSplitter((Qt::Orientation)Orientation);
+		if (ParentSplitter)
+		{
+			ParentSplitter->addWidget(Splitter);
+		}
+		else
+		{
+			Parent->layout()->addWidget(Splitter);
+		}
+		for (int i = 0; i < Count; ++i)
+		{
+			restoreChildNodes(stream, Splitter);
+		}
+	}
+	else
+	{
+		std::cout << "Restore NodeDockArea " << std::endl;
+		CDockAreaWidget* DockArea = new CDockAreaWidget(DockManager, _this);
+		if (ParentSplitter)
+		{
+			ParentSplitter->addWidget(DockArea);
+		}
+		else
+		{
+			Parent->layout()->addWidget(DockArea);
+		}
+		DockAreas.append(DockArea);
+	}
+}
+
+
 //============================================================================
 CDockAreaWidget* DockContainerWidgetPrivate::dockWidgetIntoContainer(DockWidgetArea area,
 	CDockWidget* Dockwidget)
@@ -301,7 +380,7 @@ void DockContainerWidgetPrivate::addDockArea(CDockAreaWidget* NewDockArea, DockW
 	auto InsertParam = internal::dockAreaInsertParameters(area);
 	if (DockAreas.isEmpty())
 	{
-		Layout->addWidget(NewDockArea, 0, 0);
+		_this->layout()->addWidget(NewDockArea);
 	}
 	else if (DockAreas.count() == 1)
 	{
@@ -604,6 +683,51 @@ QList<CDockAreaWidget*> CDockContainerWidget::openedDockAreas() const
 }
 
 
+//============================================================================
+void CDockContainerWidget::saveState(QDataStream& stream) const
+{
+	std::cout << "CDockContainerWidget::saveState" << std::endl;
+	stream << isFloating();
+	if (isFloating())
+	{
+		CFloatingDockContainer* FloatingWidget = internal::findParent<CFloatingDockContainer*>(this);
+		stream << FloatingWidget->saveGeometry();
+	}
+
+	QWidget* RootChild = d->Layout->itemAt(0)->widget();
+	if (RootChild)
+	{
+		d->saveChildNodesState(stream, RootChild);
+	}
+}
+
+
+//============================================================================
+bool CDockContainerWidget::restoreState(QDataStream& stream)
+{
+	bool IsFloating;
+	stream >> IsFloating;
+	if (isFloating())
+	{
+		std::cout << "Restore floating widget" << std::endl;
+		CFloatingDockContainer* FloatingWidget = internal::findParent<CFloatingDockContainer*>(this);
+		QByteArray Geometry;
+		stream >> Geometry;
+		FloatingWidget->restoreGeometry(Geometry);
+		FloatingWidget->show();
+	}
+
+	QWidget* RootChild = d->Layout->itemAt(0)->widget();
+	if (RootChild)
+	{
+		d->DockAreas.clear();
+		delete RootChild;
+	}
+	d->restoreChildNodes(stream, this);
+	return true;
+}
+
+
 } // namespace ads
 
 //---------------------------------------------------------------------------

src/DockContainerWidget.h

@@ -134,6 +134,16 @@ class CDockContainerWidget : public QFrame
 	 */
 	bool isFloating() const;
 
+	/**
+	 * Saves the state into the given stream
+	 */
+	void saveState(QDataStream& Stream) const;
+
+	/**
+	 * Restores the state from given stream
+	 */
+	bool restoreState(QDataStream& Stream);
+
 signals:
 	/**
 	 * This signal is emitted if one or multiple dock areas has been added to