Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Sat Sep 27 15:59:38 2014 +0200
+++ b/APIs/Python3/eric6.api	Sat Sep 27 16:01:57 2014 +0200
@@ -8507,6 +8507,8 @@
 eric6.Utilities._percentReplacementFunc?5(matchobj)
 eric6.Utilities._uescape?8
 eric6.Utilities._uunescape?8
+eric6.Utilities.absolutePath?4(path, start)
+eric6.Utilities.absoluteUniversalPath?4(path, start)
 eric6.Utilities.binplistlib.BoolWrapper?1(value)
 eric6.Utilities.binplistlib.HashableWrapper?1(value)
 eric6.Utilities.binplistlib.PlistByteCounts?7
@@ -8669,10 +8671,13 @@
 eric6.Utilities.readEncodedFileWithEncoding?4(filename, encoding)
 eric6.Utilities.readEncodedFileWithHash?4(filename)
 eric6.Utilities.readStringFromStream?4(stream)
+eric6.Utilities.relativePath?4(path, start)
+eric6.Utilities.relativeUniversalPath?4(path, start)
 eric6.Utilities.relpath?4(path, start=os.path.curdir)
 eric6.Utilities.samefilepath?4(f1, f2)
 eric6.Utilities.samepath?4(f1, f2)
 eric6.Utilities.splitPath?4(name)
+eric6.Utilities.startswithPath?4(path, start)
 eric6.Utilities.supportedCodecs?7
 eric6.Utilities.toBool?4(dataStr)
 eric6.Utilities.toNativeSeparators?4(path)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Sep 27 15:59:38 2014 +0200
+++ b/Documentation/Help/source.qhp	Sat Sep 27 16:01:57 2014 +0200
@@ -12891,6 +12891,8 @@
       <keyword name="_is_eol_token_1" id="_is_eol_token_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#_is_eol_token_1" />
       <keyword name="_main" id="_main" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#_main" />
       <keyword name="_percentReplacementFunc" id="_percentReplacementFunc" ref="eric6.Utilities.__init__.html#_percentReplacementFunc" />
+      <keyword name="absolutePath" id="absolutePath" ref="eric6.Utilities.__init__.html#absolutePath" />
+      <keyword name="absoluteUniversalPath" id="absoluteUniversalPath" ref="eric6.Utilities.__init__.html#absoluteUniversalPath" />
       <keyword name="addActions" id="addActions" ref="eric6.E5Gui.E5Action.html#addActions" />
       <keyword name="addSearchPath" id="addSearchPath" ref="eric6.UI.PixmapCache.html#addSearchPath" />
       <keyword name="amendConfig" id="amendConfig" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.html#amendConfig" />
@@ -13396,6 +13398,8 @@
       <keyword name="registerLexer" id="registerLexer" ref="eric6.QScintilla.Lexers.__init__.html#registerLexer" />
       <keyword name="register_check" id="register_check" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#register_check" />
       <keyword name="rehashPassword" id="rehashPassword" ref="eric6.Utilities.crypto.py3PBKDF2.html#rehashPassword" />
+      <keyword name="relativePath" id="relativePath" ref="eric6.Utilities.__init__.html#relativePath" />
+      <keyword name="relativeUniversalPath" id="relativeUniversalPath" ref="eric6.Utilities.__init__.html#relativeUniversalPath" />
       <keyword name="relpath" id="relpath" ref="eric6.Utilities.__init__.html#relpath" />
       <keyword name="removeMarkers" id="removeMarkers" ref="eric6.UI.CompareDialog.html#removeMarkers" />
       <keyword name="removeProjectBrowserFlags" id="removeProjectBrowserFlags" ref="eric6.Preferences.__init__.html#removeProjectBrowserFlags" />
@@ -13470,6 +13474,7 @@
       <keyword name="splitPath" id="splitPath" ref="eric6.Utilities.__init__.html#splitPath" />
       <keyword name="startDebugger" id="startDebugger" ref="eric6.DebugClients.Python.eric6dbgstub.html#startDebugger" />
       <keyword name="startDebugger" id="startDebugger" ref="eric6.DebugClients.Python3.eric6dbgstub.html#startDebugger" />
+      <keyword name="startswithPath" id="startswithPath" ref="eric6.Utilities.__init__.html#startswithPath" />
       <keyword name="stdin_get_value" id="stdin_get_value" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#stdin_get_value" />
       <keyword name="strip_PKCS7_padding" id="strip_PKCS7_padding" ref="eric6.Utilities.crypto.py3AES.html#strip_PKCS7_padding" />
       <keyword name="subversion (Module)" id="subversion (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html" />

--- a/Documentation/Source/eric6.Utilities.__init__.html	Sat Sep 27 15:59:38 2014 +0200
+++ b/Documentation/Source/eric6.Utilities.__init__.html	Sat Sep 27 16:01:57 2014 +0200
@@ -43,6 +43,12 @@
 <td><a href="#_percentReplacementFunc">_percentReplacementFunc</a></td>
 <td>Protected function called for replacing % codes.</td>
 </tr><tr>
+<td><a href="#absolutePath">absolutePath</a></td>
+<td>Public method to convert a path relative to a start path to an absolute path.</td>
+</tr><tr>
+<td><a href="#absoluteUniversalPath">absoluteUniversalPath</a></td>
+<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>
 </tr><tr>
@@ -214,6 +220,12 @@
 <td><a href="#readStringFromStream">readStringFromStream</a></td>
 <td>Module function to read a string from the given stream.</td>
 </tr><tr>
+<td><a href="#relativePath">relativePath</a></td>
+<td>Function to convert a file path to a path relative to a start path.</td>
+</tr><tr>
+<td><a href="#relativeUniversalPath">relativeUniversalPath</a></td>
+<td>Function to convert a file path to a path relative to a start path with universal separators.</td>
+</tr><tr>
 <td><a href="#relpath">relpath</a></td>
 <td>Return a relative version of a path.</td>
 </tr><tr>
@@ -226,6 +238,9 @@
 <td><a href="#splitPath">splitPath</a></td>
 <td>Function to split a pathname into a directory part and a file part.</td>
 </tr><tr>
+<td><a href="#startswithPath">startswithPath</a></td>
+<td>Function to check, if a path starts with a given start path.</td>
+</tr><tr>
 <td><a href="#toBool">toBool</a></td>
 <td>Module function to convert a string to a boolean value.</td>
 </tr><tr>
@@ -366,6 +381,50 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="absolutePath" ID="absolutePath"></a>
+<h2>absolutePath</h2>
+<b>absolutePath</b>(<i>path, start</i>)
+<p>
+    Public method to convert a path relative to a start path to an
+    absolute path.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+file or directory name to convert (string)
+</dd><dt><i>start</i></dt>
+<dd>
+start path (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+absolute path (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="absoluteUniversalPath" ID="absoluteUniversalPath"></a>
+<h2>absoluteUniversalPath</h2>
+<b>absoluteUniversalPath</b>(<i>path, start</i>)
+<p>
+    Public method to convert a path relative to a start path with
+    universal separators to an absolute path.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+file or directory name to convert (string)
+</dd><dt><i>start</i></dt>
+<dd>
+start path (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+absolute path with native separators (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="checkPyside" ID="checkPyside"></a>
 <h2>checkPyside</h2>
 <b>checkPyside</b>(<i></i>)
@@ -1466,6 +1525,51 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="relativePath" ID="relativePath"></a>
+<h2>relativePath</h2>
+<b>relativePath</b>(<i>path, start</i>)
+<p>
+    Function to convert a file path to a path relative to a start path.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+file or directory name to convert (string)
+</dd><dt><i>start</i></dt>
+<dd>
+start path (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+relative path or unchanged path, if path does not start with
+        the start path (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="relativeUniversalPath" ID="relativeUniversalPath"></a>
+<h2>relativeUniversalPath</h2>
+<b>relativeUniversalPath</b>(<i>path, start</i>)
+<p>
+    Function to convert a file path to a path relative to a start path
+    with universal separators.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+file or directory name to convert (string)
+</dd><dt><i>start</i></dt>
+<dd>
+start path (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+relative path or unchanged path, if path does not start with
+        the start path with universal separators (string)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="relpath" ID="relpath"></a>
 <h2>relpath</h2>
 <b>relpath</b>(<i>path, start=os.path.curdir</i>)
@@ -1554,6 +1658,28 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="startswithPath" ID="startswithPath"></a>
+<h2>startswithPath</h2>
+<b>startswithPath</b>(<i>path, start</i>)
+<p>
+    Function to check, if a path starts with a given start path.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+path to be checked (string)
+</dd><dt><i>start</i></dt>
+<dd>
+start path (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating that the path starts with the given start
+        path (boolean)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="toBool" ID="toBool"></a>
 <h2>toBool</h2>
 <b>toBool</b>(<i>dataStr</i>)

--- a/changelog	Sat Sep 27 15:59:38 2014 +0200
+++ b/changelog	Sat Sep 27 16:01:57 2014 +0200
@@ -5,6 +5,9 @@
 - General
   -- added Portugese translations provided by Candido Fontes
   -- extended the code base to be usable with PyQt4 as well
+- Multi Project
+  -- changed multi project file format to contain relative paths to
+     the contained project files
 - Web Browser
   -- added DuckDuckGo to the list of default search engines