Mercurial Repositories > eric / file diff

--- a/src/eric7/UI/UserInterface.py	Tue Apr 02 10:13:41 2024 +0200
+++ b/src/eric7/UI/UserInterface.py	Wed Apr 24 10:14:16 2024 +0200
@@ -57,6 +57,7 @@
 from eric7.CondaInterface.Conda import Conda
 from eric7.Debugger.DebugServer import DebugServer
 from eric7.Debugger.DebugUI import DebugUI
+from eric7.EricCore import EricFileSystemWatcher
 from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
 from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
@@ -426,6 +427,9 @@
         self.projectBrowser.sourceFile[str, int, str].connect(
             self.viewmanager.openSourceFile
         )
+        self.projectBrowser.sourceFile[str, int, int].connect(
+            self.viewmanager.openSourceFileLinePos
+        )
         self.projectBrowser.closeSourceWindow.connect(self.viewmanager.closeWindow)
         self.projectBrowser.testFile.connect(self.__startTestScript)
         self.projectBrowser.designerFile.connect(self.__designer)
@@ -476,7 +480,6 @@
         self.debuggerUI.processChangedProjectFiles.connect(
             self.project.processChangedProjectFiles
         )
-        self.debuggerUI.appendStdout.connect(self.appendToStdout)
 
         self.__debugServer.clientDisassembly.connect(
             self.debugViewer.disassemblyViewer.showDisassembly
@@ -514,6 +517,9 @@
             self.browser.sourceFile[str, int, str].connect(
                 self.viewmanager.openSourceFile
             )
+            self.browser.sourceFile[str, int, int].connect(
+                self.viewmanager.openSourceFileLinePos
+            )
             self.browser.designerFile.connect(self.__designer)
             self.browser.linguistFile.connect(self.__linguist)
             self.browser.projectFile.connect(self.project.openProject)
@@ -8262,6 +8268,10 @@
         Preferences.saveToolGroups(self.toolGroups, self.currentToolGroup)
         Preferences.syncPreferences()
         self.shutdownCalled = True
+
+        # shut down the global file system watcher
+        EricFileSystemWatcher.instance().shutdown()
+
         return True
 
     def isOnline(self):
@@ -8471,11 +8481,11 @@
     ## some event handlers below
     ############################
 
-    def showEvent(self, evt):
+    def showEvent(self, _evt):
         """
         Protected method to handle the show event.
 
-        @param evt reference to the show event
+        @param _evt reference to the show event (unused)
         @type QShowEvent
         """
         if self.__startup: