OSDN Git Service

winmerge-jp/winmerge-jp.git
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 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 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.

2 years agoMergeDoc.cpp: Avoid unpacking the file on the right if the Unpacker plugin fails...
Takashi Sawanaka [Sun, 9 May 2021 02:13:30 +0000 (11:13 +0900)]
MergeDoc.cpp: Avoid unpacking the file on the right if the Unpacker plugin fails to unpack the file on the left

2 years agoFix the problem that the BS key does not work at the beginning of the line after...
Takashi Sawanaka [Sun, 9 May 2021 02:09:39 +0000 (11:09 +0900)]
Fix the problem that the BS key does not work at the beginning of the line after splitting the pane or clicking the OK button in the Options dialog.

2 years ago- C(Reg|Ini)OptionsMgr::SplitName() -> COptionsMgr::SplitName()
Takashi Sawanaka [Sun, 9 May 2021 02:06:38 +0000 (11:06 +0900)]
- C(Reg|Ini)OptionsMgr::SplitName() -> COptionsMgr::SplitName()
- Write the settings to the INI file in a separate thread.

2 years agoFix Register.bat not working properly on the Chinese version of Windows XP (#780)
Takashi Sawanaka [Sat, 8 May 2021 11:02:40 +0000 (20:02 +0900)]
Fix Register.bat not working properly on the Chinese version of Windows XP (#780)

2 years agoFix the following PHP syntax highlighting issues: (#782)
Jun Tajima [Fri, 7 May 2021 14:35:19 +0000 (23:35 +0900)]
Fix the following PHP syntax highlighting issues: (#782)

- The second and subsequent lines of the string enclosed in single quotes are not displayed in the string color.
- The lines after the blank line of the string enclosed in double quotes are not displayed in the string color.

2 years agoDirView.cpp: Fix not being able to open an unpaired file from the 'Compare As' contex...
Takashi Sawanaka [Fri, 7 May 2021 00:23:16 +0000 (09:23 +0900)]
DirView.cpp: Fix not being able to open an unpaired file from the 'Compare As' context menu

2 years agoAdd Testing/Data/Compare/Dir?/file123_0x00-0xff.txt
Takashi Sawanaka [Thu, 6 May 2021 23:46:51 +0000 (08:46 +0900)]
Add Testing/Data/Compare/Dir?/file123_0x00-0xff.txt

2 years agoIniOptionsMgr: Fix the problem that it cannot be read the value from the INI file...
Takashi Sawanaka [Thu, 6 May 2021 13:45:28 +0000 (22:45 +0900)]
IniOptionsMgr: Fix the problem that it cannot be read the value from the INI file normally, if the value written to the INI file contains control characters such as \n.

2 years agoeditor addin.sct: ExecFilterCommand: Specify the previously entered command as the...
Takashi Sawanaka [Wed, 5 May 2021 14:24:16 +0000 (23:24 +0900)]
editor addin.sct: ExecFilterCommand: Specify the previously entered command as the default value of InputBox.

2 years agoGenerate Unpacker Plugins from Editor script functions
Takashi Sawanaka [Wed, 5 May 2021 13:38:48 +0000 (22:38 +0900)]
Generate Unpacker Plugins from Editor script functions

2 years agoUniFile.*: Add ReadStringAll(), GetBase() and GetFileSize() function
Takashi Sawanaka [Wed, 5 May 2021 13:35:46 +0000 (22:35 +0900)]
UniFile.*: Add ReadStringAll(), GetBase() and GetFileSize() function

2 years agoGuessCodepageEncoding() -> codepage_detect::Guess()
Takashi Sawanaka [Wed, 5 May 2021 12:35:12 +0000 (21:35 +0900)]
GuessCodepageEncoding() -> codepage_detect::Guess()

2 years agoFix osdn.net #42179: Thicken the caret in overwrite mode
Takashi Sawanaka [Wed, 5 May 2021 06:26:21 +0000 (15:26 +0900)]
Fix osdn.net #42179: Thicken the caret in overwrite mode

2 years agoIniOptionsMgr.*: Reduce the number of reads from the INI file (2)
Takashi Sawanaka [Tue, 4 May 2021 01:13:16 +0000 (10:13 +0900)]
IniOptionsMgr.*: Reduce the number of reads from the INI file (2)

2 years agoIniOptionsMgr.*: Reduce the number of reads from the INI file
Takashi Sawanaka [Mon, 3 May 2021 02:37:03 +0000 (11:37 +0900)]
IniOptionsMgr.*: Reduce the number of reads from the INI file

2 years agoFIx discussion #768: Different Files are Identical? (When comparing files with only...
Takashi Sawanaka [Mon, 3 May 2021 01:22:47 +0000 (10:22 +0900)]
FIx discussion #768: Different Files are Identical? (When comparing files with only BOM and no contents, the comparison result became unstable because it referred to the uninitialized memory.)

2 years agorefactor
Takashi Sawanaka [Sat, 1 May 2021 01:53:34 +0000 (10:53 +0900)]
refactor

2 years agoUpdate Polish.po (#769)
Mirosław Żylewicz [Fri, 30 Apr 2021 22:58:46 +0000 (00:58 +0200)]
Update Polish.po (#769)

2 years agoIniOptionsMgr.cpp: The value of the m_serializing variable was not initialized
Takashi Sawanaka [Fri, 30 Apr 2021 15:53:38 +0000 (00:53 +0900)]
IniOptionsMgr.cpp: The value of the m_serializing variable was not initialized

2 years agoAvoid an assertion failure when loading settings from winmerge.ini
Takashi Sawanaka [Fri, 30 Apr 2021 15:15:03 +0000 (00:15 +0900)]
Avoid an assertion failure when loading settings from winmerge.ini

2 years agoUpdate Russian.po
Takashi Sawanaka [Fri, 30 Apr 2021 15:06:20 +0000 (00:06 +0900)]
Update Russian.po

2 years agoLeave the class name as CIniOptionsMgr, but rename the filename to IniOptionsMgr.*
Takashi Sawanaka [Fri, 30 Apr 2021 15:05:54 +0000 (00:05 +0900)]
Leave the class name as CIniOptionsMgr, but rename the filename to IniOptionsMgr.*

2 years agocrystaledit: Use GetProfile*()/WriteProfile*() to read and write the registry wheneve...
Takashi Sawanaka [Fri, 30 Apr 2021 14:59:20 +0000 (23:59 +0900)]
crystaledit: Use GetProfile*()/WriteProfile*() to read and write the registry whenever possible.

2 years agoFix an issue where the message "The number of automatically merged changes: %1\nThe...
Jun Tajima [Fri, 30 Apr 2021 02:51:48 +0000 (11:51 +0900)]
Fix an issue where the message "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" is not translated. (#763)

2 years agoUpdate French translation (#762)
slolo2000 [Thu, 29 Apr 2021 22:51:01 +0000 (00:51 +0200)]
Update French translation (#762)

2 years agoUpdate Russian.po (#761)
wvxwxvw [Thu, 29 Apr 2021 22:50:34 +0000 (01:50 +0300)]
Update Russian.po (#761)

2 years agoPossibility to store settings in INI file (#248) (#750)
grzesie [Thu, 29 Apr 2021 22:50:21 +0000 (00:50 +0200)]
Possibility to store settings in INI file (#248) (#750)

* Possibility to store settings in INI file (#248)

* changing name to CIniOptionsMgr

changing name to CIniOptionsMgr

2 years agoBump revision to 2.16.12.0 v2.16.12
Takashi Sawanaka [Thu, 29 Apr 2021 00:55:12 +0000 (09:55 +0900)]
Bump revision to 2.16.12.0

2 years agoUpdate changelog&releasenotes
Takashi Sawanaka [Thu, 29 Apr 2021 00:20:57 +0000 (09:20 +0900)]
Update changelog&releasenotes

2 years agoFix a rare crash when enabling syntax highlighting
Takashi Sawanaka [Wed, 28 Apr 2021 23:21:04 +0000 (08:21 +0900)]
Fix a rare crash when enabling syntax highlighting

2 years agoFix inline scripts in HTML file not being properly highlighted.
Takashi Sawanaka [Wed, 28 Apr 2021 15:41:34 +0000 (00:41 +0900)]
Fix inline scripts in HTML file not being properly highlighted.

2 years agoFix 'Automatic Rescan' not working after splitting panes
Takashi Sawanaka [Wed, 28 Apr 2021 14:18:17 +0000 (23:18 +0900)]
Fix 'Automatic Rescan' not working after splitting panes

2 years agoUpdate manual
Takashi Sawanaka [Wed, 28 Apr 2021 13:51:10 +0000 (22:51 +0900)]
Update manual

2 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Tue, 27 Apr 2021 13:12:50 +0000 (22:12 +0900)]
Update TranslationsStatus.*

2 years agoUpdate changelog&releasenotes
Takashi Sawanaka [Tue, 27 Apr 2021 13:06:20 +0000 (22:06 +0900)]
Update changelog&releasenotes

2 years agoLanguageSelect.cpp: Fix the problem that the last translation of the PO file is not...
Takashi Sawanaka [Mon, 26 Apr 2021 14:37:39 +0000 (23:37 +0900)]
LanguageSelect.cpp: Fix the problem that the last translation of the PO file is not added to the map.

2 years agoFix GitHub issue #755: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and...
Takashi Sawanaka [Mon, 26 Apr 2021 13:53:35 +0000 (22:53 +0900)]
Fix GitHub issue #755: ATL: QIThunk - 2 LEAK in plugins e.g. DisplayBinaryFiles and DisplayXMLFiles

2 years agoautoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)
Takashi Sawanaka [Fri, 23 Apr 2021 22:36:48 +0000 (07:36 +0900)]
autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)

(cherry picked from commit 46546b0aceb516696662be481218c207e0725527)

2 years agoUpdate of Lithuanian translation (#754)
Tichij [Mon, 26 Apr 2021 12:09:08 +0000 (15:09 +0300)]
Update of Lithuanian translation (#754)

2 years agoautoit.cpp - #CS #CE support (#753)
Michał Lipok [Mon, 26 Apr 2021 12:08:35 +0000 (14:08 +0200)]
autoit.cpp - #CS #CE  support (#753)

2 years agoImgMergeFrm.cpp: Fix the header bar widths not being calculated properly when the...
Takashi Sawanaka [Sun, 25 Apr 2021 12:36:17 +0000 (21:36 +0900)]
ImgMergeFrm.cpp:  Fix the header bar widths not being calculated properly when the 'Split Vertically' menu item is unchecked.

2 years agoUpdate to winimerge 1.0.27.0
Takashi Sawanaka [Sun, 25 Apr 2021 12:23:53 +0000 (21:23 +0900)]
Update to winimerge 1.0.27.0

2 years agoUpdate Slovenian translation. Submitted by JadranR
Takashi Sawanaka [Sun, 25 Apr 2021 08:46:04 +0000 (17:46 +0900)]
Update Slovenian translation. Submitted by JadranR

2 years agoUpdate German.po (#752)
Mr-Update [Sun, 25 Apr 2021 08:43:16 +0000 (10:43 +0200)]
Update German.po (#752)

Translation completed

2 years agoFix PHP syntax highlighting. (#751)
Jun Tajima [Sun, 25 Apr 2021 08:41:57 +0000 (17:41 +0900)]
Fix PHP syntax highlighting. (#751)

- Fix an issue where the string after the block whose color index is COLORINDEX_NORMALTEXT or COLORINDEX_USER1 is not highlighted correctly.
  (The processing of the fixed part is now the same as CrystalLineParser::ParseLineCJava() with this fix.)

2 years agoautoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)
Takashi Sawanaka [Fri, 23 Apr 2021 22:36:48 +0000 (07:36 +0900)]
autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)

2 years agoautoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749)
Michał Lipok [Fri, 23 Apr 2021 22:13:37 +0000 (00:13 +0200)]
autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749)

2 years agoFix osdn.net ticket #42064: Fix conflicting accelerators
Takashi Sawanaka [Fri, 23 Apr 2021 13:23:50 +0000 (22:23 +0900)]
Fix osdn.net ticket #42064: Fix conflicting accelerators

2 years agoFix osdn.net ticket #42063: Make the width of the 'Find what' label in Find dialog...
Takashi Sawanaka [Fri, 23 Apr 2021 12:11:37 +0000 (21:11 +0900)]
Fix osdn.net ticket #42063: Make the width of the 'Find what' label in Find dialog a little wider