From f2a5dde3a6dad60223f227fbc3b90af983b27b9b Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 30 Aug 2010 20:37:44 -0400
Subject: [PATCH] Themes

- Updated themes to include blank entries for the new color.tag.none
  and color.project.none rules.
---
 doc/rc/dark-16.theme        | 4 +++-
 doc/rc/dark-256.theme       | 4 +++-
 doc/rc/dark-blue-256.theme  | 4 +++-
 doc/rc/dark-green-256.theme | 4 +++-
 doc/rc/dark-red-256.theme   | 4 +++-
 doc/rc/light-16.theme       | 4 +++-
 doc/rc/light-256.theme      | 4 +++-
 src/Config.cpp              | 4 ++++
 src/command.cpp             | 2 +-
 9 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme
index fb1daa63b..8ab05b737 100644
--- a/doc/rc/dark-16.theme
+++ b/doc/rc/dark-16.theme
@@ -60,6 +60,8 @@ color.pri.H=bold white
 color.pri.M=white
 color.pri.L=
 color.tagged=green
-color.blocked=black on white           # placeholder color
+color.blocked=black on white
+color.project.none=
+color.tag.none=
 color.alternate=
 
diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme
index 2773b4f4c..abcf1f7f5 100644
--- a/doc/rc/dark-256.theme
+++ b/doc/rc/dark-256.theme
@@ -60,6 +60,8 @@ color.pri.H=color255
 color.pri.M=color250
 color.pri.L=color245
 color.tagged=rgb031
-color.blocked=black on white           # placeholder color
+color.blocked=on gray4
+color.project.none=
+color.tag.none=
 color.alternate=on color233
 
diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme
index 4964c01a0..975fe367f 100644
--- a/doc/rc/dark-blue-256.theme
+++ b/doc/rc/dark-blue-256.theme
@@ -60,6 +60,8 @@ color.pri.H=rgb035
 color.pri.M=rgb025
 color.pri.L=rgb015
 color.tagged=color246
-color.blocked=black on white           # placeholder color
+color.blocked=on gray4
+color.project.none=
+color.tag.none=
 color.alternate=on color233
 
diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme
index b4c27ef2f..2cb3ff54a 100644
--- a/doc/rc/dark-green-256.theme
+++ b/doc/rc/dark-green-256.theme
@@ -60,6 +60,8 @@ color.pri.H=rgb050
 color.pri.M=rgb030
 color.pri.L=rgb010
 color.tagged=color246
-color.blocked=black on white           # placeholder color
+color.blocked=on gray4
+color.project.none=
+color.tag.none=
 color.alternate=on color233
 
diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme
index f3c8c61b1..a979a6e4b 100644
--- a/doc/rc/dark-red-256.theme
+++ b/doc/rc/dark-red-256.theme
@@ -60,6 +60,8 @@ color.pri.H=rgb500
 color.pri.M=rgb400
 color.pri.L=rgb300
 color.tagged=color246
-color.blocked=black on white           # placeholder color
+color.blocked=on gray4
+color.project.none=
+color.tag.none=
 color.alternate=on color233
 
diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme
index a3e887dd5..45fc2d880 100644
--- a/doc/rc/light-16.theme
+++ b/doc/rc/light-16.theme
@@ -60,6 +60,8 @@ color.pri.H=bold black
 color.pri.M=black
 color.pri.L=
 color.tagged=green
-color.blocked=black on white           # placeholder color
+color.blocked=black on white
+color.project.none=
+color.tag.none=
 color.alternate=
 
diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme
index 08dfbd0f2..2bb5e774f 100644
--- a/doc/rc/light-256.theme
+++ b/doc/rc/light-256.theme
@@ -59,6 +59,8 @@ color.pri.H=color232
 color.pri.M=color237
 color.pri.L=color242
 color.tagged=rgb020
-color.blocked=black on white           # placeholder color
+color.blocked=on gray4
+color.project.none=
+color.tag.none=
 color.alternate=on color254
 
diff --git a/src/Config.cpp b/src/Config.cpp
index 6ec49c5f0..a87a99a18 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -150,7 +150,9 @@ std::string Config::defaults =
   "color.due=color1                               # Color of due tasks\n"
   "#color.keyword.car=on blue                     # Color of description.contains:car tasks\n"
   "#color.project.garden=on green                 # Color of project:garden tasks\n"
+  "#color.project.none=                           # Color of tasks with no project\n"
   "#color.tag.bug=yellow                          # Color of +bug tasks\n"
+  "#color.tag.none=                               # Color of tag-less tasks\n"
   "color.active=rgb555 on rgb410                  # Color of active tasks\n"
   "color.pri.none=                                # Color of priority:  tasks\n"
   "color.pri.H=rgb255                             # Color of priority:H tasks\n"
@@ -189,7 +191,9 @@ std::string Config::defaults =
   "color.due=red                                  # Color of due tasks\n"
   "#color.keyword.car=on blue                     # Color of description.contains:car tasks\n"
   "#color.project.garden=on green                 # Color of project:garden tasks\n"
+  "#color.project.none=                           # Color of tasks with no project\n"
   "#color.tag.bug=yellow                          # Color of +bug tasks\n"
+  "#color.tag.none=                               # Color of tag-less tasks\n"
   "color.active=black on bright green             # Color of active tasks\n"
   "color.pri.none=                                # Color of priority:  tasks\n"
   "color.pri.H=bold white                         # Color of priority:H tasks\n"
diff --git a/src/command.cpp b/src/command.cpp
index 1c13f3de6..fc3bc785e 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1965,7 +1965,7 @@ int handleColor (std::string &outs)
           // actual colors.
           if (*item != "_forcecolor" &&
               *item != "color"       &&
-              item->find ("color") != std::string::npos)
+              item->find ("color") == 0)
           {
             int row = table.addRow ();
             table.addCell (row, 0, *item);