diff --git a/FreeSimpleGUIQt/FreeSimpleGUIQt/FreeSimpleGUIQt.py b/FreeSimpleGUIQt/FreeSimpleGUIQt/FreeSimpleGUIQt.py index a2b67868..3ec86102 100644 --- a/FreeSimpleGUIQt/FreeSimpleGUIQt/FreeSimpleGUIQt.py +++ b/FreeSimpleGUIQt/FreeSimpleGUIQt/FreeSimpleGUIQt.py @@ -31,7 +31,7 @@ # Copyright 2020 PySimpleGUI.org -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QApplication, QLabel, QWidget, @@ -44,7 +44,7 @@ QDial, QTableWidget, ) -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QSlider, QCheckBox, QRadioButton, @@ -55,7 +55,7 @@ QDialog, QAbstractItemView, ) -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QSpacerItem, QFrame, QGroupBox, @@ -72,22 +72,22 @@ QTreeWidgetItemIterator, QProgressBar, ) -from PySide2.QtWidgets import ( +from PySide6.QtWidgets import ( QTableWidgetItem, QGraphicsView, QGraphicsScene, QGraphicsItemGroup, QMenu, QMenuBar, - QAction, QSystemTrayIcon, QColorDialog, ) -from PySide2.QtGui import QPainter, QPixmap, QPen, QColor, QBrush, QPainterPath, QFont, QImage, QIcon -from PySide2.QtCore import Qt, QEvent, QSize -import PySide2.QtGui as QtGui -import PySide2.QtCore as QtCore -import PySide2.QtWidgets as QtWidgets +from PySide6.QtGui import QPainter, QPixmap, QPen, QColor, QBrush, QPainterPath, QFont, QImage, QIcon, QAction + +from PySide6.QtCore import Qt, QEvent, QSize +import PySide6.QtGui as QtGui +import PySide6.QtCore as QtCore +import PySide6.QtWidgets as QtWidgets using_pyqt5 = False diff --git a/FreeSimpleGUIQt/readme.md b/FreeSimpleGUIQt/readme.md index 65af85ec..55947c26 100644 --- a/FreeSimpleGUIQt/readme.md +++ b/FreeSimpleGUIQt/readme.md @@ -14,9 +14,8 @@ Welcome to the Alpha Release of FreeSimpleGUI for Qt! You can use the exact same code that you are running on the older, tkinter, version of FreeSimpleGUI. -FreeSimpleGUIQt uses **PySide2** OR **PyQt5** for access to Qt. **PyQt5 has been having a number of problems recently however so tread lightly.** +FreeSimpleGUIQt uses **PySide6** as of version 2.0.0 -- Version 1.0 used PySide2 -## To minimize potential problems and broken features, if at all possible, use pyside2 instead of PyQt5. ## Porting your FreeSimpleGUI code to FreeSimpleGUIQt @@ -46,18 +45,11 @@ Fonts should be in the format (font family, size). You can use the older string pip3 install --upgrade --no-cache-dir FreeSimpleGUIQt -### Installing PySide2 for Python 3 +### PySide dependency -It is _highly_ recommended that you use PySide2. The code will attempt to use PyQt5 is pyside2 isn't found. PyQt5 is **not** recommended. - -To install Pyside2: - -```pip install PySide2``` - - -**PyQt5 is no longer supported. Only PySide2 is supported** - -Too many differences were causing a lot of headaches. Supporting just 1 Qt port is difficult enough. Parsing out the differences between pyside2 and pyqt5 was simply getting to be too much +As of version 2.0.0 this project depends on PySide6, which in turn requires Python3.9 or greater. Version 1.0 of this project +used PySide2, which supports Python versions up to 3.10. The correct version of FreeSimpleGUIQt and respective +required version of PySide will be installed automatically when you install `FreeSimpleGUIQt` using `pip`. @@ -79,10 +71,6 @@ Here is the window you should see: -## Prerequisites Python 3 -PySide2 or PyQt5 (experimental) - - ## Using - Python 3 To use in your code, simply import.... `import FreeSimpleGUIQt as sg` diff --git a/FreeSimpleGUIQt/setup.cfg b/FreeSimpleGUIQt/setup.cfg index a44048d0..df334cbc 100644 --- a/FreeSimpleGUIQt/setup.cfg +++ b/FreeSimpleGUIQt/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = FreeSimpleGUIQt -version = 1.0.0 +version = 2.0.0 maintainer = Spencer Phillip Young maintainer_email = spencer.young@spyoung.com description = The free-forever Python GUI framework. @@ -10,14 +10,11 @@ keywords = PySimpleGui fork GUI UI tkinter Qt WxPython Remi wrapper simple easy url = https://github.com/spyoungtech/FreeSimpleGui classifiers = Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 - Programming Language :: Python :: 3.5 - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+) Topic :: Multimedia :: Graphics Operating System :: OS Independent @@ -27,4 +24,6 @@ packages = FreeSimpleGUIQt include_package_data = True install_requires = - pyside2 + pyside6 + +python_requires = >=3.9