OSDN Git Service
Jochen Tucht [Sun, 20 Mar 2005 09:01:06 +0000 (09:01 +0000)]
Update IDD_MERGE7ZMISMATCH resource in localized RC files
Jochen Tucht [Sun, 20 Mar 2005 08:55:03 +0000 (08:55 +0000)]
Update IDD_MERGE7ZMISMATCH resource in localized RC files
Perry Rapp [Sat, 19 Mar 2005 17:42:34 +0000 (17:42 +0000)]
2005-03-19 Perry
PATCH: [
1157769 ] Move GuessEncoding functions into one file
Src: DiffContext.cpp DiffContext.cpp MainFrm.cpp Merge.dsp
Src/Common: UniFile.cpp UniFile.h
Src new: codepage_detect.cpp codepage_detect.h
Perry Rapp [Fri, 18 Mar 2005 22:57:26 +0000 (22:57 +0000)]
Cosmetic (new comments)
Src/Common: LanguageSelect.cpp
Perry Rapp [Fri, 18 Mar 2005 22:38:45 +0000 (22:38 +0000)]
PATCH: [
1162571 ] Simplify SplitFilename
Src/Common: coretools.cpp
Perry Rapp [Fri, 18 Mar 2005 17:42:12 +0000 (17:42 +0000)]
2005-03-18 Perry
PATCH: [
1155977 ] Log scriptlet plugin errors
Src: Plugins.cpp
Kimmo Varis [Wed, 16 Mar 2005 19:29:47 +0000 (19:29 +0000)]
PATCH: [
1161709 ] Virtual InitOption() and SaveOption() for COptionsMgr
Jochen Tucht [Wed, 16 Mar 2005 17:00:31 +0000 (17:00 +0000)]
no message
Jochen Tucht [Wed, 16 Mar 2005 16:59:37 +0000 (16:59 +0000)]
BUG: [
1154551 ] Merge7zInstaller download link focus issue
Jochen Tucht [Wed, 16 Mar 2005 16:58:27 +0000 (16:58 +0000)]
Widen controls to display Merge7z plugin names (unicode names got chopped off)
Jochen Tucht [Tue, 15 Mar 2005 19:35:38 +0000 (19:35 +0000)]
no message
Jochen Tucht [Tue, 15 Mar 2005 19:34:41 +0000 (19:34 +0000)]
Fix typo in IDD_MERGE7ZMISMATCH dialog
Jochen Tucht [Tue, 15 Mar 2005 19:16:04 +0000 (19:16 +0000)]
Import Merge7z415(U).dll
Jochen Tucht [Tue, 15 Mar 2005 19:13:06 +0000 (19:13 +0000)]
Initialize filename in Open dialog to "*.exe"
Kimmo Varis [Tue, 15 Mar 2005 16:52:02 +0000 (16:52 +0000)]
Remove version numbers accidentally applied earlier
Kimmo Varis [Tue, 15 Mar 2005 16:49:00 +0000 (16:49 +0000)]
Add include I missed from fix to bug #
1154153
Kimmo Varis [Tue, 15 Mar 2005 16:04:41 +0000 (16:04 +0000)]
WinMerge beta 2.3.2.0 released
Kimmo Varis [Mon, 14 Mar 2005 20:03:22 +0000 (20:03 +0000)]
BUG: [
1154153 ] Poor font choice for default font
- fix submitted by Takashi Sawanaka
Kimmo Varis [Sun, 13 Mar 2005 22:19:22 +0000 (22:19 +0000)]
BUG: [
1162374 ] Recent WinMerge doesn't support NT4
Kimmo Varis [Sun, 13 Mar 2005 19:35:04 +0000 (19:35 +0000)]
BUG: [
1160919 ] Bad layout in the OpenDialog
- fix submitted by Tim
Jochen Tucht [Sun, 13 Mar 2005 19:16:03 +0000 (19:16 +0000)]
Fix bug [
1162369] short path name problem
Jochen Tucht [Sun, 13 Mar 2005 19:05:54 +0000 (19:05 +0000)]
Fix bug [
1162369] short path name problem
Tim Gerundt [Sun, 13 Mar 2005 18:44:45 +0000 (18:44 +0000)]
PATCH: [
1160257 ] Web: Various navigation updates
Kimmo Varis [Sun, 13 Mar 2005 13:23:12 +0000 (13:23 +0000)]
BUG: [
1160919 ] Bad layout in the OpenDialog
- fix submitted by Tim
Kimmo Varis [Sun, 13 Mar 2005 13:17:46 +0000 (13:17 +0000)]
PATCH: [
1161671 ] Convert couple of VCS options to COptionsMgr
Kimmo Varis [Fri, 11 Mar 2005 17:25:24 +0000 (17:25 +0000)]
PATCH: [
1160923 ] Remove CMainFrame::m_nCompMethod (ugly hack)
Kimmo Varis [Thu, 10 Mar 2005 23:56:44 +0000 (23:56 +0000)]
Fix invalid compare for VSS dialog returnvalue
Kimmo Varis [Thu, 10 Mar 2005 20:48:44 +0000 (20:48 +0000)]
PATCH: [
1160064 ] Undo for Copy All
Perry Rapp [Wed, 9 Mar 2005 15:46:25 +0000 (15:46 +0000)]
PATCH: [
1159465 ] Add Jesus (Mack) to contributors/Spanish
Add [Jes�s M. Delgado 'MacK'] to Spanish contributors.
Alphabetize Swedish contributors.
Users/Docs: Contributors.txt
Perry Rapp [Wed, 9 Mar 2005 14:32:13 +0000 (14:32 +0000)]
2005-03-09 Perry
PATCH: [
1157359 ] Minor change for FILEFILTER_INFOLIST
Src: FileFilterHelper.h
Perry Rapp [Wed, 9 Mar 2005 00:15:12 +0000 (00:15 +0000)]
BUG: [
1143619 ] Unicode chars in filename display as '_'
Remove ES_OEMCONVERT from edit boxes in IDD_EDITOR_HEADERBAR.
Src: Merge.rc
Src/Languages: Merge*.rc
Perry Rapp [Tue, 8 Mar 2005 23:42:26 +0000 (23:42 +0000)]
2005-03-08 Perry
Cosmetic: Added & doxygen'd comments, and prefixed members with m_.
Src: FilepathEdit.cpp FilepathEdit.h
Kimmo Varis [Tue, 8 Mar 2005 17:11:29 +0000 (17:11 +0000)]
WinMerge experimental release 2.3.1.6 (cvs)
Kimmo Varis [Tue, 8 Mar 2005 17:07:26 +0000 (17:07 +0000)]
PATCH: [
1158136 ] Spanish translation revised
-submitted by Jesus M. Delgado 'Mack'
Kimmo Varis [Tue, 8 Mar 2005 17:04:46 +0000 (17:04 +0000)]
PATCH: [
1159112 ] Swedish translation revision
- submitted by Hans Eriksson
Kimmo Varis [Tue, 8 Mar 2005 16:53:50 +0000 (16:53 +0000)]
PATCH: [
1159112 ] Swedish translation revision
- submitted by Hans Eriksson
Kimmo Varis [Tue, 8 Mar 2005 16:43:33 +0000 (16:43 +0000)]
PATCH: [
1158484 ] Fix assert from headerbar-setactive() when closing views
Kimmo Varis [Tue, 8 Mar 2005 16:29:52 +0000 (16:29 +0000)]
PATCH: [
1158456 ] Fix setting font for headerbar editcontrols
Perry Rapp [Mon, 7 Mar 2005 13:47:22 +0000 (13:47 +0000)]
2005-03-07 Perry
PATCH: [
1157859 ] Add LVS_SHOWSELALWAYS style to dirview
Postlude: Alter WindowStyle_Add to call CWnd::ModifyStyle.
Src/Common: WindowStyle.cpp
Tim Gerundt [Sun, 6 Mar 2005 23:08:46 +0000 (23:08 +0000)]
PATCH: [
1156198 ] Non-standard html in developer docs
Tim Gerundt [Sun, 6 Mar 2005 21:53:45 +0000 (21:53 +0000)]
PATCH: [
1157240 ] Web: Scaling menu
Perry Rapp [Sun, 6 Mar 2005 19:39:35 +0000 (19:39 +0000)]
PATCH: [
1157859 ] Add LVS_SHOWSELALWAYS style to dirview
Src: DirView.cpp Merge.dsp
Common new files: WindowStyle.cpp WindowStyle.h
(second application -- Merge.dsp was not saved to disk before)
Perry Rapp [Sun, 6 Mar 2005 19:36:08 +0000 (19:36 +0000)]
PATCH: [
1157859 ] Add LVS_SHOWSELALWAYS style to dirview
Src: DirView.cpp
Common new files: WindowStyle.cpp WindowStyle.h
Perry Rapp [Sun, 6 Mar 2005 18:39:52 +0000 (18:39 +0000)]
PATCH: [ 968285 ] DBCS fixes from Sawanaka
(continuing editlib portions)
Src/editlib: batch.cpp crystaleditview.cpp crystaltextview2.cpp cplusplus.cpp
cregexp.cpp csharp.cpp dcl.cpp filesup.cpp fortran.cpp html.cpp js.cpp
java.cpp list.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp
sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
Perry Rapp [Sun, 6 Mar 2005 03:59:08 +0000 (03:59 +0000)]
2005-03-06 Perry
[ 964676 ] rc file lacks bytes after DIALOGEX defs
Add 0,0,0x1 to any FONT line lacking it, for all DIALOGEX dialogs
Src: Merge.rc
Languages: Merge*.rc
Perry Rapp [Sun, 6 Mar 2005 02:52:11 +0000 (02:52 +0000)]
2005-03-06 Perry
PATCH: [
1157524 ] Fix view line length
editlib: ccrystaltextview.cpp ccrystaltextview.h
Perry Rapp [Sat, 5 Mar 2005 18:10:17 +0000 (18:10 +0000)]
PATCH: [ 968285 ] DBCS fixes from Sawanaka
Applied asp & basic portions (there are many more)
editlib: asp.cpp basic.cpp
Perry Rapp [Sat, 5 Mar 2005 17:38:00 +0000 (17:38 +0000)]
PATCH: [
1157145 ] FileFilterHelper doesn't have boilerplate new redefinition
Src: FileFilterHelper.cpp
Perry Rapp [Sat, 5 Mar 2005 07:23:22 +0000 (07:23 +0000)]
PATCH: [
1157015 ] Spanish translation update
Lots of updates to Spanish translation by Jesus M. Delgado 'Mack'
Src/Languages/Spanish: MergeSpanish.rc
Perry Rapp [Sat, 5 Mar 2005 06:34:53 +0000 (06:34 +0000)]
BUG: [
1153184 ] DiffWrapper.cpp missing NEW redefinition
Added boilerplate new redefintion for DEBUG builds to DiffWrapper.cpp
Src: DiffWrapper.cpp
Perry Rapp [Sat, 5 Mar 2005 06:23:28 +0000 (06:23 +0000)]
Rename FilterHelper's GetUseMask to IsUsingMask.
Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
Perry Rapp [Sat, 5 Mar 2005 06:20:45 +0000 (06:20 +0000)]
More filter clarifying renames
Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
Perry Rapp [Sat, 5 Mar 2005 06:12:58 +0000 (06:12 +0000)]
2005-03-05 Perry
Rename CDirFrame::SetFilter to CDirFrame::SetFilterStatusDisplay for easier greps.
Src: DirDoc.cpp DirFrame.cpp DirFrame.h
Perry Rapp [Sat, 5 Mar 2005 00:49:58 +0000 (00:49 +0000)]
PATCH: [
1112871 ] new byte_compare function to bypass diffutils
Src: DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp Merge.dsp
Src new files: ByteComparator.cpp ByteComparator.h
Perry Rapp [Sat, 5 Mar 2005 00:21:44 +0000 (00:21 +0000)]
PATCH: [
1112871 ] new byte_compare function to bypass diffutils
Src: DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp Merge.dsp
Src new files: ByteComparator.cpp ByteComparator.h
Perry Rapp [Fri, 4 Mar 2005 18:57:25 +0000 (18:57 +0000)]
2005-03-04 Perry
PATCH: [
1147039 ] experimental patch for colored word diff
Merge all the easy new Japanese string translations
(Omit major changes to IDD_PROPPAGE_EDITOR & IDD_MERGE7ZMISMATCH.
Languages: Japanese/MergeJapanese.rc
Kimmo Varis [Fri, 4 Mar 2005 13:39:42 +0000 (13:39 +0000)]
PATCH: [
1147039 ] experimental patch for colored word diff
- submitted by Takashi Sawanaka
Kimmo Varis [Fri, 4 Mar 2005 09:15:51 +0000 (09:15 +0000)]
PATCH: [
1156188 ] Updated readme-innosetup
Kimmo Varis [Fri, 4 Mar 2005 08:58:21 +0000 (08:58 +0000)]
PATCH: [
1155436 ] Remove non-const GetDiffAt() from CDiffContext
Kimmo Varis [Fri, 4 Mar 2005 08:21:23 +0000 (08:21 +0000)]
PATCH: [
1155319 ] Select font for dir compare view
- we must allow selecting file compare font even if no open views
Perry Rapp [Fri, 4 Mar 2005 02:20:58 +0000 (02:20 +0000)]
2005-03-04 Perry
PATCH: [
1156253 ] Fix filter helper handling of new filters
BUG: [
1153018 ] Create new filter, now cannot find it
Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp Merge.cpp
Merge.h paths.cpp paths.h
Kimmo Varis [Thu, 3 Mar 2005 18:22:47 +0000 (18:22 +0000)]
PATCH: [
1154667 ] Make CDiffContext paths private members
Kimmo Varis [Thu, 3 Mar 2005 17:15:45 +0000 (17:15 +0000)]
PATCH: [
1155319 ] Select font for dir compare view
Perry Rapp [Thu, 3 Mar 2005 15:42:45 +0000 (15:42 +0000)]
2005-03-03 Perry
Fix typo ("for" => "four")
Manual: Text_encoding.xml
Perry Rapp [Thu, 3 Mar 2005 15:31:31 +0000 (15:31 +0000)]
2005-03-02 Perry
PATCH: [
1154259 ] Non blurred 'error.bmp'
New clearer error bitmap from Tim Gerundt
Languages: res/error.bmp
Perry Rapp [Thu, 3 Mar 2005 06:37:46 +0000 (06:37 +0000)]
2005-03-03 Perry
PATCH: [
1151951 ] Alter getRightFilepath for root paths
re: BUG: [
1105933 ] Problem accessing files in network shares and removables
Src: DiffContext.cpp
Kimmo Varis [Wed, 2 Mar 2005 21:31:53 +0000 (21:31 +0000)]
BUG: [ 975226 ] Editor: Always refresh with Del-Key
- fix submitted by Takashi Sawanaka
Perry Rapp [Wed, 2 Mar 2005 03:55:25 +0000 (03:55 +0000)]
PATCH: [ 967230 ] Initialize default language from locale
Src/Common: LanguageSelect.cpp LanguageSelect.h
Perry Rapp [Wed, 2 Mar 2005 03:38:12 +0000 (03:38 +0000)]
PATCH: [
1153127 ] Rename Filepath to FilepathWithEncoding
Src: DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Wed, 2 Mar 2005 03:34:16 +0000 (03:34 +0000)]
PATCH: [
1154259 ] Non blurred 'error.bmp'
New clearer error bitmap from Tim Gerundt
Src/Res: error.bmp
Kimmo Varis [Tue, 1 Mar 2005 15:38:17 +0000 (15:38 +0000)]
WinMerge experimental release 2.3.1.5 (cvs)
Kimmo Varis [Tue, 1 Mar 2005 15:26:28 +0000 (15:26 +0000)]
PATCH: [
1153905 ] Doc: Update installation help for Merge7zInstaller
Kimmo Varis [Tue, 1 Mar 2005 15:23:06 +0000 (15:23 +0000)]
PATCH: [
1153870 ] Disable redrawing dir compare view while adding items
Kimmo Varis [Tue, 1 Mar 2005 15:20:29 +0000 (15:20 +0000)]
PATCH: [
1153851 ] Remove Merge7z*.dll install from installer
Jochen Tucht [Tue, 1 Mar 2005 06:49:33 +0000 (06:49 +0000)]
Patches [
1152341], [
1152469]
Jochen Tucht [Tue, 1 Mar 2005 06:41:35 +0000 (06:41 +0000)]
Patch [
1152469] Add Merge7zInstaller download link
Jochen Tucht [Tue, 1 Mar 2005 06:34:21 +0000 (06:34 +0000)]
Patch [
1152341] Merge7z update (DllBuild_Merge7z_10)
Perry Rapp [Mon, 28 Feb 2005 22:51:59 +0000 (22:51 +0000)]
BUG: [ 895732 ] paths_GetLongPath usually ignores 2nd parameter
Remove 2nd parameter entirely from paths_GetLongPath, and improve documentation.
Src: Merge.cpp OpenDlg.cpp paths.cpp paths.h readme.txt
Kimmo Varis [Mon, 28 Feb 2005 20:39:15 +0000 (20:39 +0000)]
PATCH: [
1144545 ] Project Handling Patch3 (remember last valid project path)
- submitted by Andreas Morsing
Kimmo Varis [Mon, 28 Feb 2005 17:11:35 +0000 (17:11 +0000)]
PATCH: [
1153091 ] Fix selecting default font from View menu
Perry Rapp [Mon, 28 Feb 2005 14:56:49 +0000 (14:56 +0000)]
BUG: [
1039158 ] Confusing EOL differences messagebox
Perry Rapp [Mon, 28 Feb 2005 00:15:23 +0000 (00:15 +0000)]
PATCH: [ 925085 ] Propose failing files 2gigs+ in size
Src/Common: UniFile.cpp
Perry Rapp [Sun, 27 Feb 2005 23:59:26 +0000 (23:59 +0000)]
BUG [
1144425 ] German: Options/codepage dlg needs adjust
(Fix by Tim Gerundt)
Perry Rapp [Sun, 27 Feb 2005 23:23:08 +0000 (23:23 +0000)]
PATCH: [
1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles
(new method DiffFileData::Filepath::AssignPath)
Kimmo Varis [Sun, 27 Feb 2005 23:15:42 +0000 (23:15 +0000)]
BUG: [
1153017 ] FileFilterHelper::SetFilter ASSERTS on empty string
Perry Rapp [Sun, 27 Feb 2005 22:47:57 +0000 (22:47 +0000)]
BUG: [
1152911 ] CListCtrlEx::Dump is an infinite loop.
Perry Rapp [Sun, 27 Feb 2005 19:48:55 +0000 (19:48 +0000)]
Cosmetic: Add more explanation to function header of
FileFilterHelper::LoadFileFilterDirPattern.
Perry Rapp [Sun, 27 Feb 2005 19:06:21 +0000 (19:06 +0000)]
BUG: [
1038897 ] Weird comment in DiffWrapper.cpp
cosmetic: removing obsolete comment, improving existing comments
Perry Rapp [Sun, 27 Feb 2005 18:03:43 +0000 (18:03 +0000)]
PATCH: [
1152967 ] Fix re_match_2 declaration warnings
Perry Rapp [Sun, 27 Feb 2005 17:53:06 +0000 (17:53 +0000)]
BUG: [
1152913 ] LocationView type bugs?
(Fixed 17 type conversion warnings in MSVC.NET 2003, mostly by explicit casts)
Jochen Tucht [Sat, 26 Feb 2005 16:55:48 +0000 (16:55 +0000)]
Attempt to fix bug [
1152375] 'Help -> Archive Support disabled' broken
Jochen Tucht [Sat, 26 Feb 2005 14:13:28 +0000 (14:13 +0000)]
Explain release filename convention
Jochen Tucht [Sat, 26 Feb 2005 10:08:51 +0000 (10:08 +0000)]
Patch [
1152256] UniFile may fail to read last line
Perry Rapp [Sat, 26 Feb 2005 06:49:41 +0000 (06:49 +0000)]
PATCH: [
1151949 ] Fix CDirDoc::FindItemFromPaths for root
Tim Gerundt [Fri, 25 Feb 2005 22:42:11 +0000 (22:42 +0000)]
PATCH: [
1151385 ] Compile instructions for Merge7zInstaller
Perry Rapp [Wed, 23 Feb 2005 21:28:30 +0000 (21:28 +0000)]
PATCH: [
1145016 ] i18n the version control strings
Src: Merge.rc PropVss.cpp PropVss.h resource.h
Languages: resource.h Merge*.rc
Kimmo Varis [Wed, 23 Feb 2005 18:13:31 +0000 (18:13 +0000)]
2005-02-23 WinMerge experimental release 2.3.1.4 (cvs)
Kimmo Varis [Wed, 23 Feb 2005 18:10:15 +0000 (18:10 +0000)]
PATCH: [
1145560 ] Docs: Add link to updated developer-pages
Kimmo Varis [Wed, 23 Feb 2005 18:05:20 +0000 (18:05 +0000)]
Add compiler-selecting ifdef to Unifile.cpp to make it compile with MSVC6 and MSVC7
Kimmo Varis [Wed, 23 Feb 2005 17:49:20 +0000 (17:49 +0000)]
PATCH: [
1149388 ] Check for previous compare text before find again