eric: comparison Helpviewer/HelpWindow.py

-:01246ad582c3
+:db40effc5c65
 import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
-from PyQt4.QtWebKit import QWebSettings
+from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin
 from PyQt4.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery
 from .SearchWidget import SearchWidget
 from .HelpBrowserWV import HelpBrowser
 from .HelpTocWidget import HelpTocWidget
 from .History.HistoryMenu import HistoryMenu
 from .History.HistoryCompleter import HistoryCompletionModel, HistoryCompleter
 from .Passwords.PasswordManager import PasswordManager
 from .Network.NetworkAccessManager import NetworkAccessManager
 from .AdBlock.AdBlockManager import AdBlockManager
+from .OfflineStorage.OfflineStorageConfigDialog import OfflineStorageConfigDialog
 from E5Gui.E5TabWidget import E5TabWidget
 from E5Gui.E5Action import E5Action
 from E5Network.E5NetworkMonitor import E5NetworkMonitor
 if hasattr(QWebSettings, "PrintElementBackgrounds"):
 settings.setAttribute(QWebSettings.PrintElementBackgrounds,
 Preferences.getHelp("PrintBackgrounds"))
+if hasattr(QWebSettings, "setOfflineStoragePath"):
+settings.setAttribute(QWebSettings.OfflineStorageDatabaseEnabled,
+Preferences.getHelp("OfflineStorageDatabaseEnabled"))
+webDatabaseDir = os.path.join(
+Utilities.getConfigDir(), "browser", "webdatabases")
+if not os.path.exists(webDatabaseDir):
+os.makedirs(webDatabaseDir)
+settings.setOfflineStoragePath(webDatabaseDir)
+settings.setOfflineStorageDefaultQuota(
+Preferences.getHelp("OfflineStorageDatabaseQuota") * 1024 * 1024)
 def __initActions(self):
 """
 Private method to define the user interface actions.
 """
 # list of all actions
 ))
 self.connect(self.cookiesAct, SIGNAL('triggered()'),
 self.__showCookiesConfiguration)
 self.__actions.append(self.cookiesAct)
+self.offlineStorageAct = E5Action(self.trUtf8('Offline Storage'),
+UI.PixmapCache.getIcon("preferences-html5.png"),
+self.trUtf8('Offline &Storage...'), 0, 0, self, 'help_offline_storage')
+self.offlineStorageAct.setStatusTip(self.trUtf8(
+'Configure offline storage'))
+self.offlineStorageAct.setWhatsThis(self.trUtf8(
+"""<b>Offline Storage</b>"""
+"""<p>Opens a dialog to configure offline storage.</p>"""
+))
+self.connect(self.offlineStorageAct, SIGNAL('triggered()'),
+self.__showOfflineStorageConfiguration)
+self.__actions.append(self.offlineStorageAct)
 self.syncTocAct = E5Action(self.trUtf8('Sync with Table of Contents'),
 UI.PixmapCache.getIcon("syncToc.png"),
 self.trUtf8('Sync with Table of Contents'),
 0, 0, self, 'help_sync_toc')
 self.syncTocAct.setStatusTip(self.trUtf8(
 ))
 self.connect(self.clearIconsAct, SIGNAL('triggered()'), self.__clearIconsDatabase)
 self.__actions.append(self.clearIconsAct)
 self.searchEnginesAct = E5Action(self.trUtf8('Configure Search Engines'),
-self.trUtf8('Configure &Search Engines...'),
+self.trUtf8('Configure Search &Engines...'),
 0, 0,
 self, 'help_search_engines')
 self.searchEnginesAct.setStatusTip(self.trUtf8(
 'Configure the available search engines'))
 self.searchEnginesAct.setWhatsThis(self.trUtf8(
 menu = mb.addMenu(self.trUtf8('&Settings'))
 menu.setTearOffEnabled(True)
 menu.addAction(self.prefAct)
 menu.addAction(self.acceptedLanguagesAct)
 menu.addAction(self.cookiesAct)
+menu.addAction(self.offlineStorageAct)
 menu.addSeparator()
 menu.addAction(self.searchEnginesAct)
 menu.addSeparator()
 menu.addAction(self.passwordsAct)
 menu.addSeparator()
 settingstb.setObjectName("SettingsToolBar")
 settingstb.setIconSize(UI.Config.ToolBarIconSize)
 settingstb.addAction(self.prefAct)
 settingstb.addAction(self.acceptedLanguagesAct)
 settingstb.addAction(self.cookiesAct)
+settingstb.addAction(self.offlineStorageAct)
 helptb = self.addToolBar(self.trUtf8("Help"))
 helptb.setObjectName("HelpToolBar")
 helptb.setIconSize(UI.Config.ToolBarIconSize)
 helptb.addAction(self.whatsThisAct)
 txt = self.trUtf8("""<b>Are you sure you want to turn on private"""
 """ browsing?</b><p>When private browsing is turned on,"""
 """ web pages are not added to the history, searches"""
 """ are not added to the list of recent searches and"""
 """ web site icons and cookies are not stored."""
+""" HTML5 offline storage will be deactivated."""
 """ Until you close the window, you can still click"""
 """ the Back and Forward buttons to return to the"""
 """ web pages you have opened.</p>""")
 res = QMessageBox.question(self, "", txt,
 QMessageBox.StandardButtons(\
 Private slot to configure the cookies handling.
 """
 dlg = CookiesConfigurationDialog(self)
 dlg.exec_()
+def __showOfflineStorageConfiguration(self):
+"""
+Private slot to configure the offline storage.
+"""
+dlg = OfflineStorageConfigDialog(self)
+if dlg.exec_() == QDialog.Accepted:
+dlg.storeData()
+self.__initWebSettings()
 def setLoading(self, widget):
 """
 Public method to set the loading icon.
 @param widget reference to the widget to set the icon for (QWidget)
 """
 Private slot to clear the private data.
 """
 dlg = HelpClearPrivateDataDialog(self)
 if dlg.exec_() == QDialog.Accepted:
-history, searches, favicons, cache, cookies, passwords = dlg.getData()
+history, searches, favicons, cache, cookies, passwords, databases = \
-# browsing history, search history, favicons, disk cache, cookies, passwords
+dlg.getData()
+# browsing history, search history, favicons, disk cache, cookies,
+# passwords, web databases
 if history:
 self.historyManager().clear()
 if searches:
 self.searchEdit.clear()
 if favicons:
 pass
 if cookies:
 self.cookieJar().clear()
 if passwords:
 self.passwordManager().clear()
+if databases:
+if hasattr(QWebDatabase, "removeAllDatabases"):
+QWebDatabase.removeAllDatabases()
+else:
+for securityOrigin in QWebSecurityOrigin.allOrigins():
+for database in securityOrigin.databases():
+QWebDatabase.removeDatabase(database)
 def __showEnginesConfigurationDialog(self):
 """
 Private slot to show the search engines configuration dialog.
 """

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/HelpWindow.py

Helpviewer/HelpWindow.py