OSDN Git Service
sdottaka [Mon, 27 Oct 2014 03:19:29 +0000 (12:19 +0900)]
Merge with stable
sdottaka [Mon, 27 Oct 2014 03:04:49 +0000 (12:04 +0900)]
Externals/winimerge: update winimerge to 0.9.5.0
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 03:01:05 +0000 (12:01 +0900)]
HTML Report: modernize html reports
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 02:38:00 +0000 (11:38 +0900)]
Merge.cpp: Restore window before showing messagebox
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 02:35:54 +0000 (11:35 +0900)]
DirView.cpp: Fix crash while creating folder compare report
--HG--
branch : stable
sdottaka [Mon, 27 Oct 2014 01:12:33 +0000 (10:12 +0900)]
ccrystaltextview.cpp: merge text blocks if possible to decrease html report size
--HG--
branch : stable
sdottaka [Sat, 25 Oct 2014 00:34:42 +0000 (09:34 +0900)]
Removed tag 2.13.13+-JP-11
--HG--
branch : stable
sdottaka [Tue, 21 Oct 2014 06:57:27 +0000 (15:57 +0900)]
Merge with stable
sdottaka [Tue, 21 Oct 2014 06:53:18 +0000 (15:53 +0900)]
.hgsub: Add subpaths magic described at (mercurial.selenic.com/wiki/Subrepository)
--HG--
branch : stable
sdottaka [Thu, 16 Oct 2014 13:29:27 +0000 (22:29 +0900)]
Bump revision to 2.14.0+-jp-58
--HG--
branch : stable
sdottaka [Thu, 16 Oct 2014 13:28:48 +0000 (22:28 +0900)]
DirView.cpp: Compare folders in a new tab when the Ctrl key is pressed
--HG--
branch : stable
sdottaka [Thu, 16 Oct 2014 13:19:29 +0000 (22:19 +0900)]
Merge.cpp: Restore main window after closing message box if main window is minimized
--HG--
branch : stable
sdottaka [Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)]
Merge with stable
sdottaka [Sun, 5 Oct 2014 12:14:23 +0000 (21:14 +0900)]
Bump revision to 2.14.0+-jp-57
--HG--
branch : stable
sdottaka [Sun, 5 Oct 2014 11:50:15 +0000 (20:50 +0900)]
Apply the patch below:
[Fix for MFC 8.0 MDI Maximizing Child Window bug on Vista]
https://groups.google.com/forum/#!topic/microsoft.public.vc.mfc/iajCdW5DzTM
--HG--
branch : stable
sdottaka [Fri, 3 Oct 2014 01:08:20 +0000 (10:08 +0900)]
Update .hgsub
sdottaka [Fri, 3 Oct 2014 01:08:20 +0000 (10:08 +0900)]
Update .hgsub
--HG--
branch : stable
sdottaka [Fri, 3 Oct 2014 00:59:31 +0000 (09:59 +0900)]
Fix broken .hgsubstate
sdottaka [Thu, 2 Oct 2014 18:13:55 +0000 (03:13 +0900)]
Merge with stable
sdottaka [Thu, 2 Oct 2014 17:35:06 +0000 (02:35 +0900)]
Fix a compilation error (debug build)
--HG--
branch : stable
sdottaka [Thu, 2 Oct 2014 16:49:09 +0000 (01:49 +0900)]
MainFrm.cpp: Remove accidently duplicated code
sdottaka [Thu, 2 Oct 2014 16:29:51 +0000 (01:29 +0900)]
Constify some methods
--HG--
branch : stable
sdottaka [Thu, 2 Oct 2014 10:02:34 +0000 (19:02 +0900)]
DirView.*: Delete unnecessary CDirView::OnPluginsList()function
--HG--
branch : stable
sdottaka [Thu, 2 Oct 2014 08:41:31 +0000 (17:41 +0900)]
Merge with stable
sdottaka [Sun, 28 Sep 2014 17:18:44 +0000 (02:18 +0900)]
Added tag 2.14.0+-jp-56 for changeset
ce5a7809b9d5
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 17:02:31 +0000 (02:02 +0900)]
Bump revision to 2.14.0+-jp-56
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 17:01:53 +0000 (02:01 +0900)]
Update winimerge to changeset 32:
2b34fc4b2abf
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 17:01:20 +0000 (02:01 +0900)]
ImgMergeFrm.cpp: Did not remove *.ficache file when exiting WinMerge
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 16:57:17 +0000 (01:57 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 16:55:59 +0000 (01:55 +0900)]
Assign Ctrl+0 to reset zoom ratio
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 02:53:14 +0000 (11:53 +0900)]
Bump revison to 2.14.0+-jp-55
--HG--
branch : stable
sdottaka [Sun, 28 Sep 2014 02:52:01 +0000 (11:52 +0900)]
ImgMergeFrm.cpp: Display (x, y), RGBA and color distance in status bar
--HG--
branch : stable
sdottaka [Sat, 27 Sep 2014 12:03:44 +0000 (21:03 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 27 Sep 2014 11:56:03 +0000 (20:56 +0900)]
Merge.rc: move menu items
--HG--
branch : stable
sdottaka [Sat, 27 Sep 2014 05:04:42 +0000 (14:04 +0900)]
BCMenu.cpp: Optimization: avoid creating toolbar window if not needed
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 22:20:26 +0000 (07:20 +0900)]
HexView: Implement "Reload" menu item
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 15:53:22 +0000 (00:53 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 15:02:30 +0000 (00:02 +0900)]
Add "Ignore Color Difference (Color Distance Threshold)" menu item
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 04:48:11 +0000 (13:48 +0900)]
ImgMergeFram.cpp: Fix a build error on VC7.1
--HG--
branch : stable
sdottaka [Fri, 26 Sep 2014 04:37:00 +0000 (13:37 +0900)]
ImgMergeFrm.*: Implement "Reload" menu item
--HG--
branch : stable
sdottaka [Thu, 25 Sep 2014 14:50:49 +0000 (23:50 +0900)]
- ImgMergeFrm.*: Implement "Copy All To Right", "Copy All To Left", "Auto Merge" menu item
- MainFrm.cpp: Recognize the -al, -am, -ar command line switches for Image Compare
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 13:01:20 +0000 (22:01 +0900)]
Bump revision to 2.14.0+-jp-54
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 13:01:05 +0000 (22:01 +0900)]
Update BuildArc.cmd
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 12:29:06 +0000 (21:29 +0900)]
Update BuildArc.cmd
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 11:01:01 +0000 (20:01 +0900)]
ImgMergeFrm.cpp: Fix mixed eols
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 10:35:27 +0000 (19:35 +0900)]
Add a feature that creates image compare report
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 09:49:26 +0000 (18:49 +0900)]
ImgMergeFrm.cpp: Fix ansi build
--HG--
branch : stable
sdottaka [Wed, 24 Sep 2014 09:04:29 +0000 (18:04 +0900)]
MDITabBar.cpp: DrawItem(): Avoid crash when registered MDIChildFrame window is destroyed.
--HG--
branch : stable
sdottaka [Mon, 22 Sep 2014 10:48:22 +0000 (19:48 +0900)]
Bump revision to 2.14.0+-jp-53
--HG--
branch : stable
sdottaka [Mon, 22 Sep 2014 10:28:45 +0000 (19:28 +0900)]
Add a image merge feature
--HG--
branch : stable
sdottaka [Mon, 22 Sep 2014 07:48:44 +0000 (16:48 +0900)]
Move Merge Mode code in (MergeDoc.*, MergeEditView.*) to Merge.*
--HG--
branch : stable
sdottaka [Tue, 16 Sep 2014 14:08:22 +0000 (23:08 +0900)]
OptionsInit.cpp: Fix incorrect default value of zoom
--HG--
branch : stable
sdottaka [Tue, 16 Sep 2014 13:09:25 +0000 (22:09 +0900)]
Bump revision to 2.14.0+-jp-52
--HG--
branch : stable
sdottaka [Tue, 16 Sep 2014 13:08:56 +0000 (22:08 +0900)]
BuildArc.cmd: Add freeimage and winimerge to zip archive
--HG--
branch : stable
sdottaka [Tue, 16 Sep 2014 12:03:49 +0000 (21:03 +0900)]
Increment the constant OVEC_SIZE for long regexes (image file extension regex)
--HG--
branch : stable
sdottaka [Tue, 16 Sep 2014 11:54:40 +0000 (20:54 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Tue, 16 Sep 2014 11:54:07 +0000 (20:54 +0900)]
- Add a image diff feature
- Add external libraries (freeimage, winimerge)
--HG--
branch : stable
sdottaka [Thu, 11 Sep 2014 02:50:06 +0000 (11:50 +0900)]
Merge with stable
sdottaka [Thu, 11 Sep 2014 02:43:46 +0000 (11:43 +0900)]
Move frhed folder to https://bitbucket.org/sdottaka/frhed
sdottaka [Thu, 11 Sep 2014 02:32:21 +0000 (11:32 +0900)]
Move frhed folder to https://bitbucket.org/sdottaka/frhed (2)
--HG--
branch : stable
sdottaka [Thu, 11 Sep 2014 02:14:56 +0000 (11:14 +0900)]
Move frhed folder to https://bitbucket.org/sdottaka/frhed
--HG--
branch : stable
sdottaka [Tue, 2 Sep 2014 09:45:21 +0000 (18:45 +0900)]
Merge with stable
sdottaka [Mon, 1 Sep 2014 12:11:41 +0000 (21:11 +0900)]
ChildFrm.cpp: Resizing window made the hidden status bar visible again
--HG--
branch : stable
sdottaka [Mon, 1 Sep 2014 11:19:01 +0000 (20:19 +0900)]
MDITabBar.*: Make Tabbar sortable by drag-and-drop
--HG--
branch : stable
sdottaka [Mon, 1 Sep 2014 00:24:28 +0000 (09:24 +0900)]
MainFrm.*: Remove unused code
--HG--
branch : stable
sdottaka [Thu, 28 Aug 2014 16:24:50 +0000 (01:24 +0900)]
Added tag 2.14.0+-jp-51 for changeset
c309e2909e25
--HG--
branch : stable
sdottaka [Thu, 14 Aug 2014 15:30:35 +0000 (00:30 +0900)]
Bump revision to 2.14.0+-jp-51
--HG--
branch : stable
sdottaka [Thu, 14 Aug 2014 15:29:18 +0000 (00:29 +0900)]
Make the UI flat (2)
--HG--
branch : stable
sdottaka [Thu, 14 Aug 2014 15:18:21 +0000 (00:18 +0900)]
The "Defaults" button on "Syntax" Option dialog was hidden partially when hovering over the adjacent checkbox.
--HG--
branch : stable
sdottaka [Sun, 10 Aug 2014 03:35:12 +0000 (12:35 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 10 Aug 2014 03:33:31 +0000 (12:33 +0900)]
- Add margins to EditorFilepathBar
- Add "Copy" menu item to EditorFilepathBar's context menu
--HG--
branch : stable
sdottaka [Sat, 9 Aug 2014 00:56:54 +0000 (09:56 +0900)]
Bump revision to 2.14.0+-jp-50
--HG--
branch : stable
sdottaka [Sat, 9 Aug 2014 00:01:53 +0000 (09:01 +0900)]
Make the UI flat
--HG--
branch : stable
sdottaka [Tue, 29 Jul 2014 14:40:18 +0000 (23:40 +0900)]
Merge with stable
sdottaka [Mon, 28 Jul 2014 16:51:50 +0000 (01:51 +0900)]
Added tag 2.14.0+-jp-49 for changeset
16bc0c3fb82b
--HG--
branch : stable
sdottaka [Mon, 28 Jul 2014 16:51:30 +0000 (01:51 +0900)]
Bump revision to 2.14.0+-jp-49
--HG--
branch : stable
sdottaka [Mon, 28 Jul 2014 16:19:15 +0000 (01:19 +0900)]
Fix: NUL chars were lost when saving a file
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 03:26:20 +0000 (12:26 +0900)]
Bump revision to 2.14.0+-jp-48
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 03:02:47 +0000 (12:02 +0900)]
DirTravel.cpp: avoid accessing String out of bound
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 02:47:30 +0000 (11:47 +0900)]
LoadSaveCodepageDlg.cpp: Add codepage 1200(UCS2-LE) in combobox
--HG--
branch : stable
sdottaka [Sat, 26 Jul 2014 02:45:37 +0000 (11:45 +0900)]
Make WinMerge zip-comparable without 7-zip.
The side effect of this change allows the following things:
- to compare subfolders in zip files (e.g. WinMerge-2.12.0-exe.zip\WinMerge-2.12.0-exe\MergePlugins)
- to compare FTP folders (e.g. ftp://username:password@servername/dir)
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 13:11:32 +0000 (22:11 +0900)]
Bump revision to 2.14.0+-jp-47
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 11:21:43 +0000 (20:21 +0900)]
Move decompressing code from MainFrm.cpp to 7zCommon.cpp
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:20:28 +0000 (17:20 +0900)]
Add 3-way diff support to Hex View. close #34
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:09:33 +0000 (17:09 +0900)]
EditorFilepathBar.cpp: Use member initialization list instead of assignment
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:07:54 +0000 (17:07 +0900)]
Update Translations
--HG--
branch : stable
sdottaka [Sat, 19 Jul 2014 08:07:34 +0000 (17:07 +0900)]
Add "Enable Auto Max Width" menu item to Tab Bar context menu
--HG--
branch : stable
sdottaka [Sun, 13 Jul 2014 16:16:20 +0000 (01:16 +0900)]
Bump revision to 2.14.0+-jp-46
--HG--
branch : stable
sdottaka [Sun, 13 Jul 2014 15:47:09 +0000 (00:47 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 13 Jul 2014 15:45:59 +0000 (00:45 +0900)]
Add "Recompare As/XML" and "Recompare As/Binary" menu items to the "File" menu. close #33
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 05:24:09 +0000 (14:24 +0900)]
Merge with stable
sdottaka [Sun, 29 Jun 2014 04:40:12 +0000 (13:40 +0900)]
Added tag 2.14.0+-jp-45 for changeset
b57fe1e3f902
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:39:51 +0000 (13:39 +0900)]
Bump revison to 2.14.0+-jp-45
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:39:33 +0000 (13:39 +0900)]
Update Japanese translation
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:39:14 +0000 (13:39 +0900)]
MDITabBar.cpp:
- Fix compilation error with VC7.1
- Avoid floating non-active client window up when clicking it's MDITabBar close button
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 04:35:01 +0000 (13:35 +0900)]
Fix blurred icon on MDITabBar (converted 24bit icon to 32bit icon)
--HG--
branch : stable
sdottaka [Sun, 29 Jun 2014 02:37:22 +0000 (11:37 +0900)]
Use diffcode::existAll()
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 15:31:37 +0000 (00:31 +0900)]
Bump revison to 2.14.0+-jp-44
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 15:31:11 +0000 (00:31 +0900)]
Fix: unexpected icon was shown at tabbar when comparing folders non-recursively
--HG--
branch : stable
sdottaka [Sun, 22 Jun 2014 14:41:52 +0000 (23:41 +0900)]
binarydiff.ico, equalbinary.ico: Add 24-bit color icon
--HG--
branch : stable