gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

TW-1603: Priority color precedence changed since it is a UDA, should be lowered again

Browse Source 
- The 'uda.' element is moved to the end, where 'pri.' used to be (thanks to
  Jens Erat).
This commit is contained in:
Paul Beckingham
2015-04-27 17:21:01 -04:00
parent fcfc95df86
commit 7a9e099568
16 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -2,6 +2,8 @@
- TW-1596 taskwarrior can't compile FreeBSD 9.3 32bit environment (thanks to - TW-1596 taskwarrior can't compile FreeBSD 9.3 32bit environment (thanks to
ribbon) ribbon)
- TW-1603 Priority color precedence changed since it is a UDA, should be lowered
again (thanks to Jens Erat).
- The 'obfuscate' setting, if set to '1' will replace all text with 'xxx'. - The 'obfuscate' setting, if set to '1' will replace all text with 'xxx'.
------ current release --------------------------- ------ current release ---------------------------

2
doc/rc/dark-16.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-blue-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-gray-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-gray-blue-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-green-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-red-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-violets-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/dark-yellow-green.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/light-16.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/light-256.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/no-color.theme
View File

@@ -24,7 +24,7 @@
# #
############################################################################### ###############################################################################
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# This is a theme that disables all default colors # This is a theme that disables all default colors
# It can be used as template for other themes # It can be used as template for other themes

2
doc/rc/solarized-dark-256.theme
View File

@@ -41,7 +41,7 @@
# #
# Taskwarrior solarized-dark-256 theme created by Stefan A. Keel. # Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

2
doc/rc/solarized-light-256.theme
View File

@@ -41,7 +41,7 @@
# #
# Taskwarrior solarized-dark-256 theme created by Stefan A. Keel. # Taskwarrior solarized-dark-256 theme created by Stefan A. Keel.
rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.
# General decoration # General decoration
color.label= color.label=

6
src/Config.cpp
View File

@@ -166,7 +166,7 @@ std::string Config::_defaults =
"color=on # Enable color\n" "color=on # Enable color\n"
#if defined(LINUX) || defined(DARWIN) #if defined(LINUX) || defined(DARWIN)
"\n" "\n"
"rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged\n" "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
"\n" "\n"
"# General decoration\n" "# General decoration\n"
"color.label=\n" "color.label=\n"
@@ -240,7 +240,7 @@ std::string Config::_defaults =
"\n" "\n"
#else #else
"\n" "\n"
"rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged\n" "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
"\n" "\n"
"# General decoration\n" "# General decoration\n"
"color.label=\n" "color.label=\n"
@@ -329,7 +329,7 @@ std::string Config::_defaults =
"# Here is the rule precedence order, highest to lowest.\n" "# Here is the rule precedence order, highest to lowest.\n"
"# Note that these are just the color rule names, without the leading 'color.'\n" "# Note that these are just the color rule names, without the leading 'color.'\n"
"# and any trailing '.value'.\n" "# and any trailing '.value'.\n"
"rule.precedence.color=deleted,completed,active,keyword.,tag.,uda.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,pri.\n" "rule.precedence.color=deleted,completed,active,keyword.,tag.,project.,overdue,scheduled,due.today,due,blocked,blocking,recurring,tagged,uda.\n"
"\n" "\n"
"#default.project=foo # Default project for 'add' command\n" "#default.project=foo # Default project for 'add' command\n"
"#default.due=eom # Default due date for 'add' command\n" "#default.due=eom # Default due date for 'add' command\n"