Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

basic PySide2 support in examples/qt.py #438 #490

Merged
merged 1 commit into from
Nov 14, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions examples/qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
PYQT4 = False
PYQT5 = False
PYSIDE = False
PYSIDE2 = False
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Navigation bar icons don't work, see screenshot:
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't able to reproduce this - the buttons appear normally and work correctly in:
CentOS7
Ubuntu 18.10
Kubuntu 18.04
macOS High Sierra
I tested with py2 and py3 and pyqt5 and pyside2 on all the above. All the Python and PySide/PyQt stuff was from miniconda.

I also tested with PySide2 from apt on Ubuntu 18.10 with no button issues.

(I did see sporadic #284 type problems on all these platforms).

Can you please tell me more about your environment?


Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a new line to the "Tested configurations" section at the top of the file.

if "pyqt4" in sys.argv:
PYQT4 = True
Expand All @@ -47,11 +48,24 @@
from PySide.QtGui import *
# noinspection PyUnresolvedReferences
from PySide.QtCore import *
elif "pyside2" in sys.argv:
PYSIDE2 = True
# noinspection PyUnresolvedReferences
import PySide2
# noinspection PyUnresolvedReferences
from PySide2 import QtCore
# noinspection PyUnresolvedReferences
from PySide2.QtGui import *
# noinspection PyUnresolvedReferences
from PySide2.QtCore import *
# noinspection PyUnresolvedReferences
from PySide2.QtWidgets import *
else:
print("USAGE:")
print(" qt.py pyqt4")
print(" qt.py pyqt5")
print(" qt.py pyside")
print(" qt.py pyside2")
sys.exit(1)

# Fix for PyCharm hints warnings when using static methods
Expand Down Expand Up @@ -107,6 +121,9 @@ def check_versions():
elif PYSIDE:
print("[qt.py] PySide {v1} (qt {v2})".format(
v1=PySide.__version__, v2=QtCore.__version__))
elif PYSIDE2:
print("[qt.py] PySide2 {v1} (qt {v2})".format(
v1=PySide2.__version__, v2=QtCore.__version__))
# CEF Python version requirement
assert cef.__version__ >= "55.4", "CEF Python v55.4+ required to run this"

Expand All @@ -126,6 +143,8 @@ def __init__(self):
self.setWindowTitle("PyQt5 example")
elif PYSIDE:
self.setWindowTitle("PySide example")
elif PYSIDE2:
self.setWindowTitle("PySide2 example")
self.setFocusPolicy(Qt.StrongFocus)
self.setupLayout()

Expand All @@ -147,7 +166,7 @@ def setupLayout(self):
frame.setLayout(layout)
self.setCentralWidget(frame)

if PYQT5 and WINDOWS:
if (PYSIDE2 or PYQT5) and WINDOWS:
# On Windows with PyQt5 main window must be shown first
# before CEF browser is embedded, otherwise window is
# not resized and application hangs during resize.
Expand All @@ -156,7 +175,7 @@ def setupLayout(self):
# Browser can be embedded only after layout was set up
self.cef_widget.embedBrowser()

if PYQT5 and LINUX:
if (PYSIDE2 or PYQT5) and LINUX:
# On Linux with PyQt5 the QX11EmbedContainer widget is
# no more available. An equivalent in Qt5 is to create
# a hidden window, embed CEF browser in it and then
Expand Down Expand Up @@ -204,7 +223,7 @@ def focusOutEvent(self, event):
self.browser.SetFocus(False)

def embedBrowser(self):
if PYQT5 and LINUX:
if (PYSIDE2 or PYQT5) and LINUX:
# noinspection PyUnresolvedReferences
self.hidden_window = QWindow()
window_info = cef.WindowInfo()
Expand Down