diff -r d14ddbfbbd36 -r c6dda2cbe081 UI/UserInterface.py
--- a/UI/UserInterface.py Sat Feb 16 10:27:50 2019 +0100
+++ b/UI/UserInterface.py Sat Mar 02 11:15:24 2019 +0100
@@ -212,10 +212,10 @@
self.restoreGeometry(g)
self.__startup = True
- self.__proxyFactory = E5NetworkProxyFactory()
if Preferences.getUI("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
+ self.__proxyFactory = E5NetworkProxyFactory()
QNetworkProxyFactory.setApplicationProxyFactory(
self.__proxyFactory)
QNetworkProxyFactory.setUseSystemConfiguration(False)
@@ -231,6 +231,11 @@
# load the view profiles
self.profiles = Preferences.getUI("ViewProfiles2")
+ # Generate the conda interface
+ from CondaInterface.Conda import Conda
+ self.condaInterface = Conda(self)
+ e5App().registerObject("Conda", self.condaInterface)
+
# Generate the virtual environment manager
from VirtualEnv.VirtualenvManager import VirtualenvManager
self.virtualenvManager = VirtualenvManager(self)
@@ -248,6 +253,7 @@
# Generate an empty project object and multi project object
from Project.Project import Project
self.project = Project(self)
+ e5App().registerObject("Project", self.project)
from MultiProject.MultiProject import MultiProject
self.multiProject = MultiProject(self.project, self)
@@ -573,7 +579,6 @@
e5App().registerObject("DebugServer", debugServer)
e5App().registerObject("BackgroundService", self.backgroundService)
e5App().registerObject("ViewManager", self.viewmanager)
- e5App().registerObject("Project", self.project)
e5App().registerObject("ProjectBrowser", self.projectBrowser)
e5App().registerObject("MultiProject", self.multiProject)
e5App().registerObject("TaskViewer", self.taskViewer)
@@ -834,6 +839,24 @@
UI.PixmapCache.getIcon("debugViewer.png"),
self.tr("Debug-Viewer"))
+ if Preferences.getUI("ShowPyPIPackageManager"):
+ # Create the PyPI package manager
+ logging.debug("Creating PyPI Package Manager...")
+ from PipInterface.PipPackagesWidget import PipPackagesWidget
+ self.pipWidget = PipPackagesWidget()
+ self.rToolbox.addItem(self.pipWidget,
+ UI.PixmapCache.getIcon("pypi"),
+ self.tr("PyPI"))
+
+ if Preferences.getUI("ShowCondaPackageManager"):
+ # Create the conda package manager
+ logging.debug("Creating Conda Package Manager...")
+ from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
+ self.condaWidget = CondaPackagesWidget(self.condaInterface)
+ self.rToolbox.addItem(self.condaWidget,
+ UI.PixmapCache.getIcon("miniconda.png"),
+ self.tr("Conda"))
+
if Preferences.getUI("ShowCooperation"):
# Create the chat part of the user interface
logging.debug("Creating Chat Widget...")
@@ -975,6 +998,24 @@
self.debugViewer, UI.PixmapCache.getIcon("debugViewer.png"),
self.tr("Debug-Viewer"))
+ if Preferences.getUI("ShowPyPIPackageManager"):
+ # Create the PyPI package manager
+ logging.debug("Creating PyPI Package Manager...")
+ from PipInterface.PipPackagesWidget import PipPackagesWidget
+ self.pipWidget = PipPackagesWidget()
+ self.rightSidebar.addTab(
+ self.pipWidget, UI.PixmapCache.getIcon("pypi"),
+ self.tr("PyPI"))
+
+ if Preferences.getUI("ShowCondaPackageManager"):
+ # Create the conda package manager
+ logging.debug("Creating Conda Package Manager...")
+ from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
+ self.condaWidget = CondaPackagesWidget(self.condaInterface)
+ self.rightSidebar.addTab(
+ self.condaWidget, UI.PixmapCache.getIcon("miniconda.png"),
+ self.tr("Conda"))
+
if Preferences.getUI("ShowCooperation"):
# Create the chat part of the user interface
logging.debug("Creating Chat Widget...")
@@ -5849,6 +5890,7 @@
if Preferences.getUI("UseSystemProxy"):
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
+ self.__proxyFactory = E5NetworkProxyFactory()
QNetworkProxyFactory.setApplicationProxyFactory(
self.__proxyFactory)
QNetworkProxyFactory.setUseSystemConfiguration(False)
