From fdf7d2203fa27178a454c990914a0e2d959d2fd0 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 12 Jul 2010 20:14:07 -0400 Subject: [PATCH] Dependencies - Added new color.blocked to all themes (placeholders for now). - Added new color rule for applying color.blocked. --- doc/rc/dark-16.theme | 1 + doc/rc/dark-256.theme | 1 + doc/rc/dark-blue-256.theme | 1 + doc/rc/dark-green-256.theme | 1 + doc/rc/dark-red-256.theme | 1 + doc/rc/light-16.theme | 1 + doc/rc/light-256.theme | 1 + src/Config.cpp | 8 +++++--- src/rules.cpp | 5 +++++ 9 files changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme index 6a99b73c5..1ce91a1ba 100644 --- a/doc/rc/dark-16.theme +++ b/doc/rc/dark-16.theme @@ -33,5 +33,6 @@ color.pri.H=bold white color.pri.M=white color.pri.L= color.tagged=green +color.blocked=black on white # placeholder color color.alternate= diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme index 1f159e48d..9feba5141 100644 --- a/doc/rc/dark-256.theme +++ b/doc/rc/dark-256.theme @@ -33,5 +33,6 @@ color.pri.H=color255 color.pri.M=color250 color.pri.L=color245 color.tagged=rgb031 +color.blocked=black on white # placeholder color color.alternate=on color233 diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme index d2d2722dc..0c19c3fac 100644 --- a/doc/rc/dark-blue-256.theme +++ b/doc/rc/dark-blue-256.theme @@ -33,5 +33,6 @@ color.pri.H=rgb035 color.pri.M=rgb025 color.pri.L=rgb015 color.tagged=color246 +color.blocked=black on white # placeholder color color.alternate=on color233 diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme index 795749dea..e2d3aa3a0 100644 --- a/doc/rc/dark-green-256.theme +++ b/doc/rc/dark-green-256.theme @@ -33,5 +33,6 @@ color.pri.H=rgb050 color.pri.M=rgb030 color.pri.L=rgb010 color.tagged=color246 +color.blocked=black on white # placeholder color color.alternate=on color233 diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme index 441a66ab2..11466a75a 100644 --- a/doc/rc/dark-red-256.theme +++ b/doc/rc/dark-red-256.theme @@ -33,5 +33,6 @@ color.pri.H=rgb500 color.pri.M=rgb400 color.pri.L=rgb300 color.tagged=color246 +color.blocked=black on white # placeholder color color.alternate=on color233 diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme index efa7a98c7..24ba3650c 100644 --- a/doc/rc/light-16.theme +++ b/doc/rc/light-16.theme @@ -33,5 +33,6 @@ color.pri.H=bold black color.pri.M=black color.pri.L= color.tagged=green +color.blocked=black on white # placeholder color color.alternate= diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme index 3eb8c0331..72e45bc84 100644 --- a/doc/rc/light-256.theme +++ b/doc/rc/light-256.theme @@ -33,5 +33,6 @@ color.pri.H=color232 color.pri.M=color237 color.pri.L=color242 color.tagged=rgb020 +color.blocked=black on white # placeholder color color.alternate=on color254 diff --git a/src/Config.cpp b/src/Config.cpp index c894006b6..e39793612 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -137,8 +137,9 @@ std::string Config::defaults = "color.pri.H=rgb255 # [9] Color of priority:H tasks\n" "color.pri.M=rgb250 # [9] Color of priority:M tasks\n" "color.pri.L=rgb245 # [9] Color of priority:L tasks\n" - "color.tagged=rgb031 # [10] Color of tagged tasks\n" - "color.alternate=on color233 # [11] Alternate color for line coloring\n" + "color.tagged=rgb031 # [10] Color of tagged tasks\n" + "color.blocked=black on white # [11] Color of blocked tasks\n" + "color.alternate=on color233 # [12] Alternate color for line coloring\n" #else "color.header=yellow # Color of header messages\n" "color.footnote=yellow # Color of footnote messages\n" @@ -179,7 +180,8 @@ std::string Config::defaults = "color.pri.M=white # [9] Color of priority:M tasks\n" "color.pri.L= # [9] Color of priority:L tasks\n" "color.tagged=green # [10] Color of tagged tasks\n" - "color.alternate= # [11] Alternate color for line coloring\n" + "color.blocked=black on white # [11] Color of blocked tasks\n" + "color.alternate= # [12] Alternate color for line coloring\n" #endif "\n" "# Shadow file support\n" diff --git a/src/rules.cpp b/src/rules.cpp index aef5f57c4..d65d5ae46 100644 --- a/src/rules.cpp +++ b/src/rules.cpp @@ -64,6 +64,11 @@ void autoColorize (Task& task, Color& c) Task::status status = task.getStatus (); + // Colorization of the blocked. + if (gsColor["color.blocked"].nontrivial ()) + if (task.get ("depends") != "") + c.blend (gsColor["color.blocked"]); + // Colorization of the tagged. if (gsColor["color.tagged"].nontrivial ()) if (task.getTagCount ())