eric: comparison WebBrowser/WebBrowserWindow.py

-:84e78ee0f361
+:f9e1adc69076
 ##            if not self.__initShortcutsOnly:
 ##                self.reindexDocumentationAct.triggered.connect(
 ##                    self.__searchEngine.reindexDocumentation)
 ##            self.__actions.append(self.reindexDocumentationAct)
-# TODO: Clear Private Data
+self.clearPrivateDataAct = E5Action(
-##        self.clearPrivateDataAct = E5Action(
+self.tr('Clear private data'),
-##            self.tr('Clear private data'),
+self.tr('&Clear private data'),
-##            self.tr('&Clear private data'),
+0, 0,
-##            0, 0,
+self, 'webbrowser_clear_private_data')
-##            self, 'webbrowser_clear_private_data')
+self.clearPrivateDataAct.setStatusTip(self.tr(
-##        self.clearPrivateDataAct.setStatusTip(self.tr(
+'Clear private data'))
-##            'Clear private data'))
+self.clearPrivateDataAct.setWhatsThis(self.tr(
-##        self.clearPrivateDataAct.setWhatsThis(self.tr(
+"""<b>Clear private data</b>"""
-##            """<b>Clear private data</b>"""
+"""<p>Clears the private data like browsing history, search"""
-##            """<p>Clears the private data like browsing history, search"""
+""" history or the favicons database.</p>"""
-##            """ history or the favicons database.</p>"""
+))
-##        ))
+if not self.__initShortcutsOnly:
-##        if not self.__initShortcutsOnly:
+self.clearPrivateDataAct.triggered.connect(
-##            self.clearPrivateDataAct.triggered.connect(
+self.__clearPrivateData)
-##                self.__clearPrivateData)
+self.__actions.append(self.clearPrivateDataAct)
-##        self.__actions.append(self.clearPrivateDataAct)
-##
+self.clearIconsAct = E5Action(
-##        self.clearIconsAct = E5Action(
+self.tr('Clear icons database'),
-##            self.tr('Clear icons database'),
+self.tr('Clear &icons database'),
-##            self.tr('Clear &icons database'),
+0, 0,
-##            0, 0,
+self, 'webbrowser_clear_icons_db')
-##            self, 'webbrowser_clear_icons_db')
+self.clearIconsAct.setStatusTip(self.tr(
-##        self.clearIconsAct.setStatusTip(self.tr(
+'Clear the database of favicons'))
-##            'Clear the database of favicons'))
+self.clearIconsAct.setWhatsThis(self.tr(
-##        self.clearIconsAct.setWhatsThis(self.tr(
+"""<b>Clear icons database</b>"""
-##            """<b>Clear icons database</b>"""
+"""<p>Clears the database of favicons of previously visited"""
-##            """<p>Clears the database of favicons of previously visited"""
+""" URLs.</p>"""
-##            """ URLs.</p>"""
+))
-##        ))
+if not self.__initShortcutsOnly:
-##        if not self.__initShortcutsOnly:
+self.clearIconsAct.triggered.connect(self.__clearIconsDatabase)
-##            self.clearIconsAct.triggered.connect(self.__clearIconsDatabase)
+self.__actions.append(self.clearIconsAct)
-##        self.__actions.append(self.clearIconsAct)
+self.searchEnginesAct = E5Action(
-# TODO: Open Search
+self.tr('Configure Search Engines'),
-##        self.searchEnginesAct = E5Action(
+self.tr('Configure Search &Engines...'),
-##            self.tr('Configure Search Engines'),
+0, 0,
-##            self.tr('Configure Search &Engines...'),
+self, 'webbrowser_search_engines')
-##            0, 0,
+self.searchEnginesAct.setStatusTip(self.tr(
-##            self, 'webbrowser_search_engines')
+'Configure the available search engines'))
-##        self.searchEnginesAct.setStatusTip(self.tr(
+self.searchEnginesAct.setWhatsThis(self.tr(
-##            'Configure the available search engines'))
+"""<b>Configure Search Engines...</b>"""
-##        self.searchEnginesAct.setWhatsThis(self.tr(
+"""<p>Opens a dialog to configure the available search"""
-##            """<b>Configure Search Engines...</b>"""
+""" engines.</p>"""
-##            """<p>Opens a dialog to configure the available search"""
+))
-##            """ engines.</p>"""
+if not self.__initShortcutsOnly:
-##        ))
+self.searchEnginesAct.triggered.connect(
-##        if not self.__initShortcutsOnly:
+self.__showEnginesConfigurationDialog)
-##            self.searchEnginesAct.triggered.connect(
+self.__actions.append(self.searchEnginesAct)
-##                self.__showEnginesConfigurationDialog)
-##        self.__actions.append(self.searchEnginesAct)
 # TODO: Passwords
 ##        self.passwordsAct = E5Action(
 ##            self.tr('Manage Saved Passwords'),
 ##            UI.PixmapCache.getIcon("passwords.png"),
 ##        menu.addAction(self.personalDataAct)
 ##        menu.addAction(self.greaseMonkeyAct)
 ##        menu.addAction(self.featurePermissionAct)
 ##        menu.addSeparator()
 menu.addAction(self.editMessageFilterAct)
-##        menu.addSeparator()
+menu.addSeparator()
-##        menu.addAction(self.searchEnginesAct)
+menu.addAction(self.searchEnginesAct)
 ##        menu.addSeparator()
 ##        menu.addAction(self.passwordsAct)
 ##        if SSL_AVAILABLE:
 ##            menu.addAction(self.certificatesAct)
 ##        menu.addSeparator()
 ##        if WebBrowserWindow.UseQtHelp:
 ##            menu.addAction(self.manageQtHelpDocsAct)
 ##            menu.addAction(self.manageQtHelpFiltersAct)
 ##            menu.addAction(self.reindexDocumentationAct)
 ##            menu.addSeparator()
-##        menu.addAction(self.clearPrivateDataAct)
+menu.addAction(self.clearPrivateDataAct)
-##        menu.addAction(self.clearIconsAct)
+menu.addAction(self.clearIconsAct)
 ##        menu = mb.addMenu(self.tr("&Tools"))
 ##        menu.setTearOffEnabled(True)
 ##        menu.addAction(self.feedsManagerAct)
 ##        menu.addAction(self.siteInfoAct)
 gotb.addSeparator()
 self.__navigationSplitter = QSplitter(gotb)
 self.__navigationSplitter.addWidget(self.__tabWidget.stackedUrlBar())
-##        from .HelpWebSearchWidget import HelpWebSearchWidget
+from .WebBrowserWebSearchWidget import WebBrowserWebSearchWidget
-##        self.searchEdit = HelpWebSearchWidget(self)
+self.searchEdit = WebBrowserWebSearchWidget(self)
-##        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
-##        sizePolicy.setHorizontalStretch(2)
+sizePolicy.setHorizontalStretch(2)
-##        sizePolicy.setVerticalStretch(0)
+sizePolicy.setVerticalStretch(0)
-##        self.searchEdit.setSizePolicy(sizePolicy)
+self.searchEdit.setSizePolicy(sizePolicy)
-##        self.searchEdit.search.connect(self.__linkActivated)
+self.searchEdit.search.connect(self.__linkActivated)
-##        self.__navigationSplitter.addWidget(self.searchEdit)
+self.__navigationSplitter.addWidget(self.searchEdit)
 gotb.addWidget(self.__navigationSplitter)
 self.__navigationSplitter.setSizePolicy(
 QSizePolicy.Expanding, QSizePolicy.Maximum)
 self.__navigationSplitter.setCollapsible(0, False)
 Private slot called to handle a change of a browser's title.
 @param browser reference to the browser (WebBrowserView)
 @param title new title (string)
 """
-pass
+self.historyManager().updateHistoryEntry(
-##        self.historyManager().updateHistoryEntry(
+browser.url().toString(), title)
-##            browser.url().toString(), title)
 @pyqtSlot()
 def newTab(self, link=None, requestData=None, addNextTo=None):
 """
 Public slot called to open a new web browser tab.
 @param link file to be displayed in the new window (string or QUrl)
-@param requestData tuple containing the request data (QNetworkRequest,
+@param requestData page load request data (LoadRequest)
-QNetworkAccessManager.Operation, QByteArray)
 @param addNextTo reference to the browser to open the tab after
 (HelpBrowser)
 """
 if addNextTo:
 self.__tabWidget.newBrowserAfter(addNextTo, link, requestData)
 else:
 self.__tabWidget.newBrowser(link, requestData)
-# TODO: check the above
 @pyqtSlot()
 def newWindow(self, link=None):
 """
 Public slot called to open a new web browser window.
 self.__fromEric)
 h.show()
 # TODO: Private Window
-# TODO: check if this is still needed
+# TODO: check if this is still needed/possible
 def previewer(self):
 """
 Public method to get a reference to the previewer tab.
 @return reference to the previewer tab (WebBrowserView)
 ##
 ##        self.__virusTotal.close()
 ##
 ##        self.flashCookieManager().shutdown()
 ##
-##        self.searchEdit.openSearchManager().close()
+self.searchEdit.openSearchManager().close()
-##
 ##        if WebBrowserWindow.UseQtHelp:
 ##            self.__searchEngine.cancelIndexing()
 ##            self.__searchEngine.cancelSearching()
 ##
 ##            if self.__helpInstaller:
 ##                self.__helpInstaller.stop()
 ##
-##        self.searchEdit.saveSearches()
+self.searchEdit.saveSearches()
-##
 self.__tabWidget.closeAllBrowsers()
 state = self.saveState()
 Preferences.setWebBrowser("WebBrowserState", state)
 ##
 self.historyManager().preferencesChanged()
 self.__tabWidget.preferencesChanged()
-# TODO: OpenSearch
+self.searchEdit.preferencesChanged()
-##        self.searchEdit.preferencesChanged()
-##
 # TODO: VirusTotal
 ##        self.__virusTotal.preferencesChanged()
 ##        if not Preferences.getWebBrowser("VirusTotalEnabled") or \
 ##           Preferences.getWebBrowser("VirusTotalServiceKey") == "":
 ##            self.virustotalScanCurrentAct.setEnabled(False)
 ##        """
 ##            from .CookieJar.CookieJar import CookieJar
 ##            cls._cookieJar = CookieJar()
 ##        return cls.networkAccessManager().cookieJar()
 ##
-##    def __clearIconsDatabase(self):
+def __clearIconsDatabase(self):
-##        """
+"""
-##        Private slot to clear the icons databse.
+Private slot to clear the icons databse.
-##        """
+"""
-##        QWebSettings.clearIconDatabase()
+WebIconProvider.instance().clear()
-##
 @pyqtSlot(QUrl)
 def __linkActivated(self, url):
 """
 Private slot to handle the selection of a link.
 history.goToItem(history.backItems(historyCount)[-1 * offset - 1])
 else:
 # go forward
 history.goToItem(history.forwardItems(historyCount)[offset - 1])
-##    def __clearPrivateData(self):
+def __clearPrivateData(self):
-##        """
+"""
-##        Private slot to clear the private data.
+Private slot to clear the private data.
-##        """
+"""
-##        from .HelpClearPrivateDataDialog import HelpClearPrivateDataDialog
+from .WebBrowserClearPrivateDataDialog import \
-##        dlg = HelpClearPrivateDataDialog(self)
+WebBrowserClearPrivateDataDialog
-##        if dlg.exec_() == QDialog.Accepted:
+dlg = WebBrowserClearPrivateDataDialog(self)
-##            # browsing history, search history, favicons, disk cache, cookies,
+if dlg.exec_() == QDialog.Accepted:
-##            # passwords, web databases, downloads, Flash cookies
+# browsing history, search history, favicons, disk cache, cookies,
-##            (history, searches, favicons, cache, cookies,
+# passwords, web databases, downloads, Flash cookies
-##             passwords, databases, downloads, flashCookies, zoomValues,
+(history, searches, favicons, cache, cookies,
-##             historyPeriod) = dlg.getData()
+passwords, databases, downloads, flashCookies, zoomValues,
-##            if history:
+historyPeriod) = dlg.getData()
-##                self.historyManager().clear(historyPeriod)
+if history:
-##                self.__tabWidget.clearClosedTabsList()
+self.historyManager().clear(historyPeriod)
-##            if searches:
+self.__tabWidget.clearClosedTabsList()
-##                self.searchEdit.clear()
+if searches:
+self.searchEdit.clear()
+# TODO: Downloads
 ##            if downloads:
 ##                self.downloadManager().cleanup()
 ##                self.downloadManager().hide()
-##            if favicons:
+if favicons:
-##                self.__clearIconsDatabase()
+self.__clearIconsDatabase()
+# TODO: Cache Cleaning
 ##            if cache:
 ##                try:
 ##                    self.networkAccessManager().cache().clear()
 ##                except AttributeError:
 ##                    pass
+# TODO: Cookies
 ##            if cookies:
 ##                self.cookieJar().clear()
+# TODO: Passwords
 ##            if passwords:
 ##                self.passwordManager().clear()
+# TODO: Web Databases
 ##            if databases:
 ##                if hasattr(QWebDatabase, "removeAllDatabases"):
 ##                    QWebDatabase.removeAllDatabases()
 ##                else:
 ##                    for securityOrigin in QWebSecurityOrigin.allOrigins():
 ##                        for database in securityOrigin.databases():
 ##                            QWebDatabase.removeDatabase(database)
+# TODO: Flash Cookie Manager
 ##            if flashCookies:
 ##                from .HelpLanguagesDialog import HelpLanguagesDialog
 ##                languages = Preferences.toList(
 ##                    Preferences.Prefs.settings.value(
 ##                        "Help/AcceptLanguages",
 ##                    langCode = language.split("[")[1][:2]
 ##                self.newTab(
 ##                    "http://www.macromedia.com/support/documentation/"
 ##                    "{0}/flashplayer/help/settings_manager07.html".format(
 ##                        langCode))
-##            if zoomValues:
+if zoomValues:
-##                ZoomManager.instance().clear()
+ZoomManager.instance().clear()
-##
-##    def __showEnginesConfigurationDialog(self):
+def __showEnginesConfigurationDialog(self):
-##        """
+"""
-##        Private slot to show the search engines configuration dialog.
+Private slot to show the search engines configuration dialog.
-##        """
+"""
-##        from .OpenSearch.OpenSearchDialog import OpenSearchDialog
+from .OpenSearch.OpenSearchDialog import OpenSearchDialog
-##
-##        dlg = OpenSearchDialog(self)
+dlg = OpenSearchDialog(self)
-##        dlg.exec_()
+dlg.exec_()
-##
-##    def searchEnginesAction(self):
+def searchEnginesAction(self):
-##        """
+"""
-##        Public method to get a reference to the search engines configuration
+Public method to get a reference to the search engines configuration
-##        action.
+action.
-##
-##        @return reference to the search engines configuration action (QAction)
+@return reference to the search engines configuration action (QAction)
-##        """
+"""
-##        return self.searchEnginesAct
+return self.searchEnginesAct
-##
 ##    def __showPasswordsDialog(self):
 ##        """
 ##        Private slot to show the passwords management dialog.
 ##        """
 ##        from .Passwords.PasswordsDialog import PasswordsDialog
 if self.__lastActiveWindow:
 return self.__lastActiveWindow
 return self.mainWindow()
-##    def openSearchManager(self):
+def openSearchManager(self):
-##        """
+"""
-##        Public method to get a reference to the opensearch manager object.
+Public method to get a reference to the opensearch manager object.
-##
-##        @return reference to the opensearch manager object (OpenSearchManager)
+@return reference to the opensearch manager object (OpenSearchManager)
-##        """
+"""
-##        return self.searchEdit.openSearchManager()
+return self.searchEdit.openSearchManager()
-##
 def __aboutToShowTextEncodingMenu(self):
 """
 Private slot to populate the text encoding menu.
 """
 self.__textEncodingMenu.clear()

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserWindow.py

WebBrowser/WebBrowserWindow.py