Mercurial Repositories > eric / file diff

diff -r 79009bc4acd5 -r 5841f229baf7 WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py	Thu Feb 04 19:39:54 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Fri Feb 05 20:02:09 2016 +0100
@@ -1674,9 +1674,9 @@
         
         menu = mb.addMenu(self.tr('&View'))
         menu.setTearOffEnabled(True)
-##        menu.addAction(self.zoomInAct)
-##        menu.addAction(self.zoomResetAct)
-##        menu.addAction(self.zoomOutAct)
+        menu.addAction(self.zoomInAct)
+        menu.addAction(self.zoomResetAct)
+        menu.addAction(self.zoomOutAct)
 ##        if self.zoomTextOnlyAct is not None:
 ##            menu.addAction(self.zoomTextOnlyAct)
         menu.addSeparator()
@@ -1832,12 +1832,12 @@
         edittb.setIconSize(UI.Config.ToolBarIconSize)
         edittb.addAction(self.copyAct)
         
-##        viewtb = self.addToolBar(self.tr("View"))
-##        viewtb.setObjectName("ViewToolBar")
-##        viewtb.setIconSize(UI.Config.ToolBarIconSize)
-##        viewtb.addAction(self.zoomInAct)
-##        viewtb.addAction(self.zoomResetAct)
-##        viewtb.addAction(self.zoomOutAct)
+        viewtb = self.addToolBar(self.tr("View"))
+        viewtb.setObjectName("ViewToolBar")
+        viewtb.setIconSize(UI.Config.ToolBarIconSize)
+        viewtb.addAction(self.zoomInAct)
+        viewtb.addAction(self.zoomResetAct)
+        viewtb.addAction(self.zoomOutAct)
 ##        viewtb.addSeparator()
 ##        viewtb.addAction(self.fullScreenAct)
         
@@ -2545,28 +2545,29 @@
                 # set value of zoom widget
                 self.__zoomWidget.setValue(cb.zoomValue())
     
+    # TODO: Preferences dialog
     def __showPreferences(self):
         """
         Private slot to set the preferences.
         """
-        from Preferences.ConfigurationDialog import ConfigurationDialog
-        dlg = ConfigurationDialog(
-            self, 'Configuration', True, fromEric=self.__fromEric,
-            displayMode=ConfigurationDialog.WebBrowserMode)
-        dlg.preferencesChanged.connect(self.preferencesChanged)
-        dlg.masterPasswordChanged.connect(self.masterPasswordChanged)
-        dlg.show()
-        if self.__lastConfigurationPageName:
-            dlg.showConfigurationPageByName(self.__lastConfigurationPageName)
-        else:
-            dlg.showConfigurationPageByName("empty")
-        dlg.exec_()
-        QApplication.processEvents()
-        if dlg.result() == QDialog.Accepted:
-            dlg.setPreferences()
-            Preferences.syncPreferences()
-            self.preferencesChanged()
-        self.__lastConfigurationPageName = dlg.getConfigurationPageName()
+##        from Preferences.ConfigurationDialog import ConfigurationDialog
+##        dlg = ConfigurationDialog(
+##            self, 'Configuration', True, fromEric=self.__fromEric,
+##            displayMode=ConfigurationDialog.WebBrowserMode)
+##        dlg.preferencesChanged.connect(self.preferencesChanged)
+##        dlg.masterPasswordChanged.connect(self.masterPasswordChanged)
+##        dlg.show()
+##        if self.__lastConfigurationPageName:
+##            dlg.showConfigurationPageByName(self.__lastConfigurationPageName)
+##        else:
+##            dlg.showConfigurationPageByName("empty")
+##        dlg.exec_()
+##        QApplication.processEvents()
+##        if dlg.result() == QDialog.Accepted:
+##            dlg.setPreferences()
+##            Preferences.syncPreferences()
+##            self.preferencesChanged()
+##        self.__lastConfigurationPageName = dlg.getConfigurationPageName()
     
     def preferencesChanged(self):
         """
@@ -3576,38 +3577,38 @@
         else:
             QWebEngineSettings.globalSettings().setDefaultTextEncoding(codec)
     
-##    def eventMouseButtons(self):
-##        """
-##        Public method to get the last recorded mouse buttons.
-##        
-##        @return mouse buttons (Qt.MouseButtons)
-##        """
-##        return self.__eventMouseButtons
-##    
-##    def eventKeyboardModifiers(self):
-##        """
-##        Public method to get the last recorded keyboard modifiers.
-##        
-##        @return keyboard modifiers (Qt.KeyboardModifiers)
-##        """
-##        return self.__eventKeyboardModifiers
-##    
-##    def setEventMouseButtons(self, buttons):
-##        """
-##        Public method to record mouse buttons.
-##        
-##        @param buttons mouse buttons to record (Qt.MouseButtons)
-##        """
-##        self.__eventMouseButtons = buttons
-##    
-##    def setEventKeyboardModifiers(self, modifiers):
-##        """
-##        Public method to record keyboard modifiers.
-##        
-##        @param modifiers keyboard modifiers to record (Qt.KeyboardModifiers)
-##        """
-##        self.__eventKeyboardModifiers = modifiers
-##    
+    def eventMouseButtons(self):
+        """
+        Public method to get the last recorded mouse buttons.
+        
+        @return mouse buttons (Qt.MouseButtons)
+        """
+        return self.__eventMouseButtons
+    
+    def eventKeyboardModifiers(self):
+        """
+        Public method to get the last recorded keyboard modifiers.
+        
+        @return keyboard modifiers (Qt.KeyboardModifiers)
+        """
+        return self.__eventKeyboardModifiers
+    
+    def setEventMouseButtons(self, buttons):
+        """
+        Public method to record mouse buttons.
+        
+        @param buttons mouse buttons to record (Qt.MouseButtons)
+        """
+        self.__eventMouseButtons = buttons
+    
+    def setEventKeyboardModifiers(self, modifiers):
+        """
+        Public method to record keyboard modifiers.
+        
+        @param modifiers keyboard modifiers to record (Qt.KeyboardModifiers)
+        """
+        self.__eventKeyboardModifiers = modifiers
+    
     def mousePressEvent(self, evt):
         """
         Protected method called by a mouse press event.