OSDN Git Service
Takashi Sawanaka [Sun, 3 Feb 2019 02:56:02 +0000 (11:56 +0900)]
Reduce application startup time by reducing the number of open-close of HKEY (2)
(Anti-virus software makes creating the handle of registry key slow)
Takashi Sawanaka [Fri, 1 Feb 2019 15:39:51 +0000 (00:39 +0900)]
Remove unused variables
Takashi Sawanaka [Fri, 1 Feb 2019 15:36:57 +0000 (00:36 +0900)]
Remove WMPROFILE
Takashi Sawanaka [Fri, 1 Feb 2019 15:32:14 +0000 (00:32 +0900)]
Reduce application startup time by reducing the number of open-close of HKEY
(Anti-virus software makes creating the handle of registry key slow)
Takashi Sawanaka [Fri, 1 Feb 2019 15:29:48 +0000 (00:29 +0900)]
ShellExtension: Change the encoding of *.rc and *.po files to UTF-8
Takashi Sawanaka [Fri, 1 Feb 2019 13:03:45 +0000 (22:03 +0900)]
Merge ... Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815
Takashi Sawanaka [Fri, 1 Feb 2019 12:53:10 +0000 (12:53 +0000)]
Merged in Timon34/winmerge-15/Timon34/russianpo-edited-online-with-bitbucket--
1548954256878 (pull request #25)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815
Takashi Sawanaka [Fri, 1 Feb 2019 12:52:22 +0000 (12:52 +0000)]
Merged in Timon34/winmerge-14/Timon34/russianpo-edited-online-with-bitbucket-t-
1548915674714 (pull request #24)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Thu, 31 Jan 2019 17:05:45 +0000 (17:05 +0000)]
Russian.po edited online with Bitbucket
Compared https://bitbucket.org/winmerge/winmerge/src/
b3087026c3d70d6919418e1bd6ed9825f320db72/Translations/ShellExtension/Russian.po and https://bitbucket.org/winmerge/winmerge/raw/
5b8ae66a0a1f748b0377807ed6183d60327cebb8/ShellExtension/Languages/ShellExtensionRussian.rc translations.
Made final version. Many thanks to Yury Lebedev https://bitbucket.org/yuryleb/
Not quite sure that fixed these 2 strings, think they remain from previous translation.
Found where problems with CP come from:
Takashi Sawanaka
3798cd9 Russian.po: Change the file encoding from UTF-8 to CP-1251 2019-01-16
https://bitbucket.org/winmerge/winmerge/src/
3798cd9cba3d3984b6271d904dd7b9ded58ffce8/Translations/ShellExtension/Russian.po
Do not know how it worked before, but because of 'Change the file encoding from UTF-8 to CP-1251', everything became unreadable. Probably, this edit should be rolled back.
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket--
1548954256878
Timon34 [Thu, 31 Jan 2019 06:21:52 +0000 (06:21 +0000)]
Russian.po edited online with Bitbucket
Translated maximum what was possible at the moment. This is final verified version. Again made many fixes meticulously checking with the program interface. By the way, found several sections that are not present in the language file - 'Edit - Options- Compare - Binary - Frhed Settings' - View Settings + Binary mode + Character set. They should be added because they are rather difficult for ordinary people to understand.
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-t-
1548915674714
Takashi Sawanaka [Wed, 30 Jan 2019 10:46:31 +0000 (10:46 +0000)]
Merged in Timon34/winmerge-13/Timon34/russianpo-edited-online-with-bitbucket-m-
1548842749050 (pull request #23)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Takashi Sawanaka [Wed, 30 Jan 2019 10:12:38 +0000 (19:12 +0900)]
Merge
Takashi Sawanaka [Wed, 30 Jan 2019 10:11:12 +0000 (19:11 +0900)]
Fix Bitbucket issue #140: Click doesn't trigger document to scroll in Location pane under circumstance
Timon34 [Wed, 30 Jan 2019 10:06:55 +0000 (10:06 +0000)]
Russian.po edited online with Bitbucket
Made about 25 fixes and new translations
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1548842749050
Takashi Sawanaka [Mon, 28 Jan 2019 21:00:48 +0000 (21:00 +0000)]
Merged in Timon34/winmerge-12/Timon34/russianpo-edited-online-with-bitbucket-m-
1548672659808 (pull request #22)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Mon, 28 Jan 2019 10:51:55 +0000 (10:51 +0000)]
Russian.po edited online with Bitbucket
Made several strings translation
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1548672659808
Takashi Sawanaka [Sun, 27 Jan 2019 23:01:51 +0000 (08:01 +0900)]
MergeDoc.cpp: Recover lost compatibility
Takashi Sawanaka [Sun, 27 Jan 2019 22:59:31 +0000 (07:59 +0900)]
Test.cpp: Do not change the registry values while testing
Takashi Sawanaka [Sat, 26 Jan 2019 15:32:38 +0000 (00:32 +0900)]
Merge
Takashi Sawanaka [Sat, 26 Jan 2019 15:27:39 +0000 (00:27 +0900)]
Fix bitbucket issue #138: Unique files are not shown
When comparing empty file and nonexistent file, `DIFFCODE::SAME` flag is set to the variable `code`, so change the flag to `DIFFCODE::DIFF`
Takashi Sawanaka [Fri, 25 Jan 2019 22:00:55 +0000 (22:00 +0000)]
Merged in Timon34/winmerge-11/Timon34/russianpo-edited-online-with-bitbucket-m-
1548411157417 (pull request #21)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Fri, 25 Jan 2019 10:13:44 +0000 (10:13 +0000)]
Russian.po edited online with Bitbucket
Made a huge number of fixes in previous translation, fixes typos, ...
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1548411157417
Takashi Sawanaka [Thu, 24 Jan 2019 21:36:09 +0000 (21:36 +0000)]
Merged in Timon34/winmerge-10/Timon34/russianisl-edited-online-with-bitbucket--
1548310814350 (pull request #20)
Russian.isl edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Thu, 24 Jan 2019 06:20:51 +0000 (06:20 +0000)]
Russian.isl edited online with Bitbucket
Made some fixes + translated Localization Components section
--HG--
branch : Timon34/russianisl-edited-online-with-bitbucket--
1548310814350
Takashi Sawanaka [Wed, 23 Jan 2019 16:13:11 +0000 (01:13 +0900)]
appveyor.yml: enable the eol extension
Takashi Sawanaka [Wed, 23 Jan 2019 15:19:36 +0000 (15:19 +0000)]
Merged in Timon34/winmerge-9/Timon34/russianpo-edited-online-with-bitbucket-a-
1548245477913 (pull request #19)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
datadiode [Wed, 23 Jan 2019 11:20:40 +0000 (12:20 +0100)]
MergeEditSplitterView: Don't claim input focus upon mouse click / Fix an apparent afx_msg vs. virtual confusion / Mark overrides as such
datadiode [Wed, 23 Jan 2019 09:44:23 +0000 (10:44 +0100)]
Clarification as per https://github.com/WinMerge/winmerge-v2/issues/41
Timon34 [Wed, 23 Jan 2019 12:12:25 +0000 (12:12 +0000)]
Russian.po edited online with Bitbucket
Again made many fixes and new translations
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-a-
1548245477913
Takashi Sawanaka [Tue, 22 Jan 2019 23:12:24 +0000 (08:12 +0900)]
MergeDoc.cpp: If the command line option /x is specified and the files are identical, EOL status on the status bar
Takashi Sawanaka [Tue, 22 Jan 2019 21:19:02 +0000 (21:19 +0000)]
Merged in Timon34/winmerge-8/Timon34/russianpo-edited-online-with-bitbucket-m-
1548159521632 (pull request #18)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Tue, 22 Jan 2019 12:19:51 +0000 (12:19 +0000)]
Russian.po edited online with Bitbucket
Made many fixes and new translations
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1548159521632
Tichij [Tue, 22 Jan 2019 11:05:12 +0000 (13:05 +0200)]
Changed EOL from Unix (LF) to Windows (CR LF), because not shows correctly in Windows Notepad.
Takashi Sawanaka [Mon, 21 Jan 2019 14:54:10 +0000 (23:54 +0900)]
Fix sf.net issue #2211: end of line documentation
Takashi Sawanaka [Sun, 20 Jan 2019 14:08:10 +0000 (23:08 +0900)]
Add Timon34 to Contributers.txt
Takashi Sawanaka [Sun, 20 Jan 2019 11:38:50 +0000 (20:38 +0900)]
Delay calling InitialUpdateFrame() to reduce unnecessary drawing
Takashi Sawanaka [Sun, 20 Jan 2019 02:08:06 +0000 (11:08 +0900)]
ccrystaltextview.cpp: Ctrl+F3 key did not work correctly
Takashi Sawanaka [Sat, 19 Jan 2019 13:25:03 +0000 (22:25 +0900)]
Russian.po: Correct the position of double quotation mark
Takashi Sawanaka [Sat, 19 Jan 2019 13:19:21 +0000 (22:19 +0900)]
MergeLang.vs*.vcxproj: Revert incorrectly changed OutDir
Takashi Sawanaka [Sat, 19 Jan 2019 05:17:30 +0000 (14:17 +0900)]
Fix Bitbucket issue #137: Shell Integration "Enable Advanced Menu" disabled when instaling 32-bit WinMerge on 64-bit Windows
Takashi Sawanaka [Sat, 19 Jan 2019 02:02:38 +0000 (11:02 +0900)]
Fix for https://github.com/GreyMerlin/winmerge-v2/commit/
7823411ed17d2364c026075096f093c8b24c13b0#commitcomment-
31951237
GreyMerlin [Fri, 18 Jan 2019 00:06:00 +0000 (16:06 -0800)]
Don't pass `DIFFITEM *` by casting to `uintptr_t` (3)
* Improve comments, especially related to the doubly linked list structure of DIFFITEM siblings.
* see commit comment at
https://github.com/WinMerge/winmerge-v2/commit/
c30b5e126a1e2679db8071ea043f39655fa68630#commitcomment-
31972299
Takashi Sawanaka [Thu, 17 Jan 2019 14:20:22 +0000 (14:20 +0000)]
Merged in Timon34/winmerge-7/Timon34/russianisl-edited-online-with-bitbucket--
1547702605774 (pull request #16)
Russian.isl edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Thu, 17 Jan 2019 05:23:56 +0000 (05:23 +0000)]
Russian.isl edited online with Bitbucket
Improved InnoSetup Russian translation
--HG--
branch : Timon34/russianisl-edited-online-with-bitbucket--
1547702605774
Takashi Sawanaka [Wed, 16 Jan 2019 22:39:42 +0000 (22:39 +0000)]
Merged in Timon34/winmerge-6/Timon34/russianpo-edited-online-with-bitbucket-
1547658577332 (pull request #15)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Wed, 16 Jan 2019 17:12:46 +0000 (17:12 +0000)]
Russian.po edited online with Bitbucket
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-
1547658577332
Takashi Sawanaka [Wed, 16 Jan 2019 14:54:24 +0000 (23:54 +0900)]
Merge
Takashi Sawanaka [Wed, 16 Jan 2019 14:53:20 +0000 (23:53 +0900)]
Russian.po: Change the file encoding from UTF-8 to CP-1251
Takashi Sawanaka [Wed, 16 Jan 2019 14:48:40 +0000 (23:48 +0900)]
Merged in Timon34/winmerge-4/Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815 (pull request #13)
Takashi Sawanaka [Wed, 16 Jan 2019 14:43:14 +0000 (14:43 +0000)]
Merged in Timon34/winmerge-5/Timon34/russianpo-edited-online-with-bitbucket-w-
1547639137731 (pull request #14)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Takashi Sawanaka [Wed, 16 Jan 2019 14:40:56 +0000 (14:40 +0000)]
Merged in Timon34/winmerge-3/Timon34/russianpo-edited-online-with-bitbucket-m-
1547615905093 (pull request #12)
Russian.po edited online with Bitbucket
Takashi Sawanaka [Wed, 16 Jan 2019 14:40:05 +0000 (14:40 +0000)]
Merged in Timon34/winmerge-2/Timon34/russianpo-edited-online-with-bitbucket-m-
1547615062676 (pull request #11)
Russian.po edited online with Bitbucket
Takashi Sawanaka [Wed, 16 Jan 2019 14:35:48 +0000 (23:35 +0900)]
Merge
GreyMerlin [Tue, 15 Jan 2019 23:53:43 +0000 (15:53 -0800)]
another `nullptr` cleanup
GreyMerlin [Mon, 14 Jan 2019 23:33:03 +0000 (15:33 -0800)]
Don't pass `DIFFITEM *` by casting to `uintptr_t` (2)
* Improve linkage isolation
* Move `enum ViewCustomFlags` from `DirActions.h` to `DiffItem.h`
* Keep `diffFileInfo[]` near front of DIFFITEM class for small offsets (mainly to prevent
"mistakes" from over-writing linkage values.
GreyMerlin [Sat, 5 Jan 2019 21:01:22 +0000 (13:01 -0800)]
Don't pass `DIFFITEM *` by casting to `uintptr_t` (1)
* Change DIFFITEM from `struct` to `class`
* Incorporate `ListEntry` class directly into DIFFITEM
* Change handling of m_Root (now m_pRoot) and `children`
* Eliminate all casting between `DIFFITEM *` and `uintptr_t`
* Isolate all manipulation of `DIFFITEM` linkage to be within the DIFFITEM class.
* Add `#include "StdAfx.h"` and `#define new DEBUG_NEW` to a few files
* Cleanup various related comments
* Eliminate the `ListEntry.h` file. Also, it was never part of the project's Solution Explorer
tree.
Timon34 [Wed, 16 Jan 2019 11:46:35 +0000 (11:46 +0000)]
Russian.po edited online with Bitbucket
Worked hard to fix Russian translation
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-w-
1547639137731
Timon34 [Wed, 16 Jan 2019 05:22:47 +0000 (05:22 +0000)]
Russian.po edited online with Bitbucket
Made ShellExtension Russian translation (attempt 3)
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547616140815
Timon34 [Wed, 16 Jan 2019 05:18:52 +0000 (05:18 +0000)]
Russian.po edited online with Bitbucket
Made ShellExtension Russian translation
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547615905093
Timon34 [Wed, 16 Jan 2019 05:05:02 +0000 (05:05 +0000)]
Russian.po edited online with Bitbucket
Made Russian translation for ShellExtension
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547615062676
Takashi Sawanaka [Tue, 15 Jan 2019 21:40:02 +0000 (21:40 +0000)]
Merged in Timon34/winmerge-1/Timon34/russianpo-edited-online-with-bitbucket-m-
1547585212048 (pull request #10)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Takashi Sawanaka [Tue, 15 Jan 2019 21:39:44 +0000 (21:39 +0000)]
Merged in Timon34/winmerge/Timon34/russianpo-edited-online-with-bitbucket-m-
1547582348305 (pull request #9)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Tue, 15 Jan 2019 20:50:07 +0000 (20:50 +0000)]
Russian.po edited online with Bitbucket
Made some more fixes in Russian translation
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547585212048
Timon34 [Tue, 15 Jan 2019 20:03:19 +0000 (20:03 +0000)]
Russian.po edited online with Bitbucket
Made some fixes in Russian translation
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1547582348305
Takashi Sawanaka [Mon, 14 Jan 2019 14:05:17 +0000 (23:05 +0900)]
Remove unused declarations
Takashi Sawanaka [Mon, 14 Jan 2019 09:15:12 +0000 (18:15 +0900)]
Merge
Takashi Sawanaka [Mon, 14 Jan 2019 09:13:32 +0000 (09:13 +0000)]
Merged in Tichij/winmerge (pull request #8)
Some more minor corrections.
Takashi Sawanaka [Mon, 14 Jan 2019 09:03:48 +0000 (18:03 +0900)]
Fix error C4703: potentially uninitialized local pointer variable 'pszNew' used
Tichij [Mon, 14 Jan 2019 09:02:39 +0000 (11:02 +0200)]
Some more minor corrections.
datadiode [Mon, 14 Jan 2019 07:33:35 +0000 (08:33 +0100)]
DiffTextBuffer: Create Unicode temp files (makes EscapeControlChars() obsolete)
While transcoding UTF-16 input to a relaxed superset of UTF-8 so diffutils can make sense of it, prepare_text_end() (located in diffutils/src/io.c) translates NUL chars into 2 byte sequences so as to not create bogus string terminators. That was also the single remaining purpose which EscapeControlChars() was still serving after EditLib was enabled to show control characters in hexadecimal notation with a rounded rectangle around them. Now that the NUL char handling built into prepare_text_end() applies, EscapeControlChars() is no longer needed.
Takashi Sawanaka [Mon, 14 Jan 2019 01:38:39 +0000 (10:38 +0900)]
MainFrm.h: Fix a problem which the size of header paths is not updated when opening identical files from OpenDlg.
datadiode [Sun, 13 Jan 2019 17:30:43 +0000 (18:30 +0100)]
OpenDlg: Avoid retaining bogus filetype icons from previous selections
Takashi Sawanaka [Sun, 13 Jan 2019 17:14:00 +0000 (02:14 +0900)]
LanguageSelect.cpp: Remove unused function
Takashi Sawanaka [Sun, 13 Jan 2019 17:00:24 +0000 (02:00 +0900)]
Translate strings without using MergeLang.dll
Takashi Sawanaka [Sun, 13 Jan 2019 12:24:02 +0000 (21:24 +0900)]
MainFrm.h: Fix a problem which title is not updated when opening files from DirView.
Takashi Sawanaka [Sun, 13 Jan 2019 11:12:52 +0000 (20:12 +0900)]
ChildFrm.cpp: Remove no longer needed flicker free hack thanks to GitHub PR#9
Takashi Sawanaka [Sat, 12 Jan 2019 08:57:09 +0000 (17:57 +0900)]
Installer: Upgrade to 7-Zip 18.06
Takashi Sawanaka [Sat, 12 Jan 2019 08:42:00 +0000 (17:42 +0900)]
Upgrade to 7-Zip 18.06
Takashi Sawanaka [Sat, 12 Jan 2019 05:43:55 +0000 (14:43 +0900)]
Fix "Assertion failed: dr.begin[0] == dr.begin[file], file c:\dev\winmerge\src\diffwrapper.cpp, line 984" (https://bitbucket.org/sdottaka/winmerge-v2/issues/8/)
Takashi Sawanaka [Sat, 12 Jan 2019 04:01:47 +0000 (13:01 +0900)]
GhostTextBuffer.cpp: Fix incorrect size being passed to CopyMemory(). (https://bitbucket.org/sdottaka/winmerge-v2/issues/8/)
Takashi Sawanaka [Sat, 12 Jan 2019 02:53:13 +0000 (11:53 +0900)]
Update translations
Takashi Sawanaka [Mon, 7 Jan 2019 14:24:07 +0000 (23:24 +0900)]
MainFrm.cpp: Although the command lnie option '/e' was specified, pressing the ESC key did not terminate the application in some cases.
Takashi Sawanaka [Mon, 7 Jan 2019 13:47:13 +0000 (22:47 +0900)]
Revert the commit 'ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text selection bug' partially
Takashi Sawanaka [Sun, 6 Jan 2019 11:28:15 +0000 (20:28 +0900)]
Cppcheck: Variable '...' is assigned in constructor body. Consider performing initialization in initialization list.
Takashi Sawanaka [Sun, 6 Jan 2019 11:04:30 +0000 (20:04 +0900)]
Cppcheck: Either the condition '....empty()' is redundant or content is accessed out of bounds when content is empty.
Takashi Sawanaka [Sun, 6 Jan 2019 10:56:45 +0000 (19:56 +0900)]
Cppcheck: Memory leak: hData
Takashi Sawanaka [Sat, 5 Jan 2019 14:23:14 +0000 (23:23 +0900)]
Fix Warning C26437 Do not slice (es.63).
Takashi Sawanaka [Sat, 5 Jan 2019 13:46:00 +0000 (22:46 +0900)]
Fix Warning C26444 Avoid unnamed objects with custom construction and destruction (es.84).
GreyMerlin [Sat, 5 Jan 2019 01:01:09 +0000 (17:01 -0800)]
Add `hekxedit.h` to project files
* Improve IntelliSense's handling of `hekxedit.h` declarations
* VS2015, VS2017, VS2019
GreyMerlin [Fri, 4 Jan 2019 23:48:27 +0000 (15:48 -0800)]
Distinguish between Aborted and "not yet compared" files (3)
* Repair visual blemish on icon
GreyMerlin [Fri, 4 Jan 2019 22:54:01 +0000 (14:54 -0800)]
Propagate compare FileIO error status to parent directories (2)
* Allow hard FileIO error (or STOP error) status to be propagated to parent
directories during `Ctrl-F5` (Refresh Selected) operations.
GreyMerlin [Fri, 4 Jan 2019 19:32:02 +0000 (11:32 -0800)]
Fix obscure memory leak
A memory leak can be caused under the following circumstance:
* Compare a directory structure with a number of folders and/or files.
* Select one (or more) items.
* Outside of WinMerge (i.e. without WinMerge's knowledge) delete one (or more) of the files or
folders that is already selected in WinMerge.
* Switch back to WinMerge, and then select "View | Refresh Selected" from menu (or type
`Ctrl-F5`) to rescan only the selected items (note: some of these are now missing files or folders)
WinMerge will correctly detect that the files/folders are missing while rescanning, and will
modify its internal directory structure tree accordingly. HOWEVER - WinMerge will **not**
actually `delete` the disconnected tree item's memory. Thus causing a memory leak. This will be
visible with a Debug build of WinMerge.
The fix is both simple and allows the surrounding code to be cleaned up a little bit.
GreyMerlin [Wed, 2 Jan 2019 21:22:40 +0000 (13:22 -0800)]
Add `NDEBUG` preprocessor for Release builds
* Some debugging code is still enabled without `NDEBUG`, even if `_DEBUG` is not specified. In
particular, the `assert()` macro (note all lower case) remains active.
* The Release builds of the various **Poco** libraries have always been compiled with `NDEBUG`,
likewise for the **UnitTests** project.
GreyMerlin [Fri, 28 Dec 2018 22:40:32 +0000 (14:40 -0800)]
Distinguish between Aborted and "not yet compared" files (2)
* Use a new icon for files "not yet compared". This new icon is `Src/res/fileunknown.ico`.
Derived from existing icon `Src/res/MergeDoc.ico` with an overlayed blue question mark.
GreyMerlin [Fri, 28 Dec 2018 19:34:17 +0000 (11:34 -0800)]
Distinguish between Aborted and "not yet compared" files
* Add new icon resource `IDI_FILE`(equated currently to the existing "res\\MergeDoc.ico" Icon file)
* Use `IDI_FILE` (rather than `ID_ABORT`) for files that have not been compared
* Continue to use `IDI_ABORT` for files whose comparisons are terminated by the "Stop" button.
GreyMerlin [Fri, 28 Dec 2018 01:58:07 +0000 (17:58 -0800)]
Propagate compare FileIO error status to parent directories
* Hard FileIO error status was not being propagated to parent directories, thus showing that the
top-level directories compared as "Same", when in fact there were serious problems deeper in the
folder structure.
* Additionally, if a Folder comparison is aborted with the STOP button, the parent directories are
now marked with an error status to make it easier to visually determine which file comparison(s)
were interrupted.
GreyMerlin [Fri, 28 Dec 2018 01:22:06 +0000 (17:22 -0800)]
Repair Compare Statistics dialogs
* Add proper icon for identical folders
* Account for identical folders in the Folder column
* Properly calculate number of Binary Identical and Binary Different items
GreyMerlin [Sat, 29 Dec 2018 19:58:20 +0000 (11:58 -0800)]
Additional low-level cleanups (5)
* More `if(ptr)` changed to `if(ptr != nullptr)`
* More 'ptr=0` changed to `ptr = nullptr`
* More changing '0' parameters to `nullptr` as appropriate
GreyMerlin [Tue, 25 Dec 2018 02:59:44 +0000 (18:59 -0800)]
Additional low-level cleanups (4)
GreyMerlin [Mon, 24 Dec 2018 23:26:19 +0000 (15:26 -0800)]
Additional low-level cleanups (3)