OSDN Git Service
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
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
Takashi Sawanaka [Sun, 16 May 2021 11:20:22 +0000 (20:20 +0900)]
Add WinMergePluginBase.h (5)
Takashi Sawanaka [Sun, 16 May 2021 11:17:05 +0000 (20:17 +0900)]
Add WinMergePluginBase.h (4)
Takashi Sawanaka [Sun, 16 May 2021 05:05:00 +0000 (14:05 +0900)]
Update winimerge to 1.0.28 (2)
Takashi Sawanaka [Sun, 16 May 2021 00:19:32 +0000 (09:19 +0900)]
Make Unpacker plugins available for image compare and binary compare
Takashi Sawanaka [Sun, 16 May 2021 00:09:51 +0000 (09:09 +0900)]
Update winimerge to 1.0.28
Takashi Sawanaka [Sat, 15 May 2021 06:20:26 +0000 (15:20 +0900)]
FileTransform: Remove m_subcode from PackingInfo class
Takashi Sawanaka [Sat, 15 May 2021 06:15:53 +0000 (15:15 +0900)]
theApp is unnecessary because these methods are a static methods
Takashi Sawanaka [Fri, 14 May 2021 13:12:26 +0000 (22:12 +0900)]
FileTransform.cpp: Add GetUnpackedFileExtension() function
Takashi Sawanaka [Thu, 13 May 2021 12:42:55 +0000 (21:42 +0900)]
Fix osdn.net #42219: Fix a crash when re-comparing folders
Takashi Sawanaka [Thu, 13 May 2021 12:03:57 +0000 (21:03 +0900)]
Add WinMergePluginBase.h (3)
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
Takashi Sawanaka [Wed, 12 May 2021 12:32:00 +0000 (21:32 +0900)]
Fix issue #785: Unable to modify WinMerge.txt
Takashi Sawanaka [Tue, 11 May 2021 14:45:09 +0000 (23:45 +0900)]
Add WinMergePluginBase.h (2)
Takashi Sawanaka [Mon, 10 May 2021 00:24:32 +0000 (09:24 +0900)]
Add WinMergePluginBase.h
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.
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
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.
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.
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)
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.
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
Takashi Sawanaka [Thu, 6 May 2021 23:46:51 +0000 (08:46 +0900)]
Add Testing/Data/Compare/Dir?/file123_0x00-0xff.txt
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.
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.
Takashi Sawanaka [Wed, 5 May 2021 13:38:48 +0000 (22:38 +0900)]
Generate Unpacker Plugins from Editor script functions
Takashi Sawanaka [Wed, 5 May 2021 13:35:46 +0000 (22:35 +0900)]
UniFile.*: Add ReadStringAll(), GetBase() and GetFileSize() function
Takashi Sawanaka [Wed, 5 May 2021 12:35:12 +0000 (21:35 +0900)]
GuessCodepageEncoding() -> codepage_detect::Guess()
Takashi Sawanaka [Wed, 5 May 2021 06:26:21 +0000 (15:26 +0900)]
Fix osdn.net #42179: Thicken the caret in overwrite mode
Takashi Sawanaka [Tue, 4 May 2021 01:13:16 +0000 (10:13 +0900)]
IniOptionsMgr.*: Reduce the number of reads from the INI file (2)
Takashi Sawanaka [Mon, 3 May 2021 02:37:03 +0000 (11:37 +0900)]
IniOptionsMgr.*: Reduce the number of reads from the INI file
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.)
Takashi Sawanaka [Sat, 1 May 2021 01:53:34 +0000 (10:53 +0900)]
refactor
Mirosław Żylewicz [Fri, 30 Apr 2021 22:58:46 +0000 (00:58 +0200)]
Update Polish.po (#769)
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
Takashi Sawanaka [Fri, 30 Apr 2021 15:15:03 +0000 (00:15 +0900)]
Avoid an assertion failure when loading settings from winmerge.ini
Takashi Sawanaka [Fri, 30 Apr 2021 15:06:20 +0000 (00:06 +0900)]
Update Russian.po
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.*
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.
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)
slolo2000 [Thu, 29 Apr 2021 22:51:01 +0000 (00:51 +0200)]
Update French translation (#762)
wvxwxvw [Thu, 29 Apr 2021 22:50:34 +0000 (01:50 +0300)]
Update Russian.po (#761)
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
Takashi Sawanaka [Thu, 29 Apr 2021 00:55:12 +0000 (09:55 +0900)]
Bump revision to 2.16.12.0
Takashi Sawanaka [Thu, 29 Apr 2021 00:20:57 +0000 (09:20 +0900)]
Update changelog&releasenotes
Takashi Sawanaka [Wed, 28 Apr 2021 23:21:04 +0000 (08:21 +0900)]
Fix a rare crash when enabling syntax highlighting
Takashi Sawanaka [Wed, 28 Apr 2021 15:41:34 +0000 (00:41 +0900)]
Fix inline scripts in HTML file not being properly highlighted.
Takashi Sawanaka [Wed, 28 Apr 2021 14:18:17 +0000 (23:18 +0900)]
Fix 'Automatic Rescan' not working after splitting panes
Takashi Sawanaka [Wed, 28 Apr 2021 13:51:10 +0000 (22:51 +0900)]
Update manual
Takashi Sawanaka [Tue, 27 Apr 2021 13:12:50 +0000 (22:12 +0900)]
Update TranslationsStatus.*
Takashi Sawanaka [Tue, 27 Apr 2021 13:06:20 +0000 (22:06 +0900)]
Update changelog&releasenotes
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.
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
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)
Tichij [Mon, 26 Apr 2021 12:09:08 +0000 (15:09 +0300)]
Update of Lithuanian translation (#754)
Michał Lipok [Mon, 26 Apr 2021 12:08:35 +0000 (14:08 +0200)]
autoit.cpp - #CS #CE support (#753)
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.
Takashi Sawanaka [Sun, 25 Apr 2021 12:23:53 +0000 (21:23 +0900)]
Update to winimerge 1.0.27.0
Takashi Sawanaka [Sun, 25 Apr 2021 08:46:04 +0000 (17:46 +0900)]
Update Slovenian translation. Submitted by JadranR
Mr-Update [Sun, 25 Apr 2021 08:43:16 +0000 (10:43 +0200)]
Update German.po (#752)
Translation completed
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.)
Takashi Sawanaka [Fri, 23 Apr 2021 22:36:48 +0000 (07:36 +0900)]
autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749) (2)
Michał Lipok [Fri, 23 Apr 2021 22:13:37 +0000 (00:13 +0200)]
autoit.cpp - Macros >> User 1 ..... Variable >> User 2 (#749)
Takashi Sawanaka [Fri, 23 Apr 2021 13:23:50 +0000 (22:23 +0900)]
Fix osdn.net ticket #42064: Fix conflicting accelerators
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
Takashi Sawanaka [Thu, 22 Apr 2021 12:06:26 +0000 (21:06 +0900)]
Binary compare window: Fix the problem that only one pane is zoomed in/out in Ctrl+Mouse Wheel
Takashi Sawanaka [Wed, 21 Apr 2021 14:17:41 +0000 (23:17 +0900)]
MergeEditView.cpp: Fix an issue where font size restoration with Ctrl + 0 did not work properly in Hi-DPI environment
Takashi Sawanaka [Wed, 21 Apr 2021 13:50:40 +0000 (22:50 +0900)]
MergeStatusBar.cpp: Fix an issue where the position of each pane in the status bar was not calculated correctly when the width of the panes was reduced.
Takashi Sawanaka [Wed, 21 Apr 2021 13:45:47 +0000 (22:45 +0900)]
refactor
Takashi Sawanaka [Tue, 20 Apr 2021 14:09:24 +0000 (23:09 +0900)]
refactor
Takashi Sawanaka [Tue, 20 Apr 2021 14:07:55 +0000 (23:07 +0900)]
"with External Editor" -> "With External Editor"
Takashi Sawanaka [Tue, 20 Apr 2021 12:40:52 +0000 (21:40 +0900)]
Add "Open Parent Folder" menu item to the file compare window's context menu
Takashi Sawanaka [Mon, 19 Apr 2021 12:22:22 +0000 (21:22 +0900)]
Fix GitHub issue #739: Copy confirmation dialog has overlapped Yes/No Button
Tichij [Mon, 19 Apr 2021 12:19:23 +0000 (15:19 +0300)]
Update of Lithuanian translation (#738)
LMS [Sun, 18 Apr 2021 22:24:54 +0000 (00:24 +0200)]
Galician translation update (#737)
* Update Galician.po
* Update Galician.po
* Update Galician.po
Galician translation update and corrections
* Galician translation update
* Galician translation update
Takashi Sawanaka [Sun, 18 Apr 2021 15:10:06 +0000 (00:10 +0900)]
SubstitutionFiltersList.cpp: Fix an issue where strings matching a regular expression in a multi-line diff block would not be replaced correctly if the substitution filters' regular expression contained ^.
Takashi Sawanaka [Sun, 18 Apr 2021 13:21:32 +0000 (22:21 +0900)]
crystaledit: Use structured bindings
Takashi Sawanaka [Sun, 18 Apr 2021 06:53:46 +0000 (15:53 +0900)]
Implement GitHub #135: [Feature Request] Selection Count on Status Bar
Takashi Sawanaka [Sun, 18 Apr 2021 06:29:10 +0000 (15:29 +0900)]
Update DownloadDeps.cmd
Takashi Sawanaka [Sat, 17 Apr 2021 10:32:35 +0000 (19:32 +0900)]
crystaledit: Make the characters that represent spaces and tabs lighter than other characters when the "View Whitespace" menu item is enabled
Takashi Sawanaka [Wed, 14 Apr 2021 22:57:57 +0000 (07:57 +0900)]
Update translations
Takashi Sawanaka [Wed, 14 Apr 2021 22:57:28 +0000 (07:57 +0900)]
Brazilian.isl: The encoding of the isl file must match the LanguageCodePage (1252) in the [LangOptions] section.
Felipe [Wed, 14 Apr 2021 22:47:46 +0000 (19:47 -0300)]
Update Brazilian.isl (#729)
Felipe [Wed, 14 Apr 2021 22:47:06 +0000 (19:47 -0300)]
Update Brazilian.po (#728)
Updated the translation here because the .po/.pot files found here are reported as corrupted by poedit https://winmerge.org/translations/?lang=en
Hugo Carvalho [Sat, 10 Apr 2021 18:19:17 +0000 (19:19 +0100)]
Update Portuguese.po (#725)
* Update Portuguese
* Add files via upload
Co-authored-by: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Jun Tajima [Sat, 10 Apr 2021 18:11:31 +0000 (03:11 +0900)]
Update PHP syntax highlighting keyword list. (#724)
- Added some keywords
- Modify the list grouping as described in the PHP documentation. (https://www.php.net/manual/en/reserved.php)
Takashi Sawanaka [Sat, 10 Apr 2021 07:20:04 +0000 (16:20 +0900)]
Fix GitHub issue #721: FR: Add a shortcut key go to next file (2)
pgert [Sat, 10 Apr 2021 07:08:07 +0000 (09:08 +0200)]
Minor update of Swedish translation (#723)
Takashi Sawanaka [Sat, 10 Apr 2021 07:07:36 +0000 (16:07 +0900)]
Fix GitHub issue #721: FR: Add a shortcut key go to next file
Takashi Sawanaka [Sat, 10 Apr 2021 04:59:55 +0000 (13:59 +0900)]
Delete the last blank line in the .po file.
Takashi Sawanaka [Sat, 10 Apr 2021 04:19:09 +0000 (13:19 +0900)]
Update translations
pgert [Sat, 10 Apr 2021 04:12:21 +0000 (06:12 +0200)]
GUI textstrings: grammatical corrections (#722)
Takashi Sawanaka [Sat, 10 Apr 2021 03:28:57 +0000 (12:28 +0900)]
Fix compilation warnings
Takashi Sawanaka [Sat, 10 Apr 2021 00:24:56 +0000 (09:24 +0900)]
Fix that the Next File or Previous File button on the toolbar did not work if the active window was a binary compare window or an image compare window.
Takashi Sawanaka [Thu, 8 Apr 2021 14:17:06 +0000 (23:17 +0900)]
Update TranslationsStatus.*
pgert [Thu, 8 Apr 2021 14:11:47 +0000 (16:11 +0200)]
Update & Improvements of Swedish translation (#720)
Takashi Sawanaka [Thu, 8 Apr 2021 12:35:59 +0000 (21:35 +0900)]
Add ARM64 support (4)
Rodrigo Cesar [Tue, 6 Apr 2021 23:52:37 +0000 (20:52 -0300)]
Add C# 6.0 reserved words to style list (#719)
Takashi Sawanaka [Mon, 5 Apr 2021 13:10:58 +0000 (22:10 +0900)]
OpenView.cpp: Make the archive files comparable as binary files.