From 4b8213341055d92face17a530ac6848545a15cab Mon Sep 17 00:00:00 2001 From: Joao Bimbo Date: Tue, 24 Jan 2017 16:56:52 +0100 Subject: [PATCH 1/2] qt5 imports --- src/xdot/xdot_qt.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/xdot/xdot_qt.py b/src/xdot/xdot_qt.py index 2abaf79..04c48e7 100755 --- a/src/xdot/xdot_qt.py +++ b/src/xdot/xdot_qt.py @@ -33,13 +33,15 @@ #from PySide.QtCore import * #from PySide.QtGui import * -from PyQt4 import * -from PyQt4.QtCore import * -from PyQt4.QtGui import * +from PyQt5 import * +from PyQt5.QtCore import * +from PyQt5.QtGui import * +from PyQt5.QtCore import Signal +from python_qt_binding.QtWidgets import QWidget, QMainWindow #from python_qt_binding import * -#from python_qt_binding.QtCore import * -#from python_qt_binding.QtGui import * +#from python_qt_binding.QtCore import QMainWindow +#from python_qt_binding.QtGui import * #-------------------------------------------------------------------------------------------------------------------------------------------------------------------- #-- Drawing Classes --# @@ -1338,6 +1340,8 @@ class DotWidget(QWidget): """Qt widget that draws dot graphs.""" filter = 'dot' + trigger = pyqtSignal() + def __init__(self, parent=None): super(DotWidget, self).__init__(parent) @@ -1634,9 +1638,9 @@ def mouseReleaseEvent(self, event): x, y = event.x(), event.y() url = self.get_url(x, y) if url is not None: - self.emit(SIGNAL("clicked"), unicode(url.url), event) + self.trigger.emit(SIGNAL("clicked"), unicode(url.url), event) else: - self.emit(SIGNAL("clicked"), 'none', event) + self.trigger.emit(SIGNAL("clicked"), 'none', event) jump = self.get_jump(x, y) if jump is not None: self.animate_to(jump.x, jump.y) @@ -1647,9 +1651,9 @@ def mouseReleaseEvent(self, event): x, y = event.x(), event.y() url = self.get_url(x, y) if url is not None: - self.emit(SIGNAL("right_clicked"), unicode(url.url), event) + self.trigger.emit(SIGNAL("right_clicked"), unicode(url.url), event) else: - self.emit(SIGNAL("right_clicked"), 'none', event) + self.trigger.emit(SIGNAL("right_clicked"), 'none', event) jump = self.get_jump(x, y) if jump is not None: self.animate_to(jump.x, jump.y) From 4929276e1c57372d8fe830e2d117559e72849391 Mon Sep 17 00:00:00 2001 From: Joao Bimbo Date: Tue, 24 Jan 2017 17:20:44 +0100 Subject: [PATCH 2/2] qt5 wheel emit and wheelevent --- src/xdot/xdot_qt.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xdot/xdot_qt.py b/src/xdot/xdot_qt.py index 04c48e7..cd88c50 100755 --- a/src/xdot/xdot_qt.py +++ b/src/xdot/xdot_qt.py @@ -1340,7 +1340,7 @@ class DotWidget(QWidget): """Qt widget that draws dot graphs.""" filter = 'dot' - trigger = pyqtSignal() + trigger = pyqtSignal(str,str,QMouseEvent) def __init__(self, parent=None): @@ -1638,9 +1638,9 @@ def mouseReleaseEvent(self, event): x, y = event.x(), event.y() url = self.get_url(x, y) if url is not None: - self.trigger.emit(SIGNAL("clicked"), unicode(url.url), event) + self.trigger.emit("clicked", unicode(url.url), event) else: - self.trigger.emit(SIGNAL("clicked"), 'none', event) + self.trigger.emit("clicked", 'none', event) jump = self.get_jump(x, y) if jump is not None: self.animate_to(jump.x, jump.y) @@ -1651,9 +1651,9 @@ def mouseReleaseEvent(self, event): x, y = event.x(), event.y() url = self.get_url(x, y) if url is not None: - self.trigger.emit(SIGNAL("right_clicked"), unicode(url.url), event) + self.trigger.emit("right_clicked", unicode(url.url), event) else: - self.trigger.emit(SIGNAL("right_clicked"), 'none', event) + self.trigger.emit("right_clicked", 'none', event) jump = self.get_jump(x, y) if jump is not None: self.animate_to(jump.x, jump.y) @@ -1666,10 +1666,10 @@ def on_area_scroll_event(self, area, event): return False def wheelEvent(self, event): - if event.delta() > 0: + if event.angleDelta().y() > 0: self.zoom_image(self.zoom_ratio * self.ZOOM_INCREMENT, pos=(event.x(), event.y())) - if event.delta() < 0: + if event.angleDelta().y() < 0: self.zoom_image(self.zoom_ratio / self.ZOOM_INCREMENT, pos=(event.x(), event.y()))