Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/APIs/Python3/eric6.api	Sun May 02 15:09:29 2021 +0200
@@ -1979,11 +1979,13 @@
 eric6.Graphics.ClassItem.ClassItem.parseItemDataString?4(version, data)
 eric6.Graphics.ClassItem.ClassItem.setModel?4(model)
 eric6.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, colors=None, parent=None, scene=None)
-eric6.Graphics.ClassItem.ClassModel.addAttribute?4(attribute)
+eric6.Graphics.ClassItem.ClassModel.addClassAttribute?4(attribute)
+eric6.Graphics.ClassItem.ClassModel.addInstanceAttribute?4(attribute)
 eric6.Graphics.ClassItem.ClassModel.addMethod?4(method)
-eric6.Graphics.ClassItem.ClassModel.getAttributes?4()
+eric6.Graphics.ClassItem.ClassModel.getClassAttributes?4()
+eric6.Graphics.ClassItem.ClassModel.getInstanceAttributes?4()
 eric6.Graphics.ClassItem.ClassModel.getMethods?4()
-eric6.Graphics.ClassItem.ClassModel?1(name, methods=None, attributes=None)
+eric6.Graphics.ClassItem.ClassModel?1(name, methods=None, instanceAttributes=None, classAttributes=None)
 eric6.Graphics.GraphicsUtilities._buildChildrenLists?5(routes)
 eric6.Graphics.GraphicsUtilities.sort?4(nodes, routes, noRecursion=False)
 eric6.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.buildDiagram?4()
@@ -2039,15 +2041,15 @@
 eric6.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.initialize?4()
 eric6.Graphics.UMLDiagramBuilder.UMLDiagramBuilder.parsePersistenceData?4(version, data)
 eric6.Graphics.UMLDiagramBuilder.UMLDiagramBuilder?1(dialog, view, project)
-eric6.Graphics.UMLDialog.UMLDialog.ApplicationDiagram?7
-eric6.Graphics.UMLDialog.UMLDialog.ClassDiagram?7
 eric6.Graphics.UMLDialog.UMLDialog.FileVersions?7
-eric6.Graphics.UMLDialog.UMLDialog.ImportsDiagram?7
-eric6.Graphics.UMLDialog.UMLDialog.NoDiagram?7
-eric6.Graphics.UMLDialog.UMLDialog.PackageDiagram?7
 eric6.Graphics.UMLDialog.UMLDialog.load?4()
 eric6.Graphics.UMLDialog.UMLDialog.show?4(fromFile=False)
 eric6.Graphics.UMLDialog.UMLDialog?1(diagramType, project, path="", parent=None, initBuilder=True, **kwargs)
+eric6.Graphics.UMLDialog.UMLDialogType.APPLICATION_DIAGRAM?7
+eric6.Graphics.UMLDialog.UMLDialogType.CLASS_DIAGRAM?7
+eric6.Graphics.UMLDialog.UMLDialogType.IMPORTS_DIAGRAM?7
+eric6.Graphics.UMLDialog.UMLDialogType.NO_DIAGRAM?7
+eric6.Graphics.UMLDialog.UMLDialogType.PACKAGE_DIAGRAM?7
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.autoAdjustSceneSize?4(limit=False)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.event?4(evt)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.filteredItems?4(items, itemType=UMLItem)
@@ -8916,13 +8918,6 @@
 eric6.Tasks.Task.Task.TaskType2ColorName?7
 eric6.Tasks.Task.Task.TaskType2IconName?7
 eric6.Tasks.Task.Task.TaskType2MarkersName?7
-eric6.Tasks.Task.Task.TypeDocu?7
-eric6.Tasks.Task.Task.TypeFixme?7
-eric6.Tasks.Task.Task.TypeNone?7
-eric6.Tasks.Task.Task.TypeNote?7
-eric6.Tasks.Task.Task.TypeTest?7
-eric6.Tasks.Task.Task.TypeTodo?7
-eric6.Tasks.Task.Task.TypeWarning?7
 eric6.Tasks.Task.Task.colorizeTask?4()
 eric6.Tasks.Task.Task.getFilename?4()
 eric6.Tasks.Task.Task.getLineno?4()
@@ -8937,8 +8932,19 @@
 eric6.Tasks.Task.Task.setPriority?4(priority)
 eric6.Tasks.Task.Task.setProjectTask?4(pt)
 eric6.Tasks.Task.Task.setSummary?4(summary)
+eric6.Tasks.Task.Task.setTaskType?4(taskType)
 eric6.Tasks.Task.Task.toDict?4()
-eric6.Tasks.Task.Task?1(summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, description="", uid="", parentUid="")
+eric6.Tasks.Task.Task?1(summary, priority=TaskPriority.NORMAL, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TaskType.TODO, project=None, description="", uid="", parentUid="")
+eric6.Tasks.Task.TaskPriority.HIGH?7
+eric6.Tasks.Task.TaskPriority.LOW?7
+eric6.Tasks.Task.TaskPriority.NORMAL?7
+eric6.Tasks.Task.TaskType.DOCU?7
+eric6.Tasks.Task.TaskType.FIXME?7
+eric6.Tasks.Task.TaskType.NONE?7
+eric6.Tasks.Task.TaskType.NOTE?7
+eric6.Tasks.Task.TaskType.TEST?7
+eric6.Tasks.Task.TaskType.TODO?7
+eric6.Tasks.Task.TaskType.WARNING?7
 eric6.Tasks.TaskFilter.TaskFilter.hasActiveFilter?4()
 eric6.Tasks.TaskFilter.TaskFilter.setActive?4(enabled)
 eric6.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filterStr)
@@ -8952,7 +8958,7 @@
 eric6.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog.configureTaskFilter?4(taskFilter)
 eric6.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog?1(taskFilter, parent=None)
 eric6.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.getData?4()
-eric6.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.setReadOnly?4()
+eric6.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.isManualTaskMode?4()
 eric6.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.setSubTaskMode?4(projectTask)
 eric6.Tasks.TaskPropertiesDialog.TaskPropertiesDialog?1(task=None, parent=None, projectOpen=False)
 eric6.Tasks.TaskViewer.ProjectTaskExtractionThread.requestInterrupt?4()
@@ -8960,8 +8966,8 @@
 eric6.Tasks.TaskViewer.ProjectTaskExtractionThread.scan?4(markers, files)
 eric6.Tasks.TaskViewer.ProjectTaskExtractionThread.taskFound?7
 eric6.Tasks.TaskViewer.ProjectTaskExtractionThread?1(parent=None)
-eric6.Tasks.TaskViewer.TaskViewer.addFileTask?4(summary, filename, lineno, taskType=Task.TypeTodo, description="")
-eric6.Tasks.TaskViewer.TaskViewer.addTask?4(summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, description="", uid="", parentTask=None)
+eric6.Tasks.TaskViewer.TaskViewer.addFileTask?4(summary, filename, lineno, taskType=TaskType.TODO, description="")
+eric6.Tasks.TaskViewer.TaskViewer.addTask?4(summary, priority=TaskPriority.NORMAL, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TaskType.TODO, description="", uid="", parentTask=None)
 eric6.Tasks.TaskViewer.TaskViewer.clearFileTasks?4(filename, conditionally=False)
 eric6.Tasks.TaskViewer.TaskViewer.clearProjectTasks?4(fileOnly=False)
 eric6.Tasks.TaskViewer.TaskViewer.clearTasks?4()

--- a/eric6/APIs/Python3/eric6.bas	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/APIs/Python3/eric6.bas	Sun May 02 15:09:29 2021 +0200
@@ -937,7 +937,9 @@
 TagError Exception
 Task QTreeWidgetItem
 TaskFilterConfigDialog QDialog Ui_TaskFilterConfigDialog
+TaskPriority enum.IntEnum
 TaskPropertiesDialog QDialog Ui_TaskPropertiesDialog
+TaskType enum.IntEnum
 TaskViewer QTreeWidget
 TasksFile QObject
 TasksPage ConfigurationPageBase Ui_TasksPage
@@ -975,6 +977,7 @@
 UMLClassDiagramBuilder UMLDiagramBuilder
 UMLDiagramBuilder QObject
 UMLDialog E5MainWindow
+UMLDialogType enum.Enum
 UMLGraphicsView E5GraphicsView
 UMLItem QGraphicsRectItem
 UMLSceneSizeDialog QDialog Ui_UMLSceneSizeDialog

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Help/source.qhp	Sun May 02 15:09:29 2021 +0200
@@ -2519,9 +2519,11 @@
       <keyword name="ClassItem.setModel" id="ClassItem.setModel" ref="eric6.Graphics.ClassItem.html#ClassItem.setModel" />
       <keyword name="ClassModel" id="ClassModel" ref="eric6.Graphics.ClassItem.html#ClassModel" />
       <keyword name="ClassModel (Constructor)" id="ClassModel (Constructor)" ref="eric6.Graphics.ClassItem.html#ClassModel.__init__" />
-      <keyword name="ClassModel.addAttribute" id="ClassModel.addAttribute" ref="eric6.Graphics.ClassItem.html#ClassModel.addAttribute" />
+      <keyword name="ClassModel.addClassAttribute" id="ClassModel.addClassAttribute" ref="eric6.Graphics.ClassItem.html#ClassModel.addClassAttribute" />
+      <keyword name="ClassModel.addInstanceAttribute" id="ClassModel.addInstanceAttribute" ref="eric6.Graphics.ClassItem.html#ClassModel.addInstanceAttribute" />
       <keyword name="ClassModel.addMethod" id="ClassModel.addMethod" ref="eric6.Graphics.ClassItem.html#ClassModel.addMethod" />
-      <keyword name="ClassModel.getAttributes" id="ClassModel.getAttributes" ref="eric6.Graphics.ClassItem.html#ClassModel.getAttributes" />
+      <keyword name="ClassModel.getClassAttributes" id="ClassModel.getClassAttributes" ref="eric6.Graphics.ClassItem.html#ClassModel.getClassAttributes" />
+      <keyword name="ClassModel.getInstanceAttributes" id="ClassModel.getInstanceAttributes" ref="eric6.Graphics.ClassItem.html#ClassModel.getInstanceAttributes" />
       <keyword name="ClassModel.getMethods" id="ClassModel.getMethods" ref="eric6.Graphics.ClassItem.html#ClassModel.getMethods" />
       <keyword name="ClbrBase" id="ClbrBase" ref="eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html#ClbrBase" />
       <keyword name="ClbrBase (Constructor)" id="ClbrBase (Constructor)" ref="eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html#ClbrBase.__init__" />
@@ -15021,6 +15023,7 @@
       <keyword name="Task.setPriority" id="Task.setPriority" ref="eric6.Tasks.Task.html#Task.setPriority" />
       <keyword name="Task.setProjectTask" id="Task.setProjectTask" ref="eric6.Tasks.Task.html#Task.setProjectTask" />
       <keyword name="Task.setSummary" id="Task.setSummary" ref="eric6.Tasks.Task.html#Task.setSummary" />
+      <keyword name="Task.setTaskType" id="Task.setTaskType" ref="eric6.Tasks.Task.html#Task.setTaskType" />
       <keyword name="Task.toDict" id="Task.toDict" ref="eric6.Tasks.Task.html#Task.toDict" />
       <keyword name="TaskFilter" id="TaskFilter" ref="eric6.Tasks.TaskFilter.html#TaskFilter" />
       <keyword name="TaskFilter (Constructor)" id="TaskFilter (Constructor)" ref="eric6.Tasks.TaskFilter.html#TaskFilter.__init__" />
@@ -15038,12 +15041,15 @@
       <keyword name="TaskFilterConfigDialog (Constructor)" id="TaskFilterConfigDialog (Constructor)" ref="eric6.Tasks.TaskFilterConfigDialog.html#TaskFilterConfigDialog.__init__" />
       <keyword name="TaskFilterConfigDialog (Module)" id="TaskFilterConfigDialog (Module)" ref="eric6.Tasks.TaskFilterConfigDialog.html" />
       <keyword name="TaskFilterConfigDialog.configureTaskFilter" id="TaskFilterConfigDialog.configureTaskFilter" ref="eric6.Tasks.TaskFilterConfigDialog.html#TaskFilterConfigDialog.configureTaskFilter" />
+      <keyword name="TaskPriority" id="TaskPriority" ref="eric6.Tasks.Task.html#TaskPriority" />
       <keyword name="TaskPropertiesDialog" id="TaskPropertiesDialog" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog" />
       <keyword name="TaskPropertiesDialog (Constructor)" id="TaskPropertiesDialog (Constructor)" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog.__init__" />
       <keyword name="TaskPropertiesDialog (Module)" id="TaskPropertiesDialog (Module)" ref="eric6.Tasks.TaskPropertiesDialog.html" />
+      <keyword name="TaskPropertiesDialog.__setMode" id="TaskPropertiesDialog.__setMode" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog.__setMode" />
       <keyword name="TaskPropertiesDialog.getData" id="TaskPropertiesDialog.getData" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog.getData" />
-      <keyword name="TaskPropertiesDialog.setReadOnly" id="TaskPropertiesDialog.setReadOnly" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog.setReadOnly" />
+      <keyword name="TaskPropertiesDialog.isManualTaskMode" id="TaskPropertiesDialog.isManualTaskMode" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog.isManualTaskMode" />
       <keyword name="TaskPropertiesDialog.setSubTaskMode" id="TaskPropertiesDialog.setSubTaskMode" ref="eric6.Tasks.TaskPropertiesDialog.html#TaskPropertiesDialog.setSubTaskMode" />
+      <keyword name="TaskType" id="TaskType" ref="eric6.Tasks.Task.html#TaskType" />
       <keyword name="TaskViewer" id="TaskViewer" ref="eric6.Tasks.TaskViewer.html#TaskViewer" />
       <keyword name="TaskViewer (Constructor)" id="TaskViewer (Constructor)" ref="eric6.Tasks.TaskViewer.html#TaskViewer.__init__" />
       <keyword name="TaskViewer (Module)" id="TaskViewer (Module)" ref="eric6.Tasks.TaskViewer.html" />
@@ -15494,6 +15500,7 @@
       <keyword name="UMLDialog.__showInvalidDataMessage" id="UMLDialog.__showInvalidDataMessage" ref="eric6.Graphics.UMLDialog.html#UMLDialog.__showInvalidDataMessage" />
       <keyword name="UMLDialog.load" id="UMLDialog.load" ref="eric6.Graphics.UMLDialog.html#UMLDialog.load" />
       <keyword name="UMLDialog.show" id="UMLDialog.show" ref="eric6.Graphics.UMLDialog.html#UMLDialog.show" />
+      <keyword name="UMLDialogType" id="UMLDialogType" ref="eric6.Graphics.UMLDialog.html#UMLDialogType" />
       <keyword name="UMLGraphicsView" id="UMLGraphicsView" ref="eric6.Graphics.UMLGraphicsView.html#UMLGraphicsView" />
       <keyword name="UMLGraphicsView (Constructor)" id="UMLGraphicsView (Constructor)" ref="eric6.Graphics.UMLGraphicsView.html#UMLGraphicsView.__init__" />
       <keyword name="UMLGraphicsView (Module)" id="UMLGraphicsView (Module)" ref="eric6.Graphics.UMLGraphicsView.html" />

--- a/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Sun May 02 15:09:29 2021 +0200
@@ -187,23 +187,30 @@
 </p>
 <dl>
 
-<dt><i>rect</i></dt>
+<dt><i>rect</i> (QRectF)</dt>
 <dd>
-minimum rectangle fitting the diagram (QRectF)
+minimum rectangle fitting the diagram
 </dd>
-<dt><i>imageFormat</i></dt>
+<dt><i>imageFormat</i> (str)</dt>
 <dd>
-format for the image file (string)
+format for the image file
 </dd>
 <dt><i>filename</i></dt>
 <dd>
-name of the file for non pixmaps (string)
+name of the file for non pixmaps
+        str
 </dd>
 </dl>
 <dl>
 <dt>Return:</dt>
 <dd>
-diagram pixmap to receive the diagram (QPixmap)
+paint device containing the diagram
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+QPixmap or QSvgGenerator
 </dd>
 </dl>
 <a NAME="E5GraphicsView.__levelForZoom" ID="E5GraphicsView.__levelForZoom"></a>

--- a/eric6/Documentation/Source/eric6.Graphics.ClassItem.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.ClassItem.html	Sun May 02 15:09:29 2021 +0200
@@ -292,15 +292,23 @@
 <td>Constructor</td>
 </tr>
 <tr>
-<td><a href="#ClassModel.addAttribute">addAttribute</a></td>
-<td>Public method to add an attribute to the class model.</td>
+<td><a href="#ClassModel.addClassAttribute">addClassAttribute</a></td>
+<td>Public method to add a class attribute to the class model.</td>
+</tr>
+<tr>
+<td><a href="#ClassModel.addInstanceAttribute">addInstanceAttribute</a></td>
+<td>Public method to add an instance attribute to the class model.</td>
 </tr>
 <tr>
 <td><a href="#ClassModel.addMethod">addMethod</a></td>
 <td>Public method to add a method to the class model.</td>
 </tr>
 <tr>
-<td><a href="#ClassModel.getAttributes">getAttributes</a></td>
+<td><a href="#ClassModel.getClassAttributes">getClassAttributes</a></td>
+<td>Public method to retrieve the global attributes of the class.</td>
+</tr>
+<tr>
+<td><a href="#ClassModel.getInstanceAttributes">getInstanceAttributes</a></td>
 <td>Public method to retrieve the attributes of the class.</td>
 </tr>
 <tr>
@@ -316,40 +324,56 @@
 
 <a NAME="ClassModel.__init__" ID="ClassModel.__init__"></a>
 <h4>ClassModel (Constructor)</h4>
-<b>ClassModel</b>(<i>name, methods=None, attributes=None</i>)
+<b>ClassModel</b>(<i>name, methods=None, instanceAttributes=None, classAttributes=None</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>name</i></dt>
+<dt><i>name</i> (str)</dt>
 <dd>
-the class name (string)
+the class name
 </dd>
-<dt><i>methods</i></dt>
+<dt><i>methods</i> (list of str)</dt>
 <dd>
 list of method names of the class
-            (list of strings)
 </dd>
-<dt><i>attributes</i></dt>
+<dt><i>instanceAttributes</i> (list of str)</dt>
 <dd>
-list of attribute names of the class
-            (list of strings)
+list of instance attribute names of the class
+</dd>
+<dt><i>classAttributes</i> (list of str)</dt>
+<dd>
+list of class attribute names of the class
 </dd>
 </dl>
-<a NAME="ClassModel.addAttribute" ID="ClassModel.addAttribute"></a>
-<h4>ClassModel.addAttribute</h4>
-<b>addAttribute</b>(<i>attribute</i>)
+<a NAME="ClassModel.addClassAttribute" ID="ClassModel.addClassAttribute"></a>
+<h4>ClassModel.addClassAttribute</h4>
+<b>addClassAttribute</b>(<i>attribute</i>)
 
 <p>
-        Public method to add an attribute to the class model.
+        Public method to add a class attribute to the class model.
 </p>
 <dl>
 
-<dt><i>attribute</i></dt>
+<dt><i>attribute</i> (str)</dt>
 <dd>
-attribute name to be added (string)
+class attribute name to be added
+</dd>
+</dl>
+<a NAME="ClassModel.addInstanceAttribute" ID="ClassModel.addInstanceAttribute"></a>
+<h4>ClassModel.addInstanceAttribute</h4>
+<b>addInstanceAttribute</b>(<i>attribute</i>)
+
+<p>
+        Public method to add an instance attribute to the class model.
+</p>
+<dl>
+
+<dt><i>attribute</i> (str)</dt>
+<dd>
+instance attribute name to be added
 </dd>
 </dl>
 <a NAME="ClassModel.addMethod" ID="ClassModel.addMethod"></a>
@@ -361,14 +385,33 @@
 </p>
 <dl>
 
-<dt><i>method</i></dt>
+<dt><i>method</i> (str)</dt>
 <dd>
-method name to be added (string)
+method name to be added
 </dd>
 </dl>
-<a NAME="ClassModel.getAttributes" ID="ClassModel.getAttributes"></a>
-<h4>ClassModel.getAttributes</h4>
-<b>getAttributes</b>(<i></i>)
+<a NAME="ClassModel.getClassAttributes" ID="ClassModel.getClassAttributes"></a>
+<h4>ClassModel.getClassAttributes</h4>
+<b>getClassAttributes</b>(<i></i>)
+
+<p>
+        Public method to retrieve the global attributes of the class.
+</p>
+<dl>
+<dt>Return:</dt>
+<dd>
+list of class attributes
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+list of str
+</dd>
+</dl>
+<a NAME="ClassModel.getInstanceAttributes" ID="ClassModel.getInstanceAttributes"></a>
+<h4>ClassModel.getInstanceAttributes</h4>
+<b>getInstanceAttributes</b>(<i></i>)
 
 <p>
         Public method to retrieve the attributes of the class.
@@ -376,7 +419,13 @@
 <dl>
 <dt>Return:</dt>
 <dd>
-list of class attributes (list of strings)
+list of instance attributes
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+list of str
 </dd>
 </dl>
 <a NAME="ClassModel.getMethods" ID="ClassModel.getMethods"></a>
@@ -389,7 +438,13 @@
 <dl>
 <dt>Return:</dt>
 <dd>
-list of class methods (list of strings)
+list of class methods
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+list of str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>

--- a/eric6/Documentation/Source/eric6.Graphics.UMLDialog.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Graphics.UMLDialog.html	Sun May 02 15:09:29 2021 +0200
@@ -38,6 +38,10 @@
 <td><a href="#UMLDialog">UMLDialog</a></td>
 <td>Class implementing a dialog showing UML like diagrams.</td>
 </tr>
+<tr>
+<td><a href="#UMLDialogType">UMLDialogType</a></td>
+<td>Class defining the UML dialog types.</td>
+</tr>
 </table>
 <h3>Functions</h3>
 
@@ -57,7 +61,7 @@
 <h3>Class Attributes</h3>
 
 <table>
-<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>
+<tr><td>FileVersions</td></tr>
 </table>
 <h3>Class Methods</h3>
 
@@ -124,29 +128,28 @@
 </p>
 <dl>
 
-<dt><i>diagramType</i></dt>
+<dt><i>diagramType</i> (UMLDialogType)</dt>
 <dd>
-type of the diagram (one of ApplicationDiagram,
-            ClassDiagram, ImportsDiagram, NoDiagram, PackageDiagram)
+type of the diagram
 </dd>
-<dt><i>project</i></dt>
+<dt><i>project</i> (Project)</dt>
 <dd>
-reference to the project object (Project)
+reference to the project object
 </dd>
-<dt><i>path</i></dt>
+<dt><i>path</i> (str)</dt>
 <dd>
-file or directory path to build the diagram from (string)
+file or directory path to build the diagram from
 </dd>
-<dt><i>parent</i></dt>
+<dt><i>parent</i> (QWidget)</dt>
 <dd>
-parent widget of the dialog (QWidget)
+parent widget of the dialog
 </dd>
-<dt><i>initBuilder</i></dt>
+<dt><i>initBuilder</i> (bool)</dt>
 <dd>
 flag indicating to initialize the diagram
-            builder (boolean)
+            builder
 </dd>
-<dt><i>kwargs=</i></dt>
+<dt><i>kwargs=</i> (dict)</dt>
 <dd>
 diagram specific data
 </dd>
@@ -160,17 +163,15 @@
 </p>
 <dl>
 
-<dt><i>diagramType</i></dt>
+<dt><i>diagramType</i> (UMLDialogType)</dt>
 <dd>
 type of the diagram
-            (one of ApplicationDiagram, ClassDiagram, ImportsDiagram,
-            PackageDiagram)
 </dd>
-<dt><i>path</i></dt>
+<dt><i>path</i> (str)</dt>
 <dd>
-file or directory path to build the diagram from (string)
+file or directory path to build the diagram from
 </dd>
-<dt><i>kwargs=</i></dt>
+<dt><i>kwargs=</i> (dict)</dt>
 <dd>
 diagram specific data
 </dd>
@@ -182,10 +183,9 @@
 </dd>
 </dl>
 <dl>
-
-<dt>Raises <b>ValueError</b>:</dt>
+<dt>Return Type:</dt>
 <dd>
-raised to indicate an illegal diagram type
+UMLDiagramBuilder
 </dd>
 </dl>
 <a NAME="UMLDialog.__initActions" ID="UMLDialog.__initActions"></a>
@@ -278,4 +278,36 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
+<hr />
+<a NAME="UMLDialogType" ID="UMLDialogType"></a>
+<h2>UMLDialogType</h2>
+
+<p>
+    Class defining the UML dialog types.
+</p>
+<h3>Derived from</h3>
+enum.Enum
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>APPLICATION_DIAGRAM</td></tr><tr><td>CLASS_DIAGRAM</td></tr><tr><td>IMPORTS_DIAGRAM</td></tr><tr><td>NO_DIAGRAM</td></tr><tr><td>PACKAGE_DIAGRAM</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<div align="right"><a href="#top">Up</a></div>
+<hr />
 </body></html>
\ No newline at end of file

--- a/eric6/Documentation/Source/eric6.Tasks.Task.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Tasks.Task.html	Sun May 02 15:09:29 2021 +0200
@@ -38,6 +38,14 @@
 <td><a href="#Task">Task</a></td>
 <td>Class implementing the task data structure.</td>
 </tr>
+<tr>
+<td><a href="#TaskPriority">TaskPriority</a></td>
+<td>Class defining the task priorities.</td>
+</tr>
+<tr>
+<td><a href="#TaskType">TaskType</a></td>
+<td>Class defining the task types.</td>
+</tr>
 </table>
 <h3>Functions</h3>
 
@@ -57,7 +65,7 @@
 <h3>Class Attributes</h3>
 
 <table>
-<tr><td>TaskType2ColorName</td></tr><tr><td>TaskType2IconName</td></tr><tr><td>TaskType2MarkersName</td></tr><tr><td>TypeDocu</td></tr><tr><td>TypeFixme</td></tr><tr><td>TypeNone</td></tr><tr><td>TypeNote</td></tr><tr><td>TypeTest</td></tr><tr><td>TypeTodo</td></tr><tr><td>TypeWarning</td></tr>
+<tr><td>TaskType2ColorName</td></tr><tr><td>TaskType2IconName</td></tr><tr><td>TaskType2MarkersName</td></tr>
 </table>
 <h3>Class Methods</h3>
 
@@ -129,6 +137,10 @@
 <td>Public slot to update the description.</td>
 </tr>
 <tr>
+<td><a href="#Task.setTaskType">setTaskType</a></td>
+<td>Public method to update the task type.</td>
+</tr>
+<tr>
 <td><a href="#Task.toDict">toDict</a></td>
 <td>Public method to convert the task data to a dictionary.</td>
 </tr>
@@ -141,62 +153,61 @@
 
 <a NAME="Task.__init__" ID="Task.__init__"></a>
 <h4>Task (Constructor)</h4>
-<b>Task</b>(<i>summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, description="", uid="", parentUid=""</i>)
+<b>Task</b>(<i>summary, priority=TaskPriority.NORMAL, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TaskType.TODO, project=None, description="", uid="", parentUid=""</i>)
 
 <p>
         Constructor
 </p>
 <dl>
 
-<dt><i>summary</i></dt>
+<dt><i>summary</i> (str)</dt>
 <dd>
-summary text of the task (string)
+summary text of the task
 </dd>
-<dt><i>priority</i></dt>
+<dt><i>priority</i> (TaskPriority)</dt>
 <dd>
-priority of the task (0=high, 1=normal, 2=low)
+priority of the task
 </dd>
-<dt><i>filename</i></dt>
+<dt><i>filename</i> (str)</dt>
 <dd>
-filename containing the task (string)
+filename containing the task
 </dd>
-<dt><i>lineno</i></dt>
+<dt><i>lineno</i> (int)</dt>
 <dd>
-line number containing the task (integer)
+line number containing the task
 </dd>
-<dt><i>completed</i></dt>
+<dt><i>completed</i> (bool)</dt>
 <dd>
-flag indicating completion status (boolean)
+flag indicating completion status
 </dd>
-<dt><i>_time</i></dt>
+<dt><i>_time</i> (float)</dt>
 <dd>
-creation time of the task (float, if 0 use current time)
+creation time of the task (if 0 use current time)
 </dd>
-<dt><i>isProjectTask</i></dt>
+<dt><i>isProjectTask</i> (bool)</dt>
 <dd>
 flag indicating a task related to the current
-            project (boolean)
+            project
 </dd>
-<dt><i>taskType</i></dt>
+<dt><i>taskType</i> (TaskType)</dt>
 <dd>
-type of the task (one of TypeFixme, TypeTodo,
-            TypeWarning, TypeNote, TypeTest, TypeDocu)
+type of the task
 </dd>
-<dt><i>project</i></dt>
+<dt><i>project</i> (Project)</dt>
 <dd>
-reference to the project object (Project)
+reference to the project object
 </dd>
-<dt><i>description</i></dt>
+<dt><i>description</i> (str)</dt>
 <dd>
-explanatory text of the task (string)
+explanatory text of the task
 </dd>
-<dt><i>uid</i></dt>
+<dt><i>uid</i> (str)</dt>
 <dd>
-unique id of the task (string)
+unique id of the task
 </dd>
-<dt><i>parentUid</i></dt>
+<dt><i>parentUid</i> (str)</dt>
 <dd>
-unique id of the parent task (string)
+unique id of the parent task
 </dd>
 </dl>
 <a NAME="Task.colorizeTask" ID="Task.colorizeTask"></a>
@@ -334,9 +345,9 @@
 </p>
 <dl>
 
-<dt><i>description</i></dt>
+<dt><i>description</i> (str)</dt>
 <dd>
-descriptive text of the task (string)
+descriptive text of the task
 </dd>
 </dl>
 <a NAME="Task.setPriority" ID="Task.setPriority"></a>
@@ -348,9 +359,9 @@
 </p>
 <dl>
 
-<dt><i>priority</i></dt>
+<dt><i>priority</i> (TaskPriority)</dt>
 <dd>
-priority of the task (0=high, 1=normal, 2=low)
+priority of the task
 </dd>
 </dl>
 <a NAME="Task.setProjectTask" ID="Task.setProjectTask"></a>
@@ -381,6 +392,20 @@
 summary text of the task (string)
 </dd>
 </dl>
+<a NAME="Task.setTaskType" ID="Task.setTaskType"></a>
+<h4>Task.setTaskType</h4>
+<b>setTaskType</b>(<i>taskType</i>)
+
+<p>
+        Public method to update the task type.
+</p>
+<dl>
+
+<dt><i>taskType</i> (TaskType)</dt>
+<dd>
+type of the task
+</dd>
+</dl>
 <a NAME="Task.toDict" ID="Task.toDict"></a>
 <h4>Task.toDict</h4>
 <b>toDict</b>(<i></i>)
@@ -402,4 +427,68 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
+<hr />
+<a NAME="TaskPriority" ID="TaskPriority"></a>
+<h2>TaskPriority</h2>
+
+<p>
+    Class defining the task priorities.
+</p>
+<h3>Derived from</h3>
+enum.IntEnum
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>HIGH</td></tr><tr><td>LOW</td></tr><tr><td>NORMAL</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+<hr />
+<a NAME="TaskType" ID="TaskType"></a>
+<h2>TaskType</h2>
+
+<p>
+    Class defining the task types.
+</p>
+<h3>Derived from</h3>
+enum.IntEnum
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>DOCU</td></tr><tr><td>FIXME</td></tr><tr><td>NONE</td></tr><tr><td>NOTE</td></tr><tr><td>TEST</td></tr><tr><td>TODO</td></tr><tr><td>WARNING</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<div align="right"><a href="#top">Up</a></div>
+<hr />
 </body></html>
\ No newline at end of file

--- a/eric6/Documentation/Source/eric6.Tasks.TaskFilter.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Tasks.TaskFilter.html	Sun May 02 15:09:29 2021 +0200
@@ -173,9 +173,9 @@
 </p>
 <dl>
 
-<dt><i>priorities</i></dt>
+<dt><i>priorities</i> (list of TaskPriority or None)</dt>
 <dd>
-list of task priorities (list of integer) or None
+list of task priorities or None
 </dd>
 </dl>
 <a NAME="TaskFilter.setScopeFilter" ID="TaskFilter.setScopeFilter"></a>
@@ -230,10 +230,9 @@
 </p>
 <dl>
 
-<dt><i>taskType</i></dt>
+<dt><i>taskType</i> (TaskType)</dt>
 <dd>
-type of the task (one of Task.TypeNone, Task.TypeFixme,
-            Task.TypeTodo, Task.TypeWarning, Task.TypeNote)
+type of the task
 </dd>
 </dl>
 <a NAME="TaskFilter.showTask" ID="TaskFilter.showTask"></a>

--- a/eric6/Documentation/Source/eric6.Tasks.TaskPropertiesDialog.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Tasks.TaskPropertiesDialog.html	Sun May 02 15:09:29 2021 +0200
@@ -73,12 +73,16 @@
 <td>Constructor</td>
 </tr>
 <tr>
+<td><a href="#TaskPropertiesDialog.__setMode">__setMode</a></td>
+<td>Private method to show or hide dialog elements depending on the task kind.</td>
+</tr>
+<tr>
 <td><a href="#TaskPropertiesDialog.getData">getData</a></td>
 <td>Public method to retrieve the dialogs data.</td>
 </tr>
 <tr>
-<td><a href="#TaskPropertiesDialog.setReadOnly">setReadOnly</a></td>
-<td>Public slot to set the dialog to read only mode.</td>
+<td><a href="#TaskPropertiesDialog.isManualTaskMode">isManualTaskMode</a></td>
+<td>Public method to check, if the dialog is in manual task mode.</td>
 </tr>
 <tr>
 <td><a href="#TaskPropertiesDialog.setSubTaskMode">setSubTaskMode</a></td>
@@ -100,17 +104,36 @@
 </p>
 <dl>
 
-<dt><i>task</i></dt>
+<dt><i>task</i> (Task)</dt>
 <dd>
 the task object to be shown
 </dd>
-<dt><i>parent</i></dt>
+<dt><i>parent</i> (QWidget)</dt>
 <dd>
-the parent widget (QWidget)
+the parent widget
+</dd>
+<dt><i>projectOpen</i> (bool)</dt>
+<dd>
+flag indicating status of the project
 </dd>
-<dt><i>projectOpen</i></dt>
+</dl>
+<a NAME="TaskPropertiesDialog.__setMode" ID="TaskPropertiesDialog.__setMode"></a>
+<h4>TaskPropertiesDialog.__setMode</h4>
+<b>__setMode</b>(<i>isFileTask, projectOpen</i>)
+
+<p>
+        Private method to show or hide dialog elements depending on the task
+        kind.
+</p>
+<dl>
+
+<dt><i>isFileTask</i> (bool)</dt>
 <dd>
-flag indicating status of the project (boolean)
+flag indicating a file task (i.e. extracted task)
+</dd>
+<dt><i>projectOpen</i> (bool)</dt>
+<dd>
+flag indicating status of the project
 </dd>
 </dl>
 <a NAME="TaskPropertiesDialog.getData" ID="TaskPropertiesDialog.getData"></a>
@@ -123,18 +146,35 @@
 <dl>
 <dt>Return:</dt>
 <dd>
-tuple of description, priority, completion flag,
-                project flag and long text (string, string, boolean,
-                boolean, string)
+tuple of description, priority, type, completion flag,
+                project flag and long text
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (str, TaskPriority, TaskType, bool, bool, str)
 </dd>
 </dl>
-<a NAME="TaskPropertiesDialog.setReadOnly" ID="TaskPropertiesDialog.setReadOnly"></a>
-<h4>TaskPropertiesDialog.setReadOnly</h4>
-<b>setReadOnly</b>(<i></i>)
+<a NAME="TaskPropertiesDialog.isManualTaskMode" ID="TaskPropertiesDialog.isManualTaskMode"></a>
+<h4>TaskPropertiesDialog.isManualTaskMode</h4>
+<b>isManualTaskMode</b>(<i></i>)
 
 <p>
-        Public slot to set the dialog to read only mode.
+        Public method to check, if the dialog is in manual task mode.
 </p>
+<dl>
+<dt>Return:</dt>
+<dd>
+flag indicating manual task mode
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl>
 <a NAME="TaskPropertiesDialog.setSubTaskMode" ID="TaskPropertiesDialog.setSubTaskMode"></a>
 <h4>TaskPropertiesDialog.setSubTaskMode</h4>
 <b>setSubTaskMode</b>(<i>projectTask</i>)

--- a/eric6/Documentation/Source/eric6.Tasks.TaskViewer.html	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Documentation/Source/eric6.Tasks.TaskViewer.html	Sun May 02 15:09:29 2021 +0200
@@ -64,11 +64,11 @@
 <h3>Signals</h3>
 <dl>
 
-<dt>taskFound(str, str, int, int)</dt>
+<dt>taskFound(str, str, int, TaskType)</dt>
 <dd>
-emitted with the task description,
-        the file name, the line number and task type to signal the presence of
-        a task
+emitted with the task
+        description, the file name, the line number and task type to signal
+        the presence of a task
 </dd>
 </dl>
 <h3>Derived from</h3>
@@ -561,96 +561,100 @@
 </dl>
 <a NAME="TaskViewer.addFileTask" ID="TaskViewer.addFileTask"></a>
 <h4>TaskViewer.addFileTask</h4>
-<b>addFileTask</b>(<i>summary, filename, lineno, taskType=Task.TypeTodo, description=""</i>)
+<b>addFileTask</b>(<i>summary, filename, lineno, taskType=TaskType.TODO, description=""</i>)
 
 <p>
         Public slot to add a file related task.
 </p>
 <dl>
 
-<dt><i>summary</i></dt>
+<dt><i>summary</i> (str)</dt>
 <dd>
-summary text of the task (string)
+summary text of the task
 </dd>
-<dt><i>filename</i></dt>
+<dt><i>filename</i> (str)</dt>
 <dd>
-filename containing the task (string)
+filename containing the task
 </dd>
-<dt><i>lineno</i></dt>
+<dt><i>lineno</i> (int)</dt>
 <dd>
-line number containing the task (integer)
+line number containing the task
 </dd>
-<dt><i>taskType</i></dt>
+<dt><i>taskType</i> (TaskType)</dt>
 <dd>
-type of the task (one of Task.TypeFixme, Task.TypeTodo,
-            Task.TypeWarning, Task.TypeNote)
+type of the task
 </dd>
-<dt><i>description</i></dt>
+<dt><i>description</i> (str)</dt>
 <dd>
-explanatory text of the task (string)
+explanatory text of the task
 </dd>
 </dl>
 <a NAME="TaskViewer.addTask" ID="TaskViewer.addTask"></a>
 <h4>TaskViewer.addTask</h4>
-<b>addTask</b>(<i>summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, description="", uid="", parentTask=None</i>)
+<b>addTask</b>(<i>summary, priority=TaskPriority.NORMAL, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TaskType.TODO, description="", uid="", parentTask=None</i>)
 
 <p>
         Public slot to add a task.
 </p>
 <dl>
 
-<dt><i>summary</i></dt>
+<dt><i>summary</i> (str)</dt>
 <dd>
-summary text of the task (string)
+summary text of the task
 </dd>
-<dt><i>priority</i></dt>
+<dt><i>priority</i> (TaskPriority)</dt>
 <dd>
-priority of the task (0=high, 1=normal, 2=low)
+priority of the task
 </dd>
-<dt><i>filename</i></dt>
+<dt><i>filename</i> (str)</dt>
 <dd>
-filename containing the task (string)
+filename containing the task
 </dd>
-<dt><i>lineno</i></dt>
+<dt><i>lineno</i> (int)</dt>
 <dd>
-line number containing the task (integer)
+line number containing the task
 </dd>
-<dt><i>completed</i></dt>
+<dt><i>completed</i> (bool)</dt>
 <dd>
-flag indicating completion status (boolean)
+flag indicating completion status
 </dd>
-<dt><i>_time</i></dt>
+<dt><i>_time</i> (float)</dt>
 <dd>
-creation time of the task (float, if 0 use current time)
+creation time of the task (if 0 use current time)
 </dd>
-<dt><i>isProjectTask</i></dt>
+<dt><i>isProjectTask</i> (bool)</dt>
 <dd>
 flag indicating a task related to the current
-            project (boolean)
+            project
 </dd>
-<dt><i>taskType</i></dt>
+<dt><i>taskType</i> (TaskType)</dt>
 <dd>
-type of the task (one of Task.TypeFixme, Task.TypeTodo,
-            Task.TypeWarning, Task.TypeNote)
+type of the task
 </dd>
-<dt><i>description</i></dt>
+<dt><i>description</i> (str)</dt>
 <dd>
-explanatory text of the task (string)
+explanatory text of the task
 </dd>
-<dt><i>uid</i></dt>
+<dt><i>uid</i> (str)</dt>
 <dd>
-unique id of the task (string)
+unique id of the task
 </dd>
-<dt><i>parentTask</i></dt>
+<dt><i>parentTask</i> (Task or str)</dt>
 <dd>
-reference to the parent task item (Task) or the
-            UID of the parent task
+reference to the parent task item or the UID of the
+            parent task
 </dd>
 </dl>
 <dl>
 <dt>Return:</dt>
 <dd>
-reference to the task item (Task)
+reference to the task item
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+Task
 </dd>
 </dl>
 <a NAME="TaskViewer.clearFileTasks" ID="TaskViewer.clearFileTasks"></a>

--- a/eric6/E5Gui/E5PathPicker.py	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/E5Gui/E5PathPicker.py	Sun May 02 15:09:29 2021 +0200
@@ -25,8 +25,8 @@
     """
     Class implementing the path picker modes.
     """
-    # TODO: convert these to all uppercase without "Mode" when doing
-    #       the port to PyQt6 (i.e. eric7)
+    # TODO: eric7: convert these to all uppercase without "Mode" when doing
+    #       the port to PyQt6
     OpenFileMode = 0
     OpenFilesMode = 1
     SaveFileMode = 2

--- a/eric6/Graphics/ClassItem.py	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Graphics/ClassItem.py	Sun May 02 15:09:29 2021 +0200
@@ -80,7 +80,7 @@
         Public method to retrieve the methods of the class.
         
         @return list of class methods
-        @type list of str
+        @rtype list of str
         """
         return self.methods[:]
     
@@ -89,7 +89,7 @@
         Public method to retrieve the attributes of the class.
         
         @return list of instance attributes
-        @type list of str
+        @rtype list of str
         """
         return self.instanceAttributes[:]
     
@@ -98,7 +98,7 @@
         Public method to retrieve the global attributes of the class.
         
         @return list of class attributes
-        @type list of str
+        @rtype list of str
         """
         return self.classAttributes[:]
 

--- a/eric6/Graphics/UMLDialog.py	Sun May 02 15:09:14 2021 +0200
+++ b/eric6/Graphics/UMLDialog.py	Sun May 02 15:09:29 2021 +0200
@@ -268,7 +268,7 @@
         self.__fileName = filename
     
     # TODO: add loading of file in JSON format
-    # TODO: delete the current one with eric7
+    # TODO: eric7: delete the current one
     def load(self):
         """
         Public method to load a diagram from a file.