OSDN Git Service

winmerge-jp/winmerge-jp.git
15 years agoTweak Astyle formatting options a bit:
Kimmo Varis [Sun, 26 Jul 2009 14:03:45 +0000 (14:03 +0000)]
Tweak Astyle formatting options a bit:
- force using tabs
- indent continued statements with two tabs
- do not break one line code blocks

15 years agoAstyle fixes for ShellExtension sources.
Kimmo Varis [Sun, 26 Jul 2009 12:54:32 +0000 (12:54 +0000)]
Astyle fixes for ShellExtension sources.

15 years agoAdd ShellExtension folder to astyle batch.
Kimmo Varis [Sun, 26 Jul 2009 12:53:24 +0000 (12:53 +0000)]
Add ShellExtension folder to astyle batch.

15 years agoPATCH: [ 2823536 ] Add accelerator keys for Shell context menu
Kimmo Varis [Sun, 26 Jul 2009 12:37:02 +0000 (12:37 +0000)]
PATCH: [ 2823536 ] Add accelerator keys for Shell context menu

15 years agoPATCH: [ 2825132 ] ShellExtension - Turkish Translation
Tim Gerundt [Sat, 25 Jul 2009 17:14:18 +0000 (17:14 +0000)]
PATCH: [ 2825132 ] ShellExtension - Turkish Translation

15 years agoPATCH: [ 2825130 ] Turkish Translation Update
Tim Gerundt [Sat, 25 Jul 2009 17:00:41 +0000 (17:00 +0000)]
PATCH: [ 2825130 ] Turkish Translation Update

15 years agoMake SanityCheckDiff() a const method. Its task is to check diffs not modify anything.
Kimmo Varis [Sat, 25 Jul 2009 08:43:31 +0000 (08:43 +0000)]
Make SanityCheckDiff() a const method. Its task is to check diffs not modify anything.

15 years agoAdd batch file for running Astyle for WinMerge sources.
Kimmo Varis [Thu, 23 Jul 2009 16:07:15 +0000 (16:07 +0000)]
Add batch file for running Astyle for WinMerge sources.

15 years agoPATCH: [ 2818451 ] Make color options hierarchical
Kimmo Varis [Thu, 23 Jul 2009 15:40:59 +0000 (15:40 +0000)]
PATCH: [ 2818451 ] Make color options hierarchical
 Change options page caption from "Merge" to "Differences".

15 years agoPATCH: [ 2825628 ] Add option GUI for Quick compare limit option
Kimmo Varis [Thu, 23 Jul 2009 15:20:41 +0000 (15:20 +0000)]
PATCH: [ 2825628 ] Add option GUI for Quick compare limit option

15 years agoPATCH: [ 2824173 ] Stringdiffs
Kimmo Varis [Thu, 23 Jul 2009 15:11:41 +0000 (15:11 +0000)]
PATCH: [ 2824173 ] Stringdiffs
 Optimize loops
 Submitted by Matthias Mayer

15 years agoPATCH: [ 2824173 ] Stringdiffs
Kimmo Varis [Wed, 22 Jul 2009 11:15:45 +0000 (11:15 +0000)]
PATCH: [ 2824173 ] Stringdiffs
 Submitted by Matthias Mayer

15 years agoBUG: [ 2817546 ] Copy pathname appends CRLF to path
Kimmo Varis [Sat, 18 Jul 2009 11:17:59 +0000 (11:17 +0000)]
BUG: [ 2817546 ] Copy pathname appends CRLF to path

15 years agoChanglog: Allow disabling reading of unique folder contents (#2820067)
Kimmo Varis [Sat, 18 Jul 2009 11:15:04 +0000 (11:15 +0000)]
Changlog: Allow disabling reading of unique folder contents (#2820067)

15 years agoWeb: Move Page class to engine sub directory
Tim Gerundt [Thu, 16 Jul 2009 19:47:06 +0000 (19:47 +0000)]
Web: Move Page class to engine sub directory

15 years agoWeb: Drop convertXml2Array() and multisortArray() functions from Page class
Tim Gerundt [Thu, 16 Jul 2009 19:21:55 +0000 (19:21 +0000)]
Web: Drop convertXml2Array() and multisortArray() functions from Page class

15 years agoRemove MFC dependency from CompareStats class.
Kimmo Varis [Sun, 12 Jul 2009 22:31:23 +0000 (22:31 +0000)]
Remove MFC dependency from CompareStats class.

15 years agoWeb: Use PHP5 function to parse the PAD file
Tim Gerundt [Sun, 12 Jul 2009 19:23:00 +0000 (19:23 +0000)]
Web: Use PHP5 function to parse the PAD file

15 years agoWeb: Switch to UTF-8
Tim Gerundt [Sun, 12 Jul 2009 17:20:35 +0000 (17:20 +0000)]
Web: Switch to UTF-8

15 years agoRemove MFC dependency from ByteComparator class.
Kimmo Varis [Sun, 12 Jul 2009 14:09:24 +0000 (14:09 +0000)]
Remove MFC dependency from ByteComparator class.

15 years agoPATCH: [ 2820067 ] Make walking into uniq folders optional
Kimmo Varis [Sun, 12 Jul 2009 09:06:54 +0000 (09:06 +0000)]
PATCH: [ 2820067 ] Make walking into uniq folders optional

15 years agoMove recursive-info from thread's struct to compare context.
Kimmo Varis [Sat, 11 Jul 2009 13:03:42 +0000 (13:03 +0000)]
Move recursive-info from thread's struct to compare context.

15 years agoRename CProp* classes to Prop* to keep them named in same way.
Kimmo Varis [Sat, 11 Jul 2009 08:29:49 +0000 (08:29 +0000)]
Rename CProp* classes to Prop* to keep them named in same way.

15 years agoPATCH: [ 2819626 ] Create own options page for folder compare options
Kimmo Varis [Sat, 11 Jul 2009 07:47:04 +0000 (07:47 +0000)]
PATCH: [ 2819626 ] Create own options page for folder compare options

15 years agoPATCH: [ 2723613 ] More accurate byte-level string difference
Kimmo Varis [Thu, 9 Jul 2009 06:42:50 +0000 (06:42 +0000)]
PATCH: [ 2723613 ] More accurate byte-level string difference
 Submitted by Matthias Mayer

15 years agoUpdate translation POT file.
Kimmo Varis [Thu, 9 Jul 2009 06:30:26 +0000 (06:30 +0000)]
Update translation POT file.

15 years agoPATCH: [ 2818451 ] Make color options hierarchical
Kimmo Varis [Thu, 9 Jul 2009 06:27:46 +0000 (06:27 +0000)]
PATCH: [ 2818451 ] Make color options hierarchical

15 years agoUpdate PCRE regular expression library to latest version 7.9.
Kimmo Varis [Wed, 8 Jul 2009 19:46:31 +0000 (19:46 +0000)]
Update PCRE regular expression library to latest version 7.9.

15 years agoPATCH: [ 2817835 ] Ukrainian translation update
Kimmo Varis [Tue, 7 Jul 2009 07:47:48 +0000 (07:47 +0000)]
PATCH: [ 2817835 ] Ukrainian translation update
 Submitted by Warrior

15 years agoPATCH: [ 2783915 ] Do not install plugins at all - Drop plugins from MSI setup too
Tim Gerundt [Mon, 6 Jul 2009 18:34:04 +0000 (18:34 +0000)]
PATCH: [ 2783915 ] Do not install plugins at all - Drop plugins from MSI setup too

15 years agoRemove unneeded includes, fix io.h to be system include.
Kimmo Varis [Sun, 5 Jul 2009 14:22:19 +0000 (14:22 +0000)]
Remove unneeded includes, fix io.h to be system include.

15 years agoCode style fixes.
Kimmo Varis [Sun, 5 Jul 2009 14:13:50 +0000 (14:13 +0000)]
Code style fixes.

15 years agoUse windows.h instead of stdafx.h in non-MFC file.
Kimmo Varis [Sun, 5 Jul 2009 14:04:42 +0000 (14:04 +0000)]
Use windows.h instead of stdafx.h in non-MFC file.

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add noneTemplateLanguages...
Tim Gerundt [Sat, 4 Jul 2009 07:40:37 +0000 (07:40 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add noneTemplateLanguages() property to status and project class

15 years agoFix SVN link in GetTranslationsStatus.vbs script
Tim Gerundt [Sat, 4 Jul 2009 06:54:24 +0000 (06:54 +0000)]
Fix SVN link in GetTranslationsStatus.vbs script

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Create HTML status file too
Tim Gerundt [Sat, 4 Jul 2009 06:49:10 +0000 (06:49 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Create HTML status file too

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add __getitem__ function...
Tim Gerundt [Sat, 4 Jul 2009 06:35:59 +0000 (06:35 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add __getitem__ function to Project class and rename some variables

15 years agoSmall optimizations to DiffList.
Kimmo Varis [Thu, 2 Jul 2009 17:30:18 +0000 (17:30 +0000)]
Small optimizations to DiffList.

15 years agoMake few variables consts.
Kimmo Varis [Thu, 2 Jul 2009 13:41:14 +0000 (13:41 +0000)]
Make few variables consts.

15 years agoOptimize merging list of differences. Give diff number instead of activating diff...
Kimmo Varis [Thu, 2 Jul 2009 13:15:48 +0000 (13:15 +0000)]
Optimize merging list of differences. Give diff number instead of activating diff and letting code to determine active difference for every diff.

15 years agoOptimize editors line length array handling.
Kimmo Varis [Tue, 30 Jun 2009 13:30:36 +0000 (13:30 +0000)]
Optimize editors line length array handling.

15 years agoConvert editor's line length array to use stl vector.
Kimmo Varis [Tue, 30 Jun 2009 10:36:28 +0000 (10:36 +0000)]
Convert editor's line length array to use stl vector.

15 years agoTests: Add global test project that builds all unit tests.
Kimmo Varis [Tue, 30 Jun 2009 09:08:47 +0000 (09:08 +0000)]
Tests: Add global test project that builds all unit tests.

15 years agoTests: Create test main file for FileVersion tests.
Kimmo Varis [Tue, 30 Jun 2009 08:51:26 +0000 (08:51 +0000)]
Tests: Create test main file for FileVersion tests.

15 years agoTests: Create test main file for DirItem tests.
Kimmo Varis [Tue, 30 Jun 2009 08:45:58 +0000 (08:45 +0000)]
Tests: Create test main file for DirItem tests.

15 years agoCheck string end/begin/empty string more carefully when stripping whitespace. This...
Kimmo Varis [Tue, 30 Jun 2009 08:15:17 +0000 (08:15 +0000)]
Check string end/begin/empty string more carefully when stripping whitespace. This fixes possible crash with VS2008.

15 years agoTests: UnicodeString: Add tests for whitespace stripping and no-case compare. Couple...
Kimmo Varis [Tue, 30 Jun 2009 08:12:06 +0000 (08:12 +0000)]
Tests: UnicodeString: Add tests for whitespace stripping and no-case compare. Couple more tests for replace.

15 years agoTests: UnicodeString: Add main cpp file.
Kimmo Varis [Tue, 30 Jun 2009 07:19:21 +0000 (07:19 +0000)]
Tests: UnicodeString: Add main cpp file.

15 years agoOptimize editor's parse cookie array access.
Kimmo Varis [Mon, 29 Jun 2009 16:07:57 +0000 (16:07 +0000)]
Optimize editor's parse cookie array access.

15 years agoConvert editor's parse cookie array to use std::vector.
Kimmo Varis [Mon, 29 Jun 2009 15:41:00 +0000 (15:41 +0000)]
Convert editor's parse cookie array to use std::vector.

15 years agoMake bunch of editor functions const functions.
Kimmo Varis [Mon, 29 Jun 2009 10:00:33 +0000 (10:00 +0000)]
Make bunch of editor functions const functions.

15 years agoFew trivial optimizations and cleanups for editor buffer.
Kimmo Varis [Mon, 29 Jun 2009 09:28:13 +0000 (09:28 +0000)]
Few trivial optimizations and cleanups for editor buffer.

15 years agoUse std::vector instead of CArray for storing linedata in editor.
Kimmo Varis [Mon, 29 Jun 2009 07:39:10 +0000 (07:39 +0000)]
Use std::vector instead of CArray for storing linedata in editor.

15 years agoUse std::vector instead of CList in FileActionScript.
Kimmo Varis [Sat, 27 Jun 2009 20:56:08 +0000 (20:56 +0000)]
Use std::vector instead of CList in FileActionScript.

15 years agoImprove file filter loading logic. Fix bug in loading file filters due to earlier...
Kimmo Varis [Sat, 27 Jun 2009 12:57:11 +0000 (12:57 +0000)]
Improve file filter loading logic. Fix bug in loading file filters due to earlier refactoring patches.

15 years agoRemove rest of MFC dependencies from file filtering code.
Kimmo Varis [Sat, 27 Jun 2009 11:46:11 +0000 (11:46 +0000)]
Remove rest of MFC dependencies from file filtering code.

15 years agoDon't edit file filters through FileFilterHelper. Removes CMainFrame dependency from...
Kimmo Varis [Sat, 27 Jun 2009 10:54:21 +0000 (10:54 +0000)]
Don't edit file filters through FileFilterHelper. Removes CMainFrame dependency from FileFilterHelper.

15 years agoRemove unneeded CMap from file filter loading.
Kimmo Varis [Sat, 27 Jun 2009 10:14:39 +0000 (10:14 +0000)]
Remove unneeded CMap from file filter loading.

15 years agoContinue removing MFC code from file filter code.
Kimmo Varis [Fri, 26 Jun 2009 13:22:16 +0000 (13:22 +0000)]
Continue removing MFC code from file filter code.

15 years agoFix exception when trimming empty string.
Kimmo Varis [Fri, 26 Jun 2009 10:30:06 +0000 (10:30 +0000)]
Fix exception when trimming empty string.

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add "languages" property...
Tim Gerundt [Thu, 25 Jun 2009 19:56:52 +0000 (19:56 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add "languages" property to TranslationsStatus and IProject class

15 years agoWeb: Support unknown translations status
Tim Gerundt [Thu, 25 Jun 2009 17:30:38 +0000 (17:30 +0000)]
Web: Support unknown translations status

15 years agoWeb: Use new PHP5 class for Trunk translations status
Tim Gerundt [Thu, 25 Jun 2009 17:00:44 +0000 (17:00 +0000)]
Web: Use new PHP5 class for Trunk translations status

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add InnoSetup project...
Tim Gerundt [Thu, 25 Jun 2009 16:35:07 +0000 (16:35 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add InnoSetup project (currently without a status)

15 years agoMore conversion from MFC CString to String in file filter code.
Kimmo Varis [Thu, 25 Jun 2009 13:24:06 +0000 (13:24 +0000)]
More conversion from MFC CString to String in file filter code.

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add ReadMe project (curre...
Tim Gerundt [Thu, 25 Jun 2009 13:13:04 +0000 (13:13 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add ReadMe project (currently without a status)

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Use base class for projec...
Tim Gerundt [Thu, 25 Jun 2009 12:50:52 +0000 (12:50 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Use base class for project and status

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Rename some properties...
Tim Gerundt [Thu, 25 Jun 2009 12:12:14 +0000 (12:12 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Rename some properties and classes

15 years agoRefactor file filtering code to use String instead of CString.
Kimmo Varis [Thu, 25 Jun 2009 12:11:07 +0000 (12:11 +0000)]
Refactor file filtering code to use String instead of CString.

15 years agoMove FileFilter and FileFilterElement definitions to own file.
Kimmo Varis [Thu, 25 Jun 2009 09:54:27 +0000 (09:54 +0000)]
Move FileFilter and FileFilterElement definitions to own file.

15 years agoRemove VC6 project/solution files.
Kimmo Varis [Thu, 25 Jun 2009 08:28:21 +0000 (08:28 +0000)]
Remove VC6 project/solution files.

15 years agoRemove couple of CString uses.
Kimmo Varis [Thu, 25 Jun 2009 07:48:26 +0000 (07:48 +0000)]
Remove couple of CString uses.

15 years agoRemove unused typedef.
Kimmo Varis [Thu, 25 Jun 2009 07:46:29 +0000 (07:46 +0000)]
Remove unused typedef.

15 years agoRemove some MFC code.
Kimmo Varis [Thu, 25 Jun 2009 06:34:42 +0000 (06:34 +0000)]
Remove some MFC code.

15 years agoAdd missing include and remove MFC-style from include guard.
Kimmo Varis [Thu, 25 Jun 2009 06:33:15 +0000 (06:33 +0000)]
Add missing include and remove MFC-style from include guard.

15 years agoRemove couple of unneeded include files.
Kimmo Varis [Wed, 24 Jun 2009 16:17:43 +0000 (16:17 +0000)]
Remove couple of unneeded include files.

15 years agoMove Timesize-compare engine files in Compare-engines folder in project file.
Kimmo Varis [Wed, 24 Jun 2009 16:10:32 +0000 (16:10 +0000)]
Move Timesize-compare engine files in Compare-engines folder in project file.

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Mark POT file with "templ...
Tim Gerundt [Mon, 15 Jun 2009 15:21:20 +0000 (15:21 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Mark POT file with "template" attribute in XML file

15 years agoBUG: [ 2805946 ] PO files should use winmerge.org link for bug tracker
Tim Gerundt [Sun, 14 Jun 2009 13:59:11 +0000 (13:59 +0000)]
BUG: [ 2805946 ] PO files should use winmerge.org link for bug tracker

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Write XML head to XML...
Tim Gerundt [Sun, 14 Jun 2009 13:39:00 +0000 (13:39 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Write XML head to XML status file

15 years agoWeb: Use own RSS feed items for each Trunk translations status sub project
Tim Gerundt [Sun, 14 Jun 2009 12:08:30 +0000 (12:08 +0000)]
Web: Use own RSS feed items for each Trunk translations status sub project

15 years agoPATCH: [ 2805726 ] A Swedish trunk translation update
Tim Gerundt [Sat, 13 Jun 2009 15:42:58 +0000 (15:42 +0000)]
PATCH: [ 2805726 ] A Swedish trunk translation update

15 years agoPATCH: [ 2804979 ] Updated Dutch translation (+ ShellExtension)
Tim Gerundt [Sat, 13 Jun 2009 15:24:07 +0000 (15:24 +0000)]
PATCH: [ 2804979 ] Updated Dutch translation (+ ShellExtension)

15 years agoWeb: Add TOC to Trunk translations status page
Tim Gerundt [Sat, 13 Jun 2009 12:56:45 +0000 (12:56 +0000)]
Web: Add TOC to Trunk translations status page

15 years agoPATCH: [ 2805717 ] Refactor Date/Size compare to own compare engine
Kimmo Varis [Sat, 13 Jun 2009 12:55:37 +0000 (12:55 +0000)]
PATCH: [ 2805717 ] Refactor Date/Size compare to own compare engine

15 years agoWeb: Use new XML file for Trunk translations status - Fix problem with english langua...
Tim Gerundt [Thu, 11 Jun 2009 18:11:17 +0000 (18:11 +0000)]
Web: Use new XML file for Trunk translations status - Fix problem with english language file

15 years agoWeb: Add Unstable/Stable keywords to translations status RSS feeds too
Tim Gerundt [Thu, 11 Jun 2009 15:32:18 +0000 (15:32 +0000)]
Web: Add Unstable/Stable keywords to translations status RSS feeds too

15 years agoWeb: Use new XML file for Trunk translations status
Tim Gerundt [Thu, 11 Jun 2009 14:50:16 +0000 (14:50 +0000)]
Web: Use new XML file for Trunk translations status

15 years agoPATCH: [ 2801690 ] Updated Dutch translation (unstable trunk)
Tim Gerundt [Thu, 11 Jun 2009 14:24:22 +0000 (14:24 +0000)]
PATCH: [ 2801690 ]  Updated Dutch translation (unstable trunk)

15 years agoFix basepath in some shell extension PO files
Tim Gerundt [Thu, 11 Jun 2009 14:09:27 +0000 (14:09 +0000)]
Fix basepath in some shell extension PO files

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Move update date to ...
Tim Gerundt [Thu, 11 Jun 2009 13:04:16 +0000 (13:04 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Move update date to <status> level

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add <status> level to...
Tim Gerundt [Thu, 11 Jun 2009 11:51:44 +0000 (11:51 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Add <status> level to XML file

15 years agoPATCH: [ 2803152 ] Fix bug that compare method was not restored to global value
Kimmo Varis [Tue, 9 Jun 2009 22:01:48 +0000 (22:01 +0000)]
PATCH: [ 2803152 ] Fix bug that compare method was not restored to global value

15 years agoWeb: Changes for new stable release 2.12.4
Tim Gerundt [Tue, 9 Jun 2009 17:00:05 +0000 (17:00 +0000)]
Web: Changes for new stable release 2.12.4

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python - Create status for ShellEx...
Tim Gerundt [Mon, 8 Jun 2009 22:02:20 +0000 (22:02 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Create status for ShellExtension too

15 years agoPATCH: [ 2802270 ] GetTranslationsStatus script in Python
Tim Gerundt [Mon, 8 Jun 2009 19:09:53 +0000 (19:09 +0000)]
PATCH: [ 2802270 ] GetTranslationsStatus script in Python

15 years agoBuildscript: Remove rest of WinMerge-specific properties from tool settings.
Kimmo Varis [Fri, 5 Jun 2009 21:20:24 +0000 (21:20 +0000)]
Buildscript: Remove rest of WinMerge-specific properties from tool settings.

15 years agoBuildscript: use global variables instead of settings class for version number and...
Kimmo Varis [Fri, 5 Jun 2009 21:13:21 +0000 (21:13 +0000)]
Buildscript: use global variables instead of settings class for version number and other WinMerge specific data.

15 years agoConvert UpgradeProjects-script to use ToolSettings.
Kimmo Varis [Fri, 5 Jun 2009 17:10:49 +0000 (17:10 +0000)]
Convert UpgradeProjects-script to use ToolSettings.

15 years agoSplit tool settings to separate file from build script. So other scripts can use...
Kimmo Varis [Fri, 5 Jun 2009 16:03:58 +0000 (16:03 +0000)]
Split tool settings to separate file from build script. So other scripts can use those settings too.