diff options
Diffstat (limited to 'examples')
13 files changed, 92 insertions, 79 deletions
diff --git a/examples/3d/simple3d.py b/examples/3d/simple3d.py index 3cfa39a05..e4b06132b 100644 --- a/examples/3d/simple3d.py +++ b/examples/3d/simple3d.py @@ -146,7 +146,7 @@ class Window(Qt3DExtras.Qt3DWindow): self.sphereRotateTransformAnimation = QPropertyAnimation(self.sphereTransform) self.sphereRotateTransformAnimation.setTargetObject(self.controller) - self.sphereRotateTransformAnimation.setPropertyName("angle") + self.sphereRotateTransformAnimation.setPropertyName(b"angle") self.sphereRotateTransformAnimation.setStartValue(0) self.sphereRotateTransformAnimation.setEndValue(360) self.sphereRotateTransformAnimation.setDuration(10000) diff --git a/examples/scriptableapplication/pythonutils.cpp b/examples/scriptableapplication/pythonutils.cpp index 2f7d2c2ad..f546a5a6c 100644 --- a/examples/scriptableapplication/pythonutils.cpp +++ b/examples/scriptableapplication/pythonutils.cpp @@ -54,6 +54,8 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDebug> #include <QtCore/QStringList> +#include <QtCore/QTemporaryFile> +#include <QtCore/QDir> #include <sbkpython.h> #include <sbkconverter.h> @@ -122,7 +124,7 @@ bool bindAppObject(const QString &moduleName, const QString &name, return false; PyTypeObject *typeObject = SbkAppLibTypes[index]; - PyObject *po = Shiboken::Conversions::pointerToPython(reinterpret_cast<const SbkObjectType *>(typeObject), o); + PyObject *po = Shiboken::Conversions::pointerToPython(reinterpret_cast<SbkObjectType *>(typeObject), o); if (!po) { qWarning() << __FUNCTION__ << "Failed to create wrapper for" << o; return false; @@ -152,17 +154,22 @@ bool runScript(const QStringList &script) { if (init() == PythonUninitialized) return false; + + // Concatenating all the lines + QString content; + QTextStream ss(&content); + for (const QString &line: script) + ss << line << "\n"; + + // Executing the whole script as one line bool result = true; - for (const QString& lineS : script) { - const QByteArray line = lineS.toUtf8(); - if (PyRun_SimpleString(line.constData()) == -1) { - if (PyErr_Occurred()) - PyErr_Print(); - qWarning() << __FUNCTION__ << "Error at" << line; - result = false; - break; - } + const QByteArray line = content.toUtf8(); + if (PyRun_SimpleString(line.constData()) == -1) { + if (PyErr_Occurred()) + PyErr_Print(); + result = false; } + return result; } diff --git a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py index 01a69b921..6bd2b4586 100644 --- a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py @@ -122,6 +122,7 @@ def _serialize_model(model, directory): # Bookmarks as a tree view to be used in a dock widget with # functionality to persist and populate tool bars and menus. class BookmarkWidget(QTreeView): + """Provides a tree view to manage the bookmarks.""" open_bookmark = QtCore.Signal(QUrl) open_bookmark_in_new_tab = QtCore.Signal(QUrl) diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py index d9263be08..d85b8ad3d 100644 --- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py @@ -50,6 +50,7 @@ from PySide2.QtWebEngineWidgets import (QWebEngineDownloadItem, QWebEnginePage, QWebEngineProfile) class BrowserTabWidget(QTabWidget): + """Enables having several tabs with QWebEngineView.""" url_changed = QtCore.Signal(QUrl) enabled_changed = QtCore.Signal(QWebEnginePage.WebAction, bool) diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py index 030dfc14b..437c534ec 100644 --- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py @@ -48,7 +48,7 @@ from PySide2.QtWebEngineWidgets import QWebEngineDownloadItem # A QProgressBar with context menu for displaying downloads in a QStatusBar. class DownloadWidget(QProgressBar): - + """Lets you track progress of a QWebEngineDownloadItem.""" finished = QtCore.Signal() remove_requested = QtCore.Signal() diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index 12efdcd5c..09b6cc9ec 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -60,6 +60,7 @@ from PySide2.QtWebEngineWidgets import (QWebEngineDownloadItem, QWebEnginePage, main_windows = [] def create_main_window(): + """Creates a MainWindow using 75% of the available screen resolution.""" main_win = MainWindow() main_windows.append(main_win) available_geometry = app.desktop().availableGeometry(main_win) @@ -68,11 +69,14 @@ def create_main_window(): return main_win def create_main_window_with_browser(): + """Creates a MainWindow with a tab that loads the www.qt.io webpage.""" main_win = create_main_window() return main_win.add_browser_tab() class MainWindow(QMainWindow): - + """Provides the parent window that includes the BookmarkWidget, + BrowserTabWidget, and a DownloadWidget, to offer the complete + web browsing experience.""" def __init__(self): super(MainWindow, self).__init__() diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.py b/examples/widgets/animation/animatedtiles/animatedtiles.py index f50c99378..e390cfcee 100755 --- a/examples/widgets/animation/animatedtiles/animatedtiles.py +++ b/examples/widgets/animation/animatedtiles/animatedtiles.py @@ -229,7 +229,7 @@ if __name__ == '__main__': group = QtCore.QParallelAnimationGroup() for i, item in enumerate(items): - anim = QtCore.QPropertyAnimation(item, 'pos') + anim = QtCore.QPropertyAnimation(item, b'pos') anim.setDuration(750 + i * 25) anim.setEasingCurve(QtCore.QEasingCurve.InOutBack) group.addAnimation(anim) diff --git a/examples/widgets/animation/appchooser/appchooser.py b/examples/widgets/animation/appchooser/appchooser.py index 67550ab4e..862e2bef4 100755 --- a/examples/widgets/animation/appchooser/appchooser.py +++ b/examples/widgets/animation/appchooser/appchooser.py @@ -79,7 +79,7 @@ def createStates(objects, selectedRect, parent): def createAnimations(objects, machine): for obj in objects: - animation = QtCore.QPropertyAnimation(obj, 'geometry', obj) + animation = QtCore.QPropertyAnimation(obj, b'geometry', obj) machine.addDefaultAnimation(animation) diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py index 17377e83d..6a37d46d8 100644 --- a/examples/widgets/animation/easing/easing.py +++ b/examples/widgets/animation/easing/easing.py @@ -135,7 +135,7 @@ class Window(QtWidgets.QWidget): self.m_scene.addItem(self.m_item.pixmap_item) self.m_ui.graphicsView.setScene(self.m_scene) - self.m_anim = Animation(self.m_item, 'pos') + self.m_anim = Animation(self.m_item, b'pos') self.m_anim.setEasingCurve(QtCore.QEasingCurve.OutBounce) self.m_ui.easingCurvePicker.setCurrentRow(int(QtCore.QEasingCurve.OutBounce)) diff --git a/examples/widgets/animation/states/states.py b/examples/widgets/animation/states/states.py index 6b31922cb..6cf1597dd 100755 --- a/examples/widgets/animation/states/states.py +++ b/examples/widgets/animation/states/states.py @@ -191,71 +191,71 @@ if __name__ == '__main__': t1 = state1.addTransition(button.clicked, state2) animation1SubGroup = QtCore.QSequentialAnimationGroup() animation1SubGroup.addPause(250) - animation1SubGroup.addAnimation(QtCore.QPropertyAnimation(box, 'geometry', state1)) + animation1SubGroup.addAnimation(QtCore.QPropertyAnimation(box, b'geometry', state1)) t1.addAnimation(animation1SubGroup) - t1.addAnimation(QtCore.QPropertyAnimation(widget, 'geometry', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p1, 'pos', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p2, 'pos', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p3, 'pos', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p4, 'pos', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p5, 'pos', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p6, 'pos', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p1, 'rotation', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p2, 'rotation', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p3, 'rotation', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p4, 'rotation', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p5, 'rotation', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p6, 'rotation', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p1, 'opacity', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p2, 'opacity', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p3, 'opacity', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p4, 'opacity', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p5, 'opacity', state1)) - t1.addAnimation(QtCore.QPropertyAnimation(p6, 'opacity', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(widget, b'geometry', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p1, b'pos', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p2, b'pos', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p3, b'pos', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p4, b'pos', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p5, b'pos', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p6, b'pos', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p1, b'rotation', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p2, b'rotation', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p3, b'rotation', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p4, b'rotation', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p5, b'rotation', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p6, b'rotation', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p1, b'opacity', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p2, b'opacity', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p3, b'opacity', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p4, b'opacity', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p5, b'opacity', state1)) + t1.addAnimation(QtCore.QPropertyAnimation(p6, b'opacity', state1)) t2 = state2.addTransition(button.clicked, state3) - t2.addAnimation(QtCore.QPropertyAnimation(box, 'geometry', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(widget, 'geometry', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p1, 'pos', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p2, 'pos', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p3, 'pos', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p4, 'pos', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p5, 'pos', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p6, 'pos', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p1, 'rotation', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p2, 'rotation', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p3, 'rotation', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p4, 'rotation', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p5, 'rotation', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p6, 'rotation', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p1, 'opacity', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p2, 'opacity', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p3, 'opacity', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p4, 'opacity', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p5, 'opacity', state2)) - t2.addAnimation(QtCore.QPropertyAnimation(p6, 'opacity', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(box, b'geometry', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(widget, b'geometry', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p1, b'pos', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p2, b'pos', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p3, b'pos', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p4, b'pos', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p5, b'pos', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p6, b'pos', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p1, b'rotation', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p2, b'rotation', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p3, b'rotation', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p4, b'rotation', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p5, b'rotation', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p6, b'rotation', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p1, b'opacity', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p2, b'opacity', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p3, b'opacity', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p4, b'opacity', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p5, b'opacity', state2)) + t2.addAnimation(QtCore.QPropertyAnimation(p6, b'opacity', state2)) t3 = state3.addTransition(button.clicked, state1) - t3.addAnimation(QtCore.QPropertyAnimation(box, 'geometry', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(widget, 'geometry', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p1, 'pos', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p2, 'pos', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p3, 'pos', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p4, 'pos', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p5, 'pos', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p6, 'pos', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p1, 'rotation', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p2, 'rotation', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p3, 'rotation', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p4, 'rotation', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p5, 'rotation', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p6, 'rotation', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p1, 'opacity', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p2, 'opacity', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p3, 'opacity', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p4, 'opacity', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p5, 'opacity', state3)) - t3.addAnimation(QtCore.QPropertyAnimation(p6, 'opacity', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(box, b'geometry', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(widget, b'geometry', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p1, b'pos', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p2, b'pos', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p3, b'pos', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p4, b'pos', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p5, b'pos', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p6, b'pos', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p1, b'rotation', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p2, b'rotation', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p3, b'rotation', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p4, b'rotation', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p5, b'rotation', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p6, b'rotation', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p1, b'opacity', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p2, b'opacity', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p3, b'opacity', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p4, b'opacity', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p5, b'opacity', state3)) + t3.addAnimation(QtCore.QPropertyAnimation(p6, b'opacity', state3)) machine.start() diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.py b/examples/widgets/draganddrop/draggabletext/draggabletext.py index 67e988714..d2bcdf5ae 100755 --- a/examples/widgets/draganddrop/draggabletext/draggabletext.py +++ b/examples/widgets/draganddrop/draggabletext/draggabletext.py @@ -64,7 +64,7 @@ class DragLabel(QLabel): mimeData = QMimeData() mimeData.setText(self.text()) mimeData.setData('application/x-hotspot', - '%d %d' % (hotSpot.x(), hotSpot.y())) + b'%d %d' % (hotSpot.x(), hotSpot.y())) pixmap = QPixmap(self.size()) self.render(pixmap) diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py index 841943292..32adb70c7 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.py @@ -75,7 +75,7 @@ class MainWindow(QtWidgets.QMainWindow): if fileName!="": inFile = QtCore.QFile(fileName) if inFile.open(QtCore.QFile.ReadOnly | QtCore.QFile.Text): - self.editor.setPlainText(unicode(inFile.readAll())) + self.editor.setPlainText(str(inFile.readAll())) def setupEditor(self): variableFormat = QtGui.QTextCharFormat() diff --git a/examples/xmlpatterns/schema/schema.py b/examples/xmlpatterns/schema/schema.py index a10cc32ce..4a24e4f30 100755 --- a/examples/xmlpatterns/schema/schema.py +++ b/examples/xmlpatterns/schema/schema.py @@ -61,7 +61,7 @@ except NameError: # Python v3. def encode_utf8(ba): - return str(ba, encoding='utf8') + return str(ba.data(), encoding='utf8') def decode_utf8(qs): return QtCore.QByteArray(bytes(qs, encoding='utf8')) |