OSDN Git Service

winmerge-jp/winmerge-jp.git
4 years agoRevert "Fix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag... ShellExtension-1.17.13.0
Takashi Sawanaka [Mon, 20 Jul 2020 10:14:21 +0000 (19:14 +0900)]
Revert "Fix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag/drop"

This reverts commit cd4a235b828622038786709e247715b931f0b13e.

4 years agoShellExtension: Bump revision to 1.17.13.0
Takashi Sawanaka [Mon, 20 Jul 2020 10:05:48 +0000 (19:05 +0900)]
ShellExtension: Bump revision to 1.17.13.0

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Fri, 17 Jul 2020 23:38:16 +0000 (08:38 +0900)]
Update Contributors.txt

4 years agoMerge pull request #377 from yfdyh000/zh-CN
Takashi Sawanaka [Fri, 17 Jul 2020 23:30:37 +0000 (08:30 +0900)]
Merge pull request #377 from yfdyh000/zh-CN

Update Chinese (Simplified) translations

4 years agoMerge pull request #376 from yfdyh000/patch-1
Takashi Sawanaka [Fri, 17 Jul 2020 23:30:23 +0000 (08:30 +0900)]
Merge pull request #376 from yfdyh000/patch-1

Update DirViewColItems.cpp

4 years agoUpdate Chinese (Simplified) translations
YFdyh000 [Thu, 16 Jul 2020 10:54:22 +0000 (18:54 +0800)]
Update Chinese (Simplified) translations

4 years agoUpdate DirViewColItems.cpp
YFdyh000 [Fri, 17 Jul 2020 15:22:23 +0000 (23:22 +0800)]
Update DirViewColItems.cpp

4 years agoCompareMSExcelFiles.sct: Change the extension of the file that outputs the sheet...
Takashi Sawanaka [Thu, 9 Jul 2020 12:36:32 +0000 (21:36 +0900)]
CompareMSExcelFiles.sct: Change the extension of the file that outputs the sheet cell values ​​from .txt to .tsv

4 years agoCompareMSExcelFiles.sct: Enclose the value in double quotation marks If a cell value...
Takashi Sawanaka [Thu, 9 Jul 2020 11:48:04 +0000 (20:48 +0900)]
CompareMSExcelFiles.sct: Enclose the value in double quotation marks If a cell value contains line breaks or double quotation marks.

4 years agoMerge.rc: Fix typo
Takashi Sawanaka [Thu, 9 Jul 2020 11:19:09 +0000 (20:19 +0900)]
Merge.rc: Fix typo

4 years agoFix GitHub issue #367: Crash when comparing encrypted 7z files (2)
Takashi Sawanaka [Thu, 2 Jul 2020 23:02:40 +0000 (08:02 +0900)]
Fix GitHub issue #367: Crash when comparing encrypted 7z files (2)

4 years agocrystaledit: Replace Text In Selection did not work properly
Takashi Sawanaka [Thu, 2 Jul 2020 11:28:27 +0000 (20:28 +0900)]
crystaledit: Replace Text In Selection did not work properly

4 years agoFix GitHub issue #368: Find dialog sometimes remembers old text to start a new find...
Takashi Sawanaka [Thu, 2 Jul 2020 11:02:59 +0000 (20:02 +0900)]
Fix GitHub issue #368: Find dialog sometimes remembers old text to start a new find instead of the new text.

4 years agoFix GitHub issue #367: Crash when comparing encrypted 7z files Merge7z1900.2
Takashi Sawanaka [Thu, 2 Jul 2020 10:16:24 +0000 (19:16 +0900)]
Fix GitHub issue #367: Crash when comparing encrypted 7z files

4 years agocrystaledit: rename m_bColumnSelection to m_bRectangularSelection
Takashi Sawanaka [Tue, 30 Jun 2020 11:52:55 +0000 (20:52 +0900)]
crystaledit: rename m_bColumnSelection to m_bRectangularSelection

4 years agoMerge pull request #366 from tjmprm77/feature/disable_menu_items_for_directories
Takashi Sawanaka [Sun, 28 Jun 2020 00:13:30 +0000 (09:13 +0900)]
Merge pull request #366 from tjmprm77/feature/disable_menu_items_for_directories

Change to disable some menu items that should not be executed for directories, when directories are selected in the folder compare window.

4 years agoChange to disable some menu items that should not be executed for directories, when...
Jun Tajima [Sat, 27 Jun 2020 16:52:26 +0000 (01:52 +0900)]
Change to disable some menu items that should not be executed for directories, when directories are selected in the folder compare window.
Target menu items are the following:
- Context menu
  - "Compare As" > "XML"
  - "Compare As" > "Binary"
  - "Compare As" > "Image"
- Menu Bar
  - "Plugins" > "Edit with Unpacker..."

Also, as a precaution, change to do not perform processing when the above menu items are selected with selecting directories.
(Note that in normal case we cannot select these menu items because they are disabled.)

4 years agoFix GitHub issue #362: opening same file (2)
Takashi Sawanaka [Sat, 27 Jun 2020 13:43:20 +0000 (22:43 +0900)]
Fix GitHub issue #362: opening same file (2)

4 years agocrystaledit: fix indentation
Takashi Sawanaka [Sat, 27 Jun 2020 13:03:23 +0000 (22:03 +0900)]
crystaledit: fix indentation

4 years agocrystaledit: Use custom word break rules
Takashi Sawanaka [Sat, 27 Jun 2020 04:05:09 +0000 (13:05 +0900)]
crystaledit: Use custom word break rules

4 years agoMerge pull request #365 from b0/csharp-filter
Takashi Sawanaka [Fri, 26 Jun 2020 13:09:48 +0000 (22:09 +0900)]
Merge pull request #365 from b0/csharp-filter

added bin and obj directories to C# filter

4 years agoadded bin and obj directories to C# filter
Marko Matic [Fri, 26 Jun 2020 07:17:59 +0000 (09:17 +0200)]
added bin and obj directories to C# filter

4 years agocrystaledit: Move TextDefinition and TextType to CrystalLineParser namespace
Takashi Sawanaka [Wed, 24 Jun 2020 13:25:06 +0000 (22:25 +0900)]
crystaledit: Move TextDefinition and TextType to CrystalLineParser namespace

4 years agocrystaledit/Sample: Add 'View Whitespace' menu item
Takashi Sawanaka [Mon, 22 Jun 2020 13:40:56 +0000 (22:40 +0900)]
crystaledit/Sample: Add 'View Whitespace' menu item

4 years agocrystaledit/Sample: Remove unused resources
Takashi Sawanaka [Mon, 22 Jun 2020 13:07:51 +0000 (22:07 +0900)]
crystaledit/Sample: Remove unused resources

4 years agoUpdate Brazilian.po
Takashi Sawanaka [Mon, 22 Jun 2020 13:02:07 +0000 (22:02 +0900)]
Update Brazilian.po

4 years agoFix osdn.net #40488: C language block comments are not highlighted correctly (2)
Takashi Sawanaka [Mon, 22 Jun 2020 12:18:45 +0000 (21:18 +0900)]
Fix osdn.net #40488: C language block comments are not highlighted correctly (2)

4 years agoFix osdn.net #40488: C language block comments are not highlighted correctly
Takashi Sawanaka [Wed, 17 Jun 2020 13:42:33 +0000 (22:42 +0900)]
Fix osdn.net #40488: C language block comments are not highlighted correctly
TODO: fix csharp.cpp later.

4 years agoosdn.net ticket #40473: Add a plugin for Visio. Submitted by dedicatus (2)
Takashi Sawanaka [Wed, 17 Jun 2020 12:50:47 +0000 (21:50 +0900)]
osdn.net ticket #40473: Add a plugin for Visio. Submitted by dedicatus (2)

4 years agoosdn.net ticket #40473: Add a plugin for Visio. Submitted by dedicatus
Takashi Sawanaka [Wed, 17 Jun 2020 12:47:32 +0000 (21:47 +0900)]
osdn.net ticket #40473: Add a plugin for Visio. Submitted by dedicatus

4 years agoFix osdn.net ticket #40487: When the file is opened from OpenDlg, garbage remains...
Takashi Sawanaka [Tue, 16 Jun 2020 12:17:10 +0000 (21:17 +0900)]
Fix osdn.net ticket #40487: When the file is opened from OpenDlg, garbage remains under the following conditions
- MDI Child Windows are not maximized
- 'Close "Select Files or Folders" Dialog on clicking OK button' option is enabled

4 years agoFix GitHub issue #362: opening same file
Takashi Sawanaka [Sun, 14 Jun 2020 06:34:17 +0000 (15:34 +0900)]
Fix GitHub issue #362: opening same file

4 years agoFix an issue where the cursor would move to the beginning of a file when reloading...
Takashi Sawanaka [Wed, 10 Jun 2020 12:39:40 +0000 (21:39 +0900)]
Fix an issue where the cursor would move to the beginning of a file when reloading a file that was modified by an external application.

4 years agoFix osdn.net ticket #40476: HTML5 encoding (<meta charset="..." >) is ignored.
Takashi Sawanaka [Wed, 10 Jun 2020 11:35:39 +0000 (20:35 +0900)]
Fix osdn.net ticket #40476: HTML5 encoding (<meta charset="..." >) is ignored.

4 years agoFix osdn.net ticket #40472: Error when comparing images in the CompareMSExcelFiles...
Takashi Sawanaka [Tue, 9 Jun 2020 11:40:03 +0000 (20:40 +0900)]
Fix osdn.net ticket #40472: Error when comparing images in the CompareMSExcelFiles.sct plugin

4 years agoFix GitHub issue #356: Only indent existing lines
Takashi Sawanaka [Mon, 8 Jun 2020 11:43:53 +0000 (20:43 +0900)]
Fix GitHub issue #356: Only indent existing lines

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Mon, 8 Jun 2020 11:19:17 +0000 (20:19 +0900)]
Update Contributors.txt

4 years agoMerge pull request #360 from igorruckert/patch-1
Takashi Sawanaka [Mon, 8 Jun 2020 11:16:34 +0000 (20:16 +0900)]
Merge pull request #360 from igorruckert/patch-1

Update Brazilian.po

4 years agoFix GitHub issue #358: Moved ghost lines are shown in the wrong color
Takashi Sawanaka [Mon, 8 Jun 2020 11:15:45 +0000 (20:15 +0900)]
Fix GitHub issue #358: Moved ghost lines are shown in the wrong color

4 years agoUpdate Brazilian.po
Igor Rückert [Sun, 7 Jun 2020 22:17:04 +0000 (19:17 -0300)]
Update Brazilian.po

4 years agoMerge pull request #357 from Mr-Update/patch-9
Takashi Sawanaka [Sat, 6 Jun 2020 00:28:34 +0000 (09:28 +0900)]
Merge pull request #357 from Mr-Update/patch-9

Update German.po

4 years agoUpdate German.po
Mr-Update [Fri, 5 Jun 2020 20:10:35 +0000 (22:10 +0200)]
Update German.po

Translation completed.
Several lines combined to one line (like in English.pot).

4 years agoDirView.cpp: Improve performance when selecting a large number of files. (ref GitHub...
Takashi Sawanaka [Sat, 30 May 2020 13:17:23 +0000 (22:17 +0900)]
DirView.cpp: Improve performance when selecting a large number of files. (ref GitHub issue #352)

4 years agoFix a problem where tests in the "Test" configuration fail when run from Test Explorer.
Takashi Sawanaka [Tue, 26 May 2020 23:01:33 +0000 (08:01 +0900)]
Fix a problem where tests in the "Test" configuration fail when run from Test Explorer.

4 years agoUnitTests: Add tests
Takashi Sawanaka [Tue, 26 May 2020 22:55:35 +0000 (07:55 +0900)]
UnitTests: Add tests

4 years agoFileTransform.cpp: Show an error if the plugin specified in the command line argument...
Takashi Sawanaka [Sun, 24 May 2020 14:30:01 +0000 (23:30 +0900)]
FileTransform.cpp: Show an error if the plugin specified in the command line argument does not exist

4 years agoFix UnitTests.vs2019.vcxproj.filters
Takashi Sawanaka [Sun, 24 May 2020 14:26:12 +0000 (23:26 +0900)]
Fix UnitTests.vs2019.vcxproj.filters

4 years agoFix GitHub issue #351: Crush-report.
Takashi Sawanaka [Sun, 24 May 2020 13:14:55 +0000 (22:14 +0900)]
Fix GitHub issue #351: Crush-report.

4 years agoFix GitHub issue #348: Winmerge Freeze if large number of files are listed in Window...
Takashi Sawanaka [Thu, 21 May 2020 11:55:41 +0000 (20:55 +0900)]
Fix GitHub issue #348: Winmerge Freeze if large number of files are listed in Window View

4 years agoMergeEditView.cpp: Fix crash when selecting Diff Context = 0
Takashi Sawanaka [Wed, 20 May 2020 13:14:35 +0000 (22:14 +0900)]
MergeEditView.cpp: Fix crash when selecting Diff Context = 0

4 years agoUpdate .gitignore
Takashi Sawanaka [Wed, 20 May 2020 11:21:07 +0000 (20:21 +0900)]
Update .gitignore

4 years agoAllow a unpacker plugin to be specified with command line arguments
Takashi Sawanaka [Wed, 20 May 2020 10:23:26 +0000 (19:23 +0900)]
Allow a unpacker plugin to be specified with command line arguments

4 years agoRemove PluginForFile:m_bWithFile
Takashi Sawanaka [Wed, 20 May 2020 10:18:10 +0000 (19:18 +0900)]
Remove PluginForFile:m_bWithFile

4 years agoPlugins: Add PluginUnpackedFileExtenstion property
Takashi Sawanaka [Mon, 18 May 2020 12:48:29 +0000 (21:48 +0900)]
Plugins: Add PluginUnpackedFileExtenstion property

4 years agoRemove include guards
Takashi Sawanaka [Sun, 17 May 2020 12:41:42 +0000 (21:41 +0900)]
Remove include guards

4 years agoRemove $Id lines
Takashi Sawanaka [Sun, 17 May 2020 09:36:51 +0000 (18:36 +0900)]
Remove $Id lines

4 years agocrystaledit/Sample: Fix clicking the "View Margins" or "Wrap Lines" menu items does...
Takashi Sawanaka [Sun, 17 May 2020 09:13:46 +0000 (18:13 +0900)]
crystaledit/Sample: Fix clicking the "View Margins" or "Wrap Lines" menu items does not apply to all split views

4 years agoRemove unused macros from editcmd.h
Takashi Sawanaka [Sun, 17 May 2020 07:25:29 +0000 (16:25 +0900)]
Remove unused macros from editcmd.h

4 years agoCppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Sat, 16 May 2020 14:57:11 +0000 (23:57 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.

4 years agoCppcheck: Virtual function 'DestroyMenu' is called from destructor '~BCMenu()' at...
Takashi Sawanaka [Sat, 16 May 2020 14:50:18 +0000 (23:50 +0900)]
Cppcheck: Virtual function 'DestroyMenu' is called from destructor '~BCMenu()' at line 199. Dynamic binding is not used.

4 years agoBCMenu.*: Remove #ifdef UNICODE
Takashi Sawanaka [Sat, 16 May 2020 14:43:12 +0000 (23:43 +0900)]
BCMenu.*: Remove #ifdef UNICODE

4 years agoOpen Window: Make the parent folder of that path the default path for the Open dialog...
Takashi Sawanaka [Sat, 16 May 2020 13:49:13 +0000 (22:49 +0900)]
Open Window: Make the parent folder of that path the default path for the Open dialog box if the path in the text box to the left of the Browse button does not exist when the Browse button is pressed (ref issue #346)

4 years agoReduce compilation warnings
Takashi Sawanaka [Sat, 16 May 2020 07:52:57 +0000 (16:52 +0900)]
Reduce compilation warnings

4 years agoUse SPDX license identifier
Takashi Sawanaka [Sat, 16 May 2020 07:40:49 +0000 (16:40 +0900)]
Use SPDX license identifier

4 years agoUpdate .gitignore
Takashi Sawanaka [Sat, 16 May 2020 06:18:10 +0000 (15:18 +0900)]
Update .gitignore

4 years agoUpdate POCO C++ Libraries to 1.10.1
Takashi Sawanaka [Sat, 16 May 2020 06:16:49 +0000 (15:16 +0900)]
Update POCO C++ Libraries to 1.10.1

4 years agoWindowsManagerDialog.cpp: Fix warning C6001: Using uninitialized memory 'this'.
Takashi Sawanaka [Fri, 15 May 2020 15:47:20 +0000 (00:47 +0900)]
WindowsManagerDialog.cpp: Fix warning C6001: Using uninitialized memory 'this'.

4 years agoBCMenu.*: Remove *A() functions
Takashi Sawanaka [Fri, 15 May 2020 15:32:39 +0000 (00:32 +0900)]
BCMenu.*: Remove *A() functions

4 years agoFix osdn.net ticket 40407: Fix a problem where markers that are out of the range...
Takashi Sawanaka [Wed, 13 May 2020 12:31:27 +0000 (21:31 +0900)]
Fix osdn.net ticket 40407: Fix a problem where markers that are out of the range of the current difference appear in the difference pane.

4 years agoReduce compilation warnings
Takashi Sawanaka [Tue, 12 May 2020 09:06:19 +0000 (18:06 +0900)]
Reduce compilation warnings

4 years agoFix crash in Test
Takashi Sawanaka [Sun, 10 May 2020 13:51:46 +0000 (22:51 +0900)]
Fix crash in Test

4 years agoFix build error on 'Test' solution configuration
Takashi Sawanaka [Sun, 10 May 2020 09:53:16 +0000 (18:53 +0900)]
Fix build error on 'Test' solution configuration

4 years agoFix GitHub issue #339: Long filename issue
Takashi Sawanaka [Sun, 10 May 2020 09:51:52 +0000 (18:51 +0900)]
Fix GitHub issue #339: Long filename issue

4 years agocrystaledit: Fix search not working properly
Takashi Sawanaka [Sun, 10 May 2020 05:01:23 +0000 (14:01 +0900)]
crystaledit: Fix search not working properly

4 years agoMerge pull request #338 from kayazeren/master
Takashi Sawanaka [Sat, 9 May 2020 22:17:49 +0000 (07:17 +0900)]
Merge pull request #338 from kayazeren/master

2.16.6 update

4 years agoMerge branch 'master' into master
Takashi Sawanaka [Sat, 9 May 2020 22:17:34 +0000 (07:17 +0900)]
Merge branch 'master' into master

4 years ago2.16.6 update
Kaya Zeren [Sat, 9 May 2020 19:17:32 +0000 (22:17 +0300)]
2.16.6 update

There were some obsolete 2.16.4 strings in po file. All fixed.

4 years agocrystaledit: Fix the problem that the icon of the mouse cursor does not change even...
Takashi Sawanaka [Sat, 9 May 2020 13:57:56 +0000 (22:57 +0900)]
crystaledit: Fix the problem that the icon of the mouse cursor does not change even if the mouse pointer is moved out of the selected area when column selection is used.

4 years agocrystaledit: Reduce compilation warnings
Takashi Sawanaka [Sat, 9 May 2020 00:19:37 +0000 (09:19 +0900)]
crystaledit: Reduce compilation warnings

4 years agocrystaledit: Fix garbage appearing with horizontal scrolling of text containing combi...
Takashi Sawanaka [Sat, 9 May 2020 00:09:24 +0000 (09:09 +0900)]
crystaledit: Fix garbage appearing with horizontal scrolling of text containing combining characters

4 years agocrystaledit/Sample: Enable ctrl+A shortcut
Takashi Sawanaka [Fri, 8 May 2020 22:26:07 +0000 (07:26 +0900)]
crystaledit/Sample: Enable ctrl+A shortcut

4 years agocrystaledit: Fix crash when thire is no EOL
Takashi Sawanaka [Fri, 8 May 2020 22:13:25 +0000 (07:13 +0900)]
crystaledit: Fix crash when thire is no EOL

4 years agoUpdate Turkish.po
Takashi Sawanaka [Fri, 8 May 2020 11:03:44 +0000 (20:03 +0900)]
Update Turkish.po

4 years agoMerge pull request #337 from kayazeren/master
Takashi Sawanaka [Fri, 8 May 2020 10:51:45 +0000 (19:51 +0900)]
Merge pull request #337 from kayazeren/master

2.16.6 Turkish translation

4 years ago2.16.6 Turkish translation
Kaya Zeren [Fri, 8 May 2020 08:35:03 +0000 (11:35 +0300)]
2.16.6 Turkish translation

Small fixes after full review

4 years agoMerge pull request #336 from kayazeren/master
Takashi Sawanaka [Fri, 8 May 2020 01:09:12 +0000 (10:09 +0900)]
Merge pull request #336 from kayazeren/master

2.16.6 ReadMe-Turkish translation update

4 years ago2.16.6 ReadMe-Turkish translation update
Kaya Zeren [Fri, 8 May 2020 00:53:45 +0000 (03:53 +0300)]
2.16.6 ReadMe-Turkish translation update

4 years agoUpdate Turkish.po
Takashi Sawanaka [Fri, 8 May 2020 00:51:01 +0000 (09:51 +0900)]
Update Turkish.po

4 years agoMerge pull request #335 from kayazeren/master
Takashi Sawanaka [Fri, 8 May 2020 00:43:10 +0000 (09:43 +0900)]
Merge pull request #335 from kayazeren/master

2.16.6 Turkish translation update

4 years ago2.16.6 update
Kaya Zeren [Fri, 8 May 2020 00:17:24 +0000 (03:17 +0300)]
2.16.6 update

4 years ago Fix Github issue #307(3): Diff Pane issues(2.)
Takashi Sawanaka [Thu, 7 May 2020 08:07:43 +0000 (17:07 +0900)]
 Fix Github issue #307(3): Diff Pane issues(2.)

4 years ago Fix Github issue #307(2): Diff Pane issues(1.)
Takashi Sawanaka [Thu, 7 May 2020 04:41:43 +0000 (13:41 +0900)]
 Fix Github issue #307(2): Diff Pane issues(1.)

4 years agoCppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Wed, 6 May 2020 13:48:42 +0000 (22:48 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.

4 years agoCppcheck: The scope of the variable '...' can be reduced
Takashi Sawanaka [Wed, 6 May 2020 13:40:47 +0000 (22:40 +0900)]
Cppcheck: The scope of the variable '...' can be reduced

4 years agoCppcheck: Unsigned expression 'pos=str_pos(name,codes[i].name)' can't be negative...
Takashi Sawanaka [Wed, 6 May 2020 13:33:59 +0000 (22:33 +0900)]
Cppcheck: Unsigned expression 'pos=str_pos(name,codes[i].name)' can't be negative so it is unnecessary to test it.

4 years agoCppcheck: The condition 'posit==1 || posit!=1 && sString.GetAt(posit-2)==L':'' is...
Takashi Sawanaka [Wed, 6 May 2020 13:31:06 +0000 (22:31 +0900)]
Cppcheck: The condition 'posit==1 || posit!=1 && sString.GetAt(posit-2)==L':'' is equivalent to 'posit==1 || sString.GetAt(posit-2)==L':''.

4 years agoCppcheck: Using object to temporary.
Takashi Sawanaka [Wed, 6 May 2020 13:27:11 +0000 (22:27 +0900)]
Cppcheck: Using object to temporary.

4 years agoCppcheck: Virtual function 'Clone' is called from copy constructor 'UndoRecord(const...
Takashi Sawanaka [Wed, 6 May 2020 13:12:11 +0000 (22:12 +0900)]
Cppcheck: Virtual function 'Clone' is called from copy constructor 'UndoRecord(const UndoRecord&src)' at line 56. Dynamic binding is not used.

4 years agoCppcheck: Virtual function 'ResetView' is called from constructor 'CCrystalTextView...
Takashi Sawanaka [Wed, 6 May 2020 13:10:30 +0000 (22:10 +0900)]
Cppcheck: Virtual function 'ResetView' is called from constructor 'CCrystalTextView()' at line 616. Dynamic binding is not used.

4 years agoCppcheck: Same expression used in consecutive assignments of 'nLineLength' and 'nFound'.
Takashi Sawanaka [Wed, 6 May 2020 12:56:07 +0000 (21:56 +0900)]
Cppcheck: Same expression used in consecutive assignments of 'nLineLength' and 'nFound'.