--- a/src/eric7/WebBrowser/WebBrowserWindow.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/WebBrowser/WebBrowserWindow.py Tue Oct 18 16:06:21 2022 +0200
@@ -55,30 +55,29 @@
except ImportError:
QTHELP_AVAILABLE = False
-from EricGui.EricAction import EricAction
-from EricGui.EricOverrideCursor import EricOverrideCursor
-
-from EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage
-from EricWidgets.EricMainWindow import EricMainWindow
-from EricWidgets.EricApplication import ericApp
-from EricWidgets.EricZoomWidget import EricZoomWidget
-
-from EricNetwork.EricNetworkIcon import EricNetworkIcon
-
-import Preferences
-from Preferences import Shortcuts
-
-import Utilities
-import Globals
-
-import UI.PixmapCache
-import UI.Config
-from UI.Info import Version
-from UI.NotificationWidget import NotificationTypes
-
-from .Tools import Scripts, WebBrowserTools, WebIconProvider
-
-from .ZoomManager import ZoomManager
+from eric7.EricGui.EricAction import EricAction
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+
+from eric7.EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+
+from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
+
+from eric7 import Globals, Preferences, Utilities
+
+from eric7.Preferences import Shortcuts
+
+from eric7.EricGui import EricPixmapCache
+from eric7.UI import Config
+from eric7.UI.Info import Version
+from eric7.UI.NotificationWidget import NotificationTypes
+
+from .Tools import Scripts, WebBrowserTools
+from eric7.WebBrowser.Tools import WebIconProvider
+
+from eric7.WebBrowser.ZoomManager import ZoomManager
from .WebBrowserSingleApplication import WebBrowserSingleApplicationServer
@@ -187,7 +186,7 @@
self.setWindowTitle(self.tr("eric Web Browser"))
self.__settingsDir = settingsDir
- self.setWindowIcon(UI.PixmapCache.getIcon("ericWeb"))
+ self.setWindowIcon(EricPixmapCache.getIcon("ericWeb"))
self.__mHistory = []
self.__lastConfigurationPageName = ""
@@ -222,7 +221,7 @@
self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))
# initialize some SSL stuff
- from EricNetwork.EricSslUtilities import initSSL
+ from eric7.EricNetwork.EricSslUtilities import initSSL
initSSL()
@@ -240,9 +239,9 @@
self.__helpInstaller = None
self.__zoomWidget = EricZoomWidget(
- UI.PixmapCache.getPixmap("zoomOut"),
- UI.PixmapCache.getPixmap("zoomIn"),
- UI.PixmapCache.getPixmap("zoomReset"),
+ EricPixmapCache.getPixmap("zoomOut"),
+ EricPixmapCache.getPixmap("zoomIn"),
+ EricPixmapCache.getPixmap("zoomReset"),
self,
)
self.statusBar().addPermanentWidget(self.__zoomWidget)
@@ -261,11 +260,11 @@
self.__searchWidget = SearchWidget(self, self)
- self.__setIconDatabasePath()
+ self.setIconDatabasePath()
bookmarksModel = self.bookmarksManager().bookmarksModel()
self.__bookmarksToolBar = BookmarksToolBar(self, bookmarksModel, self)
- self.__bookmarksToolBar.setIconSize(UI.Config.ToolBarIconSize)
+ self.__bookmarksToolBar.setIconSize(Config.ToolBarIconSize)
self.__bookmarksToolBar.openUrl.connect(self.openUrl)
self.__bookmarksToolBar.newTab.connect(self.openUrlNewTab)
self.__bookmarksToolBar.newWindow.connect(self.openUrlNewWindow)
@@ -522,9 +521,10 @@
"""
return self.__tabWidget
- def __setIconDatabasePath(self, enable=True):
- """
- Private method to set the favicons path.
+ @classmethod
+ def setIconDatabasePath(cls, enable=True):
+ """
+ Class method to set the favicons path.
@param enable flag indicating to enabled icon storage (boolean)
"""
@@ -719,7 +719,7 @@
self.newTabAct = EricAction(
self.tr("New Tab"),
- UI.PixmapCache.getIcon("tabNew"),
+ EricPixmapCache.getIcon("tabNew"),
self.tr("&New Tab"),
QKeySequence(self.tr("Ctrl+T", "File|New Tab")),
0,
@@ -735,7 +735,7 @@
self.newAct = EricAction(
self.tr("New Window"),
- UI.PixmapCache.getIcon("newWindow"),
+ EricPixmapCache.getIcon("newWindow"),
self.tr("New &Window"),
QKeySequence(self.tr("Ctrl+N", "File|New Window")),
0,
@@ -755,7 +755,7 @@
self.newPrivateAct = EricAction(
self.tr("New Private Window"),
- UI.PixmapCache.getIcon("privateMode"),
+ EricPixmapCache.getIcon("privateMode"),
self.tr("New &Private Window"),
QKeySequence(self.tr("Ctrl+Shift+P", "File|New Private Window")),
0,
@@ -777,7 +777,7 @@
self.openAct = EricAction(
self.tr("Open File"),
- UI.PixmapCache.getIcon("open"),
+ EricPixmapCache.getIcon("open"),
self.tr("&Open File"),
QKeySequence(self.tr("Ctrl+O", "File|Open")),
0,
@@ -797,7 +797,7 @@
self.openTabAct = EricAction(
self.tr("Open File in New Tab"),
- UI.PixmapCache.getIcon("openNewTab"),
+ EricPixmapCache.getIcon("openNewTab"),
self.tr("Open File in New &Tab"),
QKeySequence(self.tr("Shift+Ctrl+O", "File|Open in new tab")),
0,
@@ -818,7 +818,7 @@
if hasattr(QWebEnginePage, "SavePage"):
self.saveAsAct = EricAction(
self.tr("Save As"),
- UI.PixmapCache.getIcon("fileSaveAs"),
+ EricPixmapCache.getIcon("fileSaveAs"),
self.tr("&Save As..."),
QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")),
0,
@@ -838,7 +838,7 @@
self.saveVisiblePageScreenAct = EricAction(
self.tr("Save Page Screen"),
- UI.PixmapCache.getIcon("fileSavePixmap"),
+ EricPixmapCache.getIcon("fileSavePixmap"),
self.tr("Save Page Screen..."),
0,
0,
@@ -901,7 +901,7 @@
self.printAct = EricAction(
self.tr("Print"),
- UI.PixmapCache.getIcon("print"),
+ EricPixmapCache.getIcon("print"),
self.tr("&Print"),
QKeySequence(self.tr("Ctrl+P", "File|Print")),
0,
@@ -917,7 +917,7 @@
self.printPdfAct = EricAction(
self.tr("Print as PDF"),
- UI.PixmapCache.getIcon("printPdf"),
+ EricPixmapCache.getIcon("printPdf"),
self.tr("Print as PDF"),
0,
0,
@@ -936,7 +936,7 @@
self.printPreviewAct = EricAction(
self.tr("Print Preview"),
- UI.PixmapCache.getIcon("printPreview"),
+ EricPixmapCache.getIcon("printPreview"),
self.tr("Print Preview"),
0,
0,
@@ -957,7 +957,7 @@
self.sendPageLinkAct = EricAction(
self.tr("Send Page Link"),
- UI.PixmapCache.getIcon("mailSend"),
+ EricPixmapCache.getIcon("mailSend"),
self.tr("Send Page Link"),
0,
0,
@@ -978,7 +978,7 @@
self.closeAct = EricAction(
self.tr("Close"),
- UI.PixmapCache.getIcon("close"),
+ EricPixmapCache.getIcon("close"),
self.tr("&Close"),
QKeySequence(self.tr("Ctrl+W", "File|Close")),
0,
@@ -1014,7 +1014,7 @@
self.exitAct = EricAction(
self.tr("Quit"),
- UI.PixmapCache.getIcon("exit"),
+ EricPixmapCache.getIcon("exit"),
self.tr("&Quit"),
QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
0,
@@ -1030,7 +1030,7 @@
self.backAct = EricAction(
self.tr("Backward"),
- UI.PixmapCache.getIcon("back"),
+ EricPixmapCache.getIcon("back"),
self.tr("&Backward"),
QKeySequence(self.tr("Alt+Left", "Go|Backward")),
0,
@@ -1050,7 +1050,7 @@
self.forwardAct = EricAction(
self.tr("Forward"),
- UI.PixmapCache.getIcon("forward"),
+ EricPixmapCache.getIcon("forward"),
self.tr("&Forward"),
QKeySequence(self.tr("Alt+Right", "Go|Forward")),
0,
@@ -1070,7 +1070,7 @@
self.homeAct = EricAction(
self.tr("Home"),
- UI.PixmapCache.getIcon("home"),
+ EricPixmapCache.getIcon("home"),
self.tr("&Home"),
QKeySequence(self.tr("Ctrl+Home", "Go|Home")),
0,
@@ -1086,7 +1086,7 @@
self.reloadAct = EricAction(
self.tr("Reload"),
- UI.PixmapCache.getIcon("reload"),
+ EricPixmapCache.getIcon("reload"),
self.tr("&Reload"),
QKeySequence(self.tr("Ctrl+R", "Go|Reload")),
QKeySequence(self.tr("F5", "Go|Reload")),
@@ -1102,7 +1102,7 @@
self.stopAct = EricAction(
self.tr("Stop"),
- UI.PixmapCache.getIcon("stopLoading"),
+ EricPixmapCache.getIcon("stopLoading"),
self.tr("&Stop"),
QKeySequence(self.tr("Ctrl+.", "Go|Stop")),
QKeySequence(self.tr("Esc", "Go|Stop")),
@@ -1118,7 +1118,7 @@
self.copyAct = EricAction(
self.tr("Copy"),
- UI.PixmapCache.getIcon("editCopy"),
+ EricPixmapCache.getIcon("editCopy"),
self.tr("&Copy"),
QKeySequence(self.tr("Ctrl+C", "Edit|Copy")),
0,
@@ -1136,7 +1136,7 @@
self.cutAct = EricAction(
self.tr("Cut"),
- UI.PixmapCache.getIcon("editCut"),
+ EricPixmapCache.getIcon("editCut"),
self.tr("Cu&t"),
QKeySequence(self.tr("Ctrl+X", "Edit|Cut")),
0,
@@ -1154,7 +1154,7 @@
self.pasteAct = EricAction(
self.tr("Paste"),
- UI.PixmapCache.getIcon("editPaste"),
+ EricPixmapCache.getIcon("editPaste"),
self.tr("&Paste"),
QKeySequence(self.tr("Ctrl+V", "Edit|Paste")),
0,
@@ -1170,7 +1170,7 @@
self.undoAct = EricAction(
self.tr("Undo"),
- UI.PixmapCache.getIcon("editUndo"),
+ EricPixmapCache.getIcon("editUndo"),
self.tr("&Undo"),
QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")),
0,
@@ -1186,7 +1186,7 @@
self.redoAct = EricAction(
self.tr("Redo"),
- UI.PixmapCache.getIcon("editRedo"),
+ EricPixmapCache.getIcon("editRedo"),
self.tr("&Redo"),
QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")),
0,
@@ -1202,7 +1202,7 @@
self.selectAllAct = EricAction(
self.tr("Select All"),
- UI.PixmapCache.getIcon("editSelectAll"),
+ EricPixmapCache.getIcon("editSelectAll"),
self.tr("&Select All"),
QKeySequence(self.tr("Ctrl+A", "Edit|Select All")),
0,
@@ -1239,7 +1239,7 @@
self.findAct = EricAction(
self.tr("Find..."),
- UI.PixmapCache.getIcon("find"),
+ EricPixmapCache.getIcon("find"),
self.tr("&Find..."),
QKeySequence(self.tr("Ctrl+F", "Edit|Find")),
0,
@@ -1255,7 +1255,7 @@
self.findNextAct = EricAction(
self.tr("Find next"),
- UI.PixmapCache.getIcon("findNext"),
+ EricPixmapCache.getIcon("findNext"),
self.tr("Find &next"),
QKeySequence(self.tr("F3", "Edit|Find next")),
0,
@@ -1274,7 +1274,7 @@
self.findPrevAct = EricAction(
self.tr("Find previous"),
- UI.PixmapCache.getIcon("findPrev"),
+ EricPixmapCache.getIcon("findPrev"),
self.tr("Find &previous"),
QKeySequence(self.tr("Shift+F3", "Edit|Find previous")),
0,
@@ -1316,7 +1316,7 @@
self.bookmarksAddAct = EricAction(
self.tr("Add Bookmark"),
- UI.PixmapCache.getIcon("addBookmark"),
+ EricPixmapCache.getIcon("addBookmark"),
self.tr("Add &Bookmark..."),
QKeySequence(self.tr("Ctrl+D", "Help|Add bookmark")),
0,
@@ -1375,7 +1375,7 @@
self.whatsThisAct = EricAction(
self.tr("What's This?"),
- UI.PixmapCache.getIcon("whatsThis"),
+ EricPixmapCache.getIcon("whatsThis"),
self.tr("&What's This?"),
QKeySequence(self.tr("Shift+F1", "Help|What's This?'")),
0,
@@ -1431,7 +1431,7 @@
self.zoomInAct = EricAction(
self.tr("Zoom in"),
- UI.PixmapCache.getIcon("zoomIn"),
+ EricPixmapCache.getIcon("zoomIn"),
self.tr("Zoom &in"),
QKeySequence(self.tr("Ctrl++", "View|Zoom in")),
QKeySequence(self.tr("Zoom In", "View|Zoom in")),
@@ -1451,7 +1451,7 @@
self.zoomOutAct = EricAction(
self.tr("Zoom out"),
- UI.PixmapCache.getIcon("zoomOut"),
+ EricPixmapCache.getIcon("zoomOut"),
self.tr("Zoom &out"),
QKeySequence(self.tr("Ctrl+-", "View|Zoom out")),
QKeySequence(self.tr("Zoom Out", "View|Zoom out")),
@@ -1471,7 +1471,7 @@
self.zoomResetAct = EricAction(
self.tr("Zoom reset"),
- UI.PixmapCache.getIcon("zoomReset"),
+ EricPixmapCache.getIcon("zoomReset"),
self.tr("Zoom &reset"),
QKeySequence(self.tr("Ctrl+0", "View|Zoom reset")),
0,
@@ -1510,7 +1510,7 @@
self.fullScreenAct = EricAction(
self.tr("Full Screen"),
- UI.PixmapCache.getIcon("windowFullscreen"),
+ EricPixmapCache.getIcon("windowFullscreen"),
self.tr("&Full Screen"),
0,
0,
@@ -1563,7 +1563,7 @@
self.prefAct = EricAction(
self.tr("Preferences"),
- UI.PixmapCache.getIcon("configure"),
+ EricPixmapCache.getIcon("configure"),
self.tr("&Preferences..."),
0,
0,
@@ -1583,7 +1583,7 @@
self.acceptedLanguagesAct = EricAction(
self.tr("Languages"),
- UI.PixmapCache.getIcon("flag"),
+ EricPixmapCache.getIcon("flag"),
self.tr("&Languages..."),
0,
0,
@@ -1604,7 +1604,7 @@
self.cookiesAct = EricAction(
self.tr("Cookies"),
- UI.PixmapCache.getIcon("cookie"),
+ EricPixmapCache.getIcon("cookie"),
self.tr("C&ookies..."),
0,
0,
@@ -1620,7 +1620,7 @@
self.personalDataAct = EricAction(
self.tr("Personal Information"),
- UI.PixmapCache.getIcon("pim"),
+ EricPixmapCache.getIcon("pim"),
self.tr("Personal Information..."),
0,
0,
@@ -1642,7 +1642,7 @@
self.greaseMonkeyAct = EricAction(
self.tr("GreaseMonkey Scripts"),
- UI.PixmapCache.getIcon("greaseMonkey"),
+ EricPixmapCache.getIcon("greaseMonkey"),
self.tr("GreaseMonkey Scripts..."),
0,
0,
@@ -1662,7 +1662,7 @@
self.editMessageFilterAct = EricAction(
self.tr("Edit Message Filters"),
- UI.PixmapCache.getIcon("warning"),
+ EricPixmapCache.getIcon("warning"),
self.tr("Edit Message Filters..."),
0,
0,
@@ -1685,7 +1685,7 @@
self.featurePermissionAct = EricAction(
self.tr("Edit HTML5 Feature Permissions"),
- UI.PixmapCache.getIcon("featurePermission"),
+ EricPixmapCache.getIcon("featurePermission"),
self.tr("Edit HTML5 Feature Permissions..."),
0,
0,
@@ -1708,7 +1708,7 @@
if WebBrowserWindow._useQtHelp:
self.syncTocAct = EricAction(
self.tr("Sync with Table of Contents"),
- UI.PixmapCache.getIcon("syncToc"),
+ EricPixmapCache.getIcon("syncToc"),
self.tr("Sync with Table of Contents"),
0,
0,
@@ -1816,7 +1816,7 @@
self.clearPrivateDataAct = EricAction(
self.tr("Clear private data"),
- UI.PixmapCache.getIcon("clearPrivateData"),
+ EricPixmapCache.getIcon("clearPrivateData"),
self.tr("Clear private data"),
0,
0,
@@ -1855,7 +1855,7 @@
self.manageIconsAct = EricAction(
self.tr("Manage saved Favicons"),
- UI.PixmapCache.getIcon("icons"),
+ EricPixmapCache.getIcon("icons"),
self.tr("Manage saved Favicons"),
0,
0,
@@ -1898,7 +1898,7 @@
self.passwordsAct = EricAction(
self.tr("Manage Saved Passwords"),
- UI.PixmapCache.getIcon("passwords"),
+ EricPixmapCache.getIcon("passwords"),
self.tr("Manage Saved Passwords..."),
0,
0,
@@ -1917,7 +1917,7 @@
self.adblockAct = EricAction(
self.tr("Ad Block"),
- UI.PixmapCache.getIcon("adBlockPlus"),
+ EricPixmapCache.getIcon("adBlockPlus"),
self.tr("&Ad Block..."),
0,
0,
@@ -1939,7 +1939,7 @@
self.certificateErrorsAct = EricAction(
self.tr("Manage SSL Certificate Errors"),
- UI.PixmapCache.getIcon("certificates"),
+ EricPixmapCache.getIcon("certificates"),
self.tr("Manage SSL Certificate Errors..."),
0,
0,
@@ -1961,7 +1961,7 @@
self.safeBrowsingAct = EricAction(
self.tr("Manage Safe Browsing"),
- UI.PixmapCache.getIcon("safeBrowsing"),
+ EricPixmapCache.getIcon("safeBrowsing"),
self.tr("Manage Safe Browsing..."),
0,
0,
@@ -1998,7 +1998,7 @@
self.feedsManagerAct = EricAction(
self.tr("RSS Feeds Dialog"),
- UI.PixmapCache.getIcon("rss22"),
+ EricPixmapCache.getIcon("rss22"),
self.tr("&RSS Feeds Dialog..."),
QKeySequence(self.tr("Ctrl+Shift+F", "Help|RSS Feeds Dialog")),
0,
@@ -2021,7 +2021,7 @@
self.siteInfoAct = EricAction(
self.tr("Siteinfo Dialog"),
- UI.PixmapCache.getIcon("helpAbout"),
+ EricPixmapCache.getIcon("helpAbout"),
self.tr("&Siteinfo Dialog..."),
QKeySequence(self.tr("Ctrl+Shift+I", "Help|Siteinfo Dialog")),
0,
@@ -2063,7 +2063,7 @@
self.synchronizationAct = EricAction(
self.tr("Synchronize data"),
- UI.PixmapCache.getIcon("sync"),
+ EricPixmapCache.getIcon("sync"),
self.tr("&Synchronize Data..."),
0,
0,
@@ -2085,7 +2085,7 @@
self.zoomValuesAct = EricAction(
self.tr("Manage Saved Zoom Values"),
- UI.PixmapCache.getIcon("zoomReset"),
+ EricPixmapCache.getIcon("zoomReset"),
self.tr("Manage Saved Zoom Values..."),
0,
0,
@@ -2161,7 +2161,7 @@
self.virustotalScanCurrentAct = EricAction(
self.tr("Scan current site"),
- UI.PixmapCache.getIcon("virustotal"),
+ EricPixmapCache.getIcon("virustotal"),
self.tr("Scan current site"),
0,
0,
@@ -2175,7 +2175,7 @@
self.virustotalIpReportAct = EricAction(
self.tr("IP Address Report"),
- UI.PixmapCache.getIcon("virustotal"),
+ EricPixmapCache.getIcon("virustotal"),
self.tr("IP Address Report"),
0,
0,
@@ -2187,7 +2187,7 @@
self.virustotalDomainReportAct = EricAction(
self.tr("Domain Report"),
- UI.PixmapCache.getIcon("virustotal"),
+ EricPixmapCache.getIcon("virustotal"),
self.tr("Domain Report"),
0,
0,
@@ -2207,7 +2207,7 @@
self.shortcutsAct = EricAction(
self.tr("Keyboard Shortcuts"),
- UI.PixmapCache.getIcon("configureShortcuts"),
+ EricPixmapCache.getIcon("configureShortcuts"),
self.tr("Keyboard &Shortcuts..."),
0,
0,
@@ -2227,7 +2227,7 @@
self.exportShortcutsAct = EricAction(
self.tr("Export Keyboard Shortcuts"),
- UI.PixmapCache.getIcon("exportShortcuts"),
+ EricPixmapCache.getIcon("exportShortcuts"),
self.tr("&Export Keyboard Shortcuts..."),
0,
0,
@@ -2246,7 +2246,7 @@
self.importShortcutsAct = EricAction(
self.tr("Import Keyboard Shortcuts"),
- UI.PixmapCache.getIcon("importShortcuts"),
+ EricPixmapCache.getIcon("importShortcuts"),
self.tr("&Import Keyboard Shortcuts..."),
0,
0,
@@ -2469,7 +2469,7 @@
menu.addAction(self.synchronizationAct)
menu.addSeparator()
vtMenu = menu.addMenu(
- UI.PixmapCache.getIcon("virustotal"), self.tr("&VirusTotal")
+ EricPixmapCache.getIcon("virustotal"), self.tr("&VirusTotal")
)
vtMenu.addAction(self.virustotalScanCurrentAct)
vtMenu.addAction(self.virustotalIpReportAct)
@@ -2541,7 +2541,7 @@
self.__superMenu.addAction(self.findAct)
self.__superMenu.addSeparator()
act = self.__superMenu.addAction(
- UI.PixmapCache.getIcon("history"), self.tr("Show All History...")
+ EricPixmapCache.getIcon("history"), self.tr("Show All History...")
)
act.triggered.connect(self.historyMenu.showHistoryDialog)
self.__superMenu.addAction(self.bookmarksManageAct)
@@ -2624,7 +2624,7 @@
menu.addAction(self.synchronizationAct)
menu.addSeparator()
vtMenu = menu.addMenu(
- UI.PixmapCache.getIcon("virustotal"), self.tr("&VirusTotal")
+ EricPixmapCache.getIcon("virustotal"), self.tr("&VirusTotal")
)
vtMenu.addAction(self.virustotalScanCurrentAct)
vtMenu.addAction(self.virustotalIpReportAct)
@@ -2644,7 +2644,7 @@
"""
filetb = self.addToolBar(self.tr("File"))
filetb.setObjectName("FileToolBar")
- filetb.setIconSize(UI.Config.ToolBarIconSize)
+ filetb.setIconSize(Config.ToolBarIconSize)
filetb.addAction(self.newTabAct)
filetb.addAction(self.newAct)
filetb.addAction(self.newPrivateAct)
@@ -2669,7 +2669,7 @@
edittb = self.addToolBar(self.tr("Edit"))
edittb.setObjectName("EditToolBar")
- edittb.setIconSize(UI.Config.ToolBarIconSize)
+ edittb.setIconSize(Config.ToolBarIconSize)
edittb.addAction(self.undoAct)
edittb.addAction(self.redoAct)
edittb.addSeparator()
@@ -2682,7 +2682,7 @@
viewtb = self.addToolBar(self.tr("View"))
viewtb.setObjectName("ViewToolBar")
- viewtb.setIconSize(UI.Config.ToolBarIconSize)
+ viewtb.setIconSize(Config.ToolBarIconSize)
viewtb.addAction(self.zoomInAct)
viewtb.addAction(self.zoomResetAct)
viewtb.addAction(self.zoomOutAct)
@@ -2692,7 +2692,7 @@
findtb = self.addToolBar(self.tr("Find"))
findtb.setObjectName("FindToolBar")
- findtb.setIconSize(UI.Config.ToolBarIconSize)
+ findtb.setIconSize(Config.ToolBarIconSize)
findtb.addAction(self.findAct)
findtb.addAction(self.findNextAct)
findtb.addAction(self.findPrevAct)
@@ -2717,7 +2717,7 @@
settingstb = self.addToolBar(self.tr("Settings"))
settingstb.setObjectName("SettingsToolBar")
- settingstb.setIconSize(UI.Config.ToolBarIconSize)
+ settingstb.setIconSize(Config.ToolBarIconSize)
settingstb.addAction(self.prefAct)
settingstb.addAction(self.shortcutsAct)
settingstb.addAction(self.acceptedLanguagesAct)
@@ -2729,7 +2729,7 @@
toolstb = self.addToolBar(self.tr("Tools"))
toolstb.setObjectName("ToolsToolBar")
- toolstb.setIconSize(UI.Config.ToolBarIconSize)
+ toolstb.setIconSize(Config.ToolBarIconSize)
toolstb.addAction(self.feedsManagerAct)
toolstb.addAction(self.siteInfoAct)
toolstb.addSeparator()
@@ -2738,14 +2738,14 @@
helptb = self.addToolBar(self.tr("Help"))
helptb.setObjectName("HelpToolBar")
- helptb.setIconSize(UI.Config.ToolBarIconSize)
+ helptb.setIconSize(Config.ToolBarIconSize)
helptb.addAction(self.whatsThisAct)
self.__toolbars["help"] = (helptb.windowTitle(), helptb)
self.addToolBarBreak()
vttb = self.addToolBar(self.tr("VirusTotal"))
vttb.setObjectName("VirusTotalToolBar")
- vttb.setIconSize(UI.Config.ToolBarIconSize)
+ vttb.setIconSize(Config.ToolBarIconSize)
vttb.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
vttb.addAction(self.virustotalScanCurrentAct)
vttb.addAction(self.virustotalIpReportAct)
@@ -3315,7 +3315,7 @@
parent=self,
)
quitButton = mb.addButton(self.tr("&Quit"), EricMessageBox.AcceptRole)
- quitButton.setIcon(UI.PixmapCache.getIcon("exit"))
+ quitButton.setIcon(EricPixmapCache.getIcon("exit"))
mb.addButton(EricMessageBox.Cancel)
mb.exec()
return mb.clickedButton() == quitButton
@@ -3644,7 +3644,7 @@
"""
Private slot to set the preferences.
"""
- from Preferences.ConfigurationDialog import (
+ from eric7.Preferences.ConfigurationDialog import (
ConfigurationDialog,
ConfigurationMode,
)
@@ -4261,7 +4261,7 @@
@param src source of the web page
@type str
"""
- from QScintilla.MiniEditor import MiniEditor
+ from eric7.QScintilla.MiniEditor import MiniEditor
editor = MiniEditor(parent=self)
editor.setText(src, "Html")
@@ -5228,7 +5228,7 @@
@type int
"""
if cls._notification is None:
- from UI.NotificationWidget import NotificationWidget
+ from eric7.UI.NotificationWidget import NotificationWidget
cls._notification = NotificationWidget()
@@ -5509,7 +5509,7 @@
Private slot to configure the keyboard shortcuts.
"""
if self.__shortcutsDialog is None:
- from Preferences.ShortcutsDialog import ShortcutsDialog
+ from eric7.Preferences.ShortcutsDialog import ShortcutsDialog
self.__shortcutsDialog = ShortcutsDialog(self)
self.__shortcutsDialog.populate(helpViewer=self)
@@ -5552,7 +5552,7 @@
)
if ok:
- from Preferences import Shortcuts
+ from eric7.Preferences import Shortcuts
Shortcuts.exportShortcuts(fn, helpViewer=self)
@@ -5571,6 +5571,6 @@
)
if fn:
- from Preferences import Shortcuts
+ from eric7.Preferences import Shortcuts
Shortcuts.importShortcuts(fn, helpViewer=self)
