OSDN Git Service

winmerge-jp/winmerge-jp.git
22 years agofix last line merge problem
Dennis Lim [Wed, 12 Dec 2001 15:53:11 +0000 (15:53 +0000)]
fix last line merge problem

22 years agofix last line merge problem
Dennis Lim [Wed, 12 Dec 2001 15:42:37 +0000 (15:42 +0000)]
fix last line merge problem

22 years agodefault sort dates descending
Dennis Lim [Wed, 12 Dec 2001 15:38:12 +0000 (15:38 +0000)]
default sort dates descending

22 years agofix root drive compare bug
Dennis Lim [Wed, 5 Dec 2001 12:03:41 +0000 (12:03 +0000)]
fix root drive compare bug
fix default font bug

22 years agoEnter key will open diff in directory view
Dennis Lim [Wed, 5 Dec 2001 12:01:39 +0000 (12:01 +0000)]
Enter key will open diff in directory view

22 years agogeneral clean up of codes
Dennis Lim [Thu, 15 Nov 2001 15:41:37 +0000 (15:41 +0000)]
general clean up of codes

22 years agoenable VSS COM interface
Dennis Lim [Thu, 15 Nov 2001 15:31:21 +0000 (15:31 +0000)]
enable VSS COM interface

22 years agoenable VSS COM interface
Dennis Lim [Thu, 15 Nov 2001 15:21:50 +0000 (15:21 +0000)]
enable VSS COM interface
support sorting by extension in directory diff view

22 years agogeneral clean up of codes
Dennis Lim [Thu, 15 Nov 2001 15:16:11 +0000 (15:16 +0000)]
general clean up of codes

22 years agosupport for VSS COM interface
Dennis Lim [Thu, 15 Nov 2001 15:09:34 +0000 (15:09 +0000)]
support for VSS COM interface

22 years agogeneral clean up of codes
Dennis Lim [Thu, 15 Nov 2001 15:06:19 +0000 (15:06 +0000)]
general clean up of codes

22 years agosort by extension for directory view
Dennis Lim [Thu, 15 Nov 2001 14:49:44 +0000 (14:49 +0000)]
sort by extension for directory view
add support for VSS COM interface

22 years agogeneral clean up of codes
Dennis Lim [Thu, 15 Nov 2001 14:39:17 +0000 (14:39 +0000)]
general clean up of codes
add support for VSS COM interface

22 years agogeneral clean up of codes
Dennis Lim [Thu, 15 Nov 2001 14:33:14 +0000 (14:33 +0000)]
general clean up of codes

22 years agoadd support for VSS COM interface
Dennis Lim [Thu, 15 Nov 2001 14:30:52 +0000 (14:30 +0000)]
add support for VSS COM interface

22 years agoadd 'extensions' column in directory diff
Dennis Lim [Thu, 15 Nov 2001 14:18:26 +0000 (14:18 +0000)]
add 'extensions' column in directory diff

22 years agoadd 'extensions' column in directory diff
Dennis Lim [Thu, 15 Nov 2001 14:07:29 +0000 (14:07 +0000)]
add 'extensions' column in directory diff

22 years agoadd 'extensions' column in directory diff
Dennis Lim [Thu, 15 Nov 2001 13:59:03 +0000 (13:59 +0000)]
add 'extensions' column in directory diff

22 years agocleanup codes.
Dennis Lim [Sun, 11 Nov 2001 03:32:43 +0000 (03:32 +0000)]
cleanup codes.

22 years agofix scroll bar size problem
Dennis Lim [Sat, 10 Nov 2001 08:28:30 +0000 (08:28 +0000)]
fix scroll bar size problem

22 years agofix pageup/pagedn scroll sync problem
Dennis Lim [Fri, 9 Nov 2001 13:59:09 +0000 (13:59 +0000)]
fix pageup/pagedn scroll sync problem

22 years agofix menu labels for accelerators
Dennis Lim [Wed, 7 Nov 2001 12:48:03 +0000 (12:48 +0000)]
fix menu labels for accelerators

22 years agofix the tabs
Dennis Lim [Wed, 7 Nov 2001 12:44:24 +0000 (12:44 +0000)]
fix the tabs

22 years agoBugfix to update MRU list if invoked from command line.
Dennis Lim [Mon, 8 Oct 2001 14:03:40 +0000 (14:03 +0000)]
Bugfix to update MRU list if invoked from command line.

22 years agobugfix to use system colours for unselected lines in directory.
Dennis Lim [Mon, 8 Oct 2001 12:44:02 +0000 (12:44 +0000)]
bugfix to use system colours for unselected lines in directory.

22 years agoselection for type of whitespace comparison
Dennis Lim [Sat, 6 Oct 2001 11:59:44 +0000 (11:59 +0000)]
selection for type of whitespace comparison

22 years agofix bug for undo
Dennis Lim [Tue, 2 Oct 2001 13:50:34 +0000 (13:50 +0000)]
fix bug for undo

23 years agofix bug with fonts and hilighted word width
Dennis Lim [Wed, 1 Aug 2001 12:39:40 +0000 (12:39 +0000)]
fix bug with fonts and hilighted word width

23 years agofix some bugs with undo and merge
Dennis Lim [Wed, 1 Aug 2001 12:36:28 +0000 (12:36 +0000)]
fix some bugs with undo and merge

23 years agoFix bug with undo and merge left/right/all
Dennis Lim [Tue, 31 Jul 2001 14:56:32 +0000 (14:56 +0000)]
Fix bug with undo and merge left/right/all

23 years agoChanged so that it can handle mixed mode EOL files
Dennis Lim [Sat, 21 Jul 2001 12:10:26 +0000 (12:10 +0000)]
Changed so that it can handle mixed mode EOL files

23 years agobug fix scroll to first diff.
Dennis Lim [Thu, 28 Jun 2001 13:30:47 +0000 (13:30 +0000)]
bug fix scroll to first diff.

23 years agoFix directory diff code.
Dennis Lim [Wed, 20 Jun 2001 15:46:46 +0000 (15:46 +0000)]
Fix directory diff code.
FileIsBinary now is consistant with binary_file_p

23 years agoImplement Font selection feature
Dennis Lim [Wed, 20 Jun 2001 15:45:11 +0000 (15:45 +0000)]
Implement Font selection feature

23 years agoOption to disable Splash Screen
Dennis Lim [Wed, 20 Jun 2001 15:44:19 +0000 (15:44 +0000)]
Option to disable Splash Screen

23 years agoAdd Redo feature
Dennis Lim [Tue, 19 Jun 2001 14:57:08 +0000 (14:57 +0000)]
Add Redo feature
Fix Undo feature bug with grouping

23 years agoAdd Redo feature
Dennis Lim [Tue, 19 Jun 2001 14:54:42 +0000 (14:54 +0000)]
Add Redo feature

23 years agoimprove undo behaviour in base crystal edit library
Dennis Lim [Thu, 7 Jun 2001 15:37:37 +0000 (15:37 +0000)]
improve undo behaviour in base crystal edit library

23 years agochange menu command for undo to ID_EDIT_UNDO
Dennis Lim [Wed, 6 Jun 2001 15:11:15 +0000 (15:11 +0000)]
change menu command for undo to ID_EDIT_UNDO

23 years agoDeleting the 'bounds check' configuration. Not needed and not maintained.
Dennis Lim [Wed, 6 Jun 2001 14:51:14 +0000 (14:51 +0000)]
Deleting the 'bounds check' configuration. Not needed and not maintained.

23 years agoImprove Rescan implementation
Dennis Lim [Wed, 30 May 2001 16:31:26 +0000 (16:31 +0000)]
Improve Rescan implementation
Add Undo capability

23 years agoimprove rescan during edit hook
Dennis Lim [Tue, 29 May 2001 15:19:12 +0000 (15:19 +0000)]
improve rescan during edit hook

23 years agomerge regular expressions support from patch
Dennis Lim [Mon, 28 May 2001 15:04:35 +0000 (15:04 +0000)]
merge regular expressions support from patch

23 years agoUpdate DirView to handle copy/delete using ID_R2L and ID_L2R
Dennis Lim [Wed, 23 May 2001 15:09:27 +0000 (15:09 +0000)]
Update DirView to handle copy/delete using ID_R2L and ID_L2R

23 years agoFix ASSERT bug for OleInit
Dennis Lim [Wed, 23 May 2001 15:08:12 +0000 (15:08 +0000)]
Fix ASSERT bug for OleInit

23 years agoshow splash screen only if FileNew, not FileOpen
Dennis Lim [Tue, 22 May 2001 12:59:10 +0000 (12:59 +0000)]
show splash screen only if FileNew, not FileOpen

23 years agosolve edit key and merge key combination
Dennis Lim [Tue, 22 May 2001 12:57:52 +0000 (12:57 +0000)]
solve edit key and merge key combination

23 years agoImplement OnAllLeft and OnAllRight
Dennis Lim [Wed, 16 May 2001 15:48:48 +0000 (15:48 +0000)]
Implement OnAllLeft and OnAllRight
decouple and optimize code

23 years agoAdd RTTI support for dynamic casts
Dennis Lim [Wed, 9 May 2001 12:52:40 +0000 (12:52 +0000)]
Add RTTI support for dynamic casts

23 years agoFix to properly initialize OLE for Crystal Edit drag and drop
Dennis Lim [Wed, 9 May 2001 12:48:53 +0000 (12:48 +0000)]
Fix to properly initialize OLE for Crystal Edit drag and drop

23 years agoMove status bar update to ON_COMAND_UI message
Dennis Lim [Wed, 9 May 2001 12:47:57 +0000 (12:47 +0000)]
Move status bar update to ON_COMAND_UI message

23 years agoAdd OnFileSave method
Dennis Lim [Tue, 8 May 2001 12:57:10 +0000 (12:57 +0000)]
Add OnFileSave method
Fix DoSave so that filename is update when 'save as'.

23 years agoFix incorrect binary file detection and comparison (excel files).
Dennis Lim [Sat, 5 May 2001 15:39:05 +0000 (15:39 +0000)]
Fix incorrect binary file detection and comparison (excel files).
Root cause, open using incorrect mode (text mode)

23 years agoFix 'cannot select CDROM directory' problem
Dennis Lim [Sat, 5 May 2001 08:24:03 +0000 (08:24 +0000)]
Fix 'cannot select CDROM directory' problem

23 years agoremoved edtlib.cpp
grimmd [Mon, 9 Apr 2001 14:07:47 +0000 (14:07 +0000)]
removed edtlib.cpp

23 years agoRemoved all references to DiffView
grimmd [Wed, 28 Mar 2001 04:27:16 +0000 (04:27 +0000)]
Removed all references to DiffView

23 years agofixed warning
grimmd [Wed, 28 Mar 2001 04:15:13 +0000 (04:15 +0000)]
fixed warning

23 years agoadded SplitterWndEx.cpp to project
grimmd [Wed, 28 Mar 2001 04:12:51 +0000 (04:12 +0000)]
added SplitterWndEx.cpp to project

23 years agoadded CSplitterWndEx reference back (oops)
grimmd [Wed, 28 Mar 2001 04:12:06 +0000 (04:12 +0000)]
added CSplitterWndEx reference back (oops)

23 years agoremoved CSplitterWndEx reference
grimmd [Wed, 28 Mar 2001 04:08:47 +0000 (04:08 +0000)]
removed CSplitterWndEx reference

23 years agoincorporates patch #408224
grimmd [Tue, 13 Mar 2001 20:20:28 +0000 (20:20 +0000)]
incorporates patch #408224

23 years agoupdate slightly to handle scroll events better
Dennis Lim [Tue, 13 Mar 2001 16:21:41 +0000 (16:21 +0000)]
update slightly to handle scroll events better

23 years agoUse CSplitterWndEx instead of CSplitterWnd to handle horizontal scrolls
Dennis Lim [Tue, 13 Mar 2001 16:15:35 +0000 (16:15 +0000)]
Use CSplitterWndEx instead of CSplitterWnd to handle horizontal scrolls

23 years agoMove HScroll sync functions to SplitterWndEx
Dennis Lim [Tue, 13 Mar 2001 16:12:47 +0000 (16:12 +0000)]
Move HScroll sync functions to SplitterWndEx

23 years agoSplitter window for proportional horizontal sync
Dennis Lim [Tue, 13 Mar 2001 16:01:23 +0000 (16:01 +0000)]
Splitter window for proportional horizontal sync

23 years ago2.0 initial checkin
grimmd [Wed, 7 Mar 2001 15:11:30 +0000 (15:11 +0000)]
2.0 initial checkin

23 years agochanged copyright info
grimmd [Thu, 1 Mar 2001 23:34:52 +0000 (23:34 +0000)]
changed copyright info

23 years agoinitial checkin
grimmd [Thu, 1 Mar 2001 23:32:24 +0000 (23:32 +0000)]
initial checkin

23 years agoInitial revision
grimmd [Thu, 1 Mar 2001 21:01:27 +0000 (21:01 +0000)]
Initial revision

23 years agoTask #21516: Added file modification times to directory view
grimmd [Wed, 21 Feb 2001 06:39:02 +0000 (06:39 +0000)]
Task #21516: Added file modification times to directory view

23 years agoBug #127538: Changed DDX_CBString to DDX_CBStringExact
grimmd [Mon, 12 Feb 2001 04:35:32 +0000 (04:35 +0000)]
Bug #127538: Changed DDX_CBString to DDX_CBStringExact

23 years agoChanged FileIsBinary code to also test at end of file (for files that are text at...
grimmd [Fri, 12 Jan 2001 15:39:13 +0000 (15:39 +0000)]
Changed FileIsBinary code to also test at end of file (for files that are text at beginning and binary at end )

23 years agoFixed bug #126985, now attempts to re-diff when properties are changed
grimmd [Wed, 3 Jan 2001 15:10:04 +0000 (15:10 +0000)]
Fixed bug #126985, now attempts to re-diff when properties are changed
Also fixed intermittent problem where SaveHelper wasn't being called when diff session was closed

23 years agoBug #126257: now diffs binary files correctly
grimmd [Tue, 2 Jan 2001 19:12:13 +0000 (19:12 +0000)]
Bug #126257: now diffs binary files correctly

23 years agoclose file handles
Dennis Lim [Thu, 28 Dec 2000 13:05:42 +0000 (13:05 +0000)]
close file handles
remove dummy 'FILE_ERROR' message when binary files identical

23 years agoset m_pLeft and m_pRight to NULL when MDI child closes
Dennis Lim [Mon, 25 Dec 2000 15:29:55 +0000 (15:29 +0000)]
set m_pLeft and m_pRight to NULL when MDI child closes

23 years agoAdded Rational ClearCase versioning support
grimmd [Thu, 21 Dec 2000 00:22:46 +0000 (00:22 +0000)]
Added Rational ClearCase versioning support

23 years agoRational ClearCase integration
Dennis Lim [Wed, 20 Dec 2000 14:33:22 +0000 (14:33 +0000)]
Rational ClearCase integration

23 years agoclose unused file handle
Dennis Lim [Wed, 20 Dec 2000 14:31:15 +0000 (14:31 +0000)]
close unused file handle

23 years agonew bitmaps for left/right unique status
grimmd [Tue, 19 Dec 2000 17:00:58 +0000 (17:00 +0000)]
new bitmaps for left/right unique status

23 years agoBug #125573: now shows the filename in the Filename field
grimmd [Sat, 16 Dec 2000 15:06:44 +0000 (15:06 +0000)]
Bug #125573: now shows the filename in the Filename field

23 years agoBug #125572: state of recurse checkbox is now saved
grimmd [Sat, 16 Dec 2000 02:51:03 +0000 (02:51 +0000)]
Bug #125572: state of recurse checkbox is now saved

23 years agoBug #1125882: Now prompts for save when mainframe window is closed & a modified diff...
grimmd [Sat, 16 Dec 2000 01:48:05 +0000 (01:48 +0000)]
Bug #1125882: Now prompts for save when mainframe window is closed & a modified diff window is open

23 years agoTask #22797: now scrolls to undo point
grimmd [Thu, 7 Dec 2000 19:36:00 +0000 (19:36 +0000)]
Task #22797: now scrolls to undo point

23 years agoTask #23046: Added difference indicator in status bar
grimmd [Thu, 7 Dec 2000 19:26:57 +0000 (19:26 +0000)]
Task #23046: Added difference indicator in status bar

23 years agoTask #23045: Added first, current & next diff buttons & menu items
grimmd [Thu, 7 Dec 2000 18:16:12 +0000 (18:16 +0000)]
Task #23045: Added first, current & next diff buttons & menu items

23 years agoAdded column sort (thanks DLKJ)
grimmd [Tue, 5 Dec 2000 15:27:39 +0000 (15:27 +0000)]
Added column sort (thanks DLKJ)

23 years agoinitialize inf structures
grimmd [Fri, 1 Dec 2000 15:11:29 +0000 (15:11 +0000)]
initialize inf structures

23 years agoNow checks for negative file descriptors when detecting binary files
grimmd [Mon, 20 Nov 2000 23:08:58 +0000 (23:08 +0000)]
Now checks for negative file descriptors when detecting binary files

23 years agoNow writes standard DIFF-style output to a file in the application directory called...
grimmd [Sun, 19 Nov 2000 17:05:22 +0000 (17:05 +0000)]
Now writes standard DIFF-style output to a file in the application directory called DIFF.TXT.

23 years agofixed warnings
grimmd [Fri, 10 Nov 2000 19:19:33 +0000 (19:19 +0000)]
fixed warnings

23 years agoAdded "Translated by" to version resource
grimmd [Fri, 3 Nov 2000 19:01:46 +0000 (19:01 +0000)]
Added "Translated by" to version resource

23 years agoMade extensions case insensitive
grimmd [Fri, 3 Nov 2000 18:26:32 +0000 (18:26 +0000)]
Made extensions case insensitive

23 years agoTweaked about box
grimmd [Fri, 3 Nov 2000 18:16:30 +0000 (18:16 +0000)]
Tweaked about box

23 years agoChanged header file locations
grimmd [Fri, 3 Nov 2000 18:15:19 +0000 (18:15 +0000)]
Changed header file locations

23 years agoFixed warnings in legacy GNU code
grimmd [Fri, 3 Nov 2000 18:13:47 +0000 (18:13 +0000)]
Fixed warnings in legacy GNU code

23 years agoFixed warnings in legacy GNU code
grimmd [Fri, 3 Nov 2000 16:36:07 +0000 (16:36 +0000)]
Fixed warnings in legacy GNU code

23 years agoStandardized language names
grimmd [Fri, 3 Nov 2000 01:37:01 +0000 (01:37 +0000)]
Standardized language names

23 years agoMods for language stuff
grimmd [Fri, 3 Nov 2000 01:29:10 +0000 (01:29 +0000)]
Mods for language stuff

23 years agoTrimmed blanks off end of version strings
grimmd [Fri, 3 Nov 2000 00:42:10 +0000 (00:42 +0000)]
Trimmed blanks off end of version strings