Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Mon Apr 02 12:04:56 2018 +0200
+++ b/UI/UserInterface.py	Tue May 01 12:03:52 2018 +0200
@@ -164,25 +164,36 @@
     
     ErrorLogFileName = "eric6_error.log"
     
-    def __init__(self, app, locale, splash, plugin, noOpenAtStartup,
-                 noCrashOpenAtStartup, disableCrashSession, restartArguments):
+    def __init__(self, app, locale, splash, plugin, disabledPlugins,
+                 noOpenAtStartup, noCrashOpenAtStartup, disableCrashSession,
+                 restartArguments):
         """
         Constructor
         
-        @param app reference to the application object (E5Application)
-        @param locale locale to be used by the UI (string)
+        @param app reference to the application object
+        @type E5Application
+        @param locale locale to be used by the UI
+        @type str
         @param splash reference to the splashscreen
-            (UI.SplashScreen.SplashScreen)
-        @param plugin filename of a plugin to be loaded (used for plugin
+        @type UI.SplashScreen.SplashScreen
+        @param plugin filename of a plug-in to be loaded (used for plugin
             development)
+        @type str
+        @param disabledPlugins list of plug-ins that have been disabled via
+            the command line parameters '--disable-plugin='
+        @type list of str
         @param noOpenAtStartup flag indicating that the open at startup option
-            should not be executed (boolean)
+            should not be executed
+        @type bool
         @param noCrashOpenAtStartup flag indicating to ignore any crash session
-            file found at statup (boolean)
+            file found at statup
+        @type bool
         @param disableCrashSession flag indicating to disable the crash session
-            support (boolean)
+            support
+        @type bool
         @param restartArguments list of command line parameters to be used for
-            a restart (list of strings)
+            a restart
+        @type list of str
         """
         super(UserInterface, self).__init__()
         
@@ -196,6 +207,7 @@
         self.__noOpenAtStartup = noOpenAtStartup
         self.__noCrashOpenAtStartup = noCrashOpenAtStartup
         self.__disableCrashSession = disableCrashSession
+        self.__disabledPlugins = disabledPlugins[:]
         
         self.layoutType, self.embeddedShell, self.embeddedFileBrowser = \
             Preferences.getUILayout()
@@ -245,7 +257,8 @@
         
         # Initialize the Plugin Manager (Plugins are initialized later
         from PluginManager.PluginManager import PluginManager
-        self.pluginManager = PluginManager(self, develPlugin=plugin)
+        self.pluginManager = PluginManager(self, self.__disabledPlugins,
+                                           develPlugin=plugin)
         
         splash.showMessage(self.tr("Generating Main User Interface..."))
         
@@ -392,6 +405,8 @@
             self.backgroundService.preferencesOrProjectChanged)
         self.project.projectOpened.connect(self.__writeCrashSession)
         self.project.projectClosed.connect(self.__writeCrashSession)
+        self.project.appendStdout.connect(self.appendToStdout)
+        self.project.appendStderr.connect(self.appendToStderr)
         
         self.multiProject.multiProjectOpened.connect(
             self.__activateMultiProjectBrowser)
@@ -415,6 +430,7 @@
             self.projectBrowser.pfBrowser.compileChangedForms)
         self.debuggerUI.compileResources.connect(
             self.projectBrowser.prBrowser.compileChangedResources)
+        self.debuggerUI.executeMake.connect(self.project.executeMake)
         self.debuggerUI.appendStdout.connect(self.appendToStdout)
         
         debugServer.passiveDebugStarted.connect(
@@ -2566,7 +2582,6 @@
         """
         self.__menus = {}
         mb = self.menuBar()
-        # TODO: make this configurable (True default)
         if Utilities.isLinuxPlatform() and \
            not Preferences.getUI("UseNativeMenuBar"):
             mb.setNativeMenuBar(False)