Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Mon Sep 10 18:42:28 2012 +0200
+++ b/APIs/Python3/eric5.api	Mon Sep 10 18:43:17 2012 +0200
@@ -1617,7 +1617,7 @@
 eric5.Globals.settingsNameRecent?7
 eric5.Graphics.ApplicationDiagramBuilder.ApplicationDiagramBuilder.buildDiagram?4()
 eric5.Graphics.ApplicationDiagramBuilder.ApplicationDiagramBuilder.getPersistenceData?4()
-eric5.Graphics.ApplicationDiagramBuilder.ApplicationDiagramBuilder.parsePersistenceData?4(data)
+eric5.Graphics.ApplicationDiagramBuilder.ApplicationDiagramBuilder.parsePersistenceData?4(version, data)
 eric5.Graphics.ApplicationDiagramBuilder.ApplicationDiagramBuilder?1(dialog, view, project, noModules=False)
 eric5.Graphics.AssociationItem.AssociationItem.buildAssociationItemDataString?4()
 eric5.Graphics.AssociationItem.AssociationItem.parseAssociationItemDataString?4(data)
@@ -1641,7 +1641,7 @@
 eric5.Graphics.ClassItem.ClassItem.buildItemDataString?4()
 eric5.Graphics.ClassItem.ClassItem.isExternal?4()
 eric5.Graphics.ClassItem.ClassItem.paint?4(painter, option, widget=None)
-eric5.Graphics.ClassItem.ClassItem.parseItemDataString?4(data)
+eric5.Graphics.ClassItem.ClassItem.parseItemDataString?4(version, data)
 eric5.Graphics.ClassItem.ClassItem.setModel?4(model)
 eric5.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None)
 eric5.Graphics.ClassItem.ClassModel.addAttribute?4(attribute)
@@ -1655,12 +1655,12 @@
 eric5.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.buildDiagram?4()
 eric5.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.getPersistenceData?4()
 eric5.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.initialize?4()
-eric5.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.parsePersistenceData?4(data)
+eric5.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.parsePersistenceData?4(version, data)
 eric5.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder?1(dialog, view, project, package, showExternalImports=False)
 eric5.Graphics.ModuleItem.ModuleItem.ItemType?7
 eric5.Graphics.ModuleItem.ModuleItem.buildItemDataString?4()
 eric5.Graphics.ModuleItem.ModuleItem.paint?4(painter, option, widget=None)
-eric5.Graphics.ModuleItem.ModuleItem.parseItemDataString?4(data)
+eric5.Graphics.ModuleItem.ModuleItem.parseItemDataString?4(version, data)
 eric5.Graphics.ModuleItem.ModuleItem.setModel?4(model)
 eric5.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, parent=None, scene=None)
 eric5.Graphics.ModuleItem.ModuleModel.addClass?4(classname)
@@ -1670,12 +1670,12 @@
 eric5.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.buildDiagram?4()
 eric5.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.getPersistenceData?4()
 eric5.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.initialize?4()
-eric5.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.parsePersistenceData?4(data)
+eric5.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.parsePersistenceData?4(version, data)
 eric5.Graphics.PackageDiagramBuilder.PackageDiagramBuilder?1(dialog, view, project, package, noAttrs=False)
 eric5.Graphics.PackageItem.PackageItem.ItemType?7
 eric5.Graphics.PackageItem.PackageItem.buildItemDataString?4()
 eric5.Graphics.PackageItem.PackageItem.paint?4(painter, option, widget=None)
-eric5.Graphics.PackageItem.PackageItem.parseItemDataString?4(data)
+eric5.Graphics.PackageItem.PackageItem.parseItemDataString?4(version, data)
 eric5.Graphics.PackageItem.PackageItem.setModel?4(model)
 eric5.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None)
 eric5.Graphics.PackageItem.PackageModel.addModule?4(modulename)
@@ -1696,19 +1696,21 @@
 eric5.Graphics.UMLClassDiagramBuilder.UMLClassDiagramBuilder.buildDiagram?4()
 eric5.Graphics.UMLClassDiagramBuilder.UMLClassDiagramBuilder.getPersistenceData?4()
 eric5.Graphics.UMLClassDiagramBuilder.UMLClassDiagramBuilder.initialize?4()
-eric5.Graphics.UMLClassDiagramBuilder.UMLClassDiagramBuilder.parsePersistenceData?4(data)
+eric5.Graphics.UMLClassDiagramBuilder.UMLClassDiagramBuilder.parsePersistenceData?4(version, data)
 eric5.Graphics.UMLClassDiagramBuilder.UMLClassDiagramBuilder?1(dialog, view, project, file, noAttrs=False)
 eric5.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.buildDiagram?4()
 eric5.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.getPersistenceData?4()
 eric5.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.initialize?4()
-eric5.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.parsePersistenceData?4(data)
+eric5.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.parsePersistenceData?4(version, data)
 eric5.Graphics.UMLDiagramBuilder.UMLDiagramBuilder?1(dialog, view, project)
 eric5.Graphics.UMLDialog.UMLDialog.ApplicationDiagram?7
 eric5.Graphics.UMLDialog.UMLDialog.ClassDiagram?7
+eric5.Graphics.UMLDialog.UMLDialog.FileVersions?7
 eric5.Graphics.UMLDialog.UMLDialog.ImportsDiagram?7
+eric5.Graphics.UMLDialog.UMLDialog.NoDiagram?7
 eric5.Graphics.UMLDialog.UMLDialog.PackageDiagram?7
-eric5.Graphics.UMLDialog.UMLDialog.generateDialogFromFile?4(project, parent=None)
-eric5.Graphics.UMLDialog.UMLDialog.show?4()
+eric5.Graphics.UMLDialog.UMLDialog.load?4()
+eric5.Graphics.UMLDialog.UMLDialog.show?4(fromFile=False)
 eric5.Graphics.UMLDialog.UMLDialog?1(diagramType, project, path="", parent=None, initBuilder=True, **kwargs)
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.autoAdjustSceneSize?4(limit=False)
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.event?4(evt)
@@ -1718,7 +1720,7 @@
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.getItemId?4()
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.getPersistenceData?4()
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.initToolBar?4()
-eric5.Graphics.UMLGraphicsView.UMLGraphicsView.parsePersistenceData?4(data)
+eric5.Graphics.UMLGraphicsView.UMLGraphicsView.parsePersistenceData?4(version, data)
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.printDiagram?4()
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.printPreviewDiagram?4()
 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.relayout?7
@@ -1737,7 +1739,7 @@
 eric5.Graphics.UMLItem.UMLItem.itemChange?4(change, value)
 eric5.Graphics.UMLItem.UMLItem.moveBy?4(dx, dy)
 eric5.Graphics.UMLItem.UMLItem.paint?4(painter, option, widget=None)
-eric5.Graphics.UMLItem.UMLItem.parseItemDataString?4(data)
+eric5.Graphics.UMLItem.UMLItem.parseItemDataString?4(version, data)
 eric5.Graphics.UMLItem.UMLItem.removeAssociation?4(assoc)
 eric5.Graphics.UMLItem.UMLItem.removeAssociations?4()
 eric5.Graphics.UMLItem.UMLItem.setId?4(id)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Help/source.qhp	Mon Sep 10 18:43:17 2012 +0200
@@ -3782,6 +3782,7 @@
       <keyword name="Editor.__languageMenuTriggered" id="Editor.__languageMenuTriggered" ref="eric5.QScintilla.Editor.html#Editor.__languageMenuTriggered" />
       <keyword name="Editor.__lmBbookmarks" id="Editor.__lmBbookmarks" ref="eric5.QScintilla.Editor.html#Editor.__lmBbookmarks" />
       <keyword name="Editor.__lmBbreakpoints" id="Editor.__lmBbreakpoints" ref="eric5.QScintilla.Editor.html#Editor.__lmBbreakpoints" />
+      <keyword name="Editor.__loadDiagram" id="Editor.__loadDiagram" ref="eric5.QScintilla.Editor.html#Editor.__loadDiagram" />
       <keyword name="Editor.__marginClicked" id="Editor.__marginClicked" ref="eric5.QScintilla.Editor.html#Editor.__marginClicked" />
       <keyword name="Editor.__marginNumber" id="Editor.__marginNumber" ref="eric5.QScintilla.Editor.html#Editor.__marginNumber" />
       <keyword name="Editor.__markOccurrences" id="Editor.__markOccurrences" ref="eric5.QScintilla.Editor.html#Editor.__markOccurrences" />
@@ -7645,6 +7646,7 @@
       <keyword name="Project.__initData" id="Project.__initData" ref="eric5.Project.Project.html#Project.__initData" />
       <keyword name="Project.__initDebugProperties" id="Project.__initDebugProperties" ref="eric5.Project.Project.html#Project.__initDebugProperties" />
       <keyword name="Project.__initProjectTypes" id="Project.__initProjectTypes" ref="eric5.Project.Project.html#Project.__initProjectTypes" />
+      <keyword name="Project.__loadDiagram" id="Project.__loadDiagram" ref="eric5.Project.Project.html#Project.__loadDiagram" />
       <keyword name="Project.__loadRecent" id="Project.__loadRecent" ref="eric5.Project.Project.html#Project.__loadRecent" />
       <keyword name="Project.__makePpathRe" id="Project.__makePpathRe" ref="eric5.Project.Project.html#Project.__makePpathRe" />
       <keyword name="Project.__openRecent" id="Project.__openRecent" ref="eric5.Project.Project.html#Project.__openRecent" />
@@ -8031,6 +8033,7 @@
       <keyword name="ProjectSourcesBrowser.__createPythonPopupMenus" id="ProjectSourcesBrowser.__createPythonPopupMenus" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__createPythonPopupMenus" />
       <keyword name="ProjectSourcesBrowser.__createRubyPopupMenus" id="ProjectSourcesBrowser.__createRubyPopupMenus" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__createRubyPopupMenus" />
       <keyword name="ProjectSourcesBrowser.__deleteFile" id="ProjectSourcesBrowser.__deleteFile" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__deleteFile" />
+      <keyword name="ProjectSourcesBrowser.__loadDiagram" id="ProjectSourcesBrowser.__loadDiagram" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__loadDiagram" />
       <keyword name="ProjectSourcesBrowser.__showApplicationDiagram" id="ProjectSourcesBrowser.__showApplicationDiagram" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__showApplicationDiagram" />
       <keyword name="ProjectSourcesBrowser.__showClassDiagram" id="ProjectSourcesBrowser.__showClassDiagram" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__showClassDiagram" />
       <keyword name="ProjectSourcesBrowser.__showCodeCoverage" id="ProjectSourcesBrowser.__showCodeCoverage" ref="eric5.Project.ProjectSourcesBrowser.html#ProjectSourcesBrowser.__showCodeCoverage" />
@@ -10649,7 +10652,8 @@
       <keyword name="UMLDialog.__relayout" id="UMLDialog.__relayout" ref="eric5.Graphics.UMLDialog.html#UMLDialog.__relayout" />
       <keyword name="UMLDialog.__save" id="UMLDialog.__save" ref="eric5.Graphics.UMLDialog.html#UMLDialog.__save" />
       <keyword name="UMLDialog.__saveAs" id="UMLDialog.__saveAs" ref="eric5.Graphics.UMLDialog.html#UMLDialog.__saveAs" />
-      <keyword name="UMLDialog.generateDialogFromFile" id="UMLDialog.generateDialogFromFile" ref="eric5.Graphics.UMLDialog.html#UMLDialog.generateDialogFromFile" />
+      <keyword name="UMLDialog.__showInvalidDataMessage" id="UMLDialog.__showInvalidDataMessage" ref="eric5.Graphics.UMLDialog.html#UMLDialog.__showInvalidDataMessage" />
+      <keyword name="UMLDialog.load" id="UMLDialog.load" ref="eric5.Graphics.UMLDialog.html#UMLDialog.load" />
       <keyword name="UMLDialog.show" id="UMLDialog.show" ref="eric5.Graphics.UMLDialog.html#UMLDialog.show" />
       <keyword name="UMLGraphicsView" id="UMLGraphicsView" ref="eric5.Graphics.UMLGraphicsView.html#UMLGraphicsView" />
       <keyword name="UMLGraphicsView (Constructor)" id="UMLGraphicsView (Constructor)" ref="eric5.Graphics.UMLGraphicsView.html#UMLGraphicsView.__init__" />

--- a/Documentation/Source/eric5.Graphics.ApplicationDiagramBuilder.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.ApplicationDiagramBuilder.html	Mon Sep 10 18:43:17 2012 +0200
@@ -161,14 +161,22 @@
 </dd>
 </dl><a NAME="ApplicationDiagramBuilder.parsePersistenceData" ID="ApplicationDiagramBuilder.parsePersistenceData"></a>
 <h4>ApplicationDiagramBuilder.parsePersistenceData</h4>
-<b>parsePersistenceData</b>(<i>data</i>)
+<b>parsePersistenceData</b>(<i>version, data</i>)
 <p>
         Public method to parse persisted data.
 </p><dl>
-<dt><i>dat</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.Graphics.ClassItem.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.ClassItem.html	Mon Sep 10 18:43:17 2012 +0200
@@ -173,14 +173,22 @@
 </dd>
 </dl><a NAME="ClassItem.parseItemDataString" ID="ClassItem.parseItemDataString"></a>
 <h4>ClassItem.parseItemDataString</h4>
-<b>parseItemDataString</b>(<i>data</i>)
+<b>parseItemDataString</b>(<i>version, data</i>)
 <p>
         Public method to parse the given persistence data.
 </p><dl>
-<dt><i>data</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl><a NAME="ClassItem.setModel" ID="ClassItem.setModel"></a>
 <h4>ClassItem.setModel</h4>
 <b>setModel</b>(<i>model</i>)

--- a/Documentation/Source/eric5.Graphics.ImportsDiagramBuilder.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.ImportsDiagramBuilder.html	Mon Sep 10 18:43:17 2012 +0200
@@ -176,14 +176,22 @@
         Public method to initialize the object.
 </p><a NAME="ImportsDiagramBuilder.parsePersistenceData" ID="ImportsDiagramBuilder.parsePersistenceData"></a>
 <h4>ImportsDiagramBuilder.parsePersistenceData</h4>
-<b>parsePersistenceData</b>(<i>data</i>)
+<b>parsePersistenceData</b>(<i>version, data</i>)
 <p>
         Public method to parse persisted data.
 </p><dl>
-<dt><i>dat</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.Graphics.ModuleItem.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.ModuleItem.html	Mon Sep 10 18:43:17 2012 +0200
@@ -154,14 +154,22 @@
 </dd>
 </dl><a NAME="ModuleItem.parseItemDataString" ID="ModuleItem.parseItemDataString"></a>
 <h4>ModuleItem.parseItemDataString</h4>
-<b>parseItemDataString</b>(<i>data</i>)
+<b>parseItemDataString</b>(<i>version, data</i>)
 <p>
         Public method to parse the given persistence data.
 </p><dl>
-<dt><i>data</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl><a NAME="ModuleItem.setModel" ID="ModuleItem.setModel"></a>
 <h4>ModuleItem.setModel</h4>
 <b>setModel</b>(<i>model</i>)

--- a/Documentation/Source/eric5.Graphics.PackageDiagramBuilder.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.PackageDiagramBuilder.html	Mon Sep 10 18:43:17 2012 +0200
@@ -225,14 +225,22 @@
         Public method to initialize the object.
 </p><a NAME="PackageDiagramBuilder.parsePersistenceData" ID="PackageDiagramBuilder.parsePersistenceData"></a>
 <h4>PackageDiagramBuilder.parsePersistenceData</h4>
-<b>parsePersistenceData</b>(<i>data</i>)
+<b>parsePersistenceData</b>(<i>version, data</i>)
 <p>
         Public method to parse persisted data.
 </p><dl>
-<dt><i>dat</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.Graphics.PackageItem.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.PackageItem.html	Mon Sep 10 18:43:17 2012 +0200
@@ -158,14 +158,22 @@
 </dd>
 </dl><a NAME="PackageItem.parseItemDataString" ID="PackageItem.parseItemDataString"></a>
 <h4>PackageItem.parseItemDataString</h4>
-<b>parseItemDataString</b>(<i>data</i>)
+<b>parseItemDataString</b>(<i>version, data</i>)
 <p>
         Public method to parse the given persistence data.
 </p><dl>
-<dt><i>data</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl><a NAME="PackageItem.setModel" ID="PackageItem.setModel"></a>
 <h4>PackageItem.setModel</h4>
 <b>setModel</b>(<i>model</i>)

--- a/Documentation/Source/eric5.Graphics.UMLClassDiagramBuilder.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.UMLClassDiagramBuilder.html	Mon Sep 10 18:43:17 2012 +0200
@@ -212,14 +212,22 @@
         Public method to initialize the object.
 </p><a NAME="UMLClassDiagramBuilder.parsePersistenceData" ID="UMLClassDiagramBuilder.parsePersistenceData"></a>
 <h4>UMLClassDiagramBuilder.parsePersistenceData</h4>
-<b>parsePersistenceData</b>(<i>data</i>)
+<b>parsePersistenceData</b>(<i>version, data</i>)
 <p>
         Public method to parse persisted data.
 </p><dl>
-<dt><i>dat</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.Graphics.UMLDiagramBuilder.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.UMLDiagramBuilder.html	Mon Sep 10 18:43:17 2012 +0200
@@ -118,14 +118,22 @@
         Public method to initialize the object.
 </p><a NAME="UMLDiagramBuilder.parsePersistenceData" ID="UMLDiagramBuilder.parsePersistenceData"></a>
 <h4>UMLDiagramBuilder.parsePersistenceData</h4>
-<b>parsePersistenceData</b>(<i>data</i>)
+<b>parsePersistenceData</b>(<i>version, data</i>)
 <p>
         Public method to parse persisted data.
 </p><dl>
-<dt><i>dat</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />

--- a/Documentation/Source/eric5.Graphics.UMLDialog.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.UMLDialog.html	Mon Sep 10 18:43:17 2012 +0200
@@ -49,14 +49,11 @@
 QMainWindow
 <h3>Class Attributes</h3>
 <table>
-<tr><td>ApplicationDiagram</td></tr><tr><td>ClassDiagram</td></tr><tr><td>ImportsDiagram</td></tr><tr><td>PackageDiagram</td></tr>
+<tr><td>ApplicationDiagram</td></tr><tr><td>ClassDiagram</td></tr><tr><td>FileVersions</td></tr><tr><td>ImportsDiagram</td></tr><tr><td>NoDiagram</td></tr><tr><td>PackageDiagram</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
-<tr>
-<td><a href="#UMLDialog.generateDialogFromFile">generateDialogFromFile</a></td>
-<td>Class method to generate a dialog reading data from a file.</td>
-</tr>
+<tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
 <table>
@@ -85,33 +82,21 @@
 <td><a href="#UMLDialog.__saveAs">__saveAs</a></td>
 <td>Private slot to save the diagram.</td>
 </tr><tr>
+<td><a href="#UMLDialog.__showInvalidDataMessage">__showInvalidDataMessage</a></td>
+<td>Private slot to show a message dialog indicating an invalid data file.</td>
+</tr><tr>
+<td><a href="#UMLDialog.load">load</a></td>
+<td>Public method to load a diagram from a file.</td>
+</tr><tr>
 <td><a href="#UMLDialog.show">show</a></td>
-<td>Overriden method to show the dialog.</td>
+<td>Public method to show the dialog.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
 <table>
 <tr><td>None</td></tr>
 </table>
-<a NAME="UMLDialog.generateDialogFromFile" ID="UMLDialog.generateDialogFromFile"></a>
-<h4>UMLDialog.generateDialogFromFile (class method)</h4>
-<b>generateDialogFromFile</b>(<i>project, parent=None</i>)
-<p>
-        Class method to generate a dialog reading data from a file.
-</p><dl>
-<dt><i>project</i></dt>
-<dd>
-reference to the project object (Project)
-</dd><dt><i>parent</i></dt>
-<dd>
-parent widget of the dialog (QWidget)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-generated dialog (UMLDialog)
-</dd>
-</dl><a NAME="UMLDialog.__init__" ID="UMLDialog.__init__"></a>
+<a NAME="UMLDialog.__init__" ID="UMLDialog.__init__"></a>
 <h4>UMLDialog (Constructor)</h4>
 <b>UMLDialog</b>(<i>diagramType, project, path="", parent=None, initBuilder=True, **kwargs</i>)
 <p>
@@ -119,8 +104,8 @@
 </p><dl>
 <dt><i>diagramType</i></dt>
 <dd>
-type of the diagram
-            (one of ApplicationDiagram, ClassDiagram, ImportsDiagram, PackageDiagram)
+type of the diagram (one of ApplicationDiagram, ClassDiagram,
+            ImportsDiagram, NoDiagram, PackageDiagram)
 </dd><dt><i>project</i></dt>
 <dd>
 reference to the project object (Project)
@@ -139,7 +124,7 @@
 </dd>
 </dl><a NAME="UMLDialog.__diagramBuilder" ID="UMLDialog.__diagramBuilder"></a>
 <h4>UMLDialog.__diagramBuilder</h4>
-<b>__diagramBuilder</b>(<i>diagramType, project, path, **kwargs</i>)
+<b>__diagramBuilder</b>(<i>diagramType, path, **kwargs</i>)
 <p>
         Private method to instantiate a diagram builder object.
 </p><dl>
@@ -147,9 +132,6 @@
 <dd>
 type of the diagram
             (one of ApplicationDiagram, ClassDiagram, ImportsDiagram, PackageDiagram)
-</dd><dt><i>project</i></dt>
-<dd>
-reference to the project object (Project)
 </dd><dt><i>path</i></dt>
 <dd>
 file or directory path to build the diagram from (string)
@@ -197,12 +179,41 @@
 <dd>
 name of the file to write to (string)
 </dd>
+</dl><a NAME="UMLDialog.__showInvalidDataMessage" ID="UMLDialog.__showInvalidDataMessage"></a>
+<h4>UMLDialog.__showInvalidDataMessage</h4>
+<b>__showInvalidDataMessage</b>(<i>filename, linenum=-1</i>)
+<p>
+        Private slot to show a message dialog indicating an invalid data file.
+</p><dl>
+<dt><i>filename</i></dt>
+<dd>
+name of the file containing the invalid data (string)
+</dd><dt><i>linenum</i></dt>
+<dd>
+number of the invalid line (integer)
+</dd>
+</dl><a NAME="UMLDialog.load" ID="UMLDialog.load"></a>
+<h4>UMLDialog.load</h4>
+<b>load</b>(<i></i>)
+<p>
+        Public method to load a diagram from a file.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl><a NAME="UMLDialog.show" ID="UMLDialog.show"></a>
 <h4>UMLDialog.show</h4>
-<b>show</b>(<i></i>)
+<b>show</b>(<i>fromFile=False</i>)
 <p>
-        Overriden method to show the dialog.
-</p>
+        Public method to show the dialog.
+</p><dl>
+<dt><i>fromFile=</i></dt>
+<dd>
+flag indicating, that the diagram was loaded
+            from file (boolean)
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Graphics.UMLGraphicsView.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.UMLGraphicsView.html	Mon Sep 10 18:43:17 2012 +0200
@@ -350,13 +350,22 @@
 </dd>
 </dl><a NAME="UMLGraphicsView.parsePersistenceData" ID="UMLGraphicsView.parsePersistenceData"></a>
 <h4>UMLGraphicsView.parsePersistenceData</h4>
-<b>parsePersistenceData</b>(<i>data</i>)
+<b>parsePersistenceData</b>(<i>version, data</i>)
 <p>
         Public method to parse persisted data.
 </p><dl>
-<dt><i>dat</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
-persisted data to be parsed (string)
+persisted data to be parsed (list of string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+tuple of flag indicating success (boolean) and faulty line
+            number (integer)
 </dd>
 </dl><a NAME="UMLGraphicsView.printDiagram" ID="UMLGraphicsView.printDiagram"></a>
 <h4>UMLGraphicsView.printDiagram</h4>

--- a/Documentation/Source/eric5.Graphics.UMLItem.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Graphics.UMLItem.html	Mon Sep 10 18:43:17 2012 +0200
@@ -225,14 +225,22 @@
 </dd>
 </dl><a NAME="UMLItem.parseItemDataString" ID="UMLItem.parseItemDataString"></a>
 <h4>UMLItem.parseItemDataString</h4>
-<b>parseItemDataString</b>(<i>data</i>)
+<b>parseItemDataString</b>(<i>version, data</i>)
 <p>
         Public method to parse the given persistence data.
 </p><dl>
-<dt><i>data</i></dt>
+<dt><i>version</i></dt>
+<dd>
+version of the data (string)
+</dd><dt><i>data</i></dt>
 <dd>
 persisted data to be parsed (string)
 </dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating success (boolean)
+</dd>
 </dl><a NAME="UMLItem.removeAssociation" ID="UMLItem.removeAssociation"></a>
 <h4>UMLItem.removeAssociation</h4>
 <b>removeAssociation</b>(<i>assoc</i>)

--- a/Documentation/Source/eric5.Project.Project.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Project.Project.html	Mon Sep 10 18:43:17 2012 +0200
@@ -219,6 +219,9 @@
 <td><a href="#Project.__initProjectTypes">__initProjectTypes</a></td>
 <td>Private method to initialize the list of supported project types.</td>
 </tr><tr>
+<td><a href="#Project.__loadDiagram">__loadDiagram</a></td>
+<td>Private slot to load a diagram from file.</td>
+</tr><tr>
 <td><a href="#Project.__loadRecent">__loadRecent</a></td>
 <td>Private method to load the recently opened project filenames.</td>
 </tr><tr>
@@ -833,6 +836,11 @@
 <b>__initProjectTypes</b>(<i></i>)
 <p>
         Private method to initialize the list of supported project types.
+</p><a NAME="Project.__loadDiagram" ID="Project.__loadDiagram"></a>
+<h4>Project.__loadDiagram</h4>
+<b>__loadDiagram</b>(<i></i>)
+<p>
+        Private slot to load a diagram from file.
 </p><a NAME="Project.__loadRecent" ID="Project.__loadRecent"></a>
 <h4>Project.__loadRecent</h4>
 <b>__loadRecent</b>(<i></i>)

--- a/Documentation/Source/eric5.Project.ProjectSourcesBrowser.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.Project.ProjectSourcesBrowser.html	Mon Sep 10 18:43:17 2012 +0200
@@ -103,6 +103,9 @@
 <td><a href="#ProjectSourcesBrowser.__deleteFile">__deleteFile</a></td>
 <td>Private method to delete files from the project.</td>
 </tr><tr>
+<td><a href="#ProjectSourcesBrowser.__loadDiagram">__loadDiagram</a></td>
+<td>Private slot to load a diagram from file.</td>
+</tr><tr>
 <td><a href="#ProjectSourcesBrowser.__showApplicationDiagram">__showApplicationDiagram</a></td>
 <td>Private method to handle the application diagram context menu action.</td>
 </tr><tr>
@@ -213,6 +216,11 @@
 <b>__deleteFile</b>(<i></i>)
 <p>
         Private method to delete files from the project.
+</p><a NAME="ProjectSourcesBrowser.__loadDiagram" ID="ProjectSourcesBrowser.__loadDiagram"></a>
+<h4>ProjectSourcesBrowser.__loadDiagram</h4>
+<b>__loadDiagram</b>(<i></i>)
+<p>
+        Private slot to load a diagram from file.
 </p><a NAME="ProjectSourcesBrowser.__showApplicationDiagram" ID="ProjectSourcesBrowser.__showApplicationDiagram"></a>
 <h4>ProjectSourcesBrowser.__showApplicationDiagram</h4>
 <b>__showApplicationDiagram</b>(<i></i>)

--- a/Documentation/Source/eric5.QScintilla.Editor.html	Mon Sep 10 18:42:28 2012 +0200
+++ b/Documentation/Source/eric5.QScintilla.Editor.html	Mon Sep 10 18:43:17 2012 +0200
@@ -341,6 +341,9 @@
 <td><a href="#Editor.__lmBbreakpoints">__lmBbreakpoints</a></td>
 <td>Private method to handle the 'LMB toggles breakpoint' context menu action.</td>
 </tr><tr>
+<td><a href="#Editor.__loadDiagram">__loadDiagram</a></td>
+<td>Private slot to load a diagram from file.</td>
+</tr><tr>
 <td><a href="#Editor.__marginClicked">__marginClicked</a></td>
 <td>Private slot to handle the marginClicked signal.</td>
 </tr><tr>
@@ -1593,6 +1596,11 @@
 <b>__lmBbreakpoints</b>(<i></i>)
 <p>
         Private method to handle the 'LMB toggles breakpoint' context menu action.
+</p><a NAME="Editor.__loadDiagram" ID="Editor.__loadDiagram"></a>
+<h4>Editor.__loadDiagram</h4>
+<b>__loadDiagram</b>(<i></i>)
+<p>
+        Private slot to load a diagram from file.
 </p><a NAME="Editor.__marginClicked" ID="Editor.__marginClicked"></a>
 <h4>Editor.__marginClicked</h4>
 <b>__marginClicked</b>(<i>margin, line, modifiers</i>)