OSDN Git Service

winmerge-jp/winmerge-jp.git
3 years agoMainFrm.cpp: Toolbar was leaking image lists
datadiode [Sat, 19 Sep 2020 09:33:08 +0000 (11:33 +0200)]
MainFrm.cpp: Toolbar was leaking image lists

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276 (2)
Takashi Sawanaka [Wed, 16 Sep 2020 22:36:39 +0000 (07:36 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276 (2)

3 years agoMake the toolbar icon DPI-aware. fixes #370, fixes #276
Takashi Sawanaka [Wed, 16 Sep 2020 14:56:13 +0000 (23:56 +0900)]
Make the toolbar icon DPI-aware. fixes #370, fixes #276

3 years agoMerge pull request #430 from Mr-Update/patch-2
Takashi Sawanaka [Sun, 13 Sep 2020 23:14:51 +0000 (08:14 +0900)]
Merge pull request #430 from Mr-Update/patch-2

Update Shortcut_keys.xml

3 years agoUpdate Shortcut_keys.xml
Mr-Update [Sun, 13 Sep 2020 20:12:54 +0000 (22:12 +0200)]
Update Shortcut_keys.xml

Shift+F6 added

3 years agoMerge pull request #429 from hugok79/master
Takashi Sawanaka [Sat, 12 Sep 2020 15:44:34 +0000 (00:44 +0900)]
Merge pull request #429 from hugok79/master

Update Portuguese translation

3 years agoAdd files via upload
Hugo Carvalho [Sat, 12 Sep 2020 15:24:29 +0000 (16:24 +0100)]
Add files via upload

3 years agomemcombo.cpp: The text width was calculated using the wrong font.
Takashi Sawanaka [Thu, 10 Sep 2020 22:19:53 +0000 (07:19 +0900)]
memcombo.cpp: The text width was calculated using the wrong font.

3 years agoFix wrong base class names in the BEGIN_MESSAGE_MAP macro
Takashi Sawanaka [Wed, 9 Sep 2020 12:09:07 +0000 (21:09 +0900)]
Fix wrong base class names in the BEGIN_MESSAGE_MAP macro

3 years agoTrDialogs.h: Use using
Takashi Sawanaka [Tue, 8 Sep 2020 12:16:39 +0000 (21:16 +0900)]
TrDialogs.h: Use using

3 years agoUpdate Turkish.po
Takashi Sawanaka [Tue, 8 Sep 2020 12:16:19 +0000 (21:16 +0900)]
Update Turkish.po

3 years agoMerge pull request #425 from kayazeren/master
Takashi Sawanaka [Tue, 8 Sep 2020 10:08:06 +0000 (19:08 +0900)]
Merge pull request #425 from kayazeren/master

2.16.8 Turkish translation update

3 years agoMerge branch 'master' into master
Takashi Sawanaka [Tue, 8 Sep 2020 10:07:52 +0000 (19:07 +0900)]
Merge branch 'master' into master

3 years ago2.16.8 Turkish translation update
Kaya Zeren [Tue, 8 Sep 2020 07:25:12 +0000 (10:25 +0300)]
2.16.8 Turkish translation update

2.16.8 Turkish translation update

3 years agoMerge pull request #424 from gerundt/master
Takashi Sawanaka [Sun, 6 Sep 2020 00:22:35 +0000 (09:22 +0900)]
Merge pull request #424 from gerundt/master

Tweak output from BuildInstaller.cmd and BuildArc.cmd

3 years agoHide setup copy in BuildArc.cmd output
Tim Gerundt [Sat, 5 Sep 2020 22:05:48 +0000 (00:05 +0200)]
Hide setup copy in BuildArc.cmd output

3 years agoAdd echo output to BuildInstaller.cmd
Tim Gerundt [Sat, 5 Sep 2020 22:05:02 +0000 (00:05 +0200)]
Add echo output to BuildInstaller.cmd

3 years agoUpdate README.md
Takashi Sawanaka [Thu, 3 Sep 2020 12:15:41 +0000 (21:15 +0900)]
Update README.md

3 years agoFix GitHub issue #418: Commandline to display versions in the output report
Takashi Sawanaka [Sun, 30 Aug 2020 13:49:53 +0000 (22:49 +0900)]
Fix GitHub issue #418: Commandline to display versions in the output report

3 years agoUpdate ChangeLog.*
Takashi Sawanaka [Sun, 30 Aug 2020 07:36:18 +0000 (16:36 +0900)]
Update ChangeLog.*

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 30 Aug 2020 07:34:43 +0000 (16:34 +0900)]
Update Contributors.txt

3 years agoEven in VS2019, setting the Linker/System/Minimum Required Version to 5.01 seems...
Takashi Sawanaka [Sun, 30 Aug 2020 07:23:27 +0000 (16:23 +0900)]
Even in VS2019, setting the Linker/System/Minimum Required Version to 5.01 seems to create an executable that works on Windows XP.

3 years ago CreateRelease.cmd: PDB files could not be copied properly (2)
Takashi Sawanaka [Sun, 30 Aug 2020 06:24:58 +0000 (15:24 +0900)]
 CreateRelease.cmd: PDB files could not be copied properly (2)

3 years agoMerge pull request #421 from tjmprm77/feature/generate_patch_by_selecting_multiple_files
Takashi Sawanaka [Sun, 30 Aug 2020 06:21:30 +0000 (15:21 +0900)]
Merge pull request #421 from tjmprm77/feature/generate_patch_by_selecting_multiple_files

Fixed the problem that the input to File1 or File2 comboboxes of the Patch Generator dialog is not applied when the Patch Generator dialog is opened by selecting multiple files.

3 years agoFixed the problem that the input to File1 or File2 comboboxes of the Patch Generator...
Jun Tajima [Sun, 30 Aug 2020 05:57:50 +0000 (14:57 +0900)]
Fixed the problem that the input to File1 or File2 comboboxes of the Patch Generator dialog is not applied when the Patch Generator dialog is opened by selecting multiple files.

- When multiple items are registered in the internal item list of the CPatchDlg class, and the File1 or File2 comboboxes of the Patch Generator dialog is changed, do the following:
  - Clear the internal item list of the CPatchDlg class.
  - Clear the contents of the other combobox.

3 years agoCreateRelase.cmd: The PDB file could not be copied propery
Takashi Sawanaka [Sat, 29 Aug 2020 21:02:48 +0000 (06:02 +0900)]
CreateRelase.cmd: The PDB file could not be copied propery

3 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Fri, 28 Aug 2020 22:46:41 +0000 (07:46 +0900)]
Update Slovenian translation. Submitted by JadranR

3 years agoUpdate Galician.po
Takashi Sawanaka [Fri, 28 Aug 2020 22:07:56 +0000 (07:07 +0900)]
Update Galician.po

3 years agoBump revision to 2.16.9
Takashi Sawanaka [Fri, 28 Aug 2020 22:00:03 +0000 (07:00 +0900)]
Bump revision to 2.16.9

3 years agoBump revision to 2.16.8 2.16.8
Takashi Sawanaka [Fri, 28 Aug 2020 14:13:42 +0000 (23:13 +0900)]
Bump revision to 2.16.8

3 years agoUpdUpdate ChangeLog and ReleaseNotes
Takashi Sawanaka [Fri, 28 Aug 2020 14:10:29 +0000 (23:10 +0900)]
UpdUpdate ChangeLog and ReleaseNotes

3 years agoFix GitHub issue #420: Wrong merging (minimal/patience/histogram Diff algorithm does...
Takashi Sawanaka [Fri, 28 Aug 2020 14:04:05 +0000 (23:04 +0900)]
Fix GitHub issue #420: Wrong merging (minimal/patience/histogram Diff algorithm does not work on Windows XP)

3 years agoUpdate ChangeLog and ReleaseNotes
Takashi Sawanaka [Fri, 28 Aug 2020 11:40:57 +0000 (20:40 +0900)]
Update ChangeLog and ReleaseNotes

3 years agoUpdate Manual
Takashi Sawanaka [Fri, 28 Aug 2020 11:39:33 +0000 (20:39 +0900)]
Update Manual

3 years agoUpdate ChangeLog and ReleaseNotes
Takashi Sawanaka [Fri, 28 Aug 2020 10:50:24 +0000 (19:50 +0900)]
Update ChangeLog and ReleaseNotes

3 years agoFix osdn.net ticket #40672: 'Show Middle/Right Unique items' menu item does not work...
Takashi Sawanaka [Fri, 28 Aug 2020 10:45:00 +0000 (19:45 +0900)]
Fix osdn.net ticket #40672: 'Show Middle/Right Unique items' menu item does not work properly in 3-way folder compare.

3 years agoUpdate BuildArc.cmd
Takashi Sawanaka [Fri, 28 Aug 2020 00:02:05 +0000 (09:02 +0900)]
Update BuildArc.cmd

3 years agoMergeEditView.*: When scrolling with the horizontal mouse wheel, the scroll positions...
Takashi Sawanaka [Thu, 27 Aug 2020 23:44:37 +0000 (08:44 +0900)]
MergeEditView.*: When scrolling with the horizontal mouse wheel, the scroll positions of the left and right panes were not synchronized.

3 years agoMerge pull request #419 from qosobrin/master
Takashi Sawanaka [Thu, 27 Aug 2020 21:40:18 +0000 (06:40 +0900)]
Merge pull request #419 from qosobrin/master

Galician translation update

3 years agoGalician translation update
qosobrin [Thu, 27 Aug 2020 19:03:13 +0000 (21:03 +0200)]
Galician translation update

3 years agoMerge pull request #7 from WinMerge/master
LMS [Thu, 27 Aug 2020 18:52:04 +0000 (20:52 +0200)]
Merge pull request #7 from WinMerge/master

Puesta al día del proyecto

3 years agoUpdate manual
Takashi Sawanaka [Thu, 27 Aug 2020 14:42:24 +0000 (23:42 +0900)]
Update manual

3 years agoccrystaltextview: The amount of horizontal scroll movement when receiving the WM_MOUS...
Takashi Sawanaka [Thu, 27 Aug 2020 14:39:04 +0000 (23:39 +0900)]
ccrystaltextview: The amount of horizontal scroll movement when receiving the WM_MOUSEHWHEEL message was too large.

3 years agoUpdate manual
Takashi Sawanaka [Thu, 27 Aug 2020 00:11:56 +0000 (09:11 +0900)]
Update manual

3 years agoFix an issue where inline differences aren't highlighted properly under the following...
Takashi Sawanaka [Tue, 25 Aug 2020 19:22:49 +0000 (04:22 +0900)]
Fix an issue where inline differences aren't highlighted properly under the following conditions:
-Table layout and word-wrap mode
-The inline difference is clipped at the right edge

3 years agoFix the crash under the following conditions:
Takashi Sawanaka [Tue, 25 Aug 2020 19:09:58 +0000 (04:09 +0900)]
Fix the crash under the following conditions:
- Table layout and word-wrap mode
- When pressing the Enter key at the position enclosed by double quotation marks on the first line

3 years agoGhostTextView.*: It is quite stressful that the horizontal scroll position is not...
Takashi Sawanaka [Tue, 25 Aug 2020 13:14:36 +0000 (22:14 +0900)]
GhostTextView.*: It is quite stressful that the horizontal scroll position is not restored when undoing or rescanning.

3 years agocrystaledit/Sample: Fix compilation error
Takashi Sawanaka [Tue, 25 Aug 2020 12:43:13 +0000 (21:43 +0900)]
crystaledit/Sample: Fix compilation error

3 years agoccrystaltextview.cpp: Fix the problem that a white vertical rectangle is drawn in...
Takashi Sawanaka [Mon, 24 Aug 2020 14:41:23 +0000 (23:41 +0900)]
ccrystaltextview.cpp: Fix the problem that a white vertical rectangle is drawn in the selection area. (2)

3 years agoMerge pull request #417 from Tichij/master
Takashi Sawanaka [Mon, 24 Aug 2020 05:31:55 +0000 (14:31 +0900)]
Merge pull request #417 from Tichij/master

Update of Lithuanian translation

3 years agoUpdate of Lithuanian translation
Tichij [Mon, 24 Aug 2020 04:46:37 +0000 (07:46 +0300)]
Update of Lithuanian translation

3 years agoFix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway (2)
Takashi Sawanaka [Mon, 24 Aug 2020 00:23:51 +0000 (09:23 +0900)]
Fix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway (2)

3 years agoFix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway
Takashi Sawanaka [Sun, 23 Aug 2020 23:36:26 +0000 (08:36 +0900)]
Fix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway

3 years agoManual/jp: Add missing *.png files
Takashi Sawanaka [Sun, 23 Aug 2020 23:04:17 +0000 (08:04 +0900)]
Manual/jp: Add missing *.png files

3 years agoInstaller: Change ChangeLog.txt to ChangeLog.html
Takashi Sawanaka [Sun, 23 Aug 2020 07:54:32 +0000 (16:54 +0900)]
Installer: Change ChangeLog.txt to ChangeLog.html

3 years agoUpdate Docs/README.md
Takashi Sawanaka [Sun, 23 Aug 2020 06:42:41 +0000 (15:42 +0900)]
Update Docs/README.md

3 years ago- Change ChangeLog.txt and ReleaseNotes.html to Markdown format
Takashi Sawanaka [Sun, 23 Aug 2020 06:38:45 +0000 (15:38 +0900)]
- Change ChangeLog.txt and ReleaseNotes.html to Markdown format
- Changes in 2.16.8

3 years agoUpdate frhed to 0.10904.2017.5
Takashi Sawanaka [Sun, 23 Aug 2020 00:48:01 +0000 (09:48 +0900)]
Update frhed to 0.10904.2017.5

3 years agoFIXME: LoadImageFromResource() seems to fail when running on Wine 5.0. (2)
Takashi Sawanaka [Fri, 21 Aug 2020 18:05:38 +0000 (03:05 +0900)]
FIXME: LoadImageFromResource() seems to fail when running on Wine 5.0. (2)

3 years agoFIXME: LoadImageFromResource() seems to fail when running on Wine 5.0.
Takashi Sawanaka [Fri, 21 Aug 2020 18:02:48 +0000 (03:02 +0900)]
FIXME: LoadImageFromResource() seems to fail when running on Wine 5.0.

3 years agoMerge pull request #415 from Mr-Update/patch-1
Takashi Sawanaka [Fri, 21 Aug 2020 16:37:57 +0000 (01:37 +0900)]
Merge pull request #415 from Mr-Update/patch-1

Lithuanian.po is missing

3 years agoUpdate WinMergeX64NonAdmin.iss
Mr-Update [Fri, 21 Aug 2020 16:05:04 +0000 (18:05 +0200)]
Update WinMergeX64NonAdmin.iss

3 years agoUpdate WinMergeX64.iss
Mr-Update [Fri, 21 Aug 2020 16:03:53 +0000 (18:03 +0200)]
Update WinMergeX64.iss

3 years agoUpdate WinMergeX64.is6.iss
Mr-Update [Fri, 21 Aug 2020 16:03:10 +0000 (18:03 +0200)]
Update WinMergeX64.is6.iss

3 years agoUpdate WinMerge.iss
Mr-Update [Fri, 21 Aug 2020 16:00:57 +0000 (18:00 +0200)]
Update WinMerge.iss

3 years agoMerge pull request #414 from Mr-Update/patch-18
Takashi Sawanaka [Thu, 20 Aug 2020 23:20:49 +0000 (08:20 +0900)]
Merge pull request #414 from Mr-Update/patch-18

Update German.po

3 years agoUpdate German.po
Mr-Update [Thu, 20 Aug 2020 20:40:02 +0000 (22:40 +0200)]
Update German.po

Translation improved

3 years agoMerge pull request #413 from Tichij/master
Takashi Sawanaka [Thu, 20 Aug 2020 10:40:24 +0000 (19:40 +0900)]
Merge pull request #413 from Tichij/master

Update of Lithuanian translation

3 years agoUpdate of Lithuanian translation
Tichij [Thu, 20 Aug 2020 04:37:36 +0000 (07:37 +0300)]
Update of Lithuanian translation

3 years agoFix GitHub issue #411: Some improvements
Takashi Sawanaka [Wed, 19 Aug 2020 22:50:22 +0000 (07:50 +0900)]
Fix GitHub issue #411: Some improvements

3 years agoMerge pull request #412 from Mr-Update/patch-17
Takashi Sawanaka [Tue, 18 Aug 2020 22:14:59 +0000 (07:14 +0900)]
Merge pull request #412 from Mr-Update/patch-17

Update German.po

3 years agoUpdate German.po
Mr-Update [Tue, 18 Aug 2020 20:01:07 +0000 (22:01 +0200)]
Update German.po

Translation improved

3 years agoMerge pull request #410 from Mr-Update/patch-16
Takashi Sawanaka [Mon, 17 Aug 2020 22:12:32 +0000 (07:12 +0900)]
Merge pull request #410 from Mr-Update/patch-16

Update Shortcut_keys.xml

3 years agoUpdate Shortcut_keys.xml
Mr-Update [Mon, 17 Aug 2020 21:18:55 +0000 (23:18 +0200)]
Update Shortcut_keys.xml

Shift+F4 added
Alt+Ctrl uniformly changed to Ctrl+Alt
Shift+Ctrl uniformly changed to Ctrl+Shift

3 years agoUpdate manual
Takashi Sawanaka [Mon, 17 Aug 2020 16:48:26 +0000 (01:48 +0900)]
Update manual

3 years agoUpdate manual
Takashi Sawanaka [Mon, 17 Aug 2020 15:13:48 +0000 (00:13 +0900)]
Update manual

3 years agoOptionsInit.cpp: Change the default value for the "Ignore codepage differences" optio...
Takashi Sawanaka [Mon, 17 Aug 2020 14:26:08 +0000 (23:26 +0900)]
OptionsInit.cpp: Change the default value for the "Ignore codepage differences" option to false

3 years agoTreat files that have matching content but different BOMs as different when the ...
Takashi Sawanaka [Mon, 17 Aug 2020 14:11:23 +0000 (23:11 +0900)]
Treat files that have matching content but different BOMs as different when the "Ignore codepage differences" option is disabled

3 years agoMerge pull request #408 from Tichij/master
Takashi Sawanaka [Mon, 17 Aug 2020 12:40:58 +0000 (21:40 +0900)]
Merge pull request #408 from Tichij/master

Removed mistakenly returned BOM in Lithuanian.po file

3 years agoRemoved, returned by mistake, BOM in Lithuanian.po file
Tichij [Mon, 17 Aug 2020 12:27:51 +0000 (15:27 +0300)]
Removed, returned by mistake, BOM in Lithuanian.po file

3 years agoMerge pull request #407 from Tichij/master
Takashi Sawanaka [Mon, 17 Aug 2020 09:10:51 +0000 (18:10 +0900)]
Merge pull request #407 from Tichij/master

Update of Lithuanian translation

3 years agoUpdate of Lithuanian translation
Tichij [Mon, 17 Aug 2020 05:49:51 +0000 (08:49 +0300)]
Update of Lithuanian translation

3 years agoOptionsInit.cpp: Change the default value for the "Include unique subfolders contents...
Takashi Sawanaka [Sun, 16 Aug 2020 14:58:14 +0000 (23:58 +0900)]
OptionsInit.cpp: Change the default value for the "Include unique subfolders contents" option to true

3 years agoUpdate manual
Takashi Sawanaka [Sun, 16 Aug 2020 14:55:50 +0000 (23:55 +0900)]
Update manual

3 years agoFix a bug where the title of the tabs in the file comparison window changed to "untit...
Takashi Sawanaka [Sun, 16 Aug 2020 13:24:37 +0000 (22:24 +0900)]
Fix a bug where the title of the tabs in the file comparison window changed to "untitled left/right" after changing the language.

3 years agoUpdate manual
Takashi Sawanaka [Sun, 16 Aug 2020 12:22:53 +0000 (21:22 +0900)]
Update manual

3 years agoMainFrm.cpp: Do a reverse comparison with the current 'Include Subfolders' settings...
Takashi Sawanaka [Sun, 16 Aug 2020 12:04:03 +0000 (21:04 +0900)]
MainFrm.cpp: Do a reverse comparison with the current 'Include Subfolders' settings when pressing Control key

3 years agoUpdate manual
Takashi Sawanaka [Sun, 16 Aug 2020 02:40:04 +0000 (11:40 +0900)]
Update manual

3 years agoRemove BOM in *.po files
Takashi Sawanaka [Sun, 16 Aug 2020 02:39:38 +0000 (11:39 +0900)]
Remove BOM in *.po files

3 years agoFix conflicting mnemonic
Takashi Sawanaka [Sat, 15 Aug 2020 13:26:31 +0000 (22:26 +0900)]
Fix conflicting mnemonic

3 years agoxutils.c: Fix a bug that "Ignore case" does not work.
Takashi Sawanaka [Sat, 15 Aug 2020 08:57:25 +0000 (17:57 +0900)]
xutils.c: Fix a bug that "Ignore case" does not work.

3 years agoFix GitHub issue #405: Some improvements (2)
Takashi Sawanaka [Sat, 15 Aug 2020 07:23:40 +0000 (16:23 +0900)]
Fix GitHub issue #405: Some improvements (2)

3 years agoFix GitHub issue #405: Some improvements
Takashi Sawanaka [Sat, 15 Aug 2020 06:58:55 +0000 (15:58 +0900)]
Fix GitHub issue #405: Some improvements

3 years agoMerge pull request #406 from Mr-Update/patch-15
Takashi Sawanaka [Fri, 14 Aug 2020 22:48:37 +0000 (07:48 +0900)]
Merge pull request #406 from Mr-Update/patch-15

Update German.po

3 years agoUpdate German.po
Mr-Update [Fri, 14 Aug 2020 20:17:01 +0000 (22:17 +0200)]
Update German.po

Translation improved

3 years agoUpdate BuildInstaller.cmd
Takashi Sawanaka [Fri, 14 Aug 2020 15:09:18 +0000 (00:09 +0900)]
Update BuildInstaller.cmd

3 years agoDirActions.h: Display the appropriate message if the file to delete does not already...
Takashi Sawanaka [Fri, 14 Aug 2020 14:13:55 +0000 (23:13 +0900)]
DirActions.h: Display the appropriate message if the file to delete does not already exist.

3 years agoUpdate manual
Takashi Sawanaka [Fri, 14 Aug 2020 13:45:06 +0000 (22:45 +0900)]
Update manual

3 years agoAdd Help button to PluginsList dialog
Takashi Sawanaka [Thu, 13 Aug 2020 14:55:35 +0000 (23:55 +0900)]
Add Help button to PluginsList dialog

3 years agoUpdate manual
Takashi Sawanaka [Wed, 12 Aug 2020 13:33:42 +0000 (22:33 +0900)]
Update manual