Adding orange coloring of WIP todo items.

dvorka · Jan 5, 2024 · eccc002 · eccc002
1 parent ac49b6d
commit eccc002
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/app/src/qt/look_n_feel.cpp b/app/src/qt/look_n_feel.cpp
@@ -102,7 +102,8 @@ void LookAndFeels::setDarkTheme()
     editorLink.setRgb(0x00,0xFF,0xFF);
     editorList.setRgb(0x00,0x99,0x00);
     editorTaskDone.setRgb(0x00,0x99,0x00);
-    editorTaskWip.setRgb(0x99,0x00,0x00);
+    editorTaskWip.setRgb(0xFF,0xA5,0x00);
+    editorTaskTodo.setRgb(0x99,0x00,0x00);
     editorCodeblock.setRgb(0x99,0x99,0x99);
     editorHtmlTag.setRgb(0xAA,0x00,0xAA);
     editorHtmlEntity.setRgb(0xAA,0x00,0xAA);

diff --git a/app/src/qt/look_n_feel.h b/app/src/qt/look_n_feel.h
@@ -82,6 +82,7 @@ class LookAndFeels : public HtmlColorsRepresentation
     QColor editorList;
     QColor editorTaskDone;
     QColor editorTaskWip;
+    QColor editorTaskTodo;
     QColor editorHtmlTag;
     QColor editorHtmlEntity;
     QColor editorHtmlAttrName;
@@ -148,6 +149,7 @@ class LookAndFeels : public HtmlColorsRepresentation
     QColor& getEditorList() { return editorList; }
     QColor& getEditorTaskDone() { return editorTaskDone; }
     QColor& getEditorTaskWip() { return editorTaskWip; }
+    QColor& getEditorTaskTodo() { return editorTaskTodo; }
     QColor& getEditorCodeblock() { return editorCodeblock; }
     QColor& getEditorHtmlTag() { return editorHtmlTag; }
     QColor& getEditorHtmlEntity() { return editorHtmlEntity; }

diff --git a/app/src/qt/note_edit_highlighter.cpp b/app/src/qt/note_edit_highlighter.cpp
@@ -65,7 +65,8 @@ NoteEditHighlighter::NoteEditHighlighter(QPlainTextEdit* noteEditorView)
     addRegex(UnorderedList, "^(:?    )*[\\*\\+\\-] ");
     addRegex(OrderedList, "^(:?    )*\\d\\d?\\. ");
     addRegex(TaskDoneItem, "^(:?    )*[\\*\\+\\-] \\[x\\]");
-    addRegex(TaskWipItem, "^(:?    )*[\\*\\+\\-] \\[ \\]");
+    addRegex(TaskWipItem, "^(:?    )*[\\*\\+\\-] \\[w\\]");
+    addRegex(TaskTodoItem, "^(:?    )*[\\*\\+\\-] \\[ \\]");
 
     // formats
     boldFormat.setForeground(lookAndFeels.getEditorBold());
@@ -80,6 +81,7 @@ NoteEditHighlighter::NoteEditHighlighter(QPlainTextEdit* noteEditorView)
     listFormat.setForeground(lookAndFeels.getEditorList());
     taskDoneFormat.setForeground(lookAndFeels.getEditorTaskDone());
     taskWipFormat.setForeground(lookAndFeels.getEditorTaskWip());
+    taskTodoFormat.setForeground(lookAndFeels.getEditorTaskTodo());
     codeBlockFormat.setForeground(lookAndFeels.getEditorCodeblock());
     mathBlockFormat.setForeground(lookAndFeels.getEditorCodeblock());
 
@@ -205,6 +207,9 @@ void NoteEditHighlighter::highlightPatterns(const QString& text)
             case TaskDoneItem:
                 setFormat(index, length, taskDoneFormat);
                 break;
+            case TaskTodoItem:
+                setFormat(index, length, taskTodoFormat);
+                break;
             case TaskWipItem:
                 setFormat(index, length, taskWipFormat);
                 break;

diff --git a/app/src/qt/note_edit_highlighter.h b/app/src/qt/note_edit_highlighter.h
@@ -45,6 +45,7 @@ class NoteEditHighlighter : public QSyntaxHighlighter
         UnorderedList,
         TaskDoneItem,
         TaskWipItem,
+        TaskTodoItem,
         OrderedList,
 
         HtmlTag,
@@ -79,6 +80,7 @@ class NoteEditHighlighter : public QSyntaxHighlighter
     QTextCharFormat listFormat;
     QTextCharFormat taskDoneFormat;
     QTextCharFormat taskWipFormat;
+    QTextCharFormat taskTodoFormat;
     QTextCharFormat codeBlockFormat;
     QTextCharFormat mathBlockFormat;