--- a/Helpviewer/HelpWindow.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Helpviewer/HelpWindow.py Fri Nov 01 15:48:48 2013 +0100 @@ -323,25 +323,33 @@ styleSheet = Preferences.getHelp("UserStyleSheet") settings.setUserStyleSheetUrl(self.__userStyleSheet(styleSheet)) - settings.setAttribute(QWebSettings.AutoLoadImages, + settings.setAttribute( + QWebSettings.AutoLoadImages, Preferences.getHelp("AutoLoadImages")) - settings.setAttribute(QWebSettings.JavaEnabled, + settings.setAttribute( + QWebSettings.JavaEnabled, Preferences.getHelp("JavaEnabled")) - settings.setAttribute(QWebSettings.JavascriptEnabled, + settings.setAttribute( + QWebSettings.JavascriptEnabled, Preferences.getHelp("JavaScriptEnabled")) - settings.setAttribute(QWebSettings.JavascriptCanOpenWindows, + settings.setAttribute( + QWebSettings.JavascriptCanOpenWindows, Preferences.getHelp("JavaScriptCanOpenWindows")) - settings.setAttribute(QWebSettings.JavascriptCanAccessClipboard, + settings.setAttribute( + QWebSettings.JavascriptCanAccessClipboard, Preferences.getHelp("JavaScriptCanAccessClipboard")) - settings.setAttribute(QWebSettings.PluginsEnabled, + settings.setAttribute( + QWebSettings.PluginsEnabled, Preferences.getHelp("PluginsEnabled")) if hasattr(QWebSettings, "PrintElementBackgrounds"): - settings.setAttribute(QWebSettings.PrintElementBackgrounds, + settings.setAttribute( + QWebSettings.PrintElementBackgrounds, Preferences.getHelp("PrintBackgrounds")) if hasattr(QWebSettings, "setOfflineStoragePath"): - settings.setAttribute(QWebSettings.OfflineStorageDatabaseEnabled, + settings.setAttribute( + QWebSettings.OfflineStorageDatabaseEnabled, Preferences.getHelp("OfflineStorageDatabaseEnabled")) webDatabaseDir = os.path.join( Utilities.getConfigDir(), "browser", "webdatabases") @@ -366,7 +374,8 @@ 1024 * 1024) if hasattr(QWebSettings, "LocalStorageEnabled"): - settings.setAttribute(QWebSettings.LocalStorageEnabled, + settings.setAttribute( + QWebSettings.LocalStorageEnabled, Preferences.getHelp("LocalStorageEnabled")) localStorageDir = os.path.join( Utilities.getConfigDir(), "browser", "weblocalstorage") @@ -375,7 +384,8 @@ settings.setLocalStoragePath(localStorageDir) if hasattr(QWebSettings, "DnsPrefetchEnabled"): - settings.setAttribute(QWebSettings.DnsPrefetchEnabled, + settings.setAttribute( + QWebSettings.DnsPrefetchEnabled, Preferences.getHelp("DnsPrefetchEnabled")) if hasattr(QWebSettings, "defaultTextEncoding"): @@ -383,22 +393,28 @@ Preferences.getHelp("DefaultTextEncoding")) if hasattr(QWebSettings, "SpatialNavigationEnabled"): - settings.setAttribute(QWebSettings.SpatialNavigationEnabled, + settings.setAttribute( + QWebSettings.SpatialNavigationEnabled, Preferences.getHelp("SpatialNavigationEnabled")) if hasattr(QWebSettings, "LinksIncludedInFocusChain"): - settings.setAttribute(QWebSettings.LinksIncludedInFocusChain, + settings.setAttribute( + QWebSettings.LinksIncludedInFocusChain, Preferences.getHelp("LinksIncludedInFocusChain")) if hasattr(QWebSettings, "LocalContentCanAccessRemoteUrls"): - settings.setAttribute(QWebSettings.LocalContentCanAccessRemoteUrls, + settings.setAttribute( + QWebSettings.LocalContentCanAccessRemoteUrls, Preferences.getHelp("LocalContentCanAccessRemoteUrls")) if hasattr(QWebSettings, "LocalContentCanAccessFileUrls"): - settings.setAttribute(QWebSettings.LocalContentCanAccessFileUrls, + settings.setAttribute( + QWebSettings.LocalContentCanAccessFileUrls, Preferences.getHelp("LocalContentCanAccessFileUrls")) if hasattr(QWebSettings, "XSSAuditingEnabled"): - settings.setAttribute(QWebSettings.XSSAuditingEnabled, + settings.setAttribute( + QWebSettings.XSSAuditingEnabled, Preferences.getHelp("XSSAuditingEnabled")) if hasattr(QWebSettings, "SiteSpecificQuirksEnabled"): - settings.setAttribute(QWebSettings.SiteSpecificQuirksEnabled, + settings.setAttribute( + QWebSettings.SiteSpecificQuirksEnabled, Preferences.getHelp("SiteSpecificQuirksEnabled")) QWebSecurityOrigin.addLocalScheme("eric") @@ -410,7 +426,8 @@ # list of all actions self.__actions = [] - self.newTabAct = E5Action(self.trUtf8('New Tab'), + self.newTabAct = E5Action( + self.trUtf8('New Tab'), UI.PixmapCache.getIcon("tabNew.png"), self.trUtf8('&New Tab'), QKeySequence(self.trUtf8("Ctrl+T", "File|New Tab")), @@ -424,7 +441,8 @@ self.newTabAct.triggered[()].connect(self.newTab) self.__actions.append(self.newTabAct) - self.newAct = E5Action(self.trUtf8('New Window'), + self.newAct = E5Action( + self.trUtf8('New Window'), UI.PixmapCache.getIcon("newWindow.png"), self.trUtf8('New &Window'), QKeySequence(self.trUtf8("Ctrl+N", "File|New Window")), @@ -438,7 +456,8 @@ self.newAct.triggered[()].connect(self.newWindow) self.__actions.append(self.newAct) - self.openAct = E5Action(self.trUtf8('Open File'), + self.openAct = E5Action( + self.trUtf8('Open File'), UI.PixmapCache.getIcon("open.png"), self.trUtf8('&Open File'), QKeySequence(self.trUtf8("Ctrl+O", "File|Open")), @@ -453,7 +472,8 @@ self.openAct.triggered[()].connect(self.__openFile) self.__actions.append(self.openAct) - self.openTabAct = E5Action(self.trUtf8('Open File in New Tab'), + self.openTabAct = E5Action( + self.trUtf8('Open File in New Tab'), UI.PixmapCache.getIcon("openNewTab.png"), self.trUtf8('Open File in New &Tab'), QKeySequence(self.trUtf8("Shift+Ctrl+O", "File|Open in new tab")), @@ -469,7 +489,8 @@ self.openTabAct.triggered[()].connect(self.__openFileNewTab) self.__actions.append(self.openTabAct) - self.saveAsAct = E5Action(self.trUtf8('Save As'), + self.saveAsAct = E5Action( + self.trUtf8('Save As'), UI.PixmapCache.getIcon("fileSaveAs.png"), self.trUtf8('&Save As...'), QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")), @@ -484,7 +505,8 @@ self.saveAsAct.triggered[()].connect(self.__savePageAs) self.__actions.append(self.saveAsAct) - self.savePageScreenAct = E5Action(self.trUtf8('Save Page Screen'), + self.savePageScreenAct = E5Action( + self.trUtf8('Save Page Screen'), UI.PixmapCache.getIcon("fileSavePixmap.png"), self.trUtf8('Save Page Screen...'), 0, 0, self, 'help_file_save_page_screen') @@ -517,7 +539,8 @@ self.__actions.append(self.saveVisiblePageScreenAct) bookmarksManager = self.bookmarksManager() - self.importBookmarksAct = E5Action(self.trUtf8('Import Bookmarks'), + self.importBookmarksAct = E5Action( + self.trUtf8('Import Bookmarks'), self.trUtf8('&Import Bookmarks...'), 0, 0, self, 'help_file_import_bookmarks') self.importBookmarksAct.setStatusTip( @@ -531,7 +554,8 @@ bookmarksManager.importBookmarks) self.__actions.append(self.importBookmarksAct) - self.exportBookmarksAct = E5Action(self.trUtf8('Export Bookmarks'), + self.exportBookmarksAct = E5Action( + self.trUtf8('Export Bookmarks'), self.trUtf8('&Export Bookmarks...'), 0, 0, self, 'help_file_export_bookmarks') self.exportBookmarksAct.setStatusTip( @@ -545,7 +569,8 @@ bookmarksManager.exportBookmarks) self.__actions.append(self.exportBookmarksAct) - self.printAct = E5Action(self.trUtf8('Print'), + self.printAct = E5Action( + self.trUtf8('Print'), UI.PixmapCache.getIcon("print.png"), self.trUtf8('&Print'), QKeySequence(self.trUtf8("Ctrl+P", "File|Print")), @@ -559,7 +584,8 @@ self.printAct.triggered[()].connect(self.tabWidget.printBrowser) self.__actions.append(self.printAct) - self.printPdfAct = E5Action(self.trUtf8('Print as PDF'), + self.printPdfAct = E5Action( + self.trUtf8('Print as PDF'), UI.PixmapCache.getIcon("printPdf.png"), self.trUtf8('Print as PDF'), 0, 0, self, 'help_file_print_pdf') @@ -574,7 +600,8 @@ self.tabWidget.printBrowserPdf) self.__actions.append(self.printPdfAct) - self.printPreviewAct = E5Action(self.trUtf8('Print Preview'), + self.printPreviewAct = E5Action( + self.trUtf8('Print Preview'), UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8('Print Preview'), 0, 0, self, 'help_file_print_preview') @@ -589,7 +616,8 @@ self.tabWidget.printPreviewBrowser) self.__actions.append(self.printPreviewAct) - self.closeAct = E5Action(self.trUtf8('Close'), + self.closeAct = E5Action( + self.trUtf8('Close'), UI.PixmapCache.getIcon("close.png"), self.trUtf8('&Close'), QKeySequence(self.trUtf8("Ctrl+W", "File|Close")), @@ -604,7 +632,8 @@ self.closeAct.triggered[()].connect(self.tabWidget.closeBrowser) self.__actions.append(self.closeAct) - self.closeAllAct = E5Action(self.trUtf8('Close All'), + self.closeAllAct = E5Action( + self.trUtf8('Close All'), self.trUtf8('Close &All'), 0, 0, self, 'help_file_close_all') self.closeAllAct.setStatusTip(self.trUtf8('Close all help windows')) @@ -617,7 +646,8 @@ self.tabWidget.closeAllBrowsers) self.__actions.append(self.closeAllAct) - self.privateBrowsingAct = E5Action(self.trUtf8('Private Browsing'), + self.privateBrowsingAct = E5Action( + self.trUtf8('Private Browsing'), UI.PixmapCache.getIcon("privateBrowsing.png"), self.trUtf8('Private &Browsing'), 0, 0, self, 'help_file_private_browsing') @@ -633,7 +663,8 @@ self.privateBrowsingAct.setCheckable(True) self.__actions.append(self.privateBrowsingAct) - self.exitAct = E5Action(self.trUtf8('Quit'), + self.exitAct = E5Action( + self.trUtf8('Quit'), UI.PixmapCache.getIcon("exit.png"), self.trUtf8('&Quit'), QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit")), @@ -650,7 +681,8 @@ self.exitAct.triggered[()].connect(self.__closeAllWindows) self.__actions.append(self.exitAct) - self.backAct = E5Action(self.trUtf8('Backward'), + self.backAct = E5Action( + self.trUtf8('Backward'), UI.PixmapCache.getIcon("back.png"), self.trUtf8('&Backward'), QKeySequence(self.trUtf8("Alt+Left", "Go|Backward")), @@ -666,7 +698,8 @@ self.backAct.triggered[()].connect(self.__backward) self.__actions.append(self.backAct) - self.forwardAct = E5Action(self.trUtf8('Forward'), + self.forwardAct = E5Action( + self.trUtf8('Forward'), UI.PixmapCache.getIcon("forward.png"), self.trUtf8('&Forward'), QKeySequence(self.trUtf8("Alt+Right", "Go|Forward")), @@ -683,7 +716,8 @@ self.forwardAct.triggered[()].connect(self.__forward) self.__actions.append(self.forwardAct) - self.homeAct = E5Action(self.trUtf8('Home'), + self.homeAct = E5Action( + self.trUtf8('Home'), UI.PixmapCache.getIcon("home.png"), self.trUtf8('&Home'), QKeySequence(self.trUtf8("Ctrl+Home", "Go|Home")), @@ -698,7 +732,8 @@ self.homeAct.triggered[()].connect(self.__home) self.__actions.append(self.homeAct) - self.reloadAct = E5Action(self.trUtf8('Reload'), + self.reloadAct = E5Action( + self.trUtf8('Reload'), UI.PixmapCache.getIcon("reload.png"), self.trUtf8('&Reload'), QKeySequence(self.trUtf8("Ctrl+R", "Go|Reload")), @@ -714,7 +749,8 @@ self.reloadAct.triggered[()].connect(self.__reload) self.__actions.append(self.reloadAct) - self.stopAct = E5Action(self.trUtf8('Stop'), + self.stopAct = E5Action( + self.trUtf8('Stop'), UI.PixmapCache.getIcon("stopLoading.png"), self.trUtf8('&Stop'), QKeySequence(self.trUtf8("Ctrl+.", "Go|Stop")), @@ -729,7 +765,8 @@ self.stopAct.triggered[()].connect(self.__stopLoading) self.__actions.append(self.stopAct) - self.copyAct = E5Action(self.trUtf8('Copy'), + self.copyAct = E5Action( + self.trUtf8('Copy'), UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8('&Copy'), QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")), @@ -743,7 +780,8 @@ self.copyAct.triggered[()].connect(self.__copy) self.__actions.append(self.copyAct) - self.findAct = E5Action(self.trUtf8('Find...'), + self.findAct = E5Action( + self.trUtf8('Find...'), UI.PixmapCache.getIcon("find.png"), self.trUtf8('&Find...'), QKeySequence(self.trUtf8("Ctrl+F", "Edit|Find")), @@ -757,7 +795,8 @@ self.findAct.triggered[()].connect(self.__find) self.__actions.append(self.findAct) - self.findNextAct = E5Action(self.trUtf8('Find next'), + self.findNextAct = E5Action( + self.trUtf8('Find next'), UI.PixmapCache.getIcon("findNext.png"), self.trUtf8('Find &next'), QKeySequence(self.trUtf8("F3", "Edit|Find next")), @@ -772,7 +811,8 @@ self.findNextAct.triggered[()].connect(self.findDlg.findNext) self.__actions.append(self.findNextAct) - self.findPrevAct = E5Action(self.trUtf8('Find previous'), + self.findPrevAct = E5Action( + self.trUtf8('Find previous'), UI.PixmapCache.getIcon("findPrev.png"), self.trUtf8('Find &previous'), QKeySequence(self.trUtf8("Shift+F3", "Edit|Find previous")), @@ -788,7 +828,8 @@ self.findPrevAct.triggered[()].connect(self.findDlg.findPrevious) self.__actions.append(self.findPrevAct) - self.bookmarksManageAct = E5Action(self.trUtf8('Manage Bookmarks'), + self.bookmarksManageAct = E5Action( + self.trUtf8('Manage Bookmarks'), self.trUtf8('&Manage Bookmarks...'), QKeySequence(self.trUtf8("Ctrl+Shift+B", "Help|Manage bookmarks")), 0, self, 'help_bookmarks_manage') @@ -803,7 +844,8 @@ self.__showBookmarksDialog) self.__actions.append(self.bookmarksManageAct) - self.bookmarksAddAct = E5Action(self.trUtf8('Add Bookmark'), + self.bookmarksAddAct = E5Action( + self.trUtf8('Add Bookmark'), UI.PixmapCache.getIcon("addBookmark.png"), self.trUtf8('Add &Bookmark...'), QKeySequence(self.trUtf8("Ctrl+D", "Help|Add bookmark")), @@ -819,7 +861,8 @@ self.bookmarksAddAct.triggered[()].connect(self.__addBookmark) self.__actions.append(self.bookmarksAddAct) - self.bookmarksAddFolderAct = E5Action(self.trUtf8('Add Folder'), + self.bookmarksAddFolderAct = E5Action( + self.trUtf8('Add Folder'), self.trUtf8('Add &Folder...'), 0, 0, self, 'help_bookmark_show_all') self.bookmarksAddFolderAct.setStatusTip(self.trUtf8( @@ -833,7 +876,8 @@ self.__addBookmarkFolder) self.__actions.append(self.bookmarksAddFolderAct) - self.bookmarksAllTabsAct = E5Action(self.trUtf8('Bookmark All Tabs'), + self.bookmarksAllTabsAct = E5Action( + self.trUtf8('Bookmark All Tabs'), self.trUtf8('Bookmark All Tabs...'), 0, 0, self, 'help_bookmark_all_tabs') self.bookmarksAllTabsAct.setStatusTip(self.trUtf8( @@ -847,7 +891,8 @@ self.bookmarksAllTabsAct.triggered[()].connect(self.bookmarkAll) self.__actions.append(self.bookmarksAllTabsAct) - self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), + self.whatsThisAct = E5Action( + self.trUtf8('What\'s This?'), UI.PixmapCache.getIcon("whatsThis.png"), self.trUtf8('&What\'s This?'), QKeySequence(self.trUtf8("Shift+F1", "Help|What's This?'")), @@ -865,7 +910,8 @@ self.whatsThisAct.triggered[()].connect(self.__whatsThis) self.__actions.append(self.whatsThisAct) - self.aboutAct = E5Action(self.trUtf8('About'), + self.aboutAct = E5Action( + self.trUtf8('About'), self.trUtf8('&About'), 0, 0, self, 'help_help_about') self.aboutAct.setStatusTip(self.trUtf8( @@ -878,7 +924,8 @@ self.aboutAct.triggered[()].connect(self.__about) self.__actions.append(self.aboutAct) - self.aboutQtAct = E5Action(self.trUtf8('About Qt'), + self.aboutQtAct = E5Action( + self.trUtf8('About Qt'), self.trUtf8('About &Qt'), 0, 0, self, 'help_help_about_qt') self.aboutQtAct.setStatusTip( @@ -891,7 +938,8 @@ self.aboutQtAct.triggered[()].connect(self.__aboutQt) self.__actions.append(self.aboutQtAct) - self.zoomInAct = E5Action(self.trUtf8('Zoom in'), + self.zoomInAct = E5Action( + self.trUtf8('Zoom in'), UI.PixmapCache.getIcon("zoomIn.png"), self.trUtf8('Zoom &in'), QKeySequence(self.trUtf8("Ctrl++", "View|Zoom in")), @@ -906,7 +954,8 @@ self.zoomInAct.triggered[()].connect(self.__zoomIn) self.__actions.append(self.zoomInAct) - self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), + self.zoomOutAct = E5Action( + self.trUtf8('Zoom out'), UI.PixmapCache.getIcon("zoomOut.png"), self.trUtf8('Zoom &out'), QKeySequence(self.trUtf8("Ctrl+-", "View|Zoom out")), @@ -921,7 +970,8 @@ self.zoomOutAct.triggered[()].connect(self.__zoomOut) self.__actions.append(self.zoomOutAct) - self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), + self.zoomResetAct = E5Action( + self.trUtf8('Zoom reset'), UI.PixmapCache.getIcon("zoomReset.png"), self.trUtf8('Zoom &reset'), QKeySequence(self.trUtf8("Ctrl+0", "View|Zoom reset")), @@ -938,7 +988,8 @@ self.__actions.append(self.zoomResetAct) if hasattr(QWebSettings, 'ZoomTextOnly'): - self.zoomTextOnlyAct = E5Action(self.trUtf8('Zoom text only'), + self.zoomTextOnlyAct = E5Action( + self.trUtf8('Zoom text only'), self.trUtf8('Zoom &text only'), 0, 0, self, 'help_view_zoom_text_only') self.zoomTextOnlyAct.setCheckable(True) @@ -955,7 +1006,8 @@ else: self.zoomTextOnlyAct = None - self.pageSourceAct = E5Action(self.trUtf8('Show page source'), + self.pageSourceAct = E5Action( + self.trUtf8('Show page source'), self.trUtf8('Show page source'), QKeySequence(self.trUtf8('Ctrl+U')), 0, self, 'help_show_page_source') @@ -970,7 +1022,8 @@ self.__actions.append(self.pageSourceAct) self.addAction(self.pageSourceAct) - self.fullScreenAct = E5Action(self.trUtf8('Full Screen'), + self.fullScreenAct = E5Action( + self.trUtf8('Full Screen'), UI.PixmapCache.getIcon("windowFullscreen.png"), self.trUtf8('&Full Screen'), QKeySequence(self.trUtf8('F11')), 0, @@ -980,7 +1033,8 @@ self.__actions.append(self.fullScreenAct) self.addAction(self.fullScreenAct) - self.nextTabAct = E5Action(self.trUtf8('Show next tab'), + self.nextTabAct = E5Action( + self.trUtf8('Show next tab'), self.trUtf8('Show next tab'), QKeySequence(self.trUtf8('Ctrl+Alt+Tab')), 0, self, 'help_view_next_tab') @@ -989,7 +1043,8 @@ self.__actions.append(self.nextTabAct) self.addAction(self.nextTabAct) - self.prevTabAct = E5Action(self.trUtf8('Show previous tab'), + self.prevTabAct = E5Action( + self.trUtf8('Show previous tab'), self.trUtf8('Show previous tab'), QKeySequence(self.trUtf8('Shift+Ctrl+Alt+Tab')), 0, self, 'help_view_previous_tab') @@ -998,7 +1053,8 @@ self.__actions.append(self.prevTabAct) self.addAction(self.prevTabAct) - self.switchTabAct = E5Action(self.trUtf8('Switch between tabs'), + self.switchTabAct = E5Action( + self.trUtf8('Switch between tabs'), self.trUtf8('Switch between tabs'), QKeySequence(self.trUtf8('Ctrl+1')), 0, self, 'help_switch_tabs') @@ -1007,7 +1063,8 @@ self.__actions.append(self.switchTabAct) self.addAction(self.switchTabAct) - self.prefAct = E5Action(self.trUtf8('Preferences'), + self.prefAct = E5Action( + self.trUtf8('Preferences'), UI.PixmapCache.getIcon("configure.png"), self.trUtf8('&Preferences...'), 0, 0, self, 'help_preferences') self.prefAct.setStatusTip(self.trUtf8( @@ -1037,7 +1094,8 @@ self.__showAcceptedLanguages) self.__actions.append(self.acceptedLanguagesAct) - self.cookiesAct = E5Action(self.trUtf8('Cookies'), + self.cookiesAct = E5Action( + self.trUtf8('Cookies'), UI.PixmapCache.getIcon("cookie.png"), self.trUtf8('C&ookies...'), 0, 0, self, 'help_cookies') self.cookiesAct.setStatusTip(self.trUtf8( @@ -1051,7 +1109,8 @@ self.__showCookiesConfiguration) self.__actions.append(self.cookiesAct) - self.offlineStorageAct = E5Action(self.trUtf8('Offline Storage'), + self.offlineStorageAct = E5Action( + self.trUtf8('Offline Storage'), UI.PixmapCache.getIcon("preferences-html5.png"), self.trUtf8('Offline &Storage...'), 0, 0, self, 'help_offline_storage') @@ -1066,7 +1125,8 @@ self.__showOfflineStorageConfiguration) self.__actions.append(self.offlineStorageAct) - self.personalDataAct = E5Action(self.trUtf8('Personal Information'), + self.personalDataAct = E5Action( + self.trUtf8('Personal Information'), UI.PixmapCache.getIcon("pim.png"), self.trUtf8('Personal Information...'), 0, 0, @@ -1083,7 +1143,8 @@ self.__showPersonalInformationDialog) self.__actions.append(self.personalDataAct) - self.greaseMonkeyAct = E5Action(self.trUtf8('GreaseMonkey Scripts'), + self.greaseMonkeyAct = E5Action( + self.trUtf8('GreaseMonkey Scripts'), UI.PixmapCache.getIcon("greaseMonkey.png"), self.trUtf8('GreaseMonkey Scripts...'), 0, 0, @@ -1135,7 +1196,8 @@ self.syncTocAct.triggered[()].connect(self.__syncTOC) self.__actions.append(self.syncTocAct) - self.showTocAct = E5Action(self.trUtf8('Table of Contents'), + self.showTocAct = E5Action( + self.trUtf8('Table of Contents'), self.trUtf8('Table of Contents'), 0, 0, self, 'help_show_toc') self.showTocAct.setStatusTip(self.trUtf8( @@ -1148,7 +1210,8 @@ self.showTocAct.triggered[()].connect(self.__showTocWindow) self.__actions.append(self.showTocAct) - self.showIndexAct = E5Action(self.trUtf8('Index'), + self.showIndexAct = E5Action( + self.trUtf8('Index'), self.trUtf8('Index'), 0, 0, self, 'help_show_index') self.showIndexAct.setStatusTip(self.trUtf8( @@ -1161,7 +1224,8 @@ self.showIndexAct.triggered[()].connect(self.__showIndexWindow) self.__actions.append(self.showIndexAct) - self.showSearchAct = E5Action(self.trUtf8('Search'), + self.showSearchAct = E5Action( + self.trUtf8('Search'), self.trUtf8('Search'), 0, 0, self, 'help_show_search') self.showSearchAct.setStatusTip(self.trUtf8( @@ -1221,10 +1285,11 @@ self.__searchEngine.reindexDocumentation) self.__actions.append(self.reindexDocumentationAct) - self.clearPrivateDataAct = E5Action(self.trUtf8('Clear private data'), - self.trUtf8('&Clear private data'), - 0, 0, - self, 'help_clear_private_data') + self.clearPrivateDataAct = E5Action( + self.trUtf8('Clear private data'), + self.trUtf8('&Clear private data'), + 0, 0, + self, 'help_clear_private_data') self.clearPrivateDataAct.setStatusTip(self.trUtf8( 'Clear private data')) self.clearPrivateDataAct.setWhatsThis(self.trUtf8( @@ -1237,10 +1302,11 @@ self.__clearPrivateData) self.__actions.append(self.clearPrivateDataAct) - self.clearIconsAct = E5Action(self.trUtf8('Clear icons database'), - self.trUtf8('Clear &icons database'), - 0, 0, - self, 'help_clear_icons_db') + self.clearIconsAct = E5Action( + self.trUtf8('Clear icons database'), + self.trUtf8('Clear &icons database'), + 0, 0, + self, 'help_clear_icons_db') self.clearIconsAct.setStatusTip(self.trUtf8( 'Clear the database of favicons')) self.clearIconsAct.setWhatsThis(self.trUtf8( @@ -1269,11 +1335,12 @@ self.__showEnginesConfigurationDialog) self.__actions.append(self.searchEnginesAct) - self.passwordsAct = E5Action(self.trUtf8('Manage Saved Passwords'), - UI.PixmapCache.getIcon("passwords.png"), - self.trUtf8('Manage Saved Passwords...'), - 0, 0, - self, 'help_manage_passwords') + self.passwordsAct = E5Action( + self.trUtf8('Manage Saved Passwords'), + UI.PixmapCache.getIcon("passwords.png"), + self.trUtf8('Manage Saved Passwords...'), + 0, 0, + self, 'help_manage_passwords') self.passwordsAct.setStatusTip(self.trUtf8( 'Manage the saved passwords')) self.passwordsAct.setWhatsThis(self.trUtf8( @@ -1284,11 +1351,12 @@ self.passwordsAct.triggered[()].connect(self.__showPasswordsDialog) self.__actions.append(self.passwordsAct) - self.adblockAct = E5Action(self.trUtf8('Ad Block'), - UI.PixmapCache.getIcon("adBlockPlus.png"), - self.trUtf8('&Ad Block...'), - 0, 0, - self, 'help_adblock') + self.adblockAct = E5Action( + self.trUtf8('Ad Block'), + UI.PixmapCache.getIcon("adBlockPlus.png"), + self.trUtf8('&Ad Block...'), + 0, 0, + self, 'help_adblock') self.adblockAct.setStatusTip(self.trUtf8( 'Configure AdBlock subscriptions and rules')) self.adblockAct.setWhatsThis(self.trUtf8( @@ -1300,11 +1368,12 @@ self.adblockAct.triggered[()].connect(self.__showAdBlockDialog) self.__actions.append(self.adblockAct) - self.flashblockAct = E5Action(self.trUtf8('ClickToFlash'), - UI.PixmapCache.getIcon("flashBlock.png"), - self.trUtf8('&ClickToFlash...'), - 0, 0, - self, 'help_flashblock') + self.flashblockAct = E5Action( + self.trUtf8('ClickToFlash'), + UI.PixmapCache.getIcon("flashBlock.png"), + self.trUtf8('&ClickToFlash...'), + 0, 0, + self, 'help_flashblock') self.flashblockAct.setStatusTip(self.trUtf8( 'Configure ClickToFlash whitelist')) self.flashblockAct.setWhatsThis(self.trUtf8( @@ -1336,10 +1405,11 @@ self.__showCertificatesDialog) self.__actions.append(self.certificatesAct) - self.toolsMonitorAct = E5Action(self.trUtf8('Network Monitor'), - self.trUtf8('&Network Monitor...'), - 0, 0, - self, 'help_tools_network_monitor') + self.toolsMonitorAct = E5Action( + self.trUtf8('Network Monitor'), + self.trUtf8('&Network Monitor...'), + 0, 0, + self, 'help_tools_network_monitor') self.toolsMonitorAct.setStatusTip(self.trUtf8( 'Show the network monitor dialog')) self.toolsMonitorAct.setWhatsThis(self.trUtf8( @@ -1351,7 +1421,8 @@ self.__showNetworkMonitor) self.__actions.append(self.toolsMonitorAct) - self.showDownloadManagerAct = E5Action(self.trUtf8('Downloads'), + self.showDownloadManagerAct = E5Action( + self.trUtf8('Downloads'), self.trUtf8('Downloads'), 0, 0, self, 'help_show_downloads') self.showDownloadManagerAct.setStatusTip(self.trUtf8( @@ -1365,7 +1436,8 @@ self.__showDownloadsWindow) self.__actions.append(self.showDownloadManagerAct) - self.feedsManagerAct = E5Action(self.trUtf8('RSS Feeds Dialog'), + self.feedsManagerAct = E5Action( + self.trUtf8('RSS Feeds Dialog'), UI.PixmapCache.getIcon("rss22.png"), self.trUtf8('&RSS Feeds Dialog...'), QKeySequence(self.trUtf8("Ctrl+Shift+F", "Help|RSS Feeds Dialog")), @@ -1382,7 +1454,8 @@ self.feedsManagerAct.triggered[()].connect(self.__showFeedsManager) self.__actions.append(self.feedsManagerAct) - self.siteInfoAct = E5Action(self.trUtf8('Siteinfo Dialog'), + self.siteInfoAct = E5Action( + self.trUtf8('Siteinfo Dialog'), UI.PixmapCache.getIcon("helpAbout.png"), self.trUtf8('&Siteinfo Dialog...'), QKeySequence(self.trUtf8("Ctrl+Shift+I", "Help|Siteinfo Dialog")), @@ -1413,7 +1486,8 @@ self.__showUserAgentsDialog) self.__actions.append(self.userAgentManagerAct) - self.synchronizationAct = E5Action(self.trUtf8('Synchronize data'), + self.synchronizationAct = E5Action( + self.trUtf8('Synchronize data'), UI.PixmapCache.getIcon("sync.png"), self.trUtf8('&Synchronize Data...'), 0, 0, self, 'help_synchronize_data') @@ -1976,11 +2050,15 @@ """ Private slot to show the about information. """ - E5MessageBox.about(self, self.trUtf8("eric5 Web Browser"), self.trUtf8( - """<b>eric5 Web Browser - {0}</b>""" - """<p>The eric5 Web Browser is a combined help file and HTML""" - """ browser. It is part of the eric5 development toolset.</p>""" - ).format(Version)) + E5MessageBox.about( + self, + self.trUtf8("eric5 Web Browser"), + self.trUtf8( + """<b>eric5 Web Browser - {0}</b>""" + """<p>The eric5 Web Browser is a combined help file and HTML""" + """ browser. It is part of the eric5 development""" + """ toolset.</p>""" + ).format(Version)) def __aboutQt(self): """ @@ -2773,7 +2851,8 @@ @param message message to be shown (string) """ - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("eric5 Web Browser"), message) @@ -2816,7 +2895,8 @@ @param msg message sent by the help engine (string) """ - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Help Engine"), msg) def __aboutToShowSettingsMenu(self): @@ -2917,7 +2997,8 @@ if flashCookies: from .HelpLanguagesDialog import HelpLanguagesDialog languages = Preferences.toList( - Preferences.Prefs.settings.value("Help/AcceptLanguages", + Preferences.Prefs.settings.value( + "Help/AcceptLanguages", HelpLanguagesDialog.defaultAcceptLanguages())) if languages: language = languages[0] @@ -3491,7 +3572,8 @@ @param txt contents of the search (string) """ - self.virustotalSearchAct.setEnabled(txt != "" and \ + self.virustotalSearchAct.setEnabled( + txt != "" and \ Preferences.getHelp("VirusTotalEnabled") and \ Preferences.getHelp("VirusTotalServiceKey") != "") @@ -3530,7 +3612,8 @@ @param msg error message (str) """ - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("VirusTotal Scan"), self.trUtf8("""<p>The VirusTotal scan could not be""" """ scheduled.<p>\n<p>Reason: {0}</p>""").format(msg))