Removed external dependencies for build, fixed build system, updated preview images to reflect the current state of the library

Uwe Kindler · Uwe Kindler · commit 990d3235c59d · 2017-03-29T12:18:49.000+02:00
diff --git a/demo/demo.pro b/demo/demo.pro
@@ -1,9 +1,9 @@
-include($$(cetoni_repository)/build/qt/qtprojectsettings/common.pri)
+ADS_ROOT = $${PWD}/..
+ADS_OUT_ROOT = $${OUT_PWD}/..
 
 TARGET = AdvancedDockingSystemDemo
-
+DESTDIR = $${ADS_OUT_ROOT}/lib
 QT += core gui widgets
-DEFINES += ADS_NAMESPACE_ENABLED
 
 windows {
 	# MinGW
@@ -26,12 +26,12 @@ HEADERS += \
 FORMS += \
 	mainwindow.ui
 
+LIBS += -L$${ADS_OUT_ROOT}/lib
 
 # Dependency: AdvancedDockingSystem (shared)
-win32:CONFIG(release, debug|release): LIBS += -l$$qtLinkLibrary(AdvancedDockingSystem)
-else:win32:CONFIG(debug, debug|release): LIBS += -l$$qtLinkLibrary(AdvancedDockingSystem)
-else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem
+win32:CONFIG(release, debug|release): LIBS += -lAdvancedDockingSystem
+else:win32:CONFIG(debug, debug|release): LIBS += -lAdvancedDockingSystemd
+else:unix: LIBS += -lAdvancedDockingSystem
 
 INCLUDEPATH += ../src
-
 DEPENDPATH += ../src
diff --git a/demo/mainwindow.cpp b/demo/mainwindow.cpp
@@ -2,7 +2,6 @@
 
 #include "ui_mainwindow.h"
 
-#include <iostream>
 
 #include <QTime>
 #include <QLabel>
@@ -14,15 +13,13 @@
 #include <QBoxLayout>
 #include <QSettings>
 #include <QDockWidget>
+#include <QDebug>
 
 #include "DockManager.h"
 #include "DockWidget.h"
 #include "DockAreaWidget.h"
 
 
-///////////////////////////////////////////////////////////////////////
-
-static int CONTENT_COUNT = 0;
 
 
 static ads::CDockWidget* createLongTextLabelDockWidget(QMenu* ViewMenu)
@@ -82,8 +79,6 @@ static ads::CDockWidget* createFileSystemTreeDockWidget(QMenu* ViewMenu)
 
 
 
-///////////////////////////////////////////////////////////////////////
-
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow(parent),
 	ui(new Ui::MainWindow)
@@ -127,16 +122,16 @@ void MainWindow::createContent()
 
 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);
 }
 
 
 void MainWindow::on_actionSaveState_triggered(bool)
 {
-	std::cout << "MainWindow::on_actionSaveState_triggered" << std::endl;
+	qDebug() << "MainWindow::on_actionSaveState_triggered";
 	QSettings Settings("Settings.ini", QSettings::IniFormat);
 	Settings.setValue("mainWindow/Geometry", saveGeometry());
 	Settings.setValue("mainWindow/DockingState", m_DockManager->saveState());
@@ -145,7 +140,7 @@ void MainWindow::on_actionSaveState_triggered(bool)
 
 void MainWindow::on_actionRestoreState_triggered(bool)
 {
-	std::cout << "MainWindow::on_actionRestoreState_triggered" << std::endl;
+	qDebug() << "MainWindow::on_actionRestoreState_triggered";
 	QSettings Settings("Settings.ini", QSettings::IniFormat);
 	restoreGeometry(Settings.value("mainWindow/Geometry").toByteArray());
 	m_DockManager->restoreState(Settings.value("mainWindow/DockingState").toByteArray());
diff --git a/preview-dragndrop.png b/preview-dragndrop.png
diff --git a/preview.png b/preview.png
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
@@ -374,7 +374,6 @@ void DockAreaWidgetPrivate::updateTabsMenu()
 	menu->clear();
 	for (int i = 0; i < ContentsLayout->count(); ++i)
 	{
-		CDockWidget* DockWidget = dockWidgetAt(i);
 		addTabsMenuEntry(dockWidgetAt(i), APPEND, menu);
 	}
 }
@@ -449,7 +448,6 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 	d->TabsLayout->insertWidget(index, TitleBar);
 	TitleBar->show();
 	connect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
-	connect(DockWidget, SIGNAL(viewToggled(bool)), this, SLOT(onDockWidgetViewToggled(bool)));
 	DockWidget->setProperty(INDEX_PROPERTY, index);
 	if (Activate)
 	{
@@ -469,7 +467,6 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	TitleBar->hide();
 	d->TabsLayout->removeWidget(TitleBar);
 	disconnect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
-	disconnect(DockWidget, SIGNAL(viewToggled(bool)), this, SLOT(onDockWidgetViewToggled(bool)));
 	setCurrentIndex(d->ContentsLayout->currentIndex());
 	d->updateTabsMenu();
 
@@ -707,13 +704,6 @@ void CDockAreaWidget::updateDockArea()
 }
 
 
-//============================================================================
-void CDockAreaWidget::onDockWidgetViewToggled(bool Open)
-{
-	auto DockWidget = dynamic_cast<CDockWidget*>(sender());
-}
-
-
 //============================================================================
 void CDockAreaWidget::saveState(QDataStream& stream) const
 {
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
@@ -56,7 +56,6 @@ private slots:
 	void onDockWidgetTitleClicked();
 	void onTabsMenuActionTriggered(QAction* Action);
 	void onCloseButtonClicked();
-	void onDockWidgetViewToggled(bool Open);
 
 public:
 	/**
@@ -190,13 +189,6 @@ public slots:
 	 * @param index
 	 */
 	void currentChanged(int index);
-
-	/**
-	 * This signal is emitted if the dock area is closed or opened.
-	 * The dock area will be closed, if all dock widgets in the dock area are
-	 * closed and will be opened, when the first dock widget is opened
-	 */
-	void viewToggled(bool Open);
 }; // class DockAreaWidget
 }
  // namespace ads
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
@@ -181,6 +181,7 @@ void DockContainerWidgetPrivate::dropIntoContainer(CFloatingDockContainer* Float
 		QLayoutItem* li = Layout->replaceWidget(Splitter, NewSplitter);
 		NewSplitter->addWidget(Splitter);
 		Splitter = NewSplitter;
+		delete li;
 	}
 
 	// Now we can insert the floating widget content into this container
@@ -555,6 +556,9 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
 		}
 		qDebug("%sDockArea", (const char*)buf);
 	}
+#else
+	Q_UNUSED(level);
+	Q_UNUSED(widget);
 #endif
 }
 
@@ -692,7 +696,7 @@ void CDockContainerWidget::addDockArea(CDockAreaWidget* DockAreaWidget,
 		Container->removeDockArea(DockAreaWidget);
 	}
 
-	d->addDockArea(DockAreaWidget);
+	d->addDockArea(DockAreaWidget, area);
 }
 
 
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
@@ -154,12 +154,12 @@ bool DockManagerPrivate::restoreContainer(int Index, QDataStream& stream, bool T
 	if (Index >= Containers.count())
 	{
 		CFloatingDockContainer* FloatingWidget = new CFloatingDockContainer(_this);
-		return FloatingWidget->restoreState(stream, internal::Restore);
+		return FloatingWidget->restoreState(stream, Testing);
 	}
 	else
 	{
 		qDebug() << "d->Containers[i]->restoreState ";
-		return Containers[Index]->restoreState(stream, internal::Restore);
+		return Containers[Index]->restoreState(stream, Testing);
 	}
 }
 
@@ -201,8 +201,6 @@ bool DockManagerPrivate::restoreState(const QByteArray &state,  int version)
     // Delete remaining empty floating widgets
     int FloatingWidgetIndex = i - 1;
     int DeleteCount = FloatingWidgets.count() - FloatingWidgetIndex;
-    /*std::cout << "DeleteCount " << DeleteCount << " FloatingWidgets.count() "
-    	<< FloatingWidgets.count() << " FloatingWdgetIndex " << FloatingWidgetIndex << std::endl;*/
     for (int i = 0; i < DeleteCount; ++i)
     {
     	FloatingWidgets[FloatingWidgetIndex + i]->deleteLater();
diff --git a/src/DockOverlay.cpp b/src/DockOverlay.cpp
@@ -356,6 +356,7 @@ void CDockOverlay::enableDropPreview(bool Enable)
 //============================================================================
 void CDockOverlay::paintEvent(QPaintEvent* event)
 {
+	Q_UNUSED(event);
 	// Draw rect based on location
 	if (!d->DropPreviewEnabled)
 	{
diff --git a/src/DockWidgetTitleBar.cpp b/src/DockWidgetTitleBar.cpp
@@ -112,7 +112,7 @@ struct DockWidgetTitleBarPrivate
 	 * Returns true, if floating has been started and false if floating
 	 * is not possible for any reason
 	 */
-	bool startFloating(const QPoint& GlobalPos);
+	bool startFloating();
 };
 // struct DockWidgetTitleBarPrivate
 
@@ -158,7 +158,7 @@ void DockWidgetTitleBarPrivate::moveTab(QMouseEvent* ev)
 
 
 //============================================================================
-bool DockWidgetTitleBarPrivate::startFloating(const QPoint& GlobalPos)
+bool DockWidgetTitleBarPrivate::startFloating()
 {
 	qDebug() << "isFloating " << DockWidget->dockContainer()->isFloating();
 	qDebug() << "areaCount " << DockWidget->dockContainer()->dockAreaCount();
@@ -187,7 +187,6 @@ bool DockWidgetTitleBarPrivate::startFloating(const QPoint& GlobalPos)
 		qDebug() << "DockWidgetTitleBarPrivate::startFloating DockArea";
 		// If section widget has only one content widget, we can move the complete
 		// dock area into floating widget
-		auto splitter = internal::findParent<QSplitter*>(DockArea);
 		FloatingWidget = new CFloatingDockContainer(DockArea);
 	}
 
@@ -292,7 +291,7 @@ void CDockWidgetTitleBar::mouseMoveEvent(QMouseEvent* ev)
     bool MouseInsideTitleArea = d->titleAreaGeometryContains(ev->globalPos());
     if (!MouseInsideTitleArea)
 	{
-    	d->startFloating(ev->globalPos());
+    	d->startFloating();
     	return;
 	}
     else if (d->DockArea->count() > 1
diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
@@ -331,6 +331,7 @@ bool CFloatingDockContainer::event(QEvent *e)
 //============================================================================
 bool CFloatingDockContainer::eventFilter(QObject *watched, QEvent *event)
 {
+	Q_UNUSED(watched);
 	if (event->type() == QEvent::MouseButtonRelease && d->DraggingActive)
 	{
 		qDebug() << "FloatingWidget::eventFilter QEvent::MouseButtonRelease";
@@ -389,6 +390,7 @@ void CFloatingDockContainer::onDockAreasAddedOrRemoved()
 //============================================================================
 void CFloatingDockContainer::onDockAreaCurrentChanged(int Index)
 {
+	Q_UNUSED(Index);
 	this->setWindowTitle(d->SingleDockArea->currentDockWidget()->windowTitle());
 }
 
diff --git a/src/src.pro b/src/src.pro
@@ -1,14 +1,13 @@
-include($$(cetoni_repository)/build/qt/qtprojectsettings/shared_library.pri)
-include(src/v2/v2.pri)
+ADS_ROOT = $${PWD}/..
+ADS_OUT_ROOT = $${OUT_PWD}/..
 
 TARGET = $$qtLibraryTarget(AdvancedDockingSystem)
 TEMPLATE = lib
-#VERSION = 1.0.0
+DESTDIR = $${ADS_OUT_ROOT}/lib
+QT += core gui widgets
 
 CONFIG += adsBuildShared
 
-QT += core gui widgets
-DEFINES += ADS_NAMESPACE_ENABLED
 
 adsBuildShared {
 	CONFIG += shared

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,6 @@ void DockAreaWidgetPrivate::updateTabsMenu()`
`374`	`374`	`menu->clear();`
`375`	`375`	`for (int i = 0; i < ContentsLayout->count(); ++i)`
`376`	`376`	`{`
`377`		`- CDockWidget* DockWidget = dockWidgetAt(i);`
`378`	`377`	`addTabsMenuEntry(dockWidgetAt(i), APPEND, menu);`
`379`	`378`	`}`
`380`	`379`	`}`
`@@ -449,7 +448,6 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,`
`449`	`448`	`d->TabsLayout->insertWidget(index, TitleBar);`
`450`	`449`	`TitleBar->show();`
`451`	`450`	`connect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));`
`452`		`- connect(DockWidget, SIGNAL(viewToggled(bool)), this, SLOT(onDockWidgetViewToggled(bool)));`
`453`	`451`	`DockWidget->setProperty(INDEX_PROPERTY, index);`
`454`	`452`	`if (Activate)`
`455`	`453`	`{`
`@@ -469,7 +467,6 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)`
`469`	`467`	`TitleBar->hide();`
`470`	`468`	`d->TabsLayout->removeWidget(TitleBar);`
`471`	`469`	`disconnect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));`
`472`		`- disconnect(DockWidget, SIGNAL(viewToggled(bool)), this, SLOT(onDockWidgetViewToggled(bool)));`
`473`	`470`	`setCurrentIndex(d->ContentsLayout->currentIndex());`
`474`	`471`	`d->updateTabsMenu();`
`475`	`472`
`@@ -707,13 +704,6 @@ void CDockAreaWidget::updateDockArea()`
`707`	`704`	`}`
`708`	`705`
`709`	`706`
`710`		`-//============================================================================`
`711`		`-void CDockAreaWidget::onDockWidgetViewToggled(bool Open)`
`712`		`-{`
`713`		`- auto DockWidget = dynamic_cast<CDockWidget*>(sender());`
`714`		`-}`
`715`		`-`
`716`		`-`
`717`	`707`	`//============================================================================`
`718`	`708`	`void CDockAreaWidget::saveState(QDataStream& stream) const`
`719`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ void DockContainerWidgetPrivate::dropIntoContainer(CFloatingDockContainer* Float`
`181`	`181`	`QLayoutItem* li = Layout->replaceWidget(Splitter, NewSplitter);`
`182`	`182`	`NewSplitter->addWidget(Splitter);`
`183`	`183`	`Splitter = NewSplitter;`
	`184`	`+ delete li;`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`// Now we can insert the floating widget content into this container`
`@@ -555,6 +556,9 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)`
`555`	`556`	`}`
`556`	`557`	`qDebug("%sDockArea", (const char*)buf);`
`557`	`558`	`}`
	`559`	`+#else`
	`560`	`+ Q_UNUSED(level);`
	`561`	`+ Q_UNUSED(widget);`
`558`	`562`	`#endif`
`559`	`563`	`}`
`560`	`564`
`@@ -692,7 +696,7 @@ void CDockContainerWidget::addDockArea(CDockAreaWidget* DockAreaWidget,`
`692`	`696`	`Container->removeDockArea(DockAreaWidget);`
`693`	`697`	`}`
`694`	`698`
`695`		`- d->addDockArea(DockAreaWidget);`
	`699`	`+ d->addDockArea(DockAreaWidget, area);`
`696`	`700`	`}`
`697`	`701`
`698`	`702`
Original file line number	Diff line number	Diff line change
`@@ -154,12 +154,12 @@ bool DockManagerPrivate::restoreContainer(int Index, QDataStream& stream, bool T`
`154`	`154`	`if (Index >= Containers.count())`
`155`	`155`	`{`
`156`	`156`	`CFloatingDockContainer* FloatingWidget = new CFloatingDockContainer(_this);`
`157`		`- return FloatingWidget->restoreState(stream, internal::Restore);`
	`157`	`+ return FloatingWidget->restoreState(stream, Testing);`
`158`	`158`	`}`
`159`	`159`	`else`
`160`	`160`	`{`
`161`	`161`	`qDebug() << "d->Containers[i]->restoreState ";`
`162`		`- return Containers[Index]->restoreState(stream, internal::Restore);`
	`162`	`+ return Containers[Index]->restoreState(stream, Testing);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`@@ -201,8 +201,6 @@ bool DockManagerPrivate::restoreState(const QByteArray &state, int version)`
`201`	`201`	`// Delete remaining empty floating widgets`
`202`	`202`	`int FloatingWidgetIndex = i - 1;`
`203`	`203`	`int DeleteCount = FloatingWidgets.count() - FloatingWidgetIndex;`
`204`		`- /*std::cout << "DeleteCount " << DeleteCount << " FloatingWidgets.count() "`
`205`		`- << FloatingWidgets.count() << " FloatingWdgetIndex " << FloatingWidgetIndex << std::endl;*/`
`206`	`204`	`for (int i = 0; i < DeleteCount; ++i)`
`207`	`205`	`{`
`208`	`206`	`FloatingWidgets[FloatingWidgetIndex + i]->deleteLater();`
Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@ void CDockOverlay::enableDropPreview(bool Enable)`
`356`	`356`	`//============================================================================`
`357`	`357`	`void CDockOverlay::paintEvent(QPaintEvent* event)`
`358`	`358`	`{`
	`359`	`+ Q_UNUSED(event);`
`359`	`360`	`// Draw rect based on location`
`360`	`361`	`if (!d->DropPreviewEnabled)`
`361`	`362`	`{`