Merge pull request #92 from hhslepicka/fix_sip_bindings

FIX: Update SIP Bindings

setup.py

@@ -14,8 +14,8 @@ from PyQt5.QtCore import PYQT_CONFIGURATION
 from PyQt5.pyrcc_main import processResourceFile
 
 MAJOR = 2
-MINOR = 5
+MINOR = 7
-MICRO = 1
+MICRO = 0
 ISRELEASED = True
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
 MODULE_NAME = "ads"

sip/DockAreaTabBar.sip

@@ -18,9 +18,10 @@ protected:
 	virtual void mouseMoveEvent(QMouseEvent* ev);
 	virtual void mouseDoubleClickEvent(QMouseEvent *event);
 	void startFloating(const QPoint& Offset);
-	ads::CFloatingDockContainer* makeAreaFloating(const QPoint& Offset,
+	ads::IFloatingWidget* makeAreaFloating(const QPoint& Offset,
 		ads::eDragState DragState);
-    
+    ads::eDragState dragState() const;
+
 public:
 	CDockAreaTabBar(ads::CDockAreaWidget* parent /TransferThis/);
 	virtual ~CDockAreaTabBar();

sip/DockContainerWidget.sip

@@ -23,10 +23,11 @@ protected:
 	QSplitter* rootSplitter() const;
 	void createRootSplitter();
 	void dropFloatingWidget(ads::CFloatingDockContainer* FloatingWidget, const QPoint& TargetPos);
+    void dropWidget(QWidget* widget, const QPoint& TargetPos);
 	void addDockArea(ads::CDockAreaWidget* DockAreaWidget /Transfer/, ads::DockWidgetArea area = ads::CenterDockWidgetArea);
 	void removeDockArea(ads::CDockAreaWidget* area /Transfer/);
 	void saveState(QXmlStreamWriter& Stream) const;
-	bool restoreState(QXmlStreamReader& Stream, bool Testing);
+	bool restoreState(CDockingStateReader& Stream, bool Testing);
 	ads::CDockAreaWidget* lastAddedDockAreaWidget(ads::DockWidgetArea area) const;
 	bool hasTopLevelDockWidget() const;
 	ads::CDockWidget* topLevelDockWidget() const;

sip/DockManager.sip

@@ -152,7 +152,13 @@ public:
 		TabCloseButtonIsToolButton,
 		AllTabsHaveCloseButton,
 		RetainTabSizeWhenCloseButtonHidden,
+        OpaqueUndocking,
+        DragPreviewIsDynamic,
+        DragPreviewShowsContentPixmap,
+        DragPreviewHasWindowFrame,
 		DefaultConfig,
+        DefaultNonOpaqueConfig,
+        NonOpaqueWithWindowFrame,
 	};
     typedef QFlags<ads::CDockManager::eConfigFlag> ConfigFlags;
 
@@ -161,20 +167,22 @@ public:
 	static ads::CDockManager::ConfigFlags configFlags();
 	static void setConfigFlags(const ads::CDockManager::ConfigFlags Flags);
 	static void setConfigFlag(ads::CDockManager::eConfigFlag Flag, bool On = true);
+    static ads::CIconProvider& iconProvider();
 	ads::CDockAreaWidget* addDockWidget(ads::DockWidgetArea area, ads::CDockWidget* Dockwidget /Transfer/,
 		ads::CDockAreaWidget* DockAreaWidget /Transfer/ = 0);
 	ads::CDockAreaWidget* addDockWidgetTab(ads::DockWidgetArea area,
 		ads::CDockWidget* Dockwidget /Transfer/);
 	ads::CDockAreaWidget* addDockWidgetTabToArea(ads::CDockWidget* Dockwidget /Transfer/,
 		ads::CDockAreaWidget* DockAreaWidget /Transfer/);
+    ads::CFloatingDockContainer* addDockWidgetFloating(ads::CDockWidget* DockWidget /Transfer/);
 	ads::CDockWidget* findDockWidget(const QString& ObjectName) const;
 	void removeDockWidget(ads::CDockWidget* Dockwidget) /TransferBack/;
 	QMap<QString, ads::CDockWidget*> dockWidgetsMap() const;
 	const QList<ads::CDockContainerWidget*> dockContainers() const;
 	const QList<ads::CFloatingDockContainer*> floatingWidgets() const;
 	virtual unsigned int zOrderIndex() const;
-	QByteArray saveState(int version = 0) const;
+	QByteArray saveState(int version = 1) const;
-	bool restoreState(const QByteArray &state, int version = 0);
+	bool restoreState(const QByteArray &state, int version = 1);
 	void addPerspective(const QString& UniquePrespectiveName);
 	void removePerspective(const QString& Name);
 	void removePerspectives(const QStringList& Names);
@@ -198,8 +206,11 @@ signals:
     void stateRestored();
     void openingPerspective(const QString& PerspectiveName);
     void perspectiveOpened(const QString& PerspectiveName);
+    void dockAreaCreated(ads::CDockAreaWidget* DockArea);
+    void dockWidgetAboutToBeRemoved(ads::CDockWidget* DockWidget);
+    void dockWidgetRemoved(ads::CDockWidget* DockWidget);
 };
 
 };
 
-%End
+%End

sip/DockWidget.sip

@@ -28,6 +28,7 @@ public:
 		DockWidgetClosable,
 		DockWidgetMovable,
 		DockWidgetFloatable,
+		DockWidgetDeleteOnClose,
 		AllDockWidgetFeatures,
 		NoDockWidgetFeatures
 	};
@@ -88,6 +89,8 @@ public:
 
 public slots:
 	void toggleView(bool Open = true);
+    void setFloating();
+    void deleteDockWidget();
 
 signals:
 	void viewToggled(bool Open);

sip/DockingStateReader.sip

@@ -0,0 +1,21 @@
+%If (Qt_5_0_0 -)
+
+namespace ads
+{
+
+class CDockingStateReader : QXmlStreamReader
+{
+
+    %TypeHeaderCode
+    #include <DockingStateReader.h>
+    %End
+
+
+public:
+	void setFileVersion(int FileVersion);
+	int fileVersion() const;
+};
+
+};
+
+%End

sip/FloatingDockContainer.sip

@@ -5,7 +5,22 @@
 namespace ads
 {
 
-class CFloatingDockContainer : QWidget
+class IFloatingWidget
+{
+    %TypeHeaderCode
+    #include <FloatingDockContainer.h>
+    %End
+
+public:
+	virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
+        ads::eDragState DragState, QWidget* MouseEventHandler) = 0;
+
+	virtual void moveFloating() = 0;
+	virtual void finishDragging() = 0;
+};
+
+
+class CFloatingDockContainer : QWidget, ads::IFloatingWidget
 {
     
     %TypeHeaderCode
@@ -13,14 +28,14 @@ class CFloatingDockContainer : QWidget
     %End
     
 protected:
-	void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
+	virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
         ads::eDragState DragState, QWidget* MouseEventHandler);
     void startDragging(const QPoint& DragStartMousePos, const QSize& Size,
         QWidget* MouseEventHandler);
-	void finishDragging();
+	virtual void finishDragging();
 	void initFloatingGeometry(const QPoint& DragStartMousePos, const QSize& Size);
 	void moveFloating();
-	bool restoreState(QXmlStreamReader& Stream, bool Testing);
+	bool restoreState(ads::CDockingStateReader& Stream, bool Testing);
 	void updateWindowTitle();
 
 

sip/FloatingDragPreview.sip

@@ -0,0 +1,38 @@
+%Import QtWidgets/QtWidgetsmod.sip
+
+%If (Qt_5_0_0 -)
+
+namespace ads
+{
+
+class CFloatingDragPreview : QWidget, ads::IFloatingWidget
+{
+
+    %TypeHeaderCode
+    #include <FloatingDragPreview.h>
+    %End
+
+
+public:
+    CFloatingDragPreview(ads::CDockWidget* Content /TransferThis/ );
+    CFloatingDragPreview(ads::CDockAreaWidget* Content /TransferThis/ );
+
+    virtual ~CFloatingDragPreview();
+
+    virtual bool eventFilter(QObject* watched, QEvent* event);
+
+    virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
+        ads::eDragState DragState, QWidget* MouseEventHandler);
+
+    virtual void moveFloating();
+
+    virtual void finishDragging();
+
+signals:
+    void draggingCanceled();
+
+};
+
+};
+
+%End

sip/IconProvider.sip

@@ -0,0 +1,28 @@
+%Import QtWidgets/QtWidgetsmod.sip
+
+%If (Qt_5_0_0 -)
+
+namespace ads
+{
+
+class CIconProvider
+{
+
+    %TypeHeaderCode
+    #include <IconProvider.h>
+    %End
+
+
+public:
+    CIconProvider();
+
+  	virtual ~CIconProvider();
+
+    QIcon customIcon(eIcon IconId);
+
+    void registerCustomIcon(eIcon IconId, const QIcon& icon /TransferThis/ );
+};
+
+};
+
+%End

sip/ads.sip

@@ -9,12 +9,15 @@
 %Include DockAreaTitleBar.sip
 %Include DockAreaWidget.sip
 %Include DockContainerWidget.sip
+%Include DockingStateReader.sip
 %Include DockManager.sip
 %Include DockOverlay.sip
 %Include DockSplitter.sip
 %Include DockWidgetTab.sip
 %Include ElidingLabel.sip
 %Include FloatingDockContainer.sip
+%Include FloatingDragPreview.sip
+%Include IconProvider.sip
 %If (Linux)
     %Include linux/FloatingWidgetTitleBar.sip
 %End

sip/ads_globals.sip

@@ -39,6 +39,16 @@ namespace ads
         DraggingFloatingWidget
     };
 
+    enum eIcon
+    {
+        TabCloseIcon,
+        DockAreaMenuIcon,
+        DockAreaUndockIcon,
+        DockAreaCloseIcon,
+
+        IconCount,
+    };
+
 };
 
 %End