ADD: Support for PySide6

.github/ISSUE_TEMPLATE.md

@@ -18,9 +18,7 @@ Or use the helpdev if you have
 
 [If used, please inform their versions]
 
-- PySide:
-- PyQt:
-- PyQtGraph:
+- PySide6:
 - QtPy:
 - QT_API:
 - PYQTGRAPH_QT_LIB:

.github/workflows/build.yml

@@ -6,13 +6,14 @@ on:
 
 jobs:
   build:
-    name: Build - Python ${{ matrix.python-version }} - ${{ matrix.platform }}
+    name: Build - Python ${{ matrix.python-version }} - ${{ matrix.qt-binding }} - ${{ matrix.platform }}
     runs-on: ${{ matrix.platform }}
     strategy:
-      max-parallel: 2
+      max-parallel: 4
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.9]
+        qt-binding: [pyqt5, pyside2, pyside6]
+        python-version: [3.10]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -29,18 +30,18 @@ jobs:
       run: tox
       env:
         PLATFORM: ${{ matrix.platform }}
-        TASK: build
+        QT_BINDING: ${{ matrix.qt-binding }}
 
   test:
     needs: [build]
     name: Test - ${{ matrix.tasks }}
     runs-on: ${{ matrix.platform }}
     strategy:
-      max-parallel: 2
+      max-parallel: 4
       matrix:
         platform: [ubuntu-latest]
-        python-version: [3.9]
-        tasks: [lint, safety, metric, doc, release]
+        python-version: [3.10]
+        tasks: [lint, safety, format, metric, doc, release]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -57,7 +58,6 @@ jobs:
       run: tox
       env:
         PLATFORM: ${{ matrix.platform }}
-        TASK: ${{ matrix.tasks }}
 
   release:
     runs-on: ubuntu-latest
@@ -69,7 +69,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2.3.2
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: Install dependencies
       run: |

.github/workflows/deploy.yml

@@ -15,19 +15,19 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2.3.2
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install build twine
 
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_TEST_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         twine upload --repository testpypi --skip-existing --verbose dist/*
 
   deploy:
@@ -39,17 +39,17 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2.3.2
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install build twine
 
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         twine upload --skip-existing --verbose dist/*

.github/workflows/docs.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2.3.2
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: Install dependencies
       run: |

CHANGES.rst

@@ -1,5 +1,24 @@
 Changelog
 =========
+- Unreleased
+    -
+
+- 0.9.9
+    - Fix size and tooltip for palette button in palette picker widgets
+    - Add AIK and Djurgården palettes
+    - Update to GBK palette to reduce contrast between colors
+    - Fix complex dependencies by replacing linting tools with ruff
+      and safety with pip audit
+
+- 0.9.8
+    - Add new palettes: GBK
+
+- 0.9.7
+    - Add support for py 3.10
+    - Add support for PySide6
+    - Remove traces of unsupported Qt, PyQt4 and PySide
+    - Remove support for pyqtgraph
+    - Remove GoogleMapsWidgets to remove WebEngine dependencies
 
 - 0.9.6:
     - Cast ``floats`` to ``ints`` to fix TypeErrors in new Qt version

CONTRIBUTING.rst

@@ -206,8 +206,7 @@ inside script folder, using:
        python process_ui.py
     ```
 
-It will generate all ``_ui.py`` files for PyQt4, PyQt5, PySide, QtPy,
-PyQtGraph.
+It will generate all ``_ui.py`` files for PySide2, PySide6, PyQt5, QtPy.
 
 Modifying QSS File
 ~~~~~~~~~~~~~~~~~~
@@ -223,8 +222,7 @@ folder.
        python process_qrc.py
     ```
 
-This generates all ``_rc.py`` files for PyQt4, PyQt5, PySide, QtPy,
-PyQtGraph.
+This generates all ``_rc.py`` files for PySide2, PySide6, PyQt5, QtPy.
 
 Making It Easy
 ~~~~~~~~~~~~~~
@@ -354,17 +352,17 @@ maintainer in both.
 
 2. Generate a distribution (code package and wheel)
 
-   ``python setup.py sdist bdist_wheel``
+   ``python -m build``
 
 3. Check with ``twine``, which also tests README format for PyPI
 
    ``twine check dist/*``
 
 4. Try upload in `PyPI test
-   page <https://test.pypi.org/project/QRainbowstyle>`__ platform before
-   the oficial
+   page <https://test.pypi.org/project/QRainbowstyle>`__ platform before the
+   official one.
 
-   ``twine upload --repository-url https://test.pypi.org/legacy/ dist/*``
+   ``twine upload --repository testpypi dist/*``
 
 5. Try to install from test
 
@@ -375,9 +373,9 @@ maintainer in both.
    ``pip uninstall qrainbowstyle -y``
 
 7. Upload to `PyPI official
-   page <https://pypi.python.org/pypi/QRainbowstyle>`__
+   page <https://pypi.org/project/QRainbowstyle>`__
 
-   ``twine upload --repository-url https://upload.pypi.org/legacy/ dist/*``
+   ``twine upload dist/*``
 
 8. Try to install from oficial
 

README.rst

@@ -5,7 +5,7 @@ QRainbowStyleSheet
 |License: CC BY 4.0| |Conduct|
 
 The most complete customizable stylesheet for Qt application (PySide2,
-PyQt5, QtPy, Qt.Py).
+PySide6, PyQt5, QtPy, Qt.Py).
 
 Preview
 -------
@@ -72,8 +72,10 @@ Frameless windows
     from qtpy.QtWidgets import QApplication
     from qtpy.QtCore import Qt
 
-    QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps)
-    QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
+    # If using Qt5 enable for HighDPI support, in Qt6 HighDPI support is
+    # enabled by default.
+    # QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps)
+    # QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
 
     app = QApplication(sys.argv)
     app.setStyleSheet(qrainbowstyle.load_stylesheet(style="oceanic"))
@@ -109,7 +111,7 @@ Style sheet
     import qrainbowstyle
 
     # set the environment variable to use a specific wrapper
-    # it can be set to pyqt, pyqt5, or pyside2
+    # it can be set to pyqt5, pyside2 or pyside6
     # you do not need to use QtPy to set this variable
     os.environ['QT_API'] = 'pyqt5'
 
@@ -143,8 +145,6 @@ If you are using PyQt5 directly, see the complete example
     window = QMainWindow()
 
     # setup stylesheet
-    app.setStyleSheet(qrainbowstyle.load_stylesheet_pyqt5())
-    # or in new API
     app.setStyleSheet(qrainbowstyle.load_stylesheet(qt_api='pyqt5'))
 
     # run
@@ -165,8 +165,6 @@ Here is an example using PySide2
     window = QMainWindow()
 
     # setup stylesheet
-    app.setStyleSheet(qrainbowstyle.load_stylesheet_pyside2())
-    # or in new API
     app.setStyleSheet(qrainbowstyle.load_stylesheet(qt_api='pyside2'))
 
     # run
@@ -184,6 +182,7 @@ Available styles
 Currently available styles are:
 
 * Oceanic
+* GBK
 * QDarkStyle3
 * QDarkstyle3Light
 * LightOrange
@@ -204,15 +203,6 @@ In v0.6 I added a few new widgets which automatically load colors from current
 stylesheet's palette.
 
 
-GoogleMapsView
-~~~~~~~~~~~~~~
-
-GoogleMapsView allows to load Google Maps to application. Supports creating markers and polylines.
-Call handler captures all map/markers/polylines actions such as map move or marker click/double click.
-
-.. image:: https://raw.githubusercontent.com/desty2k/QRainbowStyleSheet/master/images/frameless_mainwindow_google_maps_example.png
-
-
 StylePicker
 ~~~~~~~~~~~
 

docs/conf.py

@@ -13,16 +13,16 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.abspath('..'))
-sys.path.insert(1, os.path.abspath(os.path.join('..', 'scripts')))
+sys.path.insert(0, os.path.abspath(".."))
+sys.path.insert(1, os.path.abspath(os.path.join("..", "scripts")))
 
 import qrainbowstyle
 
 # -- Project information -----------------------------------------------------
 
-project = 'QRainbowStyle'
-copyright = '2021, Wojciech Wentland'
-author = 'Wojciech Wentland'
+project = "QRainbowStyle"
+copyright = "2021, Wojciech Wentland"
+author = "Wojciech Wentland"
 
 
 # The version info for the project you're documenting, acts as replacement for
@@ -32,7 +32,7 @@
 # The short X.Y version.
 version = qrainbowstyle.__version__
 # The full version, including alpha/beta/rc tags.
-release = ''
+release = ""
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -46,39 +46,41 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.doctest',
-              'sphinx.ext.intersphinx',
-              'sphinx.ext.todo',
-              'sphinx.ext.coverage',
-              'sphinx.ext.mathjax',
-              'sphinx.ext.ifconfig',
-              'sphinx.ext.viewcode',
-              'sphinx.ext.githubpages',
-              'sphinx.ext.napoleon']
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.mathjax",
+    "sphinx.ext.ifconfig",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.githubpages",
+    "sphinx.ext.napoleon",
+]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
-source_suffix = ['.rst']
+source_suffix = [".rst"]
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"

docs/example/FramelessWindowExample.rst

@@ -0,0 +1,8 @@
+FramelessWindowExample module
+=============================
+
+.. automodule:: FramelessWindowExample
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :private-members:

docs/example/FramelessWindowsMenuExample.rst

@@ -0,0 +1,8 @@
+FramelessWindowsMenuExample module
+==================================
+
+.. automodule:: FramelessWindowsMenuExample
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :private-members:

docs/example/QRoundProgressBarExample.rst

@@ -0,0 +1,8 @@
+QRoundProgressBarExample module
+===============================
+
+.. automodule:: QRoundProgressBarExample
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :private-members: