GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed bugs #533 and #536

Browse source 
- correct paths are now written to default .taskrc
This commit is contained in:
Federico Hernandez 2011-09-14 01:10:52 +02:00
parent 6e52194ab0
commit 070ec91566
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -107,6 +107,8 @@
+ Fixed bug #511, which caused display problem on Cygwin when colored output + Fixed bug #511, which caused display problem on Cygwin when colored output
used the full width of the terminal. The 'avoidlastcolumn' configuration used the full width of the terminal. The 'avoidlastcolumn' configuration
variable forces taskwarrior to never use the last column. variable forces taskwarrior to never use the last column.
+ Fixed bugs #533 and #536, which prevented having correct paths for themes
in .taskrc (thanks to Juergen Daubert)
+ Fixed bug #594, which broke the 'all' report with a combination of bad regex + Fixed bug #594, which broke the 'all' report with a combination of bad regex
handling and a formatting bug (thanks to Steve Rader). handling and a formatting bug (thanks to Steve Rader).
+ Fixed bug #605, which gave misleading project completion percentages under + Fixed bug #605, which gave misleading project completion percentages under

10
cmake.h.in
View file

@ -1,15 +1,19 @@
/* cmake.h.in. Creates auto.h during a cmake run */ /* cmake.h.in. Creates cmake.h during a cmake run */
#define L10N // Localization complete. #define L10N // Localization complete.
/* Package information */ /* Package information */
#define PACKAGE "${PACKAGE}" #define PACKAGE "${PACKAGE}"
#define VERSION "${VERSION}" #define VERSION "${VERSION}"
#define PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}" #define PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
#define PACKAGE_NAME "${PACKAGE_NAME}" #define PACKAGE_NAME "${PACKAGE_NAME}"
#define PACKAGE_TARNAME "${PACKAGE_TARNAME}" #define PACKAGE_TARNAME "${PACKAGE_TARNAME}"
#define PACKAGE_VERSION "${PACKAGE_VERSION}" #define PACKAGE_VERSION "${PACKAGE_VERSION}"
#define PACKAGE_STRING "${PACKAGE_STRING}" #define PACKAGE_STRING "${PACKAGE_STRING}"
/* Installation details */
#define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_DOCDIR}/rc"
/* Localization */ /* Localization */
#define PACKAGE_LANGUAGE 1 #define PACKAGE_LANGUAGE 1
#define LANGUAGE_EN_US 1 #define LANGUAGE_EN_US 1

20
src/Config.cpp
View file

@ -583,16 +583,16 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
<< _defaults.substr (0, loc + 14) << _defaults.substr (0, loc + 14)
<< data << data
<< "\n\n# Color theme (uncomment one to use)\n" << "\n\n# Color theme (uncomment one to use)\n"
<< "#include /usr/local/share/doc/task/rc/light-16.theme\n" << "#include " << TASK_RCDIR << "/light-16.theme\n"
<< "#include /usr/local/share/doc/task/rc/light-256.theme\n" << "#include " << TASK_RCDIR << "/light-256.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-16.theme\n" << "#include " << TASK_RCDIR << "/dark-16.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-256.theme\n" << "#include " << TASK_RCDIR << "/dark-256.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-red-256.theme\n" << "#include " << TASK_RCDIR << "/dark-red-256.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-green-256.theme\n" << "#include " << TASK_RCDIR << "/dark-green-256.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-blue-256.theme\n" << "#include " << TASK_RCDIR << "/dark-blue-256.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-violets-256.theme\n" << "#include " << TASK_RCDIR << "/dark-violets-256.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-yellow-green.theme\n" << "#include " << TASK_RCDIR << "/dark-yellow-green.theme\n"
<< "#include /usr/local/share/doc/task/rc/dark-gray-256.theme\n" << "#include " << TASK_RCDIR << "/dark-gray-256.theme\n"
<< "\n"; << "\n";
// Write out the new file. // Write out the new file.