OSDN Git Service

winmerge-jp/winmerge-jp.git
21 years agoPATCH: [ 713416 ] MergeEditView optimisations
Kimmo Varis [Wed, 2 Apr 2003 20:10:36 +0000 (20:10 +0000)]
PATCH: [ 713416 ] MergeEditView optimisations

21 years agoPATCH: [ 713322 ] Save whole buffer not line by line
Kimmo Varis [Wed, 2 Apr 2003 12:16:00 +0000 (12:16 +0000)]
PATCH: [ 713322 ] Save whole buffer not line by line

21 years agoPATCH: [ 711437 ] Don't copy/cut removed lines
Kimmo Varis [Mon, 31 Mar 2003 19:25:53 +0000 (19:25 +0000)]
PATCH: [ 711437 ] Don't copy/cut removed lines

21 years agoPATCH: [ 712429 ] Fix UpdateItemStatus bug 712093
Perry Rapp [Mon, 31 Mar 2003 15:48:45 +0000 (15:48 +0000)]
PATCH: [ 712429 ] Fix UpdateItemStatus bug 712093

21 years agoPATCH: [ 712417 ] Fix save of open doc before next merge
Perry Rapp [Mon, 31 Mar 2003 00:04:13 +0000 (00:04 +0000)]
PATCH: [ 712417 ] Fix save of open doc before next merge

21 years ago[ 711983 ] ClearMergeDoc causing ASSERT
Perry Rapp [Sat, 29 Mar 2003 23:04:23 +0000 (23:04 +0000)]
[ 711983 ] ClearMergeDoc causing ASSERT

21 years agoFIx crash in CMainFrame::GetAllViews from my earlier code today.
Perry Rapp [Sat, 29 Mar 2003 22:44:40 +0000 (22:44 +0000)]
FIx crash in CMainFrame::GetAllViews from my earlier code today.

21 years ago[ 689884 ] Revise doc/view code (allow multiple docs)
Perry Rapp [Sat, 29 Mar 2003 22:29:49 +0000 (22:29 +0000)]
[ 689884 ] Revise doc/view code (allow multiple docs)

21 years ago[ 687177 ] Handle more errors during copy/creation
Perry Rapp [Sat, 29 Mar 2003 21:18:04 +0000 (21:18 +0000)]
[ 687177 ] Handle more errors during copy/creation

21 years ago[ 710347 ] Fix crash of winmerge c:\ d:" DiffContext.h DirDoc.cpp MainFrm.cpp Merge...
Perry Rapp [Sat, 29 Mar 2003 19:34:16 +0000 (19:34 +0000)]
[ 710347 ] Fix crash of winmerge c:\ d:" DiffContext.h DirDoc.cpp MainFrm.cpp Merge.cpp OpenDlg.cpp OpenDlg.h paths.cpp paths.h readme.txt

21 years agoPATCH: [ 708542 ] Make splash & about show language-independent version
Perry Rapp [Tue, 25 Mar 2003 22:25:00 +0000 (22:25 +0000)]
PATCH: [ 708542 ] Make splash & about show language-independent version

21 years agoPATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()
Perry Rapp [Tue, 25 Mar 2003 22:17:37 +0000 (22:17 +0000)]
PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()

21 years agoReplace COPYING with corrected version from http://www.gnu.org/licenses/gpl.txt
Christian List [Tue, 25 Mar 2003 21:43:26 +0000 (21:43 +0000)]
Replace COPYING with corrected version from gnu.org/licenses/gpl.txt

21 years agoY2K compliance and a new adress of FSF
Christian List [Tue, 25 Mar 2003 21:40:12 +0000 (21:40 +0000)]
Y2K compliance and a new adress of FSF

21 years agoPATCH: [ 709502 ] Fix missing/existing EOL at end of file
Kimmo Varis [Tue, 25 Mar 2003 19:36:22 +0000 (19:36 +0000)]
PATCH: [ 709502 ] Fix missing/existing EOL at end of file

21 years agoPATCH: [ 703069 ] Fix undo crash
Kimmo Varis [Tue, 25 Mar 2003 18:08:05 +0000 (18:08 +0000)]
PATCH: [ 703069 ] Fix undo crash

21 years agoPATCH: [ 708893 ] Don't ask to save file compare
Kimmo Varis [Tue, 25 Mar 2003 14:05:39 +0000 (14:05 +0000)]
PATCH: [ 708893 ] Don't ask to save file compare

21 years ago PATCH: [ 706006 ] Suppress Rescan during Merge
Perry Rapp [Sun, 23 Mar 2003 20:30:52 +0000 (20:30 +0000)]
 PATCH: [ 706006 ] Suppress Rescan during Merge

21 years agoPATCH: [ 707753 ] Delayed rescan - fix
Kimmo Varis [Sun, 23 Mar 2003 12:29:21 +0000 (12:29 +0000)]
PATCH: [ 707753 ] Delayed rescan - fix

21 years agoPATCH: [ 707753 ] Delayed rescan
Kimmo Varis [Sat, 22 Mar 2003 12:13:54 +0000 (12:13 +0000)]
PATCH: [ 707753 ] Delayed rescan

21 years agoPATCH: [ 707152 ] Delay path check in opendialog
Kimmo Varis [Fri, 21 Mar 2003 18:26:04 +0000 (18:26 +0000)]
PATCH: [ 707152 ] Delay path check in opendialog

21 years agoPATCH: [ 703234 ] Use stricmp
Kimmo Varis [Fri, 14 Mar 2003 13:25:17 +0000 (13:25 +0000)]
PATCH: [ 703234 ] Use stricmp

21 years agoDeleted unused res files: bitmap1.bmp, bmp00001.bmp, ScreenShot.gif, WinMerge.gif
Perry Rapp [Tue, 11 Mar 2003 18:14:36 +0000 (18:14 +0000)]
Deleted unused res files: bitmap1.bmp, bmp00001.bmp, ScreenShot.gif, WinMerge.gif

21 years ago[ 700872 ] Esc to close crashes WinMerge
Christian List [Tue, 11 Mar 2003 17:06:58 +0000 (17:06 +0000)]
[ 700872 ] Esc to close crashes WinMerge

21 years agoPATCH: [ 699893 ] Add drag&drop of files/paths to main window
Kimmo Varis [Sun, 9 Mar 2003 19:55:04 +0000 (19:55 +0000)]
PATCH: [ 699893 ] Add drag&drop of files/paths to main window

21 years agoPATCH: [ 699839 ] Add same binaries to dir compare status
Kimmo Varis [Sun, 9 Mar 2003 19:18:02 +0000 (19:18 +0000)]
PATCH: [ 699839 ] Add same binaries to dir compare status

21 years agoPatch 699580: Fix paths.cpp
Perry Rapp [Fri, 7 Mar 2003 22:43:02 +0000 (22:43 +0000)]
Patch 699580: Fix paths.cpp

21 years agoPATCH: [ 698754 ] Update filetimes after save
Kimmo Varis [Fri, 7 Mar 2003 17:48:09 +0000 (17:48 +0000)]
PATCH: [ 698754 ] Update filetimes after save

21 years ago[ 698346 ] Use full path for directory context menu option
Christian List [Thu, 6 Mar 2003 20:43:17 +0000 (20:43 +0000)]
[ 698346 ] Use full path for directory context menu option

21 years ago*** empty log message ***
Perry Rapp [Thu, 6 Mar 2003 16:42:34 +0000 (16:42 +0000)]
*** empty log message ***

21 years ago Update Danish language file with new strings in MergeDanish.rc
Christian List [Thu, 6 Mar 2003 16:18:18 +0000 (16:18 +0000)]
 Update Danish language file with new strings in MergeDanish.rc
 Removed duplicate dialog in French language file in MergeFrench.rc
 Added Czech to BuildAll.bat

21 years agoAdded Czech
Christian List [Thu, 6 Mar 2003 16:13:10 +0000 (16:13 +0000)]
Added Czech

21 years agoDeleted duplicate dialog
Christian List [Thu, 6 Mar 2003 16:06:13 +0000 (16:06 +0000)]
Deleted duplicate dialog

21 years agoRemoved escape key
Christian List [Thu, 6 Mar 2003 15:53:35 +0000 (15:53 +0000)]
Removed escape key

21 years agoPATCH: [ 696695 ] DirDoc Redisplay optimisation
Kimmo Varis [Thu, 6 Mar 2003 14:13:30 +0000 (14:13 +0000)]
PATCH: [ 696695 ] DirDoc Redisplay optimisation

21 years agoUpdate Danish resources.
Perry Rapp [Wed, 5 Mar 2003 19:46:56 +0000 (19:46 +0000)]
Update Danish resources.

21 years agoUpdate resource.h and update language dialogbox to use IDC_LANGUAGE_LIST.
Perry Rapp [Wed, 5 Mar 2003 19:46:03 +0000 (19:46 +0000)]
Update resource.h and update language dialogbox to use IDC_LANGUAGE_LIST.

21 years agoPATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames
Perry Rapp [Wed, 5 Mar 2003 19:33:53 +0000 (19:33 +0000)]
PATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames

21 years ago*** empty log message ***
Perry Rapp [Wed, 5 Mar 2003 19:31:22 +0000 (19:31 +0000)]
*** empty log message ***

21 years ago[ 697320 ] Saving enabled when comparing directories
Kimmo Varis [Tue, 4 Mar 2003 21:57:39 +0000 (21:57 +0000)]
[ 697320 ] Saving enabled when comparing directories

21 years agoPATCH: [ 696588 ] Multimonitor + virtual screens support
Kimmo Varis [Tue, 4 Mar 2003 15:31:27 +0000 (15:31 +0000)]
PATCH: [ 696588 ] Multimonitor + virtual screens support

21 years agoBUG: [ 684622 ] Escape key closes whole program - 2. try
Kimmo Varis [Tue, 4 Mar 2003 15:12:46 +0000 (15:12 +0000)]
BUG: [ 684622 ] Escape key closes whole program - 2. try

21 years agoBUG: [ 693932 ] Trailing \ on path crashes WinMerge
Kimmo Varis [Fri, 28 Feb 2003 13:56:16 +0000 (13:56 +0000)]
BUG: [ 693932 ] Trailing \ on path crashes WinMerge

21 years agoBUG: [ 693004 ] Keyboard does not work for accessing menus
Kimmo Varis [Thu, 27 Feb 2003 16:24:22 +0000 (16:24 +0000)]
BUG: [ 693004 ] Keyboard does not work for accessing menus

21 years agoBUG: [ 693820 ] Typed path failed to compare
Kimmo Varis [Thu, 27 Feb 2003 12:58:41 +0000 (12:58 +0000)]
BUG: [ 693820 ] Typed path failed to compare

21 years agoPut back accidentally removed include line
Kimmo Varis [Thu, 27 Feb 2003 12:42:48 +0000 (12:42 +0000)]
Put back accidentally removed include line

21 years agoBUG: [ 683753 ] Rescan is not prompting to save dirty current file
Kimmo Varis [Wed, 26 Feb 2003 23:16:42 +0000 (23:16 +0000)]
BUG: [ 683753 ] Rescan is not prompting to save dirty current file

21 years ago [ 686699 ] Check & return file saving success - Fix2
Kimmo Varis [Wed, 26 Feb 2003 17:31:13 +0000 (17:31 +0000)]
 [ 686699 ] Check & return file saving success - Fix2

21 years ago70970 Translate Merge.rc into danish
Christian List [Wed, 26 Feb 2003 17:05:49 +0000 (17:05 +0000)]
70970 Translate Merge.rc into danish

21 years agoDanish added
Christian List [Wed, 26 Feb 2003 17:02:31 +0000 (17:02 +0000)]
Danish added

21 years agoInitial translation
Christian List [Wed, 26 Feb 2003 17:01:45 +0000 (17:01 +0000)]
Initial translation

21 years ago[ 686699 ] Check & return file saving success - Fix2
Kimmo Varis [Wed, 26 Feb 2003 14:15:20 +0000 (14:15 +0000)]
[ 686699 ] Check & return file saving success - Fix2

21 years ago[ 692922 ] Don't try to compare file & directory
Kimmo Varis [Wed, 26 Feb 2003 13:30:38 +0000 (13:30 +0000)]
[ 692922 ] Don't try to compare file & directory

21 years ago[ 686699 ] Check & return file saving success - fix
Kimmo Varis [Mon, 24 Feb 2003 20:47:31 +0000 (20:47 +0000)]
[ 686699 ] Check & return file saving success - fix

21 years ago[ 687574 ] Navigate in directory view (fix bug in patch)
Kimmo Varis [Mon, 24 Feb 2003 13:40:39 +0000 (13:40 +0000)]
[ 687574 ] Navigate in directory view (fix bug in patch)

21 years agoRemoving unused functions with bugs.
Perry Rapp [Sat, 22 Feb 2003 22:39:04 +0000 (22:39 +0000)]
Removing unused functions with bugs.

21 years ago[ 684300 ] Stringified Diffitems
Perry Rapp [Fri, 21 Feb 2003 23:16:26 +0000 (23:16 +0000)]
[ 684300 ] Stringified Diffitems

21 years agoSync'ing all language resources to English version.
Perry Rapp [Fri, 21 Feb 2003 07:04:57 +0000 (07:04 +0000)]
Sync'ing all language resources to English version.

21 years ago[ 689896 ] Update to sync Czech resource
Perry Rapp [Fri, 21 Feb 2003 04:31:29 +0000 (04:31 +0000)]
[ 689896 ] Update to sync Czech resource

21 years ago[ 690176 ] Cmdline param for ESC closing
Perry Rapp [Fri, 21 Feb 2003 04:04:18 +0000 (04:04 +0000)]
[ 690176 ] Cmdline param for ESC closing

21 years ago[ 687574 ] Navigate in directory view
Perry Rapp [Thu, 20 Feb 2003 21:50:28 +0000 (21:50 +0000)]
[ 687574 ] Navigate in directory view

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.