OSDN Git Service

winmerge-jp/winmerge-jp.git
21 years agoHandle file not found opening doc, to avoid ASSERT(m_bInit) failure in crystal buffer
Perry Rapp [Thu, 20 Feb 2003 08:35:38 +0000 (08:35 +0000)]
Handle file not found opening doc, to avoid ASSERT(m_bInit) failure in crystal buffer

21 years agoRemoved annoying SourceSafe path from Merge.dsp
Christian List [Tue, 18 Feb 2003 21:44:54 +0000 (21:44 +0000)]
Removed annoying SourceSafe path from Merge.dsp

21 years ago[ 684737 ] Fix Language Box to handle dblclick
Kimmo Varis [Tue, 18 Feb 2003 20:32:57 +0000 (20:32 +0000)]
[ 684737 ] Fix Language Box to handle dblclick

21 years ago[ 687039 ] View whitespaces on editor
Kimmo Varis [Tue, 18 Feb 2003 14:04:14 +0000 (14:04 +0000)]
[ 687039 ] View whitespaces on editor

21 years ago[ 686699 ] Check & return file saving success
Kimmo Varis [Sat, 15 Feb 2003 20:18:02 +0000 (20:18 +0000)]
[ 686699 ] Check & return file saving success

21 years ago[ 685491 ] Saving fixes: SaveToFile() rewrite part + missing NULL check
Kimmo Varis [Fri, 14 Feb 2003 13:49:13 +0000 (13:49 +0000)]
[ 685491 ] Saving fixes: SaveToFile() rewrite part + missing NULL check

21 years ago[ 686090 ] Show/hide binary files
Perry Rapp [Fri, 14 Feb 2003 01:27:31 +0000 (01:27 +0000)]
[ 686090 ] Show/hide binary files

21 years ago[ 684290 ] improved bin test
Perry Rapp [Fri, 14 Feb 2003 00:40:04 +0000 (00:40 +0000)]
[ 684290 ] improved bin test

21 years agoRemoved Turkish.
Perry Rapp [Fri, 14 Feb 2003 00:20:24 +0000 (00:20 +0000)]
Removed Turkish.

21 years ago[ 685816 ] Recommend deleting unlocalized translations
Perry Rapp [Fri, 14 Feb 2003 00:18:29 +0000 (00:18 +0000)]
[ 685816 ] Recommend deleting unlocalized translations

21 years ago[ 685637 ] CMainFrame::SyncFiles GPF bug
Perry Rapp [Thu, 13 Feb 2003 00:53:01 +0000 (00:53 +0000)]
[ 685637 ] CMainFrame::SyncFiles GPF bug

21 years agoSome updates to align Dutch rc towards English rc.
Perry Rapp [Wed, 12 Feb 2003 22:07:57 +0000 (22:07 +0000)]
Some updates to align Dutch rc towards English rc.

21 years agoSome updates to align Dutch rc towards English rc.
Perry Rapp [Wed, 12 Feb 2003 21:54:16 +0000 (21:54 +0000)]
Some updates to align Dutch rc towards English rc.

21 years ago[ 630286 ] WinMerge crashes/fails in WinCVS
Christian List [Wed, 12 Feb 2003 19:24:40 +0000 (19:24 +0000)]
[ 630286 ] WinMerge crashes/fails in WinCVS

21 years ago [ 630286 ] WinMerge crashes/fails in WinCVS
Christian List [Wed, 12 Feb 2003 19:24:14 +0000 (19:24 +0000)]
 [ 630286 ] WinMerge crashes/fails in WinCVS

21 years ago[ 683752 ] Add option to be listed on Directory context menu
Christian List [Wed, 12 Feb 2003 18:30:35 +0000 (18:30 +0000)]
[ 683752 ] Add option to be listed on Directory context menu

21 years ago[ 683924 ] Same binaries for directory compare
Perry Rapp [Tue, 11 Feb 2003 22:44:27 +0000 (22:44 +0000)]
[ 683924 ] Same binaries for directory compare

21 years agoFixes for new (CString) SplitFilename.
Perry Rapp [Tue, 11 Feb 2003 16:25:37 +0000 (16:25 +0000)]
Fixes for new (CString) SplitFilename.

21 years agoFixing recent SplitFilename & directory concat problems.
Perry Rapp [Tue, 11 Feb 2003 07:11:46 +0000 (07:11 +0000)]
Fixing recent SplitFilename & directory concat problems.

21 years ago[ 470013 ] Spanish Orthography and Semantics
Perry Rapp [Tue, 11 Feb 2003 00:05:33 +0000 (00:05 +0000)]
[ 470013 ] Spanish Orthography and Semantics

21 years agoKimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.
Perry Rapp [Mon, 10 Feb 2003 16:44:43 +0000 (16:44 +0000)]
Kimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.

21 years agoUndoing Chris Mumford's temporary fix for when I broke cvs code.
Perry Rapp [Mon, 10 Feb 2003 02:40:18 +0000 (02:40 +0000)]
Undoing Chris Mumford's temporary fix for when I broke cvs code.

21 years agoReplacing old SplitFilename with new one from Chris Mumford.
Perry Rapp [Mon, 10 Feb 2003 02:18:48 +0000 (02:18 +0000)]
Replacing old SplitFilename with new one from Chris Mumford.

21 years agoFix for cursor on line that disappears (from Kimmo, that I meant to check in earlier).
Perry Rapp [Mon, 10 Feb 2003 00:26:17 +0000 (00:26 +0000)]
Fix for cursor on line that disappears (from Kimmo, that I meant to check in earlier).

21 years agoReduce unneeded size in DIFFITEM (another part of Kimmo's patch I missed).
Perry Rapp [Sun, 9 Feb 2003 19:03:33 +0000 (19:03 +0000)]
Reduce unneeded size in DIFFITEM (another part of Kimmo's patch I missed).

21 years agoDisable logging when m_bLogging off (I missed this earlier).
Perry Rapp [Sun, 9 Feb 2003 19:00:01 +0000 (19:00 +0000)]
Disable logging when m_bLogging off (I missed this earlier).

21 years ago[ 683120 ] splitfilename changed to CStrings
Perry Rapp [Sun, 9 Feb 2003 18:16:24 +0000 (18:16 +0000)]
[ 683120 ] splitfilename changed to CStrings

21 years agoAdded (temporarily) two missing functions: GetPathOnly and SplitFilename.
Chris Mumford [Sun, 9 Feb 2003 14:50:19 +0000 (14:50 +0000)]
Added (temporarily) two missing functions: GetPathOnly and SplitFilename.

21 years ago[ 683120 ] splitfilename changed to CStrings
Perry Rapp [Sun, 9 Feb 2003 10:56:57 +0000 (10:56 +0000)]
[ 683120 ] splitfilename changed to CStrings

21 years agoCleaning up accidental blank lines.
Perry Rapp [Sun, 9 Feb 2003 01:46:17 +0000 (01:46 +0000)]
Cleaning up accidental blank lines.

21 years agoApplying Kimmo's API patch.
Perry Rapp [Sun, 9 Feb 2003 01:42:34 +0000 (01:42 +0000)]
Applying Kimmo's API patch.

21 years agoFirst half of [ 679692 ] Update after editing (with code combination).
Perry Rapp [Sat, 8 Feb 2003 23:33:26 +0000 (23:33 +0000)]
First half of [ 679692 ] Update after editing (with code combination).

21 years agoChanged from strftime to COleDateTime::Format (respects user prefs).
Perry Rapp [Sat, 8 Feb 2003 20:34:59 +0000 (20:34 +0000)]
Changed from strftime to COleDateTime::Format (respects user prefs).

21 years agoRemove references to deleted IDS_COPY2DIR_FMT string.
Perry Rapp [Sat, 8 Feb 2003 04:11:10 +0000 (04:11 +0000)]
Remove references to deleted IDS_COPY2DIR_FMT string.

21 years agoBring up-to-date changed binary resources.
Perry Rapp [Sat, 8 Feb 2003 04:03:05 +0000 (04:03 +0000)]
Bring up-to-date changed binary resources.

21 years agoUpdating Czech resources. Also propagate new resource.h (new languages).
Perry Rapp [Sat, 8 Feb 2003 03:56:36 +0000 (03:56 +0000)]
Updating Czech resources. Also propagate new resource.h (new languages).

21 years agoPropagate new language names (& resource ID changes) to all resources.
Perry Rapp [Sat, 8 Feb 2003 02:40:20 +0000 (02:40 +0000)]
Propagate new language names (& resource ID changes) to all resources.

21 years agoFix Italian dup strings.
Perry Rapp [Sat, 8 Feb 2003 02:34:16 +0000 (02:34 +0000)]
Fix Italian dup strings.

21 years agoNew BuildAll batch file. Fix dup strings in Italian rc.
Perry Rapp [Sat, 8 Feb 2003 02:33:54 +0000 (02:33 +0000)]
New BuildAll batch file. Fix dup strings in Italian rc.

21 years agoAdd Italian to change list.
Perry Rapp [Fri, 7 Feb 2003 19:30:21 +0000 (19:30 +0000)]
Add Italian to change list.

21 years agoAdded 24 missing languages
Christian List [Fri, 7 Feb 2003 16:29:22 +0000 (16:29 +0000)]
Added 24 missing languages

21 years agoResources from English version.
Perry Rapp [Thu, 6 Feb 2003 03:01:11 +0000 (03:01 +0000)]
Resources from English version.

21 years agoSynching with English/main resources.
Perry Rapp [Thu, 6 Feb 2003 03:00:35 +0000 (03:00 +0000)]
Synching with English/main resources.

21 years agoUpdated Spanish resources.
Perry Rapp [Thu, 6 Feb 2003 02:28:38 +0000 (02:28 +0000)]
Updated Spanish resources.

21 years agoSynching resources to English/main.
Perry Rapp [Thu, 6 Feb 2003 00:58:10 +0000 (00:58 +0000)]
Synching resources to English/main.

21 years agoUpdated Brazilian resources.
Perry Rapp [Thu, 6 Feb 2003 00:29:01 +0000 (00:29 +0000)]
Updated Brazilian resources.

21 years agoBring resources up-to-date with English/main resources.
Perry Rapp [Thu, 6 Feb 2003 00:28:01 +0000 (00:28 +0000)]
Bring resources up-to-date with English/main resources.

21 years ago[ 424579 ] Escape to exit
Christian List [Tue, 28 Jan 2003 16:21:35 +0000 (16:21 +0000)]
[ 424579 ] Escape to exit

21 years ago [ 672879 ] Propose clarifying change in ccrystaleditview.cpp
Christian List [Mon, 27 Jan 2003 20:30:32 +0000 (20:30 +0000)]
 [ 672879 ] Propose clarifying change in ccrystaleditview.cpp
 [ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes
 [ 673063 ] Modification check before close
 [ 675526 ] Waitcursors and merging all

21 years ago[ 675526 ] Waitcursors and merging all
Christian List [Mon, 27 Jan 2003 20:29:51 +0000 (20:29 +0000)]
[ 675526 ] Waitcursors and merging all

21 years ago[ 673063 ] Modification check before close
Christian List [Mon, 27 Jan 2003 20:25:04 +0000 (20:25 +0000)]
[ 673063 ] Modification check before close

21 years ago[ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes
Christian List [Mon, 27 Jan 2003 20:20:44 +0000 (20:20 +0000)]
[ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes

21 years ago[ 672879 ] Propose clarifying change in ccrystaleditview.cpp
Christian List [Mon, 27 Jan 2003 20:16:57 +0000 (20:16 +0000)]
[ 672879 ] Propose clarifying change in ccrystaleditview.cpp

21 years agoApplied patch [ 672554 ] Update DirView after individual merge
Christian List [Mon, 27 Jan 2003 20:12:00 +0000 (20:12 +0000)]
Applied patch [ 672554 ] Update DirView after individual merge
Fixed [ 225571 ] After individual merge, dirView not updated

21 years ago[ 668654 ] Tabtype selection feature
Christian List [Mon, 27 Jan 2003 19:55:25 +0000 (19:55 +0000)]
[ 668654 ] Tabtype selection feature

21 years ago[ 671810 ] Tempfiles to temp dir
Christian List [Tue, 21 Jan 2003 22:36:30 +0000 (22:36 +0000)]
[ 671810 ] Tempfiles to temp dir

21 years ago[ 671037 ] Changes to common for MSVC.NET
Christian List [Tue, 21 Jan 2003 22:27:53 +0000 (22:27 +0000)]
[ 671037 ] Changes to common for MSVC.NET

21 years ago5 recently committed patches
Christian List [Mon, 20 Jan 2003 15:25:50 +0000 (15:25 +0000)]
5 recently committed patches

21 years ago[ 671034 ] operator precedence bug in SplitterWndEx.cpp
Christian List [Mon, 20 Jan 2003 15:04:26 +0000 (15:04 +0000)]
[ 671034 ] operator precedence bug in SplitterWndEx.cpp

21 years agoPatch [ 651689 ] Add OpenLeft, OpenLeftWith, ... context
Christian List [Wed, 15 Jan 2003 15:09:00 +0000 (15:09 +0000)]
Patch [ 651689 ] Add OpenLeft, OpenLeftWith, ... context

21 years agoAplying patch [ 665993 ] Little optimisation
Christian List [Tue, 14 Jan 2003 17:49:58 +0000 (17:49 +0000)]
Aplying patch [ 665993 ] Little optimisation

21 years agoDisable unused code
Christian List [Tue, 14 Jan 2003 17:37:44 +0000 (17:37 +0000)]
Disable unused code

21 years agoChanged Del to Delete
Christian List [Tue, 17 Dec 2002 15:57:17 +0000 (15:57 +0000)]
Changed Del to Delete

21 years agoFixed bug [ 640548 ] scroll to current difference
Christian List [Tue, 10 Dec 2002 21:36:07 +0000 (21:36 +0000)]
Fixed bug [ 640548 ] scroll to current difference

21 years agoSolved [ 494865 ] Diff.txt left in startup dir
Christian List [Tue, 10 Dec 2002 21:16:47 +0000 (21:16 +0000)]
Solved [ 494865 ] Diff.txt left in startup dir
It will now be written in the users temp dir

21 years agoApplied patch [ 650207 ] Fall back to English resource
Christian List [Sun, 8 Dec 2002 21:57:36 +0000 (21:57 +0000)]
Applied patch [ 650207 ] Fall back to English resource

To handle the case that the developers have added strings
to the English resources, but they have not been added
to the localized resource DLL, this patch adds a dummy
dynlik record to the link chain to cause the app to
search the English (application) resources when a
resource is not found in the localized resource DLL.

21 years agoApplying patch [ 650203 ] Fix char functions in StdAfx.cpp
Christian List [Sun, 8 Dec 2002 21:36:31 +0000 (21:36 +0000)]
Applying patch [ 650203 ] Fix char functions in StdAfx.cpp

Char functions in StdAfx.cpp do not handle non-ASCII
data correctly; they suffer from sign-extension bug
which can cause GPF. A signed char gets
converted (sign-extended !) to a signed int, which then
gets converted back to unsigned, and now it is off
by billions.

21 years agoPerry:
Christian List [Tue, 3 Dec 2002 22:10:51 +0000 (22:10 +0000)]
Perry:
 Implemented recursive directory delete
 Fix bug in EOL handling in crystaltextbuffer, and add optional EOL sensitivity.
 Added optional EOL insensitivity to gnu diff IO.c.
 Added status bar progress (file count) indicator during scanning
 Fixed tooltips of toolbar buttons to list correct hotkeys
 Split "Show Unique" option into "Show Left Unique" and "Show Right Unique"
 Added left files, left dirs, right files, right dirs to status bar feedback

21 years agoDelete left/right + allow copy uniques
Christian List [Mon, 25 Nov 2002 22:38:58 +0000 (22:38 +0000)]
Delete left/right + allow copy uniques
Code added on behalf of Perry Rapp

21 years agoFixed an error where extremely long lines would crash WinMerge
Christian List [Thu, 7 Nov 2002 18:04:58 +0000 (18:04 +0000)]
Fixed an error where extremely long lines would crash WinMerge

21 years agoModified search dialogs
Chris Mumford [Sun, 29 Sep 2002 14:55:22 +0000 (14:55 +0000)]
Modified search dialogs

21 years agoAdded find feedback to user.
Chris Mumford [Sun, 29 Sep 2002 14:52:45 +0000 (14:52 +0000)]
Added find feedback to user.

21 years agono message
Chris Mumford [Sun, 29 Sep 2002 14:51:34 +0000 (14:51 +0000)]
no message

21 years agoAdded new icon menu
Chris Mumford [Sun, 29 Sep 2002 14:48:55 +0000 (14:48 +0000)]
Added new icon menu

21 years agoAn icon menu from www.codeguru.com
Chris Mumford [Sun, 29 Sep 2002 14:45:38 +0000 (14:45 +0000)]
An icon menu from www.codeguru.com

21 years agoAdded separator
Chris Mumford [Sun, 29 Sep 2002 14:43:03 +0000 (14:43 +0000)]
Added separator

21 years agoIncluding Merge.h
Chris Mumford [Sat, 7 Sep 2002 01:01:12 +0000 (01:01 +0000)]
Including Merge.h

21 years agoAdded a hight color selection property page
Chris Mumford [Fri, 6 Sep 2002 13:41:26 +0000 (13:41 +0000)]
Added a hight color selection property page

21 years agoInitial checkin of a highlight color selection property page
Chris Mumford [Fri, 6 Sep 2002 13:40:25 +0000 (13:40 +0000)]
Initial checkin of a highlight color selection property page

21 years agoInitial checkin of a color bottom class
Chris Mumford [Fri, 6 Sep 2002 13:39:21 +0000 (13:39 +0000)]
Initial checkin of a color bottom class

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