Mercurial Repositories > eric / file diff

diff -r 4adc526bc4b3 -r 985d275502c8 WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py	Thu Mar 17 20:22:20 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Fri Mar 18 20:05:12 2016 +0100
@@ -55,6 +55,7 @@
 from .data import icons_rc          # __IGNORE_WARNING__
 from .data import html_rc           # __IGNORE_WARNING__
 from .data import javascript_rc     # __IGNORE_WARNING__
+from .data import qml_rc            # __IGNORE_WARNING__
 
 
 from .Tools import Scripts, WebBrowserTools, WebIconProvider
@@ -94,7 +95,7 @@
     _feedsManager = None
 ##    _userAgentsManager = None
     _syncManager = None
-##    _speedDial = None
+    _speedDial = None
     _personalInformationManager = None
     _greaseMonkeyManager = None
     _notification = None
@@ -2556,8 +2557,7 @@
         # TODO: UserAgents
 ##        self.userAgentsManager().close()
 ##        
-        # TODO: SpeedDial
-##        self.speedDial().close()
+        self.speedDial().close()
         
         self.syncManager().close()
         
@@ -3917,20 +3917,19 @@
         """
         self.syncManager().showSyncDialog()
     
-    # TODO: SpeedDial
-##    @classmethod
-##    def speedDial(cls):
-##        """
-##        Class methdo to get a reference to the speed dial.
-##        
-##        @return reference to the speed dial (SpeedDial)
-##        """
-##        if cls._speedDial is None:
-##            from .SpeedDial.SpeedDial import SpeedDial
-##            cls._speedDial = SpeedDial()
-##        
-##        return cls._speedDial
-##    
+    @classmethod
+    def speedDial(cls):
+        """
+        Class methdo to get a reference to the speed dial.
+        
+        @return reference to the speed dial (SpeedDial)
+        """
+        if cls._speedDial is None:
+            from .SpeedDial.SpeedDial import SpeedDial
+            cls._speedDial = SpeedDial()
+        
+        return cls._speedDial
+    
     def keyPressEvent(self, evt):
         """
         Protected method to handle key presses.
@@ -3967,13 +3966,12 @@
                     number = self.__tabWidget.count()
                 self.__tabWidget.setCurrentIndex(number - 1)
                 return
-        # TODO: SpeeedDial
-##            
-##            if evt.modifiers() == Qt.KeyboardModifiers(Qt.MetaModifier):
-##                url = self.speedDial().urlForShortcut(number - 1)
-##                if url.isValid():
-##                    self.__linkActivated(url)
-##                    return
+            
+            if evt.modifiers() == Qt.KeyboardModifiers(Qt.MetaModifier):
+                url = self.speedDial().urlForShortcut(number - 1)
+                if url.isValid():
+                    self.__linkActivated(url)
+                    return
         
         super(WebBrowserWindow, self).keyPressEvent(evt)