OSDN Git Service

winmerge-jp/winmerge-jp.git
11 years agoRemove unused files
sdottaka [Sun, 19 May 2013 14:30:46 +0000 (23:30 +0900)]
Remove unused files

11 years agoAdd "Ignore Reparse Points" Option
sdottaka [Sun, 19 May 2013 14:25:34 +0000 (23:25 +0900)]
Add "Ignore Reparse Points" Option

11 years agoFilepathEdit.cpp: Use clipboard helper function
sdottaka [Sun, 19 May 2013 14:21:02 +0000 (23:21 +0900)]
FilepathEdit.cpp: Use clipboard helper function

11 years agoRemove unused function
sdottaka [Sun, 19 May 2013 14:18:44 +0000 (23:18 +0900)]
Remove unused function

11 years agoMove drag and drop helper code to DragDrop.*
sdottaka [Sun, 19 May 2013 14:12:03 +0000 (23:12 +0900)]
Move drag and drop helper code to DragDrop.*

11 years agoMove loading/saving diff color settings code to OptionsDiffColors.{cpp,h} (2)
sdottaka [Sun, 19 May 2013 13:50:26 +0000 (22:50 +0900)]
Move loading/saving diff color settings code to OptionsDiffColors.{cpp,h} (2)

11 years agoAdded tag 2.14.0+-jp-7 for changeset 0e72022c2be8
sdottaka [Wed, 15 May 2013 14:23:52 +0000 (23:23 +0900)]
Added tag 2.14.0+-jp-7 for changeset 0e72022c2be8

11 years agoUpdate revisions 2.14.0+-jp-7
sdottaka [Wed, 15 May 2013 13:25:22 +0000 (22:25 +0900)]
Update revisions

11 years agostringdiffs.*: Remove unused functions
sdottaka [Wed, 15 May 2013 13:25:10 +0000 (22:25 +0900)]
stringdiffs.*: Remove unused functions

11 years agoFix adding FFILEOPEN_NOMRU flagged items to Win7 jump list
sdottaka [Tue, 14 May 2013 13:25:26 +0000 (22:25 +0900)]
Fix adding FFILEOPEN_NOMRU flagged items to Win7 jump list

11 years agoFix adding garbage item into Win7 jump list on WinMerge ANSI build
sdottaka [Mon, 13 May 2013 16:04:44 +0000 (01:04 +0900)]
Fix adding garbage item into Win7 jump list on WinMerge ANSI build

11 years agoGet rid of a NUL char at the end of pasted text on ANSI build
sdottaka [Mon, 13 May 2013 13:53:10 +0000 (22:53 +0900)]
Get rid of a NUL char at the end of pasted text on ANSI build

11 years agoMove loading/saving diff color settings code to OptionsDiffColors.{cpp,h}
sdottaka [Mon, 13 May 2013 13:40:01 +0000 (22:40 +0900)]
Move loading/saving diff color settings code to OptionsDiffColors.{cpp,h}

11 years agoFix mixed eol-style
sdottaka [Sun, 12 May 2013 12:36:41 +0000 (21:36 +0900)]
Fix mixed eol-style

11 years agoRename SyntaxColorsUtil.* to OptionsSyntaxColors.*
sdottaka [Sun, 12 May 2013 03:42:25 +0000 (12:42 +0900)]
Rename SyntaxColorsUtil.* to OptionsSyntaxColors.*

11 years ago* Remove "View/Select Font" menu item. close #19
sdottaka [Sun, 12 May 2013 02:58:12 +0000 (11:58 +0900)]
* Remove "View/Select Font" menu item. close #19
* Update File/Folder Window's font when selecting "View/Use Default Font" menu item
* Move loading/saving font settings code to OptionsFont.{cpp,h}

11 years agoSeparte diff3 algorithm from DiffWrapper.cpp and stringdiffs.cpp into Diff3.h
sdottaka [Sun, 5 May 2013 06:22:59 +0000 (15:22 +0900)]
Separte diff3 algorithm from DiffWrapper.cpp and stringdiffs.cpp into Diff3.h

11 years agoFix mixed eol-style
sdottaka [Sun, 5 May 2013 02:20:43 +0000 (11:20 +0900)]
Fix mixed eol-style

11 years agoFix crash when comparing zero size file with prediffer plugin
sdottaka [Sat, 4 May 2013 04:40:42 +0000 (13:40 +0900)]
Fix crash when comparing zero size file with prediffer plugin

11 years agoAvoid using 'delete' operator
sdottaka [Sat, 4 May 2013 03:55:45 +0000 (12:55 +0900)]
Avoid using 'delete' operator

11 years agoUpdate boost version to 1.53.0
sdottaka [Fri, 3 May 2013 09:06:20 +0000 (18:06 +0900)]
Update boost version to 1.53.0

11 years agoFix mixed eol-style
sdottaka [Fri, 3 May 2013 03:55:35 +0000 (12:55 +0900)]
Fix mixed eol-style

11 years agoFix: Still shows green progress bar on Win7's taskbar even when finished comparing...
sdottaka [Mon, 29 Apr 2013 10:00:07 +0000 (19:00 +0900)]
Fix: Still shows green progress bar on Win7's taskbar even when finished comparing folders. Submitted by tatsu-san

11 years agoAdded tag 2.14.0+-jp-6 for changeset d8ee64c8d443
sdottaka [Sun, 21 Apr 2013 20:01:37 +0000 (05:01 +0900)]
Added tag 2.14.0+-jp-6 for changeset d8ee64c8d443

11 years agoCppcheck: Variable 'm_svalue' is assigned in constructor body. Consider performing... 2.14.0+-jp-6
sdottaka [Sun, 21 Apr 2013 13:48:54 +0000 (22:48 +0900)]
Cppcheck: Variable 'm_svalue' is assigned in constructor body. Consider performing initialization in initialization list.

11 years agoCppcheck: Function parameter 'str1' should be passed by reference.
sdottaka [Sun, 21 Apr 2013 13:41:35 +0000 (22:41 +0900)]
Cppcheck: Function parameter 'str1' should be passed by reference.

11 years agoCppcheck: Passing the result of c_str() to a function that takes std::string as argum...
sdottaka [Sun, 21 Apr 2013 13:37:23 +0000 (22:37 +0900)]
Cppcheck: Passing the result of c_str() to a function that takes std::string as argument no. ? is slow and redundant.

11 years agoCppcheck: The extra qualification '*::' is unnecessary and is considered an error...
sdottaka [Sun, 21 Apr 2013 13:32:39 +0000 (22:32 +0900)]
Cppcheck: The extra qualification '*::' is unnecessary and is considered an error by many compilers.

11 years agoCppcheck: Member variable * is not initialized in the constructor.
sdottaka [Sun, 21 Apr 2013 13:27:30 +0000 (22:27 +0900)]
Cppcheck: Member variable * is not initialized in the constructor.

11 years agoCppcheck: syntax error
sdottaka [Sun, 21 Apr 2013 13:08:35 +0000 (22:08 +0900)]
Cppcheck: syntax error

11 years agoCppcheck: Common realloc mistake: 'ptr' nulled but not freed upon failure
sdottaka [Sun, 21 Apr 2013 12:53:30 +0000 (21:53 +0900)]
Cppcheck: Common realloc mistake: 'ptr' nulled but not freed upon failure

11 years agoCppcheck: Uninitialized variable: bModified
sdottaka [Sun, 21 Apr 2013 12:36:54 +0000 (21:36 +0900)]
Cppcheck: Uninitialized variable: bModified

11 years agoFix: OpenView does not accept Drag&Droped three files
sdottaka [Sun, 21 Apr 2013 12:35:14 +0000 (21:35 +0900)]
Fix: OpenView does not accept Drag&Droped three files

11 years agoFix memory leak In GetWordDiffArray()
sdottaka [Sun, 21 Apr 2013 12:30:27 +0000 (21:30 +0900)]
Fix memory leak In GetWordDiffArray()

11 years ago Cppcheck: Passing the result of c_str() to a function that takes std::string as...
sdottaka [Sun, 21 Apr 2013 11:48:04 +0000 (20:48 +0900)]
 Cppcheck: Passing the result of c_str() to a function that takes std::string as argument no. ? is slow and redundant.

11 years agoCppcheck: Unused variable: *
sdottaka [Sun, 21 Apr 2013 11:36:04 +0000 (20:36 +0900)]
Cppcheck: Unused variable: *
Cppcheck: Variable * is assigned a value that is never used.

11 years agoCppcheck: Prefer prefix ++/-- operators for non-primitive types.
sdottaka [Sun, 21 Apr 2013 11:03:22 +0000 (20:03 +0900)]
Cppcheck: Prefer prefix ++/-- operators for non-primitive types.

11 years agoFix crash when enabling Application Verifier
sdottaka [Sun, 21 Apr 2013 08:32:25 +0000 (17:32 +0900)]
Fix crash when enabling Application Verifier

11 years agoUpdate revisions
sdottaka [Sun, 21 Apr 2013 05:31:46 +0000 (14:31 +0900)]
Update revisions

11 years agoFix: Temporary folder path name is created in Windows 7 jump list after comparing...
sdottaka [Sun, 21 Apr 2013 05:31:35 +0000 (14:31 +0900)]
Fix: Temporary folder path name is created in Windows 7 jump list after comparing zip files

11 years agoChange "FileDescription" of WinMergeU.exe
sdottaka [Sun, 21 Apr 2013 05:26:31 +0000 (14:26 +0900)]
Change "FileDescription" of WinMergeU.exe

11 years agoFix: Windows 7 Jump List not appearing on Start Menu
sdottaka [Sun, 21 Apr 2013 05:22:47 +0000 (14:22 +0900)]
Fix: Windows 7 Jump List not appearing on Start Menu

11 years agoAdded tag 2.14.0+-jp-5 for changeset c6c1df8f5366
sdottaka [Wed, 17 Apr 2013 14:18:19 +0000 (23:18 +0900)]
Added tag 2.14.0+-jp-5 for changeset c6c1df8f5366

11 years agoRemoved tag 2.14.0+-jp-5
sdottaka [Wed, 17 Apr 2013 14:18:17 +0000 (23:18 +0900)]
Removed tag 2.14.0+-jp-5

11 years agoRemove atl100.dll dependency from WinMerge32BitPluginProxy.exe 2.14.0+-jp-5
sdottaka [Wed, 17 Apr 2013 14:17:49 +0000 (23:17 +0900)]
Remove atl100.dll dependency from WinMerge32BitPluginProxy.exe

11 years agoAdded tag 2.14.0+-jp-5 for changeset 105e944f738b
sdottaka [Mon, 15 Apr 2013 14:14:09 +0000 (23:14 +0900)]
Added tag 2.14.0+-jp-5 for changeset 105e944f738b

11 years agono more need to adjust image size from rev.7987
sdottaka [Mon, 15 Apr 2013 10:57:38 +0000 (19:57 +0900)]
no more need to adjust image size from rev.7987

11 years agoFix for the case when there is '&' in Project File
sdottaka [Mon, 15 Apr 2013 10:38:49 +0000 (19:38 +0900)]
Fix for the case when there is '&' in Project File

11 years agoAdd support for Windows 7 jump list
sdottaka [Mon, 15 Apr 2013 10:22:16 +0000 (19:22 +0900)]
Add support for Windows 7 jump list

11 years agoMake PLUGIN_AUTO default selection in CSelectUnpackerDlg.
sdottaka [Mon, 15 Apr 2013 08:21:46 +0000 (17:21 +0900)]
Make PLUGIN_AUTO default selection in CSelectUnpackerDlg.

11 years agoRemoved tag 2.14.0+-jp-5
sdottaka [Mon, 15 Apr 2013 07:10:03 +0000 (16:10 +0900)]
Removed tag 2.14.0+-jp-5

11 years agoChange the behavior when specifying '-e' command line option.
sdottaka [Sat, 13 Apr 2013 13:38:04 +0000 (22:38 +0900)]
Change the behavior when specifying '-e' command line option.
(Quit WinMerge with ESC key when opening only one window) issue #17

11 years agoFix: failed to delete temporary folder on XP
sdottaka [Fri, 12 Apr 2013 14:53:05 +0000 (23:53 +0900)]
Fix: failed to delete temporary folder on XP

11 years agoAdded tag 2.14.0+-jp-5 for changeset 06871e7c92d9
sdottaka [Sun, 7 Apr 2013 00:23:37 +0000 (09:23 +0900)]
Added tag 2.14.0+-jp-5 for changeset 06871e7c92d9

11 years agoDefer deleting temporary files. issue #18
sdottaka [Sat, 6 Apr 2013 13:37:27 +0000 (22:37 +0900)]
Defer deleting temporary files. issue #18

11 years agoSeparate ShellExtension project from WinMerge_vc10.sln
sdottaka [Sat, 6 Apr 2013 13:21:24 +0000 (22:21 +0900)]
Separate ShellExtension project from WinMerge_vc10.sln

11 years agoUpdate revisions
sdottaka [Sat, 6 Apr 2013 13:18:11 +0000 (22:18 +0900)]
Update revisions

11 years agoAdd 32bit plugin proxy COM server
sdottaka [Sat, 6 Apr 2013 13:17:07 +0000 (22:17 +0900)]
Add 32bit plugin proxy COM server

11 years agoAdded tag 2.14.0+-jp-4 for changeset 4e61445d642d
sdottaka [Sat, 16 Mar 2013 22:52:08 +0000 (07:52 +0900)]
Added tag 2.14.0+-jp-4 for changeset 4e61445d642d

11 years agoUpdate revisions 2.14.0+-jp-4
sdottaka [Sat, 16 Mar 2013 22:51:05 +0000 (07:51 +0900)]
Update revisions

11 years agoFix crash when using shift key drag and drop
sdottaka [Sat, 16 Mar 2013 22:49:38 +0000 (07:49 +0900)]
Fix crash when using shift key drag and drop

11 years agoFix import/export WinMerge.reg error. close #16
sdottaka [Sat, 16 Mar 2013 22:46:38 +0000 (07:46 +0900)]
Fix import/export WinMerge.reg error. close #16

11 years agoEnable right button drag and drop
sdottaka [Sat, 16 Mar 2013 22:38:55 +0000 (07:38 +0900)]
Enable right button drag and drop

11 years agoAdded tag 2.14.0+-jp-3 for changeset 467ccf561df7
sdottaka [Mon, 4 Mar 2013 11:40:15 +0000 (20:40 +0900)]
Added tag 2.14.0+-jp-3 for changeset 467ccf561df7

11 years agoUpdate revisions 2.14.0+-jp-3
sdottaka [Sun, 3 Mar 2013 15:46:53 +0000 (00:46 +0900)]
Update revisions

11 years ago* Fix unexpected result when comparing utf-8 files with prediffer plugin
sdottaka [Sun, 3 Mar 2013 15:46:38 +0000 (00:46 +0900)]
* Fix unexpected result when comparing utf-8 files with prediffer plugin
* Fix "Unable to compare files" error when comparing zero-byte files.

11 years agoFix misdetection of same binary files as different files when 'Custom codepage' ...
sdottaka [Sun, 3 Mar 2013 15:25:47 +0000 (00:25 +0900)]
Fix misdetection of same binary files as different files when 'Custom codepage' = UTF-8 and using mlang.dll

11 years ago* Revert rev.7738. Instead, Copy file paths separated by a space to clipboard when...
sdottaka [Sun, 3 Mar 2013 15:05:20 +0000 (00:05 +0900)]
* Revert rev.7738. Instead, Copy file paths separated by a space to clipboard when clicking "Copy Items To Clipboard" menu item
* Add "Copy Items To Clipbard/Both" menu item
* Remove compiler warnings

11 years agoFix file change detection failure
sdottaka [Sun, 3 Mar 2013 14:39:58 +0000 (23:39 +0900)]
Fix file change detection failure

11 years agoFix that WinMerge sometimes reported wrong results in Quick Contents Compare Mode(2)
sdottaka [Sun, 3 Mar 2013 14:27:31 +0000 (23:27 +0900)]
Fix that WinMerge sometimes reported wrong results in Quick Contents Compare Mode(2)

11 years agoDetect Windows 8 and Windows Server 2012 in config log
sdottaka [Sun, 3 Mar 2013 14:23:58 +0000 (23:23 +0900)]
Detect Windows 8 and Windows Server 2012 in config log

11 years ago* Add ucr::getBomSize()
sdottaka [Sun, 3 Mar 2013 14:22:36 +0000 (23:22 +0900)]
* Add ucr::getBomSize()
* Add support for UCS2{LE|BE} convertion to ucr::CrossConvert()

11 years agoAdded tag 2.14.0+-jp-2 for changeset 7277b94a33bf
sdottaka [Mon, 18 Feb 2013 08:04:15 +0000 (00:04 -0800)]
Added tag 2.14.0+-jp-2 for changeset 7277b94a33bf

11 years agoCompare words per line if diff block lines > 20 (for performance improvement and... 2.14.0+-jp-2
sdottaka [Mon, 18 Feb 2013 08:02:42 +0000 (00:02 -0800)]
Compare words per line if diff block lines > 20 (for performance improvement and better result)

11 years agoFix that WinMerge sometimes reported wrong results in Quick Contents Compare Mode
sdottaka [Mon, 18 Feb 2013 07:40:00 +0000 (23:40 -0800)]
Fix that WinMerge sometimes reported wrong results in Quick Contents Compare Mode
Conditions:
 * Compare Method == 'Quick Contents'
 * Check "Ignore carriage return differences"
 * File size > 32KB
 * Same contents but different EOLs

11 years agoUpdate revisions
sdottaka [Mon, 18 Feb 2013 07:19:23 +0000 (23:19 -0800)]
Update revisions

11 years agoChange URL
sdottaka [Mon, 18 Feb 2013 07:19:04 +0000 (23:19 -0800)]
Change URL

11 years agoUpdate Japanese translation for Inno Setup
sdottaka [Mon, 18 Feb 2013 07:17:46 +0000 (23:17 -0800)]
Update Japanese translation for Inno Setup

11 years agoAdded tag 2.14.0+-jp-1 for changeset db532de010e5
sdottaka [Tue, 12 Feb 2013 07:59:17 +0000 (23:59 -0800)]
Added tag 2.14.0+-jp-1 for changeset db532de010e5

11 years agoMake a folder compare report with color 2.14.0+-jp-1
sdottaka [Tue, 12 Feb 2013 07:58:34 +0000 (23:58 -0800)]
Make a folder compare report with color

11 years agoFix uninitialized variable
sdottaka [Tue, 12 Feb 2013 04:11:54 +0000 (20:11 -0800)]
Fix uninitialized variable

11 years agoFix window menu breaking when closing OpenView window
sdottaka [Tue, 12 Feb 2013 04:08:00 +0000 (20:08 -0800)]
Fix window menu breaking when closing OpenView window

11 years agoAvoid conflicting folder name in TEMP folder
sdottaka [Tue, 12 Feb 2013 03:58:01 +0000 (19:58 -0800)]
Avoid conflicting folder name in TEMP folder

11 years agoChange default maximized window
sdottaka [Tue, 12 Feb 2013 03:49:28 +0000 (19:49 -0800)]
Change default maximized window

11 years agoUpdate revisions
sdottaka [Tue, 12 Feb 2013 03:41:10 +0000 (19:41 -0800)]
Update revisions

11 years agoAdd .hgignore file
sdottaka [Tue, 12 Feb 2013 03:40:20 +0000 (19:40 -0800)]
Add .hgignore file

11 years agoFix broken moved blocks detection feature
sdottaka [Tue, 12 Feb 2013 03:10:22 +0000 (19:10 -0800)]
Fix broken moved blocks detection feature

11 years agoAdd SortAscending, SortDescending and ExecFilterCommand to editor addin.sct
sdottaka [Tue, 12 Feb 2013 03:02:30 +0000 (19:02 -0800)]
Add SortAscending, SortDescending and ExecFilterCommand to editor addin.sct

11 years agoDrop support for Win98/ME/2000
sdottaka [Tue, 12 Feb 2013 02:53:12 +0000 (18:53 -0800)]
Drop support for Win98/ME/2000

11 years agoMerge from SVN trunk
sdottaka [Tue, 12 Feb 2013 02:49:12 +0000 (18:49 -0800)]
Merge from SVN trunk

11 years agoAdded tag 2.13.22+-jp-2 for changeset 02407cebb2e7
sdottaka [Mon, 4 Feb 2013 08:24:38 +0000 (00:24 -0800)]
Added tag 2.13.22+-jp-2 for changeset 02407cebb2e7

11 years agoAdded tag 2.13.22+-jp-1 for changeset 0173c3420011 2.13.22+-jp-2
sdottaka [Mon, 4 Feb 2013 08:24:16 +0000 (00:24 -0800)]
Added tag 2.13.22+-jp-1 for changeset 0173c3420011

11 years agoRemoved tag 2.13.22+-jp-2
sdottaka [Mon, 4 Feb 2013 08:23:45 +0000 (00:23 -0800)]
Removed tag 2.13.22+-jp-2

11 years agoAdded tag 2.13.22+-jp-2 for changeset 667dbdd0068b
sdottaka [Mon, 4 Feb 2013 08:22:10 +0000 (00:22 -0800)]
Added tag 2.13.22+-jp-2 for changeset 667dbdd0068b

11 years agoUpdate revisions
sdottaka [Mon, 4 Feb 2013 08:21:28 +0000 (00:21 -0800)]
Update revisions

11 years agoInclude Translations folder in source archive
sdottaka [Mon, 4 Feb 2013 08:21:08 +0000 (00:21 -0800)]
Include Translations folder in source archive

11 years ago* Change DirCompProgressDlg dialog to DirCompProgressBar dialog bar
sdottaka [Mon, 4 Feb 2013 08:15:29 +0000 (00:15 -0800)]
* Change DirCompProgressDlg dialog to DirCompProgressBar dialog bar
* Allow to open new files when comparing folders

11 years agoFix error when opening zero byte file
sdottaka [Mon, 4 Feb 2013 07:35:50 +0000 (23:35 -0800)]
Fix error when opening zero byte file

11 years agoDisplay file timestamp as not UTC but local time
sdottaka [Mon, 4 Feb 2013 07:33:35 +0000 (23:33 -0800)]
Display file timestamp as not UTC but local time

11 years agoFix warning "dialog data checkbox value (-842150451) out of range"
sdottaka [Mon, 4 Feb 2013 07:21:40 +0000 (23:21 -0800)]
Fix warning "dialog data checkbox value (-842150451) out of range"