OSDN Git Service
Taiki Minai [Fri, 7 Feb 2020 07:07:21 +0000 (16:07 +0900)]
Update Configuration.xml
目についた部分だけ変更
Takashi Sawanaka [Sun, 26 Jan 2020 22:33:32 +0000 (07:33 +0900)]
Merge pull request #258 from Mr-Update/patch-8
Update German.po
Takashi Sawanaka [Sun, 26 Jan 2020 22:32:45 +0000 (07:32 +0900)]
Merge pull request #257 from GreyMerlin/master
Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes
Mr-Update [Sun, 26 Jan 2020 21:45:53 +0000 (22:45 +0100)]
Update German.po
Translation completed
Takashi Sawanaka [Sun, 26 Jan 2020 12:28:38 +0000 (21:28 +0900)]
ccrystaleditview.cpp: Fix an issue where "Replace All" would not replace all text
Takashi Sawanaka [Sun, 26 Jan 2020 10:40:00 +0000 (19:40 +0900)]
GhostTextBuffer.cpp: Fix TEST(FileCompare, LastLineEOL) failed.
(Fix broken redoing)
GreyMerlin [Sat, 25 Jan 2020 23:59:56 +0000 (15:59 -0800)]
Prevent silent abort with File Comparison of files whose size is an exact multiple of 2^32 bytes
* File size values that were all zero in the low 32 bits were assumed to be empty,
and thus did not have some critical pointers initialized. This resulted in WinMerge
silently aborting with no message.
* WinMerge will now properly continue, but will likely display an "Out of memory" error
message box.
* I discovered this when attempting to compare two files that are exactly 0x3700000000
(236,223,201,280) bytes long. A pointless exercise of course... Memory eventually fills up
and an "Out of memory" error is displayed. After clicking "OK", WinMerge terminates the
comparison, and returns to the "Select Files or Folders" dialog, but does not actually
release the memory until the program has completely terminated !!
* Folder Comparison with files of this extreme size does not exhibit this problem.
Takashi Sawanaka [Sat, 25 Jan 2020 14:20:26 +0000 (23:20 +0900)]
GhostTextBuffer.cpp: Do not insert EOL after text without EOL if both of the following are true:
-When inserting text without EOL into the ghost line
-If there is no real line after the ghost line
Takashi Sawanaka [Sat, 25 Jan 2020 07:15:27 +0000 (16:15 +0900)]
Update winimerge to 1.0.14.0
Takashi Sawanaka [Sat, 25 Jan 2020 07:14:19 +0000 (16:14 +0900)]
Update .gitignore
Takashi Sawanaka [Sat, 25 Jan 2020 03:50:53 +0000 (12:50 +0900)]
xdiff_genudiff_compat.cpp: Improve the comparison speed when choosing patience or histogram for the diff algorithm and enabling moved block detection
Takashi Sawanaka [Tue, 21 Jan 2020 16:19:29 +0000 (01:19 +0900)]
Restore English.pot
Takashi Sawanaka [Tue, 21 Jan 2020 16:16:37 +0000 (01:16 +0900)]
Restore StringBlacklist.txt
Takashi Sawanaka [Mon, 20 Jan 2020 23:24:20 +0000 (08:24 +0900)]
Oops!
Takashi Sawanaka [Mon, 20 Jan 2020 23:06:12 +0000 (08:06 +0900)]
Implement GitHub #254: It would be nice if touchpad horizontal scroll can work with Winmerge
Takashi Sawanaka [Sun, 19 Jan 2020 16:07:00 +0000 (01:07 +0900)]
Fix GitHub issue #252: Crash when generating patch for multiple files and a file only on one side (2)
Takashi Sawanaka [Sun, 19 Jan 2020 13:09:26 +0000 (22:09 +0900)]
Update copyright year to 2020
Takashi Sawanaka [Sun, 19 Jan 2020 12:47:58 +0000 (21:47 +0900)]
Fix osdn issue #39924: An error message is shown when pressing Enter key in Diff pane
Takashi Sawanaka [Sun, 19 Jan 2020 12:43:27 +0000 (21:43 +0900)]
Add support for PDF, SVG, WMF and EMF flie format
Takashi Sawanaka [Sat, 11 Jan 2020 07:20:42 +0000 (16:20 +0900)]
Fix GitHub issue #252: Crash when generating patch for multiple files and a file only on one side
Takashi Sawanaka [Wed, 8 Jan 2020 15:44:45 +0000 (00:44 +0900)]
Merge pull request #251 from louistio/fix-french-compare-non-horizontal
Fix french translations for non-horizontal compare
Adam Gauthier [Wed, 8 Jan 2020 02:57:49 +0000 (21:57 -0500)]
Fix french translations for non-horizontal compare
- Remove extra spaces around ampersand character
- Prefer "comparer" to "comparaison" for compare action
- Add translation for msgid "Compare Non-hor&izontally..."
Takashi Sawanaka [Sun, 5 Jan 2020 04:40:58 +0000 (13:40 +0900)]
Merge.cpp: Allow path starting '\' without drive name in the project file
Takashi Sawanaka [Sun, 5 Jan 2020 01:44:57 +0000 (10:44 +0900)]
Make it possible to select whether to close the main window (if no chlid window) or only the child window when pressing the ESC key
Takashi Sawanaka [Fri, 3 Jan 2020 01:41:56 +0000 (10:41 +0900)]
Fix broken build (2)
Takashi Sawanaka [Fri, 3 Jan 2020 01:33:23 +0000 (10:33 +0900)]
Fix broken build
Takashi Sawanaka [Fri, 3 Jan 2020 00:53:39 +0000 (09:53 +0900)]
Merge pull request #247 from mesajflaviu/new_branch
New branch
Takashi Sawanaka [Fri, 3 Jan 2020 00:53:17 +0000 (09:53 +0900)]
Merge pull request #246 from csware/spelling-of-git
Fix spelling of Git
Flaviu [Thu, 2 Jan 2020 18:08:04 +0000 (20:08 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:53 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:34 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:22 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:07:16 +0000 (20:07 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:58 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:45 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:33 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:19 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:06:16 +0000 (20:06 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:55 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:38 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:22 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 18:05:06 +0000 (20:05 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 17:41:28 +0000 (19:41 +0200)]
modifications
Flaviu [Thu, 2 Jan 2020 17:41:15 +0000 (19:41 +0200)]
modifications
Sven Strickroth [Thu, 2 Jan 2020 14:53:44 +0000 (15:53 +0100)]
Fix spelling of Git
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Takashi Sawanaka [Tue, 31 Dec 2019 05:57:27 +0000 (14:57 +0900)]
PATCH: [ 3038 ] Arabic translation (4)
Takashi Sawanaka [Tue, 31 Dec 2019 05:03:55 +0000 (14:03 +0900)]
PATCH: [ 3038 ] Arabic translation (3)
Takashi Sawanaka [Tue, 31 Dec 2019 04:16:48 +0000 (13:16 +0900)]
PATCH: [ 3038 ] Arabic translation (2)
Takashi Sawanaka [Tue, 31 Dec 2019 04:07:24 +0000 (13:07 +0900)]
PATCH: [ 3038 ] Arabic translation
Takashi Sawanaka [Sun, 29 Dec 2019 10:51:25 +0000 (19:51 +0900)]
GUITestUtils.cpp: do not test all languages when command line arguments are empty
Takashi Sawanaka [Sun, 29 Dec 2019 10:47:21 +0000 (19:47 +0900)]
Fix typo
Takashi Sawanaka [Sun, 29 Dec 2019 10:35:31 +0000 (19:35 +0900)]
Make UI look flatter (5)
Takashi Sawanaka [Sun, 29 Dec 2019 07:16:29 +0000 (16:16 +0900)]
Merge pull request #244 from datadiode/ghosttextbuffer-empty-line-between-ghost-lines-comes-back-after-deletion
GhostTextBuffer: Don't unexpectedly bring back empty lines user wants…
Takashi Sawanaka [Sun, 29 Dec 2019 05:26:19 +0000 (14:26 +0900)]
Fix issue osdn#39851: Non-moved lines are treated as moved lines
Takashi Sawanaka [Sun, 29 Dec 2019 02:23:18 +0000 (11:23 +0900)]
Merge pull request #245 from Mr-Update/patch-7
Update German.po
Mr-Update [Sat, 28 Dec 2019 22:02:17 +0000 (23:02 +0100)]
Update German.po
Double hotkeys in all menus, context menus and options corrected
datadiode [Sat, 28 Dec 2019 09:02:11 +0000 (10:02 +0100)]
GhostTextBuffer: Don't unexpectedly bring back empty lines user wants to delete
Happens with empty lines enclosed between ghost lines.
Besides, this change seems to also save some extra messing to prevent lines from accidentally losing an EOL.
Takashi Sawanaka [Sat, 28 Dec 2019 02:44:25 +0000 (11:44 +0900)]
Merge pull request #242 from datadiode/foldercmp-reduce-code-duplication
Consolidate FolderCmp (5)
datadiode [Fri, 27 Dec 2019 18:04:58 +0000 (19:04 +0100)]
Consolidate FolderCmp (5)
Reduce code duplication.
Don't repeat initialization steps which are (supposedly) meant to be one-time.
Takashi Sawanaka [Thu, 26 Dec 2019 22:45:20 +0000 (07:45 +0900)]
Merge pull request #240 from datadiode/master
Consolidate FolderCmp (4)
datadiode [Thu, 26 Dec 2019 10:24:14 +0000 (11:24 +0100)]
Consolidate FolderCmp (4)
Remove some obsolete error handling for legacy non-standard operator new.
datadiode [Thu, 26 Dec 2019 09:27:43 +0000 (10:27 +0100)]
CMDIClient: Intercepting WM_MDINEXT seems unnecessary and causes an extra redraw
Takashi Sawanaka [Mon, 23 Dec 2019 22:54:40 +0000 (07:54 +0900)]
Update Contributors.txt
Takashi Sawanaka [Mon, 23 Dec 2019 22:54:17 +0000 (07:54 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Mon, 23 Dec 2019 22:48:58 +0000 (07:48 +0900)]
Merge pull request #239 from Mr-Update/patch-6
Update German.po
Mr-Update [Mon, 23 Dec 2019 22:03:11 +0000 (23:03 +0100)]
Update German.po
German translation completed
Takashi Sawanaka [Sun, 22 Dec 2019 10:38:29 +0000 (19:38 +0900)]
Make UI look flatter (4)
Takashi Sawanaka [Sun, 22 Dec 2019 05:34:12 +0000 (14:34 +0900)]
crystaledit: use U+21b2(Downwards Arrow with Tip Leftwards) as CRLF when the rendering mode is not GDI
Takashi Sawanaka [Sun, 22 Dec 2019 04:05:57 +0000 (13:05 +0900)]
Cppcheck: Member variable 'CGhostTextView::...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 22 Dec 2019 02:56:41 +0000 (11:56 +0900)]
Cppcheck: Class 'Heksedit' does not have a copy constructor which is recommended since it has dynamic memory/resource allocation(s).
Cppcheck: Class 'Heksedit' does not have a operator= which is recommended since it has dynamic memory/resource allocation(s).
Cppcheck: Class 'Heksedit' does not have a destructor which is recommended since it has dynamic memory/resource allocation(s).
Takashi Sawanaka [Sun, 22 Dec 2019 02:45:58 +0000 (11:45 +0900)]
Cppcheck: Member variable 'COpenDoc::m_infoHandler' is not initialized in the constructor.
Takashi Sawanaka [Sun, 22 Dec 2019 02:20:09 +0000 (11:20 +0900)]
Cppcheck: %d in format string (no. 1) requires 'int' but the argument type is 'UINT {aka unsigned int}'.
Takashi Sawanaka [Sun, 22 Dec 2019 01:58:14 +0000 (10:58 +0900)]
Cppcheck: Variable '...' is assigned in constructor body. Consider performing initialization in initialization list
Takashi Sawanaka [Sun, 22 Dec 2019 01:15:23 +0000 (10:15 +0900)]
Warning C26495 Variable '...' is uninitialized. Always initialize a member variable (type.6).
Takashi Sawanaka [Sun, 22 Dec 2019 00:34:03 +0000 (09:34 +0900)]
Update boost to 1.72.0
Takashi Sawanaka [Sat, 21 Dec 2019 22:10:32 +0000 (07:10 +0900)]
Update .gitignore
Takashi Sawanaka [Sat, 21 Dec 2019 22:07:36 +0000 (07:07 +0900)]
Fix issue where active pane is not restored correctly (2)
Takashi Sawanaka [Sat, 21 Dec 2019 13:33:16 +0000 (22:33 +0900)]
Fix issue where active pane is not restored correctly
Takashi Sawanaka [Sat, 21 Dec 2019 12:31:35 +0000 (21:31 +0900)]
MergeEditFrm.cpp: Fix crash when closing the File Compare Window under the following conditions:
- View -> Split Vertically menu item is unchecked
- The second pane is focused
Takashi Sawanaka [Sat, 21 Dec 2019 06:56:44 +0000 (15:56 +0900)]
Make UI look flatter (3)
Takashi Sawanaka [Sat, 21 Dec 2019 06:44:36 +0000 (15:44 +0900)]
ccrystalrendererdirectwrite.cpp: tweak
Takashi Sawanaka [Sat, 21 Dec 2019 03:46:56 +0000 (12:46 +0900)]
Make UI look flatter (2)
Takashi Sawanaka [Sun, 15 Dec 2019 05:43:14 +0000 (14:43 +0900)]
Make UI look more flat
Takashi Sawanaka [Sat, 14 Dec 2019 08:55:33 +0000 (17:55 +0900)]
Merge.cpp: CMergeApp::GetProfile*():
Call COptionsMgr::AddOption () instead of CRegOptionsMgr::InitOption() to avoid writing to the registry
Takashi Sawanaka [Thu, 12 Dec 2019 22:40:43 +0000 (07:40 +0900)]
Merge pull request #236 from StoyanDimitrov/master
Update Bulgarian translation
Стоян Димитров [Thu, 12 Dec 2019 12:12:48 +0000 (14:12 +0200)]
Misc translations
Стоян Димитров [Thu, 12 Dec 2019 10:28:18 +0000 (12:28 +0200)]
Fix wrong translation.
Стоян Димитров [Thu, 12 Dec 2019 08:35:22 +0000 (10:35 +0200)]
Update Bulgarian translation
Takashi Sawanaka [Wed, 11 Dec 2019 21:46:52 +0000 (06:46 +0900)]
Merge pull request #234 from Lippe35/master
Add Portuguese Portugal
Lippe35 [Wed, 11 Dec 2019 00:48:07 +0000 (00:48 +0000)]
Add Portuguese Portugal
Takashi Sawanaka [Tue, 10 Dec 2019 21:49:50 +0000 (06:49 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Tue, 10 Dec 2019 21:49:26 +0000 (06:49 +0900)]
Merge pull request #233 from Tichij/master
Update of Lithuanian translation
Takashi Sawanaka [Tue, 10 Dec 2019 21:45:28 +0000 (06:45 +0900)]
Add resource strings
Takashi Sawanaka [Tue, 10 Dec 2019 21:41:05 +0000 (06:41 +0900)]
Fix an issue where the operation of changing the selection on a line with differences is significantly slow (2)
Tichij [Tue, 10 Dec 2019 14:10:32 +0000 (16:10 +0200)]
Update of Lithuanian translation
Takashi Sawanaka [Mon, 9 Dec 2019 13:52:47 +0000 (22:52 +0900)]
Update release notes and changelog for 2.16.5 (2)
Takashi Sawanaka [Sun, 8 Dec 2019 07:56:54 +0000 (16:56 +0900)]
DirView: Fix a crash when clicking Next Difference button after unchecking Show Different Items menu item
Takashi Sawanaka [Sun, 8 Dec 2019 07:41:49 +0000 (16:41 +0900)]
Fix an issue where the operation of changing the selection on a line with differences is significantly slow
Takashi Sawanaka [Sun, 8 Dec 2019 03:09:05 +0000 (12:09 +0900)]
PropEditor.cpp: Since WinMerge of 32bit version does not use DirectWrite, disable the Rendering mode combo box.
Takashi Sawanaka [Sat, 7 Dec 2019 09:26:14 +0000 (18:26 +0900)]
ccrystaltextview.*, ccrystaleditview.*: small optimization