diff -r a4eb1787ea41 -r 343db73c4842 eric6/WebBrowser/WebBrowserView.py
--- a/eric6/WebBrowser/WebBrowserView.py Sun Apr 05 18:17:08 2020 +0200
+++ b/eric6/WebBrowser/WebBrowserView.py Sat May 02 13:51:07 2020 +0200
@@ -585,7 +585,7 @@
):
self.__menu.addSeparator()
self.__menu.addAction(
- UI.PixmapCache.getIcon("webInspector.png"),
+ UI.PixmapCache.getIcon("webInspector"),
self.tr("Inspect Element..."), self.__webInspector)
if not self.__menu.isEmpty():
@@ -671,42 +671,42 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("openNewTab.png"),
+ UI.PixmapCache.getIcon("openNewTab"),
self.tr("Open Link in New Tab\tCtrl+LMB"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
lambda: self.__openLinkInNewTab(act))
act = menu.addAction(
- UI.PixmapCache.getIcon("newWindow.png"),
+ UI.PixmapCache.getIcon("newWindow"),
self.tr("Open Link in New Window"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
lambda: self.__openLinkInNewWindow(act))
act = menu.addAction(
- UI.PixmapCache.getIcon("privateMode.png"),
+ UI.PixmapCache.getIcon("privateMode"),
self.tr("Open Link in New Private Window"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
lambda: self.__openLinkInNewPrivateWindow(act))
menu.addSeparator()
menu.addAction(
- UI.PixmapCache.getIcon("download.png"),
+ UI.PixmapCache.getIcon("download"),
self.tr("Save Lin&k"), self.__downloadLink)
act = menu.addAction(
- UI.PixmapCache.getIcon("bookmark22.png"),
+ UI.PixmapCache.getIcon("bookmark22"),
self.tr("Bookmark this Link"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
lambda: self.__bookmarkLink(act))
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("editCopy.png"),
+ UI.PixmapCache.getIcon("editCopy"),
self.tr("Copy Link to Clipboard"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
lambda: self.__copyLink(act))
act = menu.addAction(
- UI.PixmapCache.getIcon("mailSend.png"),
+ UI.PixmapCache.getIcon("mailSend"),
self.tr("Send Link"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
@@ -716,7 +716,7 @@
Preferences.getWebBrowser("VirusTotalServiceKey") != ""
):
act = menu.addAction(
- UI.PixmapCache.getIcon("virustotal.png"),
+ UI.PixmapCache.getIcon("virustotal"),
self.tr("Scan Link with VirusTotal"))
act.setData(hitTest.linkUrl())
act.triggered.connect(
@@ -735,25 +735,25 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("openNewTab.png"),
+ UI.PixmapCache.getIcon("openNewTab"),
self.tr("Open Image in New Tab"))
act.setData(hitTest.imageUrl())
act.triggered.connect(
lambda: self.__openLinkInNewTab(act))
menu.addSeparator()
menu.addAction(
- UI.PixmapCache.getIcon("download.png"),
+ UI.PixmapCache.getIcon("download"),
self.tr("Save Image"), self.__downloadImage)
menu.addAction(
self.tr("Copy Image to Clipboard"), self.__copyImage)
act = menu.addAction(
- UI.PixmapCache.getIcon("editCopy.png"),
+ UI.PixmapCache.getIcon("editCopy"),
self.tr("Copy Image Location to Clipboard"))
act.setData(hitTest.imageUrl())
act.triggered.connect(
lambda: self.__copyLink(act))
act = menu.addAction(
- UI.PixmapCache.getIcon("mailSend.png"),
+ UI.PixmapCache.getIcon("mailSend"),
self.tr("Send Image Link"))
act.setData(hitTest.imageUrl())
act.triggered.connect(
@@ -764,7 +764,7 @@
engine = WebBrowserWindow.imageSearchEngine()
searchEngineName = engine.searchEngine()
act = menu.addAction(
- UI.PixmapCache.getIcon("{0}.png".format(
+ UI.PixmapCache.getIcon("{0}".format(
searchEngineName.lower())),
self.tr("Search image in {0}").format(searchEngineName))
act.setData(engine.getSearchQuery(hitTest.imageUrl()))
@@ -774,7 +774,7 @@
self.tr("Search image with..."))
for searchEngineName in engine.searchEngineNames():
act = self.__imageSearchMenu.addAction(
- UI.PixmapCache.getIcon("{0}.png".format(
+ UI.PixmapCache.getIcon("{0}".format(
searchEngineName.lower())),
self.tr("Search image in {0}").format(searchEngineName))
act.setData(engine.getSearchQuery(
@@ -784,7 +784,7 @@
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("adBlockPlus.png"),
+ UI.PixmapCache.getIcon("adBlockPlus"),
self.tr("Block Image"))
act.setData(hitTest.imageUrl().toString())
act.triggered.connect(
@@ -794,7 +794,7 @@
Preferences.getWebBrowser("VirusTotalServiceKey") != ""
):
act = menu.addAction(
- UI.PixmapCache.getIcon("virustotal.png"),
+ UI.PixmapCache.getIcon("virustotal"),
self.tr("Scan Image with VirusTotal"))
act.setData(hitTest.imageUrl())
act.triggered.connect(
@@ -814,35 +814,35 @@
if hitTest.mediaPaused():
menu.addAction(
- UI.PixmapCache.getIcon("mediaPlaybackStart.png"),
+ UI.PixmapCache.getIcon("mediaPlaybackStart"),
self.tr("Play"), self.__pauseMedia)
else:
menu.addAction(
- UI.PixmapCache.getIcon("mediaPlaybackPause.png"),
+ UI.PixmapCache.getIcon("mediaPlaybackPause"),
self.tr("Pause"), self.__pauseMedia)
if hitTest.mediaMuted():
menu.addAction(
- UI.PixmapCache.getIcon("audioVolumeHigh.png"),
+ UI.PixmapCache.getIcon("audioVolumeHigh"),
self.tr("Unmute"), self.__muteMedia)
else:
menu.addAction(
- UI.PixmapCache.getIcon("audioVolumeMuted.png"),
+ UI.PixmapCache.getIcon("audioVolumeMuted"),
self.tr("Mute"), self.__muteMedia)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("editCopy.png"),
+ UI.PixmapCache.getIcon("editCopy"),
self.tr("Copy Media Address to Clipboard"))
act.setData(hitTest.mediaUrl())
act.triggered.connect(
lambda: self.__copyLink(act))
act = menu.addAction(
- UI.PixmapCache.getIcon("mailSend.png"),
+ UI.PixmapCache.getIcon("mailSend"),
self.tr("Send Media Address"))
act.setData(hitTest.mediaUrl())
act.triggered.connect(
lambda: self.__sendLink(act))
menu.addAction(
- UI.PixmapCache.getIcon("download.png"),
+ UI.PixmapCache.getIcon("download"),
self.tr("Save Media"), self.__downloadMedia)
def __createSelectedTextContextMenu(self, menu, hitTest):
@@ -860,7 +860,7 @@
menu.addAction(self.__mw.copyAct)
menu.addSeparator()
act = menu.addAction(
- UI.PixmapCache.getIcon("mailSend.png"),
+ UI.PixmapCache.getIcon("mailSend"),
self.tr("Send Text"))
act.setData(self.selectedText())
act.triggered.connect(
@@ -898,7 +898,7 @@
"http://translate.google.com/#auto/{0}/{1}".format(
langCode, self.selectedText()))
act = menu.addAction(
- UI.PixmapCache.getIcon("translate.png"),
+ UI.PixmapCache.getIcon("translate"),
self.tr("Google Translate"))
act.setData(googleTranslatorUrl)
act.triggered.connect(
@@ -907,7 +907,7 @@
"http://{0}.wiktionary.org/wiki/Special:Search?search={1}"
.format(langCode, self.selectedText()))
act = menu.addAction(
- UI.PixmapCache.getIcon("wikipedia.png"),
+ UI.PixmapCache.getIcon("wikipedia"),
self.tr("Dictionary"))
act.setData(wiktionaryUrl)
act.triggered.connect(
@@ -942,14 +942,14 @@
menu.addAction(self.__mw.forwardAct)
menu.addSeparator()
menu.addAction(
- UI.PixmapCache.getIcon("plus.png"),
+ UI.PixmapCache.getIcon("plus"),
self.tr("Add New Page"), self.__addSpeedDial)
menu.addAction(
- UI.PixmapCache.getIcon("preferences-general.png"),
+ UI.PixmapCache.getIcon("preferences-general"),
self.tr("Configure Speed Dial"), self.__configureSpeedDial)
menu.addSeparator()
menu.addAction(
- UI.PixmapCache.getIcon("reload.png"),
+ UI.PixmapCache.getIcon("reload"),
self.tr("Reload All Dials"), self.__reloadAllSpeedDials)
menu.addSeparator()
menu.addAction(
@@ -957,16 +957,16 @@
return
menu.addAction(
- UI.PixmapCache.getIcon("bookmark22.png"),
+ UI.PixmapCache.getIcon("bookmark22"),
self.tr("Bookmark this Page"), self.addBookmark)
act = menu.addAction(
- UI.PixmapCache.getIcon("editCopy.png"),
+ UI.PixmapCache.getIcon("editCopy"),
self.tr("Copy Page Link"))
act.setData(self.url())
act.triggered.connect(
lambda: self.__copyLink(act))
act = menu.addAction(
- UI.PixmapCache.getIcon("mailSend.png"),
+ UI.PixmapCache.getIcon("mailSend"),
self.tr("Send Page Link"))
act.setData(self.url())
act.triggered.connect(
@@ -1002,7 +1002,7 @@
b"http://validator.w3.org/check?uri=" +
QUrl.toPercentEncoding(bytes(self.url().toEncoded()).decode()))
act = menu.addAction(
- UI.PixmapCache.getIcon("w3.png"),
+ UI.PixmapCache.getIcon("w3"),
self.tr("Validate Page"))
act.setData(w3url)
act.triggered.connect(
@@ -1023,7 +1023,7 @@
QUrl.toPercentEncoding(
bytes(self.url().toEncoded()).decode()))
act = menu.addAction(
- UI.PixmapCache.getIcon("translate.png"),
+ UI.PixmapCache.getIcon("translate"),
self.tr("Google Translate"))
act.setData(googleTranslatorUrl)
act.triggered.connect(
