Mercurial Repositories > eric / file diff

diff -r 0ce09efa00da -r f1b9899847dc WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py	Mon Mar 07 19:24:20 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Mon Mar 07 20:08:06 2016 +0100
@@ -241,6 +241,19 @@
 ##                self.__searchDock.setWidget(self.__searchWindow)
 ##                self.addDockWidget(Qt.LeftDockWidgetArea, self.__searchDock)
 ##            
+            # JavaScript Console window
+            from .WebBrowserJavaScriptConsole import \
+                WebBrowserJavaScriptConsole
+            self.__javascriptConsole = WebBrowserJavaScriptConsole(self)
+            self.__javascriptConsoleDock = QDockWidget(
+                self.tr("JavaScript Console"))
+            self.__javascriptConsoleDock.setObjectName("JavascriptConsole")
+            self.__javascriptConsoleDock.setAllowedAreas(
+                Qt.BottomDockWidgetArea | Qt.TopDockWidgetArea)
+            self.__javascriptConsoleDock.setWidget(self.__javascriptConsole)
+            self.addDockWidget(Qt.BottomDockWidgetArea,
+                               self.__javascriptConsoleDock)
+            
             if Preferences.getWebBrowser("SaveGeometry"):
                 g = Preferences.getGeometry("WebBrowserGeometry")
             else:
@@ -1754,6 +1767,21 @@
             self.zoomValuesAct.triggered.connect(self.__showZoomValuesDialog)
         self.__actions.append(self.zoomValuesAct)
         
+        self.showJavaScriptConsoleAct = E5Action(
+            self.tr('JavaScript Console'),
+            self.tr('JavaScript Console'),
+            0, 0, self, 'webbrowser_show_javascript_console')
+        self.showJavaScriptConsoleAct.setStatusTip(self.tr(
+            'Toggle the JavaScript console window'))
+        self.showJavaScriptConsoleAct.setWhatsThis(self.tr(
+            """<b>JavaScript Console</b>"""
+            """<p>This toggles the JavaScript console window.</p>"""
+        ))
+        if not self.__initShortcutsOnly:
+            self.showJavaScriptConsoleAct.triggered.connect(
+                self.__toggleJavaScriptConsole)
+        self.__actions.append(self.showJavaScriptConsoleAct)
+        
         self.backAct.setEnabled(False)
         self.forwardAct.setEnabled(False)
         
@@ -1925,6 +1953,7 @@
         menu = mb.addMenu(self.tr("&Window"))
         menu.setTearOffEnabled(True)
         menu.addAction(self.showDownloadManagerAct)
+        menu.addAction(self.showJavaScriptConsoleAct)
 ##        if WebBrowserWindow.UseQtHelp:
 ##            menu.addSeparator()
 ##            menu.addAction(self.showTocAct)
@@ -3463,6 +3492,24 @@
         editor.setLanguage("dummy.html")
         editor.show()
     
+    def __toggleJavaScriptConsole(self):
+        """
+        Private slot to toggle the JavaScript console.
+        """
+        if self.__javascriptConsoleDock.isVisible():
+            self.__javascriptConsoleDock.hide()
+        else:
+            self.__javascriptConsoleDock.show()
+    
+    def javascriptConsole(self):
+        """
+        Public method to get a reference to the JavaScript console widget.
+        
+        @return reference to the JavaScript console
+        @rtype WebBrowserJavaScriptConsole
+        """
+        return self.__javascriptConsole
+    
     @classmethod
     def icon(cls, url):
         """