Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Sat Feb 16 10:27:50 2019 +0100
+++ b/eric6.e4p	Sat Mar 02 11:15:24 2019 +0100
@@ -16,6 +16,14 @@
   <TranslationPattern>i18n/eric6_%language%.ts</TranslationPattern>
   <Eol index="1"/>
   <Sources>
+    <Source>CondaInterface/Conda.py</Source>
+    <Source>CondaInterface/CondaExecDialog.py</Source>
+    <Source>CondaInterface/CondaExportDialog.py</Source>
+    <Source>CondaInterface/CondaInfoDialog.py</Source>
+    <Source>CondaInterface/CondaNewEnvironmentDataDialog.py</Source>
+    <Source>CondaInterface/CondaPackageDetailsWidget.py</Source>
+    <Source>CondaInterface/CondaPackagesWidget.py</Source>
+    <Source>CondaInterface/__init__.py</Source>
     <Source>Cooperation/ChatWidget.py</Source>
     <Source>Cooperation/Connection.py</Source>
     <Source>Cooperation/CooperationClient.py</Source>
@@ -463,6 +471,14 @@
     <Source>Network/IRC/IrcWidget.py</Source>
     <Source>Network/IRC/__init__.py</Source>
     <Source>Network/__init__.py</Source>
+    <Source>PipInterface/Pip.py</Source>
+    <Source>PipInterface/PipDialog.py</Source>
+    <Source>PipInterface/PipFileSelectionDialog.py</Source>
+    <Source>PipInterface/PipFreezeDialog.py</Source>
+    <Source>PipInterface/PipPackageDetailsDialog.py</Source>
+    <Source>PipInterface/PipPackagesInputDialog.py</Source>
+    <Source>PipInterface/PipPackagesWidget.py</Source>
+    <Source>PipInterface/__init__.py</Source>
     <Source>PluginManager/PluginDetailsDialog.py</Source>
     <Source>PluginManager/PluginExceptions.py</Source>
     <Source>PluginManager/PluginInfoDialog.py</Source>
@@ -511,7 +527,6 @@
     <Source>Plugins/PluginCodeStyleChecker.py</Source>
     <Source>Plugins/PluginEricapi.py</Source>
     <Source>Plugins/PluginEricdoc.py</Source>
-    <Source>Plugins/PluginPipInterface.py</Source>
     <Source>Plugins/PluginSyntaxChecker.py</Source>
     <Source>Plugins/PluginTabnanny.py</Source>
     <Source>Plugins/PluginTranslator.py</Source>
@@ -533,18 +548,6 @@
     <Source>Plugins/PluginWizardQRegExp.py</Source>
     <Source>Plugins/PluginWizardQRegularExpression.py</Source>
     <Source>Plugins/PluginWizardSetup.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/__init__.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/Pip.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipFileSelectionDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipFreezeDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipListDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipPackageDetailsDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipPackagesInputDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipSearchDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/PipSelectionDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/PipInterface/__init__.py</Source>
     <Source>Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py</Source>
     <Source>Plugins/UiExtensionPlugins/Translator/ConfigurationPage/__init__.py</Source>
     <Source>Plugins/UiExtensionPlugins/Translator/Translator.py</Source>
@@ -838,6 +841,7 @@
     <Source>Plugins/__init__.py</Source>
     <Source>Preferences/ConfigurationDialog.py</Source>
     <Source>Preferences/ConfigurationPages/ApplicationPage.py</Source>
+    <Source>Preferences/ConfigurationPages/CondaPage.py</Source>
     <Source>Preferences/ConfigurationPages/ConfigurationPageBase.py</Source>
     <Source>Preferences/ConfigurationPages/CooperationPage.py</Source>
     <Source>Preferences/ConfigurationPages/CorbaPage.py</Source>
@@ -884,6 +888,7 @@
     <Source>Preferences/ConfigurationPages/MultiProjectPage.py</Source>
     <Source>Preferences/ConfigurationPages/NetworkPage.py</Source>
     <Source>Preferences/ConfigurationPages/NotificationsPage.py</Source>
+    <Source>Preferences/ConfigurationPages/PipPage.py</Source>
     <Source>Preferences/ConfigurationPages/PluginManagerPage.py</Source>
     <Source>Preferences/ConfigurationPages/PrinterPage.py</Source>
     <Source>Preferences/ConfigurationPages/ProjectBrowserPage.py</Source>
@@ -1419,6 +1424,7 @@
     <Source>VirtualEnv/VirtualenvInterpreterSelectionDialog.py</Source>
     <Source>VirtualEnv/VirtualenvManager.py</Source>
     <Source>VirtualEnv/VirtualenvManagerDialog.py</Source>
+    <Source>VirtualEnv/VirtualenvNameDialog.py</Source>
     <Source>VirtualEnv/__init__.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockDialog.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockExceptionsDialog.py</Source>
@@ -1521,6 +1527,8 @@
     <Source>WebBrowser/Network/EricSchemeHandler.py</Source>
     <Source>WebBrowser/Network/NetworkManager.py</Source>
     <Source>WebBrowser/Network/NetworkUrlInterceptor.py</Source>
+    <Source>WebBrowser/Network/ProtocolHandlerManager.py</Source>
+    <Source>WebBrowser/Network/ProtocolHandlerManagerDialog.py</Source>
     <Source>WebBrowser/Network/QtHelpSchemeHandler.py</Source>
     <Source>WebBrowser/Network/SendRefererWhitelistDialog.py</Source>
     <Source>WebBrowser/Network/SslErrorExceptionsDialog.py</Source>
@@ -1572,6 +1580,7 @@
     <Source>WebBrowser/Session/SessionManagerDialog.py</Source>
     <Source>WebBrowser/Session/__init__.py</Source>
     <Source>WebBrowser/SiteInfo/SiteInfoDialog.py</Source>
+    <Source>WebBrowser/SiteInfo/SiteInfoWidget.py</Source>
     <Source>WebBrowser/SiteInfo/__init__.py</Source>
     <Source>WebBrowser/SpeedDial/Page.py</Source>
     <Source>WebBrowser/SpeedDial/PageThumbnailer.py</Source>
@@ -1709,6 +1718,12 @@
     <Source>uninstall.py</Source>
   </Sources>
   <Forms>
+    <Form>CondaInterface/CondaExecDialog.ui</Form>
+    <Form>CondaInterface/CondaExportDialog.ui</Form>
+    <Form>CondaInterface/CondaInfoDialog.ui</Form>
+    <Form>CondaInterface/CondaNewEnvironmentDataDialog.ui</Form>
+    <Form>CondaInterface/CondaPackageDetailsWidget.ui</Form>
+    <Form>CondaInterface/CondaPackagesWidget.ui</Form>
     <Form>Cooperation/ChatWidget.ui</Form>
     <Form>DataViews/CodeMetricsDialog.ui</Form>
     <Form>DataViews/PyCoverageDialog.ui</Form>
@@ -1806,6 +1821,12 @@
     <Form>Network/IRC/IrcNetworkWidget.ui</Form>
     <Form>Network/IRC/IrcServerEditDialog.ui</Form>
     <Form>Network/IRC/IrcWidget.ui</Form>
+    <Form>PipInterface/PipDialog.ui</Form>
+    <Form>PipInterface/PipFileSelectionDialog.ui</Form>
+    <Form>PipInterface/PipFreezeDialog.ui</Form>
+    <Form>PipInterface/PipPackageDetailsDialog.ui</Form>
+    <Form>PipInterface/PipPackagesInputDialog.ui</Form>
+    <Form>PipInterface/PipPackagesWidget.ui</Form>
     <Form>PluginManager/PluginDetailsDialog.ui</Form>
     <Form>PluginManager/PluginInfoDialog.ui</Form>
     <Form>PluginManager/PluginInstallDialog.ui</Form>
@@ -1822,15 +1843,6 @@
     <Form>Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.ui</Form>
     <Form>Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui</Form>
     <Form>Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipFileSelectionDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipFreezeDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipListDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipPackageDetailsDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipPackagesInputDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipSearchDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/PipInterface/PipSelectionDialog.ui</Form>
     <Form>Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.ui</Form>
     <Form>Plugins/UiExtensionPlugins/Translator/TranslatorWidget.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui</Form>
@@ -2008,6 +2020,7 @@
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.ui</Form>
     <Form>Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.ui</Form>
     <Form>Preferences/ConfigurationPages/ApplicationPage.ui</Form>
+    <Form>Preferences/ConfigurationPages/CondaPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CooperationPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CorbaPage.ui</Form>
     <Form>Preferences/ConfigurationPages/DebuggerGeneralPage.ui</Form>
@@ -2053,6 +2066,7 @@
     <Form>Preferences/ConfigurationPages/MultiProjectPage.ui</Form>
     <Form>Preferences/ConfigurationPages/NetworkPage.ui</Form>
     <Form>Preferences/ConfigurationPages/NotificationsPage.ui</Form>
+    <Form>Preferences/ConfigurationPages/PipPage.ui</Form>
     <Form>Preferences/ConfigurationPages/PluginManagerPage.ui</Form>
     <Form>Preferences/ConfigurationPages/PrinterPage.ui</Form>
     <Form>Preferences/ConfigurationPages/ProjectBrowserPage.ui</Form>
@@ -2140,6 +2154,7 @@
     <Form>VirtualEnv/VirtualenvExecDialog.ui</Form>
     <Form>VirtualEnv/VirtualenvInterpreterSelectionDialog.ui</Form>
     <Form>VirtualEnv/VirtualenvManagerDialog.ui</Form>
+    <Form>VirtualEnv/VirtualenvNameDialog.ui</Form>
     <Form>WebBrowser/AdBlock/AdBlockDialog.ui</Form>
     <Form>WebBrowser/AdBlock/AdBlockExceptionsDialog.ui</Form>
     <Form>WebBrowser/Bookmarks/AddBookmarkDialog.ui</Form>
@@ -2162,6 +2177,7 @@
     <Form>WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.ui</Form>
     <Form>WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.ui</Form>
     <Form>WebBrowser/History/HistoryDialog.ui</Form>
+    <Form>WebBrowser/Network/ProtocolHandlerManagerDialog.ui</Form>
     <Form>WebBrowser/Network/SendRefererWhitelistDialog.ui</Form>
     <Form>WebBrowser/Network/SslErrorExceptionsDialog.ui</Form>
     <Form>WebBrowser/OpenSearch/OpenSearchDialog.ui</Form>
@@ -2239,14 +2255,14 @@
   </Resources>
   <Others>
     <Other>.hgignore</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>