diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/WebBrowser/WebBrowserWindow.py
--- a/eric7/WebBrowser/WebBrowserWindow.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWindow.py Sat May 22 18:51:46 2021 +0200
@@ -34,12 +34,12 @@
except ImportError:
QTHELP_AVAILABLE = False
-from E5Gui.E5Action import E5Action
-from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5Application import e5App
-from E5Gui.E5ZoomWidget import E5ZoomWidget
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricAction import EricAction
+from E5Gui import EricMessageBox, EricFileDialog, EricErrorMessage
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricZoomWidget import EricZoomWidget
+from E5Gui.EricOverrideCursor import EricOverrideCursor
import Preferences
from Preferences import Shortcuts
@@ -61,7 +61,7 @@
from eric7config import getConfig
-class WebBrowserWindow(E5MainWindow):
+class WebBrowserWindow(EricMainWindow):
"""
Class implementing the web browser main window.
@@ -74,8 +74,8 @@
@signal webBrowserClosed(browser) emitted after a web browser tab was
closed
"""
- webBrowserWindowClosed = pyqtSignal(E5MainWindow)
- webBrowserWindowOpened = pyqtSignal(E5MainWindow)
+ webBrowserWindowClosed = pyqtSignal(EricMainWindow)
+ webBrowserWindowOpened = pyqtSignal(EricMainWindow)
webBrowserOpened = pyqtSignal(QWidget)
webBrowserClosed = pyqtSignal(QWidget)
@@ -203,7 +203,7 @@
self.__helpEngine = None
self.__helpInstaller = None
- self.__zoomWidget = E5ZoomWidget(
+ self.__zoomWidget = EricZoomWidget(
UI.PixmapCache.getPixmap("zoomOut"),
UI.PixmapCache.getPixmap("zoomIn"),
UI.PixmapCache.getPixmap("zoomReset"), self)
@@ -446,7 +446,7 @@
self.__virusTotal.fileScanReport.connect(
self.__virusTotalFileScanReport)
- e5App().focusChanged.connect(self.__appFocusChanged)
+ ericApp().focusChanged.connect(self.__appFocusChanged)
self.__toolbarStates = self.saveState()
@@ -664,7 +664,7 @@
# list of all actions
self.__actions = []
- self.newTabAct = E5Action(
+ self.newTabAct = EricAction(
self.tr('New Tab'),
UI.PixmapCache.getIcon("tabNew"),
self.tr('&New Tab'),
@@ -678,7 +678,7 @@
self.newTabAct.triggered.connect(self.newTab)
self.__actions.append(self.newTabAct)
- self.newAct = E5Action(
+ self.newAct = EricAction(
self.tr('New Window'),
UI.PixmapCache.getIcon("newWindow"),
self.tr('New &Window'),
@@ -693,7 +693,7 @@
self.newAct.triggered.connect(self.newWindow)
self.__actions.append(self.newAct)
- self.newPrivateAct = E5Action(
+ self.newPrivateAct = EricAction(
self.tr('New Private Window'),
UI.PixmapCache.getIcon("privateMode"),
self.tr('New &Private Window'),
@@ -709,7 +709,7 @@
self.newPrivateAct.triggered.connect(self.newPrivateWindow)
self.__actions.append(self.newPrivateAct)
- self.openAct = E5Action(
+ self.openAct = EricAction(
self.tr('Open File'),
UI.PixmapCache.getIcon("open"),
self.tr('&Open File'),
@@ -724,7 +724,7 @@
self.openAct.triggered.connect(self.__openFile)
self.__actions.append(self.openAct)
- self.openTabAct = E5Action(
+ self.openTabAct = EricAction(
self.tr('Open File in New Tab'),
UI.PixmapCache.getIcon("openNewTab"),
self.tr('Open File in New &Tab'),
@@ -741,7 +741,7 @@
self.__actions.append(self.openTabAct)
if hasattr(QWebEnginePage, "SavePage"):
- self.saveAsAct = E5Action(
+ self.saveAsAct = EricAction(
self.tr('Save As'),
UI.PixmapCache.getIcon("fileSaveAs"),
self.tr('&Save As...'),
@@ -758,7 +758,7 @@
else:
self.saveAsAct = None
- self.saveVisiblePageScreenAct = E5Action(
+ self.saveVisiblePageScreenAct = EricAction(
self.tr('Save Page Screen'),
UI.PixmapCache.getIcon("fileSavePixmap"),
self.tr('Save Page Screen...'),
@@ -776,7 +776,7 @@
self.__actions.append(self.saveVisiblePageScreenAct)
bookmarksManager = self.bookmarksManager()
- self.importBookmarksAct = E5Action(
+ self.importBookmarksAct = EricAction(
self.tr('Import Bookmarks'),
self.tr('&Import Bookmarks...'),
0, 0, self, 'webbrowser_file_import_bookmarks')
@@ -790,7 +790,7 @@
bookmarksManager.importBookmarks)
self.__actions.append(self.importBookmarksAct)
- self.exportBookmarksAct = E5Action(
+ self.exportBookmarksAct = EricAction(
self.tr('Export Bookmarks'),
self.tr('&Export Bookmarks...'),
0, 0, self, 'webbrowser_file_export_bookmarks')
@@ -804,7 +804,7 @@
bookmarksManager.exportBookmarks)
self.__actions.append(self.exportBookmarksAct)
- self.printAct = E5Action(
+ self.printAct = EricAction(
self.tr('Print'),
UI.PixmapCache.getIcon("print"),
self.tr('&Print'),
@@ -818,7 +818,7 @@
self.printAct.triggered.connect(self.__tabWidget.printBrowser)
self.__actions.append(self.printAct)
- self.printPdfAct = E5Action(
+ self.printPdfAct = EricAction(
self.tr('Print as PDF'),
UI.PixmapCache.getIcon("printPdf"),
self.tr('Print as PDF'),
@@ -833,7 +833,7 @@
self.__tabWidget.printBrowserPdf)
self.__actions.append(self.printPdfAct)
- self.printPreviewAct = E5Action(
+ self.printPreviewAct = EricAction(
self.tr('Print Preview'),
UI.PixmapCache.getIcon("printPreview"),
self.tr('Print Preview'),
@@ -848,7 +848,7 @@
self.__tabWidget.printPreviewBrowser)
self.__actions.append(self.printPreviewAct)
- self.sendPageLinkAct = E5Action(
+ self.sendPageLinkAct = EricAction(
self.tr('Send Page Link'),
UI.PixmapCache.getIcon("mailSend"),
self.tr('Send Page Link'),
@@ -862,7 +862,7 @@
self.sendPageLinkAct.triggered.connect(self.__sendPageLink)
self.__actions.append(self.sendPageLinkAct)
- self.closeAct = E5Action(
+ self.closeAct = EricAction(
self.tr('Close'),
UI.PixmapCache.getIcon("close"),
self.tr('&Close'),
@@ -877,7 +877,7 @@
self.closeAct.triggered.connect(self.__tabWidget.closeBrowser)
self.__actions.append(self.closeAct)
- self.closeAllAct = E5Action(
+ self.closeAllAct = EricAction(
self.tr('Close All'),
self.tr('Close &All'),
0, 0, self, 'webbrowser_file_close_all')
@@ -890,7 +890,7 @@
self.__tabWidget.closeAllBrowsers)
self.__actions.append(self.closeAllAct)
- self.exitAct = E5Action(
+ self.exitAct = EricAction(
self.tr('Quit'),
UI.PixmapCache.getIcon("exit"),
self.tr('&Quit'),
@@ -904,7 +904,7 @@
self.exitAct.triggered.connect(self.shutdown)
self.__actions.append(self.exitAct)
- self.backAct = E5Action(
+ self.backAct = EricAction(
self.tr('Backward'),
UI.PixmapCache.getIcon("back"),
self.tr('&Backward'),
@@ -919,7 +919,7 @@
self.backAct.triggered.connect(self.__backward)
self.__actions.append(self.backAct)
- self.forwardAct = E5Action(
+ self.forwardAct = EricAction(
self.tr('Forward'),
UI.PixmapCache.getIcon("forward"),
self.tr('&Forward'),
@@ -935,7 +935,7 @@
self.forwardAct.triggered.connect(self.__forward)
self.__actions.append(self.forwardAct)
- self.homeAct = E5Action(
+ self.homeAct = EricAction(
self.tr('Home'),
UI.PixmapCache.getIcon("home"),
self.tr('&Home'),
@@ -950,7 +950,7 @@
self.homeAct.triggered.connect(self.__home)
self.__actions.append(self.homeAct)
- self.reloadAct = E5Action(
+ self.reloadAct = EricAction(
self.tr('Reload'),
UI.PixmapCache.getIcon("reload"),
self.tr('&Reload'),
@@ -966,7 +966,7 @@
self.reloadAct.triggered.connect(self.__reload)
self.__actions.append(self.reloadAct)
- self.stopAct = E5Action(
+ self.stopAct = EricAction(
self.tr('Stop'),
UI.PixmapCache.getIcon("stopLoading"),
self.tr('&Stop'),
@@ -981,7 +981,7 @@
self.stopAct.triggered.connect(self.__stopLoading)
self.__actions.append(self.stopAct)
- self.copyAct = E5Action(
+ self.copyAct = EricAction(
self.tr('Copy'),
UI.PixmapCache.getIcon("editCopy"),
self.tr('&Copy'),
@@ -995,7 +995,7 @@
self.copyAct.triggered.connect(self.__copy)
self.__actions.append(self.copyAct)
- self.cutAct = E5Action(
+ self.cutAct = EricAction(
self.tr('Cut'),
UI.PixmapCache.getIcon("editCut"),
self.tr('Cu&t'),
@@ -1009,7 +1009,7 @@
self.cutAct.triggered.connect(self.__cut)
self.__actions.append(self.cutAct)
- self.pasteAct = E5Action(
+ self.pasteAct = EricAction(
self.tr('Paste'),
UI.PixmapCache.getIcon("editPaste"),
self.tr('&Paste'),
@@ -1023,7 +1023,7 @@
self.pasteAct.triggered.connect(self.__paste)
self.__actions.append(self.pasteAct)
- self.undoAct = E5Action(
+ self.undoAct = EricAction(
self.tr('Undo'),
UI.PixmapCache.getIcon("editUndo"),
self.tr('&Undo'),
@@ -1037,7 +1037,7 @@
self.undoAct.triggered.connect(self.__undo)
self.__actions.append(self.undoAct)
- self.redoAct = E5Action(
+ self.redoAct = EricAction(
self.tr('Redo'),
UI.PixmapCache.getIcon("editRedo"),
self.tr('&Redo'),
@@ -1051,7 +1051,7 @@
self.redoAct.triggered.connect(self.__redo)
self.__actions.append(self.redoAct)
- self.selectAllAct = E5Action(
+ self.selectAllAct = EricAction(
self.tr('Select All'),
UI.PixmapCache.getIcon("editSelectAll"),
self.tr('&Select All'),
@@ -1065,7 +1065,7 @@
self.selectAllAct.triggered.connect(self.__selectAll)
self.__actions.append(self.selectAllAct)
- self.unselectAct = E5Action(
+ self.unselectAct = EricAction(
self.tr('Unselect'),
self.tr('Unselect'),
QKeySequence(self.tr("Alt+Ctrl+A", "Edit|Unselect")),
@@ -1078,7 +1078,7 @@
self.unselectAct.triggered.connect(self.__unselect)
self.__actions.append(self.unselectAct)
- self.findAct = E5Action(
+ self.findAct = EricAction(
self.tr('Find...'),
UI.PixmapCache.getIcon("find"),
self.tr('&Find...'),
@@ -1092,7 +1092,7 @@
self.findAct.triggered.connect(self.__find)
self.__actions.append(self.findAct)
- self.findNextAct = E5Action(
+ self.findNextAct = EricAction(
self.tr('Find next'),
UI.PixmapCache.getIcon("findNext"),
self.tr('Find &next'),
@@ -1107,7 +1107,7 @@
self.findNextAct.triggered.connect(self.__searchWidget.findNext)
self.__actions.append(self.findNextAct)
- self.findPrevAct = E5Action(
+ self.findPrevAct = EricAction(
self.tr('Find previous'),
UI.PixmapCache.getIcon("findPrev"),
self.tr('Find &previous'),
@@ -1124,7 +1124,7 @@
self.__searchWidget.findPrevious)
self.__actions.append(self.findPrevAct)
- self.bookmarksManageAct = E5Action(
+ self.bookmarksManageAct = EricAction(
self.tr('Manage Bookmarks'),
self.tr('&Manage Bookmarks...'),
QKeySequence(self.tr("Ctrl+Shift+B", "Help|Manage bookmarks")),
@@ -1139,7 +1139,7 @@
self.__showBookmarksDialog)
self.__actions.append(self.bookmarksManageAct)
- self.bookmarksAddAct = E5Action(
+ self.bookmarksAddAct = EricAction(
self.tr('Add Bookmark'),
UI.PixmapCache.getIcon("addBookmark"),
self.tr('Add &Bookmark...'),
@@ -1155,7 +1155,7 @@
self.bookmarksAddAct.triggered.connect(self.__addBookmark)
self.__actions.append(self.bookmarksAddAct)
- self.bookmarksAddFolderAct = E5Action(
+ self.bookmarksAddFolderAct = EricAction(
self.tr('Add Folder'),
self.tr('Add &Folder...'),
0, 0, self, 'webbrowser_bookmark_show_all')
@@ -1169,7 +1169,7 @@
self.__addBookmarkFolder)
self.__actions.append(self.bookmarksAddFolderAct)
- self.bookmarksAllTabsAct = E5Action(
+ self.bookmarksAllTabsAct = EricAction(
self.tr('Bookmark All Tabs'),
self.tr('Bookmark All Tabs...'),
0, 0, self, 'webbrowser_bookmark_all_tabs')
@@ -1183,7 +1183,7 @@
self.bookmarksAllTabsAct.triggered.connect(self.bookmarkAll)
self.__actions.append(self.bookmarksAllTabsAct)
- self.whatsThisAct = E5Action(
+ self.whatsThisAct = EricAction(
self.tr('What\'s This?'),
UI.PixmapCache.getIcon("whatsThis"),
self.tr('&What\'s This?'),
@@ -1201,7 +1201,7 @@
self.whatsThisAct.triggered.connect(self.__whatsThis)
self.__actions.append(self.whatsThisAct)
- self.aboutAct = E5Action(
+ self.aboutAct = EricAction(
self.tr('About'),
self.tr('&About'),
0, 0, self, 'webbrowser_help_about')
@@ -1214,7 +1214,7 @@
self.aboutAct.triggered.connect(self.__about)
self.__actions.append(self.aboutAct)
- self.aboutQtAct = E5Action(
+ self.aboutQtAct = EricAction(
self.tr('About Qt'),
self.tr('About &Qt'),
0, 0, self, 'webbrowser_help_about_qt')
@@ -1227,7 +1227,7 @@
self.aboutQtAct.triggered.connect(self.__aboutQt)
self.__actions.append(self.aboutQtAct)
- self.zoomInAct = E5Action(
+ self.zoomInAct = EricAction(
self.tr('Zoom in'),
UI.PixmapCache.getIcon("zoomIn"),
self.tr('Zoom &in'),
@@ -1243,7 +1243,7 @@
self.zoomInAct.triggered.connect(self.__zoomIn)
self.__actions.append(self.zoomInAct)
- self.zoomOutAct = E5Action(
+ self.zoomOutAct = EricAction(
self.tr('Zoom out'),
UI.PixmapCache.getIcon("zoomOut"),
self.tr('Zoom &out'),
@@ -1259,7 +1259,7 @@
self.zoomOutAct.triggered.connect(self.__zoomOut)
self.__actions.append(self.zoomOutAct)
- self.zoomResetAct = E5Action(
+ self.zoomResetAct = EricAction(
self.tr('Zoom reset'),
UI.PixmapCache.getIcon("zoomReset"),
self.tr('Zoom &reset'),
@@ -1275,7 +1275,7 @@
self.zoomResetAct.triggered.connect(self.__zoomReset)
self.__actions.append(self.zoomResetAct)
- self.pageSourceAct = E5Action(
+ self.pageSourceAct = EricAction(
self.tr('Show page source'),
self.tr('Show page source'),
QKeySequence(self.tr('Ctrl+U')), 0,
@@ -1290,7 +1290,7 @@
self.__actions.append(self.pageSourceAct)
self.addAction(self.pageSourceAct)
- self.fullScreenAct = E5Action(
+ self.fullScreenAct = EricAction(
self.tr('Full Screen'),
UI.PixmapCache.getIcon("windowFullscreen"),
self.tr('&Full Screen'),
@@ -1305,7 +1305,7 @@
self.__actions.append(self.fullScreenAct)
self.addAction(self.fullScreenAct)
- self.nextTabAct = E5Action(
+ self.nextTabAct = EricAction(
self.tr('Show next tab'),
self.tr('Show next tab'),
QKeySequence(self.tr('Ctrl+Alt+Tab')), 0,
@@ -1314,7 +1314,7 @@
self.__actions.append(self.nextTabAct)
self.addAction(self.nextTabAct)
- self.prevTabAct = E5Action(
+ self.prevTabAct = EricAction(
self.tr('Show previous tab'),
self.tr('Show previous tab'),
QKeySequence(self.tr('Shift+Ctrl+Alt+Tab')), 0,
@@ -1323,7 +1323,7 @@
self.__actions.append(self.prevTabAct)
self.addAction(self.prevTabAct)
- self.switchTabAct = E5Action(
+ self.switchTabAct = EricAction(
self.tr('Switch between tabs'),
self.tr('Switch between tabs'),
QKeySequence(self.tr('Ctrl+1')), 0,
@@ -1332,7 +1332,7 @@
self.__actions.append(self.switchTabAct)
self.addAction(self.switchTabAct)
- self.prefAct = E5Action(
+ self.prefAct = EricAction(
self.tr('Preferences'),
UI.PixmapCache.getIcon("configure"),
self.tr('&Preferences...'), 0, 0, self, 'webbrowser_preferences')
@@ -1346,7 +1346,7 @@
self.prefAct.triggered.connect(self.__showPreferences)
self.__actions.append(self.prefAct)
- self.acceptedLanguagesAct = E5Action(
+ self.acceptedLanguagesAct = EricAction(
self.tr('Languages'),
UI.PixmapCache.getIcon("flag"),
self.tr('&Languages...'), 0, 0,
@@ -1361,7 +1361,7 @@
self.__showAcceptedLanguages)
self.__actions.append(self.acceptedLanguagesAct)
- self.cookiesAct = E5Action(
+ self.cookiesAct = EricAction(
self.tr('Cookies'),
UI.PixmapCache.getIcon("cookie"),
self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies')
@@ -1375,7 +1375,7 @@
self.__showCookiesConfiguration)
self.__actions.append(self.cookiesAct)
- self.personalDataAct = E5Action(
+ self.personalDataAct = EricAction(
self.tr('Personal Information'),
UI.PixmapCache.getIcon("pim"),
self.tr('Personal Information...'),
@@ -1392,7 +1392,7 @@
self.__showPersonalInformationDialog)
self.__actions.append(self.personalDataAct)
- self.greaseMonkeyAct = E5Action(
+ self.greaseMonkeyAct = EricAction(
self.tr('GreaseMonkey Scripts'),
UI.PixmapCache.getIcon("greaseMonkey"),
self.tr('GreaseMonkey Scripts...'),
@@ -1409,7 +1409,7 @@
self.__showGreaseMonkeyConfigDialog)
self.__actions.append(self.greaseMonkeyAct)
- self.editMessageFilterAct = E5Action(
+ self.editMessageFilterAct = EricAction(
self.tr('Edit Message Filters'),
UI.PixmapCache.getIcon("warning"),
self.tr('Edit Message Filters...'), 0, 0, self,
@@ -1423,10 +1423,10 @@
""" window.</p>"""
))
self.editMessageFilterAct.triggered.connect(
- E5ErrorMessage.editMessageFilters)
+ EricErrorMessage.editMessageFilters)
self.__actions.append(self.editMessageFilterAct)
- self.featurePermissionAct = E5Action(
+ self.featurePermissionAct = EricAction(
self.tr('Edit HTML5 Feature Permissions'),
UI.PixmapCache.getIcon("featurePermission"),
self.tr('Edit HTML5 Feature Permissions...'), 0, 0, self,
@@ -1443,7 +1443,7 @@
self.__actions.append(self.featurePermissionAct)
if WebBrowserWindow._useQtHelp:
- self.syncTocAct = E5Action(
+ self.syncTocAct = EricAction(
self.tr('Sync with Table of Contents'),
UI.PixmapCache.getIcon("syncToc"),
self.tr('Sync with Table of Contents'),
@@ -1458,7 +1458,7 @@
self.syncTocAct.triggered.connect(self.__syncTOC)
self.__actions.append(self.syncTocAct)
- self.showTocAct = E5Action(
+ self.showTocAct = EricAction(
self.tr('Table of Contents'),
self.tr('Table of Contents'),
0, 0, self, 'webbrowser_show_toc')
@@ -1471,7 +1471,7 @@
self.showTocAct.triggered.connect(self.__showTocWindow)
self.__actions.append(self.showTocAct)
- self.showIndexAct = E5Action(
+ self.showIndexAct = EricAction(
self.tr('Index'),
self.tr('Index'),
0, 0, self, 'webbrowser_show_index')
@@ -1484,7 +1484,7 @@
self.showIndexAct.triggered.connect(self.__showIndexWindow)
self.__actions.append(self.showIndexAct)
- self.showSearchAct = E5Action(
+ self.showSearchAct = EricAction(
self.tr('Search'),
self.tr('Search'),
0, 0, self, 'webbrowser_show_search')
@@ -1498,7 +1498,7 @@
self.__showSearchWindow)
self.__actions.append(self.showSearchAct)
- self.manageQtHelpDocsAct = E5Action(
+ self.manageQtHelpDocsAct = EricAction(
self.tr('Manage QtHelp Documents'),
self.tr('Manage QtHelp &Documents'),
0, 0, self, 'webbrowser_qthelp_documents')
@@ -1513,7 +1513,7 @@
self.__manageQtHelpDocumentation)
self.__actions.append(self.manageQtHelpDocsAct)
- self.reindexDocumentationAct = E5Action(
+ self.reindexDocumentationAct = EricAction(
self.tr('Reindex Documentation'),
self.tr('&Reindex Documentation'),
0, 0, self, 'webbrowser_qthelp_reindex')
@@ -1527,7 +1527,7 @@
self.__searchEngine.reindexDocumentation)
self.__actions.append(self.reindexDocumentationAct)
- self.clearPrivateDataAct = E5Action(
+ self.clearPrivateDataAct = EricAction(
self.tr('Clear private data'),
UI.PixmapCache.getIcon("clearPrivateData"),
self.tr('Clear private data'),
@@ -1544,7 +1544,7 @@
self.__clearPrivateData)
self.__actions.append(self.clearPrivateDataAct)
- self.clearIconsAct = E5Action(
+ self.clearIconsAct = EricAction(
self.tr('Clear icons database'),
self.tr('Clear &icons database'),
0, 0,
@@ -1559,7 +1559,7 @@
self.clearIconsAct.triggered.connect(self.__clearIconsDatabase)
self.__actions.append(self.clearIconsAct)
- self.manageIconsAct = E5Action(
+ self.manageIconsAct = EricAction(
self.tr('Manage saved Favicons'),
UI.PixmapCache.getIcon("icons"),
self.tr('Manage saved Favicons'),
@@ -1575,7 +1575,7 @@
self.manageIconsAct.triggered.connect(self.__showWebIconsDialog)
self.__actions.append(self.manageIconsAct)
- self.searchEnginesAct = E5Action(
+ self.searchEnginesAct = EricAction(
self.tr('Configure Search Engines'),
self.tr('Configure Search &Engines...'),
0, 0,
@@ -1591,7 +1591,7 @@
self.__showEnginesConfigurationDialog)
self.__actions.append(self.searchEnginesAct)
- self.passwordsAct = E5Action(
+ self.passwordsAct = EricAction(
self.tr('Manage Saved Passwords'),
UI.PixmapCache.getIcon("passwords"),
self.tr('Manage Saved Passwords...'),
@@ -1606,7 +1606,7 @@
self.passwordsAct.triggered.connect(self.__showPasswordsDialog)
self.__actions.append(self.passwordsAct)
- self.adblockAct = E5Action(
+ self.adblockAct = EricAction(
self.tr('Ad Block'),
UI.PixmapCache.getIcon("adBlockPlus"),
self.tr('&Ad Block...'),
@@ -1622,7 +1622,7 @@
self.adblockAct.triggered.connect(self.__showAdBlockDialog)
self.__actions.append(self.adblockAct)
- self.certificateErrorsAct = E5Action(
+ self.certificateErrorsAct = EricAction(
self.tr('Manage SSL Certificate Errors'),
UI.PixmapCache.getIcon("certificates"),
self.tr('Manage SSL Certificate Errors...'),
@@ -1639,7 +1639,7 @@
self.__showCertificateErrorsDialog)
self.__actions.append(self.certificateErrorsAct)
- self.safeBrowsingAct = E5Action(
+ self.safeBrowsingAct = EricAction(
self.tr('Manage Safe Browsing'),
UI.PixmapCache.getIcon("safeBrowsing"),
self.tr('Manage Safe Browsing...'), 0, 0, self,
@@ -1655,7 +1655,7 @@
self.__showSafeBrowsingDialog)
self.__actions.append(self.safeBrowsingAct)
- self.showDownloadManagerAct = E5Action(
+ self.showDownloadManagerAct = EricAction(
self.tr('Downloads'),
self.tr('Downloads'),
0, 0, self, 'webbrowser_show_downloads')
@@ -1669,7 +1669,7 @@
self.__showDownloadsWindow)
self.__actions.append(self.showDownloadManagerAct)
- self.feedsManagerAct = E5Action(
+ self.feedsManagerAct = EricAction(
self.tr('RSS Feeds Dialog'),
UI.PixmapCache.getIcon("rss22"),
self.tr('&RSS Feeds Dialog...'),
@@ -1686,7 +1686,7 @@
self.feedsManagerAct.triggered.connect(self.__showFeedsManager)
self.__actions.append(self.feedsManagerAct)
- self.siteInfoAct = E5Action(
+ self.siteInfoAct = EricAction(
self.tr('Siteinfo Dialog'),
UI.PixmapCache.getIcon("helpAbout"),
self.tr('&Siteinfo Dialog...'),
@@ -1702,7 +1702,7 @@
self.siteInfoAct.triggered.connect(self.__showSiteinfoDialog)
self.__actions.append(self.siteInfoAct)
- self.userAgentManagerAct = E5Action(
+ self.userAgentManagerAct = EricAction(
self.tr('Manage User Agent Settings'),
self.tr('Manage &User Agent Settings'),
0, 0, self, 'webbrowser_user_agent_settings')
@@ -1716,7 +1716,7 @@
self.__showUserAgentsDialog)
self.__actions.append(self.userAgentManagerAct)
- self.synchronizationAct = E5Action(
+ self.synchronizationAct = EricAction(
self.tr('Synchronize data'),
UI.PixmapCache.getIcon("sync"),
self.tr('&Synchronize Data...'),
@@ -1732,7 +1732,7 @@
self.__showSyncDialog)
self.__actions.append(self.synchronizationAct)
- self.zoomValuesAct = E5Action(
+ self.zoomValuesAct = EricAction(
self.tr('Manage Saved Zoom Values'),
UI.PixmapCache.getIcon("zoomReset"),
self.tr('Manage Saved Zoom Values...'),
@@ -1747,7 +1747,7 @@
self.zoomValuesAct.triggered.connect(self.__showZoomValuesDialog)
self.__actions.append(self.zoomValuesAct)
- self.showJavaScriptConsoleAct = E5Action(
+ self.showJavaScriptConsoleAct = EricAction(
self.tr('JavaScript Console'),
self.tr('JavaScript Console'),
0, 0, self, 'webbrowser_show_javascript_console')
@@ -1761,7 +1761,7 @@
self.__toggleJavaScriptConsole)
self.__actions.append(self.showJavaScriptConsoleAct)
- self.showTabManagerAct = E5Action(
+ self.showTabManagerAct = EricAction(
self.tr('Tab Manager'),
self.tr('Tab Manager'),
0, 0, self, 'webbrowser_show_tab_manager')
@@ -1775,7 +1775,7 @@
lambda: self.__showTabManager(self.showTabManagerAct))
self.__actions.append(self.showTabManagerAct)
- self.showSessionsManagerAct = E5Action(
+ self.showSessionsManagerAct = EricAction(
self.tr('Session Manager'),
self.tr('Session Manager...'),
0, 0, self, 'webbrowser_show_session_manager')
@@ -1789,7 +1789,7 @@
self.__showSessionManagerDialog)
self.__actions.append(self.showSessionsManagerAct)
- self.virustotalScanCurrentAct = E5Action(
+ self.virustotalScanCurrentAct = EricAction(
self.tr("Scan current site"),
UI.PixmapCache.getIcon("virustotal"),
self.tr("Scan current site"),
@@ -1799,7 +1799,7 @@
self.__virusTotalScanCurrentSite)
self.__actions.append(self.virustotalScanCurrentAct)
- self.virustotalIpReportAct = E5Action(
+ self.virustotalIpReportAct = EricAction(
self.tr("IP Address Report"),
UI.PixmapCache.getIcon("virustotal"),
self.tr("IP Address Report"),
@@ -1809,7 +1809,7 @@
self.__virusTotalIpAddressReport)
self.__actions.append(self.virustotalIpReportAct)
- self.virustotalDomainReportAct = E5Action(
+ self.virustotalDomainReportAct = EricAction(
self.tr("Domain Report"),
UI.PixmapCache.getIcon("virustotal"),
self.tr("Domain Report"),
@@ -1827,7 +1827,7 @@
self.virustotalIpReportAct.setEnabled(False)
self.virustotalDomainReportAct.setEnabled(False)
- self.shortcutsAct = E5Action(
+ self.shortcutsAct = EricAction(
self.tr('Keyboard Shortcuts'),
UI.PixmapCache.getIcon("configureShortcuts"),
self.tr('Keyboard &Shortcuts...'),
@@ -1843,7 +1843,7 @@
self.shortcutsAct.triggered.connect(self.__configShortcuts)
self.__actions.append(self.shortcutsAct)
- self.exportShortcutsAct = E5Action(
+ self.exportShortcutsAct = EricAction(
self.tr('Export Keyboard Shortcuts'),
UI.PixmapCache.getIcon("exportShortcuts"),
self.tr('&Export Keyboard Shortcuts...'),
@@ -1857,7 +1857,7 @@
self.exportShortcutsAct.triggered.connect(self.__exportShortcuts)
self.__actions.append(self.exportShortcutsAct)
- self.importShortcutsAct = E5Action(
+ self.importShortcutsAct = EricAction(
self.tr('Import Keyboard Shortcuts'),
UI.PixmapCache.getIcon("importShortcuts"),
self.tr('&Import Keyboard Shortcuts...'),
@@ -1871,7 +1871,7 @@
self.importShortcutsAct.triggered.connect(self.__importShortcuts)
self.__actions.append(self.importShortcutsAct)
- self.showProtocolHandlerManagerAct = E5Action(
+ self.showProtocolHandlerManagerAct = EricAction(
self.tr('Protocol Handler Manager'),
self.tr('Protocol Handler Manager...'),
0, 0, self, 'webbrowser_show_protocol_handler_manager')
@@ -1895,7 +1895,7 @@
"""
Public method to get a list of all actions.
- @return list of all actions (list of E5Action)
+ @return list of all actions (list of EricAction)
"""
return self.__actions[:]
@@ -2474,7 +2474,7 @@
not os.path.isfile(applPath) or
not QProcess.startDetached(sys.executable, args)
):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('New Private Window'),
self.tr(
@@ -2487,7 +2487,7 @@
"""
Private slot called to open a file.
"""
- fn = E5FileDialog.getOpenFileName(
+ fn = EricFileDialog.getOpenFileName(
self,
self.tr("Open File"),
"",
@@ -2507,7 +2507,7 @@
"""
Private slot called to open a file in a new tab.
"""
- fn = E5FileDialog.getOpenFileName(
+ fn = EricFileDialog.getOpenFileName(
self,
self.tr("Open File"),
"",
@@ -2548,7 +2548,7 @@
chromeVersion, webengineVersion = (
WebBrowserTools.getWebEngineVersions()
)
- E5MessageBox.about(
+ EricMessageBox.about(
self,
self.tr("eric Web Browser"),
self.tr(
@@ -2563,7 +2563,7 @@
"""
Private slot to show info about Qt.
"""
- E5MessageBox.aboutQt(self, self.tr("eric Web Browser"))
+ EricMessageBox.aboutQt(self, self.tr("eric Web Browser"))
def setBackwardAvailable(self, b):
"""
@@ -2849,8 +2849,8 @@
tabCount += browser.tabWidget().count()
if windowCount > 1 or tabCount > 1:
- mb = E5MessageBox.E5MessageBox(
- E5MessageBox.Information,
+ mb = EricMessageBox.EricMessageBox(
+ EricMessageBox.Information,
self.tr("Are you sure you want to close the web browser?"),
self.tr("""Are you sure you want to close the web"""
""" browser?\n"""
@@ -2859,9 +2859,9 @@
modal=True,
parent=self)
quitButton = mb.addButton(
- self.tr("&Quit"), E5MessageBox.AcceptRole)
+ self.tr("&Quit"), EricMessageBox.AcceptRole)
quitButton.setIcon(UI.PixmapCache.getIcon("exit"))
- mb.addButton(E5MessageBox.Cancel)
+ mb.addButton(EricMessageBox.Cancel)
mb.exec()
return mb.clickedButton() == quitButton
@@ -3393,7 +3393,7 @@
Private slot to synchronize the TOC with the currently shown page.
"""
if WebBrowserWindow._useQtHelp:
- with E5OverrideCursor():
+ with EricOverrideCursor():
url = self.currentBrowser().source()
self.__showTocWindow()
if not self.__tocWindow.syncToContent(url):
@@ -3575,7 +3575,7 @@
@param message message to be shown (string)
"""
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("eric Web Browser"),
message)
@@ -3612,7 +3612,7 @@
@param msg message sent by the help engine (string)
"""
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Help Engine"), msg)
@@ -3621,7 +3621,7 @@
Private slot to show the Settings menu.
"""
self.editMessageFilterAct.setEnabled(
- E5ErrorMessage.messageHandlerInstalled())
+ EricErrorMessage.messageHandlerInstalled())
def __clearPrivateData(self):
"""
@@ -4042,7 +4042,7 @@
"""
Private slot to handle a change of the focus.
"""
- focusWindow = e5App().activeWindow()
+ focusWindow = ericApp().activeWindow()
if isinstance(focusWindow, WebBrowserWindow):
WebBrowserWindow._lastActiveWindow = focusWindow
@@ -4583,7 +4583,7 @@
@param msg error message (str)
"""
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("VirusTotal Scan"),
self.tr("""<p>The VirusTotal scan could not be"""
@@ -4618,7 +4618,7 @@
if ip.count(".") == 3:
self.__virusTotal.getIpAddressReport(ip)
else:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("IP Address Report"),
self.tr("""The given IP address is not in dotted quad"""
@@ -4979,13 +4979,13 @@
"""
Private slot to export the keyboard shortcuts.
"""
- fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
None,
self.tr("Export Keyboard Shortcuts"),
"",
self.tr("Keyboard Shortcuts File (*.ekj)"),
"",
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fn:
return
@@ -4997,7 +4997,7 @@
fn += ex
ok = (
- E5MessageBox.yesNo(
+ EricMessageBox.yesNo(
self,
self.tr("Export Keyboard Shortcuts"),
self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists"""
@@ -5014,7 +5014,7 @@
"""
Private slot to import the keyboard shortcuts.
"""
- fn = E5FileDialog.getOpenFileName(
+ fn = EricFileDialog.getOpenFileName(
None,
self.tr("Import Keyboard Shortcuts"),
"",
