In TortoiseMerge, changing Settings | Colors | Modified has no effect, due
to a regression in revision 28717 (implementation of dark theme support).
In CBaseView::CBaseView, the members m_ModifiedBk and m_ModifiedDarkBk are
initialised incorrectly, using wrong Windows Registry value paths
("...\Colors\Colors\...", presumably a typo).
The issue can be circumventing by creating the erroneous key
"HKEY_CURRENT_USER\Software\TortoiseMerge\Colors\Colors" in the Windows
Registry and populating it with copies of the parent values
"ColorModifiedB" and "DarkColorModifiedB".
Screenshots of the regression, as well as a patch file, can be found in my
OneDrive public folder:
https://1drv.ms/u/s!ArGG4DkKoPNVgcxwkn2uxoCbkXe00w?e=ZUUOZc
Note that the screenshots only show the code at fault and the fix. They do
not show anything wrong with the colours (I had circumvented the bug as
described above, before I took the screenshot). However, they do show my
custom colour scheme, which I hope you will consider adopting as a default,
rather than the current Christmas tree setup (sorry).
My "marker pen" colour scheme is very simple, intuitive and easy on the
eye: Light yellow background for modifications (RGB: 254, 255, 165), with
removed lines shown in a fainter yellow (RGB: 254, 254, 221) and gray text
colour (RGB: 128, 128, 128). Inline additions, are shown with a darker
yellow background colour (RGB: 236, 229, 137). Empty lines are shown in
faint gray (RGB: 240, 240, 240). In conflict resolution mode, conflicts are
shown with faint red background (RGB: 254, 192, 192) with dark red text
(RGB: 128, 0, 0), while resolutions are faint green (RGB: 200, 255, 200)
with normal black text.
In TortoiseUDiff, I use the same scheme, with the addition of a faint blue
background (RGB: 205, 226, 244) and a blue text colour (RGB: 52, 137, 210)
for the UDiff command and header, and with the same blue text colour but a
fainter background (RGB: 236, 244, 251) for the UDiff position.
This scheme should be easily adaptable to dark themes by tinting the
colours from black rather than white.
Another couple of requests: Add a feature for selectable and customisable
named colour schemes (select, add, edit, remove). And add a feature to save
and restore select colour schemes for backup purposes (and/or store the
schemes under the users Application Data folder, in which case they will be
automatically backed up). I currently save the Windows Registry keys, but
that isn't very user-friendly. It would be great to be able to switch
between the default scheme and my own at will.
PS. Thanks for your effort on creating and maintaining TortoiseSVN! It is
an great tool, and I've used it for years. I've donated once, and will do
again.
Regards,
Vidar Hasfjord
--
You received this message because you are subscribed to the Google Groups
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/tortoisesvn/cd4eee20-8d93-406c-8b39-b3cd21f0174eo%40googlegroups.com.
