diff -r 0802dce3d1c3 -r 67773a953b64 src/eric7/UI/UserInterface.py
--- a/src/eric7/UI/UserInterface.py Sat May 03 18:07:34 2025 +0200
+++ b/src/eric7/UI/UserInterface.py Sun May 04 16:38:04 2025 +0200
@@ -62,7 +62,7 @@
QWidget,
)
-from eric7 import EricUtilities, Globals, Preferences, Testing, Utilities
+from eric7 import EricUtilities, Globals, Preferences, Testing, Utilities, ViewManager
from eric7.__version__ import Version, VersionOnly
from eric7.CondaInterface.Conda import Conda
from eric7.Debugger.DebugServer import DebugServer
@@ -320,14 +320,20 @@
releaseMode=UserInterface.ReleaseMode, parent=self
)
+ # Initialize the Plugin Manager (Plugins are initialized later)
splash.showMessage(self.tr("Initializing Plugin Manager..."))
logging.getLogger(__name__).debug("Initializing Plugin Manager...")
-
- # Initialize the Plugin Manager (Plugins are initialized later)
self.pluginManager = PluginManager(
self, self.__disabledPlugins, develPlugin=plugin
)
+ # Create the view manager depending on the configuration setting
+ logging.getLogger(__name__).debug("Creating Viewmanager...")
+ self.viewmanager = ViewManager.factory(
+ self, self.__debugServer, self.__ericServerInterface, self.pluginManager
+ )
+ ericApp().registerObject("ViewManager", self.viewmanager)
+
splash.showMessage(self.tr("Generating Main User Interface..."))
logging.getLogger(__name__).debug("Generating Main User Interface...")
@@ -542,17 +548,6 @@
lambda v: self.viewmanager.zoomValueChanged(v, self.shell)
)
- if self.cooperation is not None:
- self.viewmanager.checkActions.connect(self.cooperation.checkEditorActions)
- self.preferencesChanged.connect(self.cooperation.preferencesChanged)
- self.cooperation.shareEditor.connect(self.viewmanager.shareEditor)
- self.cooperation.startEdit.connect(self.viewmanager.startSharedEdit)
- self.cooperation.sendEdit.connect(self.viewmanager.sendSharedEdit)
- self.cooperation.cancelEdit.connect(self.viewmanager.cancelSharedEdit)
- self.cooperation.connected.connect(self.viewmanager.shareConnected)
- self.cooperation.editorCommand.connect(self.viewmanager.receive)
- self.viewmanager.setCooperationClient(self.cooperation.getClient())
-
if self.symbolsViewer is not None:
self.symbolsViewer.insertSymbol.connect(self.viewmanager.insertSymbol)
@@ -609,7 +604,6 @@
ericApp().registerObject("DebugUI", self.debuggerUI)
ericApp().registerObject("DebugServer", self.__debugServer)
ericApp().registerObject("BackgroundService", self.backgroundService)
- ericApp().registerObject("ViewManager", self.viewmanager)
ericApp().registerObject("ProjectBrowser", self.projectBrowser)
ericApp().registerObject("MultiProject", self.multiProject)
ericApp().registerObject("TaskViewer", self.taskViewer)
@@ -784,7 +778,6 @@
"""
Private method to create the various application objects.
"""
- from eric7 import ViewManager
from eric7.Debugger.DebugViewer import DebugViewer
from eric7.JediInterface.AssistantJedi import AssistantJedi
from eric7.MultiProject.MultiProjectBrowser import MultiProjectBrowser
@@ -800,12 +793,6 @@
from .PythonAstViewer import PythonAstViewer
from .PythonDisViewer import PythonDisViewer
- # Create the view manager depending on the configuration setting
- logging.getLogger(__name__).debug("Creating Viewmanager...")
- self.viewmanager = ViewManager.factory(
- self, self.__debugServer, self.__ericServerInterface, self.pluginManager
- )
-
# Create previewer
logging.getLogger(__name__).debug("Creating Previewer...")
self.__previewer = Previewer(viewmanager=self.viewmanager, ui=self)
