Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Fri May 18 19:24:37 2018 +0200
+++ b/APIs/Python3/eric6.api	Fri May 18 19:41:02 2018 +0200
@@ -4892,6 +4892,9 @@
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog.startProcess?4(cmd, args, showArgs=True)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog.startProcesses?4(processParams)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog?1(text, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.PipFileSelectionDialog.getData?4()
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.PipFileSelectionDialog.on_filePicker_textChanged?4(txt)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.PipFileSelectionDialog?1(plugin, mode, parent=None)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.closeEvent?4(e)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_buttonBox_clicked?4(button)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_copyButton_clicked?4()
@@ -4926,10 +4929,6 @@
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog.getData?4()
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog.on_packagesEdit_textChanged?4(txt)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog?1(plugin, title, parent=None)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog.getData?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog.on_fileButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog.on_requirementsEdit_textChanged?4(txt)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog?1(plugin, parent=None)
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.Stopwords?7
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.VersionRole?7
 eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.closeEvent?4(e)
@@ -10188,7 +10187,7 @@
 eric6.Utilities.binplistlib.readPlistFromBytes?4(data)
 eric6.Utilities.binplistlib.writePlist?4(rootObject, pathOrFile, binary=True)
 eric6.Utilities.binplistlib.writePlistToBytes?4(rootObject, binary=True)
-eric6.Utilities.checkPyside?4()
+eric6.Utilities.checkPyside?4(variant="2")
 eric6.Utilities.codingBytes_regexps?7
 eric6.Utilities.coding_regexps?7
 eric6.Utilities.compactPath?4(path, width, measure=len)
@@ -10245,7 +10244,7 @@
 eric6.Utilities.generateDistroInfo?4(linesep='\n')
 eric6.Utilities.generatePluginsVersionInfo?4(linesep='\n')
 eric6.Utilities.generatePyQtToolPath?4(toolname, alternatives=None)
-eric6.Utilities.generatePySideToolPath?4(toolname)
+eric6.Utilities.generatePySideToolPath?4(toolname, variant="2")
 eric6.Utilities.generateQtToolName?4(toolname)
 eric6.Utilities.generateVersionInfo?4(linesep='\n')
 eric6.Utilities.getDirs?4(path, excludeDirs)

--- a/APIs/Python3/eric6.bas	Fri May 18 19:24:37 2018 +0200
+++ b/APIs/Python3/eric6.bas	Fri May 18 19:41:02 2018 +0200
@@ -652,13 +652,13 @@
 PersonalInformationManager QObject
 Pip QObject
 PipDialog QDialog Ui_PipDialog
+PipFileSelectionDialog QDialog Ui_PipFileSelectionDialog
 PipFreezeDialog QDialog Ui_PipFreezeDialog
 PipInterfacePlugin QObject
 PipListDialog QDialog Ui_PipListDialog
 PipPackageDetailsDialog QDialog Ui_PipPackageDetailsDialog
 PipPackagesInputDialog QDialog Ui_PipPackagesInputDialog
 PipPage ConfigurationPageBase Ui_PipPage
-PipRequirementsSelectionDialog QDialog Ui_PipRequirementsSelectionDialog
 PipSearchDialog QDialog Ui_PipSearchDialog
 PixmapDiagram E5MainWindow
 PlainStrList list

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Help/source.qhp	Fri May 18 19:41:02 2018 +0200
@@ -520,11 +520,11 @@
                 </section>
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html" />
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html" />
+                <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html" />
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html" />
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.html" />
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog.html" />
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.html" />
-                <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html" />
                 <section title="eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.html" />
               </section>
               <section title="eric6.Plugins.UiExtensionPlugins.Translator" ref="index-eric6.Plugins.UiExtensionPlugins.Translator.html">
@@ -11944,6 +11944,7 @@
       <keyword name="Pip.__getUserConfig" id="Pip.__getUserConfig" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__getUserConfig" />
       <keyword name="Pip.__getVirtualenvConfig" id="Pip.__getVirtualenvConfig" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__getVirtualenvConfig" />
       <keyword name="Pip.__handleTearOffMenu" id="Pip.__handleTearOffMenu" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__handleTearOffMenu" />
+      <keyword name="Pip.__installLocalPackage" id="Pip.__installLocalPackage" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__installLocalPackage" />
       <keyword name="Pip.__installPackages" id="Pip.__installPackages" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__installPackages" />
       <keyword name="Pip.__installPip" id="Pip.__installPip" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__installPip" />
       <keyword name="Pip.__installRequirements" id="Pip.__installRequirements" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html#Pip.__installRequirements" />
@@ -11978,6 +11979,11 @@
       <keyword name="PipDialog.on_buttonBox_clicked" id="PipDialog.on_buttonBox_clicked" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html#PipDialog.on_buttonBox_clicked" />
       <keyword name="PipDialog.startProcess" id="PipDialog.startProcess" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html#PipDialog.startProcess" />
       <keyword name="PipDialog.startProcesses" id="PipDialog.startProcesses" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html#PipDialog.startProcesses" />
+      <keyword name="PipFileSelectionDialog" id="PipFileSelectionDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html#PipFileSelectionDialog" />
+      <keyword name="PipFileSelectionDialog (Constructor)" id="PipFileSelectionDialog (Constructor)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html#PipFileSelectionDialog.__init__" />
+      <keyword name="PipFileSelectionDialog (Module)" id="PipFileSelectionDialog (Module)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html" />
+      <keyword name="PipFileSelectionDialog.getData" id="PipFileSelectionDialog.getData" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html#PipFileSelectionDialog.getData" />
+      <keyword name="PipFileSelectionDialog.on_filePicker_textChanged" id="PipFileSelectionDialog.on_filePicker_textChanged" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html#PipFileSelectionDialog.on_filePicker_textChanged" />
       <keyword name="PipFreezeDialog" id="PipFreezeDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html#PipFreezeDialog" />
       <keyword name="PipFreezeDialog (Constructor)" id="PipFreezeDialog (Constructor)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html#PipFreezeDialog.__init__" />
       <keyword name="PipFreezeDialog (Module)" id="PipFreezeDialog (Module)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html" />
@@ -12053,12 +12059,6 @@
       <keyword name="PipPage.on_addButton_clicked" id="PipPage.on_addButton_clicked" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.html#PipPage.on_addButton_clicked" />
       <keyword name="PipPage.on_defaultListButton_clicked" id="PipPage.on_defaultListButton_clicked" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.html#PipPage.on_defaultListButton_clicked" />
       <keyword name="PipPage.save" id="PipPage.save" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.html#PipPage.save" />
-      <keyword name="PipRequirementsSelectionDialog" id="PipRequirementsSelectionDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html#PipRequirementsSelectionDialog" />
-      <keyword name="PipRequirementsSelectionDialog (Constructor)" id="PipRequirementsSelectionDialog (Constructor)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html#PipRequirementsSelectionDialog.__init__" />
-      <keyword name="PipRequirementsSelectionDialog (Module)" id="PipRequirementsSelectionDialog (Module)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html" />
-      <keyword name="PipRequirementsSelectionDialog.getData" id="PipRequirementsSelectionDialog.getData" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html#PipRequirementsSelectionDialog.getData" />
-      <keyword name="PipRequirementsSelectionDialog.on_fileButton_clicked" id="PipRequirementsSelectionDialog.on_fileButton_clicked" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html#PipRequirementsSelectionDialog.on_fileButton_clicked" />
-      <keyword name="PipRequirementsSelectionDialog.on_requirementsEdit_textChanged" id="PipRequirementsSelectionDialog.on_requirementsEdit_textChanged" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html#PipRequirementsSelectionDialog.on_requirementsEdit_textChanged" />
       <keyword name="PipSearchDialog" id="PipSearchDialog" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.html#PipSearchDialog" />
       <keyword name="PipSearchDialog (Constructor)" id="PipSearchDialog (Constructor)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.html#PipSearchDialog.__init__" />
       <keyword name="PipSearchDialog (Module)" id="PipSearchDialog (Module)" ref="eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.html" />
@@ -16683,7 +16683,7 @@
       <keyword name="UserInterface.__initEricDocAction" id="UserInterface.__initEricDocAction" ref="eric6.UI.UserInterface.html#UserInterface.__initEricDocAction" />
       <keyword name="UserInterface.__initExternalToolsActions" id="UserInterface.__initExternalToolsActions" ref="eric6.UI.UserInterface.html#UserInterface.__initExternalToolsActions" />
       <keyword name="UserInterface.__initMenus" id="UserInterface.__initMenus" ref="eric6.UI.UserInterface.html#UserInterface.__initMenus" />
-      <keyword name="UserInterface.__initPySideDocAction" id="UserInterface.__initPySideDocAction" ref="eric6.UI.UserInterface.html#UserInterface.__initPySideDocAction" />
+      <keyword name="UserInterface.__initPySideDocActions" id="UserInterface.__initPySideDocActions" ref="eric6.UI.UserInterface.html#UserInterface.__initPySideDocActions" />
       <keyword name="UserInterface.__initPythonDocActions" id="UserInterface.__initPythonDocActions" ref="eric6.UI.UserInterface.html#UserInterface.__initPythonDocActions" />
       <keyword name="UserInterface.__initQtDocActions" id="UserInterface.__initQtDocActions" ref="eric6.UI.UserInterface.html#UserInterface.__initQtDocActions" />
       <keyword name="UserInterface.__initStatusbar" id="UserInterface.__initStatusbar" ref="eric6.UI.UserInterface.html#UserInterface.__initStatusbar" />
@@ -19620,6 +19620,7 @@
       <file>eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.html</file>
       <file>eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html</file>
       <file>eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html</file>
+      <file>eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html</file>
       <file>eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html</file>
       <file>eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.html</file>
       <file>eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog.html</file>

--- a/Documentation/Source/eric6.Helpviewer.HelpWindow.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Helpviewer.HelpWindow.html	Fri May 18 19:41:02 2018 +0200
@@ -548,7 +548,7 @@
 <td>Public method to shut down the web browser.</td>
 </tr><tr>
 <td><a href="#HelpWindow.urlHandler">urlHandler</a></td>
-<td>Private slot used as desktop URL handler.</td>
+<td>Public slot used as desktop URL handler.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -1874,7 +1874,7 @@
 <h4>HelpWindow.urlHandler</h4>
 <b>urlHandler</b>(<i>url</i>)
 <p>
-        Private slot used as desktop URL handler.
+        Public slot used as desktop URL handler.
 </p><dl>
 <dt><i>url</i> (QUrl)</dt>
 <dd>

--- a/Documentation/Source/eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html	Fri May 18 19:41:02 2018 +0200
@@ -90,6 +90,9 @@
 <td><a href="#Pip.__handleTearOffMenu">__handleTearOffMenu</a></td>
 <td>Private slot to handle a change of the pip executable.</td>
 </tr><tr>
+<td><a href="#Pip.__installLocalPackage">__installLocalPackage</a></td>
+<td>Private slot to install a package available on local storage.</td>
+</tr><tr>
 <td><a href="#Pip.__installPackages">__installPackages</a></td>
 <td>Private slot to install packages to be given by the user.</td>
 </tr><tr>
@@ -276,7 +279,12 @@
 <dd>
 path of the pip executable
 </dd>
-</dl><a NAME="Pip.__installPackages" ID="Pip.__installPackages"></a>
+</dl><a NAME="Pip.__installLocalPackage" ID="Pip.__installLocalPackage"></a>
+<h4>Pip.__installLocalPackage</h4>
+<b>__installLocalPackage</b>(<i></i>)
+<p>
+        Private slot to install a package available on local storage.
+</p><a NAME="Pip.__installPackages" ID="Pip.__installPackages"></a>
 <h4>Pip.__installPackages</h4>
 <b>__installPackages</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Project.ProjectFormsBrowser.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Project.ProjectFormsBrowser.html	Fri May 18 19:41:02 2018 +0200
@@ -124,10 +124,10 @@
 <td>Private slot to handle the Open in Editor menu action.</td>
 </tr><tr>
 <td><a href="#ProjectFormsBrowser.__readStderr">__readStderr</a></td>
-<td>Private slot to handle the readyReadStandardError signal of the pyuic4/pyuic5/pyside-uic/rbuic4 process.</td>
+<td>Private slot to handle the readyReadStandardError signal of the pyuic4/pyuic5/pyside-uic/pyside2-uic/rbuic4 process.</td>
 </tr><tr>
 <td><a href="#ProjectFormsBrowser.__readStdout">__readStdout</a></td>
-<td>Private slot to handle the readyReadStandardOutput signal of the pyuic4/pyuic5/pyside-uic/rbuic4 process.</td>
+<td>Private slot to handle the readyReadStandardOutput signal of the pyuic4/pyuic5/pyside-uic/pyside2-uic/rbuic4 process.</td>
 </tr><tr>
 <td><a href="#ProjectFormsBrowser.__showContextMenu">__showContextMenu</a></td>
 <td>Private slot called by the menu aboutToShow signal.</td>
@@ -290,13 +290,13 @@
 <b>__readStderr</b>(<i></i>)
 <p>
         Private slot to handle the readyReadStandardError signal of the
-        pyuic4/pyuic5/pyside-uic/rbuic4 process.
+        pyuic4/pyuic5/pyside-uic/pyside2-uic/rbuic4 process.
 </p><a NAME="ProjectFormsBrowser.__readStdout" ID="ProjectFormsBrowser.__readStdout"></a>
 <h4>ProjectFormsBrowser.__readStdout</h4>
 <b>__readStdout</b>(<i></i>)
 <p>
         Private slot to handle the readyReadStandardOutput signal of the
-        pyuic4/pyuic5/pyside-uic/rbuic4 process.
+        pyuic4/pyuic5/pyside-uic/pyside2-uic/rbuic4 process.
 </p><a NAME="ProjectFormsBrowser.__showContextMenu" ID="ProjectFormsBrowser.__showContextMenu"></a>
 <h4>ProjectFormsBrowser.__showContextMenu</h4>
 <b>__showContextMenu</b>(<i></i>)

--- a/Documentation/Source/eric6.Project.ProjectResourcesBrowser.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Project.ProjectResourcesBrowser.html	Fri May 18 19:41:02 2018 +0200
@@ -105,10 +105,10 @@
 <td>Private slot to handle the Open menu action.</td>
 </tr><tr>
 <td><a href="#ProjectResourcesBrowser.__readStderr">__readStderr</a></td>
-<td>Private slot to handle the readyReadStandardError signal of the pyrcc4/pyrcc5/pyside-rcc/rbrcc process.</td>
+<td>Private slot to handle the readyReadStandardError signal of the pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process.</td>
 </tr><tr>
 <td><a href="#ProjectResourcesBrowser.__readStdout">__readStdout</a></td>
-<td>Private slot to handle the readyReadStandardOutput signal of the pyrcc4/pyrcc5/pyside-rcc/rbrcc process.</td>
+<td>Private slot to handle the readyReadStandardOutput signal of the pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process.</td>
 </tr><tr>
 <td><a href="#ProjectResourcesBrowser.__showContextMenu">__showContextMenu</a></td>
 <td>Private slot called by the menu aboutToShow signal.</td>
@@ -259,13 +259,13 @@
 <b>__readStderr</b>(<i></i>)
 <p>
         Private slot to handle the readyReadStandardError signal of the
-        pyrcc4/pyrcc5/pyside-rcc/rbrcc process.
+        pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process.
 </p><a NAME="ProjectResourcesBrowser.__readStdout" ID="ProjectResourcesBrowser.__readStdout"></a>
 <h4>ProjectResourcesBrowser.__readStdout</h4>
 <b>__readStdout</b>(<i></i>)
 <p>
         Private slot to handle the readyReadStandardOutput signal of the
-        pyrcc4/pyrcc5/pyside-rcc/rbrcc process.
+        pyrcc4/pyrcc5/pyside-rcc/pyside2-rcc/rbrcc process.
 </p><a NAME="ProjectResourcesBrowser.__showContextMenu" ID="ProjectResourcesBrowser.__showContextMenu"></a>
 <h4>ProjectResourcesBrowser.__showContextMenu</h4>
 <b>__showContextMenu</b>(<i></i>)

--- a/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html	Fri May 18 19:41:02 2018 +0200
@@ -119,7 +119,7 @@
 <td>Private slot to handle the readyReadStandardError signal of the lrelease process.</td>
 </tr><tr>
 <td><a href="#ProjectTranslationsBrowser.__readStderrLupdate">__readStderrLupdate</a></td>
-<td>Private slot to handle the readyReadStandardError signal of the pylupdate4/pylupdate5/pyside-lupdate process.</td>
+<td>Private slot to handle the readyReadStandardError signal of the pylupdate4/pylupdate5/pyside-lupdate/pyside2-lupdate process.</td>
 </tr><tr>
 <td><a href="#ProjectTranslationsBrowser.__readStdout">__readStdout</a></td>
 <td>Private method to read from a process' stdout channel.</td>
@@ -317,7 +317,7 @@
 <b>__readStderrLupdate</b>(<i>proc</i>)
 <p>
         Private slot to handle the readyReadStandardError signal of the
-        pylupdate4/pylupdate5/pyside-lupdate process.
+        pylupdate4/pylupdate5/pyside-lupdate/pyside2-lupdate process.
 </p><dl>
 <dt><i>proc</i> (QProcess)</dt>
 <dd>

--- a/Documentation/Source/eric6.UI.UserInterface.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.UI.UserInterface.html	Fri May 18 19:41:02 2018 +0200
@@ -325,7 +325,7 @@
 <td>Private slot to handle the helpClosed signal of the help window.</td>
 </tr><tr>
 <td><a href="#UserInterface.__helpViewer">__helpViewer</a></td>
-<td>Private slot to start an empty help viewer.</td>
+<td>Private slot to start an empty help viewer/web browser.</td>
 </tr><tr>
 <td><a href="#UserInterface.__importPreferences">__importPreferences</a></td>
 <td>Private slot to import preferences.</td>
@@ -348,8 +348,8 @@
 <td><a href="#UserInterface.__initMenus">__initMenus</a></td>
 <td>Private slot to create the menus.</td>
 </tr><tr>
-<td><a href="#UserInterface.__initPySideDocAction">__initPySideDocAction</a></td>
-<td>Private slot to initialize the action to show the PySide documentation.</td>
+<td><a href="#UserInterface.__initPySideDocActions">__initPySideDocActions</a></td>
+<td>Private slot to initialize the actions to show the PySide documentation.</td>
 </tr><tr>
 <td><a href="#UserInterface.__initPythonDocActions">__initPythonDocActions</a></td>
 <td>Private slot to initialize the actions to show the Python documentation.</td>
@@ -514,7 +514,7 @@
 <td>Private slot to show the PyQt5 documentation.</td>
 </tr><tr>
 <td><a href="#UserInterface.__showPySideDoc">__showPySideDoc</a></td>
-<td>Private slot to show the PySide documentation.</td>
+<td>Private slot to show the PySide/PySide2 documentation.</td>
 </tr><tr>
 <td><a href="#UserInterface.__showPython2Doc">__showPython2Doc</a></td>
 <td>Private slot to show the Python 2 documentation.</td>
@@ -1226,7 +1226,7 @@
 <h4>UserInterface.__helpViewer</h4>
 <b>__helpViewer</b>(<i></i>)
 <p>
-        Private slot to start an empty help viewer.
+        Private slot to start an empty help viewer/web browser.
 </p><a NAME="UserInterface.__importPreferences" ID="UserInterface.__importPreferences"></a>
 <h4>UserInterface.__importPreferences</h4>
 <b>__importPreferences</b>(<i></i>)
@@ -1262,11 +1262,12 @@
 <b>__initMenus</b>(<i></i>)
 <p>
         Private slot to create the menus.
-</p><a NAME="UserInterface.__initPySideDocAction" ID="UserInterface.__initPySideDocAction"></a>
-<h4>UserInterface.__initPySideDocAction</h4>
-<b>__initPySideDocAction</b>(<i></i>)
+</p><a NAME="UserInterface.__initPySideDocActions" ID="UserInterface.__initPySideDocActions"></a>
+<h4>UserInterface.__initPySideDocActions</h4>
+<b>__initPySideDocActions</b>(<i></i>)
 <p>
-        Private slot to initialize the action to show the PySide documentation.
+        Private slot to initialize the actions to show the PySide
+        documentation.
 </p><a NAME="UserInterface.__initPythonDocActions" ID="UserInterface.__initPythonDocActions"></a>
 <h4>UserInterface.__initPythonDocActions</h4>
 <b>__initPythonDocActions</b>(<i></i>)
@@ -1672,10 +1673,15 @@
         Private slot to show the PyQt5 documentation.
 </p><a NAME="UserInterface.__showPySideDoc" ID="UserInterface.__showPySideDoc"></a>
 <h4>UserInterface.__showPySideDoc</h4>
-<b>__showPySideDoc</b>(<i></i>)
+<b>__showPySideDoc</b>(<i>variant</i>)
 <p>
-        Private slot to show the PySide documentation.
-</p><a NAME="UserInterface.__showPython2Doc" ID="UserInterface.__showPython2Doc"></a>
+        Private slot to show the PySide/PySide2 documentation.
+</p><dl>
+<dt><i>variant</i> (str)</dt>
+<dd>
+PySide variant (1 or 2)
+</dd>
+</dl><a NAME="UserInterface.__showPython2Doc" ID="UserInterface.__showPython2Doc"></a>
 <h4>UserInterface.__showPython2Doc</h4>
 <b>__showPython2Doc</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric6.Utilities.PySideImporter.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Utilities.PySideImporter.html	Fri May 18 19:41:02 2018 +0200
@@ -21,7 +21,7 @@
 <body><a NAME="top" ID="top"></a>
 <h1>eric6.Utilities.PySideImporter</h1>
 <p>
-Module to check for the presence of PySide by importing it.
+Module to check for the presence of PySide/PySide2 by importing it.
 </p>
 <h3>Global Attributes</h3>
 <table>

--- a/Documentation/Source/eric6.Utilities.__init__.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.Utilities.__init__.html	Fri May 18 19:41:02 2018 +0200
@@ -50,7 +50,7 @@
 <td>Public method to convert a path relative to a start path with universal separators to an absolute path.</td>
 </tr><tr>
 <td><a href="#checkPyside">checkPyside</a></td>
-<td>Module function to check the presence of PySide.</td>
+<td>Module function to check the presence of PySide/PySide2.</td>
 </tr><tr>
 <td><a href="#compactPath">compactPath</a></td>
 <td>Function to return a compacted path fitting inside the given width.</td>
@@ -107,7 +107,7 @@
 <td>Module function to generate the executable path for a PyQt tool.</td>
 </tr><tr>
 <td><a href="#generatePySideToolPath">generatePySideToolPath</a></td>
-<td>Module function to generate the executable path for a PySide tool.</td>
+<td>Module function to generate the executable path for a PySide/PySide2 tool.</td>
 </tr><tr>
 <td><a href="#generateQtToolName">generateQtToolName</a></td>
 <td>Module function to generate the executable name for a Qt tool like designer.</td>
@@ -439,14 +439,24 @@
 <hr /><hr />
 <a NAME="checkPyside" ID="checkPyside"></a>
 <h2>checkPyside</h2>
-<b>checkPyside</b>(<i></i>)
+<b>checkPyside</b>(<i>variant="2"</i>)
 <p>
-    Module function to check the presence of PySide.
+    Module function to check the presence of PySide/PySide2.
 </p><dl>
+<dt><i>variant</i> (str)</dt>
+<dd>
+indicator for the PySide variant
+</dd>
+</dl><dl>
 <dt>Returns:</dt>
 <dd>
-list of two flags indicating the presence of PySide for Python2
-        and PySide for Python3 (boolean, boolean)
+list of two flags indicating the presence of PySide/PySide2 for
+        Python2 and PySide/PySide2 for Python3
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (bool, bool)
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -859,18 +869,26 @@
 <hr /><hr />
 <a NAME="generatePySideToolPath" ID="generatePySideToolPath"></a>
 <h2>generatePySideToolPath</h2>
-<b>generatePySideToolPath</b>(<i>toolname</i>)
+<b>generatePySideToolPath</b>(<i>toolname, variant="2"</i>)
 <p>
-    Module function to generate the executable path for a PySide tool.
+    Module function to generate the executable path for a PySide/PySide2 tool.
 </p><dl>
-<dt><i>toolname</i></dt>
+<dt><i>toolname</i> (str)</dt>
 <dd>
-base name of the tool (string)
+base name of the tool
+</dd><dt><i>variant</i> (str)</dt>
+<dd>
+indicator for the PySide variant
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-the PySide tool path with extension (string)
+the PySide/PySide2 tool path with extension
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>

--- a/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html	Fri May 18 19:41:02 2018 +0200
@@ -656,7 +656,7 @@
 <td>Public slot called to toggle the full screen mode.</td>
 </tr><tr>
 <td><a href="#WebBrowserWindow.urlHandler">urlHandler</a></td>
-<td>Private slot used as desktop URL handler.</td>
+<td>Public slot used as desktop URL handler.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -2421,7 +2421,7 @@
 <h4>WebBrowserWindow.urlHandler</h4>
 <b>urlHandler</b>(<i>url</i>)
 <p>
-        Private slot used as desktop URL handler.
+        Public slot used as desktop URL handler.
 </p><dl>
 <dt><i>url</i> (QUrl)</dt>
 <dd>

--- a/Documentation/Source/index-eric6.Plugins.UiExtensionPlugins.PipInterface.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/index-eric6.Plugins.UiExtensionPlugins.PipInterface.html	Fri May 18 19:41:02 2018 +0200
@@ -41,6 +41,9 @@
 <td><a href="eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html">PipDialog</a></td>
 <td>Module implementing a dialog showing the output of a pip command.</td>
 </tr><tr>
+<td><a href="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html">PipFileSelectionDialog</a></td>
+<td>Module implementing a dialog to enter a file to be processed.</td>
+</tr><tr>
 <td><a href="eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html">PipFreezeDialog</a></td>
 <td>Module implementing a dialog to generate a requirements file.</td>
 </tr><tr>
@@ -53,9 +56,6 @@
 <td><a href="eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.html">PipPackagesInputDialog</a></td>
 <td>Module implementing a dialog to enter package specifications.</td>
 </tr><tr>
-<td><a href="eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html">PipRequirementsSelectionDialog</a></td>
-<td>Module implementing a dialog to enter a requirements file.</td>
-</tr><tr>
 <td><a href="eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.html">PipSearchDialog</a></td>
 <td>Module implementing a dialog to search PyPI.</td>
 </tr>

--- a/Documentation/Source/index-eric6.Utilities.html	Fri May 18 19:24:37 2018 +0200
+++ b/Documentation/Source/index-eric6.Utilities.html	Fri May 18 19:41:02 2018 +0200
@@ -63,7 +63,7 @@
 <td>Module implementing a checker for password strength.</td>
 </tr><tr>
 <td><a href="eric6.Utilities.PySideImporter.html">PySideImporter</a></td>
-<td>Module to check for the presence of PySide by importing it.</td>
+<td>Module to check for the presence of PySide/PySide2 by importing it.</td>
 </tr><tr>
 <td><a href="eric6.Utilities.__init__.html">Utilities</a></td>
 <td>Package implementing various functions/classes needed everywhere within eric6.</td>

--- a/Helpviewer/HelpWindow.py	Fri May 18 19:24:37 2018 +0200
+++ b/Helpviewer/HelpWindow.py	Fri May 18 19:41:02 2018 +0200
@@ -2676,7 +2676,7 @@
     @pyqtSlot(QUrl)
     def urlHandler(self, url):
         """
-        Private slot used as desktop URL handler.
+        Public slot used as desktop URL handler.
         
         @param url URL to be handled
         @type QUrl

--- a/UI/UserInterface.py	Fri May 18 19:24:37 2018 +0200
+++ b/UI/UserInterface.py	Fri May 18 19:41:02 2018 +0200
@@ -5426,7 +5426,7 @@
                 self.tr("Documentation"),
                 self.tr("""<p>The PySide{0} documentation starting point"""
                         """ has not been configured.</p>""").format(
-                "" if variant == "1" else variant)
+                    "" if variant == "1" else variant)
             )
             return
         

--- a/WebBrowser/WebBrowserWindow.py	Fri May 18 19:24:37 2018 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Fri May 18 19:41:02 2018 +0200
@@ -3412,7 +3412,7 @@
     @pyqtSlot(QUrl)
     def urlHandler(self, url):
         """
-        Private slot used as desktop URL handler.
+        Public slot used as desktop URL handler.
         
         @param url URL to be handled
         @type QUrl