OSDN Git Service

winmerge-jp/winmerge-jp.git
2 years agoBump revision to 2.16.12+-jp-4 2.16.12+jp-4
Takashi Sawanaka [Mon, 5 Jul 2021 11:41:52 +0000 (20:41 +0900)]
Bump revision to 2.16.12+-jp-4

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Mon, 5 Jul 2021 11:38:00 +0000 (20:38 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.md
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
# Translations/WinMerge/German.po
# Translations/WinMerge/Hungarian.po
# Translations/WinMerge/Slovenian.po

2 years agoUpdate German.po (#860)
Mr-Update [Sun, 4 Jul 2021 22:24:44 +0000 (00:24 +0200)]
Update German.po (#860)

2 years agoUpdate Slovenian translation. Submited by JadranR
Takashi Sawanaka [Sun, 4 Jul 2021 12:59:17 +0000 (21:59 +0900)]
Update Slovenian translation. Submited by JadranR

2 years agoFix an issue where a file is deselected when returning to the folder compare window...
Jun Tajima [Sun, 4 Jul 2021 10:39:16 +0000 (19:39 +0900)]
Fix an issue where a file is deselected when returning to the folder compare window after opening the file compare window by double-clicking the file in the folder compare window. (#857)

- CDirView::OnLButtonDblClk() now executes CListView::OnLButtonDblClk() only when it is in focus.

2 years agoFix code scaning alerts 189-191: 'new[]' array freed with 'delete'
Takashi Sawanaka [Sat, 3 Jul 2021 14:38:44 +0000 (23:38 +0900)]
Fix code scaning alerts 189-191: 'new[]' array freed with 'delete'

2 years agoFix Code scanning alerts #652-661: Constant return type on member
Takashi Sawanaka [Sat, 3 Jul 2021 13:07:38 +0000 (22:07 +0900)]
Fix Code scanning alerts #652-661: Constant return type on member

2 years agoUpdated hungarian.po (#856)
efi99 [Sat, 3 Jul 2021 11:15:12 +0000 (13:15 +0200)]
Updated hungarian.po (#856)

* Update Hungarian.po

* Update Hungarian.po

2 years agoFeature request #232: Right click context menu - Compare files or folders in a new...
Takashi Sawanaka [Sat, 3 Jul 2021 05:46:39 +0000 (14:46 +0900)]
Feature request #232: Right click context menu - Compare files or folders in a new tab (Fix issue #277: Subfolder context menu -> Compare destroys existing results)

2 years agoThere is a problem that OleUninitialize() in mfc/oleinit.cpp, which is called just...
Takashi Sawanaka [Sat, 3 Jul 2021 03:54:04 +0000 (12:54 +0900)]
There is a problem that OleUninitialize() in mfc/oleinit.cpp, which is called just before the process exits, hangs in rare cases.
To deal with this problem, force the process to exit if the process does not exit within 2 seconds after the call to CMergeApp::ExitInstance().

2 years agoFix issue #855: x64: LINK : warning LNK4010: invalid subsystem version number 5.01...
Takashi Sawanaka [Fri, 2 Jul 2021 13:32:38 +0000 (22:32 +0900)]
Fix issue #855: x64: LINK : warning LNK4010: invalid subsystem version number 5.01; default subsystem version assumed

2 years agoBuildArc.cmd: Add Version.in to winmerge-x.x.x-full-src.7z
Takashi Sawanaka [Thu, 1 Jul 2021 23:02:08 +0000 (08:02 +0900)]
BuildArc.cmd: Add Version.in to winmerge-x.x.x-full-src.7z

2 years agoFolderCompare.vcxproj: use shared items projects (2)
Takashi Sawanaka [Thu, 1 Jul 2021 15:08:13 +0000 (00:08 +0900)]
FolderCompare.vcxproj: use shared items projects (2)

2 years agoFolderCompare.vcxproj: use shared items projects
Takashi Sawanaka [Thu, 1 Jul 2021 14:43:01 +0000 (23:43 +0900)]
FolderCompare.vcxproj: use shared items projects

2 years agoFix issue #853: CString rangestr = (argc > 0) ? argv[0] : GetColumnRangeString();
Takashi Sawanaka [Thu, 1 Jul 2021 12:41:39 +0000 (21:41 +0900)]
Fix issue #853: CString rangestr = (argc > 0) ? argv[0] : GetColumnRangeString();
(Fix the problem that the value specified in the setting dialog is not used when the argument is not taken to the IgnoreColumns, IgnoreFieldsComma, IgnoreFieldsTab plugin.)

2 years agoCompareMSExcelFiles.sct: Fix an issue where "This picture only contains a bitmap...
Takashi Sawanaka [Thu, 1 Jul 2021 12:07:39 +0000 (21:07 +0900)]
CompareMSExcelFiles.sct: Fix an issue where "This picture only contains a bitmap" is displayed when comparing Excel files that contain shapes. Submitted by Shirai

2 years agoFix issue #841 WinMerge doesn't build under Visual Studio 16.10.2
Takashi Sawanaka [Thu, 1 Jul 2021 00:06:30 +0000 (09:06 +0900)]
Fix issue #841 WinMerge doesn't build under Visual Studio 16.10.2
(See https://developercommunity.visualstudio.com/t/Build-fails-with-internal-compiler-erro/1367077)

2 years agoBump revision to 2.16.12+-jp-3 2.16.12+jp-3
Takashi Sawanaka [Mon, 28 Jun 2021 14:43:08 +0000 (23:43 +0900)]
Bump revision to 2.16.12+-jp-3

2 years agoUpdate Japanese.po
Takashi Sawanaka [Mon, 28 Jun 2021 14:41:13 +0000 (23:41 +0900)]
Update Japanese.po

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Mon, 28 Jun 2021 14:40:18 +0000 (23:40 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoUpdate manual
Takashi Sawanaka [Mon, 28 Jun 2021 14:39:51 +0000 (23:39 +0900)]
Update manual

2 years agoUpdate Bulgarian (#850)
StoyanDimitrov [Mon, 28 Jun 2021 12:05:07 +0000 (12:05 +0000)]
Update Bulgarian (#850)

2 years agoUpdate of Lithuanian translation (#849)
Tichij [Mon, 28 Jun 2021 11:48:04 +0000 (14:48 +0300)]
Update of Lithuanian translation (#849)

2 years agoMake the plugin description translatable 2.16.12+jp-2
Takashi Sawanaka [Sun, 27 Jun 2021 14:26:50 +0000 (23:26 +0900)]
Make the plugin description translatable

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Sun, 27 Jun 2021 13:39:30 +0000 (22:39 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoFolder compare: Fix crash when disabling plugins
Takashi Sawanaka [Sun, 27 Jun 2021 13:38:55 +0000 (22:38 +0900)]
Folder compare: Fix crash when disabling plugins

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Sun, 27 Jun 2021 12:16:54 +0000 (21:16 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoresource.h: Add IDS_PLUGIN_DESCRIPTION*
Takashi Sawanaka [Sun, 27 Jun 2021 12:13:05 +0000 (21:13 +0900)]
resource.h: Add IDS_PLUGIN_DESCRIPTION*

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Sun, 27 Jun 2021 11:52:04 +0000 (20:52 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# SetVersion.cmd
# Version.h

2 years agoeditor addin.sct: Add ReverseColumns, ReverseLines and Replace function (2)
Takashi Sawanaka [Sun, 27 Jun 2021 09:16:49 +0000 (18:16 +0900)]
editor addin.sct: Add ReverseColumns, ReverseLines and Replace function (2)

2 years agoTurkish translation 2.16.13 update (#848)
Kaya Zeren [Sat, 26 Jun 2021 22:47:45 +0000 (01:47 +0300)]
Turkish translation 2.16.13 update (#848)

* Turkish translation update for 2.16.12

Turkish translation update for 2.16.12

* 2.16.13 update

2.16.13 update

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Sat, 26 Jun 2021 08:23:07 +0000 (17:23 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

2 years agoMake the plugin description translatable
Takashi Sawanaka [Sat, 26 Jun 2021 08:22:44 +0000 (17:22 +0900)]
Make the plugin description translatable

2 years agoeditor addmin.sc: Add ReverseColumns, ReverseLines and Replace function
Takashi Sawanaka [Sat, 26 Jun 2021 08:21:55 +0000 (17:21 +0900)]
editor addmin.sc: Add ReverseColumns, ReverseLines and Replace function

2 years agoUpdate Russian.po (#847)
wvxwxvw [Fri, 25 Jun 2021 21:30:57 +0000 (00:30 +0300)]
Update Russian.po (#847)

2 years agoUpdate Portuguese translation (#846)
Hugo Carvalho [Fri, 25 Jun 2021 13:13:15 +0000 (14:13 +0100)]
Update Portuguese translation (#846)

2 years agoPatch 7 (hungarian lang update 2.16.13) (#845)
efi99 [Fri, 25 Jun 2021 12:21:10 +0000 (14:21 +0200)]
Patch 7 (hungarian lang update 2.16.13) (#845)

* Update Hungarian.po

* Update Hungarian.po

2 years agoResolves: Add continuous code security and quality analysis (#844)
Svetoslav Zlatkov [Fri, 25 Jun 2021 12:20:24 +0000 (15:20 +0300)]
Resolves: Add continuous code security and quality analysis (#844)

* add minimal CodeQL

* add minimal CodeQL using project's build instructions

* building with project's instructions

* test build with minimal CodeQL

* run pipeline on windows os.

* minimal CodeQL test with autobuild on windows

* add minimal CodeQL with project's build instructions

* add CodeQL with security-and-quality queries

* run on ubuntu and add pwsh to build step

* change building platform to windows

* change the runner platform to ubuntu

* change the build platform to windows

* Update codeql-analysis.yml

Co-authored-by: aleks-ivanov <aleksandar.ivanov@singlet.dev>
Co-authored-by: Aleksandar Ivanov <74899441+aleks-ivanov@users.noreply.github.com>
2 years agoAdd PluginTests.vbs
Takashi Sawanaka [Thu, 24 Jun 2021 13:38:08 +0000 (22:38 +0900)]
Add PluginTests.vbs

2 years agoeditr addin.sct: Add SelectLines function
Takashi Sawanaka [Thu, 24 Jun 2021 12:50:54 +0000 (21:50 +0900)]
editr addin.sct: Add SelectLines function

2 years agoUpdate Dutch.po (#842)
Thomas De Rocker [Thu, 24 Jun 2021 12:47:00 +0000 (14:47 +0200)]
Update Dutch.po (#842)

2 years agoeditr addin.sct: Add SelectColumns function
Takashi Sawanaka [Thu, 24 Jun 2021 00:03:31 +0000 (09:03 +0900)]
editr addin.sct: Add SelectColumns function

2 years agoLoad not only the plugins stored in the Program Files\WinMerge\MergePlugins folder...
Takashi Sawanaka [Wed, 23 Jun 2021 14:53:34 +0000 (23:53 +0900)]
Load not only the plugins stored in the Program Files\WinMerge\MergePlugins folder, but also the plugins stored in the % APPDATA%\WinMerge\MergePlugins folder

2 years agoMerge remote-tracking branch 'origin/master'
Takashi Sawanaka [Wed, 23 Jun 2021 14:49:35 +0000 (23:49 +0900)]
Merge remote-tracking branch 'origin/master'

2 years agoFix 'No prediffer (normal)' menu item being marked in the Prediffer menu after select...
Takashi Sawanaka [Wed, 23 Jun 2021 14:49:15 +0000 (23:49 +0900)]
Fix 'No prediffer (normal)' menu item being marked in the Prediffer menu after selecting prediffer from the Apply Prediffer menu item

2 years agoUpdate of Lithuanian translation (#840)
Tichij [Wed, 23 Jun 2021 14:38:39 +0000 (17:38 +0300)]
Update of Lithuanian translation (#840)

2 years agoPlugins: Fix a crash on Window XP v2.16.13
Takashi Sawanaka [Tue, 22 Jun 2021 13:38:52 +0000 (22:38 +0900)]
Plugins: Fix a crash on Window XP
https://stackoverflow.com/questions/32633398/crash-in-catlstringmgrgetinstance-under-windows-xp/32953859#32953859

2 years agoDownloadDeps.cmd: Download tidy.exe which supports Windows XP
Takashi Sawanaka [Tue, 22 Jun 2021 12:21:01 +0000 (21:21 +0900)]
DownloadDeps.cmd: Download tidy.exe which supports Windows XP

2 years agoq,bat: QueryCSV and QueryTSV plugins are only supported on x64 systems
Takashi Sawanaka [Tue, 22 Jun 2021 11:27:30 +0000 (20:27 +0900)]
q,bat: QueryCSV and QueryTSV plugins are only supported on x64 systems

2 years agoAdd jq and tidy-html5 submodules
Takashi Sawanaka [Tue, 22 Jun 2021 00:16:20 +0000 (09:16 +0900)]
Add jq and tidy-html5 submodules

2 years agoBump revision to 2.16.13
Takashi Sawanaka [Mon, 21 Jun 2021 23:52:51 +0000 (08:52 +0900)]
Bump revision to 2.16.13

2 years agoImprove plugin system (#797) (6)
Takashi Sawanaka [Mon, 21 Jun 2021 23:43:55 +0000 (08:43 +0900)]
Improve plugin system (#797)  (6)

2 years agoUpdate winimerge
Takashi Sawanaka [Mon, 21 Jun 2021 15:25:02 +0000 (00:25 +0900)]
Update winimerge

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Mon, 21 Jun 2021 15:23:22 +0000 (00:23 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# Externals/winimerge

2 years agoUpdate changelog&releasenotes (2)
Takashi Sawanaka [Mon, 21 Jun 2021 15:17:59 +0000 (00:17 +0900)]
Update changelog&releasenotes (2)

2 years agoImprove plugin system (#797) (5)
Takashi Sawanaka [Mon, 21 Jun 2021 15:17:39 +0000 (00:17 +0900)]
Improve plugin system (#797)  (5)

2 years agoRegister.bat, RegisterPerUser.bat: Add /s option for silent registration
Takashi Sawanaka [Mon, 21 Jun 2021 13:34:50 +0000 (22:34 +0900)]
Register.bat, RegisterPerUser.bat: Add /s option for silent registration

2 years agoImprove plugin system (#797) (4)
Takashi Sawanaka [Mon, 21 Jun 2021 12:48:15 +0000 (21:48 +0900)]
Improve plugin system (#797)  (4)

2 years agoFix issue #834: Incorrect comparison
Takashi Sawanaka [Mon, 21 Jun 2021 11:19:34 +0000 (20:19 +0900)]
Fix issue #834: Incorrect comparison
This bug occurs when enabling both the 'Ignore blank lines' option and the 'Completely unhighlight the ignored differences' option.

2 years agoUpdate changelog&releasenotes
Takashi Sawanaka [Sun, 20 Jun 2021 14:46:20 +0000 (23:46 +0900)]
Update changelog&releasenotes

2 years agoImprove plugin system (#797) (3)
Takashi Sawanaka [Sun, 20 Jun 2021 13:43:27 +0000 (22:43 +0900)]
Improve plugin system (#797)  (3)

2 years agoImprove plugin system (#797) (2)
Takashi Sawanaka [Sun, 20 Jun 2021 12:57:09 +0000 (21:57 +0900)]
Improve plugin system (#797)  (2)

2 years agoImprove plugin system (#797)
Takashi Sawanaka [Sun, 20 Jun 2021 08:12:00 +0000 (17:12 +0900)]
Improve plugin system (#797)

- Add categorized Unpacker plugin menu items to various menus
  - Select Files or Folders window
  ![image](https://user-images.githubusercontent.com/98126/122665970-85f3de80-d1e5-11eb-8ffb-5182652326c3.png)
  - Folder Compare window
  ![image](https://user-images.githubusercontent.com/98126/122665994-b471b980-d1e5-11eb-87e8-4b91a15bd8a7.png)
  - File Compare window
  ![image](https://user-images.githubusercontent.com/98126/122664730-23e3ab00-d1de-11eb-99c7-285596efaf9d.png)
  ![image](https://user-images.githubusercontent.com/98126/122666029-ee42c000-d1e5-11eb-922e-b047d74c43fb.png)
- Make it possible to specify multiple Unpacker/Prediffer plugins by concatenating them with `|` and to specify arguments.
   e.g. `ExecFilterCommand sort | MakeUpper`
![image](https://user-images.githubusercontent.com/98126/122665171-aa998780-d1e0-11eb-9f88-deae7da2c6e5.png)
- Allow Unpacker/Prediffer plugins to be specified for multiple files at once in Folder Compare window. The specified plugin will be visible in the Unpacker and Prediffer columns
   ![image](https://user-images.githubusercontent.com/98126/122666428-116e6f00-d1e8-11eb-9cc5-554285c8460e.png)
   ![image](https://user-images.githubusercontent.com/98126/122664824-ad937880-d1de-11eb-9699-18132231d11e.png)
- Add "(U)" to the tab title when using the Unpacker plugin. Also, add "(P)" to the tab title when using the Prediffer plugin
  ![image](https://user-images.githubusercontent.com/98126/122665422-12040700-d1e2-11eb-9b31-746eb8a79cf9.png)
- Allow the plugin settings dialog to specify default arguments that will be used when no plugin arguments are specified
- Allow plugins used by Automatic Unpacking/Prediffing to be excluded in the plugin settings dialog
  ![image](https://user-images.githubusercontent.com/98126/122665573-f816f400-d1e2-11eb-964e-accbd09734ba.png)
- New unpacker plugins
   - ApacheTika (Apache Tika)
   - PrettifyJSON (jq)
   - PrettifyXML (tidy-html5)
   - QueryCSV (q)
   - QueryTSV (q)
   - QueryJSON (jq)
   - MakeUpper (auto-generated unpacker plugin from editor script plugin)
   - MakeLower (auto-generated unpacker plugin from editor script plugin)
   - RemoveDuplicates (auto-generated unpacker plugin from editor script plugin)
   - CountDuplicates (auto-generated unpacker plugin from editor script plugin)
   - SortAscending (auto-generated unpacker plugin from editor script plugin)
   - ExecFilterCommand (auto-generated unpacker plugin from editor script plugin)
   - Tokenize (auto-generated unpacker plugin from editor script plugin)
   - Trim (auto-generated unpacker plugin from editor script plugin)
   - VisualizeGraphviz (graphviz)
- New editor script plugins
   - RemoveDuplicates
   - CountDuplicates
   - Tokenize
   - Trim
   - ApacheTika  (auto-generated editor script plugin from unpacker plugin)
   - PrettifyJSON  (auto-generated editor script plugin from unpacker plugin)
   - PrettifyXML  (auto-generated editor script plugin from unpacker plugin)
 - Internals
   - Allow command-based plugins to be defined in XML file
   - Make the menu items of the Unpacker / Prediffer / Editor Script plugin translatable
   - Create Editor Script plugins from the Unpacker plugins

2 years agoDetermine the language of syntax highlighting with the extension obtained with the...
Takashi Sawanaka [Wed, 16 Jun 2021 14:18:56 +0000 (23:18 +0900)]
Determine the language of syntax highlighting with the extension obtained with the UnpackedFileExtension property (related to #820)

2 years agostrutils::join(): Fix the bug when the second element is empty
Takashi Sawanaka [Wed, 16 Jun 2021 00:03:55 +0000 (09:03 +0900)]
strutils::join(): Fix the bug when the second element is empty

2 years agoUpdate CWindowsManagerDialog - check some pointers for null and made … (#824) (2)
Takashi Sawanaka [Sun, 13 Jun 2021 13:57:22 +0000 (22:57 +0900)]
Update CWindowsManagerDialog - check some pointers for null and made … (#824) (2)

2 years agoUpdate CWindowsManagerDialog - check some pointers for null and made … (#824)
Flaviu_ [Sun, 13 Jun 2021 12:35:39 +0000 (15:35 +0300)]
Update CWindowsManagerDialog - check some pointers for null and made … (#824)

* Update CWindowsManagerDialog - check some pointers for null and made safe casts

* Update WindowsManagerDialog.cpp

2 years agoFix build errors
Takashi Sawanaka [Sat, 12 Jun 2021 00:03:16 +0000 (09:03 +0900)]
Fix build errors

2 years agoAdd Smarty syntax highlighting. (https://www.smarty.net/) (#821)
Jun Tajima [Fri, 11 Jun 2021 22:35:24 +0000 (07:35 +0900)]
Add Smarty syntax highlighting. (https://smarty.net/) (#821)

- Smarty delimiters can be changed, but for now only the default delimiters "{" and "}" are supported.

2 years agoAdd WinMergePluginBase.h (7)
Takashi Sawanaka [Sat, 5 Jun 2021 01:19:35 +0000 (10:19 +0900)]
Add WinMergePluginBase.h (7)

2 years agoReduce compilation warnings
Takashi Sawanaka [Sat, 5 Jun 2021 01:18:48 +0000 (10:18 +0900)]
Reduce compilation warnings

2 years agoUpdate CWindowsManagerDialog (#811)
Flaviu_ [Fri, 4 Jun 2021 15:31:13 +0000 (18:31 +0300)]
Update CWindowsManagerDialog (#811)

Make no sense to test m_pIL for nullptr in CWindowsManagerDialog destructor

2 years agoDirView.*: Add IsDiffItemSpecial() function
Takashi Sawanaka [Sun, 30 May 2021 02:02:39 +0000 (11:02 +0900)]
DirView.*: Add IsDiffItemSpecial() function

2 years agoDirView.cpp: Disable Compare As → Text ~ XML in the context menu when the selected...
Takashi Sawanaka [Sun, 30 May 2021 01:45:34 +0000 (10:45 +0900)]
DirView.cpp: Disable Compare As → Text ~ XML in the context menu when the selected item is a folder or parent folder icon

2 years agoAdd WinMergePluginBase.h (6)
Takashi Sawanaka [Sat, 29 May 2021 02:17:35 +0000 (11:17 +0900)]
Add WinMergePluginBase.h (6)

2 years agoUpdate Hungarian.po (#807)
efi99 [Fri, 28 May 2021 11:37:08 +0000 (13:37 +0200)]
Update Hungarian.po (#807)

2 years agoFix issue #804: FeatureRequest - Ignoring options - lack in "button menu"
Takashi Sawanaka [Thu, 27 May 2021 11:44:01 +0000 (20:44 +0900)]
Fix issue #804: FeatureRequest - Ignoring options - lack in "button menu"

2 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Thu, 27 May 2021 11:26:00 +0000 (20:26 +0900)]
Update TranslationsStatus.*

2 years agoTurkish translation update for 2.16.12 (#803)
Kaya Zeren [Tue, 25 May 2021 00:21:53 +0000 (03:21 +0300)]
Turkish translation update for 2.16.12 (#803)

Turkish translation update for 2.16.12

2 years agoFix the problem that the edited contents are discarded when the "Recompare As" menu...
Takashi Sawanaka [Sun, 23 May 2021 13:34:10 +0000 (22:34 +0900)]
Fix the problem that the edited contents are discarded when the "Recompare As" menu item is selected after editing the file.

2 years agoBinary Compare: Fix the problem that the file cannot be saved after creating a new one
Takashi Sawanaka [Sun, 23 May 2021 13:28:01 +0000 (22:28 +0900)]
Binary Compare: Fix the problem that the file cannot be saved after creating a new one

2 years agoFix PHP syntax highlighting. (#802)
Jun Tajima [Sat, 22 May 2021 13:15:09 +0000 (22:15 +0900)]
Fix PHP syntax highlighting. (#802)

- Fixed an issue where the text after the closing tag "?>" in a comment or string is not highlighted correctly.

2 years ago- Allow environment variables to be included in the path of the external editor
Takashi Sawanaka [Fri, 21 May 2021 14:19:41 +0000 (23:19 +0900)]
- Allow environment variables to be included in the path of the external editor
- Set the initial value of the path of the external editor to% windir%\NOTEPAD.EXE

2 years agoFix issue #784: Error on try to show differences between two different gif
Takashi Sawanaka [Thu, 20 May 2021 14:26:33 +0000 (23:26 +0900)]
Fix issue #784: Error on try to show differences between two different gif

2 years agoAdd WinMergePluginBase.h (5)
Takashi Sawanaka [Sun, 16 May 2021 11:20:22 +0000 (20:20 +0900)]
Add WinMergePluginBase.h (5)

2 years agoAdd WinMergePluginBase.h (4)
Takashi Sawanaka [Sun, 16 May 2021 11:17:05 +0000 (20:17 +0900)]
Add WinMergePluginBase.h (4)

2 years agoUpdate winimerge to 1.0.28 (2)
Takashi Sawanaka [Sun, 16 May 2021 05:05:00 +0000 (14:05 +0900)]
Update winimerge to 1.0.28 (2)

2 years agoMake Unpacker plugins available for image compare and binary compare
Takashi Sawanaka [Sun, 16 May 2021 00:19:32 +0000 (09:19 +0900)]
Make Unpacker plugins available for image compare and binary compare

2 years agoUpdate winimerge to 1.0.28
Takashi Sawanaka [Sun, 16 May 2021 00:09:51 +0000 (09:09 +0900)]
Update winimerge to 1.0.28

2 years agoFileTransform: Remove m_subcode from PackingInfo class
Takashi Sawanaka [Sat, 15 May 2021 06:20:26 +0000 (15:20 +0900)]
FileTransform: Remove m_subcode from PackingInfo class

2 years agotheApp is unnecessary because these methods are a static methods
Takashi Sawanaka [Sat, 15 May 2021 06:15:53 +0000 (15:15 +0900)]
theApp is unnecessary because these methods are a static methods

2 years agoFileTransform.cpp: Add GetUnpackedFileExtension() function
Takashi Sawanaka [Fri, 14 May 2021 13:12:26 +0000 (22:12 +0900)]
FileTransform.cpp: Add GetUnpackedFileExtension() function

2 years agoMerge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Thu, 13 May 2021 12:46:00 +0000 (21:46 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

2 years agoFix osdn.net #42219: Fix a crash when re-comparing folders
Takashi Sawanaka [Thu, 13 May 2021 12:42:55 +0000 (21:42 +0900)]
Fix osdn.net #42219: Fix a crash when re-comparing folders

2 years agoAdd WinMergePluginBase.h (3)
Takashi Sawanaka [Thu, 13 May 2021 12:03:57 +0000 (21:03 +0900)]
Add WinMergePluginBase.h (3)

2 years agoFix osdn.net #42219: Reset the cache for the Automatic/Manual Unpacking/Prediffer...
Takashi Sawanaka [Thu, 13 May 2021 00:05:30 +0000 (09:05 +0900)]
Fix osdn.net #42219: Reset the cache for the Automatic/Manual Unpacking/Prediffer settings to take effect before re-comparing folders

2 years agoFix issue #785: Unable to modify WinMerge.txt
Takashi Sawanaka [Wed, 12 May 2021 12:32:00 +0000 (21:32 +0900)]
Fix issue #785: Unable to modify WinMerge.txt

2 years agoAdd WinMergePluginBase.h (2)
Takashi Sawanaka [Tue, 11 May 2021 14:45:09 +0000 (23:45 +0900)]
Add WinMergePluginBase.h (2)

2 years agoAdd WinMergePluginBase.h
Takashi Sawanaka [Mon, 10 May 2021 00:24:32 +0000 (09:24 +0900)]
Add WinMergePluginBase.h

2 years agoMergeDoc.cpp: If an Encoding Error occurs when reading a file, the File encoding...
Takashi Sawanaka [Sun, 9 May 2021 02:17:15 +0000 (11:17 +0900)]
MergeDoc.cpp: If an Encoding Error occurs when reading a file, the File encoding will be detected again, but if the detected File encoding is the same as before, do not reload the file.