diff -r d5e4bed968b4 -r b4d5234f92e7 eric6/Tasks/Task.py
--- a/eric6/Tasks/Task.py Wed Aug 12 17:10:50 2020 +0200
+++ b/eric6/Tasks/Task.py Thu Aug 13 16:59:03 2020 +0200
@@ -27,6 +27,33 @@
TypeTodo = 1
TypeWarning = 2
TypeNote = 3
+ TypeTest = 4
+ TypeDocu = 5
+
+ TaskType2IconName = {
+ TypeFixme: "taskFixme",
+ TypeTodo: "taskTodo",
+ TypeWarning: "taskWarning",
+ TypeNote: "taskNote",
+ TypeTest: "taskTest",
+ TypeDocu: "taskDocu",
+ }
+ TaskType2ColorName = {
+ TypeFixme: "TasksFixmeColor",
+ TypeTodo: "TasksTodoColor",
+ TypeWarning: "TasksWarningColor",
+ TypeNote: "TasksNoteColor",
+ TypeTest: "TasksTestColor",
+ TypeDocu: "TasksDocuColor",
+ }
+ TaskType2MarkersName = {
+ TypeFixme: "TasksFixmeMarkers",
+ TypeTodo: "TasksTodoMarkers",
+ TypeWarning: "TasksWarningMarkers",
+ TypeNote: "TasksNoteMarkers",
+ TypeTest: "TasksTestMarkers",
+ TypeDocu: "TasksDocuMarkers",
+ }
def __init__(self, summary, priority=1, filename="", lineno=0,
completed=False, _time=0, isProjectTask=False,
@@ -44,7 +71,7 @@
@param isProjectTask flag indicating a task related to the current
project (boolean)
@param taskType type of the task (one of TypeFixme, TypeTodo,
- TypeWarning, TypeNote)
+ TypeWarning, TypeNote, TypeTest, TypeDocu)
@param project reference to the project object (Project)
@param description explanatory text of the task (string)
@param uid unique id of the task (string)
@@ -100,14 +127,11 @@
else:
self.setIcon(1, UI.PixmapCache.getIcon("empty"))
- if self.taskType == Task.TypeFixme:
- self.setIcon(2, UI.PixmapCache.getIcon("taskFixme"))
- elif self.taskType == Task.TypeWarning:
- self.setIcon(2, UI.PixmapCache.getIcon("taskWarning"))
- elif self.taskType == Task.TypeTodo:
- self.setIcon(2, UI.PixmapCache.getIcon("taskTodo"))
- else:
- self.setIcon(2, UI.PixmapCache.getIcon("taskNote"))
+ try:
+ self.setIcon(2, UI.PixmapCache.getIcon(
+ Task.TaskType2IconName[self.taskType]))
+ except KeyError:
+ self.setIcon(2, UI.PixmapCache.getIcon("empty"))
self.colorizeTask()
self.setTextAlignment(4, Qt.AlignRight)
@@ -121,18 +145,14 @@
nonBoldFont = self.font(0)
nonBoldFont.setBold(False)
for col in range(5):
- if self.taskType == Task.TypeFixme:
- self.setBackground(
- col, Preferences.getTasks("TasksFixmeColor"))
- elif self.taskType == Task.TypeWarning:
+ try:
self.setBackground(
- col, Preferences.getTasks("TasksWarningColor"))
- elif self.taskType == Task.TypeTodo:
- self.setBackground(
- col, Preferences.getTasks("TasksTodoColor"))
- else:
- self.setBackground(
- col, Preferences.getTasks("TasksNoteColor"))
+ col, Preferences.getTasks(
+ Task.TaskType2ColorName[self.taskType]))
+ except KeyError:
+ # do not set background color if type is not known
+ pass
+
if self._isProjectTask:
self.setFont(col, boldFont)
else:
