Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Sat Mar 02 11:17:15 2019 +0100
+++ b/UI/UserInterface.py	Fri Apr 05 19:06:39 2019 +0200
@@ -236,6 +236,11 @@
         self.condaInterface = Conda(self)
         e5App().registerObject("Conda", self.condaInterface)
         
+        # Generate the pip interface
+        from PipInterface.Pip import Pip
+        self.pipInterface = Pip(self)
+        e5App().registerObject("Pip", self.pipInterface)
+        
         # Generate the virtual environment manager
         from VirtualEnv.VirtualenvManager import VirtualenvManager
         self.virtualenvManager = VirtualenvManager(self)
@@ -843,7 +848,7 @@
             # Create the PyPI package manager
             logging.debug("Creating PyPI Package Manager...")
             from PipInterface.PipPackagesWidget import PipPackagesWidget
-            self.pipWidget = PipPackagesWidget()
+            self.pipWidget = PipPackagesWidget(self.pipInterface)
             self.rToolbox.addItem(self.pipWidget,
                                   UI.PixmapCache.getIcon("pypi"),
                                   self.tr("PyPI"))
@@ -1002,7 +1007,7 @@
             # Create the PyPI package manager
             logging.debug("Creating PyPI Package Manager...")
             from PipInterface.PipPackagesWidget import PipPackagesWidget
-            self.pipWidget = PipPackagesWidget()
+            self.pipWidget = PipPackagesWidget(self.pipInterface)
             self.rightSidebar.addTab(
                 self.pipWidget, UI.PixmapCache.getIcon("pypi"),
                 self.tr("PyPI"))
@@ -3422,8 +3427,9 @@
         if Preferences.getUser("UseSystemEmailClient"):
             self.__showSystemEmailClient(mode, attachFile, deleteAttachFile)
         else:
-            if Preferences.getUser("Email") == "" or \
-               Preferences.getUser("MailServer") == "":
+            if not Preferences.getUser("UseGoogleMailOAuth2") and (
+                Preferences.getUser("Email") == "" or
+                    Preferences.getUser("MailServer") == ""):
                 E5MessageBox.critical(
                     self,
                     self.tr("Report Bug"),
@@ -4485,7 +4491,7 @@
         if self.unittestDialog is None:
             from PyUnit.UnittestDialog import UnittestDialog
             self.unittestDialog = UnittestDialog(
-                None, self.debuggerUI.debugServer, self, fromEric=True)
+                None, self.debuggerUI.debugServer, self)
             self.unittestDialog.unittestFile.connect(
                 self.viewmanager.setFileLine)
             self.unittestDialog.unittestStopped.connect(self.__unittestStopped)
@@ -4523,10 +4529,9 @@
             else:
                 prog = fn
         
-        self.__createUnitTestDialog()
+        self.__unittest()
+        self.unittestDialog.setProjectMode(False)
         self.unittestDialog.insertProg(prog)
-        self.unittestDialog.show()
-        self.unittestDialog.raise_()
         self.utRestartAct.setEnabled(False)
         self.utRerunFailedAct.setEnabled(False)
         
@@ -4551,10 +4556,9 @@
                     " current project. Aborting"))
             return
         
-        self.__createUnitTestDialog()
+        self.__unittest()
+        self.unittestDialog.setProjectMode(True)
         self.unittestDialog.insertProg(prog)
-        self.unittestDialog.show()
-        self.unittestDialog.raise_()
         self.utRestartAct.setEnabled(False)
         self.utRerunFailedAct.setEnabled(False)
         
@@ -4563,20 +4567,16 @@
         Private slot to display the unittest dialog and rerun the last
         unit test.
         """
-        self.__createUnitTestDialog()
-        self.unittestDialog.show()
-        self.unittestDialog.raise_()
-        self.unittestDialog.on_startButton_clicked()
+        self.__unittest()
+        self.unittestDialog.startTests()
         
     def __unittestRerunFailed(self):
         """
         Private slot to display the unittest dialog and rerun all failed tests
         of the last run.
         """
-        self.__createUnitTestDialog()
-        self.unittestDialog.show()
-        self.unittestDialog.raise_()
-        self.unittestDialog.on_startButton_clicked(failedOnly=True)
+        self.__unittest()
+        self.unittestDialog.startTests(failedOnly=True)
         
     def __designer(self, fn=None, version=0):
         """
@@ -5685,7 +5685,8 @@
                     "--quiet",
                     "--qthelp",
                     "--single",
-                    "--name={0}".format(self.__webBrowserSAName)
+                    "--name={0}".format(self.__webBrowserSAName),
+                    home
                 ]
                 process.start(sys.executable, args)
                 if not process.waitForStarted():
@@ -5709,8 +5710,6 @@
             process.finished.connect(self.__webBrowserFinished)
             self.__webBrowserProcess = process
             
-            if home:
-                clientArgs.append(home)
         else:
             clientArgs.append("--newtab={0}".format(home))