Upgraded PySide6-QtADS from 4.3.0.2 to 4.3.1

* Better fix for #280
* Fixes floating windows (such as range tools) on Ubuntu.

.github/ISSUE_TEMPLATE/bug_form.yml

@@ -24,8 +24,8 @@ body:
       label: UI version
       description: What version of our software are you running?
       options:
+        - 1.1.12
         - 1.1.11
-        - 1.1.10
         - other
     validations:
       required: true
@@ -39,6 +39,8 @@ body:
         - Windows 11
         - Windows 10
         - Windows 7
+        - macOS 14 arm64 (M1 and newer)
+        - macOS 14 amd64
         - macOS 13 arm64 (M1 and newer)
         - macOS 13 amd64
         - macOS 12 arm64 (M1 and newer)

.github/ISSUE_TEMPLATE/enhancement_form.yml

@@ -24,8 +24,8 @@ body:
       label: UI version
       description: What version of our software are you running?
       options:
+        - 1.1.12
         - 1.1.11
-        - 1.1.10
         - other
     validations:
       required: true
@@ -46,6 +46,8 @@ body:
         - Windows 11
         - Windows 10
         - Windows 7
+        - macOS 14 arm64 (M1 and newer)
+        - macOS 14 amd64
         - macOS 13 arm64 (M1 and newer)
         - macOS 13 amd64
         - macOS 12 arm64 (M1 and newer)

.github/ISSUE_TEMPLATE/question_form.yml

@@ -21,8 +21,8 @@ body:
       label: UI version
       description: What version of our software are you running?
       options:
+        - 1.1.12
         - 1.1.11
-        - 1.1.10
         - other
     validations:
       required: true
@@ -43,6 +43,8 @@ body:
         - Windows 11
         - Windows 10
         - Windows 7
+        - macOS 14 arm64 (M1 and newer)
+        - macOS 14 amd64
         - macOS 13 arm64 (M1 and newer)
         - macOS 13 amd64
         - macOS 12 arm64 (M1 and newer)

.github/workflows/packaging.yml

@@ -156,13 +156,11 @@ jobs:
           sudo apt install -y libudev-dev qt6-base-dev qt6-3d-dev
 
       - name: Install python dependencies
-        # CAUTION: remove hack to force PySide 6.7.3 once PySide6-QtAds gets updated.
         run: |
           which python
           python -VV
           python -m pip install --upgrade pip
           python -m pip install -U --upgrade-strategy eager -r requirements.txt
-          python -m pip install -U --upgrade-strategy eager --no-warn-conflicts shiboken6==6.7.3 PySide6==6.7.3 PySide6-Addons==6.7.3 PySide6-Essentials==6.7.3
           python -m pip install babel polib deepl
 
       - name: Patch macOS to universal2

CHANGELOG.md

@@ -5,6 +5,15 @@ This file contains the list of changes made to pyjoulescope_ui.
 
 ---
 
+## 1.1.12
+
+2024 Oct 5
+
+* Upgraded PySide6-QtADS from 4.3.0.2 to [4.3.1](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/4.3.1)
+  * Better fix for #280
+  * Fixes floating windows (such as range tools) on Ubuntu.
+
+
 ## 1.1.11
 
 2024 Sep 30

joulescope.iss

@@ -2,8 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Joulescope"
-#define MyAppVersion "1.1.11"
-#define MyAppVersionUnderscores "1_1_11"
+#define MyAppVersion "1.1.12"
+#define MyAppVersionUnderscores "1_1_12"
 #define MyAppPublisher "Jetperch LLC"
 #define MyAppURL "https://www.joulescope.com"
 #define MyAppExeName "joulescope.exe"

joulescope_ui/locale/joulescope_ui.pot

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT 1.1.11\n"
+"Project-Id-Version: PROJECT 1.1.12\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-09-21 15:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

joulescope_ui/version.py

@@ -1 +1 @@
-__version__ = "1.1.11"
+__version__ = "1.1.12"

requirements.txt

@@ -10,8 +10,8 @@ pyjls>=0.10.0,<1
 pyopengl>=3,<4
 pywin32; sys_platform == 'win32'   # python {path_to_python}\scripts\pywin32_postinstall.py -install
 pyqtgraph>=0.13.6,<1
-PySide6>=6.7.2,<7
-PySide6-QtAds>=4.3.0.2,<5
+PySide6>=6.7.3,<7
+PySide6-QtAds>=4.3.1,<5
 python-dateutil>=2.7.3,<3
 PyInstaller>=6.1.0,<7
 QtPy>=2,<3

setup.py

@@ -205,8 +205,8 @@ def run(self):
         'pyopengl>=3,<4',
         "pywin32>=223; platform_system == 'Windows'",
         'pyqtgraph>=0.13.6,<1',
-        'PySide6>=6.7.2,<7',
-        'PySide6-QtAds>=4.3.0.2,<5',
+        'PySide6>=6.7.3,<7',
+        'PySide6-QtAds>=4.3.1,<5',
         'python-dateutil>=2.7.3,<3',
         'QtPy>=2,<3',
         'requests>=2,<3',