Mercurial Repositories > eric / file diff

--- a/E5Gui/E5Action.py	Fri May 21 20:35:23 2010 +0200
+++ b/E5Gui/E5Action.py	Fri May 21 21:25:44 2010 +0200
@@ -10,7 +10,7 @@
 shortcuts.
 """
 
-from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence
+from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence, qApp
 
 class ArgumentsError(RuntimeError):
     """
@@ -99,6 +99,8 @@
         if len(args) == 7+incr:
             self.setCheckable(args[6+incr])
         
+        self.__ammendToolTip()
+        
     def setAlternateShortcut(self, shortcut):
         """
         Public slot to set the alternative keyboard shortcut.
@@ -125,6 +127,38 @@
             return QKeySequence()
         else:
             return shortcuts[1]
+        
+    def setShortcut(self, shortcut):
+        """
+        Public slot to set the keyboard shortcut.
+        
+        @param shortcut the accelerator (QKeySequence)
+        """
+        QAction.setShortcut(self, shortcut)
+        self.__ammendToolTip()
+        
+    def setShortcuts(self, shortcuts):
+        """
+        Public slot to set the list of keyboard shortcuts.
+        
+        @param shortcuts list of keyboard accelerators (list of QKeySequence)
+            or key for a platform dependent list of accelerators 
+            (QKeySequence.StandardKey)
+        """
+        QAction.setShortcuts(self, shortcuts)
+        self.__ammendToolTip()
+        
+    def __ammendToolTip(self):
+        """
+        Private slot to add the primary keyboard accelerator to the tooltip.
+        """
+        shortcut = self.shortcut().toString(QKeySequence.NativeText)
+        if shortcut:
+            if qApp.isLeftToRight():
+                fmt = "{0} ({1})"
+            else:
+                fmt = "({1}) {0}"
+            self.setToolTip(fmt.format(self.iconText(), shortcut))
 
 def addActions(target, actions):
     """