OSDN Git Service
Takashi Sawanaka [Mon, 22 Oct 2018 14:04:46 +0000 (23:04 +0900)]
Installer: Upgrade to 7-Zip 18.05
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
Takashi Sawanaka [Sat, 20 Oct 2018 13:32:38 +0000 (22:32 +0900)]
DownloadDeps.cmd: Upgrade to 7-Zip 18.05
Takashi Sawanaka [Sat, 20 Oct 2018 13:20:19 +0000 (22:20 +0900)]
Merge
Takashi Sawanaka [Sat, 20 Oct 2018 13:19:57 +0000 (22:19 +0900)]
Merge.rc: Widen 'Folder: Filter' and 'File: Unpacker Plugin' label in OpenDialog
Takashi Sawanaka [Sat, 20 Oct 2018 13:13:43 +0000 (22:13 +0900)]
CrystalEdit/Sample: Fix memory leak
Takashi Sawanaka [Sat, 20 Oct 2018 13:13:02 +0000 (22:13 +0900)]
CrystalEdit/Sample: Fix link error
Takashi Sawanaka [Sat, 20 Oct 2018 13:11:01 +0000 (22:11 +0900)]
Update Japanese translation
Takashi Sawanaka [Sat, 20 Oct 2018 13:08:14 +0000 (22:08 +0900)]
ArchiveSupport: Upgrade to 7-Zip 18.05
Tim Gerundt [Fri, 19 Oct 2018 03:59:15 +0000 (05:59 +0200)]
Use "c-format" only if nessary in POT file
Tim Gerundt [Fri, 19 Oct 2018 03:53:22 +0000 (05:53 +0200)]
Update German translation a little bit
Takashi Sawanaka [Mon, 15 Oct 2018 22:03:19 +0000 (07:03 +0900)]
Merge pull request #98 from GreyMerlin/master
Improve OpenView's Status layout
GreyMerlin [Mon, 15 Oct 2018 06:28:03 +0000 (23:28 -0700)]
Improve OpenView's Status layout (2)
* Move "Status Text" to the Left margin and make it full width
GreyMerlin [Sun, 14 Oct 2018 03:10:23 +0000 (20:10 -0700)]
More updates to 2.15.5 changelog
GreyMerlin [Sat, 13 Oct 2018 06:08:42 +0000 (23:08 -0700)]
Improve OpenView's Status layout (1)
* Status marked by light-gray line above, full width at bottom of dialog
* 12 fewer vertical pixels overall, but still 17 pixels more than original
* Added a few comments
GreyMerlin [Sat, 13 Oct 2018 15:30:03 +0000 (08:30 -0700)]
Further tweak to sizecbar.*
* Eliminate "old creation method" as it is no longer used or needed.
Takashi Sawanaka [Mon, 15 Oct 2018 16:00:34 +0000 (01:00 +0900)]
Fix release build error (2)
Takashi Sawanaka [Mon, 15 Oct 2018 14:13:51 +0000 (23:13 +0900)]
BuildArc.cmd: Eliminate error messages when running createrelease.cmd
Takashi Sawanaka [Mon, 15 Oct 2018 14:03:53 +0000 (23:03 +0900)]
Installer: Remove an unused variable
Takashi Sawanaka [Mon, 15 Oct 2018 13:06:30 +0000 (22:06 +0900)]
Bump revision to 2.15.5
Takashi Sawanaka [Mon, 15 Oct 2018 13:03:15 +0000 (22:03 +0900)]
DiffTextBuffer.cpp: Last line was not saved when last line has no EOL
Takashi Sawanaka [Mon, 15 Oct 2018 11:36:03 +0000 (20:36 +0900)]
Fix release build error
Takashi Sawanaka [Sat, 13 Oct 2018 12:18:40 +0000 (21:18 +0900)]
sizecbar.*: partially revert back to BOOL
Takashi Sawanaka [Fri, 12 Oct 2018 18:07:09 +0000 (03:07 +0900)]
Merge pull request #97 from GreyMerlin/master
Reorganize the OpenView dialog, plus ...
GreyMerlin [Thu, 11 Oct 2018 23:31:37 +0000 (16:31 -0700)]
Reorganize OpenView dialog (5)
* Update the `*.pot` and `*.po` files
GreyMerlin [Thu, 11 Oct 2018 23:29:20 +0000 (16:29 -0700)]
Reorganize OpenView dialog (4)
* Allow more room for translation with **Read-Only** and **Swap** buttons.
GreyMerlin [Thu, 11 Oct 2018 22:33:20 +0000 (15:33 -0700)]
`BOOL` becomes `bool` and related (2)
* Implicit assignment conversions of `BOOL` to `bool` that were caught only by VS2015. However it
is good to be explicit.
GreyMerlin [Thu, 11 Oct 2018 06:42:23 +0000 (23:42 -0700)]
Add icon for "New (3 panes)" menu item
* Courtesy of **Tim Gerundt**, issue #118, see
https://bitbucket.org/winmerge/winmerge/issues/118/icon-for-new-3-panes
* I couldn't find a need to use the additional `.bmp`, `.png`, or `.ico` files provided by Tim;
nonetheless I have captured them locally, but outside of the repository
GreyMerlin [Thu, 11 Oct 2018 00:16:13 +0000 (17:16 -0700)]
Reorganize OpenView dialog (3)
* Improve the Enable/Disable logic for OpenView dialog items that are only valid for Folders or
Files.
GreyMerlin [Thu, 11 Oct 2018 00:14:26 +0000 (17:14 -0700)]
Reorganize OpenView dialog (2)
* Automatic changes by VS's Resource Editor ...
* It threw away all the comments; I had **git** put them back
* I kept the other formatting changes
GreyMerlin [Thu, 11 Oct 2018 00:09:09 +0000 (17:09 -0700)]
Reorganize OpenView dialog (1)
* Same info, improved layout
GreyMerlin [Sat, 29 Sep 2018 05:56:24 +0000 (22:56 -0700)]
`BOOL` becomes `bool` and related (1)
* Retains `BOOL` where necessary for MFC or Win API interfaces
* Retains `BOOL` in `*.c` files (GNU diffutils, and others) as `bool` is unavailable
* Mostly retains `BOOL` in CrystalEdit and BCMenu related files
* Retains `BOOL` in Poco and Boost source files.
* Retains `BOOL` when used with values other than simply `TRUE` and `FALSE`, such as values of
`-1`, or with additional flag bits. These should be modernized with some future commits.
* Also `TRUE` becomes `true` and `FALSE` becomes `false` where appropriate.
Takashi Sawanaka [Thu, 11 Oct 2018 15:00:40 +0000 (00:00 +0900)]
CompareMSExcelFiles.sct: To avoid saving the extracted sheet data as a file name containing prohibited characters, change the name of the file name
Takashi Sawanaka [Thu, 11 Oct 2018 13:47:56 +0000 (22:47 +0900)]
Remove unused header file
Takashi Sawanaka [Thu, 11 Oct 2018 13:44:13 +0000 (22:44 +0900)]
EditorFilepathBar.cpp: Remove gaps
Takashi Sawanaka [Wed, 10 Oct 2018 23:10:48 +0000 (08:10 +0900)]
Update changelog for 2.15.5
Takashi Sawanaka [Wed, 10 Oct 2018 22:58:35 +0000 (07:58 +0900)]
BCMenu.cpp: Small optimization
Takashi Sawanaka [Wed, 10 Oct 2018 13:48:02 +0000 (22:48 +0900)]
Manual: Eliminate old Version Control feature
Takashi Sawanaka [Wed, 10 Oct 2018 13:25:52 +0000 (22:25 +0900)]
StdAfx.*: Improve CWinMergeProfile
Takashi Sawanaka [Wed, 10 Oct 2018 13:06:25 +0000 (22:06 +0900)]
CrystalEdit: An optimization for large text files
Takashi Sawanaka [Mon, 8 Oct 2018 11:35:55 +0000 (20:35 +0900)]
MergeEditView.*: Remove an unused function
Takashi Sawanaka [Mon, 8 Oct 2018 11:32:15 +0000 (20:32 +0900)]
MergeEditSplitterView.h: Fix mixed eol-style
Takashi Sawanaka [Sun, 7 Oct 2018 11:14:20 +0000 (20:14 +0900)]
Please run InsertLineNumbersInPOFiles.bat if you want to insert line numbers into PO files
Takashi Sawanaka [Thu, 27 Sep 2018 15:56:29 +0000 (00:56 +0900)]
Update Dutch translation. Submitted by Thomas De Rocke
Takashi Sawanaka [Wed, 26 Sep 2018 15:32:51 +0000 (00:32 +0900)]
Merge pull request #96 from GreyMerlin/master
Eliminate old (and unfinished) Version Control feature
GreyMerlin [Tue, 25 Sep 2018 04:37:00 +0000 (21:37 -0700)]
Merge branch 'master' of https://github.com/sdottaka/winmerge-v2
Tim Gerundt [Mon, 24 Sep 2018 21:15:09 +0000 (23:15 +0200)]
Rename some more readme.txt to README.md
Tim Gerundt [Mon, 24 Sep 2018 20:52:39 +0000 (22:52 +0200)]
Rename SVN_Organisation.txt to Folder_Structure.txt
Tim Gerundt [Mon, 24 Sep 2018 20:52:07 +0000 (22:52 +0200)]
Drop readme-Subversion.html
Tim Gerundt [Mon, 24 Sep 2018 20:50:56 +0000 (22:50 +0200)]
Rename some readme.txt to README.md
Tim Gerundt [Mon, 24 Sep 2018 20:50:29 +0000 (22:50 +0200)]
Use line breaks in main README.md
GreyMerlin [Sun, 23 Sep 2018 06:56:19 +0000 (23:56 -0700)]
Merge branch 'master' of https://github.com/sdottaka/winmerge-v2
Takashi Sawanaka [Sat, 22 Sep 2018 14:10:56 +0000 (23:10 +0900)]
Test.cpp: Add some tests
Takashi Sawanaka [Sat, 22 Sep 2018 14:10:00 +0000 (23:10 +0900)]
CrystalEdit: Make loading files a little bit faster
Takashi Sawanaka [Sat, 22 Sep 2018 08:31:40 +0000 (17:31 +0900)]
Fix for the issue bitbucket#113 (2)
GreyMerlin [Fri, 21 Sep 2018 02:13:50 +0000 (19:13 -0700)]
Eliminate old (and unfinished) Version Control feature
* Update all of the `Translations/WinMerge/*.po` files
GreyMerlin [Fri, 14 Sep 2018 23:13:01 +0000 (16:13 -0700)]
Eliminate old (and unfinished) Version Control feature
Completely eliminate all interfaces to Visual SourceSafe (old and new) and to Rational ClearCase
* Remove various `*.cpp` and `*.h` files
* Remove Options properties, resources, dialogs, string table constants (this implies changes to
the `English.pot` file)
* Remove special command-line handling for ClearCase and VSS commands
* Remove access to relevant Registry Keys... Note: the keys and values themselves remain untouched
in the registry.
* Removal is for both VS2017 and VS2015
GreyMerlin [Mon, 10 Sep 2018 18:23:27 +0000 (11:23 -0700)]
minor tweak to commit
1c33ab3aa
Takashi Sawanaka [Thu, 20 Sep 2018 13:59:26 +0000 (22:59 +0900)]
Partially revert the commit
eea9420613ce. bitbucket#107
sdottaka@users.sourceforge.net [Thu, 20 Sep 2018 11:45:43 +0000 (20:45 +0900)]
Merge
sdottaka@users.sourceforge.net [Thu, 20 Sep 2018 11:43:44 +0000 (20:43 +0900)]
Fix for the issue bitbucket#113
sdottaka@users.sourceforge.net [Thu, 20 Sep 2018 11:40:19 +0000 (20:40 +0900)]
Translation: windows -> Windows
Takashi Sawanaka [Sun, 9 Sep 2018 22:52:39 +0000 (07:52 +0900)]
Delete OnUpdate*() which does not matter if deleted
sdottaka@users.sourceforge.net [Sun, 9 Sep 2018 22:22:46 +0000 (07:22 +0900)]
Fixed a problem that the file item in the folder comparison window becomes only on the right side when opening the binary comparison window from the folder comparison window
sdottaka@users.sourceforge.net [Sun, 9 Sep 2018 22:17:32 +0000 (07:17 +0900)]
Partial fix for bitbucket#113
sdottaka@users.sourceforge.net [Sun, 9 Sep 2018 21:34:54 +0000 (06:34 +0900)]
Update translations
Takashi Sawanaka [Sun, 9 Sep 2018 02:15:36 +0000 (11:15 +0900)]
Merge
Takashi Sawanaka [Sun, 9 Sep 2018 02:11:11 +0000 (11:11 +0900)]
Update Dutch translation. Submitted by Thomas De Rocker
Takashi Sawanaka [Sun, 9 Sep 2018 01:41:54 +0000 (10:41 +0900)]
Update translations
Takashi Sawanaka [Thu, 6 Sep 2018 21:15:24 +0000 (06:15 +0900)]
Merge pull request #95 from GreyMerlin/master
Improvements to `CSuperComboBox` and Other Changes ...
GreyMerlin [Mon, 25 Jun 2018 21:53:31 +0000 (14:53 -0700)]
Update Poco SharedMemory to current Poco standard (2)
- Cleanup additional default parameter comments.
GreyMerlin [Wed, 5 Sep 2018 00:21:49 +0000 (17:21 -0700)]
Improvements to CSuperComboBox (11)
- Fix warnings with 32-bit builds
GreyMerlin [Wed, 5 Sep 2018 00:16:17 +0000 (17:16 -0700)]
Improve label text on the Open Dialog View tab
- Change "3rd(optional)" to "(optional) 3rd" for visual alignment.
- Improve messages regarding invalid path names by including the
ordinals (e.g. 1st, 2nd, 3rd) in the message text.
GreyMerlin [Tue, 4 Sep 2018 23:05:14 +0000 (16:05 -0700)]
Add to "Visual C++ loose" filter
- Add the files `*.idb` and `*.VC.db` to the filter. These are both
large binary files.
GreyMerlin [Tue, 4 Sep 2018 23:02:25 +0000 (16:02 -0700)]
Fix "Spanish translation in Codepage" error
- Fix BitBucket [Issue #108: "Spanish translation in Codepage"]
(https://bitbucket.org/winmerge/winmerge/issues/108/spanish-translation-in-codepage)
GreyMerlin [Tue, 4 Sep 2018 22:58:18 +0000 (15:58 -0700)]
"Open Dialog Auto-Completion" == "From MRU list" now fixed
- The option "Open Dialog Auto-Completion" (on the "Options
(General)" setting page) failed to work correctly when set to the value
"From MRU list". This appears to have been true since the
`2.13.11+-jp-8` commit on 04/18/2010 when the ComboBoxes for
file/folder selection were changed to use the the "ComboBoxEx32" common
control. The failure occurs because `FindString()`, which is used in
`CSuperComboBox::OnEditchange()`, is only valid for CComboBox but not
CComboBoxEx.
- This patch restores the "From MRU list" functionality, but
necessarily builds it upon the recent "Improvements to CSuperComboBox"
changes.
- It should also be noted that "From MRU list" provides a very limited
functionality when compared to the "From file system". This was
true even with WinMerge versions 2.13.10 and earlier.
GreyMerlin [Tue, 4 Sep 2018 21:55:41 +0000 (14:55 -0700)]
Improvements to CSuperComboBox (10)
* Proper name for `m_sFullStateText`
GreyMerlin [Tue, 4 Sep 2018 04:09:46 +0000 (21:09 -0700)]
Improvements to CSuperComboBox (9)
* Eliminate the "AddTemplate" and "AutoAdd" capabilities of
`CSuperComboBox`. They are never used and it is likely that their
logic is incomplete or incorrect.
* Eliminate the `bAdd` and `idstrAddText`parameters from the
`CSuperComboBox` constructor. Again, they are never used and have no
meaning without the "AutoAdd" capability.
GreyMerlin [Tue, 4 Sep 2018 03:59:07 +0000 (20:59 -0700)]
Improvements to CSuperComboBox (8)
* When inserting 'long' file paths into the ListView associated with
the `CSuperComboBox`, replace the middle of the file path string with an
` ... `.
* Since the ListView is limited to 255 characters, and that is itself
really too long to view (even in a really wide SuperComboBox), the
current algorithm breaks long file paths into two 72-character strings
(leading and trailing), finds convenient folder name boundaries (if
any) thus possibly further shortening those leading and trailing
sub-strings and then concatenates them back together with the ellipsis
` ... ` in the middle.
GreyMerlin [Sun, 2 Sep 2018 06:12:25 +0000 (23:12 -0700)]
Improvements to CSuperComboBox (7)
* FINALLY ... the substance of this whole effort!
- Keep a parallel copy of the file name text to allow for extended
length path names that are longer than the 255 character limit imposed
by ComboBoxEx.
- modify the way that the CSuperComboBox is initialized, so that more
state information is known throughout the life of the control, not just
within the `LoadState` and `SaveState` procedures.
GreyMerlin [Thu, 30 Aug 2018 06:09:01 +0000 (23:09 -0700)]
Improvements to CSuperComboBox (6)
- continued improvements to `LoadState()` and `SaveState()`
- Completely remove the changes from the SuperComboBox (5) commit.
Saving the state with the `Esc` key or `Cancel` button really is an
important feature.
GreyMerlin [Wed, 29 Aug 2018 19:57:02 +0000 (12:57 -0700)]
Improvements to CSuperComboBox (5)
- Don't save OpenDialog state when closed via Esc or Cancel. This
(the saving of the combobox states) seemed like an odd behavior of
Cancel, and is not mimicked if the dialog was closed by WinMerge's
termination.
GreyMerlin [Wed, 29 Aug 2018 19:26:41 +0000 (12:26 -0700)]
Improvements to CSuperComboBox (4)
- modernize many `BOOL` to `bool`
- reorganize layout of `SuperComboBox.h`
- better internal detection of "Optional" third file control. Better
handling of that control's "empty" state.
- Minor code cleanup, not affecting overall logic.
- Add comments to procedure parameters with default values.
GreyMerlin [Mon, 20 Aug 2018 19:53:26 +0000 (12:53 -0700)]
Improvements to CSuperComboBox (3)
- Simplify `IsComboBox()` checking and make it `const` and `private`
GreyMerlin [Mon, 20 Aug 2018 18:42:23 +0000 (11:42 -0700)]
Improvements to CSuperComboBox (2)
- Comments and simple text edits
GreyMerlin [Mon, 25 Jun 2018 21:54:08 +0000 (14:54 -0700)]
Improvements to CSuperComboBox
GreyMerlin [Mon, 25 Jun 2018 21:53:31 +0000 (14:53 -0700)]
Update Poco SharedMemory to current standard
- Eliminate unused parameters
GreyMerlin [Fri, 17 Aug 2018 21:27:20 +0000 (14:27 -0700)]
"Private Build" is now easy and useful for developers
* A Private Build string can now be #defined in `version.h`; the
default value is an empty string (as it should be for all released
versions of **WinMerge**). This value propagates into the
VersionInfo block via the `Merge2.rc` file, and is therefore available
to all checking of the VersionInfo block of the `.exe` file.
* The About dialog is modified to remove the separate line that
displayed the "Private Build:" information in the past, as that line
overlapped the "Copyright" text immediately below. The "Private Build"
info is now displayed on the same line as the Version, separated by
" + ". There is room for about 11 characters of "Private Build" text.
* The Configuration Log File now indicates the Private Build
information following the Version, rather that simply stating
"(Private Build)"
* Cleanup the mechanics of getting the "Private Build" information into
the About dialog.
* Also a few trivial code and comment changes.
sdottaka@users.sourceforge.net [Sat, 1 Sep 2018 15:34:59 +0000 (00:34 +0900)]
Restore lost translations
sdottaka@users.sourceforge.net [Sat, 1 Sep 2018 14:48:37 +0000 (23:48 +0900)]
Merge.rc: Make setting button in OpenDlg wider. bitbucket#111
sdottaka@users.sourceforge.net [Sat, 1 Sep 2018 14:03:08 +0000 (23:03 +0900)]
Attempt to fix bitbucket#109
sdottaka@users.sourceforge.net [Sat, 1 Sep 2018 13:19:56 +0000 (22:19 +0900)]
Update translations
Takashi Sawanaka [Sat, 18 Aug 2018 12:53:01 +0000 (21:53 +0900)]
Merge
Takashi Sawanaka [Sat, 18 Aug 2018 11:21:06 +0000 (20:21 +0900)]
Merge pull request #94 from GreyMerlin/master
Adapt to latest VS2017 version 15.8, and more ...
GreyMerlin [Fri, 17 Aug 2018 00:52:31 +0000 (17:52 -0700)]
Adapt to latest VS2017 version 15.8 (2)
* Update the presentation of the Visual Studio Version in the WinMerge
Configuration Log file.
GreyMerlin [Fri, 17 Aug 2018 00:49:51 +0000 (17:49 -0700)]
Add new node to Solution Explorer for a few gtest files
* With the testing for the recent `gtest` bug it became convenient to
have a new filter node in the Solution Explorer for making the code
visible to Intellisense. Additional files beyond simply
`gtest-printers.h` were necessary to prevent Intellisense from
presuming various configuration errors.
* The Solution Explorer additions are copied into VS2015, simply for
consistency
GreyMerlin [Fri, 17 Aug 2018 00:43:56 +0000 (17:43 -0700)]
Adapt to latest VS2017 version 15.8
* As is often the case, the boost library needs to update its warning
message for the new compiler version.
* There is a bug in the gtest software; it is using a non-portable
`operator<<` overload. The ambiguity of this usage is now being
flagged as an error by version 15.8. There have been many updates to
the gtest software since the version incorporated into WinMerge, but
fortunately the "accepted" and merged solution to this problem simply
drops into WinMerge without issue (although I've added some comments
referencing the gtest PR#1620 -
https://github.com/google/googletest/pull/1620)
* Unfortunately, in order to trigger the source code in gtest PR#1620,
the value of the predefined macro `__cplusplus` must be accurate. For
various reasons (see
https://blogs.msdn.microsoft.com/vcblog/2018/04/09/msvc-now-correctly-reports-__cplusplus/)
the compiler option `Zc:__cplusplus` must be set in order to generate
correct values for `__cplusplus`. The changes to the
`*.vs2017.vcxproj`file accomplish this. Note that the elimination of
the "additional option" `/EHa` is acceptable because that option is
properly specified elsewhere in the project's build properties.
GreyMerlin [Fri, 17 Aug 2018 00:12:22 +0000 (17:12 -0700)]
Correct Extended Length Path Name handling on UNC
* Too many `\\` characters were being inserted when forming Extended
Length Path Names on UNC (i.e. Network Storage) devices. This is a bug
in the original Poco library code
* Cleanup awkward code in `SuperComboBox.cpp` for detecting and
handling UNC file path names.