diff -r 1358e9d67a1c -r 88261c96484b eric6/WebBrowser/WebBrowserWindow.py --- a/eric6/WebBrowser/WebBrowserWindow.py Sun Apr 12 18:46:08 2020 +0200 +++ b/eric6/WebBrowser/WebBrowserWindow.py Sun Apr 12 19:07:49 2020 +0200 @@ -155,7 +155,7 @@ self.setWindowTitle(self.tr("eric6 Web Browser")) self.__settingsDir = settingsDir - self.setWindowIcon(UI.PixmapCache.getIcon("ericWeb.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("ericWeb")) self.__mHistory = [] self.__lastConfigurationPageName = "" @@ -215,9 +215,9 @@ self.__helpInstaller = None self.__zoomWidget = E5ZoomWidget( - UI.PixmapCache.getPixmap("zoomOut.png"), - UI.PixmapCache.getPixmap("zoomIn.png"), - UI.PixmapCache.getPixmap("zoomReset.png"), self) + UI.PixmapCache.getPixmap("zoomOut"), + UI.PixmapCache.getPixmap("zoomIn"), + UI.PixmapCache.getPixmap("zoomReset"), self) self.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( WebBrowserView.ZoomLevels, WebBrowserView.ZoomLevelDefault) @@ -708,7 +708,7 @@ self.newTabAct = E5Action( self.tr('New Tab'), - UI.PixmapCache.getIcon("tabNew.png"), + UI.PixmapCache.getIcon("tabNew"), self.tr('&New Tab'), QKeySequence(self.tr("Ctrl+T", "File|New Tab")), 0, self, 'webbrowser_file_new_tab') @@ -722,7 +722,7 @@ self.newAct = E5Action( self.tr('New Window'), - UI.PixmapCache.getIcon("newWindow.png"), + UI.PixmapCache.getIcon("newWindow"), self.tr('New &Window'), QKeySequence(self.tr("Ctrl+N", "File|New Window")), 0, self, 'webbrowser_file_new_window') @@ -737,7 +737,7 @@ self.newPrivateAct = E5Action( self.tr('New Private Window'), - UI.PixmapCache.getIcon("privateMode.png"), + UI.PixmapCache.getIcon("privateMode"), self.tr('New &Private Window'), QKeySequence(self.tr("Ctrl+Shift+P", "File|New Private Window")), 0, self, 'webbrowser_file_new_private_window') @@ -753,7 +753,7 @@ self.openAct = E5Action( self.tr('Open File'), - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr('&Open File'), QKeySequence(self.tr("Ctrl+O", "File|Open")), 0, self, 'webbrowser_file_open') @@ -768,7 +768,7 @@ self.openTabAct = E5Action( self.tr('Open File in New Tab'), - UI.PixmapCache.getIcon("openNewTab.png"), + UI.PixmapCache.getIcon("openNewTab"), self.tr('Open File in New &Tab'), QKeySequence(self.tr("Shift+Ctrl+O", "File|Open in new tab")), 0, self, 'webbrowser_file_open_tab') @@ -785,7 +785,7 @@ if hasattr(QWebEnginePage, "SavePage"): self.saveAsAct = E5Action( self.tr('Save As'), - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr('&Save As...'), QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")), 0, self, 'webbrowser_file_save_as') @@ -802,7 +802,7 @@ self.saveVisiblePageScreenAct = E5Action( self.tr('Save Page Screen'), - UI.PixmapCache.getIcon("fileSavePixmap.png"), + UI.PixmapCache.getIcon("fileSavePixmap"), self.tr('Save Page Screen...'), 0, 0, self, 'webbrowser_file_save_visible_page_screen') self.saveVisiblePageScreenAct.setStatusTip( @@ -848,7 +848,7 @@ self.printAct = E5Action( self.tr('Print'), - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr('&Print'), QKeySequence(self.tr("Ctrl+P", "File|Print")), 0, self, 'webbrowser_file_print') @@ -862,7 +862,7 @@ self.printPdfAct = E5Action( self.tr('Print as PDF'), - UI.PixmapCache.getIcon("printPdf.png"), + UI.PixmapCache.getIcon("printPdf"), self.tr('Print as PDF'), 0, 0, self, 'webbrowser_file_print_pdf') self.printPdfAct.setStatusTip(self.tr( @@ -877,7 +877,7 @@ self.printPreviewAct = E5Action( self.tr('Print Preview'), - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr('Print Preview'), 0, 0, self, 'webbrowser_file_print_preview') self.printPreviewAct.setStatusTip(self.tr( @@ -892,7 +892,7 @@ self.sendPageLinkAct = E5Action( self.tr('Send Page Link'), - UI.PixmapCache.getIcon("mailSend.png"), + UI.PixmapCache.getIcon("mailSend"), self.tr('Send Page Link'), 0, 0, self, 'webbrowser_send_page_link') self.sendPageLinkAct.setStatusTip(self.tr( @@ -906,7 +906,7 @@ self.closeAct = E5Action( self.tr('Close'), - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr('&Close'), QKeySequence(self.tr("Ctrl+W", "File|Close")), 0, self, 'webbrowser_file_close') @@ -934,7 +934,7 @@ self.exitAct = E5Action( self.tr('Quit'), - UI.PixmapCache.getIcon("exit.png"), + UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), QKeySequence(self.tr("Ctrl+Q", "File|Quit")), 0, self, 'webbrowser_file_quit') @@ -948,7 +948,7 @@ self.backAct = E5Action( self.tr('Backward'), - UI.PixmapCache.getIcon("back.png"), + UI.PixmapCache.getIcon("back"), self.tr('&Backward'), QKeySequence(self.tr("Alt+Left", "Go|Backward")), 0, self, 'webbrowser_go_backward') @@ -963,7 +963,7 @@ self.forwardAct = E5Action( self.tr('Forward'), - UI.PixmapCache.getIcon("forward.png"), + UI.PixmapCache.getIcon("forward"), self.tr('&Forward'), QKeySequence(self.tr("Alt+Right", "Go|Forward")), 0, self, 'webbrowser_go_foreward') @@ -979,7 +979,7 @@ self.homeAct = E5Action( self.tr('Home'), - UI.PixmapCache.getIcon("home.png"), + UI.PixmapCache.getIcon("home"), self.tr('&Home'), QKeySequence(self.tr("Ctrl+Home", "Go|Home")), 0, self, 'webbrowser_go_home') @@ -994,7 +994,7 @@ self.reloadAct = E5Action( self.tr('Reload'), - UI.PixmapCache.getIcon("reload.png"), + UI.PixmapCache.getIcon("reload"), self.tr('&Reload'), QKeySequence(self.tr("Ctrl+R", "Go|Reload")), QKeySequence(self.tr("F5", "Go|Reload")), @@ -1010,7 +1010,7 @@ self.stopAct = E5Action( self.tr('Stop'), - UI.PixmapCache.getIcon("stopLoading.png"), + UI.PixmapCache.getIcon("stopLoading"), self.tr('&Stop'), QKeySequence(self.tr("Ctrl+.", "Go|Stop")), QKeySequence(self.tr("Esc", "Go|Stop")), @@ -1025,7 +1025,7 @@ self.copyAct = E5Action( self.tr('Copy'), - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr('&Copy'), QKeySequence(self.tr("Ctrl+C", "Edit|Copy")), 0, self, 'webbrowser_edit_copy') @@ -1039,7 +1039,7 @@ self.cutAct = E5Action( self.tr('Cut'), - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr('Cu&t'), QKeySequence(self.tr("Ctrl+X", "Edit|Cut")), 0, self, 'webbrowser_edit_cut') @@ -1053,7 +1053,7 @@ self.pasteAct = E5Action( self.tr('Paste'), - UI.PixmapCache.getIcon("editPaste.png"), + UI.PixmapCache.getIcon("editPaste"), self.tr('&Paste'), QKeySequence(self.tr("Ctrl+V", "Edit|Paste")), 0, self, 'webbrowser_edit_paste') @@ -1067,7 +1067,7 @@ self.undoAct = E5Action( self.tr('Undo'), - UI.PixmapCache.getIcon("editUndo.png"), + UI.PixmapCache.getIcon("editUndo"), self.tr('&Undo'), QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")), 0, self, 'webbrowser_edit_undo') @@ -1081,7 +1081,7 @@ self.redoAct = E5Action( self.tr('Redo'), - UI.PixmapCache.getIcon("editRedo.png"), + UI.PixmapCache.getIcon("editRedo"), self.tr('&Redo'), QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")), 0, self, 'webbrowser_edit_redo') @@ -1095,7 +1095,7 @@ self.selectAllAct = E5Action( self.tr('Select All'), - UI.PixmapCache.getIcon("editSelectAll.png"), + UI.PixmapCache.getIcon("editSelectAll"), self.tr('&Select All'), QKeySequence(self.tr("Ctrl+A", "Edit|Select All")), 0, self, 'webbrowser_edit_select_all') @@ -1122,7 +1122,7 @@ self.findAct = E5Action( self.tr('Find...'), - UI.PixmapCache.getIcon("find.png"), + UI.PixmapCache.getIcon("find"), self.tr('&Find...'), QKeySequence(self.tr("Ctrl+F", "Edit|Find")), 0, self, 'webbrowser_edit_find') @@ -1136,7 +1136,7 @@ self.findNextAct = E5Action( self.tr('Find next'), - UI.PixmapCache.getIcon("findNext.png"), + UI.PixmapCache.getIcon("findNext"), self.tr('Find &next'), QKeySequence(self.tr("F3", "Edit|Find next")), 0, self, 'webbrowser_edit_find_next') @@ -1151,7 +1151,7 @@ self.findPrevAct = E5Action( self.tr('Find previous'), - UI.PixmapCache.getIcon("findPrev.png"), + UI.PixmapCache.getIcon("findPrev"), self.tr('Find &previous'), QKeySequence(self.tr("Shift+F3", "Edit|Find previous")), 0, self, 'webbrowser_edit_find_previous') @@ -1183,7 +1183,7 @@ self.bookmarksAddAct = E5Action( self.tr('Add Bookmark'), - UI.PixmapCache.getIcon("addBookmark.png"), + UI.PixmapCache.getIcon("addBookmark"), self.tr('Add &Bookmark...'), QKeySequence(self.tr("Ctrl+D", "Help|Add bookmark")), 0, self, 'webbrowser_bookmark_add') @@ -1227,7 +1227,7 @@ self.whatsThisAct = E5Action( self.tr('What\'s This?'), - UI.PixmapCache.getIcon("whatsThis.png"), + UI.PixmapCache.getIcon("whatsThis"), self.tr('&What\'s This?'), QKeySequence(self.tr("Shift+F1", "Help|What's This?'")), 0, self, 'webbrowser_help_whats_this') @@ -1271,7 +1271,7 @@ self.zoomInAct = E5Action( self.tr('Zoom in'), - UI.PixmapCache.getIcon("zoomIn.png"), + UI.PixmapCache.getIcon("zoomIn"), self.tr('Zoom &in'), QKeySequence(self.tr("Ctrl++", "View|Zoom in")), QKeySequence(self.tr("Zoom In", "View|Zoom in")), @@ -1287,7 +1287,7 @@ self.zoomOutAct = E5Action( self.tr('Zoom out'), - UI.PixmapCache.getIcon("zoomOut.png"), + UI.PixmapCache.getIcon("zoomOut"), self.tr('Zoom &out'), QKeySequence(self.tr("Ctrl+-", "View|Zoom out")), QKeySequence(self.tr("Zoom Out", "View|Zoom out")), @@ -1303,7 +1303,7 @@ self.zoomResetAct = E5Action( self.tr('Zoom reset'), - UI.PixmapCache.getIcon("zoomReset.png"), + UI.PixmapCache.getIcon("zoomReset"), self.tr('Zoom &reset'), QKeySequence(self.tr("Ctrl+0", "View|Zoom reset")), 0, self, 'webbrowser_view_zoom_reset') @@ -1334,7 +1334,7 @@ self.fullScreenAct = E5Action( self.tr('Full Screen'), - UI.PixmapCache.getIcon("windowFullscreen.png"), + UI.PixmapCache.getIcon("windowFullscreen"), self.tr('&Full Screen'), 0, 0, self, 'webbrowser_view_full_screen') @@ -1376,7 +1376,7 @@ self.prefAct = E5Action( self.tr('Preferences'), - UI.PixmapCache.getIcon("configure.png"), + UI.PixmapCache.getIcon("configure"), self.tr('&Preferences...'), 0, 0, self, 'webbrowser_preferences') self.prefAct.setStatusTip(self.tr( 'Set the prefered configuration')) @@ -1390,7 +1390,7 @@ self.acceptedLanguagesAct = E5Action( self.tr('Languages'), - UI.PixmapCache.getIcon("flag.png"), + UI.PixmapCache.getIcon("flag"), self.tr('&Languages...'), 0, 0, self, 'webbrowser_accepted_languages') self.acceptedLanguagesAct.setStatusTip(self.tr( @@ -1405,7 +1405,7 @@ self.cookiesAct = E5Action( self.tr('Cookies'), - UI.PixmapCache.getIcon("cookie.png"), + UI.PixmapCache.getIcon("cookie"), self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies') self.cookiesAct.setStatusTip(self.tr( 'Configure cookies handling')) @@ -1419,7 +1419,7 @@ self.flashCookiesAct = E5Action( self.tr('Flash Cookies'), - UI.PixmapCache.getIcon("flashCookie.png"), + UI.PixmapCache.getIcon("flashCookie"), self.tr('&Flash Cookies...'), 0, 0, self, 'webbrowser_flash_cookies') self.flashCookiesAct.setStatusTip(self.tr( @@ -1434,7 +1434,7 @@ self.personalDataAct = E5Action( self.tr('Personal Information'), - UI.PixmapCache.getIcon("pim.png"), + UI.PixmapCache.getIcon("pim"), self.tr('Personal Information...'), 0, 0, self, 'webbrowser_personal_information') @@ -1451,7 +1451,7 @@ self.greaseMonkeyAct = E5Action( self.tr('GreaseMonkey Scripts'), - UI.PixmapCache.getIcon("greaseMonkey.png"), + UI.PixmapCache.getIcon("greaseMonkey"), self.tr('GreaseMonkey Scripts...'), 0, 0, self, 'webbrowser_greasemonkey') @@ -1468,7 +1468,7 @@ self.editMessageFilterAct = E5Action( self.tr('Edit Message Filters'), - UI.PixmapCache.getIcon("warning.png"), + UI.PixmapCache.getIcon("warning"), self.tr('Edit Message Filters...'), 0, 0, self, 'webbrowser_manage_message_filters') self.editMessageFilterAct.setStatusTip(self.tr( @@ -1485,7 +1485,7 @@ self.featurePermissionAct = E5Action( self.tr('Edit HTML5 Feature Permissions'), - UI.PixmapCache.getIcon("featurePermission.png"), + UI.PixmapCache.getIcon("featurePermission"), self.tr('Edit HTML5 Feature Permissions...'), 0, 0, self, 'webbrowser_edit_feature_permissions') self.featurePermissionAct.setStatusTip(self.tr( @@ -1502,7 +1502,7 @@ if WebBrowserWindow._useQtHelp: self.syncTocAct = E5Action( self.tr('Sync with Table of Contents'), - UI.PixmapCache.getIcon("syncToc.png"), + UI.PixmapCache.getIcon("syncToc"), self.tr('Sync with Table of Contents'), 0, 0, self, 'webbrowser_sync_toc') self.syncTocAct.setStatusTip(self.tr( @@ -1586,7 +1586,7 @@ self.clearPrivateDataAct = E5Action( self.tr('Clear private data'), - UI.PixmapCache.getIcon("clearPrivateData.png"), + UI.PixmapCache.getIcon("clearPrivateData"), self.tr('Clear private data'), 0, 0, self, 'webbrowser_clear_private_data') @@ -1618,7 +1618,7 @@ self.manageIconsAct = E5Action( self.tr('Manage saved Favicons'), - UI.PixmapCache.getIcon("icons.png"), + UI.PixmapCache.getIcon("icons"), self.tr('Manage saved Favicons'), 0, 0, self, 'webbrowser_manage_icons_db') @@ -1650,7 +1650,7 @@ self.passwordsAct = E5Action( self.tr('Manage Saved Passwords'), - UI.PixmapCache.getIcon("passwords.png"), + UI.PixmapCache.getIcon("passwords"), self.tr('Manage Saved Passwords...'), 0, 0, self, 'webbrowser_manage_passwords') @@ -1665,7 +1665,7 @@ self.adblockAct = E5Action( self.tr('Ad Block'), - UI.PixmapCache.getIcon("adBlockPlus.png"), + UI.PixmapCache.getIcon("adBlockPlus"), self.tr('&Ad Block...'), 0, 0, self, 'webbrowser_adblock') @@ -1681,7 +1681,7 @@ self.certificateErrorsAct = E5Action( self.tr('Manage SSL Certificate Errors'), - UI.PixmapCache.getIcon("certificates.png"), + UI.PixmapCache.getIcon("certificates"), self.tr('Manage SSL Certificate Errors...'), 0, 0, self, 'webbrowser_manage_certificate_errors') @@ -1698,7 +1698,7 @@ self.safeBrowsingAct = E5Action( self.tr('Manage Safe Browsing'), - UI.PixmapCache.getIcon("safeBrowsing.png"), + UI.PixmapCache.getIcon("safeBrowsing"), self.tr('Manage Safe Browsing...'), 0, 0, self, 'webbrowser_manage_safe_browsing') self.safeBrowsingAct.setStatusTip(self.tr( @@ -1728,7 +1728,7 @@ self.feedsManagerAct = E5Action( self.tr('RSS Feeds Dialog'), - UI.PixmapCache.getIcon("rss22.png"), + UI.PixmapCache.getIcon("rss22"), self.tr('&RSS Feeds Dialog...'), QKeySequence(self.tr("Ctrl+Shift+F", "Help|RSS Feeds Dialog")), 0, self, 'webbrowser_rss_feeds') @@ -1745,7 +1745,7 @@ self.siteInfoAct = E5Action( self.tr('Siteinfo Dialog'), - UI.PixmapCache.getIcon("helpAbout.png"), + UI.PixmapCache.getIcon("helpAbout"), self.tr('&Siteinfo Dialog...'), QKeySequence(self.tr("Ctrl+Shift+I", "Help|Siteinfo Dialog")), 0, self, 'webbrowser_siteinfo') @@ -1775,7 +1775,7 @@ self.synchronizationAct = E5Action( self.tr('Synchronize data'), - UI.PixmapCache.getIcon("sync.png"), + UI.PixmapCache.getIcon("sync"), self.tr('&Synchronize Data...'), 0, 0, self, 'webbrowser_synchronize_data') self.synchronizationAct.setStatusTip(self.tr( @@ -1791,7 +1791,7 @@ self.zoomValuesAct = E5Action( self.tr('Manage Saved Zoom Values'), - UI.PixmapCache.getIcon("zoomReset.png"), + UI.PixmapCache.getIcon("zoomReset"), self.tr('Manage Saved Zoom Values...'), 0, 0, self, 'webbrowser_manage_zoom_values') @@ -1848,7 +1848,7 @@ self.virustotalScanCurrentAct = E5Action( self.tr("Scan current site"), - UI.PixmapCache.getIcon("virustotal.png"), + UI.PixmapCache.getIcon("virustotal"), self.tr("Scan current site"), 0, 0, self, 'webbrowser_virustotal_scan_site') @@ -1858,7 +1858,7 @@ self.virustotalIpReportAct = E5Action( self.tr("IP Address Report"), - UI.PixmapCache.getIcon("virustotal.png"), + UI.PixmapCache.getIcon("virustotal"), self.tr("IP Address Report"), 0, 0, self, 'webbrowser_virustotal_ip_report') @@ -1868,7 +1868,7 @@ self.virustotalDomainReportAct = E5Action( self.tr("Domain Report"), - UI.PixmapCache.getIcon("virustotal.png"), + UI.PixmapCache.getIcon("virustotal"), self.tr("Domain Report"), 0, 0, self, 'webbrowser_virustotal_domain_report') @@ -1886,7 +1886,7 @@ self.shortcutsAct = E5Action( self.tr('Keyboard Shortcuts'), - UI.PixmapCache.getIcon("configureShortcuts.png"), + UI.PixmapCache.getIcon("configureShortcuts"), self.tr('Keyboard &Shortcuts...'), 0, 0, self, 'webbrowser_keyboard_shortcuts') @@ -1902,7 +1902,7 @@ self.exportShortcutsAct = E5Action( self.tr('Export Keyboard Shortcuts'), - UI.PixmapCache.getIcon("exportShortcuts.png"), + UI.PixmapCache.getIcon("exportShortcuts"), self.tr('&Export Keyboard Shortcuts...'), 0, 0, self, 'export_keyboard_shortcuts') self.exportShortcutsAct.setStatusTip(self.tr( @@ -1916,7 +1916,7 @@ self.importShortcutsAct = E5Action( self.tr('Import Keyboard Shortcuts'), - UI.PixmapCache.getIcon("importShortcuts.png"), + UI.PixmapCache.getIcon("importShortcuts"), self.tr('&Import Keyboard Shortcuts...'), 0, 0, self, 'import_keyboard_shortcuts') self.importShortcutsAct.setStatusTip(self.tr( @@ -2126,7 +2126,7 @@ menu.addSeparator() menu.addAction(self.synchronizationAct) menu.addSeparator() - vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal.png"), + vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal"), self.tr("&VirusTotal")) vtMenu.addAction(self.virustotalScanCurrentAct) vtMenu.addAction(self.virustotalIpReportAct) @@ -2197,7 +2197,7 @@ self.__superMenu.addAction(self.selectAllAct) self.__superMenu.addAction(self.findAct) self.__superMenu.addSeparator() - act = self.__superMenu.addAction(UI.PixmapCache.getIcon("history.png"), + act = self.__superMenu.addAction(UI.PixmapCache.getIcon("history"), self.tr("Show All History...")) act.triggered.connect(self.historyMenu.showHistoryDialog) self.__superMenu.addAction(self.bookmarksManageAct) @@ -2281,7 +2281,7 @@ menu.addSeparator() menu.addAction(self.synchronizationAct) menu.addSeparator() - vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal.png"), + vtMenu = menu.addMenu(UI.PixmapCache.getIcon("virustotal"), self.tr("&VirusTotal")) vtMenu.addAction(self.virustotalScanCurrentAct) vtMenu.addAction(self.virustotalIpReportAct) @@ -2920,7 +2920,7 @@ parent=self) quitButton = mb.addButton( self.tr("&Quit"), E5MessageBox.AcceptRole) - quitButton.setIcon(UI.PixmapCache.getIcon("exit.png")) + quitButton.setIcon(UI.PixmapCache.getIcon("exit")) mb.addButton(E5MessageBox.Cancel) mb.exec_() return mb.clickedButton() == quitButton