OSDN Git Service
Takashi Sawanaka [Thu, 19 May 2016 13:58:57 +0000 (22:58 +0900)]
Merge pull request #1 from Kirozen/master
Very small fixes
Kirozen [Wed, 18 May 2016 13:20:19 +0000 (15:20 +0200)]
Add .gitignore
Kirozen [Wed, 18 May 2016 12:35:38 +0000 (14:35 +0200)]
Fix build script
Takashi Sawanaka [Sun, 15 May 2016 14:10:20 +0000 (23:10 +0900)]
Added tag 2.14.0+-jp-105 for changeset
14a67f9aef76
Takashi Sawanaka [Sun, 15 May 2016 09:45:48 +0000 (18:45 +0900)]
BuildArc.cmd: Exclude *.*~ files
Takashi Sawanaka [Sun, 15 May 2016 09:43:34 +0000 (18:43 +0900)]
Installer: it still needs to include vcomp120.dll #2
Takashi Sawanaka [Sun, 15 May 2016 09:15:40 +0000 (18:15 +0900)]
Installer: it still needs to include vcomp120.dll
Takashi Sawanaka [Sun, 15 May 2016 08:52:34 +0000 (17:52 +0900)]
BuildArc.cmd: Exclude *.db files
Takashi Sawanaka [Sun, 15 May 2016 07:05:24 +0000 (16:05 +0900)]
Bump revision to 2.14.0+-jp-105
Takashi Sawanaka [Sun, 15 May 2016 06:56:19 +0000 (15:56 +0900)]
UniFile.cpp: NUL chars was treated as EOL chars
Takashi Sawanaka [Sun, 15 May 2016 06:27:14 +0000 (15:27 +0900)]
Fix some warnings
Takashi Sawanaka [Sun, 15 May 2016 02:02:59 +0000 (11:02 +0900)]
BCMenu.*: Remove disable_old_style
Takashi Sawanaka [Sun, 15 May 2016 01:49:54 +0000 (10:49 +0900)]
BCMenu.*: Remove m_bDynIcons
Takashi Sawanaka [Sat, 14 May 2016 21:17:33 +0000 (06:17 +0900)]
Remove unneeded use of MAKEINTRESOURCE macro
Takashi Sawanaka [Sat, 14 May 2016 05:48:21 +0000 (14:48 +0900)]
CompareMSPowerPointFiles.sct: Make texts in notes pages comparable
Takashi Sawanaka [Sat, 14 May 2016 05:33:22 +0000 (14:33 +0900)]
Include CompareMSPowerPointFiles.sct plugin in the installer
Takashi Sawanaka [Sat, 14 May 2016 04:09:41 +0000 (13:09 +0900)]
CompareMSWordFiles.sct: Make grouped shapes comparable
Takashi Sawanaka [Sat, 14 May 2016 03:54:36 +0000 (12:54 +0900)]
DirView: even if tree mode is enabled and a folder item is selected, enable Compare menu item to compare folders
Takashi Sawanaka [Sun, 8 May 2016 11:05:07 +0000 (20:05 +0900)]
DIFFRANGE::dbegin[] and dend[] do not need to be an array.
Takashi Sawanaka [Fri, 6 May 2016 02:07:50 +0000 (11:07 +0900)]
Fix some compiler warnings
Takashi Sawanaka [Thu, 5 May 2016 08:58:03 +0000 (17:58 +0900)]
Fix typo
Takashi Sawanaka [Thu, 5 May 2016 08:54:55 +0000 (17:54 +0900)]
GhostTextBuffer.*: Remove some duplicate code #2
Takashi Sawanaka [Thu, 5 May 2016 07:11:58 +0000 (16:11 +0900)]
7zCommon.cpp: Fix mixed eol-style
Takashi Sawanaka [Wed, 4 May 2016 15:37:00 +0000 (00:37 +0900)]
GhostTextBuffer.cpp: Remove some warnings
Takashi Sawanaka [Wed, 4 May 2016 14:25:34 +0000 (23:25 +0900)]
GhostTextBuffer.cpp: Remove unneeded code
Takashi Sawanaka [Wed, 4 May 2016 11:37:19 +0000 (20:37 +0900)]
Fix crash when merging
Takashi Sawanaka [Wed, 4 May 2016 11:36:13 +0000 (20:36 +0900)]
GhostTextBuffer.*: Remove some duplicate code
Takashi Sawanaka [Mon, 2 May 2016 02:18:08 +0000 (11:18 +0900)]
Fix for the warning C6001: Using uninitialized memory '...'
Takashi Sawanaka [Mon, 2 May 2016 02:06:16 +0000 (11:06 +0900)]
Fix for the warning C6262: Function uses ... bytes of stack: exceeds /analyze:stacksize:'16384'
Takashi Sawanaka [Mon, 25 Apr 2016 14:39:27 +0000 (23:39 +0900)]
Bump revision to 2.14.0+-jp-104
Takashi Sawanaka [Mon, 25 Apr 2016 14:30:06 +0000 (23:30 +0900)]
Fix for the warning C28112: A variable which is accessed via an Interlocked function must always be accessed via an Interlocked function
Takashi Sawanaka [Sun, 24 Apr 2016 12:22:01 +0000 (21:22 +0900)]
Add "Include Subfolders" checkbox in Options dialog
Takashi Sawanaka [Sun, 24 Apr 2016 09:56:24 +0000 (18:56 +0900)]
Make the maximum number of MRU items configurable
Takashi Sawanaka [Sun, 24 Apr 2016 06:21:54 +0000 (15:21 +0900)]
The third or later menu items in Recent Files Or Folders menu item were not enabled.
Takashi Sawanaka [Sun, 24 Apr 2016 02:36:36 +0000 (11:36 +0900)]
when removing lines that have synchronization points,
delete paired synchronization points in other editor pane.
fixes #45
Takashi Sawanaka [Sat, 9 Apr 2016 11:12:06 +0000 (20:12 +0900)]
ClipBoard.*: Check GlobalLock() return value
Takashi Sawanaka [Sat, 9 Apr 2016 10:48:03 +0000 (19:48 +0900)]
Plugins.cpp: Remove unused functions
Takashi Sawanaka [Sat, 9 Apr 2016 09:13:22 +0000 (18:13 +0900)]
DiffList.cpp: Fix typo
Takashi Sawanaka [Sat, 9 Apr 2016 02:36:48 +0000 (11:36 +0900)]
Compare result was not correct when using Synchronization Point
Takashi Sawanaka [Sat, 9 Apr 2016 02:12:47 +0000 (11:12 +0900)]
LanguageSelect.cpp: Fix crash if *.po files are unmatched with MergeLang.dll
Takashi Sawanaka [Sun, 27 Mar 2016 11:10:24 +0000 (20:10 +0900)]
Update winimerge to changeset 93:
d588b6726a7f
Takashi Sawanaka [Sun, 27 Mar 2016 09:26:47 +0000 (18:26 +0900)]
Retry to upgrade project files to VS2015
Takashi Sawanaka [Mon, 21 Mar 2016 15:45:01 +0000 (00:45 +0900)]
Add CompareMSPowerPointFiles.sct
Takashi Sawanaka [Mon, 21 Mar 2016 15:44:32 +0000 (00:44 +0900)]
CompareMSExcelFiles.sct: Make grouped shapes comparable
Takashi Sawanaka [Mon, 21 Mar 2016 15:42:49 +0000 (00:42 +0900)]
CompareMSExcelFiles.sct: Optimize comparing formulas
Takashi Sawanaka [Mon, 21 Mar 2016 15:40:49 +0000 (00:40 +0900)]
CompareMSExcelFiles.sct: All cell values were not compared when including "#REF!" in cells
Takashi Sawanaka [Sun, 20 Mar 2016 14:05:43 +0000 (23:05 +0900)]
MergeDoc.cpp: Fix mixed eol-style
Takashi Sawanaka [Mon, 14 Mar 2016 15:34:24 +0000 (00:34 +0900)]
Bump revision to 2.14.0+-jp-103
Takashi Sawanaka [Mon, 14 Mar 2016 15:33:11 +0000 (00:33 +0900)]
Downgrade project file from VS2015 to VS2013 (2)
Takashi Sawanaka [Mon, 14 Mar 2016 15:30:47 +0000 (00:30 +0900)]
Update translations
Takashi Sawanaka [Mon, 14 Mar 2016 15:29:05 +0000 (00:29 +0900)]
Add "Ignore codepage differences" option
Takashi Sawanaka [Mon, 14 Mar 2016 15:24:32 +0000 (00:24 +0900)]
MergeStatusBar.*: Colorize encoding and EOL differeces in status bar
Takashi Sawanaka [Sat, 12 Mar 2016 23:41:45 +0000 (08:41 +0900)]
Move the statusbar related code from ChildFrm.* to MergeStatusBar.*
Takashi Sawanaka [Sat, 5 Mar 2016 10:10:35 +0000 (19:10 +0900)]
Fix build error when cloning from github.com/sdottaka/winmerge-v2
Takashi Sawanaka [Sat, 27 Feb 2016 12:25:26 +0000 (21:25 +0900)]
Bump revision to 2.14.0+-jp-102
Takashi Sawanaka [Sat, 27 Feb 2016 12:25:02 +0000 (21:25 +0900)]
Give priority to UTF-8 detection even in the case of using mlang.dll
Takashi Sawanaka [Sat, 27 Feb 2016 11:39:45 +0000 (20:39 +0900)]
"Filter comments" feature did not work properly in the case of issue #41
Takashi Sawanaka [Sat, 27 Feb 2016 11:31:48 +0000 (20:31 +0900)]
CompareMSExcelFiles.sct: Add support for xltx and xltm file extensions
Takashi Sawanaka [Sat, 27 Feb 2016 11:29:41 +0000 (20:29 +0900)]
Fix crash when moving from a folder to another folder without closing the descendant File Compare window
Takashi Sawanaka [Sun, 21 Feb 2016 15:43:22 +0000 (00:43 +0900)]
Bump revision to 2.14.0+-jp-101
Takashi Sawanaka [Sun, 21 Feb 2016 12:08:22 +0000 (21:08 +0900)]
Reduce MFC dependency
Takashi Sawanaka [Sat, 20 Feb 2016 11:48:33 +0000 (20:48 +0900)]
'Ignore reparse point' option did not work properly. (And a fix for that folder filters were applied twice)
Takashi Sawanaka [Sat, 20 Feb 2016 01:01:20 +0000 (10:01 +0900)]
Use DlgUtils
Takashi Sawanaka [Sat, 20 Feb 2016 00:59:02 +0000 (09:59 +0900)]
TrDialogs.h: Use CRTP
Takashi Sawanaka [Mon, 15 Feb 2016 14:23:02 +0000 (23:23 +0900)]
Bump revision to 2.14.0+-jp-100
Takashi Sawanaka [Sun, 14 Feb 2016 08:30:15 +0000 (17:30 +0900)]
Move a part of CMainFrame::OnToolsGeneratePatch() to DirView and MergeDoc
Takashi Sawanaka [Sun, 14 Feb 2016 05:37:56 +0000 (14:37 +0900)]
Use CheckDlgButton() instead of SetDlgItemChecked()
Takashi Sawanaka [Sun, 14 Feb 2016 04:55:46 +0000 (13:55 +0900)]
OpenDlg: Add Read-only checkbox to OpenDlg (2)
Takashi Sawanaka [Sun, 14 Feb 2016 03:46:38 +0000 (12:46 +0900)]
Change eol-style to CRLF
Takashi Sawanaka [Sun, 14 Feb 2016 03:43:17 +0000 (12:43 +0900)]
Merge.rc: Clean-up Merge.rc
Takashi Sawanaka [Sun, 14 Feb 2016 03:32:08 +0000 (12:32 +0900)]
resource.h: clean up resource.h
Takashi Sawanaka [Sun, 14 Feb 2016 03:24:43 +0000 (12:24 +0900)]
OpenDlg: Add Read-only checkbox to OpenDlg
Takashi Sawanaka [Sun, 14 Feb 2016 02:26:19 +0000 (11:26 +0900)]
OpenDlg: Fix for invisible cursor
Takashi Sawanaka [Sun, 14 Feb 2016 01:24:00 +0000 (10:24 +0900)]
Add the following methods:
CTrDialog::SetDlgItemChecked()
CTrDialog::EnableDlgItem()
CTrDialog::SetDlgItemFocus()
CTrDialog::GetDlgItemText()
CTrDialog::SetDlgItemText()
Takashi Sawanaka [Sun, 7 Feb 2016 01:30:07 +0000 (10:30 +0900)]
Reduce Merge.h dependency
Takashi Sawanaka [Sat, 6 Feb 2016 10:42:04 +0000 (19:42 +0900)]
resource.h: Renumber resource IDs
Takashi Sawanaka [Sat, 6 Feb 2016 01:55:32 +0000 (10:55 +0900)]
Merge.rc: To prevent that VisualStudio edits Version Info block, move it to Merge2.rc
Takashi Sawanaka [Sat, 6 Feb 2016 01:44:28 +0000 (10:44 +0900)]
Make Merge.rc editable by Visual Studio
Takashi Sawanaka [Sun, 31 Jan 2016 11:31:21 +0000 (20:31 +0900)]
Cppcheck: Unused variable: ...
Takashi Sawanaka [Sun, 31 Jan 2016 11:30:49 +0000 (20:30 +0900)]
Cppcheck: The scope of the variable '...' can be reduced.
Takashi Sawanaka [Sun, 31 Jan 2016 09:54:18 +0000 (18:54 +0900)]
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.
Takashi Sawanaka [Sun, 31 Jan 2016 09:44:42 +0000 (18:44 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 31 Jan 2016 08:28:06 +0000 (17:28 +0900)]
Remove THIS_FILE
Takashi Sawanaka [Sun, 31 Jan 2016 07:01:55 +0000 (16:01 +0900)]
Simplify SharedFilterDlg code
Takashi Sawanaka [Sun, 31 Jan 2016 00:38:08 +0000 (09:38 +0900)]
Cppcheck: C-style pointer casting
Takashi Sawanaka [Sat, 30 Jan 2016 14:50:35 +0000 (23:50 +0900)]
Reduce logo.jpg file size
Takashi Sawanaka [Sat, 30 Jan 2016 11:11:56 +0000 (20:11 +0900)]
Add "Swap Panes" menu item to Folder Compare Window (2)
Takashi Sawanaka [Fri, 29 Jan 2016 14:46:43 +0000 (23:46 +0900)]
Added tag 2.14.0+-jp-99 for changeset
30d78e69eb15
Takashi Sawanaka [Wed, 27 Jan 2016 14:41:16 +0000 (23:41 +0900)]
Bump revision to 2.14.0+-jp-99
Takashi Sawanaka [Wed, 27 Jan 2016 14:38:22 +0000 (23:38 +0900)]
DirActions.cpp: Fix crash when removing files
Takashi Sawanaka [Mon, 25 Jan 2016 15:04:44 +0000 (00:04 +0900)]
Update translations (5)
Takashi Sawanaka [Mon, 25 Jan 2016 15:03:57 +0000 (00:03 +0900)]
Update translations (4)
Takashi Sawanaka [Mon, 25 Jan 2016 15:01:44 +0000 (00:01 +0900)]
Update translations (3)
Takashi Sawanaka [Mon, 25 Jan 2016 14:58:05 +0000 (23:58 +0900)]
Update translations (2)
Takashi Sawanaka [Mon, 25 Jan 2016 14:57:10 +0000 (23:57 +0900)]
Update translations (1)
Takashi Sawanaka [Mon, 25 Jan 2016 14:56:16 +0000 (23:56 +0900)]
Bump revision to 2.14.0+-jp-98
Takashi Sawanaka [Mon, 25 Jan 2016 14:53:34 +0000 (23:53 +0900)]
Translations: Use unique ID instead of line number to identify resource strings.
This makes commit size small when modified the Merge.rc file.
Takashi Sawanaka [Sun, 24 Jan 2016 07:45:24 +0000 (16:45 +0900)]
Add 48x48 icons(5)
Takashi Sawanaka [Sun, 24 Jan 2016 07:44:55 +0000 (16:44 +0900)]
Add 48x48 icons(4)
Takashi Sawanaka [Sun, 24 Jan 2016 07:44:21 +0000 (16:44 +0900)]
Add 48x48 icons(3)