Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Sat Jun 02 12:46:57 2018 +0200
+++ b/eric6.e4p	Mon Jul 02 18:59:30 2018 +0200
@@ -515,7 +515,6 @@
     <Source>Plugins/PluginVcsMercurial.py</Source>
     <Source>Plugins/PluginVcsPySvn.py</Source>
     <Source>Plugins/PluginVcsSubversion.py</Source>
-    <Source>Plugins/PluginVirtualenvInterface.py</Source>
     <Source>Plugins/PluginVmListspace.py</Source>
     <Source>Plugins/PluginVmTabview.py</Source>
     <Source>Plugins/PluginWizardDotDesktop.py</Source>
@@ -540,6 +539,7 @@
     <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>
@@ -558,9 +558,6 @@
     <Source>Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py</Source>
     <Source>Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py</Source>
     <Source>Plugins/UiExtensionPlugins/Translator/__init__.py</Source>
-    <Source>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvConfigurationDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvExecDialog.py</Source>
-    <Source>Plugins/UiExtensionPlugins/VirtualenvInterface/__init__.py</Source>
     <Source>Plugins/UiExtensionPlugins/__init__.py</Source>
     <Source>Plugins/VcsPlugins/__init__.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/Config.py</Source>
@@ -575,6 +572,7 @@
     <Source>Plugins/VcsPlugins/vcsGit/GitBranchDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitBundleDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitCommandDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitCommitDialog.py</Source>
@@ -596,6 +594,7 @@
     <Source>Plugins/VcsPlugins/vcsGit/GitPullDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitPushDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py</Source>
+    <Source>Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py</Source>
     <Source>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py</Source>
@@ -838,8 +837,8 @@
     <Source>Preferences/ConfigurationPages/CooperationPage.py</Source>
     <Source>Preferences/ConfigurationPages/CorbaPage.py</Source>
     <Source>Preferences/ConfigurationPages/DebuggerGeneralPage.py</Source>
+    <Source>Preferences/ConfigurationPages/DebuggerPython2Page.py</Source>
     <Source>Preferences/ConfigurationPages/DebuggerPython3Page.py</Source>
-    <Source>Preferences/ConfigurationPages/DebuggerPythonPage.py</Source>
     <Source>Preferences/ConfigurationPages/DiffColoursPage.py</Source>
     <Source>Preferences/ConfigurationPages/EditorAPIsPage.py</Source>
     <Source>Preferences/ConfigurationPages/EditorAutocompletionPage.py</Source>
@@ -1397,6 +1396,13 @@
     <Source>ViewManager/BookmarkedFilesDialog.py</Source>
     <Source>ViewManager/ViewManager.py</Source>
     <Source>ViewManager/__init__.py</Source>
+    <Source>VirtualEnv/VirtualenvAddEditDialog.py</Source>
+    <Source>VirtualEnv/VirtualenvConfigurationDialog.py</Source>
+    <Source>VirtualEnv/VirtualenvExecDialog.py</Source>
+    <Source>VirtualEnv/VirtualenvInterpreterSelectionDialog.py</Source>
+    <Source>VirtualEnv/VirtualenvManager.py</Source>
+    <Source>VirtualEnv/VirtualenvManagerDialog.py</Source>
+    <Source>VirtualEnv/__init__.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockDialog.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockExceptionsDialog.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockIcon.py</Source>
@@ -1804,10 +1810,9 @@
     <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/UiExtensionPlugins/VirtualenvInterface/VirtualenvConfigurationDialog.ui</Form>
-    <Form>Plugins/UiExtensionPlugins/VirtualenvInterface/VirtualenvExecDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.ui</Form>
@@ -1818,6 +1823,7 @@
     <Form>Plugins/VcsPlugins/vcsGit/GitBranchDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitBundleDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitCommandDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitCommitDialog.ui</Form>
@@ -1836,6 +1842,7 @@
     <Form>Plugins/VcsPlugins/vcsGit/GitPullDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitPushDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.ui</Form>
+    <Form>Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.ui</Form>
     <Form>Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.ui</Form>
@@ -1984,8 +1991,8 @@
     <Form>Preferences/ConfigurationPages/CooperationPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CorbaPage.ui</Form>
     <Form>Preferences/ConfigurationPages/DebuggerGeneralPage.ui</Form>
+    <Form>Preferences/ConfigurationPages/DebuggerPython2Page.ui</Form>
     <Form>Preferences/ConfigurationPages/DebuggerPython3Page.ui</Form>
-    <Form>Preferences/ConfigurationPages/DebuggerPythonPage.ui</Form>
     <Form>Preferences/ConfigurationPages/DiffColoursPage.ui</Form>
     <Form>Preferences/ConfigurationPages/EditorAPIsPage.ui</Form>
     <Form>Preferences/ConfigurationPages/EditorAutocompletionPage.ui</Form>
@@ -2104,6 +2111,11 @@
     <Form>VCS/CommandOptionsDialog.ui</Form>
     <Form>VCS/RepositoryInfoDialog.ui</Form>
     <Form>ViewManager/BookmarkedFilesDialog.ui</Form>
+    <Form>VirtualEnv/VirtualenvAddEditDialog.ui</Form>
+    <Form>VirtualEnv/VirtualenvConfigurationDialog.ui</Form>
+    <Form>VirtualEnv/VirtualenvExecDialog.ui</Form>
+    <Form>VirtualEnv/VirtualenvInterpreterSelectionDialog.ui</Form>
+    <Form>VirtualEnv/VirtualenvManagerDialog.ui</Form>
     <Form>WebBrowser/AdBlock/AdBlockDialog.ui</Form>
     <Form>WebBrowser/AdBlock/AdBlockExceptionsDialog.ui</Form>
     <Form>WebBrowser/Bookmarks/AddBookmarkDialog.ui</Form>
@@ -2203,14 +2215,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>