Update ADS to v3.6.2

Author: dail8859

src/NotepadNext/NotepadNextApplication.cpp

@@ -73,8 +73,6 @@ bool NotepadNextApplication::initGui()
 {
     qInfo(Q_FUNC_INFO);
 
-    createNewWindow()->openFile("C:/pickles.txt");
-
     luabridge::getGlobalNamespace(luaState->L)
         .beginNamespace("nn")
             .beginClass<QWidget>("QWidget")

src/ads/PyQtAds/_version.py

@@ -23,9 +23,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = "$Format:%d$"
-    git_full = "$Format:%H$"
-    git_date = "$Format:%ci$"
+    git_refnames = " (tag: 3.6.2)"
+    git_full = "5fad43377b318daee42666e116d6d851d7d05f75"
+    git_date = "2020-09-25 14:40:28 +0200"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 

src/ads/demo/MainWindow.cpp

@@ -109,7 +109,7 @@ static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget)
 static QIcon svgIcon(const QString& File)
 {
 	// This is a workaround, because in item views SVG icons are not
-	// properly scaled an look blurry or pixelate
+	// properly scaled and look blurry or pixelate
 	QIcon SvgIcon(File);
 	SvgIcon.addPixmap(SvgIcon.pixmap(92));
 	return SvgIcon;

src/ads/doc/user-guide.md

@@ -493,6 +493,13 @@ auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
 
 See the `centralwidget` example to learn how it works.
 
+> ##### Note
+> The central widget needs to be the first dock widget that is added to the
+> dock manager. The function does not work and returns a `nullptr` if there
+> are already other dock widgets registered. So `setCentralWidget` should be
+> the first function that you call when adding dock widgets.
+
+
 ## Styling
 
 The Advanced Docking System supports styling via [Qt Style Sheets](https://doc.qt.io/qt-5/stylesheet.html). All components like splitters, tabs, buttons, titlebar and

src/ads/examples/centralwidget/mainwindow.cpp

@@ -16,6 +16,7 @@
 #include <QSettings>
 #include <QMessageBox>
 #include <QPlainTextEdit>
+#include <QToolBar>
 
 #include "DockAreaWidget.h"
 #include "DockAreaTitleBar.h"
@@ -25,6 +26,18 @@
 
 using namespace ads;
 
+/**
+ * Helper function to create an SVG icon
+ */
+static QIcon svgIcon(const QString& File)
+{
+	// This is a workaround, because in item views SVG icons are not
+	// properly scaled and look blurry or pixelate
+	QIcon SvgIcon(File);
+	SvgIcon.addPixmap(SvgIcon.pixmap(92));
+	return SvgIcon;
+}
+
 CMainWindow::CMainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::CMainWindow)
@@ -77,10 +90,46 @@ CMainWindow::CMainWindow(QWidget *parent)
     PropertiesDockWidget->setMinimumSize(200,150);
     DockManager->addDockWidget(DockWidgetArea::RightDockWidgetArea, PropertiesDockWidget, CentralDockArea);
     ui->menuView->addAction(PropertiesDockWidget->toggleViewAction());
+
+    createPerspectiveUi();
 }
 
 CMainWindow::~CMainWindow()
 {
     delete ui;
 }
 
+
+void CMainWindow::createPerspectiveUi()
+{
+	SavePerspectiveAction = new QAction("Create Perspective", this);
+	SavePerspectiveAction->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg"));
+	connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective()));
+	PerspectiveListAction = new QWidgetAction(this);
+	PerspectiveComboBox = new QComboBox(this);
+	PerspectiveComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+	connect(PerspectiveComboBox, SIGNAL(activated(const QString&)),
+		DockManager, SLOT(openPerspective(const QString&)));
+	PerspectiveListAction->setDefaultWidget(PerspectiveComboBox);
+	ui->toolBar->addSeparator();
+	ui->toolBar->addAction(PerspectiveListAction);
+	ui->toolBar->addAction(SavePerspectiveAction);
+}
+
+
+void CMainWindow::savePerspective()
+{
+	QString PerspectiveName = QInputDialog::getText(this, "Save Perspective", "Enter unique name:");
+	if (PerspectiveName.isEmpty())
+	{
+		return;
+	}
+
+	DockManager->addPerspective(PerspectiveName);
+	QSignalBlocker Blocker(PerspectiveComboBox);
+	PerspectiveComboBox->clear();
+	PerspectiveComboBox->addItems(DockManager->perspectiveNames());
+	PerspectiveComboBox->setCurrentText(PerspectiveName);
+}
+

src/ads/examples/centralwidget/mainwindow.h

@@ -2,6 +2,8 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <QComboBox>
+#include <QWidgetAction>
 
 #include "DockManager.h"
 #include "DockAreaWidget.h"
@@ -20,13 +22,19 @@ class CMainWindow : public QMainWindow
     ~CMainWindow();
 
 private:
-    static const QString kTableTopLayout;
-    static const QString kTableBottomLayout;
+	QAction* SavePerspectiveAction = nullptr;
+	QWidgetAction* PerspectiveListAction = nullptr;
+	QComboBox* PerspectiveComboBox = nullptr;
 
     Ui::CMainWindow *ui;
 
     ads::CDockManager* DockManager;
     ads::CDockAreaWidget* StatusDockArea;
     ads::CDockWidget* TimelineDockWidget;
+
+    void createPerspectiveUi();
+
+private slots:
+	void savePerspective();
 };
 #endif // MAINWINDOW_H

src/ads/examples/centralwidget/mainwindow.ui

@@ -30,6 +30,17 @@
    </widget>
    <addaction name="menuView"/>
   </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
  </widget>
  <resources/>
  <connections/>

src/ads/src/DockContainerWidget.cpp

@@ -1207,7 +1207,7 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
 		std::cout << (const char*)buf
 			<< (DockArea->isHidden() ? " " : "v")
 			<< (DockArea->openDockWidgetsCount() > 0 ? " " : "c")
-			<< " DockArea" << std::endl;
+			<< " DockArea " << "[hs: " << DockArea->sizePolicy().horizontalStretch() << ", vs: " <<  DockArea->sizePolicy().verticalStretch() << "]" << std::endl;
 		buf.fill(' ', (level + 1) * 4);
 		for (int i = 0; i < DockArea->dockWidgetsCount(); ++i)
 		{

src/ads/src/DockManager.cpp

@@ -279,6 +279,27 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state,  int versi
     int  DockContainers = s.attributes().value("Containers").toInt();
 #endif
     ADS_PRINT(DockContainers);
+
+    if (CentralWidget)
+    {
+		const auto CentralWidgetAttribute = s.attributes().value("CentralWidget");
+		// If we have a central widget but a state without central widget, then
+		// something is wrong.
+		if (CentralWidgetAttribute.isEmpty())
+		{
+			qWarning() << "Dock manager has central widget but saved state does not have central widget.";
+			return false;
+		}
+
+		// If the object name of the central widget does not match the name of the
+		// saved central widget, the something is wrong
+		if (CentralWidget->objectName() != CentralWidgetAttribute.toString())
+		{
+			qWarning() << "Object name of central widget does not match name of central widget in saved state.";
+			return false;
+		}
+    }
+
     int DockContainerCount = 0;
     while (s.readNextStartElement())
     {
@@ -405,7 +426,6 @@ bool DockManagerPrivate::restoreState(const QByteArray& State, int version)
     	return false;
     }
 
-    CentralWidget = nullptr;
     // Hide updates of floating widgets from use
     hideFloatingWidgets();
     markDockWidgetsDirty();
@@ -419,6 +439,7 @@ bool DockManagerPrivate::restoreState(const QByteArray& State, int version)
     restoreDockWidgetsOpenState();
     restoreDockAreasIndices();
     emitTopLevelEvents();
+    _this->dumpLayout();
 
     return true;
 }
@@ -636,6 +657,10 @@ QByteArray CDockManager::saveState(int version) const
 		s.writeAttribute("Version", QString::number(CurrentVersion));
 		s.writeAttribute("UserVersion", QString::number(version));
 		s.writeAttribute("Containers", QString::number(d->Containers.count()));
+		if (d->CentralWidget)
+		{
+			s.writeAttribute("CentralWidget", d->CentralWidget->objectName());
+		}
 		for (auto Container : d->Containers)
 		{
 			Container->saveState(s);
@@ -706,6 +731,7 @@ CFloatingDockContainer* CDockManager::addDockWidgetFloating(CDockWidget* Dockwid
 	{
 		d->UninitializedFloatingWidgets.append(FloatingWidget);
 	}
+	emit dockWidgetAdded(Dockwidget);
 	return FloatingWidget;
 }
 
@@ -732,7 +758,9 @@ CDockAreaWidget* CDockManager::addDockWidget(DockWidgetArea area,
 	CDockWidget* Dockwidget, CDockAreaWidget* DockAreaWidget)
 {
 	d->DockWidgetsMap.insert(Dockwidget->objectName(), Dockwidget);
-	return CDockContainerWidget::addDockWidget(area, Dockwidget, DockAreaWidget);
+	auto AreaOfAddedDockWidget = CDockContainerWidget::addDockWidget(area, Dockwidget, DockAreaWidget);
+	emit dockWidgetAdded(Dockwidget);
+	return AreaOfAddedDockWidget;
 }
 
 
@@ -901,10 +929,20 @@ CDockAreaWidget* CDockManager::setCentralWidget(CDockWidget* widget)
 		return nullptr;
 	}
 
-	// Setting a new central widget is now allowed if there is alread a central
-	// widget
+	// Setting a new central widget is now allowed if there is already a central
+	// widget or if there are already other dock widgets
 	if (d->CentralWidget)
 	{
+		qWarning("Setting a central widget not possible because there is already a central widget.");
+		return nullptr;
+	}
+
+	// Setting a central widget is now allowed if there are already other
+	// dock widgets.
+	if (!d->DockWidgetsMap.isEmpty())
+	{
+		qWarning("Setting a central widget not possible - the central widget need to be the first "
+			"dock widget that is added to the dock manager.");
 		return nullptr;
 	}
 

src/ads/src/DockManager.h

@@ -398,9 +398,12 @@ class ADS_EXPORT CDockManager : public CDockContainerWidget
      * movable, floatable or closable and the titlebar of the central
      * dock area is not visible.
      * If the given widget could be set as central widget, the function returns
-     * the created cok area. If the widget could not be set, because there
+     * the created dock area. If the widget could not be set, because there
      * is already a central widget, this function returns a nullptr.
      * To clear the central widget, pass a nullptr to the function.
+     * \note Setting a central widget is only possible if no other dock widgets
+     * have been registered before. That means, this function should be the
+     * first function that you call before you add other dock widgets.
      * \retval != 0 The dock area that contains the central widget
      * \retval nullptr Indicates that the given widget can not be set as central
      *         widget because there is already a central widget.
@@ -552,6 +555,12 @@ public slots:
      */
     void dockAreaCreated(ads::CDockAreaWidget* DockArea);
 
+    /**
+     * This signal is emitted if a dock widget has been added to this
+     * dock manager instance.
+     */
+    void dockWidgetAdded(ads::CDockWidget* DockWidget);
+
     /**
      * This signal is emitted just before the given dock widget is removed
      * from the dock manager

src/ads/src/FloatingDockContainer.cpp

@@ -752,7 +752,7 @@ bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *mess
 		case WM_NCLBUTTONDOWN:
 			 if (msg->wParam == HTCAPTION && d->isState(DraggingInactive))
 			 {
-				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_NCLBUTTONDOWN" << e->type());
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_NCLBUTTONDOWN");
 				d->DragStartPos = pos();
 				d->setState(DraggingMousePressed);
 			 }
@@ -765,7 +765,7 @@ bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *mess
 		case WM_ENTERSIZEMOVE:
 			 if (d->isState(DraggingMousePressed))
 			 {
-				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_ENTERSIZEMOVE" << e->type());
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_ENTERSIZEMOVE");
 				d->setState(DraggingFloatingWidget);
 				d->updateDropOverlays(QCursor::pos());
 			 }
@@ -774,7 +774,7 @@ bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *mess
 		case WM_EXITSIZEMOVE:
 			 if (d->isState(DraggingFloatingWidget))
 			 {
-				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_EXITSIZEMOVE" << e->type());
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_EXITSIZEMOVE");
 				if (GetAsyncKeyState(VK_ESCAPE) & 0x8000)
 				{
 					d->handleEscapeKey();

src/ads/src/src.pro

@@ -59,9 +59,10 @@ SOURCES += \
     DockFocusController.cpp
 
 
-unix {
-    HEADERS += linux/FloatingWidgetTitleBar.h
-    SOURCES += linux/FloatingWidgetTitleBar.cpp
+unix:!macx {
+HEADERS += linux/FloatingWidgetTitleBar.h
+SOURCES += linux/FloatingWidgetTitleBar.cpp
+QT += x11extras
 }
 
 DISTFILES +=