OSDN Git Service
Kimmo Varis [Tue, 13 Dec 2005 18:09:36 +0000 (18:09 +0000)]
PATCH: [
1378174 ] Share Src/res between translations
Kimmo Varis [Tue, 13 Dec 2005 17:51:17 +0000 (17:51 +0000)]
PATCH: [
1378174 ] Share Src/res between translations
Perry Rapp [Tue, 13 Dec 2005 17:13:12 +0000 (17:13 +0000)]
PATCH: [
1373255 ] New EditBinaryFiles plugin & BUG: [
1379276 ] EditBinaryFiles not added to infrastructure
Plugins\dlls: NEW EditBinaryFiles.dll (V1.0.1.0)
(Compiled MSVC6sp6, ANSI, MinDependency, WinXP)
Plugins\src_VCPP\EditBinaryFiles: ChangeLog.txt
Perry Rapp [Tue, 13 Dec 2005 06:07:09 +0000 (06:07 +0000)]
PATCH: [
1373020 ] Carry unicoding, codepage, & file path together
& PATCH: [
1377545 ] Remove needless casts
Perry Rapp [Tue, 13 Dec 2005 06:00:54 +0000 (06:00 +0000)]
PATCH: [
1373255 ] New EditBinaryFiles plugin
NEW Plugins\src_VCPP\EditBinaryFiles
Perry Rapp [Tue, 13 Dec 2005 05:52:42 +0000 (05:52 +0000)]
PATCH [
1374981 ] Improvement for RCLocalizationHelper
Plugins\src_VCPP\RCLocalizationHelper:
WinMergeScript.cpp
Perry Rapp [Mon, 12 Dec 2005 16:39:59 +0000 (16:39 +0000)]
PATCH: [
1372549 ] readme for Merge7z distributables
Merge7z: readme.txt
Kimmo Varis [Sun, 11 Dec 2005 13:51:31 +0000 (13:51 +0000)]
PATCH: [
1371994 ] Enable hi-color icons for folder compare
Icons from Tim (Thanks!)
Perry Rapp [Sat, 10 Dec 2005 19:42:41 +0000 (19:42 +0000)]
PATCH: [
1373020 ] Carry unicoding, codepage, & file path together
Perry Rapp [Sat, 10 Dec 2005 05:58:22 +0000 (05:58 +0000)]
PATCH: [
1373020 ] Carry unicoding, codepage, & file path together
Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
Src\Common: RegKey.cpp
Perry Rapp [Sat, 10 Dec 2005 05:29:05 +0000 (05:29 +0000)]
PATCH: [
1371384 ] Move Expat maps into WinMerge src
Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
Src\ExpatMapLib added
Many files moved from DisplayXMLFiles to new ExpatMapLib
Perry Rapp [Fri, 9 Dec 2005 20:48:33 +0000 (20:48 +0000)]
PATCH: [
1377362 ] Fix coretools to MakeResDll compiles
BUG: [
1377361 ] MakeResDll broken b/c coretools broken
Src/Common: coretools.cpp
Perry Rapp [Fri, 9 Dec 2005 18:24:58 +0000 (18:24 +0000)]
PATCH: [
1249007 ] Short size column
Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
Perry Rapp [Fri, 9 Dec 2005 04:11:39 +0000 (04:11 +0000)]
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
A few string resources
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
Perry Rapp [Fri, 9 Dec 2005 02:39:34 +0000 (02:39 +0000)]
BUG: [
1376825 ] infinite loop bug in byte diffs
Src: stringdiffs.cpp
Perry Rapp [Fri, 9 Dec 2005 02:35:22 +0000 (02:35 +0000)]
2005-12-09 Perry
PATCH: [
1188787 ] New Chinese translation rc file (from PATCH
1183476)
Remainder of dialogs
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
Kimmo Varis [Thu, 8 Dec 2005 22:03:46 +0000 (22:03 +0000)]
PATCH: [
1375564 ] New encoding FAQ (UTF-8)
- submitted by Perry
Perry Rapp [Thu, 8 Dec 2005 21:51:41 +0000 (21:51 +0000)]
PATCH: [
1374728 ] Fix filter dialog delete
Src: FileFilterMgr.cpp
Kimmo Varis [Thu, 8 Dec 2005 19:55:12 +0000 (19:55 +0000)]
Takashi is now developer, Olivier Mellet submitted a patch
Kimmo Varis [Thu, 8 Dec 2005 19:45:33 +0000 (19:45 +0000)]
PATCH: [
1374782 ] fix for bug
1300957 Crash on save 'unique' file comparison
- submitted by Oliver Mellet, some additional comment improvements by me.
Perry Rapp [Thu, 8 Dec 2005 19:16:44 +0000 (19:16 +0000)]
2005-12-08 Perry
PATCH: [
1376457 ] Need clarification in platform test in ShellExtension
ShellExtension: ShellExtension.cpp
Takashi Sawanaka [Thu, 8 Dec 2005 15:01:49 +0000 (15:01 +0000)]
fixes bug that was reported in "PATCH: [
1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
>Seems it adds two line-end markers sometimes when whitespace chars are visible.
Takashi Sawanaka [Thu, 8 Dec 2005 14:52:55 +0000 (14:52 +0000)]
fixes bug that was reported in "PATCH: [
1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
>Seems it adds two line-end markers sometimes when whitespace chars are visible.
Takashi Sawanaka [Thu, 8 Dec 2005 14:40:39 +0000 (14:40 +0000)]
PATCH: [
1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
Perry Rapp [Wed, 7 Dec 2005 02:31:18 +0000 (02:31 +0000)]
Fix compile paths froma above (plugins go in MergePlugins subdirectory)
Plugins\src_VCPP\RCLocalizationHelper:
RCLocalizationHelper.dsp
Perry Rapp [Wed, 7 Dec 2005 01:11:38 +0000 (01:11 +0000)]
PATCH [
1374931 ] Bugfixes & upload binary for RCLocalizationHelper
Plugins\dlls: RCLocalizationHelper.dll (v1.0.0.2)
Plugins\src_VCPP\RCLocalizationHelper:
RCLocalizationHelper.dsp RCLocalizationHelper.rc typeinfoex.h
Perry Rapp [Tue, 6 Dec 2005 19:37:10 +0000 (19:37 +0000)]
TODO [
1341058 ] ToDoDeleteThisValidateColumnOrdering()
Src: DirView.cpp DirView.h DirViewColHandler.cpp
Perry Rapp [Tue, 6 Dec 2005 16:42:56 +0000 (16:42 +0000)]
PATCH [
1372575 ] Fix link for DisplayXmlFiles plugin (2005-12-06 Perry)
Plugins\dlls: DisplayXMLFiles.dll (v1.0.4.0)
Plugins\src_VCPP\DisplayXMLFiles:
DisplayXMLFiles.dsp DisplayXMLFiles.rc
Kimmo Varis [Tue, 6 Dec 2005 16:37:29 +0000 (16:37 +0000)]
WinMerge experimental release 2.5.0.3 (cvs)
Kimmo Varis [Tue, 6 Dec 2005 16:35:00 +0000 (16:35 +0000)]
Bump shellextension version to 1.7.0.
Kimmo Varis [Tue, 6 Dec 2005 16:31:14 +0000 (16:31 +0000)]
PATCH: [
1370183 ] ShellExtension: better way to check for WinMerge executable
Kimmo Varis [Tue, 6 Dec 2005 14:48:27 +0000 (14:48 +0000)]
PATCH: [
1373037 ] Fix filter dialog to correctly add new filters
- submitted by Perry
Kimmo Varis [Tue, 6 Dec 2005 14:43:38 +0000 (14:43 +0000)]
PATCH: [
1372589 ] Document tildas in config
- submitted by Perry
Perry Rapp [Mon, 5 Dec 2005 06:27:08 +0000 (06:27 +0000)]
2005-12-05 Perry
PATCH: [ 923044 ] Partial compare large files
WatchBeginningOfLog
Update rc file ("WinMerge plugin" and year), and initial check-in of binary
Plugins\WatchBeginningOfLog\WatchBeginningOfLog.rc
Plugins\dlls: new WatchBeginningOfLog.dll (v1.0.0.1)
WatchEndOfLog
Update rc file ("WinMerge plugin" and year), and initial check-in of binary
Plugins\WatchEndOfLog\WatchEndOfLog.rc
Plugins\dlls: new WatchEndOfLog.dll (v1.0.0.1)
Perry Rapp [Sun, 4 Dec 2005 21:13:54 +0000 (21:13 +0000)]
PATCH: [
1368762 ] Fix assignment in DirScan_GetItems
Also add explanatory comment, for what variable does.
Src: DirScan.cpp
Perry Rapp [Sun, 4 Dec 2005 19:02:33 +0000 (19:02 +0000)]
2005-12-04 Perry
PATCH: [
1372974 ] Make local function "GuessEncoding_from_bytes" static
Src: codepage_detect.cpp
Jochen Tucht [Sun, 4 Dec 2005 13:59:07 +0000 (13:59 +0000)]
Jochen changed GuessCodepageEncoding to use 8+1 for UTF-8 instead of 8
Jochen Tucht [Sun, 4 Dec 2005 13:59:07 +0000 (13:59 +0000)]
no message
Jochen Tucht [Sun, 4 Dec 2005 13:27:31 +0000 (13:27 +0000)]
no message
Perry Rapp [Sun, 4 Dec 2005 00:00:46 +0000 (00:00 +0000)]
2005-12-03 Perry: DisplayBinaryFiles
Update binary copy (from v1.0.0.1 to v1.0.1.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.1.0
Plugins\dlls: DisplayBinaryFiles.dll (v1.0.1.0)
Perry Rapp [Sat, 3 Dec 2005 23:55:38 +0000 (23:55 +0000)]
Perry added more file version notes to plugin history
Perry Rapp [Sat, 3 Dec 2005 23:22:56 +0000 (23:22 +0000)]
Recording more information about file version history of DisplayXMLFiles plugin
Perry Rapp [Sat, 3 Dec 2005 21:50:50 +0000 (21:50 +0000)]
2005-12-03 Perry: PATCH: [
1335128 ] Ignore uninstalled codepages
Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
Src/Common: unicoder.cpp
Kimmo Varis [Fri, 2 Dec 2005 17:20:56 +0000 (17:20 +0000)]
PATCH: [
1358408 ] Import and export for options
- increase buffer size
Perry Rapp [Fri, 2 Dec 2005 02:00:50 +0000 (02:00 +0000)]
PATCH: [
1369660 ] Delete unused variables m_msgUpdateStatus
Perry Rapp [Fri, 2 Dec 2005 01:49:24 +0000 (01:49 +0000)]
PATCH: [
1369660 ] Delete unused variables m_msgUpdateStatus
Cosmetic cleanup
Src: DirDoc.cpp
Perry Rapp [Thu, 1 Dec 2005 07:25:50 +0000 (07:25 +0000)]
2005-12-01 Perry
Add support for Microsoft proprietary Windows codepages
Plugsin\src_VCPP\DisplayXMLFiles:
expat_maps.cpp
New map_data_CP*.h (1250-1258)
New Plugsin\src_VCPP\DisplayXMLFiles\mappings\VENDORs\MICSFT\WINDOWS
CP*.TXT (1250-1258
Perry Rapp [Wed, 30 Nov 2005 22:49:33 +0000 (22:49 +0000)]
BUG: [
1368755 ] Want comment on format line in 7ZCommon.cpp
Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
Src: 7zCommon.cpp
Perry Rapp [Wed, 30 Nov 2005 18:52:47 +0000 (18:52 +0000)]
BUG: [
1369856 ] Crashed when interface language is changed
Perry Rapp [Wed, 30 Nov 2005 18:19:30 +0000 (18:19 +0000)]
PATCH: [
1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
Kimmo Varis [Wed, 30 Nov 2005 16:36:46 +0000 (16:36 +0000)]
PATCH: [
1265295 ] Swap file compare panes (use pointers for buffers)
- forgot to update resource.h in language folders
Kimmo Varis [Wed, 30 Nov 2005 15:24:00 +0000 (15:24 +0000)]
PATCH: [
1369544 ] Catalan translation update
- submitted by Jordi Vilar
Perry Rapp [Wed, 30 Nov 2005 00:16:40 +0000 (00:16 +0000)]
Cosmetic: add comment to DiffThread giving value of msgID variable (to help debugging).
Perry Rapp [Tue, 29 Nov 2005 00:46:30 +0000 (00:46 +0000)]
2005-11-28 Perry
BUG: [
1368492 ] cvs ASSERT failing
Fix reversion bug from Patch [
1265295 ]
Tim Gerundt [Mon, 28 Nov 2005 21:18:59 +0000 (21:18 +0000)]
Add 'Takashi Sawanaka' to developers.
Kimmo Varis [Mon, 28 Nov 2005 18:12:54 +0000 (18:12 +0000)]
PATCH: [
1265295 ] Swap file compare panes (use pointers for buffers)
- submitted by Takashi Sawanaka
Perry Rapp [Mon, 28 Nov 2005 04:51:24 +0000 (04:51 +0000)]
Cosmetic: improving comments in CWinMergeScript::get_PluginFileFilters
Perry Rapp [Mon, 28 Nov 2005 04:47:25 +0000 (04:47 +0000)]
PATCH: [
1336598 ] Add extensions DisplayXMLFiles plugin
Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
Perry Rapp [Sat, 26 Nov 2005 08:44:02 +0000 (08:44 +0000)]
PATCH: [
1241935 ] Implement Line Diff coloring on byte diffs
Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
Kimmo Varis [Wed, 23 Nov 2005 18:14:17 +0000 (18:14 +0000)]
WinMerge experimental release 2.5.0.2 (cvs)
Tim Gerundt [Tue, 22 Nov 2005 20:00:20 +0000 (20:00 +0000)]
PATCH: [
1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
Kimmo Varis [Tue, 22 Nov 2005 18:32:50 +0000 (18:32 +0000)]
BUG: [
1355884 ] 2.4.2 fails to open dvd files
File/folder selection dialog couldn't open read-only folders
Kimmo Varis [Tue, 22 Nov 2005 17:55:52 +0000 (17:55 +0000)]
PATCH: [
1362882 ] Remove option for autoclosing compare statepane
Perry Rapp [Tue, 22 Nov 2005 03:39:38 +0000 (03:39 +0000)]
BUG: [
1277320 ] Plugins.txt not up-to-date
Plugins/dll/IgnoreCommentsC
Perry Rapp [Tue, 22 Nov 2005 02:50:43 +0000 (02:50 +0000)]
2005-11-21 Perry
PATCH: [
1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
Plugins\src_VCPP\DisplayXMLFiles altered files:
DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
Plugins\src_VCPP\DisplayXMLFiles new files:
expat_maps.cpp expat_maps.h MakeExpatEncod.rb
map_data_8859*.h (1-11, 13-16)
Plugins\src_VCPP\DisplayXMLFiles\mappings\ISO8859 new files:
8859*.TXT (1-11, 13-16)
Perry Rapp [Tue, 22 Nov 2005 02:34:20 +0000 (02:34 +0000)]
PATCH: [
1334277 ] Show asterisk in #diffs for QuickCompare results
Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
Kimmo Varis [Sun, 20 Nov 2005 15:57:43 +0000 (15:57 +0000)]
PATCH: [
1349645 ] Folder Compare Statistics dialog
PATCH: [
1347787 ] Use non-modal dialog for dir compare status
Jochen Tucht [Sat, 19 Nov 2005 15:47:30 +0000 (15:47 +0000)]
Merge7z DllBuild 0017
Jochen Tucht [Sat, 19 Nov 2005 14:35:07 +0000 (14:35 +0000)]
Merge7z DllBuild 0017
Jochen Tucht [Sat, 19 Nov 2005 14:34:05 +0000 (14:34 +0000)]
no message
Jochen Tucht [Sat, 19 Nov 2005 14:29:17 +0000 (14:29 +0000)]
Merge7z DllBuild 0017
Kimmo Varis [Fri, 18 Nov 2005 22:05:19 +0000 (22:05 +0000)]
PATCH: [
1358408 ] Import and export for options
Kimmo Varis [Fri, 18 Nov 2005 17:56:37 +0000 (17:56 +0000)]
PATCH: [
1349645 ] Folder Compare Statistics dialog
PATCH: [
1347787 ] Use non-modal dialog for dir compare status
Kimmo Varis [Thu, 17 Nov 2005 22:09:05 +0000 (22:09 +0000)]
PATCH: [
1349645 ] Folder Compare Statistics dialog
PATCH: [
1347787 ] Use non-modal dialog for dir compare status
Kimmo Varis [Wed, 16 Nov 2005 15:57:31 +0000 (15:57 +0000)]
PATCH: [
1356783 ] Use OptionsMgr in SyntaxColors class
Tim Gerundt [Sat, 12 Nov 2005 22:54:47 +0000 (22:54 +0000)]
PATCH: [
1353472 ] Website changes for new stable release 2.4.2
Kimmo Varis [Wed, 9 Nov 2005 17:49:22 +0000 (17:49 +0000)]
PATCH: [
1350638 ] Move options read/write code to options panels
Kimmo Varis [Wed, 9 Nov 2005 17:25:54 +0000 (17:25 +0000)]
PATCH: [
1351769 ] Manual: Minor update to file compare chapter
Kimmo Varis [Tue, 8 Nov 2005 19:13:35 +0000 (19:13 +0000)]
PATCH: [
1350819 ] Manual: Small improvements for folder compare
Kimmo Varis [Tue, 8 Nov 2005 19:01:04 +0000 (19:01 +0000)]
PATCH: [
1350794 ] Manual: Update About doc chapter
Kimmo Varis [Tue, 8 Nov 2005 18:45:06 +0000 (18:45 +0000)]
PATCH: [
1350489 ] Use SelectFile() for external editor selection
Kimmo Varis [Tue, 8 Nov 2005 18:40:34 +0000 (18:40 +0000)]
Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #
1348733)
Jochen Tucht [Sun, 6 Nov 2005 19:07:38 +0000 (19:07 +0000)]
PATCH: [
1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
Jochen Tucht [Sun, 6 Nov 2005 19:00:45 +0000 (19:00 +0000)]
PATCH: [
1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
Christian List [Sun, 6 Nov 2005 03:00:16 +0000 (03:00 +0000)]
PATCH: [
1341559 ] New CompareMSExcelFiles plugin
Perry Rapp [Sat, 5 Nov 2005 00:38:56 +0000 (00:38 +0000)]
PATCH: [
1348733 ] Fix open dialog for cvs version 2.4
Src: OpenDlg.cpp
Perry Rapp [Sat, 5 Nov 2005 00:06:53 +0000 (00:06 +0000)]
2005-11-05 Perry
PATCH: [
1337905 ] Allow comparing binary files with binary unpacker
Src: DirView.cpp
Perry Rapp [Fri, 4 Nov 2005 19:39:13 +0000 (19:39 +0000)]
2005-11-04 Perry
PATCH: [
1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
Plugins/dlls: Plugins.txt
Tim Gerundt [Wed, 2 Nov 2005 19:22:06 +0000 (19:22 +0000)]
Translate "OptionalFeatures" and "ProjectFileDesc" to German
Kimmo Varis [Wed, 2 Nov 2005 16:03:57 +0000 (16:03 +0000)]
WinMerge experimental release 2.5.0.1 (cvs)
Kimmo Varis [Wed, 2 Nov 2005 16:00:11 +0000 (16:00 +0000)]
Bump ShellExtension version to 1.6.2
Kimmo Varis [Wed, 2 Nov 2005 15:46:12 +0000 (15:46 +0000)]
PATCH: [
1345110 ] Properly compare projectfile extension
Kimmo Varis [Wed, 2 Nov 2005 15:40:14 +0000 (15:40 +0000)]
PATCH: [
1342550 ] Modernize file selection dialog
Kimmo Varis [Wed, 2 Nov 2005 15:22:40 +0000 (15:22 +0000)]
BUG: [
1341243 ] Current Find string is too fragile
Was resetting find string after rescanning
Tim Gerundt [Wed, 2 Nov 2005 11:54:50 +0000 (11:54 +0000)]
PATCH: [
1345382 ] Translated Shell Extension to German
Kimmo Varis [Tue, 1 Nov 2005 15:13:18 +0000 (15:13 +0000)]
PATCH: [
1344219 ] Manual: New FAQ items about archive files detection
Kimmo Varis [Tue, 1 Nov 2005 15:07:57 +0000 (15:07 +0000)]
PATCH: [
1344213 ] Manual: typo fixes for Configuration part
Kimmo Varis [Mon, 31 Oct 2005 17:00:59 +0000 (17:00 +0000)]
PATCH: [
1343059 ] Swedish translation update for 2.5.0.1 experimental
- submitted by Hans Eriksson
Kimmo Varis [Mon, 31 Oct 2005 16:54:55 +0000 (16:54 +0000)]
PATCH: [
1342871 ] Disable Copy Filenames for folders
Kimmo Varis [Mon, 31 Oct 2005 16:51:47 +0000 (16:51 +0000)]
RFE: [
1324314 ] CTRL+W to close current diff