Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/Preferences/__init__.py	Sun Apr 29 16:42:02 2012 +0200
@@ -811,13 +811,15 @@
     
     # defaults for tasks related stuff
     tasksDefaults = {
-        "TasksMarkers": "TO" + "DO:",
-        "TasksMarkersBugfix": "FIX" + "ME:",
+        "TasksFixmeMarkers": "FIX" + "ME:",
+        "TasksWarningMarkers": "WARN" + "ING:",
+        "TasksTodoMarkers": "TO" + "DO:",
+        "TasksNoteMarkers": "NO" + "TE:",
         # needed to keep it from being recognized as a task
-        "TasksColour": QColor(Qt.black),
-        "TasksBugfixColour": QColor(Qt.red),
-        "TasksBgColour": QColor(Qt.white),
-        "TasksProjectBgColour": QColor(Qt.lightGray),
+        "TasksFixmeColor": QColor("#FFA0A0"),
+        "TasksWarningColor": QColor("#FFFFA0"),
+        "TasksTodoColor": QColor("#A0FFA0"),
+        "TasksNoteColor": QColor("#A0A0FF"),
         "ClearOnFileClose": True,
         "TasksProjectAutoSave": True,
     }
@@ -2300,8 +2302,8 @@
     @param prefClass preferences class used as the storage area
     @return the requested user setting
     """
-    if key in ["TasksColour", "TasksBugfixColour",
-               "TasksBgColour", "TasksProjectBgColour"]:
+    if key in ["TasksFixmeColor", "TasksWarningColor",
+               "TasksTodoColor", "TasksNoteColor"]:
         col = prefClass.settings.value("Tasks/" + key)
         if col is not None:
             return QColor(col)
@@ -2323,8 +2325,8 @@
     @param value the value to be set
     @param prefClass preferences class used as the storage area
     """
-    if key in ["TasksColour", "TasksBugfixColour",
-               "TasksBgColour", "TasksProjectBgColour"]:
+    if key in ["TasksFixmeColor", "TasksWarningColor",
+               "TasksTodoColor", "TasksNoteColor"]:
         prefClass.settings.setValue("Tasks/" + key, value.name())
     else:
         prefClass.settings.setValue("Tasks/" + key, value)