Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Sun Jan 05 23:22:17 2014 +0100
+++ b/UI/UserInterface.py	Sun Mar 30 22:00:14 2014 +0200
@@ -202,6 +202,10 @@
         from Debugger.DebugServer import DebugServer
         debugServer = DebugServer()
         
+        # Create the background service object
+        from Utilities.BackgroundService import BackgroundService
+        self.backgroundService = BackgroundService()
+        
         # Generate an empty project object and multi project object
         from Project.Project import Project
         self.project = Project(self)
@@ -450,6 +454,7 @@
         e5App().registerObject("UserInterface", self)
         e5App().registerObject("DebugUI", self.debuggerUI)
         e5App().registerObject("DebugServer", debugServer)
+        e5App().registerObject("BackgroundService", self.backgroundService)
         e5App().registerObject("ViewManager", self.viewmanager)
         e5App().registerObject("Project", self.project)
         e5App().registerObject("ProjectBrowser", self.projectBrowser)
@@ -5372,8 +5377,7 @@
                     self.utEditorOpen = cap & HasUnittest
                     return
             
-            if self.viewmanager.getOpenEditor(fn).isPy3File() or \
-               self.viewmanager.getOpenEditor(fn).isPy2File():
+            if self.viewmanager.getOpenEditor(fn).getPyVersion():
                 self.utScriptAct.setEnabled(True)
                 self.utEditorOpen = True
         
@@ -5399,7 +5403,7 @@
                     self.utEditorOpen = cap & HasUnittest
                     return
             
-            if editor.isPy3File() or editor.isPy2File():
+            if editor.getPyVersion():
                 self.utScriptAct.setEnabled(True)
                 self.utEditorOpen = True
                 return
@@ -5741,6 +5745,8 @@
             return False
         self.debuggerUI.shutdown()
         
+        self.backgroundService.shutdown()
+        
         self.cooperation.shutdown()
         
         self.pluginManager.doShutdown()