OSDN Git Service
Takashi Sawanaka [Sat, 3 Feb 2018 12:47:23 +0000 (21:47 +0900)]
PathDlg.cpp: Fix a problem that typed-in Context in Generate Patch is not applied. sf.net#2179
Takashi Sawanaka [Sat, 3 Feb 2018 11:45:04 +0000 (20:45 +0900)]
DirActions.h: Setting empty filename in diffFileInfo when failing partially to rename filename causes various terrible behavior with some operations after renaming.
(parent folder name unexpectedly renamed... etc.)
Takashi Sawanaka [Sat, 3 Feb 2018 09:55:21 +0000 (18:55 +0900)]
(File|Folder)CompareReport: Entitify file paths in HTML & XML directory comparison reports (merge from bitbucket.org/jtuc/winmerge2011) (sf.net#2199)
Takashi Sawanaka [Sat, 3 Feb 2018 03:47:02 +0000 (12:47 +0900)]
TimeSizeCompare.cpp: Fix a problem that unique files are invisible when comparing files using 'Date' compare method
Takashi Sawanaka [Sat, 3 Feb 2018 03:33:40 +0000 (12:33 +0900)]
DirActions.cpp: files with comparison error were not shown in list view
Takashi Sawanaka [Tue, 30 Jan 2018 22:04:20 +0000 (07:04 +0900)]
Merge pull request #60 from Lippe35/master
Corrections Portuguese
Lippe35 [Tue, 30 Jan 2018 17:30:02 +0000 (17:30 +0000)]
Corrections Portuguese
Takashi Sawanaka [Tue, 30 Jan 2018 14:01:10 +0000 (23:01 +0900)]
Merge
Takashi Sawanaka [Tue, 30 Jan 2018 13:58:49 +0000 (22:58 +0900)]
OptionsFont.cpp: Fix the problem that the messase "assertion failed" is displayed when WinMerge is executed under Windows XP.
Takashi Sawanaka [Tue, 30 Jan 2018 13:45:55 +0000 (22:45 +0900)]
ReadMe-Portuguese.txt: Change the file encoding from utf-8 to cp1252
Takashi Sawanaka [Tue, 30 Jan 2018 13:43:55 +0000 (22:43 +0900)]
Installer: Install ReadMe-Portuguese.txt (2)
Takashi Sawanaka [Tue, 30 Jan 2018 13:40:18 +0000 (22:40 +0900)]
Merge pull request #59 from Lippe35/master
Corrections Portuguese
Tim Gerundt [Tue, 30 Jan 2018 05:00:12 +0000 (06:00 +0100)]
GetTranslationsStatus.py: Fix UnicodeDecodeError with Python 3
Lippe35 [Mon, 29 Jan 2018 23:46:32 +0000 (23:46 +0000)]
Merge branch 'master' into master
Lippe35 [Mon, 29 Jan 2018 23:30:54 +0000 (23:30 +0000)]
Corrections Portuguese
Takashi Sawanaka [Mon, 29 Jan 2018 22:17:17 +0000 (07:17 +0900)]
Merge
Takashi Sawanaka [Mon, 29 Jan 2018 22:09:51 +0000 (07:09 +0900)]
Installer: Install ReadMe-Portuguese.txt
Takashi Sawanaka [Mon, 29 Jan 2018 22:09:20 +0000 (07:09 +0900)]
ReadMe-Portuguese.txt: Rename ReadMe-Portuguese to ReadMe-Portuguese.txt
Change the file encoding from utf-8 to cp1252
Takashi Sawanaka [Mon, 29 Jan 2018 21:52:23 +0000 (06:52 +0900)]
Merge pull request #58 from Lippe35/master
Fix ReadMe-Portuguese
Lippe35 [Mon, 29 Jan 2018 19:27:16 +0000 (19:27 +0000)]
Fix ReadMe-Portuguese
Takashi Sawanaka [Mon, 29 Jan 2018 18:31:25 +0000 (03:31 +0900)]
Merge pull request #57 from Lippe35/patch-2
Update Portuguese.po
Takashi Sawanaka [Mon, 29 Jan 2018 18:30:52 +0000 (03:30 +0900)]
Merge pull request #56 from Lippe35/patch-1
ReadMe-Portuguese
Lippe35 [Mon, 29 Jan 2018 03:03:12 +0000 (03:03 +0000)]
Update Portuguese.po
Lippe35 [Mon, 29 Jan 2018 02:58:28 +0000 (02:58 +0000)]
ReadMe-Portuguese
Takashi Sawanaka [Sun, 28 Jan 2018 00:54:10 +0000 (09:54 +0900)]
CSizingControlBar: Add support for HiDPI screens(2). Fix missing semi colon
Takashi Sawanaka [Sat, 27 Jan 2018 05:20:26 +0000 (14:20 +0900)]
CSizingControlBar: Add support for HiDPI screens. close #54 (GitHub)
Takashi Sawanaka [Fri, 26 Jan 2018 13:31:37 +0000 (22:31 +0900)]
Removed +-jp tags
Takashi Sawanaka [Mon, 22 Jan 2018 15:44:12 +0000 (00:44 +0900)]
Move repositories to https://bitbucket.org/winmerge/
Takashi Sawanaka [Mon, 22 Jan 2018 15:23:21 +0000 (00:23 +0900)]
Added tag 2.15.2 for changeset
f9e46a7b9099
Takashi Sawanaka [Mon, 22 Jan 2018 13:52:02 +0000 (22:52 +0900)]
Merge.rc: Fix the problem that the static control (filename being compared) in IDD_DIRCOMP_PROGRESS is not dynamically resized.
Takashi Sawanaka [Sun, 21 Jan 2018 15:07:49 +0000 (00:07 +0900)]
Remove UploadToGithub.cmd
Takashi Sawanaka [Sun, 21 Jan 2018 14:52:35 +0000 (23:52 +0900)]
Update release notes and changelog for 2.15.2
Takashi Sawanaka [Sun, 21 Jan 2018 14:52:11 +0000 (23:52 +0900)]
Remove readme.md
Takashi Sawanaka [Sun, 21 Jan 2018 14:15:15 +0000 (23:15 +0900)]
Manual: s/Binary Image/Image File/
Takashi Sawanaka [Sun, 21 Jan 2018 14:12:38 +0000 (23:12 +0900)]
Manual: The third path is no longer a path for output
Takashi Sawanaka [Sun, 21 Jan 2018 06:54:35 +0000 (15:54 +0900)]
Filters: Add .vs folder to filter files
Takashi Sawanaka [Thu, 18 Jan 2018 15:49:20 +0000 (00:49 +0900)]
CompareMSPowerPointFiles.sct: Fix the bug that text in table is not extracted
Takashi Sawanaka [Sun, 14 Jan 2018 06:00:40 +0000 (15:00 +0900)]
FolerCompare: Fix binary flag infomation of unique files being lost
Takashi Sawanaka [Fri, 12 Jan 2018 18:43:21 +0000 (03:43 +0900)]
ChineseTraditional.po: Fix a text not quoted
Takashi Sawanaka [Wed, 10 Jan 2018 12:26:16 +0000 (21:26 +0900)]
Merge
Takashi Sawanaka [Wed, 10 Jan 2018 12:25:43 +0000 (21:25 +0900)]
ChineseTradition.po: Change the file encoding from UTF-8 to CP950
Takashi Sawanaka [Wed, 10 Jan 2018 12:04:54 +0000 (21:04 +0900)]
Merge pull request #53 from ylin77/patch-1
Update ChineseTraditional.po
ylin77 [Wed, 10 Jan 2018 10:27:59 +0000 (18:27 +0800)]
Update ChineseTraditional.po
Translate new string to CHT.
Takashi Sawanaka [Tue, 9 Jan 2018 15:15:05 +0000 (00:15 +0900)]
Implement Bitbucket#78
Takashi Sawanaka [Mon, 8 Jan 2018 15:57:41 +0000 (00:57 +0900)]
Allow to set DIFFCODE::DIFF flag for unique file
Takashi Sawanaka [Mon, 8 Jan 2018 15:21:10 +0000 (00:21 +0900)]
Introduce the flag DIFFCODE::THREEWAY to indicate whether or not to compare three items
Takashi Sawanaka [Mon, 8 Jan 2018 13:03:14 +0000 (22:03 +0900)]
Remove unused declarations
Takashi Sawanaka [Wed, 3 Jan 2018 16:39:55 +0000 (01:39 +0900)]
FolderCompare: Display whether 2 files in diff row are idential when doing 3-way comparison. related Bitbucket #78
Takashi Sawanaka [Wed, 3 Jan 2018 15:20:53 +0000 (00:20 +0900)]
Fix crash when exiting UnitTest x64 version
Takashi Sawanaka [Sat, 30 Dec 2017 21:21:55 +0000 (06:21 +0900)]
Merge pull request #52 from GreyMerlin/master
Eliminate worst of Level=4 compilation warnings
GreyMerlin [Thu, 28 Dec 2017 18:55:05 +0000 (10:55 -0800)]
Remove warning C4706: assignment in conditional
* Remove all instances of the level=4 warning `warning C4706:
assignment within conditional expression`
GreyMerlin [Thu, 28 Dec 2017 01:53:48 +0000 (17:53 -0800)]
Remove warning C4840: non-portable use of class ...
* Sample of the 5-line warning message ...
warning C4840: non-portable use of class
'ATL::CStringT<wchar_t,StrTraitMFC<wchar_t,ATL::ChTraitsCRT<wchar_t>>>'
as an argument to a variadic function
note:
'ATL::CStringT<wchar_t,StrTraitMFC<wchar_t,ATL::ChTraitsCRT<wchar_t>>>::CStringT'
is non-trivial
note: see declaration of
'ATL::CStringT<wchar_t,StrTraitMFC<wchar_t,ATL::ChTraitsCRT<wchar_t>>>::CStringT'
(compiling source file MergeEditView.cpp)
note: the constructor and destructor will not be called; a bitwise copy
of the class will be passed as the argument
note: see declaration of
'ATL::CStringT<wchar_t,StrTraitMFC<wchar_t,ATL::ChTraitsCRT<wchar_t>>>'
(compiling source file MergeEditView.cpp)
* These are warnings that only occur with Warning Level == 4.
GreyMerlin [Thu, 28 Dec 2017 01:35:28 +0000 (17:35 -0800)]
Remove warning C4238: nonstandard extension used
* Eliminate warnings such as ...
`warning C4238: nonstandard extension used: class rvalue used as
lvalue`
* These are warnings that only occur with Warning Level == 4.
GreyMerlin [Wed, 27 Dec 2017 23:28:05 +0000 (15:28 -0800)]
Remove warning C4239 (2)
* Eliminate warnings such as ...
`warning C4239: nonstandard extension used: 'initializing': conversion
from 'LangFileInfo' to 'LangFileInfo &'`
`note: A non-const reference may only be bound to an lvalue`
* And ...
`warning C4239: nonstandard extension used: 'argument': conversion from
'DirItemIterator' to 'DirItemIterator &'`
`note: A non-const reference may only be bound to an lvalue`
* These are warnings that only occur with Warning Level == 4.
GreyMerlin [Wed, 27 Dec 2017 22:31:07 +0000 (14:31 -0800)]
Remove warning C4239: nonstandard extension used
* Eliminate warnings such as ...
`warning C4239: nonstandard extension used: 'argument': conversion
from 'DirItemIterator' to 'DirItemIterator &'`
`note: A non-const reference may only be bound to an lvalue`
* These are warnings that only occur with Warning Level == 4.
* This commit only deals with issues with mixing CString and String
data.
* Discard the PopString class, a self-admitted hack from
stackoverflow.com, that was simply confusing and not all that "pretty"
anyway.
Takashi Sawanaka [Wed, 27 Dec 2017 20:18:05 +0000 (05:18 +0900)]
Merge pull request #51 from GreyMerlin/master
UnitTests can now compile with C++17
GreyMerlin [Wed, 27 Dec 2017 01:09:56 +0000 (17:09 -0800)]
UnitTests now finds Plugins correctly
* The x64 configurations of UnitTests were failing to load the
DisplayXMLFiles.dll library, because the test case was looking in the
old "c:/program files (x86)/winmerge" directory. This directory only
has a 32-bit implementation of the dll file.
* This patch allows the test case to now use the "c:/Program
Files/WinMerge" directory.
* All four configurations x64/win32 and Release/Debug now run
correctly.
GreyMerlin [Wed, 27 Dec 2017 01:03:42 +0000 (17:03 -0800)]
UnitTests can now compile with C++17
* The GoogleTest framework can disable use of the `std::tr1`
class entirely! This is disabled by specifying
`GTEST_HAS_TR1_TUPLE=0;` in the Preprocessor Definition compilation
property. The UnitTests project does not use TR1 tuples.
* The deprecation warnings are to note features scheduled to be
deimplemented in some future C++ standard (possibly as early as
C++20). They remain valid features in C++17. These warnings
(and the resulting errors) can be removed by specifying
`_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;` in the Preprocessor
Definition compilation property. This allows us to watch and study how
other projects react to the necessary changes (mostly related to
`std::function_name::_Unchecked_Iterators::`).
* The `GTEST_HAS_TR1_TUPLE=0;` Preprocessor definition is now included
in VS2015 as well, so that both VS2015 and VS2017 are both building
similar software.
Takashi Sawanaka [Tue, 26 Dec 2017 20:29:39 +0000 (05:29 +0900)]
Merge pull request #50 from GreyMerlin/master
Old-style procedures and C++17 for more projects
GreyMerlin [Sun, 24 Dec 2017 22:04:15 +0000 (14:04 -0800)]
Compile Merge subprojects w/ C++17 language rules.
* Force the **ShellExtensions**, and the various **Poco** sub-projects
to be compiled with C++17 language semantics.
* Use `unique_ptr<>` to replace `auto_ptr<>`
* Compile **Merge** with C++17 when using the **Test* configuration.
* (unrelated) `coretools.h` is not used by **ShellExtensions**
GreyMerlin [Sun, 24 Dec 2017 21:41:54 +0000 (13:41 -0800)]
Eliminate old-style procedure declarators
* Old-style procedure declarators appeared as ...
`myFunc (a, b, c)`
` int a, c; char * b;`
`{}`
* This style is very-very old C language.
* In all modern C and C++, this procedure would be declared as ...
`myFunc (int a, char * b, int c);`
* This eliminates level-4 warning C4131: "uses old-style declarator"
* Eliminate the awkward PARAMS() macro, which was used to simulate the
new style on old compilers that lacked the new style.
* These patches only effect the DiffEngine
Takashi Sawanaka [Wed, 20 Dec 2017 12:19:56 +0000 (21:19 +0900)]
Merge pull request #49 from GreyMerlin/master
Compile Merge with C++17 language rules.
GreyMerlin [Tue, 19 Dec 2017 22:14:45 +0000 (14:14 -0800)]
Compile Merge with C++17 language rules.
* Force the **Merge** project to be compiled with C++17 language
semantics.
* Ignore future (C++20?) deprecation warnings.
* Use `unique_ptr<>` to replace `auto_ptr<>`
* Force the **UnitTests** project to be compiled with the C++14
language semantics. To move this project forward to C++17 will require
a Google Tests framework that is compatible with C++17.
Takashi Sawanaka [Mon, 11 Dec 2017 22:24:02 +0000 (07:24 +0900)]
ccrystaltextmakers.cpp: Fix crash when searching or replacing text after reloading files
Takashi Sawanaka [Fri, 8 Dec 2017 22:03:22 +0000 (07:03 +0900)]
Merge pull request #47 from GreyMerlin/master
update to newest VS2017 Release 15.5
GreyMerlin [Thu, 7 Dec 2017 20:50:00 +0000 (12:50 -0800)]
VS2017 15.5.0 updated version in .sln file
GreyMerlin [Thu, 7 Dec 2017 01:51:29 +0000 (17:51 -0800)]
Fix Boost's checking for new VS2017 Version 15.5.0
* Update 5 (dated Oct 2017) changes _MSC_VER to 1912. See
https://blogs.msdn.microsoft.com/vcblog/2017/11/15/msvc-conformance-improvements-in-visual-studio-2017-version-15-5/
* This cause lots of compilation messages (neither Errors nor Warnings)
with the text "Unknown compiler version - please run the configure
tests and report the results". I have *not* reported this new issue to
Boost.org (they will eventually catchup without my help)
* This tiny patch will prevent those compilation messages until a newer
version of Boost becomes available and WinMerge chooses to adopt it.
* Since this has been a hard message to find twice now (previously with
VS2017 15.3.0), I have added a new filter Boost to the Solution
Explorer, containing a very small selection of boost configuration
files. Boost itself is too large to include either completely, or even
the reasonably small subset of boost files that WinMerge uses.
* Mimic changes also for VS2015 to add the Boost filter to the Solution
Explorer, even though this problem will never occur with VS2015
GreyMerlin [Thu, 7 Dec 2017 01:25:38 +0000 (17:25 -0800)]
VS2017 - 15.5.0 kludge for GTest UnitTests
* Using the latest (and just released) version 15.5.0 of VS2017
introduces the following error into the UnitTests project ...
"error C4996: 'std::tr1': warning STL4002: The non-Standard std::tr1
namespace and TR1-only machinery are deprecated and will be REMOVED.
You can define _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING to
acknowledge that you have received this warning. "
* MSDN claims that this is a C++17 language standards issue, but I was
not able to solve this problem by specifying the use of the C++14
standard language (the Properties control for this is likewise a new
feature of version 15.5.0) See...
https://docs.microsoft.com/en-us/cpp/cpp-conformance-improvements-2017
* The only simple, short-term solution that I could come up with was to
simply follow the suggestion of defining the _SILENCE_TR1_xxx token as
given above.
* Even though this problem has been discussed in the GoogleTest github
forum since at least 6 June, the underlying problem remains un-resolved
at this hour ...
See https://github.com/google/googletest/issues/1111
See https://github.com/google/googletest/issues/1320
See https://github.com/google/googletest/pull/1311
* I will assume that Google's resolution of this problem will require
WinMerge to adopt the newest GoogleTest framework (which is likely a
good idea anyway). I will keep an eye on their progress and resolution
and advise accordingly. In the meantime, this kludge allows WinMerge's
UnitTests project to compile and execute correctly.
Takashi Sawanaka [Mon, 4 Dec 2017 15:13:07 +0000 (00:13 +0900)]
ctextmarkerdlg.cpp: Fix an issue in which the list view item is not selected in the Marker dialog box after activating the search marker.
Takashi Sawanaka [Wed, 29 Nov 2017 22:10:56 +0000 (07:10 +0900)]
PropGeneral.h: Fix mixed eol-style
Takashi Sawanaka [Wed, 29 Nov 2017 22:08:31 +0000 (07:08 +0900)]
MessageBoxDialog.*, PropRegistry.*: Add tooltips
Takashi Sawanaka [Sun, 26 Nov 2017 16:17:15 +0000 (01:17 +0900)]
crystaltextview.cpp: Remove a warning
Takashi Sawanaka [Sun, 26 Nov 2017 16:16:18 +0000 (01:16 +0900)]
Update *.po files
H.Saido [Sun, 26 Nov 2017 10:47:17 +0000 (19:47 +0900)]
Add VHDL syntax highlighter
Takashi Sawanaka [Sun, 19 Nov 2017 22:29:46 +0000 (07:29 +0900)]
editlib: Fix syntax and diff hilighting not work properly in wrapped lines(2)
Takashi Sawanaka [Tue, 14 Nov 2017 15:31:32 +0000 (00:31 +0900)]
Manual: Update 'Comparing and merging text files' section
Takashi Sawanaka [Tue, 14 Nov 2017 15:30:51 +0000 (00:30 +0900)]
Manual: Update 'Comparing and merging folders' section
Takashi Sawanaka [Mon, 13 Nov 2017 22:06:35 +0000 (07:06 +0900)]
Manual: Update Plugins section
Takashi Sawanaka [Wed, 8 Nov 2017 12:15:28 +0000 (21:15 +0900)]
DirCmpReportDlg.cpp: Use OptionsMgr
Takashi Sawanaka [Mon, 6 Nov 2017 22:15:17 +0000 (07:15 +0900)]
Add ReportTest.cmd
Takashi Sawanaka [Mon, 6 Nov 2017 22:12:42 +0000 (07:12 +0900)]
ccrystaltextview.cpp: Avoid crash when generating a report if editor view width is 0
Takashi Sawanaka [Mon, 6 Nov 2017 14:38:56 +0000 (23:38 +0900)]
- Make /noprefs, /ignorews, /ignoreblanklines, /ignorecase and /ignoreeol command line options re-enabled
- Add /config key=value command line option
Takashi Sawanaka [Mon, 6 Nov 2017 14:13:01 +0000 (23:13 +0900)]
Merge.cpp: Exit WinMerge after folder comparison or report creation is complete if enabled non-interactive mode
Takashi Sawanaka [Mon, 30 Oct 2017 14:27:56 +0000 (23:27 +0900)]
PropGeneral.*: Load language combobox list asynchronously in order to avoid blocking the UI(2)
Avoid possible dead lock.
Takashi Sawanaka [Sun, 29 Oct 2017 15:31:34 +0000 (00:31 +0900)]
editor addin.sct: ExecFilterCommand: Fix variable not found error when clicking the Cancel button
Takashi Sawanaka [Sun, 29 Oct 2017 14:18:14 +0000 (23:18 +0900)]
Manual: Updaate Locales section
Takashi Sawanaka [Sun, 29 Oct 2017 13:57:48 +0000 (22:57 +0900)]
Manual: The option 'Add Shell menu to context menu' no longer exists
Takashi Sawanaka [Sun, 29 Oct 2017 13:40:29 +0000 (22:40 +0900)]
Manual: Update Install section (WIP)
Takashi Sawanaka [Sun, 29 Oct 2017 12:46:28 +0000 (21:46 +0900)]
Manual: Add Compare image files section (WIP)
Takashi Sawanaka [Sun, 29 Oct 2017 12:32:46 +0000 (21:32 +0900)]
Manual: Update Quick start section
Takashi Sawanaka [Sun, 29 Oct 2017 12:07:08 +0000 (21:07 +0900)]
DirView.cpp: Remove trailing garbage from a dragged text
Takashi Sawanaka [Sat, 28 Oct 2017 16:10:09 +0000 (01:10 +0900)]
Added tag 2.14.0+-jp-142 for changeset
f0ac4689d88f
Takashi Sawanaka [Sat, 28 Oct 2017 15:48:39 +0000 (00:48 +0900)]
Manual: Update configuration section (WIP)
Takashi Sawanaka [Sat, 28 Oct 2017 15:33:33 +0000 (00:33 +0900)]
PropGeneral.*: Load language combobox list asynchronously in order to avoid blocking the UI
Takashi Sawanaka [Thu, 26 Oct 2017 14:17:05 +0000 (23:17 +0900)]
Manual: Update FAQ section
Takashi Sawanaka [Wed, 25 Oct 2017 22:49:13 +0000 (07:49 +0900)]
Manual: Update shortcut keys section
Takashi Sawanaka [Wed, 25 Oct 2017 22:13:43 +0000 (07:13 +0900)]
Manual/screenshots/*.png: Update screenshots(3)
Takashi Sawanaka [Tue, 24 Oct 2017 22:41:26 +0000 (07:41 +0900)]
Manual/screenshots/*.png: Update screenshots(2)
Takashi Sawanaka [Mon, 23 Oct 2017 21:26:43 +0000 (06:26 +0900)]
Fine-tune the widths of panels in status bar
Takashi Sawanaka [Sun, 22 Oct 2017 16:37:02 +0000 (01:37 +0900)]
Manual/screenshots/*.png: Update screenshots(1)