Bitmessage/PyBitmessage-2024-12-21
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Runnable with both Python3 and Python2, with both PyQt5 and PyQt4 by using Qt.py #2250

Open
kashikoibumi wants to merge 127 commits from kashikoibumi/py3qt into v0.6
pull from: kashikoibumi/py3qt
merge into: Bitmessage:v0.6
Conversation 2 Commits 127 Files Changed 179 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit acaa2743ef - Show all commits

2
src/bitmessageqt/messagecompose.py
View File

@ -17,7 +17,7 @@ class MessageCompose(QtWidgets.QTextEdit):
if ( if (
(QtWidgets.QApplication.queryKeyboardModifiers() (QtWidgets.QApplication.queryKeyboardModifiers()
& QtCore.Qt.ControlModifier) == QtCore.Qt.ControlModifier & QtCore.Qt.ControlModifier) == QtCore.Qt.ControlModifier
and event.orientation() == QtCore.Qt.Vertical and event.angleDelta().y() != 0
): ):
if event.delta() > 0: if event.delta() > 0:
self.zoomIn(1) self.zoomIn(1)

2
src/bitmessageqt/messageview.py
View File

@ -56,7 +56,7 @@ class MessageView(QtWidgets.QTextBrowser):
if ( if (
(QtWidgets.QApplication.queryKeyboardModifiers() (QtWidgets.QApplication.queryKeyboardModifiers()
& QtCore.Qt.ControlModifier) == QtCore.Qt.ControlModifier & QtCore.Qt.ControlModifier) == QtCore.Qt.ControlModifier
and event.orientation() == QtCore.Qt.Vertical and event.angleDelta().y() != 0
): ):
zoom = self.currentFont().pointSize() * 100 / self.defaultFontPointSize zoom = self.currentFont().pointSize() * 100 / self.defaultFontPointSize
QtWidgets.QApplication.activeWindow().statusbar.showMessage( QtWidgets.QApplication.activeWindow().statusbar.showMessage(