From d6bd5630faed8ab722b814276920d5c270135f7d Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Thu, 1 Jan 2015 17:27:05 -0500
Subject: [PATCH] Config

- Updated the default, built-in themes.
---
 src/Config.cpp | 216 ++++++++++++++++++++++++++-----------------------
 1 file changed, 116 insertions(+), 100 deletions(-)

diff --git a/src/Config.cpp b/src/Config.cpp
index 793e30a49..1485cd1bb 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -165,140 +165,156 @@ std::string Config::_defaults =
   "color=on                                       # Enable color\n"
 #ifdef LINUX
   "\n"
-  "# basics\n"
-  "color.active=bold yellow\n"
+  "rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.\n"
+  "\n"
+  "# General decoration\n"
+  "color.label=\n"
+  "color.label.sort=\n"
+  "color.alternate=on gray1\n"
+  "color.header=color3\n"
+  "color.footnote=color3\n"
+  "color.warning=bold red\n"
+  "color.error=color3\n"
+  "color.debug=color3\n"
+  "\n"
+  "# Task state\n"
   "color.completed=rgb010 on white\n"
   "color.deleted=rgb100 on white\n"
-  "color.due.today=on rgb020\n"
-  "color.due=on rgb010\n"
-  "color.overdue=on rgb100\n"
-  "color.blocking=rgb522\n"
-  "color.blocked=rgb235\n"
-  "color.recurring=\n"
+  "color.active=rgb555 on rgb410\n"
+  "color.recurring=rgb013\n"
   "color.scheduled=on rgb001\n"
-  "color.tagged=\n"
-  "color.pri.H=bold white\n"
-  "color.pri.M=gray23\n"
-  "color.pri.L=gray12\n"
-  "color.pri.none=gray23\n"
+  "color.until=\n"
+  "color.blocked=white on color8\n"
+  "color.blocking=white on color15\n"
   "\n"
-  "# missing attributes\n"
+  "# Project\n"
   "color.project.none=\n"
-  "color.tag.none=\n"
+  "\n"
+  "# Priority\n"
+  "color.pri.H=color255\n"
+  "color.pri.L=color245\n"
+  "color.pri.M=color250\n"
   "color.pri.none=\n"
   "\n"
-  "# personal color rules (replace 'X' with your value)\n"
-  "#color.keyword.X=\n"
-  "#color.project.X=\n"
+  "# Tags\n"
   "color.tag.next=rgb440\n"
-  "#color.uda.X=\n"
+  "color.tag.none=\n"
+  "color.tagged=rgb031\n"
   "\n"
-  "# interface\n"
-  "color.alternate=on gray1\n"
-  "color.header=color0 on gray11\n"
-  "color.label=inverse\n"
-  "color.footnote=on gray5\n"
+  "# Due\n"
+  "color.due.today=rgb400\n"
+  "color.due=color1\n"
+  "color.overdue=color9\n"
   "\n"
-  "# burndown report\n"
-  "color.burndown.pending=rgb000 on rgb010\n"
-  "color.burndown.started=rgb000 on bright yellow\n"
-  "color.burndown.done=rgb000 on rgb020\n"
+  "# Report: burndown\n"
+  "color.burndown.done=on rgb010\n"
+  "color.burndown.pending=on color9\n"
+  "color.burndown.started=on color11\n"
   "\n"
-  "# calendar\n"
-  "color.calendar.holiday=bold yellow\n"
-  "color.calendar.today=bold white\n"
-  "color.calendar.due.today=on rgb020\n"
-  "color.calendar.due=on rgb010\n"
-  "color.calendar.overdue=on rgb100\n"
-  "color.calendar.weekend=on gray5\n"
-  "color.calendar.weeknumber=gray8\n"
+  "# Report: history\n"
+  "color.history.add=color0 on rgb500\n"
+  "color.history.delete=color0 on rgb550\n"
+  "color.history.done=color0 on rgb050\n"
   "\n"
-  "# history report\n"
-  "color.history.add=gray14 on rgb010\n"
-  "color.history.done=black on rgb020\n"
-  "color.history.delete=gray14 on rgb100\n"
+  "# Report: summary\n"
+  "color.summary.background=white on color0\n"
+  "color.summary.bar=black on rgb141\n"
   "\n"
-  "# summary report (background color only)\n"
-  "color.summary.bar=on rgb010\n"
-  "color.summary.background=on black\n"
+  "# Command: calendar\n"
+  "color.calendar.due.today=color15 on color1\n"
+  "color.calendar.due=color0 on color1\n"
+  "color.calendar.holiday=color0 on color11\n"
+  "color.calendar.overdue=color0 on color9\n"
+  "color.calendar.today=color15 on rgb013\n"
+  "color.calendar.weekend=on color235\n"
+  "color.calendar.weeknumber=rgb013\n"
   "\n"
-  "# status\n"
-  "color.error=red on white\n"
-  "color.debug=black on white\n"
-  "color.undo.before=yellow\n"
-  "color.undo.after=green\n"
-  "color.sync.added=green\n"
-  "color.sync.changed=yellow\n"
-  "color.sync.rejected=red\n"
-  "color.warning=bold red\n"
+  "# Command: sync\n"
+  "color.sync.added=rgb010\n"
+  "color.sync.changed=color11\n"
+  "color.sync.rejected=color9\n"
+  "\n"
+  "# Command: undo\n"
+  "color.undo.after=color2\n"
+  "color.undo.before=color1\n"
   "\n"
 #else
   "\n"
-  "# basics\n"
-  "color.active=bold yellow\n"
+  "rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.\n"
+  "\n"
+  "# General decoration\n"
+  "color.label=\n"
+  "color.label.sort=\n"
+  "color.alternate=\n"
+  "color.header=yellow\n"
+  "color.footnote=yellow\n"
+  "color.warning=bold red\n"
+  "color.error=yellow\n"
+  "color.debug=yellow\n"
+  "\n"
+  "# Task state\n"
   "color.completed=green on white\n"
   "color.deleted=red on white\n"
-  "color.due.today=on yellow\n"
-  "color.due=on blue\n"
-  "color.overdue=on red\n"
-  "color.blocking=bold green\n"
-  "color.blocked=bold cyan\n"
-  "color.recurring=\n"
+  "color.active=black on bright green\n"
+  "color.recurring=magenta\n"
   "color.scheduled=on green\n"
-  "color.tagged=\n"
-  "color.pri.H=bold white\n"
-  "color.pri.M=\n"
-  "color.pri.L=\n"
+  "color.until=\n"
+  "color.blocked=black on white\n"
+  "color.blocking=black on bright white\n"
   "\n"
-  "# missing attributes\n"
+  "# Project\n"
   "color.project.none=\n"
-  "color.tag.none=\n"
+  "\n"
+  "# Priority\n"
+  "color.pri.H=bold white\n"
+  "color.pri.M=white\n"
+  "color.pri.L=\n"
   "color.pri.none=\n"
   "\n"
-  "# personal color rules (remove '#' and replace 'X' with your value)\n"
-  "#color.keyword.X=\n"
-  "#color.project.X=\n"
+  "# Tags\n"
   "color.tag.next=bold yellow\n"
+  "color.tag.none=\n"
+  "color.tagged=green\n"
+  "\n"
+  "# Due\n"
+  "color.due=red\n"
+  "color.due.today=red\n"
+  "color.overdue=bold red\n"
+  "\n"
+  "# UDA\n"
   "#color.uda.X=\n"
   "\n"
-  "# interface\n"
-  "color.alternate=\n"
-  "color.header=\n"
-  "color.label=inverse\n"
-  "color.footnote=\n"
+  "# Report: burndown\n"
+  "color.burndown.done=on green\n"
+  "color.burndown.pending=on red\n"
+  "color.burndown.started=on yellow\n"
   "\n"
-  "# burndown report\n"
-  "color.burndown.pending=on green\n"
-  "color.burndown.started=on bright yellow\n"
-  "color.burndown.done=on bright green\n"
+  "# Report: history\n"
+  "color.history.add=black on red\n"
+  "color.history.delete=black on yellow\n"
+  "color.history.done=black on green\n"
   "\n"
-  "# calendar\n"
-  "color.calendar.holiday=bold yellow\n"
-  "color.calendar.today=bold white\n"
-  "color.calendar.due.today=on yellow\n"
-  "color.calendar.due=on blue\n"
-  "color.calendar.overdue=on red\n"
-  "color.calendar.weekend=on bright black\n"
-  "color.calendar.weeknumber=bold black\n"
+  "# Report: summary\n"
+  "color.summary.background=white on black\n"
+  "color.summary.bar=black on green\n"
   "\n"
-  "# history report\n"
-  "color.history.add=red on green\n"
-  "color.history.done=black on bright green\n"
-  "color.history.delete=white on red\n"
+  "# Command: calendar\n"
+  "color.calendar.due=white on red\n"
+  "color.calendar.due.today=bold white on red\n"
+  "color.calendar.holiday=black on bright yellow\n"
+  "color.calendar.overdue=black on bright red\n"
+  "color.calendar.today=bold white on bright blue\n"
+  "color.calendar.weekend=white on bright black\n"
+  "color.calendar.weeknumber=bold blue\n"
   "\n"
-  "# summary report (background color only)\n"
-  "color.summary.bar=on green\n"
-  "color.summary.background=on black\n"
-  "\n"
-  "# status\n"
-  "color.error=red on white\n"
-  "color.debug=black on white\n"
-  "color.undo.before=yellow\n"
-  "color.undo.after=green\n"
+  "# Command: sync\n"
   "color.sync.added=green\n"
   "color.sync.changed=yellow\n"
   "color.sync.rejected=red\n"
-  "color.warning=bold red\n"
+  "\n"
+  "# Command: undo\n"
+  "color.undo.after=green\n"
+  "color.undo.before=red\n"
   "\n"
 #endif
   "# Here is the rule precedence order, highest to lowest.\n"