Mercurial Repositories > eric / changeset
changeset
- added capability to zoom by Ctrl + Mouse Wheel to the editor
Mon, 26 Dec 2011 14:58:44 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 26 Dec 2011 14:58:44 +0100
- changeset 1507
- 9225700cbff5
- parent 1506
- f28af766e539
- child 1508
- fcca2642bfca
- added capability to zoom by Ctrl + Mouse Wheel to the editor
- added capability to go to method and class definitions by Shift + Mouse Wheel to the editor
- added capability to zoom by Ctrl + Mouse Wheel to various graphics related windows
--- a/APIs/Python3/eric5.api Sat Dec 24 15:15:36 2011 +0100 +++ b/APIs/Python3/eric5.api Mon Dec 26 14:58:44 2011 +0100 @@ -1640,8 +1640,10 @@ eric5.Graphics.PackageItem.PackageModel?1(name, moduleslist=[]) eric5.Graphics.PixmapDiagram.PixmapDiagram.getDiagramName?4() eric5.Graphics.PixmapDiagram.PixmapDiagram.getStatus?4() +eric5.Graphics.PixmapDiagram.PixmapDiagram.wheelEvent?4(evt) eric5.Graphics.PixmapDiagram.PixmapDiagram?1(pixmap, parent=None, name=None) eric5.Graphics.SvgDiagram.SvgDiagram.getDiagramName?4() +eric5.Graphics.SvgDiagram.SvgDiagram.wheelEvent?4(evt) eric5.Graphics.SvgDiagram.SvgDiagram?1(svgFile, parent=None, name=None) eric5.Graphics.UMLClassDiagram.UMLClassDiagram.relayout?4() eric5.Graphics.UMLClassDiagram.UMLClassDiagram.show?4() @@ -1653,6 +1655,7 @@ eric5.Graphics.UMLGraphicsView.UMLGraphicsView.selectItem?4(item) eric5.Graphics.UMLGraphicsView.UMLGraphicsView.selectItems?4(items) eric5.Graphics.UMLGraphicsView.UMLGraphicsView.setDiagramName?4(name) +eric5.Graphics.UMLGraphicsView.UMLGraphicsView.wheelEvent?4(evt) eric5.Graphics.UMLGraphicsView.UMLGraphicsView?1(scene, diagramName="Unnamed", parent=None, name=None) eric5.Graphics.UMLItem.UMLItem.addAssociation?4(assoc) eric5.Graphics.UMLItem.UMLItem.adjustAssociations?4() @@ -2612,6 +2615,7 @@ eric5.IconEditor.IconEditorPalette.IconEditorPalette?1(parent=None) eric5.IconEditor.IconEditorWindow.IconEditorWindow.closeEvent?4(evt) eric5.IconEditor.IconEditorWindow.IconEditorWindow.editorClosed?7 +eric5.IconEditor.IconEditorWindow.IconEditorWindow.wheelEvent?4(evt) eric5.IconEditor.IconEditorWindow.IconEditorWindow.windows?7 eric5.IconEditor.IconEditorWindow.IconEditorWindow?1(fileName="", parent=None, fromEric=False, initShortcutsOnly=False) eric5.IconEditor.IconSizeDialog.IconSizeDialog.getData?4() @@ -5601,6 +5605,7 @@ eric5.QScintilla.Editor.Editor.unindentLineOrSelection?4() eric5.QScintilla.Editor.Editor.unsetAutoCompletionHook?4() eric5.QScintilla.Editor.Editor.unsetCallTipHook?4() +eric5.QScintilla.Editor.Editor.wheelEvent?4(evt) eric5.QScintilla.Editor.Editor.writeFile?4(fn) eric5.QScintilla.Editor.Editor?1(dbs, fn=None, vm=None, filetype="", editor=None, tv=None) eric5.QScintilla.Editor.EditorAutoCompletionListID?7 @@ -6026,6 +6031,7 @@ eric5.QScintilla.Shell.Shell.reloadHistory?4() eric5.QScintilla.Shell.Shell.saveHistory?4(clientType) eric5.QScintilla.Shell.Shell.setDebuggerUI?4(ui) +eric5.QScintilla.Shell.Shell.wheelEvent?4(evt) eric5.QScintilla.Shell.Shell?1(dbs, vm, parent=None) eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.getHistory?4() eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_copyButton_clicked?4() @@ -6084,6 +6090,7 @@ eric5.QScintilla.Terminal.Terminal.mousePressEvent?4(event) eric5.QScintilla.Terminal.Terminal.reloadHistory?4() eric5.QScintilla.Terminal.Terminal.saveHistory?4() +eric5.QScintilla.Terminal.Terminal.wheelEvent?4(evt) eric5.QScintilla.Terminal.Terminal?1(vm, parent=None) eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.charAdded?4(charNumber) eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.isEnabled?4()
--- a/Documentation/Help/source.qhp Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Help/source.qhp Mon Dec 26 14:58:44 2011 +0100 @@ -1096,6 +1096,7 @@ <keyword name="IconEditorWindow.__zoomOut" id="IconEditorWindow.__zoomOut" ref="eric5.IconEditor.IconEditorWindow.html#IconEditorWindow.__zoomOut" /> <keyword name="IconEditorWindow.__zoomReset" id="IconEditorWindow.__zoomReset" ref="eric5.IconEditor.IconEditorWindow.html#IconEditorWindow.__zoomReset" /> <keyword name="IconEditorWindow.closeEvent" id="IconEditorWindow.closeEvent" ref="eric5.IconEditor.IconEditorWindow.html#IconEditorWindow.closeEvent" /> + <keyword name="IconEditorWindow.wheelEvent" id="IconEditorWindow.wheelEvent" ref="eric5.IconEditor.IconEditorWindow.html#IconEditorWindow.wheelEvent" /> <keyword name="E5XML (Package)" id="E5XML (Package)" ref="index-eric5.E5XML.html" /> <keyword name="XMLStreamReaderBase (Module)" id="XMLStreamReaderBase (Module)" ref="eric5.E5XML.XMLStreamReaderBase.html" /> <keyword name="XMLStreamReaderBase" id="XMLStreamReaderBase" ref="eric5.E5XML.XMLStreamReaderBase.html#XMLStreamReaderBase" /> @@ -1626,6 +1627,7 @@ <keyword name="SvgDiagram.__zoomOut" id="SvgDiagram.__zoomOut" ref="eric5.Graphics.SvgDiagram.html#SvgDiagram.__zoomOut" /> <keyword name="SvgDiagram.__zoomReset" id="SvgDiagram.__zoomReset" ref="eric5.Graphics.SvgDiagram.html#SvgDiagram.__zoomReset" /> <keyword name="SvgDiagram.getDiagramName" id="SvgDiagram.getDiagramName" ref="eric5.Graphics.SvgDiagram.html#SvgDiagram.getDiagramName" /> + <keyword name="SvgDiagram.wheelEvent" id="SvgDiagram.wheelEvent" ref="eric5.Graphics.SvgDiagram.html#SvgDiagram.wheelEvent" /> <keyword name="PixmapDiagram (Module)" id="PixmapDiagram (Module)" ref="eric5.Graphics.PixmapDiagram.html" /> <keyword name="PixmapDiagram" id="PixmapDiagram" ref="eric5.Graphics.PixmapDiagram.html#PixmapDiagram" /> <keyword name="PixmapDiagram (Constructor)" id="PixmapDiagram (Constructor)" ref="eric5.Graphics.PixmapDiagram.html#PixmapDiagram.__init__" /> @@ -1645,6 +1647,7 @@ <keyword name="PixmapDiagram.__zoomReset" id="PixmapDiagram.__zoomReset" ref="eric5.Graphics.PixmapDiagram.html#PixmapDiagram.__zoomReset" /> <keyword name="PixmapDiagram.getDiagramName" id="PixmapDiagram.getDiagramName" ref="eric5.Graphics.PixmapDiagram.html#PixmapDiagram.getDiagramName" /> <keyword name="PixmapDiagram.getStatus" id="PixmapDiagram.getStatus" ref="eric5.Graphics.PixmapDiagram.html#PixmapDiagram.getStatus" /> + <keyword name="PixmapDiagram.wheelEvent" id="PixmapDiagram.wheelEvent" ref="eric5.Graphics.PixmapDiagram.html#PixmapDiagram.wheelEvent" /> <keyword name="UMLItem (Module)" id="UMLItem (Module)" ref="eric5.Graphics.UMLItem.html" /> <keyword name="UMLItem" id="UMLItem" ref="eric5.Graphics.UMLItem.html#UMLItem" /> <keyword name="UMLItem (Constructor)" id="UMLItem (Constructor)" ref="eric5.Graphics.UMLItem.html#UMLItem.__init__" /> @@ -1755,6 +1758,7 @@ <keyword name="UMLGraphicsView.selectItem" id="UMLGraphicsView.selectItem" ref="eric5.Graphics.UMLGraphicsView.html#UMLGraphicsView.selectItem" /> <keyword name="UMLGraphicsView.selectItems" id="UMLGraphicsView.selectItems" ref="eric5.Graphics.UMLGraphicsView.html#UMLGraphicsView.selectItems" /> <keyword name="UMLGraphicsView.setDiagramName" id="UMLGraphicsView.setDiagramName" ref="eric5.Graphics.UMLGraphicsView.html#UMLGraphicsView.setDiagramName" /> + <keyword name="UMLGraphicsView.wheelEvent" id="UMLGraphicsView.wheelEvent" ref="eric5.Graphics.UMLGraphicsView.html#UMLGraphicsView.wheelEvent" /> <keyword name="E5Network (Package)" id="E5Network (Package)" ref="index-eric5.E5Network.html" /> <keyword name="E5NetworkHeaderDetailsDialog (Module)" id="E5NetworkHeaderDetailsDialog (Module)" ref="eric5.E5Network.E5NetworkHeaderDetailsDialog.html" /> <keyword name="E5NetworkHeaderDetailsDialog" id="E5NetworkHeaderDetailsDialog" ref="eric5.E5Network.E5NetworkHeaderDetailsDialog.html#E5NetworkHeaderDetailsDialog" /> @@ -5955,6 +5959,7 @@ <keyword name="Terminal.mousePressEvent" id="Terminal.mousePressEvent" ref="eric5.QScintilla.Terminal.html#Terminal.mousePressEvent" /> <keyword name="Terminal.reloadHistory" id="Terminal.reloadHistory" ref="eric5.QScintilla.Terminal.html#Terminal.reloadHistory" /> <keyword name="Terminal.saveHistory" id="Terminal.saveHistory" ref="eric5.QScintilla.Terminal.html#Terminal.saveHistory" /> + <keyword name="Terminal.wheelEvent" id="Terminal.wheelEvent" ref="eric5.QScintilla.Terminal.html#Terminal.wheelEvent" /> <keyword name="Editor (Module)" id="Editor (Module)" ref="eric5.QScintilla.Editor.html" /> <keyword name="Editor" id="Editor" ref="eric5.QScintilla.Editor.html#Editor" /> <keyword name="Editor (Constructor)" id="Editor (Constructor)" ref="eric5.QScintilla.Editor.html#Editor.__init__" /> @@ -6243,6 +6248,7 @@ <keyword name="Editor.unindentLineOrSelection" id="Editor.unindentLineOrSelection" ref="eric5.QScintilla.Editor.html#Editor.unindentLineOrSelection" /> <keyword name="Editor.unsetAutoCompletionHook" id="Editor.unsetAutoCompletionHook" ref="eric5.QScintilla.Editor.html#Editor.unsetAutoCompletionHook" /> <keyword name="Editor.unsetCallTipHook" id="Editor.unsetCallTipHook" ref="eric5.QScintilla.Editor.html#Editor.unsetCallTipHook" /> + <keyword name="Editor.wheelEvent" id="Editor.wheelEvent" ref="eric5.QScintilla.Editor.html#Editor.wheelEvent" /> <keyword name="Editor.writeFile" id="Editor.writeFile" ref="eric5.QScintilla.Editor.html#Editor.writeFile" /> <keyword name="SearchReplaceWidget (Module)" id="SearchReplaceWidget (Module)" ref="eric5.QScintilla.SearchReplaceWidget.html" /> <keyword name="SearchReplaceWidget" id="SearchReplaceWidget" ref="eric5.QScintilla.SearchReplaceWidget.html#SearchReplaceWidget" /> @@ -6351,6 +6357,7 @@ <keyword name="Shell.reloadHistory" id="Shell.reloadHistory" ref="eric5.QScintilla.Shell.html#Shell.reloadHistory" /> <keyword name="Shell.saveHistory" id="Shell.saveHistory" ref="eric5.QScintilla.Shell.html#Shell.saveHistory" /> <keyword name="Shell.setDebuggerUI" id="Shell.setDebuggerUI" ref="eric5.QScintilla.Shell.html#Shell.setDebuggerUI" /> + <keyword name="Shell.wheelEvent" id="Shell.wheelEvent" ref="eric5.QScintilla.Shell.html#Shell.wheelEvent" /> <keyword name="Printer (Module)" id="Printer (Module)" ref="eric5.QScintilla.Printer.html" /> <keyword name="Printer" id="Printer" ref="eric5.QScintilla.Printer.html#Printer" /> <keyword name="Printer (Constructor)" id="Printer (Constructor)" ref="eric5.QScintilla.Printer.html#Printer.__init__" />
--- a/Documentation/Source/eric5.Graphics.PixmapDiagram.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.PixmapDiagram.html Mon Dec 26 14:58:44 2011 +0100 @@ -108,6 +108,9 @@ </tr><tr> <td><a href="#PixmapDiagram.getStatus">getStatus</a></td> <td>Method to retrieve the status of the canvas.</td> +</tr><tr> +<td><a href="#PixmapDiagram.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> </tr> </table> <h3>Static Methods</h3> @@ -253,6 +256,16 @@ <dd> flag indicating a successful pixmap loading (boolean) </dd> +</dl><a NAME="PixmapDiagram.wheelEvent" ID="PixmapDiagram.wheelEvent"></a> +<h4>PixmapDiagram.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Graphics.SvgDiagram.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.SvgDiagram.html Mon Dec 26 14:58:44 2011 +0100 @@ -102,6 +102,9 @@ </tr><tr> <td><a href="#SvgDiagram.getDiagramName">getDiagramName</a></td> <td>Method to retrieve a name for the diagram.</td> +</tr><tr> +<td><a href="#SvgDiagram.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> </tr> </table> <h3>Static Methods</h3> @@ -222,6 +225,16 @@ <dd> name for the diagram </dd> +</dl><a NAME="SvgDiagram.wheelEvent" ID="SvgDiagram.wheelEvent"></a> +<h4>SvgDiagram.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.Graphics.UMLGraphicsView.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.UMLGraphicsView.html Mon Dec 26 14:58:44 2011 +0100 @@ -127,6 +127,9 @@ </tr><tr> <td><a href="#UMLGraphicsView.setDiagramName">setDiagramName</a></td> <td>Public slot to set the diagram name.</td> +</tr><tr> +<td><a href="#UMLGraphicsView.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> </tr> </table> <h3>Static Methods</h3> @@ -293,6 +296,16 @@ <dd> diagram name (string) </dd> +</dl><a NAME="UMLGraphicsView.wheelEvent" ID="UMLGraphicsView.wheelEvent"></a> +<h4>UMLGraphicsView.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.IconEditor.IconEditorWindow.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.IconEditor.IconEditorWindow.html Mon Dec 26 14:58:44 2011 +0100 @@ -171,6 +171,9 @@ </tr><tr> <td><a href="#IconEditorWindow.closeEvent">closeEvent</a></td> <td>Private event handler for the close event.</td> +</tr><tr> +<td><a href="#IconEditorWindow.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> </tr> </table> <h3>Static Methods</h3> @@ -436,6 +439,16 @@ <br />This event is simply accepted after the history has been saved and all window references have been deleted. </dd> +</dl><a NAME="IconEditorWindow.wheelEvent" ID="IconEditorWindow.wheelEvent"></a> +<h4>IconEditorWindow.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.QScintilla.Editor.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Editor.html Mon Dec 26 14:58:44 2011 +0100 @@ -989,6 +989,9 @@ <td><a href="#Editor.unsetCallTipHook">unsetCallTipHook</a></td> <td>Public method to unset a calltip hook.</td> </tr><tr> +<td><a href="#Editor.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> +</tr><tr> <td><a href="#Editor.writeFile">writeFile</a></td> <td>Public slot to write the text to a file.</td> </tr> @@ -3406,7 +3409,17 @@ <b>unsetCallTipHook</b>(<i></i>) <p> Public method to unset a calltip hook. -</p><a NAME="Editor.writeFile" ID="Editor.writeFile"></a> +</p><a NAME="Editor.wheelEvent" ID="Editor.wheelEvent"></a> +<h4>Editor.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> +</dl><a NAME="Editor.writeFile" ID="Editor.writeFile"></a> <h4>Editor.writeFile</h4> <b>writeFile</b>(<i>fn</i>) <p>
--- a/Documentation/Source/eric5.QScintilla.Shell.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Shell.html Mon Dec 26 14:58:44 2011 +0100 @@ -315,6 +315,9 @@ </tr><tr> <td><a href="#Shell.setDebuggerUI">setDebuggerUI</a></td> <td>Public method to set the debugger UI.</td> +</tr><tr> +<td><a href="#Shell.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> </tr> </table> <h3>Static Methods</h3> @@ -1065,6 +1068,16 @@ <dd> reference to the debugger UI object (DebugUI) </dd> +</dl><a NAME="Shell.wheelEvent" ID="Shell.wheelEvent"></a> +<h4>Shell.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric5.QScintilla.Terminal.html Sat Dec 24 15:15:36 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Terminal.html Mon Dec 26 14:58:44 2011 +0100 @@ -248,6 +248,9 @@ </tr><tr> <td><a href="#Terminal.saveHistory">saveHistory</a></td> <td>Public method to save the history.</td> +</tr><tr> +<td><a href="#Terminal.wheelEvent">wheelEvent</a></td> +<td>Protected method to handle wheel events.</td> </tr> </table> <h3>Static Methods</h3> @@ -730,7 +733,17 @@ <b>saveHistory</b>(<i></i>) <p> Public method to save the history. -</p> +</p><a NAME="Terminal.wheelEvent" ID="Terminal.wheelEvent"></a> +<h4>Terminal.wheelEvent</h4> +<b>wheelEvent</b>(<i>evt</i>) +<p> + Protected method to handle wheel events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the wheel event (QWheelEvent) +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Graphics/PixmapDiagram.py Sat Dec 24 15:15:36 2011 +0100 +++ b/Graphics/PixmapDiagram.py Mon Dec 26 14:58:44 2011 +0100 @@ -185,6 +185,22 @@ """ return self.status + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.__zoomOut() + else: + self.__zoomIn() + evt.accept() + return + + super().wheelEvent(evt) + ############################################################################ ## Private menu handling methods below. ############################################################################
--- a/Graphics/SvgDiagram.py Sat Dec 24 15:15:36 2011 +0100 +++ b/Graphics/SvgDiagram.py Mon Dec 26 14:58:44 2011 +0100 @@ -156,6 +156,22 @@ """ return self.svgFile + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.__zoomOut() + else: + self.__zoomIn() + evt.accept() + return + + super().wheelEvent(evt) + ############################################################################ ## Private menu handling methods below. ############################################################################
--- a/Graphics/UMLGraphicsView.py Sat Dec 24 15:15:36 2011 +0100 +++ b/Graphics/UMLGraphicsView.py Mon Dec 26 14:58:44 2011 +0100 @@ -502,3 +502,19 @@ item.moveBy(xOffset, yOffset) self.scene().update() + + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.zoomOut() + else: + self.zoomIn() + evt.accept() + return + + super().wheelEvent(evt)
--- a/IconEditor/IconEditorWindow.py Sat Dec 24 15:15:36 2011 +0100 +++ b/IconEditor/IconEditorWindow.py Mon Dec 26 14:58:44 2011 +0100 @@ -1218,3 +1218,19 @@ Private slot called in to enter Whats This mode. """ QWhatsThis.enterWhatsThisMode() + + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.__zoomOut() + else: + self.__zoomIn() + evt.accept() + return + + super().wheelEvent(evt)
--- a/QScintilla/Editor.py Sat Dec 24 15:15:36 2011 +0100 +++ b/QScintilla/Editor.py Mon Dec 26 14:58:44 2011 +0100 @@ -5396,6 +5396,30 @@ self.vm.eventFilter(self, event) super().mousePressEvent(event) + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.zoomOut() + else: + self.zoomIn() + evt.accept() + return + + if evt.modifiers() & Qt.ShiftModifier: + if evt.delta() < 0: + self.gotoMethodClass(False) + else: + self.gotoMethodClass(True) + evt.accept() + return + + super().wheelEvent(evt) + def __updateReadOnly(self, bForce=True): """ Private method to update the readOnly information for this editor.
--- a/QScintilla/Shell.py Sat Dec 24 15:15:36 2011 +0100 +++ b/QScintilla/Shell.py Mon Dec 26 14:58:44 2011 +0100 @@ -724,6 +724,22 @@ else: super().mousePressEvent(event) + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.zoomOut() + else: + self.zoomIn() + evt.accept() + return + + super().wheelEvent(evt) + def editorCommand(self, cmd): """ Public method to perform an editor command.
--- a/QScintilla/Terminal.py Sat Dec 24 15:15:36 2011 +0100 +++ b/QScintilla/Terminal.py Mon Dec 26 14:58:44 2011 +0100 @@ -11,7 +11,7 @@ import os import re -from PyQt4.QtCore import QSignalMapper, QTimer, QByteArray, QProcess +from PyQt4.QtCore import QSignalMapper, QTimer, QByteArray, QProcess, Qt from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QMenu, QPalette, QFont from PyQt4.Qsci import QsciScintilla @@ -483,6 +483,22 @@ self.setFocus() super().mousePressEvent(event) + def wheelEvent(self, evt): + """ + Protected method to handle wheel events. + + @param evt reference to the wheel event (QWheelEvent) + """ + if evt.modifiers() & Qt.ControlModifier: + if evt.delta()< 0: + self.zoomOut() + else: + self.zoomIn() + evt.accept() + return + + super().wheelEvent(evt) + def editorCommand(self, cmd): """ Public method to perform an editor command.
--- a/changelog Sat Dec 24 15:15:36 2011 +0100 +++ b/changelog Mon Dec 26 14:58:44 2011 +0100 @@ -19,6 +19,8 @@ -- added a syntax check while typing function -- added source navigation function for Python 2, Python 3 and Ruby sources -- added support for QScintilla 2.6 (and newer) + -- added capability to zoom by Ctrl + Mouse Wheel + -- added capability to go to method and class definitions by Shift + Mouse Wheel - Plug-in Manager Tools -- added code to download and install plug-ins - Source Browser @@ -58,9 +60,10 @@ info dialog -- added a dialog to show RSS feeds -- added a dialog to show some information about the current site - -- added the capability to go through the history via Shift+Mouse Wheel + -- added the capability to go through the history via Shift + Mouse Wheel - other enhancements -- added an action to launch another instantiation of eric5 + -- added capability to zoom by Ctrl + Mouse Wheel to various graphics related windows Version 5.2-snapshot-20110724: - bug fixes
