Mercurial Repositories > eric / file diff

--- a/VirtualEnv/VirtualenvManager.py	Sat Jan 26 17:04:11 2019 +0100
+++ b/VirtualEnv/VirtualenvManager.py	Sat Jan 26 19:42:53 2019 +0100
@@ -146,16 +146,22 @@
         
         dlg = VirtualenvConfigurationDialog()
         if dlg.exec_() == QDialog.Accepted:
-            (pyvenv, args, name, openTarget, createLog, createScript,
-             targetDir, interpreter) = dlg.getData()
+            resultDict = dlg.getData()
+##            (pyvenv, args, name, openTarget, createLog, createScript,
+##             targetDir, interpreter) = dlg.getData()
             
-            # now do the call
-            from .VirtualenvExecDialog import VirtualenvExecDialog
-            dia = VirtualenvExecDialog(pyvenv, targetDir, name, openTarget,
-                                       createLog, createScript, interpreter,
-                                       self)
+            if resultDict["envType"] == "conda":
+                # TODO: add call to the conda exec dialog
+                pass
+            else:
+                # now do the call
+                from .VirtualenvExecDialog import VirtualenvExecDialog
+                dia = VirtualenvExecDialog(resultDict, self)
+##                dia = VirtualenvExecDialog(pyvenv, targetDir, name, openTarget,
+##                                           createLog, createScript, interpreter,
+##                                           self)
             dia.show()
-            dia.start(args)
+            dia.start(resultDict["arguments"])
             dia.exec_()
     
     def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="",