OSDN Git Service

winmerge-jp/winmerge-jp.git
14 months agoFix EOL character not displayed on ARM64 version
Takashi Sawanaka [Mon, 27 Mar 2023 14:08:04 +0000 (23:08 +0900)]
Fix EOL character not displayed on ARM64 version

14 months agorefactor
Takashi Sawanaka [Sun, 26 Mar 2023 04:56:25 +0000 (13:56 +0900)]
refactor

14 months agoModify the "Go to" dialog. (#1779)
Jun Tajima [Sun, 26 Mar 2023 04:53:33 +0000 (13:53 +0900)]
Modify the "Go to" dialog. (#1779)

- Disable the "Middle" radio button when doing 2-way file comparisons.

14 months agoReduce Win32API type usage in code
Takashi Sawanaka [Sun, 26 Mar 2023 01:30:18 +0000 (10:30 +0900)]
Reduce Win32API type usage in code

14 months agoFix the issue where XML format files, such as vcxproj, are not being syntax highlighted
Takashi Sawanaka [Sun, 26 Mar 2023 00:28:07 +0000 (09:28 +0900)]
Fix the issue where XML format files, such as vcxproj, are not being syntax highlighted

14 months agoUse String instead of CString
Takashi Sawanaka [Sat, 25 Mar 2023 23:53:10 +0000 (08:53 +0900)]
Use String instead of CString

14 months agoSeparate plugin-related strings from Merge.rc into Strings.rc to reduce executable...
Takashi Sawanaka [Fri, 24 Mar 2023 14:49:55 +0000 (23:49 +0900)]
Separate plugin-related strings from Merge.rc into Strings.rc to reduce executable size.

14 months agorefactor
Takashi Sawanaka [Fri, 24 Mar 2023 13:55:23 +0000 (22:55 +0900)]
refactor

14 months agorefactor
Takashi Sawanaka [Thu, 23 Mar 2023 15:42:17 +0000 (00:42 +0900)]
refactor

14 months agocrystaledit: Change Output Directory and Intermediate Directory
Takashi Sawanaka [Wed, 22 Mar 2023 14:39:12 +0000 (23:39 +0900)]
crystaledit: Change Output Directory and Intermediate Directory

14 months agoUpdate Korean.isl (#1774) (2)
Takashi Sawanaka [Tue, 21 Mar 2023 13:52:05 +0000 (22:52 +0900)]
Update Korean.isl (#1774) (2)
Change the file encoding from UTF-8 to CP-949

14 months agoUpdate Korean.isl (#1774)
VenusGirl❤ [Tue, 21 Mar 2023 13:49:20 +0000 (22:49 +0900)]
Update Korean.isl (#1774)

14 months ago"&Include Subfolders" -> "&Include subfolders"
Takashi Sawanaka [Tue, 21 Mar 2023 13:08:22 +0000 (22:08 +0900)]
"&Include Subfolders" -> "&Include subfolders"

14 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 21 Mar 2023 12:30:41 +0000 (21:30 +0900)]
Update TranslationsStatus

14 months agoFix broken shell integration category page in Options dialog
Takashi Sawanaka [Tue, 21 Mar 2023 12:18:42 +0000 (21:18 +0900)]
Fix broken shell integration category page in Options dialog

14 months agoUpdate Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Tue, 21 Mar 2023 11:06:29 +0000 (20:06 +0900)]
Update Slovenian.po. Submitted by JadranR

14 months agoFix build errors in VS2017
Takashi Sawanaka [Mon, 20 Mar 2023 16:36:43 +0000 (01:36 +0900)]
Fix build errors in VS2017

14 months agoBump revision to 2.16.29
Takashi Sawanaka [Mon, 20 Mar 2023 15:06:40 +0000 (00:06 +0900)]
Bump revision to 2.16.29

14 months agoUpdate ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Mon, 20 Mar 2023 15:06:26 +0000 (00:06 +0900)]
Update ChangeLog&ReleaseNotes (3)

14 months agoFix problems with non-default Diff algorithm:
Takashi Sawanaka [Mon, 20 Mar 2023 14:58:39 +0000 (23:58 +0900)]
Fix problems with non-default Diff algorithm:
- Even though the Ignore carriage return differences option was disabled, EOL differences were ignored when the option to ignore whitespace differences was enabled.
- Differences between CR and CR+LF were not ignored even though Ignore carriage return differences option was enabled.

14 months agoHexMergeView.cpp: Fix an issue where an infinite loop occurred when the file size...
Takashi Sawanaka [Mon, 20 Mar 2023 06:12:45 +0000 (15:12 +0900)]
HexMergeView.cpp: Fix an issue where an infinite loop occurred when the file size was truncated during file loading.

14 months agoFix Test.cpp
Takashi Sawanaka [Sun, 19 Mar 2023 13:15:18 +0000 (22:15 +0900)]
Fix Test.cpp

14 months agoAllow the CSV file separator to be a semicolon or another character instead of a...
Takashi Sawanaka [Sun, 19 Mar 2023 12:05:42 +0000 (21:05 +0900)]
Allow the CSV file separator to be a semicolon or another character instead of a fixed comma.

14 months agoFix not working correctly when unchecking Regular expression and checking Match whole...
Takashi Sawanaka [Sun, 19 Mar 2023 01:19:42 +0000 (10:19 +0900)]
Fix not working correctly when unchecking Regular expression and checking Match whole word only on Substitution filters page.

14 months agoUpdate ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Sat, 18 Mar 2023 14:05:42 +0000 (23:05 +0900)]
Update ChangeLog&ReleaseNotes (2)

14 months agoAdd MATLAB syntax highlighting. (#1766) (2)
Takashi Sawanaka [Sat, 18 Mar 2023 14:04:11 +0000 (23:04 +0900)]
Add MATLAB syntax highlighting. (#1766) (2)

14 months agoAdd MATLAB syntax highlighting. (#1766)
wiera987 [Sat, 18 Mar 2023 13:59:29 +0000 (22:59 +0900)]
Add MATLAB syntax highlighting. (#1766)

* Add MATLAB syntax highlighting.

* Add MATLAB syntax highlighting.

14 months agoUpdate TranslationsStatus
Takashi Sawanaka [Sat, 18 Mar 2023 05:28:07 +0000 (14:28 +0900)]
Update TranslationsStatus

14 months agoUpdate ChangeLog&ReleaseNotes
Takashi Sawanaka [Sat, 18 Mar 2023 05:25:59 +0000 (14:25 +0900)]
Update ChangeLog&ReleaseNotes

14 months agoupdate zh-cn translation (#1765)
YIN, Gang [Sat, 18 Mar 2023 01:21:46 +0000 (09:21 +0800)]
update zh-cn translation (#1765)

14 months agoUpdate Polish.po (#1764)
Mirosław Żylewicz [Sat, 18 Mar 2023 01:20:51 +0000 (02:20 +0100)]
Update Polish.po (#1764)

14 months agoUpdate Polish.po (#1763)
Mirosław Żylewicz [Sat, 18 Mar 2023 01:19:04 +0000 (02:19 +0100)]
Update Polish.po (#1763)

15 months agoMove Windows dependent code from ClipBoard.h to Clipboard.cpp
Takashi Sawanaka [Fri, 17 Mar 2023 14:45:44 +0000 (23:45 +0900)]
Move Windows dependent code from ClipBoard.h to Clipboard.cpp

15 months agorefactor
Takashi Sawanaka [Fri, 17 Mar 2023 00:17:10 +0000 (09:17 +0900)]
refactor

15 months agoDelete copy constructor and copy assignment operator
Takashi Sawanaka [Thu, 16 Mar 2023 23:26:12 +0000 (08:26 +0900)]
Delete copy constructor and copy assignment operator

15 months agoRemove unused declarations
Takashi Sawanaka [Thu, 16 Mar 2023 14:28:14 +0000 (23:28 +0900)]
Remove unused declarations

15 months agoRename files.h to FileLoadResult.h
Takashi Sawanaka [Thu, 16 Mar 2023 13:57:56 +0000 (22:57 +0900)]
Rename files.h to FileLoadResult.h

15 months agorefactor
Takashi Sawanaka [Thu, 16 Mar 2023 13:49:32 +0000 (22:49 +0900)]
refactor

15 months agorefactor
Takashi Sawanaka [Thu, 16 Mar 2023 13:04:05 +0000 (22:04 +0900)]
refactor

15 months agoIntroduce fileopenflags_t type
Takashi Sawanaka [Thu, 16 Mar 2023 12:33:15 +0000 (21:33 +0900)]
Introduce fileopenflags_t type

15 months agoBOOL -> bool
Takashi Sawanaka [Thu, 16 Mar 2023 11:47:37 +0000 (20:47 +0900)]
BOOL -> bool

15 months agoFix issue #1735: Pressing F2 or Rename should not select file extension
Takashi Sawanaka [Wed, 15 Mar 2023 13:40:48 +0000 (22:40 +0900)]
Fix issue #1735: Pressing F2 or Rename should not select file extension

15 months agoSlightly improve comparison time for large files
Takashi Sawanaka [Wed, 15 Mar 2023 13:05:04 +0000 (22:05 +0900)]
Slightly improve comparison time for large files

15 months agoUse std::basic_string instead of CString
Takashi Sawanaka [Tue, 14 Mar 2023 13:58:39 +0000 (22:58 +0900)]
Use std::basic_string instead of CString

15 months agorefator & add LineInfoTests.cpp (5)
Takashi Sawanaka [Tue, 14 Mar 2023 11:58:47 +0000 (20:58 +0900)]
refator & add LineInfoTests.cpp (5)

15 months agoReduce dependency on MFC
Takashi Sawanaka [Tue, 14 Mar 2023 00:06:49 +0000 (09:06 +0900)]
Reduce dependency on MFC

15 months agoUpdate Hungarian.po (#1758) (2)
Takashi Sawanaka [Mon, 13 Mar 2023 23:03:09 +0000 (08:03 +0900)]
Update Hungarian.po (#1758) (2)

15 months agoUpdate Hungarian.po (#1758)
efi99 [Mon, 13 Mar 2023 22:58:27 +0000 (23:58 +0100)]
Update Hungarian.po (#1758)

15 months agoCCrystalTextBuffer: Do not inherit from CCmdTarget class
Takashi Sawanaka [Mon, 13 Mar 2023 13:36:59 +0000 (22:36 +0900)]
CCrystalTextBuffer: Do not inherit from CCmdTarget class

15 months agoUpdate Dutch.po (#1757) (2)
Takashi Sawanaka [Mon, 13 Mar 2023 13:35:25 +0000 (22:35 +0900)]
Update Dutch.po (#1757) (2)

15 months agoUpdate Dutch.po (#1757)
Thomas De Rocker [Mon, 13 Mar 2023 13:31:57 +0000 (14:31 +0100)]
Update Dutch.po (#1757)

15 months agoUpdate Brazilian.po (#1756)
Marcellomco [Mon, 13 Mar 2023 13:16:35 +0000 (10:16 -0300)]
Update Brazilian.po (#1756)

Update Brazilian Portuguese translation

15 months agocrystaledit: Remove unused functions
Takashi Sawanaka [Mon, 13 Mar 2023 12:28:48 +0000 (21:28 +0900)]
crystaledit: Remove unused functions

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Mon, 13 Mar 2023 11:59:33 +0000 (20:59 +0900)]
Update TranslationsStatus

15 months agoUse std::list instead of CList
Takashi Sawanaka [Mon, 13 Mar 2023 11:57:29 +0000 (20:57 +0900)]
Use std::list instead of CList

15 months agoUpdate of Lithuanian translation (#1755)
Tichij [Mon, 13 Mar 2023 11:55:07 +0000 (13:55 +0200)]
Update of Lithuanian translation (#1755)

15 months agoUpdate German.po (#1754)
Mr-Update [Sun, 12 Mar 2023 23:37:16 +0000 (00:37 +0100)]
Update German.po (#1754)

15 months agoUpdate Corsican translation for 2.16.29 (#1752)
Patriccollu [Sun, 12 Mar 2023 23:36:16 +0000 (00:36 +0100)]
Update Corsican translation for 2.16.29 (#1752)

* Update Corsican translation for 2.16.29

* Update Corsican ShellExtension for 2.16.29

15 months agorefator & add LineInfoTests.cpp (4)
Takashi Sawanaka [Sun, 12 Mar 2023 11:28:22 +0000 (20:28 +0900)]
refator & add LineInfoTests.cpp (4)

15 months agoFix invalid msgstr in (Russian.po) (#1751)
giga dev [Sun, 12 Mar 2023 11:20:27 +0000 (14:20 +0300)]
Fix invalid msgstr in (Russian.po) (#1751)

Fix invalid msgstr for Don't ask question (Russian.po)

15 months agoAdd IgnoreLeadingLineNumbers.sct plugin to 64-bit version installers
Takashi Sawanaka [Sun, 12 Mar 2023 11:14:05 +0000 (20:14 +0900)]
Add IgnoreLeadingLineNumbers.sct plugin to 64-bit version installers

15 months agoFix osdn.net ticket #47553: Allow text to wrap in the Table Compare Window and unwrap...
Takashi Sawanaka [Sun, 12 Mar 2023 10:39:38 +0000 (19:39 +0900)]
Fix osdn.net ticket #47553: Allow text to wrap in the Table Compare Window and unwrap lines in the Text Compare Window

15 months agorefator & add LineInfoTests.cpp (3)
Takashi Sawanaka [Sun, 12 Mar 2023 00:31:09 +0000 (09:31 +0900)]
refator & add LineInfoTests.cpp (3)

15 months agorefator & add LineInfoTests.cpp (2)
Takashi Sawanaka [Sun, 12 Mar 2023 00:26:41 +0000 (09:26 +0900)]
refator & add LineInfoTests.cpp (2)

15 months agorefator & add LineInfoTests.cpp
Takashi Sawanaka [Sun, 12 Mar 2023 00:16:14 +0000 (09:16 +0900)]
refator & add LineInfoTests.cpp

15 months agoAdd CEColor class
Takashi Sawanaka [Sat, 11 Mar 2023 05:47:39 +0000 (14:47 +0900)]
Add CEColor class

15 months agoAdd SPDX-License-Identifier
Takashi Sawanaka [Sat, 11 Mar 2023 03:39:34 +0000 (12:39 +0900)]
Add SPDX-License-Identifier

15 months agoUse the CEPoint type instead of the CPoint type for variables that represent characte...
Takashi Sawanaka [Fri, 10 Mar 2023 13:58:10 +0000 (22:58 +0900)]
Use the CEPoint type instead of the CPoint type for variables that represent character positions.

15 months agoAdd undoRecordTests.cpp
Takashi Sawanaka [Thu, 9 Mar 2023 14:19:21 +0000 (23:19 +0900)]
Add undoRecordTests.cpp

15 months agoChange #include order
Takashi Sawanaka [Thu, 9 Mar 2023 14:18:48 +0000 (23:18 +0900)]
Change #include order

15 months agoFix issue #1747: After I collapse a folder, the arrow next to it stays turned down
Takashi Sawanaka [Thu, 9 Mar 2023 12:43:41 +0000 (21:43 +0900)]
Fix issue  #1747: After I collapse a folder, the arrow next to it stays turned down

15 months agoupdate crystaledit/test
Takashi Sawanaka [Wed, 8 Mar 2023 14:59:04 +0000 (23:59 +0900)]
update crystaledit/test

15 months agoupdate crystaledit/test
Takashi Sawanaka [Wed, 8 Mar 2023 14:18:56 +0000 (23:18 +0900)]
update crystaledit/test

15 months agocrystaledit/Sample: Add keyboard shortcuts
Takashi Sawanaka [Wed, 8 Mar 2023 14:01:43 +0000 (23:01 +0900)]
crystaledit/Sample: Add keyboard shortcuts

15 months agoFix crash that occurs when /t is specified as a command line option and only one...
Takashi Sawanaka [Tue, 7 Mar 2023 15:53:04 +0000 (00:53 +0900)]
Fix crash that occurs when /t is specified as a command line option and only one path is specified.

15 months agoReplac CArray with std::vector
Takashi Sawanaka [Tue, 7 Mar 2023 13:37:16 +0000 (22:37 +0900)]
Replac CArray with std::vector

15 months agoReduce tchar.h depencencies
Takashi Sawanaka [Sun, 5 Mar 2023 14:29:26 +0000 (23:29 +0900)]
Reduce tchar.h depencencies

(cherry picked from commit 318d992ee319a5347db6874f437ea75bd35b3b16)

15 months agorefactor
Takashi Sawanaka [Sat, 4 Mar 2023 14:41:27 +0000 (23:41 +0900)]
refactor

15 months agorefactor
Takashi Sawanaka [Sat, 4 Mar 2023 05:19:51 +0000 (14:19 +0900)]
refactor

15 months agoFix crash when comparing Alternate Data Streams like file.zip:Zone.Identifier:$DATA...
Takashi Sawanaka [Sat, 4 Mar 2023 00:26:34 +0000 (09:26 +0900)]
Fix crash when comparing Alternate Data Streams like file.zip:Zone.Identifier:$DATA with /self-compare command line option.

15 months agoFix issue #1740: Failure to indent lines properly
Takashi Sawanaka [Sat, 4 Mar 2023 00:16:39 +0000 (09:16 +0900)]
Fix issue #1740: Failure to indent lines properly

15 months agoUpdate Portuguese translations (#1737)
Hugo Carvalho [Tue, 28 Feb 2023 15:20:24 +0000 (15:20 +0000)]
Update Portuguese translations (#1737)

* Update Portuguese.isl

* Update Portuguese.isl

Corrections

* Update Portuguese translation

* Update Portuguese translation

15 months agoDisable output of assembly code to reduce build time.
Takashi Sawanaka [Mon, 27 Feb 2023 11:50:39 +0000 (20:50 +0900)]
Disable output of assembly code to reduce build time.

15 months agoUpdate ShellExtension to 1.18.7.0
Takashi Sawanaka [Mon, 27 Feb 2023 11:43:43 +0000 (20:43 +0900)]
Update ShellExtension to 1.18.7.0

15 months agoFix issue #1661: Context menu does nothing after pushing "Compare..." on the second...
Takashi Sawanaka [Mon, 27 Feb 2023 00:11:30 +0000 (09:11 +0900)]
Fix issue #1661: Context menu does nothing after pushing "Compare..." on the second file
(https://stackoverflow.com/questions/74226129/why-is-iexplorercommandinvoke-no-longer-being-called)

15 months agoRemove the ability to import line filters for versions prior to version 2.6.x
Takashi Sawanaka [Sun, 26 Feb 2023 05:08:06 +0000 (14:08 +0900)]
Remove the ability to import line filters for versions prior to version 2.6.x

15 months agoUpdate Japanese.isl
Takashi Sawanaka [Fri, 24 Feb 2023 23:45:14 +0000 (08:45 +0900)]
Update Japanese.isl

15 months agoShellExtension (2):
Takashi Sawanaka [Thu, 23 Feb 2023 06:57:02 +0000 (15:57 +0900)]
ShellExtension (2):
- Add Compare As menu item
- Change the &WinMerge menu item to Win&Merge to avoid conflicting with Explorer's Ne&w menu item accelerator key

15 months agoRename *_to_*.bmp to copy_*_to_*.bmp
Takashi Sawanaka [Thu, 23 Feb 2023 04:56:08 +0000 (13:56 +0900)]
Rename *_to_*.bmp to copy_*_to_*.bmp

15 months agoAdd res\move_*_to_*.bmp to Merge.vcxproj
Takashi Sawanaka [Thu, 23 Feb 2023 04:25:43 +0000 (13:25 +0900)]
Add res\move_*_to_*.bmp to Merge.vcxproj

15 months agoUpdate .github/workflows/*.yml (4)
Takashi Sawanaka [Thu, 23 Feb 2023 02:51:18 +0000 (11:51 +0900)]
Update .github/workflows/*.yml (4)

15 months agoUpdate .github/workflows/*.yml (3)
Takashi Sawanaka [Thu, 23 Feb 2023 02:30:22 +0000 (11:30 +0900)]
Update .github/workflows/*.yml (3)

15 months agoUpdate .github/workflows/*.yml (2)
Takashi Sawanaka [Thu, 23 Feb 2023 02:21:35 +0000 (11:21 +0900)]
Update .github/workflows/*.yml (2)

15 months agoUpdate .github/workflows/*.yml
Takashi Sawanaka [Thu, 23 Feb 2023 02:09:21 +0000 (11:09 +0900)]
Update .github/workflows/*.yml

15 months agoImplement issue #1413: "Move" needs options "Left to Right" or "Right… (#1732)
Takashi Sawanaka [Thu, 23 Feb 2023 01:07:12 +0000 (10:07 +0900)]
Implement issue #1413: "Move" needs options "Left to Right" or "Right… (#1732)

15 months agoUpdate TranslationsStatus
Takashi Sawanaka [Tue, 21 Feb 2023 13:42:35 +0000 (22:42 +0900)]
Update TranslationsStatus

(cherry picked from commit ff528c9f9ac55bb754acaf4ce7c0b5cc75a9f635)

15 months agoDirActions.cpp: Fix Left/Right Date and Left/Right Size columns not updating when...
Takashi Sawanaka [Tue, 21 Feb 2023 13:23:29 +0000 (22:23 +0900)]
DirActions.cpp: Fix Left/Right Date and Left/Right Size columns not updating when deleting files one-sided

15 months agoAdd -show-dialog and -show-compare-as-menu command line options (5)
Takashi Sawanaka [Tue, 21 Feb 2023 13:06:38 +0000 (22:06 +0900)]
Add -show-dialog and -show-compare-as-menu command line options (5)

15 months agoBCMenu.cpp: Show "Debug Assertion Failed" message box when the debug version fails...
Takashi Sawanaka [Tue, 21 Feb 2023 12:10:19 +0000 (21:10 +0900)]
BCMenu.cpp: Show "Debug Assertion Failed" message box when the debug version fails to load an image.
(Bitmap images saved with GIMP fail to load)

15 months agoupdate zh-cn translations (#1731)
YIN, Gang [Tue, 21 Feb 2023 11:41:40 +0000 (19:41 +0800)]
update zh-cn translations (#1731)