OSDN Git Service
Takashi Sawanaka [Sun, 3 Jul 2022 13:15:08 +0000 (22:15 +0900)]
Update Contributors.txt
Jun Tajima [Sun, 3 Jul 2022 13:04:23 +0000 (22:04 +0900)]
Fix the problem that the comparison result is not displayed correctly when renaming a file (directory) that exists on only one side to a name where the file (directory) with the same name exists. (#1392)
- Rescan the renamed item if the side flag changes due to renaming.
- Delete the item with the same file name as after renaming.
Mauricio Gracia Gutierrez [Sun, 3 Jul 2022 13:03:28 +0000 (08:03 -0500)]
Keep hidden items (#1377)
* When items are hidden add them to a DiffContext list
* no need to keep m_nHiddenItems since we now have a list of the currently hidden items.
* remove two introduced warnings
* .winmerge stores a list of hidden items
* hidde-item in singular (not plural)
* saveHiddenItems inside <path> node
* Fixing indentation to use Eric Allman style
* load the hiddenItems from the .winmerge project file + keep an use the token
* load hidden-items from .winmerge and hidding some test items
* https://github.com/WinMerge/winmerge/pull/1377#issuecomment-
1164375545
* Add "Hidden Items" to the project options
* Update ChangeLog.md
* revert ChangeLog.md and README.md, applying requested changes
* rever ChangeLog.md empty space
* https://github.com/WinMerge/winmerge/pull/1377#discussion_r912328299
* update ChangeLog.md
Co-authored-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Takashi Sawanaka [Sat, 2 Jul 2022 15:30:31 +0000 (00:30 +0900)]
Fix issue #1387: replace text using regular expressions behaves inco… (#1388)
stonee-K [Fri, 1 Jul 2022 14:20:27 +0000 (23:20 +0900)]
Make wsc files available as plug-in (#1390)
Takashi Sawanaka [Mon, 27 Jun 2022 11:56:24 +0000 (20:56 +0900)]
Fix issue #1380: “Match case” in Search always enabled
Takashi Sawanaka [Sat, 25 Jun 2022 00:55:41 +0000 (09:55 +0900)]
Update 7-Zip to 22.00 (2)
Takashi Sawanaka [Sat, 25 Jun 2022 00:23:13 +0000 (09:23 +0900)]
Update 7-Zip to 22.00
Ikko Ashimine [Thu, 23 Jun 2022 23:04:49 +0000 (08:04 +0900)]
Fix typo in SuperComboBox.cpp (#1379)
alway -> always
Takashi Sawanaka [Tue, 21 Jun 2022 13:19:01 +0000 (22:19 +0900)]
Disable the Replace button if text is selected, as it cannot solve the strange behavior such as crashes when the Replace button is pressed while text is selected.
Takashi Sawanaka [Tue, 21 Jun 2022 13:16:51 +0000 (22:16 +0900)]
Fix issue #1376: "Replace All" doesn't work when Replace in "Selection" and the new string contains the old string.
StoyanDimitrov [Mon, 20 Jun 2022 22:20:55 +0000 (22:20 +0000)]
Update Bulgarian.po (#1375)
stonee-K [Mon, 20 Jun 2022 13:38:51 +0000 (22:38 +0900)]
* Disable Shift + Numeric Key (#1374)
* Enable CTRL-X, CTRL-C, CTRL-V, CTRL-Z
* Allow pasting when the clipboard string is numeric
Takashi Sawanaka [Sun, 19 Jun 2022 12:14:48 +0000 (21:14 +0900)]
Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (2)
Takashi Sawanaka [Sun, 19 Jun 2022 12:14:05 +0000 (21:14 +0900)]
Update ChangeLog&ReleaseNotes (2)
Jun Tajima [Sun, 19 Jun 2022 12:07:47 +0000 (21:07 +0900)]
Fix an issue where paths with different case are not displayed correctly in the folder column of the folder compare window when comparing three directories. (#1372)
Takashi Sawanaka [Sat, 18 Jun 2022 14:11:59 +0000 (23:11 +0900)]
Bump revision to 2.16.21
Takashi Sawanaka [Sat, 18 Jun 2022 14:11:24 +0000 (23:11 +0900)]
Update ALL.*.sln
Takashi Sawanaka [Sat, 18 Jun 2022 04:21:52 +0000 (13:21 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Thu, 16 Jun 2022 15:35:20 +0000 (00:35 +0900)]
Binary Compare: Allow the "Split Vertically" menu item to be unchecked.
Takashi Sawanaka [Wed, 15 Jun 2022 14:06:30 +0000 (23:06 +0900)]
Image Compare, Webpage Compare: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.
Takashi Sawanaka [Tue, 14 Jun 2022 12:30:23 +0000 (21:30 +0900)]
Fix issue #1367: Tab behaviour on comparisons of files vs folders
Takashi Sawanaka [Tue, 7 Jun 2022 13:14:47 +0000 (22:14 +0900)]
Fix issue #1363: Crash on command line compare
Takashi Sawanaka [Tue, 7 Jun 2022 12:30:36 +0000 (21:30 +0900)]
Fix issue #1192: [Bug Report] WinMerge does not recognize Win 11
Takashi Sawanaka [Tue, 7 Jun 2022 11:34:35 +0000 (20:34 +0900)]
Fix issue #1362: Line difference coloring in “Word-level” mode does not work correctly for Cyrillic-based languages
stonee-K [Mon, 6 Jun 2022 12:24:22 +0000 (21:24 +0900)]
Initialize variables defined at "diff.h" (#1360)
Jun Tajima [Sat, 4 Jun 2022 22:56:26 +0000 (07:56 +0900)]
Make the file name refreshed to detect case changes when running "Refresh Selected". (#1358)
Takashi Sawanaka [Wed, 1 Jun 2022 22:11:59 +0000 (07:11 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Wed, 1 Jun 2022 22:11:28 +0000 (07:11 +0900)]
Update Contributors.txt
Simone Saviolo [Wed, 1 Jun 2022 22:10:20 +0000 (00:10 +0200)]
Updated Italian translation (#1355)
Takashi Sawanaka [Tue, 31 May 2022 11:15:45 +0000 (20:15 +0900)]
Fix issue #1354: Syntax highlighting: SQL comments
stonee-K [Mon, 30 May 2022 13:29:51 +0000 (22:29 +0900)]
diffutils ver2.7 (#1351)
> Mon Sep 12 15:52:22 1994
> Use isupper+tolower instead of islower+toupper, for consistency.
Takashi Sawanaka [Sun, 29 May 2022 07:32:28 +0000 (16:32 +0900)]
Installer: Disable commit
68b4e3ea
Takashi Sawanaka [Sat, 28 May 2022 15:14:52 +0000 (00:14 +0900)]
Installer: If there are Explorer processes started as separate processes, the Shell Extension installation will fail to terminate Explorer, so terminate those Explorer processes except during file operations.
Takashi Sawanaka [Wed, 25 May 2022 14:42:58 +0000 (23:42 +0900)]
Fix issue #1349: Refresh Selected Marks Unscanned Folders as Identical
Takashi Sawanaka [Wed, 25 May 2022 12:39:44 +0000 (21:39 +0900)]
Installer: Start Explorer just before exiting the installer if the Explorer restart that was run to install the ShellExtension fails.
Takashi Sawanaka [Mon, 23 May 2022 13:26:41 +0000 (22:26 +0900)]
Update ShellExtension to 1.8.5.0
Takashi Sawanaka [Mon, 23 May 2022 13:13:36 +0000 (22:13 +0900)]
WinMergeContextMenu: Fix build error
Takashi Sawanaka [Mon, 23 May 2022 13:03:52 +0000 (22:03 +0900)]
WinMergeContextMenu: Fix build error on VS2017
Takashi Sawanaka [Mon, 23 May 2022 12:58:19 +0000 (21:58 +0900)]
ShellExtension: Bump revision to 1.18.5.0
Takashi Sawanaka [Mon, 23 May 2022 12:52:31 +0000 (21:52 +0900)]
WinMergeContextMenu: Fix the problem that the WinMerge icon is not correctly displayed on the taskbar when WinMerge is started from the Windows 11 context menu.
I referred to the following URL
- https://gitlab.com/tortoisegit/tortoisegit/-/merge_requests/187
- https://devblogs.microsoft.com/oldnewthing/
20131118-00/?p=2643
- https://devblogs.microsoft.com/oldnewthing/
20130318-00/?p=4933
Takashi Sawanaka [Mon, 23 May 2022 12:45:54 +0000 (21:45 +0900)]
WinMergeContextMenu: Fix an issue where the WinMerge menu displayed in the "Show more options" menu of the Windows 11 Explorer context menu is not an advanced menu, even though the advanced menu is enabled.
Takashi Sawanaka [Sun, 22 May 2022 12:30:16 +0000 (21:30 +0900)]
Call Windows 7 or later API functions directly since WinMerge 64-bit version only works with Windows 7 or later,
Takashi Sawanaka [Sun, 22 May 2022 12:24:55 +0000 (21:24 +0900)]
Undo accidentally committed file
Takashi Sawanaka [Sun, 22 May 2022 12:10:59 +0000 (21:10 +0900)]
Issue #1340: Request for updating code: a new language(ABAP) in "syntax highlighting" Submitted by yuanshouyan1823
Takashi Sawanaka [Sun, 22 May 2022 01:53:31 +0000 (10:53 +0900)]
Update .gitignore
Takashi Sawanaka [Sun, 22 May 2022 01:43:22 +0000 (10:43 +0900)]
Update winimerge to 1.0.34 (2)
Takashi Sawanaka [Sun, 22 May 2022 01:42:57 +0000 (10:42 +0900)]
Update winwebdiff to 1.0.3
Takashi Sawanaka [Sat, 21 May 2022 15:16:07 +0000 (00:16 +0900)]
Fix issue #1312: In windows 11 i have error 78 sidebyside with the winmerge manifest
Takashi Sawanaka [Sat, 21 May 2022 14:28:14 +0000 (23:28 +0900)]
Update TranslationsStatus format for Corsican (#1347) (2)
Patriccollu [Sat, 21 May 2022 14:21:10 +0000 (16:21 +0200)]
Update TranslationsStatus format for Corsican (#1347)
Takashi Sawanaka [Sat, 21 May 2022 13:37:26 +0000 (22:37 +0900)]
Fix issue #1326: Backup files: Misleading error message when file cannot be written
Takashi Sawanaka [Sat, 21 May 2022 06:19:41 +0000 (15:19 +0900)]
- Image compare: Make patience and histogram diff algorithm selectable.
- Update winimerge to 1.0.34
Takashi Sawanaka [Sat, 21 May 2022 06:16:42 +0000 (15:16 +0900)]
Update TranslationsStatus
Hugo Carvalho [Fri, 20 May 2022 22:32:40 +0000 (23:32 +0100)]
Update Portuguese translation (#1345)
Jun Tajima [Fri, 20 May 2022 15:34:31 +0000 (00:34 +0900)]
Fix report generation process. (#1344)
- The string with the hyperlink to the file comparie report is now replaced with the HTML entity, when generating an HTML-style folder compare report with the "Include File Compare Report" option enabled.
stonee-K [Fri, 20 May 2022 00:10:18 +0000 (09:10 +0900)]
Fix typo: GPL (#1342)
* Fix typo: GPL
Fix typo: "GNU DIFF General Public License" should be "GNU General Public License".
* Fix typo: GPL
Fix typo: "GNU DIFF General Public License" should be "GNU General Public License".
stonee-K [Mon, 16 May 2022 11:19:23 +0000 (20:19 +0900)]
Update Japanese.po (Codepage dialog) (#1338)
"both" means loading and saving, not left pane and right pane.
Takashi Sawanaka [Mon, 16 May 2022 00:11:19 +0000 (09:11 +0900)]
Fix issue #1335: Alt/Shift key highlighting issue not resetting start point from move.
Takashi Sawanaka [Sat, 14 May 2022 14:18:44 +0000 (23:18 +0900)]
Update Contributors.txt
Takashi Sawanaka [Sat, 14 May 2022 14:10:58 +0000 (23:10 +0900)]
Fix issue #1334: Copy left/right different behavior
Takashi Sawanaka [Sat, 14 May 2022 01:33:54 +0000 (10:33 +0900)]
Modify "Tools - Generate Report" (Add column width definition to html output) (#1333) (2)
Takashi Sawanaka [Sat, 14 May 2022 01:04:25 +0000 (10:04 +0900)]
FolderCompare: Make the sort order of file names including numbers the same as Explorer. (osdn.net #44557) (2)
stonee-K [Fri, 13 May 2022 12:07:26 +0000 (21:07 +0900)]
Modify "Tools - Generate Report" (Add column width definition to html output) (#1333)
* Modify column width definition at "GenerateReport"
* Modify column width definition at "GenerateReport"
Takashi Sawanaka [Wed, 11 May 2022 11:40:13 +0000 (20:40 +0900)]
FolderCompare: Make the sort order of file names including numbers the same as Explorer. (osdn.net #44557)
e.g.)
befere:
file1.txt
file100.txt
file2.txt
after: ↓
file1.txt
file2.txt
file100.txt
Takashi Sawanaka [Wed, 11 May 2022 11:36:29 +0000 (20:36 +0900)]
Update TrnaslationsStatus
Takashi Sawanaka [Wed, 11 May 2022 11:36:05 +0000 (20:36 +0900)]
Update Turkish.po
Kaya Zeren [Wed, 11 May 2022 03:18:19 +0000 (06:18 +0300)]
Turkish translation update (#1332)
* Turkish language update 2.16.19 Beta
Turkish language update 2.16.19 Beta
* Turkish translation update
Turkish translation update
Takashi Sawanaka [Mon, 9 May 2022 22:07:47 +0000 (07:07 +0900)]
Update Slovenian.po. Submitted by JadranR
Takashi Sawanaka [Mon, 9 May 2022 13:45:33 +0000 (22:45 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 9 May 2022 13:38:13 +0000 (22:38 +0900)]
LocationView: Enable mouse wheel scrolling on the location pane.
Takashi Sawanaka [Mon, 9 May 2022 13:31:54 +0000 (22:31 +0900)]
Select Plugin dialog: Fix a problem where the "Open files in the same window type after unpacking" checkbox was checked, but the checkbox was not checked the next time the dialog was opened.
Takashi Sawanaka [Mon, 9 May 2022 13:25:20 +0000 (22:25 +0900)]
Fix osdn.net ticket #44522: CompareMSExcelFiles Plugins do not compare folders when opening .xlsx files from Plugins-> Edit with Unpacker menu item even though the "Extract workbook data to multiple files" option is enabled in the plugin settings
Patriccollu [Sun, 8 May 2022 14:37:39 +0000 (16:37 +0200)]
Update Corsican translation for first 2 commits in May (#1331)
CharlesMengCA [Sat, 7 May 2022 23:56:58 +0000 (19:56 -0400)]
update ChineseSimplified.po (#1330)
Mr-Update [Sat, 7 May 2022 14:05:11 +0000 (16:05 +0200)]
Update German.po (#1329)
Tichij [Fri, 6 May 2022 08:53:58 +0000 (11:53 +0300)]
Update of Lithuanian translation (#1327)
Takashi Sawanaka [Thu, 5 May 2022 14:48:59 +0000 (23:48 +0900)]
DirActions.cpp: Fix Code scanning alerts: Complex condition
efi99 [Thu, 5 May 2022 14:34:13 +0000 (16:34 +0200)]
Update Hungarian.po (#1325)
Jun Tajima [Thu, 5 May 2022 09:48:53 +0000 (18:48 +0900)]
Fix report generation process. (#1324)
- Fix an issue where the middle directory is not output in the title of the directory compare report for three directories.
Takashi Sawanaka [Wed, 4 May 2022 23:13:37 +0000 (08:13 +0900)]
Add "none" diff algorithm
Mirosław Żylewicz [Tue, 3 May 2022 14:22:56 +0000 (16:22 +0200)]
Update Polish.po (#1323)
Jun Tajima [Mon, 2 May 2022 10:57:21 +0000 (19:57 +0900)]
Fix an issue where WinMerge crashes depending on the filename when generating a file compare report. (#1319)
- Fix to properly resize the buffer of the replaced character string in the process of replacing the special characters contained in the file name with the HTML entities.
Tichij [Sun, 1 May 2022 08:00:13 +0000 (11:00 +0300)]
Update of Lithuanian translation (#1318)
Hugo Carvalho [Sat, 30 Apr 2022 22:55:05 +0000 (23:55 +0100)]
Update Portuguese.po (#1317)
Rukoto Luther [Fri, 29 Apr 2022 08:37:13 +0000 (17:37 +0900)]
Update Japanese.po, Readme nad Manual. Submitted by Rukoto Luther
Takashi Sawanaka [Fri, 29 Apr 2022 08:11:44 +0000 (17:11 +0900)]
Fix issue #1308: Sugg: Increase the dialogue for Pluginns
Ikko Ashimine [Thu, 28 Apr 2022 22:53:16 +0000 (07:53 +0900)]
Fix typo in BCMenu.cpp (#1313)
adress -> address
Mr-Update [Wed, 27 Apr 2022 23:16:43 +0000 (01:16 +0200)]
Update German.po (#1311)
Takashi Sawanaka [Wed, 27 Apr 2022 14:03:32 +0000 (23:03 +0900)]
Update Russian.po (2)
Takashi Sawanaka [Wed, 27 Apr 2022 14:00:43 +0000 (23:00 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Wed, 27 Apr 2022 13:59:30 +0000 (22:59 +0900)]
Update Russian.po
wvxwxvw [Wed, 27 Apr 2022 13:46:23 +0000 (16:46 +0300)]
Update Russian.po (#1310)
Takashi Sawanaka [Tue, 26 Apr 2022 23:59:37 +0000 (08:59 +0900)]
Update ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Tue, 26 Apr 2022 22:57:29 +0000 (07:57 +0900)]
WebPageDiffFrm.cpp: Define BCN_DROPDOWN if BCN_DROPDOWN is not defined
Takashi Sawanaka [Tue, 26 Apr 2022 22:54:41 +0000 (07:54 +0900)]
Delete the WinWebDiff* project in ALL.vs2017.sln, as WinWebDiff* cannot be built in VS2017.
Takashi Sawanaka [Tue, 26 Apr 2022 15:27:42 +0000 (00:27 +0900)]
Update Hungarian.po
Takashi Sawanaka [Tue, 26 Apr 2022 15:08:09 +0000 (00:08 +0900)]
Bump revsion to 2.16.20
Takashi Sawanaka [Tue, 26 Apr 2022 15:06:21 +0000 (00:06 +0900)]
Update winimerge
Takashi Sawanaka [Tue, 26 Apr 2022 14:44:31 +0000 (23:44 +0900)]
Update winwebdiff to 1.0.2