diff -r f23c43e18046 -r 906485dcd210 src/eric7/UI/UserInterface.py
--- a/src/eric7/UI/UserInterface.py Sun Oct 02 11:44:07 2022 +0200
+++ b/src/eric7/UI/UserInterface.py Sat Oct 29 15:24:59 2022 +0200
@@ -57,33 +57,34 @@
from . import Config
from .NotificationWidget import NotificationTypes
-from EricWidgets.EricSingleApplication import EricSingleApplicationServer
-from EricGui.EricAction import EricAction, createActionGroup
-from EricWidgets.EricToolBarManager import EricToolBarManager
-from EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage
-from EricWidgets.EricApplication import ericApp
-from EricWidgets.EricMainWindow import EricMainWindow
-from EricWidgets.EricZoomWidget import EricZoomWidget
-from EricWidgets.EricClickableLabel import EricClickableLabel
-
-import Preferences
-import Utilities
-import Globals
-
-import UI.PixmapCache
-
-from Sessions.SessionFile import SessionFile
-
-from Tasks.TasksFile import TasksFile
-
-from EricNetwork.EricNetworkIcon import EricNetworkIcon
-from EricNetwork.EricNetworkProxyFactory import (
+from eric7.EricWidgets.EricSingleApplication import EricSingleApplicationServer
+from eric7.EricGui.EricAction import EricAction, createActionGroup
+from eric7.EricWidgets.EricToolBarManager import EricToolBarManager
+from eric7.EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
+
+from eric7 import Globals, Preferences, Utilities
+
+from eric7.EricGui import EricPixmapCache
+
+from eric7.Sessions.SessionFile import SessionFile
+
+from eric7.Tasks.TasksFile import TasksFile
+
+from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
+from eric7.EricNetwork.EricNetworkProxyFactory import (
EricNetworkProxyFactory,
proxyAuthenticationRequired,
)
try:
- from EricNetwork.EricSslErrorHandler import EricSslErrorHandler, EricSslErrorState
+ from eric7.EricNetwork.EricSslErrorHandler import (
+ EricSslErrorHandler,
+ EricSslErrorState,
+ )
SSL_AVAILABLE = True
except ImportError:
@@ -275,8 +276,8 @@
self.capEditor = ""
self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename")
- QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric"))
- self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
+ QApplication.setWindowIcon(EricPixmapCache.getIcon("eric"))
+ self.setWindowIcon(EricPixmapCache.getIcon("eric"))
self.__setWindowCaption()
# load the view profiles
@@ -286,21 +287,21 @@
# Generate the conda interface
logging.debug("Creating Conda Interface...")
- from CondaInterface.Conda import Conda
+ from eric7.CondaInterface.Conda import Conda
self.condaInterface = Conda(self)
ericApp().registerObject("Conda", self.condaInterface)
# Generate the pip interface
logging.debug("Creating Pip Interface...")
- from PipInterface.Pip import Pip
+ from eric7.PipInterface.Pip import Pip
self.pipInterface = Pip(self)
ericApp().registerObject("Pip", self.pipInterface)
# Generate the virtual environment manager
logging.debug("Creating Virtual Environments Manager...")
- from VirtualEnv.VirtualenvManager import VirtualenvManager
+ from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
self.virtualenvManager = VirtualenvManager(self)
# register it early because it is needed very soon
@@ -308,33 +309,33 @@
# Generate an empty project object and multi project object
logging.debug("Creating Project Manager...")
- from Project.Project import Project
+ from eric7.Project.Project import Project
self.project = Project(self)
ericApp().registerObject("Project", self.project)
- from MultiProject.MultiProject import MultiProject
+ from eric7.MultiProject.MultiProject import MultiProject
logging.debug("Creating Multi-Project Manager...")
self.multiProject = MultiProject(self.project, self)
# Generate the debug server object
logging.debug("Creating Debug Server...")
- from Debugger.DebugServer import DebugServer
+ from eric7.Debugger.DebugServer import DebugServer
self.__debugServer = DebugServer(
self.__originalPathString, project=self.project, parent=self
)
# Create the background service object
- from Utilities.BackgroundService import BackgroundService
+ from eric7.Utilities.BackgroundService import BackgroundService
self.backgroundService = BackgroundService(self)
splash.showMessage(self.tr("Initializing Plugin Manager..."))
# Initialize the Plugin Manager (Plugins are initialized later
- from PluginManager.PluginManager import PluginManager
+ from eric7.PluginManager.PluginManager import PluginManager
self.pluginManager = PluginManager(
self, self.__disabledPlugins, develPlugin=plugin
@@ -347,14 +348,14 @@
self.__webBrowserSAName = QUuid.createUuid().toString()[1:-1]
# set spellchecker defaults
- from QScintilla.SpellChecker import SpellChecker
+ from eric7.QScintilla.SpellChecker import SpellChecker
SpellChecker.setDefaultLanguage(
Preferences.getEditor("SpellCheckingDefaultLanguage")
)
with contextlib.suppress(ImportError, AttributeError):
- from EricWidgets.EricSpellCheckedTextEdit import SpellCheckMixin
+ from eric7.EricWidgets.EricSpellCheckedTextEdit import SpellCheckMixin
pwl = SpellChecker.getUserDictionaryPath(isException=False)
pel = SpellChecker.getUserDictionaryPath(isException=True)
@@ -373,7 +374,7 @@
# Generate the debugger part of the ui
logging.debug("Creating Debugger UI...")
- from Debugger.DebugUI import DebugUI
+ from eric7.Debugger.DebugUI import DebugUI
self.debuggerUI = DebugUI(
self, self.viewmanager, self.__debugServer, self.debugViewer, self.project
@@ -400,7 +401,7 @@
self.__configurationDialog = None
# now setup the connections
- splash.showMessage(self.tr("Setting up connections..."))
+ splash.showMessage(self.tr("Setting up signal/slot-connections..."))
self.debugViewer.exceptionLogger.sourceFile.connect(
self.viewmanager.openSourceFile
@@ -731,8 +732,8 @@
# now redirect stdout and stderr
# TODO: release - reenable redirection
- ## sys.stdout = self.stdout # __IGNORE_WARNING_M891__
- ## sys.stderr = self.stderr # __IGNORE_WARNING_M891__
+ ##sys.stdout = self.stdout # __IGNORE_WARNING_M891__
+ ##sys.stderr = self.stderr # __IGNORE_WARNING_M891__
# now fire up the single application server
if Preferences.getUI("SingleApplicationMode"):
@@ -751,14 +752,14 @@
self.pluginManager.initPluginToolbars(self.toolbarManager)
if Preferences.getPluginManager("StartupCleanup"):
splash.showMessage(self.tr("Cleaning Plugins Download Area..."))
- from PluginManager.PluginRepositoryDialog import (
+ from eric7.PluginManager.PluginRepositoryDialog import (
PluginRepositoryDownloadCleanup,
)
PluginRepositoryDownloadCleanup(quiet=True)
# now read the keyboard shortcuts for all the actions
- from Preferences import Shortcuts
+ from eric7.Preferences import Shortcuts
Shortcuts.readShortcuts()
@@ -842,7 +843,7 @@
"""
# Create the view manager depending on the configuration setting
logging.debug("Creating Viewmanager...")
- import ViewManager
+ from eric7 import ViewManager
self.viewmanager = ViewManager.factory(
self, self, self.__debugServer, self.pluginManager
@@ -868,19 +869,19 @@
# Create the project browser
logging.debug("Creating Project Browser...")
- from Project.ProjectBrowser import ProjectBrowser
+ from eric7.Project.ProjectBrowser import ProjectBrowser
self.projectBrowser = ProjectBrowser(self.project)
# Create the multi project browser
logging.debug("Creating Multiproject Browser...")
- from MultiProject.MultiProjectBrowser import MultiProjectBrowser
+ from eric7.MultiProject.MultiProjectBrowser import MultiProjectBrowser
self.multiProjectBrowser = MultiProjectBrowser(self.multiProject, self.project)
# Create the task viewer part of the user interface
logging.debug("Creating Task Viewer...")
- from Tasks.TaskViewer import TaskViewer
+ from eric7.Tasks.TaskViewer import TaskViewer
self.taskViewer = TaskViewer(None, self.project)
@@ -892,13 +893,13 @@
# Create the debug viewer
logging.debug("Creating Debug Viewer...")
- from Debugger.DebugViewer import DebugViewer
+ from eric7.Debugger.DebugViewer import DebugViewer
self.debugViewer = DebugViewer(self.__debugServer)
# Create the shell
logging.debug("Creating Shell...")
- from QScintilla.Shell import ShellAssembly
+ from eric7.QScintilla.Shell import ShellAssembly
self.shellAssembly = ShellAssembly(
self.__debugServer, self.viewmanager, self.project, True
@@ -908,7 +909,7 @@
if Preferences.getUI("ShowTemplateViewer"):
# Create the template viewer part of the user interface
logging.debug("Creating Template Viewer...")
- from Templates.TemplateViewer import TemplateViewer
+ from eric7.Templates.TemplateViewer import TemplateViewer
self.templateViewer = TemplateViewer(None, self.viewmanager)
else:
@@ -948,7 +949,7 @@
if Preferences.getUI("ShowPyPIPackageManager"):
# Create the PyPI package manager
logging.debug("Creating PyPI Package Manager...")
- from PipInterface.PipPackagesWidget import PipPackagesWidget
+ from eric7.PipInterface.PipPackagesWidget import PipPackagesWidget
self.pipWidget = PipPackagesWidget(self.pipInterface)
else:
@@ -958,7 +959,7 @@
if Preferences.getUI("ShowCondaPackageManager"):
# Create the conda package manager
logging.debug("Creating Conda Package Manager...")
- from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
+ from eric7.CondaInterface.CondaPackagesWidget import CondaPackagesWidget
self.condaWidget = CondaPackagesWidget(self.condaInterface)
else:
@@ -968,7 +969,7 @@
if Preferences.getUI("ShowCooperation"):
# Create the chat part of the user interface
logging.debug("Creating Chat Widget...")
- from Cooperation.ChatWidget import ChatWidget
+ from eric7.Cooperation.ChatWidget import ChatWidget
self.cooperation = ChatWidget(self)
else:
@@ -978,7 +979,7 @@
if Preferences.getUI("ShowIrc"):
# Create the IRC part of the user interface
logging.debug("Creating IRC Widget...")
- from Network.IRC.IrcWidget import IrcWidget
+ from eric7.Network.IRC.IrcWidget import IrcWidget
self.irc = IrcWidget(self)
else:
@@ -988,7 +989,7 @@
if Preferences.getUI("ShowMicroPython"):
# Create the MicroPython part of the user interface
logging.debug("Creating MicroPython Widget...")
- from MicroPython.MicroPythonWidget import MicroPythonWidget
+ from eric7.MicroPython.MicroPythonWidget import MicroPythonWidget
self.microPythonWidget = MicroPythonWidget(self)
else:
@@ -1007,12 +1008,12 @@
# Create the Jedi Assistant
logging.debug("Creating Jedi Assistant...")
- from JediInterface.AssistantJedi import AssistantJedi
+ from eric7.JediInterface.AssistantJedi import AssistantJedi
self.jediAssistant = AssistantJedi(self, self.viewmanager, self.project)
# Create the plug-ins repository viewer
- from PluginManager.PluginRepositoryDialog import PluginRepositoryWidget
+ from eric7.PluginManager.PluginRepositoryDialog import PluginRepositoryWidget
self.pluginRepositoryViewer = PluginRepositoryWidget(
self.pluginManager, integrated=True, parent=self
@@ -1022,7 +1023,7 @@
)
# Create the virtual environments management widget
- from VirtualEnv.VirtualenvManagerWidgets import VirtualenvManagerWidget
+ from eric7.VirtualEnv.VirtualenvManagerWidgets import VirtualenvManagerWidget
self.__virtualenvManagerWidget = VirtualenvManagerWidget(
self.virtualenvManager, self
@@ -1064,7 +1065,7 @@
self.__findLocationWidget = None
# Create the VCS Status widget
- from VCS.StatusWidget import StatusWidget
+ from eric7.VCS.StatusWidget import StatusWidget
self.__vcsStatusWidget = StatusWidget(self.project, self.viewmanager, self)
@@ -1074,7 +1075,7 @@
):
# Create the embedded help viewer
logging.debug("Creating Internal Help Viewer...")
- from HelpViewer.HelpViewerWidget import HelpViewerWidget
+ from eric7.HelpViewer.HelpViewerWidget import HelpViewerWidget
self.__helpViewerWidget = HelpViewerWidget(self)
else:
@@ -1138,7 +1139,10 @@
"""
Private method to create the Toolboxes layout.
"""
- from EricWidgets.EricToolBox import EricVerticalToolBox, EricHorizontalToolBox
+ from eric7.EricWidgets.EricToolBox import (
+ EricVerticalToolBox,
+ EricHorizontalToolBox,
+ )
logging.debug("Creating Toolboxes Layout...")
@@ -1178,52 +1182,54 @@
self.lToolbox.addItem(
self.multiProjectBrowser,
- UI.PixmapCache.getIcon("multiProjectViewer"),
+ EricPixmapCache.getIcon("multiProjectViewer"),
self.tr("Multiproject-Viewer"),
)
self.lToolbox.addItem(
self.projectBrowser,
- UI.PixmapCache.getIcon("projectViewer"),
+ EricPixmapCache.getIcon("projectViewer"),
self.tr("Project-Viewer"),
)
if self.__findFileWidget:
self.lToolbox.addItem(
self.__findFileWidget,
- UI.PixmapCache.getIcon("find"),
+ EricPixmapCache.getIcon("find"),
self.tr("Find/Replace In Files"),
)
if self.__findLocationWidget:
self.lToolbox.addItem(
self.__findLocationWidget,
- UI.PixmapCache.getIcon("findLocation"),
+ EricPixmapCache.getIcon("findLocation"),
self.tr("Find File"),
)
self.lToolbox.addItem(
self.__vcsStatusWidget,
- UI.PixmapCache.getIcon("tbVcsStatus"),
+ EricPixmapCache.getIcon("tbVcsStatus"),
self.tr("VCS Status"),
)
if self.templateViewer:
self.lToolbox.addItem(
self.templateViewer,
- UI.PixmapCache.getIcon("templateViewer"),
+ EricPixmapCache.getIcon("templateViewer"),
self.tr("Template-Viewer"),
)
if self.browser:
self.lToolbox.addItem(
- self.browser, UI.PixmapCache.getIcon("browser"), self.tr("File-Browser")
+ self.browser,
+ EricPixmapCache.getIcon("browser"),
+ self.tr("File-Browser"),
)
if self.symbolsViewer:
self.lToolbox.addItem(
self.symbolsViewer,
- UI.PixmapCache.getIcon("symbols"),
+ EricPixmapCache.getIcon("symbols"),
self.tr("Symbols"),
)
@@ -1233,62 +1239,62 @@
self.rToolbox.addItem(
self.debugViewer,
- UI.PixmapCache.getIcon("debugViewer"),
+ EricPixmapCache.getIcon("debugViewer"),
self.tr("Debug-Viewer"),
)
if self.codeDocumentationViewer:
self.rToolbox.addItem(
self.codeDocumentationViewer,
- UI.PixmapCache.getIcon("codeDocuViewer"),
+ EricPixmapCache.getIcon("codeDocuViewer"),
self.tr("Code Documentation Viewer"),
)
if self.__helpViewerWidget:
self.rToolbox.addItem(
self.__helpViewerWidget,
- UI.PixmapCache.getIcon("help"),
+ EricPixmapCache.getIcon("help"),
self.tr("Help Viewer"),
)
self.rToolbox.addItem(
self.pluginRepositoryViewer,
- UI.PixmapCache.getIcon("pluginRepository"),
+ EricPixmapCache.getIcon("pluginRepository"),
self.tr("Plugin Repository"),
)
self.rToolbox.addItem(
self.__virtualenvManagerWidget,
- UI.PixmapCache.getIcon("virtualenv"),
+ EricPixmapCache.getIcon("virtualenv"),
self.tr("Virtual Environments"),
)
if self.pipWidget:
self.rToolbox.addItem(
- self.pipWidget, UI.PixmapCache.getIcon("pypi"), self.tr("PyPI")
+ self.pipWidget, EricPixmapCache.getIcon("pypi"), self.tr("PyPI")
)
if self.condaWidget:
self.rToolbox.addItem(
- self.condaWidget, UI.PixmapCache.getIcon("miniconda"), self.tr("Conda")
+ self.condaWidget, EricPixmapCache.getIcon("miniconda"), self.tr("Conda")
)
if self.cooperation:
self.rToolbox.addItem(
self.cooperation,
- UI.PixmapCache.getIcon("cooperation"),
+ EricPixmapCache.getIcon("cooperation"),
self.tr("Cooperation"),
)
if self.irc:
self.rToolbox.addItem(
- self.irc, UI.PixmapCache.getIcon("irc"), self.tr("IRC")
+ self.irc, EricPixmapCache.getIcon("irc"), self.tr("IRC")
)
if self.microPythonWidget:
self.rToolbox.addItem(
self.microPythonWidget,
- UI.PixmapCache.getIcon("micropython"),
+ EricPixmapCache.getIcon("micropython"),
self.tr("MicroPython"),
)
@@ -1297,21 +1303,21 @@
####################################################
self.hToolbox.addItem(
- self.shellAssembly, UI.PixmapCache.getIcon("shell"), self.tr("Shell")
+ self.shellAssembly, EricPixmapCache.getIcon("shell"), self.tr("Shell")
)
self.hToolbox.addItem(
- self.taskViewer, UI.PixmapCache.getIcon("task"), self.tr("Task-Viewer")
+ self.taskViewer, EricPixmapCache.getIcon("task"), self.tr("Task-Viewer")
)
self.hToolbox.addItem(
- self.logViewer, UI.PixmapCache.getIcon("logViewer"), self.tr("Log-Viewer")
+ self.logViewer, EricPixmapCache.getIcon("logViewer"), self.tr("Log-Viewer")
)
if self.numbersViewer:
self.hToolbox.addItem(
self.numbersViewer,
- UI.PixmapCache.getIcon("numbers"),
+ EricPixmapCache.getIcon("numbers"),
self.tr("Numbers"),
)
@@ -1327,7 +1333,7 @@
"""
Private method to create the Sidebars layout.
"""
- from EricWidgets.EricSideBar import EricSideBar, EricSideBarSide
+ from eric7.EricWidgets.EricSideBar import EricSideBar, EricSideBarSide
logging.debug("Creating Sidebars Layout...")
@@ -1359,54 +1365,54 @@
self.leftSidebar.addTab(
self.multiProjectBrowser,
- UI.PixmapCache.getIcon("sbMultiProjectViewer96"),
+ EricPixmapCache.getIcon("sbMultiProjectViewer96"),
self.tr("Multiproject-Viewer"),
)
self.leftSidebar.addTab(
self.projectBrowser,
- UI.PixmapCache.getIcon("sbProjectViewer96"),
+ EricPixmapCache.getIcon("sbProjectViewer96"),
self.tr("Project-Viewer"),
)
if self.__findFileWidget:
self.leftSidebar.addTab(
self.__findFileWidget,
- UI.PixmapCache.getIcon("sbFind96"),
+ EricPixmapCache.getIcon("sbFind96"),
self.tr("Find/Replace In Files"),
)
if self.__findLocationWidget:
self.leftSidebar.addTab(
self.__findLocationWidget,
- UI.PixmapCache.getIcon("sbFindLocation96"),
+ EricPixmapCache.getIcon("sbFindLocation96"),
self.tr("Find File"),
)
self.leftSidebar.addTab(
self.__vcsStatusWidget,
- UI.PixmapCache.getIcon("sbVcsStatus96"),
+ EricPixmapCache.getIcon("sbVcsStatus96"),
self.tr("VCS Status"),
)
if self.templateViewer:
self.leftSidebar.addTab(
self.templateViewer,
- UI.PixmapCache.getIcon("sbTemplateViewer96"),
+ EricPixmapCache.getIcon("sbTemplateViewer96"),
self.tr("Template-Viewer"),
)
if self.browser:
self.leftSidebar.addTab(
self.browser,
- UI.PixmapCache.getIcon("sbFileBrowser96"),
+ EricPixmapCache.getIcon("sbFileBrowser96"),
self.tr("File-Browser"),
)
if self.symbolsViewer:
self.leftSidebar.addTab(
self.symbolsViewer,
- UI.PixmapCache.getIcon("sbSymbolsViewer96"),
+ EricPixmapCache.getIcon("sbSymbolsViewer96"),
self.tr("Symbols"),
)
@@ -1422,68 +1428,68 @@
sidebar.insertTab(
index,
self.debugViewer,
- UI.PixmapCache.getIcon("sbDebugViewer96"),
+ EricPixmapCache.getIcon("sbDebugViewer96"),
self.tr("Debug-Viewer"),
)
else:
sidebar.addTab(
self.debugViewer,
- UI.PixmapCache.getIcon("sbDebugViewer96"),
+ EricPixmapCache.getIcon("sbDebugViewer96"),
self.tr("Debug-Viewer"),
)
if self.codeDocumentationViewer:
sidebar.addTab(
self.codeDocumentationViewer,
- UI.PixmapCache.getIcon("sbCodeDocuViewer96"),
+ EricPixmapCache.getIcon("sbCodeDocuViewer96"),
self.tr("Code Documentation Viewer"),
)
if self.__helpViewerWidget:
sidebar.addTab(
self.__helpViewerWidget,
- UI.PixmapCache.getIcon("sbHelpViewer96"),
+ EricPixmapCache.getIcon("sbHelpViewer96"),
self.tr("Help Viewer"),
)
sidebar.addTab(
self.pluginRepositoryViewer,
- UI.PixmapCache.getIcon("sbPluginRepository96"),
+ EricPixmapCache.getIcon("sbPluginRepository96"),
self.tr("Plugin Repository"),
)
sidebar.addTab(
self.__virtualenvManagerWidget,
- UI.PixmapCache.getIcon("sbVirtenvManager96"),
+ EricPixmapCache.getIcon("sbVirtenvManager96"),
self.tr("Virtual Environments"),
)
if self.pipWidget:
sidebar.addTab(
- self.pipWidget, UI.PixmapCache.getIcon("sbPyPI96"), self.tr("PyPI")
+ self.pipWidget, EricPixmapCache.getIcon("sbPyPI96"), self.tr("PyPI")
)
if self.condaWidget:
sidebar.addTab(
self.condaWidget,
- UI.PixmapCache.getIcon("sbMiniconda96"),
+ EricPixmapCache.getIcon("sbMiniconda96"),
self.tr("Conda"),
)
if self.cooperation:
sidebar.addTab(
self.cooperation,
- UI.PixmapCache.getIcon("sbCooperation96"),
+ EricPixmapCache.getIcon("sbCooperation96"),
self.tr("Cooperation"),
)
if self.irc:
- sidebar.addTab(self.irc, UI.PixmapCache.getIcon("sbIrc96"), self.tr("IRC"))
+ sidebar.addTab(self.irc, EricPixmapCache.getIcon("sbIrc96"), self.tr("IRC"))
if self.microPythonWidget:
sidebar.addTab(
self.microPythonWidget,
- UI.PixmapCache.getIcon("sbMicroPython96"),
+ EricPixmapCache.getIcon("sbMicroPython96"),
self.tr("MicroPython"),
)
@@ -1492,25 +1498,25 @@
####################################################
self.bottomSidebar.addTab(
- self.shellAssembly, UI.PixmapCache.getIcon("sbShell96"), self.tr("Shell")
+ self.shellAssembly, EricPixmapCache.getIcon("sbShell96"), self.tr("Shell")
)
self.bottomSidebar.addTab(
self.taskViewer,
- UI.PixmapCache.getIcon("sbTasksViewer96"),
+ EricPixmapCache.getIcon("sbTasksViewer96"),
self.tr("Task-Viewer"),
)
self.bottomSidebar.addTab(
self.logViewer,
- UI.PixmapCache.getIcon("sbLogViewer96"),
+ EricPixmapCache.getIcon("sbLogViewer96"),
self.tr("Log-Viewer"),
)
if self.numbersViewer:
self.bottomSidebar.addTab(
self.numbersViewer,
- UI.PixmapCache.getIcon("sbNumbers96"),
+ EricPixmapCache.getIcon("sbNumbers96"),
self.tr("Numbers"),
)
@@ -1766,7 +1772,7 @@
"""
Public method to process the file containing installation information.
"""
- import Globals
+ from eric7 import Globals
installInfoFile = Globals.getInstallInfoFilePath()
if not os.path.exists(installInfoFile):
@@ -1933,7 +1939,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,
@@ -1955,7 +1961,7 @@
self.restartAct = EricAction(
self.tr("Restart"),
- UI.PixmapCache.getIcon("restart"),
+ EricPixmapCache.getIcon("restart"),
self.tr("Restart"),
QKeySequence(self.tr("Ctrl+Shift+Q", "File|Quit")),
0,
@@ -2014,7 +2020,7 @@
self.newWindowAct = EricAction(
self.tr("New Window"),
- UI.PixmapCache.getIcon("newWindow"),
+ EricPixmapCache.getIcon("newWindow"),
self.tr("New &Window"),
QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
0,
@@ -2036,7 +2042,7 @@
self.setEditProfileAct = EricAction(
self.tr("Edit Profile"),
- UI.PixmapCache.getIcon("viewProfileEdit"),
+ EricPixmapCache.getIcon("viewProfileEdit"),
self.tr("Edit Profile"),
0,
0,
@@ -2058,7 +2064,7 @@
self.setDebugProfileAct = EricAction(
self.tr("Debug Profile"),
- UI.PixmapCache.getIcon("viewProfileDebug"),
+ EricPixmapCache.getIcon("viewProfileDebug"),
self.tr("Debug Profile"),
0,
0,
@@ -2734,7 +2740,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")),
0,
@@ -2757,7 +2763,7 @@
self.helpviewerAct = EricAction(
self.tr("Helpviewer"),
- UI.PixmapCache.getIcon("help"),
+ EricPixmapCache.getIcon("help"),
self.tr("&Helpviewer..."),
QKeySequence(self.tr("F1")),
0,
@@ -2873,7 +2879,7 @@
self.testingDialogAct = EricAction(
self.tr("Testing"),
- UI.PixmapCache.getIcon("unittest"),
+ EricPixmapCache.getIcon("unittest"),
self.tr("&Testing..."),
0,
0,
@@ -2894,7 +2900,7 @@
self.restartTestAct = EricAction(
self.tr("Restart Last Test"),
- UI.PixmapCache.getIcon("unittestRestart"),
+ EricPixmapCache.getIcon("unittestRestart"),
self.tr("&Restart Last Test..."),
0,
0,
@@ -2914,7 +2920,7 @@
self.rerunFailedTestsAct = EricAction(
self.tr("Rerun Failed Tests"),
- UI.PixmapCache.getIcon("unittestRerunFailed"),
+ EricPixmapCache.getIcon("unittestRerunFailed"),
self.tr("Rerun Failed Tests..."),
0,
0,
@@ -2936,7 +2942,7 @@
self.testScriptAct = EricAction(
self.tr("Test Script"),
- UI.PixmapCache.getIcon("unittestScript"),
+ EricPixmapCache.getIcon("unittestScript"),
self.tr("Test &Script..."),
0,
0,
@@ -2955,7 +2961,7 @@
self.testProjectAct = EricAction(
self.tr("Test Project"),
- UI.PixmapCache.getIcon("unittestProject"),
+ EricPixmapCache.getIcon("unittestProject"),
self.tr("Test &Project..."),
0,
0,
@@ -2987,7 +2993,7 @@
if os.path.exists(designerExe):
self.designer4Act = EricAction(
self.tr("Qt-Designer"),
- UI.PixmapCache.getIcon("designer4"),
+ EricPixmapCache.getIcon("designer4"),
self.tr("Qt-&Designer..."),
0,
0,
@@ -3017,7 +3023,7 @@
if os.path.exists(linguistExe):
self.linguist4Act = EricAction(
self.tr("Qt-Linguist"),
- UI.PixmapCache.getIcon("linguist4"),
+ EricPixmapCache.getIcon("linguist4"),
self.tr("Qt-&Linguist..."),
0,
0,
@@ -3035,7 +3041,7 @@
self.uipreviewerAct = EricAction(
self.tr("UI Previewer"),
- UI.PixmapCache.getIcon("uiPreviewer"),
+ EricPixmapCache.getIcon("uiPreviewer"),
self.tr("&UI Previewer..."),
0,
0,
@@ -3051,7 +3057,7 @@
self.trpreviewerAct = EricAction(
self.tr("Translations Previewer"),
- UI.PixmapCache.getIcon("trPreviewer"),
+ EricPixmapCache.getIcon("trPreviewer"),
self.tr("&Translations Previewer..."),
0,
0,
@@ -3070,7 +3076,7 @@
self.diffAct = EricAction(
self.tr("Compare Files"),
- UI.PixmapCache.getIcon("diffFiles"),
+ EricPixmapCache.getIcon("diffFiles"),
self.tr("&Compare Files..."),
0,
0,
@@ -3089,7 +3095,7 @@
self.compareAct = EricAction(
self.tr("Compare Files side by side"),
- UI.PixmapCache.getIcon("compareFiles"),
+ EricPixmapCache.getIcon("compareFiles"),
self.tr("Compare &Files side by side..."),
0,
0,
@@ -3109,7 +3115,7 @@
self.sqlBrowserAct = EricAction(
self.tr("SQL Browser"),
- UI.PixmapCache.getIcon("sqlBrowser"),
+ EricPixmapCache.getIcon("sqlBrowser"),
self.tr("SQL &Browser..."),
0,
0,
@@ -3125,7 +3131,7 @@
self.miniEditorAct = EricAction(
self.tr("Mini Editor"),
- UI.PixmapCache.getIcon("editor"),
+ EricPixmapCache.getIcon("editor"),
self.tr("Mini &Editor..."),
0,
0,
@@ -3144,7 +3150,7 @@
self.hexEditorAct = EricAction(
self.tr("Hex Editor"),
- UI.PixmapCache.getIcon("hexEditor"),
+ EricPixmapCache.getIcon("hexEditor"),
self.tr("&Hex Editor..."),
0,
0,
@@ -3164,7 +3170,7 @@
self.webBrowserAct = EricAction(
self.tr("eric Web Browser"),
- UI.PixmapCache.getIcon("ericWeb"),
+ EricPixmapCache.getIcon("ericWeb"),
self.tr("eric &Web Browser..."),
0,
0,
@@ -3183,7 +3189,7 @@
self.iconEditorAct = EricAction(
self.tr("Icon Editor"),
- UI.PixmapCache.getIcon("iconEditor"),
+ EricPixmapCache.getIcon("iconEditor"),
self.tr("&Icon Editor..."),
0,
0,
@@ -3202,7 +3208,7 @@
self.snapshotAct = EricAction(
self.tr("Snapshot"),
- UI.PixmapCache.getIcon("ericSnap"),
+ EricPixmapCache.getIcon("ericSnap"),
self.tr("&Snapshot..."),
0,
0,
@@ -3222,7 +3228,7 @@
self.prefAct = EricAction(
self.tr("Preferences"),
- UI.PixmapCache.getIcon("configure"),
+ EricPixmapCache.getIcon("configure"),
self.tr("&Preferences..."),
0,
0,
@@ -3243,7 +3249,7 @@
self.prefExportAct = EricAction(
self.tr("Export Preferences"),
- UI.PixmapCache.getIcon("configureExport"),
+ EricPixmapCache.getIcon("configureExport"),
self.tr("E&xport Preferences..."),
0,
0,
@@ -3262,7 +3268,7 @@
self.prefImportAct = EricAction(
self.tr("Import Preferences"),
- UI.PixmapCache.getIcon("configureImport"),
+ EricPixmapCache.getIcon("configureImport"),
self.tr("I&mport Preferences..."),
0,
0,
@@ -3283,7 +3289,7 @@
self.themeExportAct = EricAction(
self.tr("Export Theme"),
- UI.PixmapCache.getIcon("themeExport"),
+ EricPixmapCache.getIcon("themeExport"),
self.tr("Export Theme..."),
0,
0,
@@ -3302,7 +3308,7 @@
self.themeImportAct = EricAction(
self.tr("Import Theme"),
- UI.PixmapCache.getIcon("themeImport"),
+ EricPixmapCache.getIcon("themeImport"),
self.tr("Import Theme..."),
0,
0,
@@ -3331,7 +3337,7 @@
self.showExternalToolsAct = EricAction(
self.tr("Show external tools"),
- UI.PixmapCache.getIcon("showPrograms"),
+ EricPixmapCache.getIcon("showPrograms"),
self.tr("Show external &tools"),
0,
0,
@@ -3351,7 +3357,7 @@
self.configViewProfilesAct = EricAction(
self.tr("View Profiles"),
- UI.PixmapCache.getIcon("configureViewProfiles"),
+ EricPixmapCache.getIcon("configureViewProfiles"),
self.tr("&View Profiles..."),
0,
0,
@@ -3372,7 +3378,7 @@
self.configToolBarsAct = EricAction(
self.tr("Toolbars"),
- UI.PixmapCache.getIcon("toolbarsConfigure"),
+ EricPixmapCache.getIcon("toolbarsConfigure"),
self.tr("Tool&bars..."),
0,
0,
@@ -3393,7 +3399,7 @@
self.shortcutsAct = EricAction(
self.tr("Keyboard Shortcuts"),
- UI.PixmapCache.getIcon("configureShortcuts"),
+ EricPixmapCache.getIcon("configureShortcuts"),
self.tr("Keyboard &Shortcuts..."),
0,
0,
@@ -3413,7 +3419,7 @@
self.exportShortcutsAct = EricAction(
self.tr("Export Keyboard Shortcuts"),
- UI.PixmapCache.getIcon("exportShortcuts"),
+ EricPixmapCache.getIcon("exportShortcuts"),
self.tr("&Export Keyboard Shortcuts..."),
0,
0,
@@ -3432,7 +3438,7 @@
self.importShortcutsAct = EricAction(
self.tr("Import Keyboard Shortcuts"),
- UI.PixmapCache.getIcon("importShortcuts"),
+ EricPixmapCache.getIcon("importShortcuts"),
self.tr("&Import Keyboard Shortcuts..."),
0,
0,
@@ -3452,7 +3458,7 @@
if SSL_AVAILABLE:
self.certificatesAct = EricAction(
self.tr("Manage SSL Certificates"),
- UI.PixmapCache.getIcon("certificates"),
+ EricPixmapCache.getIcon("certificates"),
self.tr("Manage SSL Certificates..."),
0,
0,
@@ -3474,7 +3480,7 @@
self.editMessageFilterAct = EricAction(
self.tr("Edit Message Filters"),
- UI.PixmapCache.getIcon("warning"),
+ EricPixmapCache.getIcon("warning"),
self.tr("Edit Message Filters..."),
0,
0,
@@ -3497,7 +3503,7 @@
self.clearPrivateDataAct = EricAction(
self.tr("Clear private data"),
- UI.PixmapCache.getIcon("clearPrivateData"),
+ EricPixmapCache.getIcon("clearPrivateData"),
self.tr("Clear private data"),
0,
0,
@@ -3565,7 +3571,7 @@
self.pluginInfoAct = EricAction(
self.tr("Plugin Infos"),
- UI.PixmapCache.getIcon("plugin"),
+ EricPixmapCache.getIcon("plugin"),
self.tr("&Plugin Infos..."),
0,
0,
@@ -3585,7 +3591,7 @@
self.pluginInstallAct = EricAction(
self.tr("Install Plugins"),
- UI.PixmapCache.getIcon("pluginInstall"),
+ EricPixmapCache.getIcon("pluginInstall"),
self.tr("&Install Plugins..."),
0,
0,
@@ -3604,7 +3610,7 @@
self.pluginDeinstallAct = EricAction(
self.tr("Uninstall Plugin"),
- UI.PixmapCache.getIcon("pluginUninstall"),
+ EricPixmapCache.getIcon("pluginUninstall"),
self.tr("&Uninstall Plugin..."),
0,
0,
@@ -3623,7 +3629,7 @@
self.pluginRepoAct = EricAction(
self.tr("Plugin Repository"),
- UI.PixmapCache.getIcon("pluginRepository"),
+ EricPixmapCache.getIcon("pluginRepository"),
self.tr("Plugin &Repository..."),
0,
0,
@@ -3964,7 +3970,7 @@
##############################################################
pluginsMenu = QMenu(self.tr("P&lugins"), self)
- pluginsMenu.setIcon(UI.PixmapCache.getIcon("plugin"))
+ pluginsMenu.setIcon(EricPixmapCache.getIcon("plugin"))
pluginsMenu.setTearOffEnabled(True)
pluginsMenu.addAction(self.pluginInfoAct)
pluginsMenu.addAction(self.pluginInstallAct)
@@ -4417,9 +4423,9 @@
)
self.sbZoom = EricZoomWidget(
- UI.PixmapCache.getPixmap("zoomOut"),
- UI.PixmapCache.getPixmap("zoomIn"),
- UI.PixmapCache.getPixmap("zoomReset"),
+ EricPixmapCache.getPixmap("zoomOut"),
+ EricPixmapCache.getPixmap("zoomIn"),
+ EricPixmapCache.getPixmap("zoomReset"),
self.__statusBar,
)
self.__statusBar.addPermanentWidget(self.sbZoom)
@@ -4440,7 +4446,7 @@
self.sbZoom,
)
- from VCS.StatusMonitorLed import StatusMonitorLedWidget
+ from eric7.VCS.StatusMonitorLed import StatusMonitorLedWidget
self.sbVcsMonitorLed = StatusMonitorLedWidget(self.project, self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbVcsMonitorLed)
@@ -4460,7 +4466,7 @@
for tool in toolGroup[1]:
if tool["menutext"] != "--":
act = QAction(
- UI.PixmapCache.getIcon(tool["icon"]), tool["menutext"], self
+ EricPixmapCache.getIcon(tool["icon"]), tool["menutext"], self
)
act.setObjectName("{0}@@{1}".format(toolGroup[0], tool["menutext"]))
act.triggered.connect(
@@ -4503,7 +4509,7 @@
key = "{0}@@{1}".format(toolGroup[0], tool["menutext"])
if key not in groupActionKeys:
act = QAction(
- UI.PixmapCache.getIcon(tool["icon"]), tool["menutext"], self
+ EricPixmapCache.getIcon(tool["icon"]), tool["menutext"], self
)
act.setObjectName(key)
act.triggered.connect(
@@ -4529,6 +4535,11 @@
"""
Private slot to display the Wizards menu.
"""
+ actionsList = self.__menus["wizards"].actions()
+ self.__menus["wizards"].clear()
+ self.__menus["wizards"].addActions(
+ sorted(actionsList, key=lambda a: a.text().replace("&", ""))
+ )
self.showMenu.emit("Wizards", self.__menus["wizards"])
def __showHelpMenu(self):
@@ -4641,7 +4652,7 @@
# webengine (chromium) version
with contextlib.suppress(ImportError):
- from WebBrowser.Tools import WebBrowserTools
+ from eric7.WebBrowser.Tools import WebBrowserTools
(
chromiumVersion,
@@ -4829,7 +4840,7 @@
"""
Private slot to show a mini editor window.
"""
- from QScintilla.MiniEditor import MiniEditor
+ from eric7.QScintilla.MiniEditor import MiniEditor
editor = MiniEditor(parent=self)
editor.show()
@@ -5149,10 +5160,10 @@
Private slot to start a new instance of eric.
"""
if not Preferences.getUI("SingleApplicationMode"):
- # start eric without any arguments
+ # start eric without loading anything and without crash session
program = Globals.getPythonExecutable()
- eric7 = os.path.join(getConfig("ericDir"), "eric7.py")
- args = [eric7]
+ eric7 = os.path.join(os.path.dirname(__file__), "..", "eric7_ide.py")
+ args = [eric7, "--no-open", "--disable-crash"]
QProcess.startDetached(program, args)
def __initToolsMenus(self, menu):
@@ -5225,7 +5236,7 @@
self.__menus["user_tools"].addSeparator()
else:
act = self.__menus["user_tools"].addAction(
- UI.PixmapCache.getIcon(tool["icon"]), tool["menutext"]
+ EricPixmapCache.getIcon(tool["icon"]), tool["menutext"]
)
act.setData(idx)
except IndexError:
@@ -5933,7 +5944,7 @@
"""
Private slot to handle the tools configuration menu entry.
"""
- from Preferences.ToolConfigurationDialog import ToolConfigurationDialog
+ from eric7.Preferences.ToolConfigurationDialog import ToolConfigurationDialog
dlg = ToolConfigurationDialog(self.toolGroups[self.currentToolGroup][1], self)
if dlg.exec() == QDialog.DialogCode.Accepted:
@@ -5944,7 +5955,7 @@
"""
Private slot to handle the tool groups configuration menu entry.
"""
- from Preferences.ToolGroupConfigurationDialog import (
+ from eric7.Preferences.ToolGroupConfigurationDialog import (
ToolGroupConfigurationDialog,
)
@@ -5957,7 +5968,7 @@
Private slot to generate the testing dialog on demand.
"""
if self.__testingWidget is None:
- from Testing.TestingWidget import TestingWidget
+ from eric7.Testing.TestingWidget import TestingWidget
self.__testingWidget = TestingWidget()
self.__testingWidget.testFile.connect(self.viewmanager.setFileLine)
@@ -6412,7 +6423,7 @@
@param fn filename of the file to show (string)
"""
- from HexEdit.HexEditMainWindow import HexEditMainWindow
+ from eric7.HexEdit.HexEditMainWindow import HexEditMainWindow
dlg = HexEditMainWindow(fn, self, fromEric=True, project=self.project)
dlg.show()
@@ -6425,7 +6436,7 @@
@param fn filename of the file to show (string)
"""
- from IconEditor.IconEditorWindow import IconEditorWindow
+ from eric7.IconEditor.IconEditorWindow import IconEditorWindow
dlg = IconEditorWindow(fn, self, fromEric=True, project=self.project)
dlg.show()
@@ -6438,7 +6449,7 @@
@param fn filename of the file to show (string)
"""
- from Graphics.PixmapDiagram import PixmapDiagram
+ from eric7.Graphics.PixmapDiagram import PixmapDiagram
dlg = PixmapDiagram(fn, self)
if dlg.getStatus():
@@ -6452,7 +6463,7 @@
@param fn filename of the file to show (string)
"""
- from Graphics.SvgDiagram import SvgDiagram
+ from eric7.Graphics.SvgDiagram import SvgDiagram
dlg = SvgDiagram(fn, self)
dlg.show()
@@ -6465,7 +6476,7 @@
@param fn name of the file to be shown
@type str
"""
- from Graphics.UMLDialog import UMLDialog, UMLDialogType
+ from eric7.Graphics.UMLDialog import UMLDialog, UMLDialogType
dlg = UMLDialog(UMLDialogType.NO_DIAGRAM, self.project, parent=self)
if dlg.load(fn):
@@ -7075,7 +7086,7 @@
-1 = server exited with an error code)
@rtype int
"""
- from WebBrowser.WebBrowserSingleApplication import (
+ from eric7.WebBrowser.WebBrowserSingleApplication import (
WebBrowserSingleApplicationClient,
)
@@ -7155,7 +7166,7 @@
"""
if self.__configurationDialog is None:
# only one invocation at a time is allowed
- from Preferences.ConfigurationDialog import ConfigurationDialog
+ from eric7.Preferences.ConfigurationDialog import ConfigurationDialog
self.__configurationDialog = ConfigurationDialog(
self,
@@ -7203,7 +7214,7 @@
@pyqtSlot()
def __importPreferences(self):
"""
- Private slot to import preferences.
+ Private slot to from eric7 import Preferences.
"""
Preferences.importPreferences()
self.__preferencesChanged()
@@ -7213,7 +7224,7 @@
"""
Private slot to export the current theme to a file.
"""
- from Preferences.ThemeManager import ThemeManager
+ from eric7.Preferences.ThemeManager import ThemeManager
ThemeManager().exportTheme()
@@ -7222,7 +7233,7 @@
"""
Private slot to import a previously exported theme.
"""
- from Preferences.ThemeManager import ThemeManager
+ from eric7.Preferences.ThemeManager import ThemeManager
if ThemeManager().importTheme():
self.__preferencesChanged()
@@ -7268,14 +7279,14 @@
self.performVersionCheck()
- from QScintilla.SpellChecker import SpellChecker
+ from eric7.QScintilla.SpellChecker import SpellChecker
SpellChecker.setDefaultLanguage(
Preferences.getEditor("SpellCheckingDefaultLanguage")
)
with contextlib.suppress(ImportError, AttributeError):
- from EricWidgets.EricSpellCheckedTextEdit import SpellCheckMixin
+ from eric7.EricWidgets.EricSpellCheckedTextEdit import SpellCheckMixin
pwl = SpellChecker.getUserDictionaryPath(isException=False)
pel = SpellChecker.getUserDictionaryPath(isException=True)
@@ -7290,7 +7301,7 @@
QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory)
QNetworkProxyFactory.setUseSystemConfiguration(False)
- from HexEdit.HexEditMainWindow import HexEditMainWindow
+ from eric7.HexEdit.HexEditMainWindow import HexEditMainWindow
for hexEditor in HexEditMainWindow.windows:
hexEditor.preferencesChanged()
@@ -7317,13 +7328,13 @@
@param oldPassword current master password (string)
@param newPassword new master password (string)
"""
- import Globals
+ from eric7 import Globals
self.masterPasswordChanged.emit(oldPassword, newPassword)
Preferences.convertPasswords(oldPassword, newPassword)
variant = Globals.getWebBrowserSupport()
if variant == "QtWebEngine":
- from WebBrowser.Passwords.PasswordManager import PasswordManager
+ from eric7.WebBrowser.Passwords.PasswordManager import PasswordManager
pwManager = PasswordManager()
pwManager.masterPasswordChanged(oldPassword, newPassword)
@@ -7341,7 +7352,7 @@
by eric.
"""
if self.programsDialog is None:
- from Preferences.ProgramsDialog import ProgramsDialog
+ from eric7.Preferences.ProgramsDialog import ProgramsDialog
self.programsDialog = ProgramsDialog(self)
self.programsDialog.show()
@@ -7350,7 +7361,7 @@
"""
Private slot to configure the various view profiles.
"""
- from Preferences.ViewProfileDialog import ViewProfileDialog
+ from eric7.Preferences.ViewProfileDialog import ViewProfileDialog
dlg = ViewProfileDialog(
self.__layoutType, self.profiles["edit"][1], self.profiles["debug"][1]
@@ -7369,7 +7380,7 @@
"""
Private slot to configure the various toolbars.
"""
- from EricWidgets.EricToolBarDialog import EricToolBarDialog
+ from eric7.EricWidgets.EricToolBarDialog import EricToolBarDialog
dlg = EricToolBarDialog(self.toolbarManager)
if dlg.exec() == QDialog.DialogCode.Accepted:
@@ -7380,7 +7391,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()
@@ -7422,7 +7433,7 @@
)
if ok:
- from Preferences import Shortcuts
+ from eric7.Preferences import Shortcuts
Shortcuts.exportShortcuts(str(fpath))
@@ -7440,7 +7451,7 @@
)
if fn:
- from Preferences import Shortcuts
+ from eric7.Preferences import Shortcuts
Shortcuts.importShortcuts(fn)
@@ -7448,7 +7459,9 @@
"""
Private slot to show the certificates management dialog.
"""
- from EricNetwork.EricSslCertificatesDialog import EricSslCertificatesDialog
+ from eric7.EricNetwork.EricSslCertificatesDialog import (
+ EricSslCertificatesDialog,
+ )
dlg = EricSslCertificatesDialog(self)
dlg.exec()
@@ -7491,7 +7504,7 @@
if testing:
# clear the unit test histories
if self.__testingWidget is None:
- from Testing.TestingWidget import clearSavedHistories
+ from eric7.Testing.TestingWidget import clearSavedHistories
clearSavedHistories()
else:
@@ -7515,7 +7528,7 @@
"""
Private slot to handle the projectOpened signal.
"""
- import Testing
+ from eric7 import Testing
self.__setWindowCaption(project=self.project.name)
supported = Testing.isLanguageSupported(self.project.getProjectLanguage())
@@ -7568,7 +7581,7 @@
self.wizardsMenuAct.setEnabled(len(self.__menus["wizards"].actions()) > 0)
if fn and str(fn) != "None":
- import Testing
+ from eric7 import Testing
if Testing.isLanguageSupported(
self.viewmanager.getOpenEditor(fn).getFileType()
@@ -7585,7 +7598,7 @@
fn = editor.getFileName() if editor else None
if fn:
- import Testing
+ from eric7 import Testing
if Testing.isLanguageSupported(editor.getFileType()):
self.testScriptAct.setEnabled(True)
@@ -7615,7 +7628,7 @@
if os.path.exists(fn):
f = QFile(fn)
if f.open(QIODevice.OpenModeFlag.ReadOnly):
- from EricXML.TasksReader import TasksReader
+ from eric7.EricXML.TasksReader import TasksReader
reader = TasksReader(f, viewer=self.taskViewer)
reader.readXML()
@@ -7685,7 +7698,7 @@
# old XML based format
f = QFile(fn)
if f.open(QIODevice.OpenModeFlag.ReadOnly):
- from EricXML.SessionReader import SessionReader
+ from eric7.EricXML.SessionReader import SessionReader
self.__readingSession = True
reader = SessionReader(f, True)
@@ -8005,7 +8018,7 @@
"""
Private slot to show the plugin info dialog.
"""
- from PluginManager.PluginInfoDialog import PluginInfoDialog
+ from eric7.PluginManager.PluginInfoDialog import PluginInfoDialog
self.__pluginInfoDialog = PluginInfoDialog(self.pluginManager, self)
self.__pluginInfoDialog.show()
@@ -8018,7 +8031,7 @@
@param pluginFileNames list of plugin files suggested for
installation list of strings
"""
- from PluginManager.PluginInstallDialog import PluginInstallDialog
+ from eric7.PluginManager.PluginInstallDialog import PluginInstallDialog
self.__pluginInstallDialog = PluginInstallDialog(
self.pluginManager,
@@ -8045,7 +8058,7 @@
"""
Private slot to show a dialog to uninstall a plugin.
"""
- from PluginManager.PluginUninstallDialog import PluginUninstallDialog
+ from eric7.PluginManager.PluginUninstallDialog import PluginUninstallDialog
dlg = PluginUninstallDialog(self.pluginManager, self)
dlg.exec()
@@ -8055,7 +8068,7 @@
"""
Private slot to show the plugins available for download.
"""
- from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
+ from eric7.PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
dlg = PluginRepositoryDialog(self.pluginManager, self)
res = dlg.exec()
