V4.4.0

.github/workflows/dist.yml

@@ -0,0 +1,102 @@
+name: Build Sdist and Wheels
+
+on:
+  push:
+    branches: [main]
+    tags: [v*]
+  pull_request:
+
+jobs:
+  build-sdist:
+    name: 🐍 sdist and universal wheel
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+      - uses: hynek/build-and-inspect-python-package@v2
+        with:
+          skip-wheel: true
+
+  build-wheels:
+    name: wheels (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    env:
+      QT_VERSION: "6.5.3"
+      QT_INSTALL_DIR: Qt
+    strategy:
+      fail-fast: false
+      matrix:
+        # TODO: fix ubuntu-latest
+        os: [windows-latest, macos-13, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+      - uses: astral-sh/setup-uv@v5
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          toolset: "14.29"
+
+      - name: Install Qt
+        shell: bash
+        run: |
+          case "${{ runner.os }}" in
+            Linux)
+              export QT_HOST_OS=linux
+              export QT_ARCH=gcc_64
+              ;;
+            macOS)
+              export QT_HOST_OS=mac
+              export QT_ARCH=clang_64
+              ;;
+            Windows)
+              export QT_HOST_OS=windows
+              export QT_ARCH=win64_msvc2019_64
+              ;;
+          esac
+
+          uvx --from aqtinstall aqt install-qt "$QT_HOST_OS" desktop \
+            "$QT_VERSION" "$QT_ARCH" --outputdir "$QT_INSTALL_DIR" \
+            --base http://mirrors.ocf.berkeley.edu/qt/
+
+      - name: Build wheels via cibuildwheel
+        uses: pypa/cibuildwheel@v2.22
+        env:
+          CIBW_BUILD_VERBOSITY: 1
+
+      - name: Upload wheels artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ runner.os }}-${{ runner.arch }}
+          path: ./wheelhouse/*.whl
+
+  publish:
+    name: Publish to PyPI
+    needs: [build-sdist, build-wheels]
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+      - name: Get sdist
+        uses: actions/download-artifact@v4
+        with:
+          name: Packages
+          path: dist
+      - name: Get wheels
+        uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-wheels-*
+          path: dist
+          merge-multiple: true
+
+      - name: 🚢 Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+      - uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+          files: "./dist/*"

.gitignore

@@ -2,3 +2,7 @@ build
 dist
 __pycache__/
 Qt/
+.vscode/settings.json
+persist/perspectives.ini
+aqtinstall.log
+wheelhouse/

.pre-commit-config.yaml

@@ -3,20 +3,21 @@ ci:
   autofix_commit_msg: "style(pre-commit.ci): auto fixes [...]"
   autoupdate_commit_msg: "ci(pre-commit.ci): autoupdate"
 
+files: "examples|tests"
 repos:
   - repo: https://github.com/crate-ci/typos
-    rev: typos-dict-v0.11.35
+    rev: typos-dict-v0.12.6
     hooks:
       - id: typos
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.3
+    rev: v0.9.8
     hooks:
       - id: ruff
         args: [--fix, --unsafe-fixes]
       - id: ruff-format
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.22
+    rev: v0.23
     hooks:
       - id: validate-pyproject

README.md

@@ -0,0 +1,3 @@
+# PyQt6Ads
+
+PyQt6 Bindings for [Qt-Advanced-Docking-System](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System)

examples/autohide/main.py

@@ -3,14 +3,13 @@
 
 from PyQt6 import uic
 from PyQt6.QtCore import QSignalBlocker
-from PyQt6.QtGui import QCloseEvent
+from PyQt6.QtGui import QCloseEvent, QAction
 from PyQt6.QtWidgets import (
     QApplication,
     QTableWidget,
     QPlainTextEdit,
     QWidgetAction,
     QComboBox,
-    QAction,
     QSizePolicy,
     QInputDialog,
 )
@@ -27,11 +26,11 @@ def __init__(self, parent=None):
 
         self.setupUi(self)
 
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.OpaqueSplitterResize, True)
+        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.OpaqueSplitterResize, True)
         QtAds.CDockManager.setConfigFlag(
-            QtAds.CDockManager.XmlCompressionEnabled, False
+            QtAds.CDockManager.eConfigFlag.XmlCompressionEnabled, False
         )
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FocusHighlighting, True)
+        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
         self.dock_manager = QtAds.CDockManager(self)
 
         # Set central widget
@@ -51,7 +50,7 @@ def __init__(self, parent=None):
         table_dock_widget = QtAds.CDockWidget("Table 1")
         table_dock_widget.setWidget(table)
         table_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         table_dock_widget.resize(250, 150)
         table_dock_widget.setMinimumSize(200, 150)
@@ -66,7 +65,7 @@ def __init__(self, parent=None):
         table_dock_widget = QtAds.CDockWidget("Table 2")
         table_dock_widget.setWidget(table)
         table_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         table_dock_widget.resize(250, 150)
         table_dock_widget.setMinimumSize(200, 150)
@@ -81,7 +80,7 @@ def __init__(self, parent=None):
         properties_dock_widget = QtAds.CDockWidget("Properties")
         properties_dock_widget.setWidget(properties_table)
         properties_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         properties_dock_widget.resize(250, 150)
         properties_dock_widget.setMinimumSize(200, 150)
@@ -99,11 +98,11 @@ def create_perspective_ui(self):
         save_perspective_action.triggered.connect(self.save_perspective)
         perspective_list_action = QWidgetAction(self)
         self.perspective_combobox = QComboBox(self)
-        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
         self.perspective_combobox.setSizePolicy(
-            QSizePolicy.Preferred, QSizePolicy.Preferred
+            QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred
         )
-        self.perspective_combobox.activated[str].connect(
+        self.perspective_combobox.currentTextChanged.connect(
             self.dock_manager.openPerspective
         )
         perspective_list_action.setDefaultWidget(self.perspective_combobox)

examples/autohidedragndrop/main.py

@@ -2,15 +2,21 @@
 import sys
 
 from PyQt6 import uic
-from PyQt6.QtCore import QSignalBlocker
-from PyQt6.QtGui import QCloseEvent
+from PyQt6.QtCore import QSignalBlocker, Qt
+from PyQt6.QtGui import (
+    QCloseEvent,
+    QAction,
+    QDragEnterEvent,
+    QDragLeaveEvent,
+    QDropEvent,
+)
 from PyQt6.QtWidgets import (
     QApplication,
     QPlainTextEdit,
     QWidgetAction,
     QComboBox,
-    QAction,
     QSizePolicy,
+    QPushButton,
     QInputDialog,
 )
 
@@ -20,20 +26,44 @@
 MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)
 
 
+class DroppableItem(QPushButton):
+    def __init__(self, text: str):
+        super().__init__(text)
+        self.setAcceptDrops(True)
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+
+    def dragEnterEvent(self, event: QDragEnterEvent):
+        if event.mimeData().hasText():
+            event.acceptProposedAction()
+            self.setCursor(Qt.CursorShape.DragMoveCursor)
+
+    def dragLeaveEvent(self, event: QDragLeaveEvent):
+        self.unsetCursor()
+
+    def dropEvent(self, event: QDropEvent):
+        if event.mimeData().hasText():
+            event.acceptProposedAction()
+            self.setText(event.mimeData().text())
+
+
 class MainWindow(MainWindowUI, MainWindowBase):
     def __init__(self, parent=None):
         super().__init__(parent)
 
         self.setupUi(self)
 
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.OpaqueSplitterResize, True)
         QtAds.CDockManager.setConfigFlag(
-            QtAds.CDockManager.XmlCompressionEnabled, False
+            QtAds.CDockManager.eConfigFlag.OpaqueSplitterResize, True
         )
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FocusHighlighting, True)
-        QtAds.CDockManager.setAutoHideConfigFlag(
-            QtAds.CDockManager.AutoHideOpenOnDragHover, True
+        QtAds.CDockManager.setConfigFlag(
+            QtAds.CDockManager.eConfigFlag.XmlCompressionEnabled, False
+        )
+        QtAds.CDockManager.setConfigFlag(
+            QtAds.CDockManager.eConfigFlag.FocusHighlighting, True
         )
+        # QtAds.CDockManager.setAutoHideConfigFlag(
+        #     QtAds.CDockManager.eAutoHideFlag.AutoHideOpenOnDragHover, True
+        # )
         self.dock_manager = QtAds.CDockManager(self)
 
         # Set central widget
@@ -50,7 +80,7 @@ def __init__(self, parent=None):
         drop_dock_widget = QtAds.CDockWidget("Tab")
         drop_dock_widget.setWidget(droppable_item)
         drop_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         drop_dock_widget.setMinimumSize(200, 150)
         drop_dock_widget.setAcceptDrops(True)
@@ -67,11 +97,11 @@ def create_perspective_ui(self):
         save_perspective_action.triggered.connect(self.save_perspective)
         perspective_list_action = QWidgetAction(self)
         self.perspective_combobox = QComboBox(self)
-        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToContents)
         self.perspective_combobox.setSizePolicy(
-            QSizePolicy.Preferred, QSizePolicy.Preferred
+            QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred
         )
-        self.perspective_combobox.activated[str].connect(
+        self.perspective_combobox.currentTextChanged.connect(
             self.dock_manager.openPerspective
         )
         perspective_list_action.setDefaultWidget(self.perspective_combobox)

examples/centralwidget/main.py

@@ -3,14 +3,13 @@
 
 from PyQt6 import uic
 from PyQt6.QtCore import QSignalBlocker
-from PyQt6.QtGui import QCloseEvent
+from PyQt6.QtGui import QCloseEvent, QAction
 from PyQt6.QtWidgets import (
     QApplication,
     QTableWidget,
     QPlainTextEdit,
     QWidgetAction,
     QComboBox,
-    QAction,
     QSizePolicy,
     QInputDialog,
 )
@@ -27,11 +26,15 @@ def __init__(self, parent=None):
 
         self.setupUi(self)
 
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.OpaqueSplitterResize, True)
         QtAds.CDockManager.setConfigFlag(
-            QtAds.CDockManager.XmlCompressionEnabled, False
+            QtAds.CDockManager.eConfigFlag.OpaqueSplitterResize, True
+        )
+        QtAds.CDockManager.setConfigFlag(
+            QtAds.CDockManager.eConfigFlag.XmlCompressionEnabled, False
+        )
+        QtAds.CDockManager.setConfigFlag(
+            QtAds.CDockManager.eConfigFlag.FocusHighlighting, True
         )
-        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FocusHighlighting, True)
         self.dock_manager = QtAds.CDockManager(self)
 
         # Set central widget
@@ -51,7 +54,7 @@ def __init__(self, parent=None):
         table_dock_widget = QtAds.CDockWidget("Table 1")
         table_dock_widget.setWidget(table)
         table_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         table_dock_widget.resize(250, 150)
         table_dock_widget.setMinimumSize(200, 150)
@@ -66,7 +69,7 @@ def __init__(self, parent=None):
         table_dock_widget = QtAds.CDockWidget("Table 2")
         table_dock_widget.setWidget(table)
         table_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         table_dock_widget.resize(250, 150)
         table_dock_widget.setMinimumSize(200, 150)
@@ -81,7 +84,7 @@ def __init__(self, parent=None):
         properties_dock_widget = QtAds.CDockWidget("Properties")
         properties_dock_widget.setWidget(properties_table)
         properties_dock_widget.setMinimumSizeHintMode(
-            QtAds.CDockWidget.MinimumSizeHintFromDockWidget
+            QtAds.CDockWidget.eMinimumSizeHintMode.MinimumSizeHintFromDockWidget
         )
         properties_dock_widget.resize(250, 150)
         properties_dock_widget.setMinimumSize(200, 150)
@@ -99,11 +102,13 @@ def create_perspective_ui(self):
         save_perspective_action.triggered.connect(self.save_perspective)
         perspective_list_action = QWidgetAction(self)
         self.perspective_combobox = QComboBox(self)
-        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+        self.perspective_combobox.setSizeAdjustPolicy(
+            QComboBox.SizeAdjustPolicy.AdjustToContents
+        )
         self.perspective_combobox.setSizePolicy(
-            QSizePolicy.Preferred, QSizePolicy.Preferred
+            QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred
         )
-        self.perspective_combobox.activated[str].connect(
+        self.perspective_combobox.currentTextChanged.connect(
             self.dock_manager.openPerspective
         )
         perspective_list_action.setDefaultWidget(self.perspective_combobox)