From 616e2309208b558f7edf6cf3bdc23db9fcbe4d5c Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 5 Oct 2010 18:22:21 -0400 Subject: [PATCH 1/3] Holidays - Added missing files to makefile. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 24d7f4ea2..08cdea882 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,5 +20,5 @@ i18ndir = $(docdir) nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE rcfiledir = $(docdir)/rc -dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-CA.rc doc/rc/holidays-SE.rc doc/rc/holidays-DE.rc doc/rc/holidays-FR.rc doc/rc/holidays-UK.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme +dist_rcfile_DATA = doc/rc/holidays-CA.rc doc/rc/holidays-DE.rc doc/rc/holidays-ES.rc doc/rc/holidays-FR.rc doc/rc/holidays-NL.rc doc/rc/holidays-SE.rc doc/rc/holidays-UK.rc doc/rc/holidays-US.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme From 6fd876b8dd9d830912e550d8033b6e3a9167e0a1 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 5 Oct 2010 18:23:07 -0400 Subject: [PATCH 2/3] Themes - Updated themes to include new color.blocked. --- doc/rc/dark-256.theme | 2 +- doc/rc/dark-blue-256.theme | 2 +- doc/rc/dark-green-256.theme | 2 +- doc/rc/dark-red-256.theme | 2 +- doc/rc/dark-violets-256.theme | 2 +- doc/rc/dark-yellow-green.theme | 2 +- doc/rc/light-16.theme | 2 +- doc/rc/light-256.theme | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme index abcf1f7f5..c86c32c56 100644 --- a/doc/rc/dark-256.theme +++ b/doc/rc/dark-256.theme @@ -60,7 +60,7 @@ color.pri.H=color255 color.pri.M=color250 color.pri.L=color245 color.tagged=rgb031 -color.blocked=on gray4 +color.blocked=white on color8 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 975fe367f..18d826266 100644 --- a/doc/rc/dark-blue-256.theme +++ b/doc/rc/dark-blue-256.theme @@ -60,7 +60,7 @@ color.pri.H=rgb035 color.pri.M=rgb025 color.pri.L=rgb015 color.tagged=color246 -color.blocked=on gray4 +color.blocked=white on rgb001 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 2cb3ff54a..1a41cdd45 100644 --- a/doc/rc/dark-green-256.theme +++ b/doc/rc/dark-green-256.theme @@ -60,7 +60,7 @@ color.pri.H=rgb050 color.pri.M=rgb030 color.pri.L=rgb010 color.tagged=color246 -color.blocked=on gray4 +color.blocked=white on rgb010 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 a979a6e4b..ea05a97dc 100644 --- a/doc/rc/dark-red-256.theme +++ b/doc/rc/dark-red-256.theme @@ -60,7 +60,7 @@ color.pri.H=rgb500 color.pri.M=rgb400 color.pri.L=rgb300 color.tagged=color246 -color.blocked=on gray4 +color.blocked=white on rgb100 color.project.none= color.tag.none= color.alternate=on color233 diff --git a/doc/rc/dark-violets-256.theme b/doc/rc/dark-violets-256.theme index 2c55fc011..f42bb1bf6 100644 --- a/doc/rc/dark-violets-256.theme +++ b/doc/rc/dark-violets-256.theme @@ -60,7 +60,7 @@ color.pri.H=rgb404 color.pri.M=rgb304 color.pri.L=rgb325 color.tagged=rgb334 -color.blocked=on gray4 +color.blocked=white on rgb101 color.project.none= color.tag.none= color.alternate=on gray2 diff --git a/doc/rc/dark-yellow-green.theme b/doc/rc/dark-yellow-green.theme index c8cfb19ec..b927d6270 100644 --- a/doc/rc/dark-yellow-green.theme +++ b/doc/rc/dark-yellow-green.theme @@ -60,7 +60,7 @@ color.pri.H=rgb450 color.pri.M=rgb030 color.pri.L=rgb010 color.tagged=rgb342 -color.blocked=on gray4 +color.blocked=white on rgb110 color.project.none= color.tag.none= color.alternate=on gray0 diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme index 45fc2d880..9a805afde 100644 --- a/doc/rc/light-16.theme +++ b/doc/rc/light-16.theme @@ -60,7 +60,7 @@ color.pri.H=bold black color.pri.M=black color.pri.L= color.tagged=green -color.blocked=black on white +color.blocked=white on black color.project.none= color.tag.none= color.alternate= diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme index 2bb5e774f..c84492687 100644 --- a/doc/rc/light-256.theme +++ b/doc/rc/light-256.theme @@ -59,7 +59,7 @@ color.pri.H=color232 color.pri.M=color237 color.pri.L=color242 color.tagged=rgb020 -color.blocked=on gray4 +color.blocked=gray12 on gray4 color.project.none= color.tag.none= color.alternate=on color254 From cb14ed128e6d47f7324dfcb69bba50e2d59f073c Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 5 Oct 2010 18:24:01 -0400 Subject: [PATCH 3/3] Bug - Fixed bug whereby after a merge, the undo.data file had all lines concatenated without \n characters. --- src/TDB.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TDB.cpp b/src/TDB.cpp index 76eaec080..5c6a3cdb9 100644 --- a/src/TDB.cpp +++ b/src/TDB.cpp @@ -1535,7 +1535,7 @@ void TDB::merge (const std::string& mergeFile) } // write undo file - if (! File::write (undoFile, undo, false)) + if (! File::write (undoFile, undo, true)) throw std::string ("Could not write '") + undoFile + "'."; } else // nothing to be done