OSDN Git Service
Takashi Sawanaka [Sun, 23 Dec 2018 08:21:14 +0000 (17:21 +0900)]
Change %DISTDIR% from Web Page\geocities to build\Releases
--HG--
branch : jp
Takashi Sawanaka [Sun, 23 Dec 2018 07:20:58 +0000 (16:20 +0900)]
Change the path of docbook tools
--HG--
branch : jp
Takashi Sawanaka [Sun, 23 Dec 2018 04:46:55 +0000 (13:46 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Sun, 23 Dec 2018 04:07:06 +0000 (13:07 +0900)]
Merge.cpp: Show translated HTML help if exists
--HG--
branch : stable
Takashi Sawanaka [Sun, 23 Dec 2018 03:51:29 +0000 (12:51 +0900)]
Update DownloadDeps.cmd
--HG--
branch : stable
vlakoff [Sat, 22 Dec 2018 21:49:21 +0000 (22:49 +0100)]
Some fixes in the manual
--HG--
branch : stable
Takashi Sawanaka [Sat, 22 Dec 2018 13:01:28 +0000 (22:01 +0900)]
Merge with stable
--HG--
branch : jp
GreyMerlin [Fri, 21 Dec 2018 22:43:22 +0000 (14:43 -0800)]
In Preparation for VS2019 (now in Preview) (6)
* Update "Build Software:" determination in `ConfigLog.cpp'
--HG--
branch : stable
GreyMerlin [Fri, 21 Dec 2018 22:02:46 +0000 (14:02 -0800)]
In Preparation for VS2019 (now in Preview) (5)
* Bring the `Build*.vs2019.cmd` files up-to-date with recent changes to the `Build*.vs2017.cmd`
files
--HG--
branch : stable
Takashi Sawanaka [Thu, 20 Dec 2018 23:12:42 +0000 (08:12 +0900)]
Update appveyor.yml
--HG--
branch : stable
Takashi Sawanaka [Thu, 20 Dec 2018 23:07:53 +0000 (08:07 +0900)]
Build*.cmd: Allow specifying platform in command line parameter
--HG--
branch : stable
Takashi Sawanaka [Thu, 20 Dec 2018 23:07:01 +0000 (08:07 +0900)]
DownloadDeps.cmd: Change download directory to build/WinMergeDownloadDeps(2)
--HG--
branch : stable
Takashi Sawanaka [Thu, 20 Dec 2018 23:05:57 +0000 (08:05 +0900)]
CreateRelease.cmd: Revert default compiler to VS2017
--HG--
branch : stable
pgert [Tue, 18 Dec 2018 15:55:25 +0000 (16:55 +0100)]
Swedish translation > InnoSetup - Pronoun corrections
--HG--
branch : stable
Takashi Sawanaka [Tue, 18 Dec 2018 23:00:35 +0000 (08:00 +0900)]
BuildArc.cmd: Allow specifying platform in command line parameter
--HG--
branch : stable
Takashi Sawanaka [Tue, 18 Dec 2018 22:57:53 +0000 (07:57 +0900)]
DownloadDeps.cmd: Change download directory to build/WinMergeDownloadDeps
--HG--
branch : stable
Takashi Sawanaka [Mon, 17 Dec 2018 14:48:36 +0000 (23:48 +0900)]
Update appveyor.yml
--HG--
branch : stable
Takashi Sawanaka [Mon, 17 Dec 2018 14:14:03 +0000 (23:14 +0900)]
Add appveyor.yml
--HG--
branch : stable
GreyMerlin [Thu, 13 Dec 2018 19:00:40 +0000 (11:00 -0800)]
In Preparation for VS2019 (now in Preview) (4)
* Update various `*.sln` properties
* Update various `*.vcxproj` properties
--HG--
branch : stable
Tichij [Thu, 13 Dec 2018 08:16:52 +0000 (10:16 +0200)]
Update for Lithuanian translation
--HG--
branch : stable
Takashi Sawanaka [Wed, 12 Dec 2018 23:01:58 +0000 (08:01 +0900)]
MergeDoc.cpp: Add "Don't ask this question again" checkbox to the messagebox "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
--HG--
branch : stable
Takashi Sawanaka [Wed, 12 Dec 2018 22:45:47 +0000 (07:45 +0900)]
Merge.rc: Fix conflicted menu accelerators
--HG--
branch : stable
GreyMerlin [Wed, 12 Dec 2018 20:21:06 +0000 (12:21 -0800)]
In Preparation for VS2019 (now in Preview) (3)
* Update Boost version checking for VS2019 Preview 1
--HG--
branch : stable
GreyMerlin [Wed, 12 Dec 2018 20:03:17 +0000 (12:03 -0800)]
In Preparation for VS2019 (now in Preview) (2)
* Copy the various *.vs2017.* solution and project files as new *.vs2019.* files
--HG--
branch : stable
GreyMerlin [Mon, 17 Dec 2018 19:43:32 +0000 (11:43 -0800)]
Update various .sln and .vcxproj properties to latest VS2017 levels
--HG--
branch : stable
GreyMerlin [Wed, 12 Dec 2018 20:19:28 +0000 (12:19 -0800)]
Update Boost version checking for VS2017 version 15.9.2
--HG--
branch : stable
GreyMerlin [Wed, 12 Dec 2018 20:23:44 +0000 (12:23 -0800)]
Update "Legal Copyright" for ShellExtension.dll to 2019
--HG--
branch : stable
Takashi Sawanaka [Wed, 12 Dec 2018 12:36:45 +0000 (21:36 +0900)]
CreateTranslatedRcFiles.vbs: Fix GitHub issue #113. The last translated message in *.po file was lost if the po file is not terminated with CR+LF or LF.
--HG--
branch : stable
pgert [Tue, 11 Dec 2018 16:47:40 +0000 (17:47 +0100)]
Swedish translation - Minor corrections
--HG--
branch : stable
Takashi Sawanaka [Tue, 11 Dec 2018 13:49:20 +0000 (22:49 +0900)]
Add FindText test
--HG--
branch : stable
Takashi Sawanaka [Sun, 9 Dec 2018 23:15:06 +0000 (08:15 +0900)]
ccrystalltextview.cpp: Fix upward and downward search not work correctly
--HG--
branch : stable
GreyMerlin [Sun, 9 Dec 2018 01:10:50 +0000 (17:10 -0800)]
In Preparation for VS2019 (now in Preview)
VS2017 version 15.9.3 has begun issuing the following warning for all compilations using the
v141_xp toolset (i.e. all of WinMerge). VS2019 (now in Preview 1) still optionally provides the
v141_xp toolset (it has to be installed by the VS Installer); it too generates the same warning.
" ... PlatformToolsets\v141_xp\Toolset.targets(39,5):
warning MSB8051: Support for targeting Windows XP is deprecated and will not be present in
future releases of Visual Studio. Please see https://go.microsoft.com/fwlink/?linkid=
2023588
for more information."
* The temporary way to suppress this warning is to set the <XPDeprecationWarning> property
to `false` for each build configuration in each `*.vs2017.vcxproj` file. There is no Solution or
Project "wizard" interface to do this; these property changes were inserted manually. This
suppression seems to work for both VS2017 and VS2019
* It appears that at some point VS2019 will stop supporting Win XP ... but everything is still
functional at this point
--HG--
branch : stable
GreyMerlin [Sat, 8 Dec 2018 23:31:40 +0000 (15:31 -0800)]
Remove `nFinalNullLines` checking, disabled by an earlier commit
* Github Commit
1b52d84 "MergeDoc.cpp: Fix github issue #106 ..." effectively removed this code
with a `#if 0`. This present commit actually removes the code, but preserves ASSERT checking to
make sure that all `m_ptBuf[]` structures have the exact same length.
* These lines of code (from GitHub Commit
51519fc, 16 Jun 2018) were an early attempt to solve
various problems with the last line(s) of a comparison. Subsequent changes made these lines
irrelevant. Independently they were shown to be erroneous.
--HG--
branch : stable
serhio [Fri, 7 Dec 2018 14:48:28 +0000 (15:48 +0100)]
Updated the copyright year to 2019, actually
Updated the copyright year to 2019, actually
--HG--
branch : stable
Takashi Sawanaka [Wed, 5 Dec 2018 13:09:56 +0000 (22:09 +0900)]
Fix a typo
--HG--
branch : stable
Takashi Sawanaka [Wed, 5 Dec 2018 13:08:26 +0000 (22:08 +0900)]
ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text selection bug (2)
--HG--
branch : stable
Takashi Sawanaka [Sun, 9 Dec 2018 23:22:56 +0000 (08:22 +0900)]
Bump revision to 2.16.2
--HG--
branch : stable
Takashi Sawanaka [Tue, 4 Dec 2018 23:10:14 +0000 (08:10 +0900)]
ccrystaltextview2.cpp: Fix the GitHub issue #109 Frustrating text selection bug
--HG--
branch : stable
Takashi Sawanaka [Sun, 2 Dec 2018 16:45:02 +0000 (01:45 +0900)]
Add File/Recompare As/Image menu item
--HG--
branch : stable
Takashi Sawanaka [Sun, 2 Dec 2018 16:39:39 +0000 (01:39 +0900)]
*.po: Add BOM
--HG--
branch : stable
Takashi Sawanaka [Sun, 2 Dec 2018 16:38:40 +0000 (01:38 +0900)]
Serbian.po: Restore broken Serbian.po
--HG--
branch : stable
Takashi Sawanaka [Sun, 2 Dec 2018 16:29:15 +0000 (01:29 +0900)]
Merge.rc: Widen the width of labels in Options dialog (GitHub#108)
--HG--
branch : stable
Takashi Sawanaka [Sun, 2 Dec 2018 14:24:02 +0000 (23:24 +0900)]
Rename Brazilian_Portguese.isl to Brazilian.isl (GitHub#108)
--HG--
branch : stable
Takashi Sawanaka [Sun, 2 Dec 2018 13:31:47 +0000 (22:31 +0900)]
Update Brazilian Portuguese translation. Submitted by Felipe (GitHub#108)
--HG--
branch : stable
Takashi Sawanaka [Fri, 30 Nov 2018 15:03:48 +0000 (00:03 +0900)]
Merge
--HG--
branch : stable
Takashi Sawanaka [Fri, 30 Nov 2018 15:01:54 +0000 (00:01 +0900)]
PreferencesDlg.cpp: Fix wrong pointer cast (Bitbucket#128)
--HG--
branch : stable
Takashi Sawanaka [Wed, 28 Nov 2018 23:18:12 +0000 (08:18 +0900)]
Added tag 2.16.0+-jp-1 for changeset
9d0258cda6e3
--HG--
branch : jp
Tim Gerundt [Wed, 28 Nov 2018 03:37:48 +0000 (04:37 +0100)]
Fix some problems in translations status
--HG--
branch : stable
Tim Gerundt [Wed, 28 Nov 2018 03:36:22 +0000 (04:36 +0100)]
Use UTF-8 meta tags for WinMerge POT file
--HG--
branch : stable
Takashi Sawanaka [Tue, 27 Nov 2018 23:05:18 +0000 (08:05 +0900)]
Bump revsion 2.16.0+-jp-1
--HG--
branch : jp
Takashi Sawanaka [Tue, 27 Nov 2018 15:53:11 +0000 (00:53 +0900)]
Change Web site URL
--HG--
branch : jp
Takashi Sawanaka [Sun, 25 Nov 2018 22:55:45 +0000 (07:55 +0900)]
Update Swedish translation. sf.net#3035
--HG--
branch : stable
Takashi Sawanaka [Thu, 22 Nov 2018 15:48:41 +0000 (00:48 +0900)]
Added tag 2.16.0 for changeset
bc5f0fce716c
--HG--
branch : stable
Takashi Sawanaka [Thu, 22 Nov 2018 13:48:11 +0000 (22:48 +0900)]
Merge with stable
--HG--
branch : jp
Takashi Sawanaka [Wed, 21 Nov 2018 11:14:54 +0000 (20:14 +0900)]
Bump revision to 2.16.0
--HG--
branch : stable
Takashi Sawanaka [Tue, 20 Nov 2018 23:13:44 +0000 (08:13 +0900)]
Test.cpp: Add FileCompare.LastLineEOL test
--HG--
branch : stable
Takashi Sawanaka [Mon, 19 Nov 2018 23:26:54 +0000 (08:26 +0900)]
Add Testing/Data/LastLineEOL/*
--HG--
branch : stable
Takashi Sawanaka [Mon, 19 Nov 2018 22:35:36 +0000 (07:35 +0900)]
Update release notes and changelog for 2.16.0
--HG--
branch : stable
Takashi Sawanaka [Sun, 18 Nov 2018 22:57:56 +0000 (07:57 +0900)]
MergeDoc.cpp: Fix github issue #106 File compare always showing different ending
--HG--
branch : stable
Takashi Sawanaka [Fri, 16 Nov 2018 14:29:17 +0000 (23:29 +0900)]
SuperComboBox.cpp: Fix crash when pressing key with enabling "From MRU list" option
--HG--
branch : stable
Takashi Sawanaka [Thu, 15 Nov 2018 22:00:14 +0000 (07:00 +0900)]
Bitmap.cpp: grayscaling toolbar bitmap did not work on XP
--HG--
branch : stable
Takashi Sawanaka [Wed, 14 Nov 2018 15:46:12 +0000 (00:46 +0900)]
OpenView.cpp: Replace SplitButton with PushButton when running on XP
--HG--
branch : stable
Takashi Sawanaka [Tue, 13 Nov 2018 23:24:26 +0000 (08:24 +0900)]
Fix github issue#105 Scrolling issue
--HG--
branch : stable
Takashi Sawanaka [Tue, 13 Nov 2018 22:00:09 +0000 (07:00 +0900)]
Fix crash when inserting text at the last line which is a ghost line. github issue#104
--HG--
branch : stable
Takashi Sawanaka [Tue, 13 Nov 2018 21:53:27 +0000 (06:53 +0900)]
ccrystaltextview.cpp: Fixed an issue that does not advance upward after the second search if backward searching of one-character text only
--HG--
branch : stable
Tim Gerundt [Tue, 13 Nov 2018 06:06:29 +0000 (07:06 +0100)]
Drop ClearCase from Installer
--HG--
branch : stable
Tim Gerundt [Tue, 13 Nov 2018 06:06:05 +0000 (07:06 +0100)]
Drop ClearCase from Manual
--HG--
branch : stable
Takashi Sawanaka [Mon, 12 Nov 2018 16:12:18 +0000 (01:12 +0900)]
MergeDoc.cpp: clear GGhostTextBuffer::m_RealityBlock when reloading unnamed buffer
--HG--
branch : stable
Takashi Sawanaka [Mon, 12 Nov 2018 14:25:51 +0000 (23:25 +0900)]
Merge.rc: Fix bitbucket issue#125. The order of controls seems to be important
--HG--
branch : stable
Takashi Sawanaka [Sat, 10 Nov 2018 19:43:51 +0000 (04:43 +0900)]
Add Lithuanian translation
--HG--
branch : stable
Takashi Sawanaka [Thu, 8 Nov 2018 16:51:25 +0000 (01:51 +0900)]
MergeEditView.cpp: Fix "Copy to Left and Advance" not work in 3-way file compare. bitbucket#123
--HG--
branch : stable
Takashi Sawanaka [Tue, 6 Nov 2018 22:01:53 +0000 (07:01 +0900)]
DirFrame.cpp: Add loading/saving of the visibility of status bar
--HG--
branch : stable
Takashi Sawanaka [Tue, 6 Nov 2018 21:54:14 +0000 (06:54 +0900)]
Merge.rc: Widen the width of 'Save project...' button for some translations
--HG--
branch : stable
Lippe35 [Tue, 6 Nov 2018 15:19:33 +0000 (15:19 +0000)]
Add missing Portuguese Translation
--HG--
branch : stable
Takashi Sawanaka [Sun, 4 Nov 2018 12:33:58 +0000 (21:33 +0900)]
Merge with stable
--HG--
branch : jp
Tim Gerundt [Wed, 31 Oct 2018 20:54:12 +0000 (21:54 +0100)]
Remove IDR_MERGEDOCTYPE and IDR_DIRDOCTYPE
--HG--
branch : stable
Tim Gerundt [Wed, 31 Oct 2018 20:53:32 +0000 (21:53 +0100)]
Add separators to "Zoom" and "Diff Context" menus
--HG--
branch : stable
Takashi Sawanaka [Wed, 31 Oct 2018 12:50:14 +0000 (21:50 +0900)]
rename readme.md to README.md
--HG--
branch : jp
Takashi Sawanaka [Mon, 29 Oct 2018 21:41:41 +0000 (06:41 +0900)]
Merge.rc: Replace 'Compare' with 'Co&mpare' in OpenDlg. bitbucket#121
--HG--
branch : stable
Lippe35 [Mon, 29 Oct 2018 14:58:38 +0000 (14:58 +0000)]
Update Portuguese Translation
--HG--
branch : stable
Takashi Sawanaka [Sun, 28 Oct 2018 22:56:34 +0000 (07:56 +0900)]
Manual: Update screenshots
--HG--
branch : stable
Takashi Sawanaka [Sun, 28 Oct 2018 22:59:24 +0000 (07:59 +0900)]
Manual: Update screenshots
--HG--
branch : stable
Takashi Sawanaka [Sun, 28 Oct 2018 17:23:25 +0000 (02:23 +0900)]
Added tag 2.15.5 for changeset
42fd7355d3f7
Takashi Sawanaka [Sun, 28 Oct 2018 14:47:48 +0000 (23:47 +0900)]
DiffTextBuffer.cpp: Impletement 'TODO: speed this up via table lookup'
Takashi Sawanaka [Sun, 28 Oct 2018 14:00:42 +0000 (23:00 +0900)]
Restore wrongly removed translations
Takashi Sawanaka [Fri, 26 Oct 2018 21:49:47 +0000 (06:49 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Tue, 23 Oct 2018 23:23:37 +0000 (08:23 +0900)]
MyCom.h: The parameter _vt in ChangeType() function was not used
Takashi Sawanaka [Tue, 23 Oct 2018 14:41:00 +0000 (23:41 +0900)]
Restore Merge7zFormatShellImpl. {cpp, h}
This module enables comparison of various special folders like the following.
- FTP folder (ftp://...)
- Folder in the ZIP file (c:\tmp\a.zip\dir1)
- CLSID (::{
645FF040-5081-101B-9F08-
00AA002F954E}})
Takashi Sawanaka [Tue, 23 Oct 2018 14:17:36 +0000 (23:17 +0900)]
Merge pull request #100 from GreyMerlin/master
Trivial Bugfix: Debugger generates three warnings
GreyMerlin [Tue, 23 Oct 2018 00:31:14 +0000 (17:31 -0700)]
Trivial Bugfix: Debugger generates three warnings
**Symptom:** Starting WinMerge with an active Debugger generates three identical
warning messages ...
`... \dlgdata.cpp(254) : AppMsg - Warning: dialog data checkbox value (205) out of range.`
**Solution:** The `m_bReadOnly`array was not being initialized, thus all of the `bool` elements
had a value of `0xcd` = 205 when initially given to the three **Read-only** checkboxes on the
OpenView dialog.
The array is now properly initialized in the `COpenView::` constructor.
**Also:** An unrelated trivial comment is repaired.
Takashi Sawanaka [Mon, 22 Oct 2018 22:56:32 +0000 (07:56 +0900)]
CreateRelase.cmd: build with VS2015 until the following problem is fixed.
https://developercommunity.visualstudio.com/content/problem/312206/mfc-exe-binary-size-is-5-times-bigger-in-vs-158-ms.html
Takashi Sawanaka [Mon, 22 Oct 2018 14:57:34 +0000 (23:57 +0900)]
Merge
Takashi Sawanaka [Mon, 22 Oct 2018 14:55:47 +0000 (23:55 +0900)]
Update release notes and changelog for 2.15.5
Takashi Sawanaka [Mon, 22 Oct 2018 14:18:10 +0000 (23:18 +0900)]
Merge pull request #99 from GreyMerlin/master
BugFix: Extended Length File Path names
Takashi Sawanaka [Mon, 22 Oct 2018 14:14:23 +0000 (23:14 +0900)]
Write an error message to the console when unknown command-line option is specified
Takashi Sawanaka [Mon, 22 Oct 2018 14:04:46 +0000 (23:04 +0900)]
Installer: Upgrade to 7-Zip 18.05
GreyMerlin [Mon, 22 Oct 2018 06:28:25 +0000 (23:28 -0700)]
BugFix: Extended Length File Path names
**Symptom:** If an explicit `\\?\` or `\\?\UNC\` prefix is given for a file path in the Open
dialog, that prefix remains with the file path even if it is not necessary to indicate an Extended
Length File Path. It will even be correctly stored and retrieved from the registry. Generally
this is OK, however some context menu actions (such as *Rename*, *Delete* *Left/Right Shell Menu"
and *Open With...*) cannot process Extended Length File Path values (because they are implemented
via Shell Extensions, which are limited to file path values with less that 260 characters).
Unfortunately, the Shell Extensions reject file path values simply based on the `\\?\` prefix, not
the actual length of the value.
**Solution:** Remove the explicit `\\?\` or `\\?\UNC\` prefix characters if they are not actually
necessary.
**Note:** The context menu actions noted above will still fail for actual Extended Length File Path
values, because Shell Extensions (indeed the entire Windows Shell) cannot handle Extended Length
File Path names.
Takashi Sawanaka [Sun, 21 Oct 2018 23:03:54 +0000 (08:03 +0900)]
Update ReleaseNotes.html for 2.15.5
Takashi Sawanaka [Sun, 21 Oct 2018 23:02:51 +0000 (08:02 +0900)]
Merge.rc: Change the tab order of the group '1st File or Folder' to 1
Takashi Sawanaka [Sat, 20 Oct 2018 15:05:43 +0000 (00:05 +0900)]
OpenView.cpp: Make 'Folder: Filter' group and 'File: Unpacker Plugin' group resizable