Rope Refactoring: comparison PluginRefactoringRope.py

-:3911c0966e07
+:23ee57a96ea3
 from __future__ import unicode_literals
 import os
 import sys
-from PyQt5.QtCore import QObject, QTranslator, QCoreApplication, QTimer
+from PyQt5.QtCore import Qt, QObject, QTranslator, QCoreApplication, QTimer
 from E5Gui.E5Application import e5App
 import Preferences
 import Utilities
 # Start-Of-Header
 name = "Refactoring Rope Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "4.1.1"
+version = "4.2.0"
 className = "RefactoringRopePlugin"
 packageName = "RefactoringRope"
 internalPackages = "rope"
 shortDescription = "Refactoring using the Rope library."
 longDescription = """This plug-in implements refactoring functionality""" \
 import CallTipsRopePage
 page = CallTipsRopePage(refactoringRopePluginObject)
 return page
+def createMouseClickHandlerPage(configDlg):
+"""
+Module function to create the mouse click handler configuration page.
+@param configDlg reference to the configuration dialog
+@return reference to the configuration page
+"""
+global refactoringRopePluginObject
+from RefactoringRope.ConfigurationPage.MouseClickHandlerRopePage \
+import MouseClickHandlerRopePage
+page = MouseClickHandlerRopePage(refactoringRopePluginObject)
+return page
 def getConfigData():
 """
 Module function returning data as required by the configuration dialog.
 @return dictionary containing the relevant data
 """
-return {
+data = {
 "ropeAutoCompletionPage": [
 QCoreApplication.translate("RefactoringRopePlugin", "Rope"),
 os.path.join("RefactoringRope", "ConfigurationPage",
 "preferences-refactoring.png"),
 createAutoCompletionPage, "editorAutocompletionPage", None],
 QCoreApplication.translate("RefactoringRopePlugin", "Rope"),
 os.path.join("RefactoringRope", "ConfigurationPage",
 "preferences-refactoring.png"),
 createCallTipsPage, "editorCalltipsPage", None],
 }
+if e5App().getObject("UserInterface").versionIsNewer("6.0.99", "20150625"):
+data["ropeMouseClickHandlerPage"] = [
+QCoreApplication.translate("RefactoringRopePlugin", "Rope"),
+os.path.join("RefactoringRope", "ConfigurationPage",
+"preferences-refactoring.png"),
+createMouseClickHandlerPage, "1editorMouseClickHandlers", None]
+return data
 def prepareUninstall():
 """
 Module function to prepare for an uninstallation.
 "CodeAssistTimeout": 100,
 "ShowQScintillaCompletions": True,
 "CodeAssistCalltipsEnabled": False,
 "CalltipsMaxFixes": 10,
+"MouseClickEnabled": True,
+"MouseClickGotoModifiers": int(Qt.ControlModifier),
+"MouseClickGotoButton": int(Qt.LeftButton),
 }
 self.__translator = None
 self.__loadTranslator()
 @param key the key of the value to get
 @return the requested refactoring setting
 """
 if key in ["CodeAssistEnabled", "CodeAssistCalltipsEnabled",
-"ShowQScintillaCompletions"]:
+"ShowQScintillaCompletions", "MouseClickEnabled"]:
 return Preferences.toBool(Preferences.Prefs.settings.value(
 self.PreferencesKey + "/" + key, self.__defaults[key]))
 else:
 return int(Preferences.Prefs.settings.value(
 self.PreferencesKey + "/" + key, self.__defaults[key]))
 @param value the value to be set
 """
 Preferences.Prefs.settings.setValue(
 self.PreferencesKey + "/" + key, value)
-if key in ["CodeAssistEnabled", "CodeAssistCalltipsEnabled"]:
+if key in ["CodeAssistEnabled", "CodeAssistCalltipsEnabled",
+"MouseClickEnabled"]:
 if value:
 if e5App().getObject("Project").isOpen():
 for editor in e5App().getObject("ViewManager")\
 .getOpenEditors():
 if editor not in self.__editors:
 self.__editorOpened(editor)
 else:
 for editor in self.__editors[:]:
 self.__editorClosed(editor)
+elif key in ["MouseClickGotoModifiers", "MouseClickGotoButton"]:
+for editor in self.__editors:
+self.__disconnectMouseClickHandler(editor)
+self.__connectMouseClickHandler(editor)
 elif key == "CodeAssistTimeout":
 self.__acTimer.setInterval(value)
 def __determineLanguage(self):
 """
 if self.getPreferences("CodeAssistEnabled"):
 self.__setAutoCompletionHook(editor)
 if self.getPreferences("CodeAssistCalltipsEnabled"):
 self.__setCalltipsHook(editor)
+if self.getPreferences("MouseClickEnabled"):
+self.__connectMouseClickHandler(editor)
+def __connectMouseClickHandler(self, editor):
+"""
+Private method to connect the mouse click handler to an editor.
+@param editor reference to the editor (QScintilla.Editor)
+"""
+if self.getPreferences("MouseClickGotoButton"):
+try:
+editor.setMouseClickHandler(
+"rope",
+self.getPreferences("MouseClickGotoModifiers"),
+self.getPreferences("MouseClickGotoButton"),
+self.__object.gotoDefinition
+)
+except AttributeError:
+# eric versions before 6.1.0 don't support this
+pass
 def __disconnectEditor(self, editor):
 """
 Private method to disconnect an editor.
 self.__unsetCalltipsHook(editor)
 except AttributeError:
 # old interface (before 6.1.0)
 if editor.callTipHook() == self.codeAssistCallTip:
 self.__unsetCalltipsHook(editor)
+self.__disconnectMouseClickHandler(editor)
+def __disconnectMouseClickHandler(self, editor):
+"""
+Private method to disconnect the mouse click handler from an editor.
+@param editor reference to the editor (QScintilla.Editor)
+"""
+try:
+editor.removeMouseClickHandlers("rope")
+except AttributeError:
+# eric versions before 6.1.0 don't support this
+pass
 def __completionListSelected(self, id, txt):
 """
 Private slot to handle the selection from the completion list.

Mercurial Repositories > Rope Refactoring / file comparison

comparison: PluginRefactoringRope.py

PluginRefactoringRope.py