OSDN Git Service
Kimmo Varis [Sat, 9 Aug 2008 15:05:38 +0000 (15:05 +0000)]
PATCH: [
2038924 ] Major edit Compare_files help topic
Submitted by Denis Bradford
Kimmo Varis [Sat, 9 Aug 2008 09:21:52 +0000 (09:21 +0000)]
Add our default SVN properties for new files.
Jochen Tucht [Sat, 9 Aug 2008 08:44:31 +0000 (08:44 +0000)]
Jochen Tucht [Sat, 9 Aug 2008 08:37:04 +0000 (08:37 +0000)]
Jochen Tucht [Sat, 9 Aug 2008 08:31:38 +0000 (08:31 +0000)]
Marcel Gosselin [Sat, 9 Aug 2008 04:06:24 +0000 (04:06 +0000)]
Remove code commented since 2001
Jochen Tucht [Fri, 8 Aug 2008 17:25:06 +0000 (17:25 +0000)]
precompiled header fixes from patch #
2036603
Kimmo Varis [Fri, 8 Aug 2008 15:06:54 +0000 (15:06 +0000)]
PATCH: [
2039929 ] update ChineseTraditional.po from revision 5739
Submitted by wck3
Kimmo Varis [Fri, 8 Aug 2008 12:59:16 +0000 (12:59 +0000)]
PATCH: [
2042296 ] Refactor undobuffer
Forgot to add GhostUndorecord.h in earlier commit
Kimmo Varis [Fri, 8 Aug 2008 06:46:30 +0000 (06:46 +0000)]
Fix std::string::find() return value checking (must check against std::string.npos).
Kimmo Varis [Fri, 8 Aug 2008 05:32:15 +0000 (05:32 +0000)]
PATCH: [
2042296 ] Refactor undobuffer
Marcel Gosselin [Fri, 8 Aug 2008 04:54:52 +0000 (04:54 +0000)]
Remove some compilation warnings
Marcel Gosselin [Fri, 8 Aug 2008 04:24:57 +0000 (04:24 +0000)]
Use std::map instead of CMap in codepage.cpp
Marcel Gosselin [Fri, 8 Aug 2008 04:01:13 +0000 (04:01 +0000)]
Remove dead code in codepage.{h|cpp}
Marcel Gosselin [Fri, 8 Aug 2008 03:18:09 +0000 (03:18 +0000)]
Replace CArray by std::vector in DirView code
Marcel Gosselin [Fri, 8 Aug 2008 03:01:00 +0000 (03:01 +0000)]
Replace CArray by std::vector
Marcel Gosselin [Fri, 8 Aug 2008 02:30:29 +0000 (02:30 +0000)]
Remove "using namespace CompareEngines" to prevent polluting the global namespace.
Marcel Gosselin [Fri, 8 Aug 2008 02:24:18 +0000 (02:24 +0000)]
Change all "using namespace std" directives to "using std::vector" or "using std::map" declarations to prevent polluting the global namespace.
Marcel Gosselin [Fri, 8 Aug 2008 02:11:51 +0000 (02:11 +0000)]
Use std::swap instead of home-made swap
Tim Gerundt [Thu, 7 Aug 2008 23:19:10 +0000 (23:19 +0000)]
PATCH: [
2042221 ] Web: Changes for new stable release 2.8.6
Kimmo Varis [Wed, 6 Aug 2008 21:58:41 +0000 (21:58 +0000)]
Add memory allocation debugging define.
Kimmo Varis [Wed, 6 Aug 2008 16:39:38 +0000 (16:39 +0000)]
PATCH: [
2039228 ] Add wait-cursor and statusbar message for undo and redo
Takashi Sawanaka [Wed, 6 Aug 2008 15:33:15 +0000 (15:33 +0000)]
BUG: [
2025833 ] Deleting/Moving file crashes WinMerge in debugger
Kimmo Varis [Tue, 5 Aug 2008 21:27:38 +0000 (21:27 +0000)]
BUG: [
2037862 ] Not possible to use command line options for external editor
Kimmo Varis [Tue, 5 Aug 2008 20:30:02 +0000 (20:30 +0000)]
PATCH: [
2039263 ] Refactor editor linebuf code to class
Kimmo Varis [Mon, 4 Aug 2008 20:54:49 +0000 (20:54 +0000)]
Rename SLineInfo to LineInfo and make it a class. Add LineInfo methods Create(), CreateEmpty() and Append().
Kimmo Varis [Mon, 4 Aug 2008 15:38:15 +0000 (15:38 +0000)]
PATCH: [
2037677 ] Do not register ShellExtension for release builds
Kimmo Varis [Mon, 4 Aug 2008 14:18:49 +0000 (14:18 +0000)]
WinMerge experimental release 2.11.1.3 (SVN revision 5733)
Kimmo Varis [Mon, 4 Aug 2008 14:10:59 +0000 (14:10 +0000)]
Update PO files from latest POT file.
Kimmo Varis [Mon, 4 Aug 2008 14:08:25 +0000 (14:08 +0000)]
Bump manual revision to 1.5.2.
Kimmo Varis [Mon, 4 Aug 2008 13:01:01 +0000 (13:01 +0000)]
Add a Python script for cleaning up TortoiseSVN patch files for use with GNU patch.
Kimmo Varis [Mon, 4 Aug 2008 11:41:36 +0000 (11:41 +0000)]
Move static char width tables to member variables and add method to reset the tables.
Kimmo Varis [Mon, 4 Aug 2008 10:53:30 +0000 (10:53 +0000)]
BUG: [
1153696 ] Backspace doesn't work if Shift pressed down
Jochen Tucht [Sun, 3 Aug 2008 11:47:53 +0000 (11:47 +0000)]
Add Merge7z458(U)
Jochen Tucht [Sun, 3 Aug 2008 11:45:27 +0000 (11:45 +0000)]
Add LZMA format (introduced with 7z458 beta)
Jochen Tucht [Sun, 3 Aug 2008 11:12:20 +0000 (11:12 +0000)]
Fix OpenArchive.* being taken from wrong folder
Jochen Tucht [Sun, 3 Aug 2008 11:07:07 +0000 (11:07 +0000)]
Kimmo Varis [Sat, 2 Aug 2008 20:21:52 +0000 (20:21 +0000)]
Remove unneeded definition of SLineInfo struct from GhostTextBuffer.
Kimmo Varis [Sat, 2 Aug 2008 17:59:01 +0000 (17:59 +0000)]
Move SUndoRecord struct code to own files.
Kimmo Varis [Sat, 2 Aug 2008 15:42:20 +0000 (15:42 +0000)]
Move SLineInfo struct definition to own header file.
Kimmo Varis [Fri, 1 Aug 2008 18:32:08 +0000 (18:32 +0000)]
PATCH: [
2032801 ] Update doc using GUI default window config
Submitted by Denis Bradford
Kimmo Varis [Fri, 1 Aug 2008 14:46:57 +0000 (14:46 +0000)]
Optimize allocation of reality mapping table. Should help with bug #
1990085 Slow copying lots of differences.
Kimmo Varis [Fri, 1 Aug 2008 14:35:59 +0000 (14:35 +0000)]
Use std::vector for undo records. Optimize allocation of vector items. Should help with bug #
1990085 Slow copying lots of differences.
Kimmo Varis [Fri, 1 Aug 2008 14:11:33 +0000 (14:11 +0000)]
Add new test data folder and add big conflict file (very useful for performance testing).
Kimmo Varis [Fri, 1 Aug 2008 06:55:15 +0000 (06:55 +0000)]
BUG: [
2000996 ] Syntax coloring boldface not working in most fonts
Kimmo Varis [Fri, 1 Aug 2008 06:53:39 +0000 (06:53 +0000)]
PATCH: [
2033754 ] Unlimited undo
Missed one file.
Kimmo Varis [Fri, 1 Aug 2008 06:44:00 +0000 (06:44 +0000)]
PATCH: [
2033754 ] Unlimited undo
Kimmo Varis [Thu, 31 Jul 2008 11:39:05 +0000 (11:39 +0000)]
BUG: [
2025130 ] Line Filters behave wonky
Takashi Sawanaka [Wed, 30 Jul 2008 19:33:52 +0000 (19:33 +0000)]
PATCH: [
2018836 ] RFE:987590 hierarchical directory comparison result view (3)
- Display whether folders are different or not.
- Add icons (equalfolder.ico, notequlfolder.ico). These are temporary icons. I'm glad if someone could make better icons.
- Disables Tree Mode menu item when doing non-recursive compare.
- Disables Backspace key when doing reursive compare or using Tree Mode.
- Changes the initial folder state to 'collapsed' state.
- Didn't move to different folder item when pressing Alt+Up/Down.
Kimmo Varis [Wed, 30 Jul 2008 19:24:23 +0000 (19:24 +0000)]
Optimize line replace. Don't bother clearing the string before setting new data to it.
Takashi Sawanaka [Wed, 30 Jul 2008 19:23:10 +0000 (19:23 +0000)]
PATCH: [
2018836 ] RFE:987590 hierarchical directory comparison result view (2)
- Expand/Collapse folder item by double-clicking or enter key pressing.
- Disable Compare-menu item when tree-mode is on and folder is selected
- When expanding folder item, inserted items are sorted now.
- When Tree-mode is on and non-recursive compare is selected, the space of
list item state icon is removed.
Kimmo Varis [Wed, 30 Jul 2008 19:07:33 +0000 (19:07 +0000)]
Use std::vector for DiffList. Optimize memory allocations.
Kimmo Varis [Wed, 30 Jul 2008 12:44:04 +0000 (12:44 +0000)]
Editor code was mis-using register keyword - cannot use it with structs.
Kimmo Varis [Wed, 30 Jul 2008 12:09:30 +0000 (12:09 +0000)]
Remove unused (only usage was in unused code) sbuffer class.
Kimmo Varis [Wed, 30 Jul 2008 11:13:18 +0000 (11:13 +0000)]
Remove two unused structures.
Kimmo Varis [Wed, 30 Jul 2008 09:08:18 +0000 (09:08 +0000)]
Pre-allocate DiffBlock list.
Kimmo Varis [Wed, 30 Jul 2008 08:54:24 +0000 (08:54 +0000)]
Use std::vector instead of CList for DiffBlocks.
Kimmo Varis [Tue, 29 Jul 2008 13:34:59 +0000 (13:34 +0000)]
PATCH: [
2027325 ] "Syntax Highlight" menu item enabled, if option disabled
Kimmo Varis [Tue, 29 Jul 2008 13:14:28 +0000 (13:14 +0000)]
PATCH: [
2030359 ] Manual: document -u command line parameter
Kimmo Varis [Tue, 29 Jul 2008 11:11:45 +0000 (11:11 +0000)]
Cleanups for CDiffTextBuffer. Remove unused function, fix coding style, add/fix doxygen commenting.
Kimmo Varis [Tue, 29 Jul 2008 06:05:12 +0000 (06:05 +0000)]
Use vector::resize() instead of vector::reserve() when we need to resize the array. This fixes the crash I added with earlier commit.
Kimmo Varis [Tue, 29 Jul 2008 05:48:35 +0000 (05:48 +0000)]
PATCH: [
2030109 ] Read-only menu description mentions dir
Kimmo Varis [Tue, 29 Jul 2008 05:38:26 +0000 (05:38 +0000)]
PATCH: [
2030040 ] Clarify Supercopier hang item in release notes
Kimmo Varis [Mon, 28 Jul 2008 19:15:57 +0000 (19:15 +0000)]
Convert SyntaxColors list to use std::vector.
Kimmo Varis [Mon, 28 Jul 2008 14:55:12 +0000 (14:55 +0000)]
PATCH: [
2029457 ] Remove RCLocalizationHelper plugin dll
Kimmo Varis [Mon, 28 Jul 2008 14:31:26 +0000 (14:31 +0000)]
PATCH: [
2029275 ] Allow giving -u cmdline param instead of -ub
Kimmo Varis [Mon, 28 Jul 2008 12:30:02 +0000 (12:30 +0000)]
Convert apparent/real line mapping to use std::vector instead of CArray.
Kimmo Varis [Mon, 28 Jul 2008 11:23:22 +0000 (11:23 +0000)]
Trivial cleanups and commenting additions and fixes.
Tim Gerundt [Fri, 25 Jul 2008 22:38:23 +0000 (22:38 +0000)]
PATCH: [
2027300 ] Rename color scheme menu item "None" and add separator
Tim Gerundt [Fri, 25 Jul 2008 22:12:00 +0000 (22:12 +0000)]
PATCH: [
2028112 ] Manual: Remove old DSSSL build script
Tim Gerundt [Thu, 24 Jul 2008 22:06:02 +0000 (22:06 +0000)]
Web: Remove SourceForge.net Community Choice Awards 2008 Finalist VOTE banner
Kimmo Varis [Thu, 24 Jul 2008 08:29:25 +0000 (08:29 +0000)]
WinMerge experimental release 2.11.1.2 (SVN revision 5673)
Kimmo Varis [Thu, 24 Jul 2008 08:24:04 +0000 (08:24 +0000)]
Commit updated POT and PO files.
Kimmo Varis [Thu, 24 Jul 2008 08:20:55 +0000 (08:20 +0000)]
Changelog: Add manual improvements.
Kimmo Varis [Thu, 24 Jul 2008 08:12:11 +0000 (08:12 +0000)]
PATCH: [
2026508 ] Add confirmation dialog for move operation
Kimmo Varis [Thu, 24 Jul 2008 08:05:59 +0000 (08:05 +0000)]
Bump manual revision to 1.5.1.
Kimmo Varis [Wed, 23 Jul 2008 18:59:22 +0000 (18:59 +0000)]
PATCH: [
2025478 ] Enable folder compare tree-mode by default
Kimmo Varis [Wed, 23 Jul 2008 17:45:10 +0000 (17:45 +0000)]
PATCH: [
2025472 ] Add Conflict Open to all menus
Kimmo Varis [Wed, 23 Jul 2008 17:39:22 +0000 (17:39 +0000)]
PATCH: [
2025781 ] Disable changing EOL for protected file
Kimmo Varis [Wed, 23 Jul 2008 17:35:05 +0000 (17:35 +0000)]
BUG: [
2023734 ] Errors Moving Files - v.2.4.8.0 Unicode
Disable moving protected items.
Kimmo Varis [Wed, 23 Jul 2008 14:24:24 +0000 (14:24 +0000)]
PATCH: [
2024587 ] Revised help topics
Modifications per comments in forum.
Submitted by Denis Bradford
Kimmo Varis [Wed, 23 Jul 2008 14:17:25 +0000 (14:17 +0000)]
PATCH: [
2025762 ] replace links with xrefs
Submitted by Denis Bradford
Kimmo Varis [Wed, 23 Jul 2008 12:04:48 +0000 (12:04 +0000)]
PATCH: [
2024587 ] Revised help topics
Rewriting folder compare documentation.
Submitted by Denis Bradford
Jochen Tucht [Tue, 22 Jul 2008 16:32:39 +0000 (16:32 +0000)]
VC6 issues
Jochen Tucht [Tue, 22 Jul 2008 16:31:42 +0000 (16:31 +0000)]
VC6 issues
Takashi Sawanaka [Tue, 22 Jul 2008 14:47:03 +0000 (14:47 +0000)]
PATCH: [
2018836 ] RFE:987590 hierarchical directory comparison result view
Takashi Sawanaka [Tue, 22 Jul 2008 14:37:39 +0000 (14:37 +0000)]
PATCH: [
2018836 ] RFE:987590 hierarchical directory comparison result view
Takashi Sawanaka [Tue, 22 Jul 2008 14:27:09 +0000 (14:27 +0000)]
PATCH: [
2023595 ] Structured DIFFITEM
Jochen Tucht [Mon, 21 Jul 2008 16:16:54 +0000 (16:16 +0000)]
Fix crash in DirCmpReport::WriteString()
Takashi Sawanaka [Mon, 21 Jul 2008 14:23:30 +0000 (14:23 +0000)]
Fix broken "Prediffer" menu item
Takashi Sawanaka [Mon, 21 Jul 2008 14:14:33 +0000 (14:14 +0000)]
Fix compilation error on ANSI build
Kimmo Varis [Mon, 21 Jul 2008 11:25:40 +0000 (11:25 +0000)]
PATCH: [
2017426 ] Rescan after filter change
Rescan all file- and folder-compares, instead of current ones.
Kimmo Varis [Sun, 20 Jul 2008 09:25:42 +0000 (09:25 +0000)]
Write plugins enabled option to config log.
Kimmo Varis [Sun, 20 Jul 2008 08:52:03 +0000 (08:52 +0000)]
Don't store both handle and pointer to LocationView in MergeEditView. We can always get a handle from the pointer.
Kimmo Varis [Sat, 19 Jul 2008 20:23:58 +0000 (20:23 +0000)]
Remove unused member variable (LONG m_nModifications).
Kimmo Varis [Sat, 19 Jul 2008 20:12:14 +0000 (20:12 +0000)]
Couple of comment improvements.
Kimmo Varis [Sat, 19 Jul 2008 17:14:25 +0000 (17:14 +0000)]
BUG: [
2010463 ] False warning: about to close several compare windows
Kimmo Varis [Sat, 19 Jul 2008 11:07:44 +0000 (11:07 +0000)]
PATCH: [
2021722 ] Add dialog listing available plugins
Jochen Tucht [Sat, 19 Jul 2008 09:32:18 +0000 (09:32 +0000)]
Fix XML whitespace canonicalization (which got broken when converting UniFile from CString to String)
Jochen Tucht [Sat, 19 Jul 2008 09:18:06 +0000 (09:18 +0000)]
Fix an invalid CMP_STATE transition from STATE_COMPARE to STATE_START