Moved stylesheet from demo into main library

Author: Uwe Kindler

demo/main.cpp

@@ -5,17 +5,6 @@
 
 #include "mainwindow.h"
 
-static void initStyleSheet(QApplication& a)
-{
-	QFile f(":ads/stylesheets/default-windows2.css");
-	if (f.open(QFile::ReadOnly))
-	{
-		const QByteArray ba = f.readAll();
-		f.close();
-		a.setStyleSheet(QString(ba));
-	}
-}
-
 
 void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
@@ -46,7 +35,6 @@ int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
 	a.setQuitOnLastWindowClosed(true);
-	initStyleSheet(a);
 	qInstallMessageHandler(myMessageOutput);
 	qDebug() << "Message handler test";
 

demo/mainwindow.cpp

@@ -111,7 +111,7 @@ void MainWindow::createContent()
 	m_DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
 	m_DockManager->addDockWidget(ads::LeftDockWidgetArea, createLongTextLabelDockWidget(ViewMenu));
 	m_DockManager->addDockWidget(ads::BottomDockWidgetArea, createFileSystemTreeDockWidget(ViewMenu));
-	/*auto TopDockArea = m_DockManager->addDockWidget(ads::TopDockWidgetArea, createFileSystemTreeDockWidget(ViewMenu));
+	auto TopDockArea = m_DockManager->addDockWidget(ads::TopDockWidgetArea, createFileSystemTreeDockWidget(ViewMenu));
 	DockWidget = createCalendarDockWidget(ViewMenu);
 	DockWidget->setFeatures(DockWidget->features().setFlag(ads::CDockWidget::DockWidgetClosable, false));
 	m_DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
@@ -121,15 +121,15 @@ void MainWindow::createContent()
 	m_DockManager->addDockWidget(ads::TopDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
 	auto BottomDockArea = m_DockManager->addDockWidget(ads::BottomDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
 	m_DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
-	m_DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea);*/
+	m_DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea);
 }
 
 
 void MainWindow::closeEvent(QCloseEvent* event)
 {
-	/*QSettings Settings("Settings.ini", QSettings::IniFormat);
+	QSettings Settings("Settings.ini", QSettings::IniFormat);
 	Settings.setValue("mainWindow/Geometry", saveGeometry());
-	Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());*/
+	Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());
 	QMainWindow::closeEvent(event);
 }
 

src/DockManager.cpp

@@ -35,6 +35,8 @@
 #include <QMap>
 #include <QVariant>
 #include <QDebug>
+#include <QFile>
+#include <QApplication>
 
 #include "FloatingDockContainer.h"
 #include "DockOverlay.h"
@@ -78,6 +80,11 @@ struct DockManagerPrivate
 	 * Restores the container with the given index
 	 */
 	bool restoreContainer(int Index, QDataStream& stream, bool Testing);
+
+	/**
+	 * Loads the stylesheet
+	 */
+	void loadStylesheet();
 };
 // struct DockManagerPrivate
 
@@ -89,6 +96,19 @@ DockManagerPrivate::DockManagerPrivate(CDockManager* _public) :
 }
 
 
+//============================================================================
+void DockManagerPrivate::loadStylesheet()
+{
+	QString Result;
+	QFile StyleSheetFile(":ads/stylesheets/default.css");
+	StyleSheetFile.open(QIODevice::ReadOnly);
+	QTextStream StyleSheetStream(&StyleSheetFile);
+	Result = StyleSheetStream.readAll();
+	StyleSheetFile.close();
+	_this->setStyleSheet(Result);
+}
+
+
 //============================================================================
 bool DockManagerPrivate::checkFormat(const QByteArray &state, int version)
 {
@@ -202,6 +222,7 @@ CDockManager::CDockManager(QWidget *parent) :
 	d->DockAreaOverlay = new CDockOverlay(this, CDockOverlay::ModeDockAreaOverlay);
 	d->ContainerOverlay = new CDockOverlay(this, CDockOverlay::ModeContainerOverlay);
 	d->Containers.append(this);
+	d->loadStylesheet();
 }
 
 //============================================================================
@@ -314,11 +335,17 @@ bool CDockManager::restoreState(const QByteArray &state, int version)
     	DockWidget->setProperty("dirty", true);
     }
 
+    //this->hide();
+    QMainWindow* MainWindow = internal::findParent<QMainWindow*>(this);
+    MainWindow->hide();
+    QApplication::processEvents();
     if (!d->restoreState(state, version))
     {
     	qDebug() << "restoreState: Error restoring state!!!!!!!";
     	return false;
     }
+    MainWindow->show();
+   // this->show();
 
     // All dock widgets, that have not been processed in the restore state
     // function are invisible to the user now and have no assigned dock area

src/ads.qrc

@@ -1,8 +1,5 @@
 <RCC>
     <qresource prefix="/ads">
-        <file>stylesheets/default-windows.css</file>
-        <file>stylesheets/vendor-partsolutions.css</file>
-        <file>stylesheets/modern-windows.css</file>
-        <file>stylesheets/default-windows2.css</file>
+        <file>stylesheets/default.css</file>
     </qresource>
 </RCC>