OSDN Git Service
Perry Rapp [Fri, 3 Feb 2006 00:20:14 +0000 (00:20 +0000)]
PATCH: [
1423060 ] Modify perl selftest to test all 4 builds
Test all 4 builds (not just MergeUnicodeDebug).
Check up front that necessary programs exist: WinMerge(U).exe & diff2merge(U).exe.
Reprint failures at end if "noisy" option.
Affected:
testdiff.pl
Perry Rapp [Thu, 2 Feb 2006 01:57:00 +0000 (01:57 +0000)]
PATCH: [
1422052 ] Correction of Swedish for 2.5.3.1+
Contributed by Hans Eriksson
Src/Languages/Swedish: Merge Swedish
Perry Rapp [Wed, 1 Feb 2006 23:30:16 +0000 (23:30 +0000)]
PATCH: [
1412386 ] Adding readme files
New WinMerge/readme.txt
(Various other directories affected -- readme.txt & Changes.txt files)
Kimmo Varis [Wed, 1 Feb 2006 21:58:01 +0000 (21:58 +0000)]
PATCH: [
1419329 ] Select Line Difference
Perry Rapp [Wed, 1 Feb 2006 17:55:59 +0000 (17:55 +0000)]
Updating Polish dialog control layout to English (except where
would hinder appearance)
Src/Languages/*: MergePolish.rc
Perry Rapp [Wed, 1 Feb 2006 17:43:15 +0000 (17:43 +0000)]
Cosmetic: synchronizing whitespace to English version
Src/Languages/*: MergePolish.rc
Perry Rapp [Wed, 1 Feb 2006 17:38:05 +0000 (17:38 +0000)]
Cosmetic: synchronizing whitespace to English version
Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
Perry Rapp [Wed, 1 Feb 2006 14:57:20 +0000 (14:57 +0000)]
PATCH: [
1421018 ] Fix handle leak in GetOpenFileName
BUG: [
1418765 ] 2.4.4.0U maintain opened a handle on folders
Adds new method paths_GetWindowsDirectory & resets current
directory to WINDIR after GetOpenFileName call
Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
Perry Rapp [Wed, 1 Feb 2006 06:46:08 +0000 (06:46 +0000)]
PATCH: [
1419582 ] Polish translation update for latest v2.5
Contributed by dr_prozac
Src/Languages/Polish: MergePolish.rc
Perry Rapp [Wed, 1 Feb 2006 05:21:55 +0000 (05:21 +0000)]
BUG: [
1419317 ] link error on 8-bit cvs trunk
Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
Src: Merge.dsp
Tim Gerundt [Tue, 31 Jan 2006 20:19:34 +0000 (20:19 +0000)]
PATCH: [
1418972 ] Web: Add version '2.5' to translation status
Tim Gerundt [Tue, 31 Jan 2006 19:31:58 +0000 (19:31 +0000)]
PATCH: [
1419171 ] Various Updates in German Translation for WinMerge 2.5
Kimmo Varis [Mon, 30 Jan 2006 18:20:52 +0000 (18:20 +0000)]
PATCH: [
1417858 ] Fix manual path
Perry Rapp [Mon, 30 Jan 2006 03:52:33 +0000 (03:52 +0000)]
PATCH: [
1415895 ] Split cmdline help string into chunks
Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
Src/Languages: */*.rc
Perry Rapp [Sat, 28 Jan 2006 11:23:12 +0000 (11:23 +0000)]
PATCH: [
1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
Src: DirView.cpp
Perry Rapp [Sat, 28 Jan 2006 11:19:44 +0000 (11:19 +0000)]
PATCH: [
1414196 ] Delete useless CChildFrame::OnNotify method
Src: ChildFrm.cpp ChildFrm.h
Perry Rapp [Sat, 28 Jan 2006 11:14:32 +0000 (11:14 +0000)]
PATCH: [
1414195 ] Delete two old TODO notes
Src: ChildFrm.cpp
Perry Rapp [Sat, 28 Jan 2006 10:56:53 +0000 (10:56 +0000)]
PATCH: [
1415165 ] Updated Swedish translation for 2.5.3.1+
Submitted by Hans Eriksson
Src\Languages\Swedish: MergeSwedish.rc
Perry Rapp [Sat, 28 Jan 2006 09:41:34 +0000 (09:41 +0000)]
2006-01-28 Perry
PATCH: [
1414904 ] updated italian translation for winmerge 2.5.3.1
submitted by A. Decorte
InnoSetup\Languages: Italian.isl
Tim Gerundt [Thu, 26 Jan 2006 23:20:26 +0000 (23:20 +0000)]
TODO: [
1413926 ] Build manual file(s) to /Build
Tim Gerundt [Thu, 26 Jan 2006 22:39:07 +0000 (22:39 +0000)]
PATCH: [
1414983 ] Manual: Make build path configurable (XSL)
Kimmo Varis [Thu, 26 Jan 2006 21:15:21 +0000 (21:15 +0000)]
PATCH: [
1413230 ] Use HtmlHelp API to open help
Perry Rapp [Wed, 25 Jan 2006 19:11:53 +0000 (19:11 +0000)]
BUG: [
1414868 ] Bug in byte_compare (early finish)
(Also added some comments.)
Src: DiffWrapper.cpp
Perry Rapp [Wed, 25 Jan 2006 02:36:40 +0000 (02:36 +0000)]
BUG: [
1412237 ] InitOption return value wrong if RegCreateKey fails
Fix unused wrong return value of InitOption & improve one comment
Src/Common: OptionsMgr.cpp
Kimmo Varis [Tue, 24 Jan 2006 18:55:47 +0000 (18:55 +0000)]
WinMerge experimental release 2.5.3.1 (cvs)
Kimmo Varis [Tue, 24 Jan 2006 18:52:40 +0000 (18:52 +0000)]
Bump revision number to 1.2.1
Kimmo Varis [Tue, 24 Jan 2006 18:32:34 +0000 (18:32 +0000)]
PATCH: [
1413909 ] Install HTMLHelp manual
Kimmo Varis [Mon, 23 Jan 2006 19:57:30 +0000 (19:57 +0000)]
PATCH: [
1411727 ] Merge inactive diff when cursor is inside it
Tim Gerundt [Mon, 23 Jan 2006 19:33:41 +0000 (19:33 +0000)]
BUG: [
1412395 ] Misspelling in l10n docs
Kimmo Varis [Mon, 23 Jan 2006 19:32:28 +0000 (19:32 +0000)]
PATCH: [
1406840 ] Use HTMLHelp locally
Kimmo Varis [Mon, 23 Jan 2006 18:48:56 +0000 (18:48 +0000)]
PATCH: [
1412405 ] Some edits to About & QuickStart pages of manual
- submitted by Perry
Perry Rapp [Mon, 23 Jan 2006 15:48:43 +0000 (15:48 +0000)]
Added "/ub" flag to WinMerge invocation, to stop polluting MRU (and added comments explaining arguments)
Perry Rapp [Mon, 23 Jan 2006 15:36:01 +0000 (15:36 +0000)]
Add repro files to selftests from
BUG [
1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
Current selftests status: Failure count: 9 (of 108)
Failing -b t002 (all 3 platforms)
Failing -bi t002 (all 3 platforms)
Failing -b bug1406950 (all 3 platforms)
PATCH: [
1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
Src: ByteComparator.cpp
(selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
Perry Rapp [Mon, 23 Jan 2006 15:26:21 +0000 (15:26 +0000)]
Added readme.txt, Changes.txt (this file).
Added noisy_testdiff.bat (so can easily double-click to get noisy version).
Added test files from BUG#
1406950.
u,m,w: bug1406950a.txt bug1406950b.txt
Perry Rapp [Mon, 23 Jan 2006 00:06:35 +0000 (00:06 +0000)]
PATCH: [
1405540 ] Cleanup filters dialog
Src: FileFiltersDlg.cpp FileFiltersDlg.h
Tim Gerundt [Sun, 22 Jan 2006 20:03:46 +0000 (20:03 +0000)]
PATCH: [
1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
Perry Rapp [Sun, 22 Jan 2006 19:54:13 +0000 (19:54 +0000)]
Annotate current selftests status
Perry Rapp [Sun, 22 Jan 2006 19:42:40 +0000 (19:42 +0000)]
2006-01-22 Perry
PATCH: [
1411406 ] self-tests and new arguments and new diff2winmerge.exe
Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
Src/Common: OptionsMgr.cpp OptionsMgr.h
New directory diff2winmerge:
Changes.txt ReadMe.txt Resource.h StdAfx.cpp StdAfx.h diff2winmerge.cpp
diff2winmerge.dsp diff2winmerge.h diff2winmerge.rc
New directory selftests:
testdiff.pl
subdir m:
t001a.txt t001b.txt t002a.txt t002b.txt t003a.txt t003b.txt
t004a.txt t004b.txt
subdir u:
t001a.txt t001b.txt t002a.txt t002b.txt t003a.txt t003b.txt
t004a.txt t004b.txt
subdir w:
t001a.txt t001b.txt t002a.txt t002b.txt t003a.txtt003b.txt
t004a.txt t004b.txt
Kimmo Varis [Sat, 21 Jan 2006 14:52:27 +0000 (14:52 +0000)]
PATCH: [
1411150 ] Add GetActiveMergeView for MergeDoc
Perry Rapp [Sat, 21 Jan 2006 00:56:38 +0000 (00:56 +0000)]
One final update to Polish translation (less than 3 seconds string)
Perry Rapp [Sat, 21 Jan 2006 00:43:41 +0000 (00:43 +0000)]
2006-01-21 Perry
PATCH: [
1407740 ] Polish translation update (for version 2.4.4.0)
Submitted by dr_prozac
(Perry merging many of these to cvs trunk)
Src/Language/Polish: MergePolish.rc
Kimmo Varis [Fri, 20 Jan 2006 18:27:15 +0000 (18:27 +0000)]
BUG: [
1408587 ] Unused DoScroll() function in Merge*View
- remove DoScroll() from CMergeEditView and CMergeDiffDetailView
Kimmo Varis [Tue, 17 Jan 2006 21:10:37 +0000 (21:10 +0000)]
PATCH: [
1406207 ] Fix error message for unique folders
Kimmo Varis [Tue, 17 Jan 2006 20:47:09 +0000 (20:47 +0000)]
PATCH: [
1407555 ] Manual: add new shortcuts for find
Tim Gerundt [Tue, 17 Jan 2006 20:27:02 +0000 (20:27 +0000)]
PATCH: [
1405261 ] Manual: Background colors for Notes and Co. (XSL)
Tim Gerundt [Tue, 17 Jan 2006 20:25:08 +0000 (20:25 +0000)]
PATCH: [
1405344 ] Manual: New icons
Tim Gerundt [Tue, 17 Jan 2006 19:56:55 +0000 (19:56 +0000)]
PATCH: [
1405344 ] Manual: New icons
Perry Rapp [Tue, 17 Jan 2006 04:31:41 +0000 (04:31 +0000)]
PATCH: [
1401711 ] A hybrid of word diff and char diff
Submitted by Takashi Sawanaka
Src: MergeDocLineDiffs.cpp PropEditor.cpp
stringdiffs.cpp stringdiffs.h
Kimmo Varis [Mon, 16 Jan 2006 21:41:48 +0000 (21:41 +0000)]
PATCH: [
1406203 ] Open unique files to external editor
Perry Rapp [Sun, 15 Jan 2006 18:06:20 +0000 (18:06 +0000)]
PATCH: [
1333600 ] Get rid of global MainFrame pointer (part1)
Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
OpenDlg.cpp PropRegistry.cpp
Src\Common: PreferencesDlg.cpp
Perry Rapp [Sat, 14 Jan 2006 22:04:26 +0000 (22:04 +0000)]
PATCH: [
1403457 ] Support Unicode file filter files
Remove limitation (file filters now handle unicode files)
(reverses my PATCH: [
1401001 ])
Manual: Filters.xml
Perry Rapp [Sat, 14 Jan 2006 21:58:51 +0000 (21:58 +0000)]
PATCH: [
1403457 ] Support Unicode file filter files
Src: FileFilterMgr.cpp
Kimmo Varis [Sat, 14 Jan 2006 16:57:47 +0000 (16:57 +0000)]
PATCH: [
1405340 ] Add XP shadow to folderskip.ico
- submitted by Tim
Kimmo Varis [Sat, 14 Jan 2006 14:09:12 +0000 (14:09 +0000)]
PATCH: [
1385672 ] Replace some 'file's with 'item's
Kimmo Varis [Sat, 14 Jan 2006 13:29:56 +0000 (13:29 +0000)]
PATCH: [
1372044 ] Add FileActionScript for folder compare actions
Perry Rapp [Sat, 14 Jan 2006 04:00:24 +0000 (04:00 +0000)]
TODO: [
1395638 ] CChildFrame::PreCreateWindow() does nothing
Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
Tim Gerundt [Fri, 13 Jan 2006 21:59:06 +0000 (21:59 +0000)]
PATCH: [
1404317 ] Web: Known Limitations page
Perry Rapp [Fri, 13 Jan 2006 17:49:54 +0000 (17:49 +0000)]
PATCH: [
1403893 ] Fix whitespace error in ByteCompare
BUG: [
1400779 ] Whitespace bug in ByteComparator
Src: ByteComparator.cpp
Perry Rapp [Fri, 13 Jan 2006 17:46:06 +0000 (17:46 +0000)]
PATCH: [
1403454 ] Add comment to UniStdioFile.h
(Cosmetic)
Src/Common: UniFile.h
Kimmo Varis [Fri, 13 Jan 2006 16:27:40 +0000 (16:27 +0000)]
PATCH: [
1039677 ] Alter text of Reset button label
Kimmo Varis [Fri, 13 Jan 2006 16:04:50 +0000 (16:04 +0000)]
PATCH: [
1399263 ] Captioned panes (new style) - apply to languages
Kimmo Varis [Thu, 12 Jan 2006 21:14:08 +0000 (21:14 +0000)]
PATCH: [
1399738 ] Filename bars to use caption colors
Kimmo Varis [Thu, 12 Jan 2006 18:29:22 +0000 (18:29 +0000)]
PATCH: [
1399263 ] Captioned panes (new style)
Tim Gerundt [Thu, 12 Jan 2006 17:04:38 +0000 (17:04 +0000)]
PATCH: [
1403412 ] German: Option 'Line Difference Coloring' looks broken
Tim Gerundt [Wed, 11 Jan 2006 22:11:52 +0000 (22:11 +0000)]
PATCH: [
1402858 ] Web: New background color for 'important' and 'note'
Kimmo Varis [Wed, 11 Jan 2006 17:48:30 +0000 (17:48 +0000)]
WinMerge beta release 2.5.2
Kimmo Varis [Wed, 11 Jan 2006 17:42:56 +0000 (17:42 +0000)]
PATCH: [
1401001 ] Add note to filters manual that Unicode is not supported
- submitted by Perry
Kimmo Varis [Wed, 11 Jan 2006 17:32:53 +0000 (17:32 +0000)]
PATCH: [
1382020 ] New FAQ entry for large file Quick Compare
- submitted by Perry
Kimmo Varis [Wed, 11 Jan 2006 17:27:45 +0000 (17:27 +0000)]
Fix EOL type back to DOS - last commit changed it to UNIX by accident.
Kimmo Varis [Wed, 11 Jan 2006 17:25:42 +0000 (17:25 +0000)]
Update copyright year, WinMerge version to 2.5 and revision
Kimmo Varis [Wed, 11 Jan 2006 17:05:32 +0000 (17:05 +0000)]
BUG: [
1400829 ] Crash trying to open location pane context menu
Kimmo Varis [Wed, 11 Jan 2006 17:03:14 +0000 (17:03 +0000)]
PATCH: [
1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
- with addition from Takashi for Shift+F3 backwards search
Kimmo Varis [Wed, 11 Jan 2006 16:39:07 +0000 (16:39 +0000)]
PATCH: [
1402774 ] Use dark red color for 'binarydiff.ico'
- submitted by Tim
Tim Gerundt [Tue, 10 Jan 2006 23:14:06 +0000 (23:14 +0000)]
PATCH: [
1401420 ] New 'MergeDir' icon
Perry Rapp [Mon, 9 Jan 2006 23:51:16 +0000 (23:51 +0000)]
PATCH: [
1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
BUG: [
1400797 ] Dropping two project files doesn't work to compare them
(Also fixes extension test to be case-sensitive)
Src: MainFrm.cpp
Perry Rapp [Mon, 9 Jan 2006 23:47:09 +0000 (23:47 +0000)]
Move a change note of mine from readme.txt to correct location in Changes.txt. Add note to top of readme.txt to try to help prevent this sort of mistake in the future.
Tim Gerundt [Mon, 9 Jan 2006 21:22:15 +0000 (21:22 +0000)]
BUG: [
1394597 ] l10n status page is outdated
Perry Rapp [Sun, 8 Jan 2006 23:58:04 +0000 (23:58 +0000)]
BUG [
1394706 ] IgnoreCommentsC.h in cvs (shouldn't be)
Plugins\src_VCPP\IgnoreCommentsC
Deleted IgnoreCommentsC.h (automatically generated file)
Perry Rapp [Sun, 8 Jan 2006 23:49:13 +0000 (23:49 +0000)]
BUG: [
1396222 ] CDirView::MoveSelection() is confused
(Rename MoveSelection to MoveFocus & add more commenting)
Src: DirActions.cpp DirView.cpp DirView.h
Perry Rapp [Sun, 8 Jan 2006 23:34:27 +0000 (23:34 +0000)]
BUG: [
1396950 ] Manual installation doesn't specify admin access
Manual: Install.xml
Tim Gerundt [Sun, 8 Jan 2006 22:05:16 +0000 (22:05 +0000)]
Add "setCharset('UTF-8')" to file instructions.php
Perry Rapp [Sat, 7 Jan 2006 18:26:28 +0000 (18:26 +0000)]
PATCH: [
1398959 ] Implement GuessEncoding in QuickCompare
Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Sat, 7 Jan 2006 01:26:13 +0000 (01:26 +0000)]
PATCH: [
1398064 ] Catalan translation update
By Jordi Vilar
Src/Languages/Catalan: MergeCatalan.rc
Perry Rapp [Fri, 6 Jan 2006 02:22:15 +0000 (02:22 +0000)]
Transcode instructions.php into UTF-8
(example above line 52 was in CP1252)
(example below line 52 was in GB2312)
Web\developer\l10n: instructions.php
Kimmo Varis [Thu, 5 Jan 2006 18:20:50 +0000 (18:20 +0000)]
WinMerge experimental release 2.5.0.5 (cvs)
Tim Gerundt [Wed, 4 Jan 2006 23:05:10 +0000 (23:05 +0000)]
PATCH: [
1394598 ] Small addition to translation instructions
Kimmo Varis [Wed, 4 Jan 2006 21:51:22 +0000 (21:51 +0000)]
PATCH: [
1396413 ] Update Open dialog controls when its activated
Kimmo Varis [Wed, 4 Jan 2006 21:36:46 +0000 (21:36 +0000)]
PATCH: [
1393635 ] Save pane sizes and positions when they change
Tim Gerundt [Wed, 4 Jan 2006 12:49:21 +0000 (12:49 +0000)]
PATCH: [
1394596 ] Make l10n web page more detailed
Perry Rapp [Wed, 4 Jan 2006 00:03:35 +0000 (00:03 +0000)]
Cosmetic; normalizing blank lines to agree with English Merge.rc
Src\Languages:
Brazilian\MergeBrazilian.rc
ChineseSimplified\MergeChineseSimplified.rc
Korean\MergeKorean.rc
Norwegian\MergeNorwegian.rc
Kimmo Varis [Tue, 3 Jan 2006 20:59:44 +0000 (20:59 +0000)]
PATCH: [
1383262 ] Fix bitmap leak in ShellExtension
- also bump version number to 1.7.1, submitted by Perry
Kimmo Varis [Tue, 3 Jan 2006 18:07:04 +0000 (18:07 +0000)]
PATCH: [
1395584 ] Update CSizingControlBar to latest version
Kimmo Varis [Tue, 3 Jan 2006 18:04:22 +0000 (18:04 +0000)]
PATCH: [
1394877 ] Find selected text with Ctrl+F3
Kimmo Varis [Tue, 3 Jan 2006 17:38:28 +0000 (17:38 +0000)]
PATCH: [
1394877 ] Find selected text with Ctrl+F3
Takashi Sawanaka [Tue, 3 Jan 2006 13:59:03 +0000 (13:59 +0000)]
PATCH: [
1390104 ] fix for BUG: [
1384069 ] Wrapped lines have incorrect column
Perry Rapp [Tue, 3 Jan 2006 02:04:45 +0000 (02:04 +0000)]
PATCH: [
1212161 ] Fix handling of \r\n in ByteComparator
Src: ByteComparator.cpp
Perry Rapp [Tue, 3 Jan 2006 01:43:52 +0000 (01:43 +0000)]
BUG: [
1390849 ] cvs trunk MergeChineseSimplified doesn't compile
Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
Perry Rapp [Tue, 3 Jan 2006 01:36:05 +0000 (01:36 +0000)]
PATCH: [
1391550 ] vbs script to check & optionally merge WinMerge resources
Src: new CheckTranslations.vbs
Perry Rapp [Tue, 3 Jan 2006 01:32:33 +0000 (01:32 +0000)]
PATCH: [
1383802 ] Cleanup line difference options in Editor-options
Translations
Src/Language: */Merge*.rc
Perry Rapp [Tue, 3 Jan 2006 01:18:25 +0000 (01:18 +0000)]
PATCH: [
1383802 ] Cleanup line difference options in Editor-options
Src: Merge.rc PropEditor.cpp PropEditor.h resource.h