diff options
Diffstat (limited to 'examples/widgets')
11 files changed, 78 insertions, 78 deletions
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..8bb742542 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)) @@ -173,7 +173,7 @@ class Window(QtWidgets.QWidget): painter.drawLine(0, xAxis, self.m_iconSize.width(), xAxis) painter.drawLine(yAxis, 0, yAxis, self.m_iconSize.height()) - curveScale = self.m_iconSize.height() / 2.0; + curveScale = self.m_iconSize.height() / 2.0 painter.setPen(QtCore.Qt.NoPen) 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/graphicsview/collidingmice/collidingmice.py b/examples/widgets/graphicsview/collidingmice/collidingmice.py index 575ecc1f1..8bff64bc3 100644 --- a/examples/widgets/graphicsview/collidingmice/collidingmice.py +++ b/examples/widgets/graphicsview/collidingmice/collidingmice.py @@ -90,7 +90,7 @@ class Mouse(QtWidgets.QGraphicsItem): def shape(self): path = QtGui.QPainterPath() path.addRect(-10, -20, 20, 40) - return path; + return path def paint(self, painter, option, widget): # Body. @@ -133,7 +133,7 @@ class Mouse(QtWidgets.QGraphicsItem): if lineToCenter.length() > 150: angleToCenter = math.acos(lineToCenter.dx() / lineToCenter.length()) if lineToCenter.dy() < 0: - angleToCenter = Mouse.TwoPi - angleToCenter; + angleToCenter = Mouse.TwoPi - angleToCenter angleToCenter = Mouse.normalizeAngle((Mouse.Pi - angleToCenter) + Mouse.Pi / 2) if angleToCenter < Mouse.Pi and angleToCenter > Mouse.Pi / 4: diff --git a/examples/widgets/graphicsview/elasticnodes.py b/examples/widgets/graphicsview/elasticnodes.py index f013156d7..f640ab60c 100755 --- a/examples/widgets/graphicsview/elasticnodes.py +++ b/examples/widgets/graphicsview/elasticnodes.py @@ -131,7 +131,7 @@ class Edge(QtWidgets.QGraphicsItem): sourceArrowP1 = self.sourcePoint + QtCore.QPointF(math.sin(angle + Edge.Pi / 3) * self.arrowSize, math.cos(angle + Edge.Pi / 3) * self.arrowSize) sourceArrowP2 = self.sourcePoint + QtCore.QPointF(math.sin(angle + Edge.Pi - Edge.Pi / 3) * self.arrowSize, - math.cos(angle + Edge.Pi - Edge.Pi / 3) * self.arrowSize); + math.cos(angle + Edge.Pi - Edge.Pi / 3) * self.arrowSize) destArrowP1 = self.destPoint + QtCore.QPointF(math.sin(angle - Edge.Pi / 3) * self.arrowSize, math.cos(angle - Edge.Pi / 3) * self.arrowSize) destArrowP2 = self.destPoint + QtCore.QPointF(math.sin(angle - Edge.Pi + Edge.Pi / 3) * self.arrowSize, diff --git a/examples/widgets/layouts/dynamiclayouts.py b/examples/widgets/layouts/dynamiclayouts.py index fe46c053a..77750ee10 100644 --- a/examples/widgets/layouts/dynamiclayouts.py +++ b/examples/widgets/layouts/dynamiclayouts.py @@ -86,27 +86,27 @@ class Dialog(QDialog): def buttonsOrientationChanged(self, index): - self.mainLayout.setSizeConstraint(QLayout.SetNoConstraint); - self.setMinimumSize(0, 0); + self.mainLayout.setSizeConstraint(QLayout.SetNoConstraint) + self.setMinimumSize(0, 0) orientation = Qt.Orientation(int(self.buttonsOrientationComboBox.itemData(index))) if orientation == self.buttonBox.orientation(): return - self.mainLayout.removeWidget(self.buttonBox); + self.mainLayout.removeWidget(self.buttonBox) spacing = self.mainLayout.spacing() - oldSizeHint = self.buttonBox.sizeHint() + QSize(spacing, spacing); + oldSizeHint = self.buttonBox.sizeHint() + QSize(spacing, spacing) self.buttonBox.setOrientation(orientation) newSizeHint = self.buttonBox.sizeHint() + QSize(spacing, spacing) if orientation == Qt.Horizontal: - self.mainLayout.addWidget(self.buttonBox, 2, 0); + self.mainLayout.addWidget(self.buttonBox, 2, 0) self.resize(self.size() + QSize(-oldSizeHint.width(), newSizeHint.height())) else: - self.mainLayout.addWidget(self.buttonBox, 0, 3, 2, 1); + self.mainLayout.addWidget(self.buttonBox, 0, 3, 2, 1) self.resize(self.size() + QSize(newSizeHint.width(), -oldSizeHint.height())) self.mainLayout.setSizeConstraint(QLayout.SetDefaultConstraint) diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py index be0dc992e..78a1f9942 100755 --- a/examples/widgets/mainwindows/application/application.py +++ b/examples/widgets/mainwindows/application/application.py @@ -161,7 +161,7 @@ class MainWindow(QtWidgets.QMainWindow): self.fileMenu.addAction(self.openAct) self.fileMenu.addAction(self.saveAct) self.fileMenu.addAction(self.saveAsAct) - self.fileMenu.addSeparator(); + self.fileMenu.addSeparator() self.fileMenu.addAction(self.exitAct) self.editMenu = self.menuBar().addMenu("&Edit") @@ -243,7 +243,7 @@ class MainWindow(QtWidgets.QMainWindow): outf << self.textEdit.toPlainText() QtWidgets.QApplication.restoreOverrideCursor() - self.setCurrentFile(fileName); + self.setCurrentFile(fileName) self.statusBar().showMessage("File saved", 2000) return True diff --git a/examples/widgets/richtext/syntaxhighlighter.py b/examples/widgets/richtext/syntaxhighlighter.py index 6a431c3f9..83621ca82 100755 --- a/examples/widgets/richtext/syntaxhighlighter.py +++ b/examples/widgets/richtext/syntaxhighlighter.py @@ -189,7 +189,7 @@ class Highlighter(QtGui.QSyntaxHighlighter): self.setFormat(startIndex, commentLength, self.multiLineCommentFormat) startIndex = self.commentStartExpression.indexIn(text, - startIndex + commentLength); + startIndex + commentLength) if __name__ == '__main__': 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() |