OSDN Git Service

winmerge-jp/winmerge-jp.git
9 years agoAdd IImgMergeWindow::ReloadImages() function
sdottaka [Fri, 26 Sep 2014 04:36:04 +0000 (13:36 +0900)]
Add IImgMergeWindow::ReloadImages() function

9 years agoCImgMergeWindow.hpp: Fix a bug of FirstConflict() function
sdottaka [Thu, 25 Sep 2014 13:43:22 +0000 (22:43 +0900)]
CImgMergeWindow.hpp: Fix a bug of FirstConflict() function

9 years agoAdd IImgMergeWindow::CopyDiffAll() function and CopyDiff3Way() function
sdottaka [Thu, 25 Sep 2014 12:26:15 +0000 (21:26 +0900)]
Add IImgMergeWindow::CopyDiffAll() function and CopyDiff3Way() function

9 years agoSelect the diff when double-clicking a diff
sdottaka [Thu, 25 Sep 2014 06:17:50 +0000 (15:17 +0900)]
Select the diff when double-clicking a diff

9 years agoAdd IImgMergeWindow::GetCursorPos() function
sdottaka [Thu, 25 Sep 2014 06:15:21 +0000 (15:15 +0900)]
Add IImgMergeWindow::GetCursorPos() function

9 years agoDraw the borders of an image
sdottaka [Thu, 25 Sep 2014 06:13:12 +0000 (15:13 +0900)]
Draw the borders of an image

9 years agoAdd BuildBin_vc11.cmd for VS2012
sdottaka [Thu, 25 Sep 2014 01:41:10 +0000 (10:41 +0900)]
Add BuildBin_vc11.cmd for VS2012

9 years agoBump revision to 0.9.1.0
sdottaka [Wed, 24 Sep 2014 10:32:58 +0000 (19:32 +0900)]
Bump revision to 0.9.1.0

9 years agoAdd "Generate Report" menu item
sdottaka [Wed, 24 Sep 2014 09:56:14 +0000 (18:56 +0900)]
Add "Generate Report" menu item

9 years agoCImgMergeWindow.hpp: Implement SaveImageAs()
sdottaka [Mon, 22 Sep 2014 10:22:47 +0000 (19:22 +0900)]
CImgMergeWindow.hpp: Implement SaveImageAs()

9 years agoWinIMerge.rc: Fix typo
sdottaka [Mon, 22 Sep 2014 07:40:05 +0000 (16:40 +0900)]
WinIMerge.rc: Fix typo

9 years agoAdd GetReadOnly(), SetReadOnly(), IsUndoable(), IsRedoable() to IImgMergeWindow
sdottaka [Mon, 22 Sep 2014 07:39:15 +0000 (16:39 +0900)]
Add GetReadOnly(), SetReadOnly(), IsUndoable(), IsRedoable() to IImgMergeWindow

9 years agoMerge
sdottaka [Sun, 21 Sep 2014 05:11:28 +0000 (14:11 +0900)]
Merge

9 years agoFix build error
sdottaka [Sun, 21 Sep 2014 04:53:16 +0000 (13:53 +0900)]
Fix build error

9 years agoREADME.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:38:08 +0000 (04:38 +0000)]
README.md edited online with Bitbucket

9 years agoREADME.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:18:25 +0000 (04:18 +0000)]
README.md edited online with Bitbucket

9 years agoAdd an image merge feature
sdottaka [Sun, 21 Sep 2014 04:04:55 +0000 (13:04 +0900)]
Add an image merge feature

9 years agoAdd BuildBin.cmd and its dependencies
sdottaka [Sun, 21 Sep 2014 03:55:34 +0000 (12:55 +0900)]
Add BuildBin.cmd and its dependencies

9 years ago- Fix some cppcheck warnings
sdottaka [Tue, 16 Sep 2014 10:43:17 +0000 (19:43 +0900)]
- Fix some cppcheck warnings
- Improve zoom

9 years agoWinIMergeLib: Add new member functions as listed below:
sdottaka [Mon, 15 Sep 2014 15:09:54 +0000 (00:09 +0900)]
WinIMergeLib: Add new member functions as listed below:
virtual int  GetPaneCount() const = 0;
virtual RECT GetPaneWindowRect(int pane) const = 0;
virtual RECT GetWindowRect() const = 0;
virtual COLORREF GetDiffColor() const = 0;
virtual void SetDiffColor(COLORREF clrDiffColor) = 0;
virtual COLORREF GetSelDiffColor() const = 0;
virtual void SetSelDiffColor(COLORREF clrSelDiffColor) = 0;
virtual double GetDiffColorAlpha() const = 0;
virtual void SetDiffColorAlpha(double diffColorAlpha) = 0;
virtual int  GetConflictCount() const = 0;
virtual bool SelectDiff(int diffIndex) = 0;
virtual int  GetNextDiffIndex() const = 0;
virtual int  GetPrevDiffIndex() const = 0;
virtual int  GetNextConflictIndex() const = 0;
virtual int  GetPrevConflictIndex() const = 0;
virtual HWND GetPaneHWND(int pane) const = 0;
virtual int  GetImageWidth(int pane) const = 0;
virtual int  GetImageHeight(int pane) const = 0;
virtual int  GetImageBitsPerPixel(int pane) const = 0;

9 years ago* WinIMergeLib: Add GetActivePane(), SetActivePane(),
sdottaka [Fri, 12 Sep 2014 10:19:47 +0000 (19:19 +0900)]
* WinIMergeLib: Add GetActivePane(), SetActivePane(),
                FirstConflict(),
                LastConflict(), NextConflict(), PrevConflict(),
                AddEventListener()
* WinIMergeLib: Draw focus rectangle
* WinIMerge: Add context menu
* WinIMerge: Add "Next Conflict", "Previous conflict" menu item

9 years agoInitial import
sdottaka [Thu, 11 Sep 2014 00:52:24 +0000 (09:52 +0900)]
Initial import