OSDN Git Service
Takashi Sawanaka [Sun, 10 Jan 2021 12:31:59 +0000 (21:31 +0900)]
Merge remote-tracking branch 'origin/stable'
Takashi Sawanaka [Sun, 10 Jan 2021 12:31:19 +0000 (21:31 +0900)]
Update changelog&releasenotes
Takashi Sawanaka [Sun, 10 Jan 2021 06:51:51 +0000 (15:51 +0900)]
Merge branch 'stable' of c:\dev\winmerge-stable
# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
Takashi Sawanaka [Sun, 10 Jan 2021 06:50:38 +0000 (15:50 +0900)]
Fix issue #354: Installation - Internal error: Failed to expand shell folder constant "userdesktop" (2)
Takashi Sawanaka [Sun, 10 Jan 2021 06:12:39 +0000 (15:12 +0900)]
Installer: Stop adding "WinMerge on the Web" to the start menu as Norton Internet Security complains.
(cherry picked from commit
78e28784fe3faec2808758f7c2e3d74edac4aed0)
Takashi Sawanaka [Sun, 10 Jan 2021 06:12:39 +0000 (15:12 +0900)]
Installer: Stop adding "WinMerge on the Web" to the start menu as Norton Internet Security complains.
Takashi Sawanaka [Sun, 10 Jan 2021 05:59:52 +0000 (14:59 +0900)]
Update translations
Takashi Sawanaka [Sat, 9 Jan 2021 13:22:01 +0000 (22:22 +0900)]
Merge.rc: Make untranslated strings translated
Takashi Sawanaka [Sat, 9 Jan 2021 01:27:37 +0000 (10:27 +0900)]
Update Manual (#546) (2)
(cherry picked from commit
471442398a6626335d3739245c445a64850c4c76)
Mr-Update [Fri, 8 Jan 2021 23:41:10 +0000 (00:41 +0100)]
Update Manual (#546)
* Update Command_line.xml
* Update Compare_dirs.xml
* Update Compare_files.xml
* Update Compare_images.xml
* Update Configuration.xml
* Update Filters.xml
* Update Intro_diffs.xml
* Update Introduction.xml
* Update Open_paths.xml
(cherry picked from commit
fe6714ee2f1b0fab7a9c9747f547b49f958d8dce)
Takashi Sawanaka [Fri, 8 Jan 2021 22:20:40 +0000 (07:20 +0900)]
Add File->New->Table menu item (2)
(cherry picked from commit
d85cea9a3096bb3c2566593173a61b24e41747f2)
Takashi Sawanaka [Fri, 8 Jan 2021 22:18:13 +0000 (07:18 +0900)]
Rename New3_16.bmp to new3.bmp
(cherry picked from commit
95db4dd5519ff2816d2719c11d906eae4a90872a)
GreyMerlin [Fri, 8 Jan 2021 18:00:20 +0000 (10:00 -0800)]
Fix Failures with GuiTests `InstallerTest` module
* If the `...-x64-PerUser-Setup.exe` file is missing from the `Build/` folder tree, then GuiTests
fails with
a) a system message box suggesting a file name misspelling, plus
b) seven ASSERT failures that have to be manually Ignored
* This patch allows GuiTests to detect the missing file itself and cause a proper GTEST_FAIL()
action.
* The filename for the Setup.exe file is upgraded from version `2.16.7.0` to `2.16.8` (the latest
publicly available setup file that I could find)
(cherry picked from commit
69c9faee1f8d2e335427cb320f5c369ca2335ddf)
GreyMerlin [Fri, 8 Jan 2021 17:38:39 +0000 (09:38 -0800)]
Fix syntax errors with `Test` solution configuration
(cherry picked from commit
721a7f39f78a7d62ba99b2de68c5ac862bad58b5)
GreyMerlin [Fri, 8 Jan 2021 17:25:51 +0000 (09:25 -0800)]
?? Bring FreeImage submodule into sync ??
* I have no idea why Git thinks this is necessary
(cherry picked from commit
950acb127e095dba5c488f504b7c7ac8328dcdd4)
Takashi Sawanaka [Sat, 9 Jan 2021 11:16:02 +0000 (20:16 +0900)]
fine-tune
Takashi Sawanaka [Sat, 9 Jan 2021 02:13:28 +0000 (11:13 +0900)]
Added a new feature "Ignored Substitutions", which are the changes that will be ignored by diff panes. (#544) (3)
Takashi Sawanaka [Sat, 9 Jan 2021 01:50:39 +0000 (10:50 +0900)]
GitHub issue #522: Feature: markings in all panels (2)
Takashi Sawanaka [Sat, 9 Jan 2021 01:27:37 +0000 (10:27 +0900)]
Update Manual (#546) (2)
Mr-Update [Fri, 8 Jan 2021 23:41:10 +0000 (00:41 +0100)]
Update Manual (#546)
* Update Command_line.xml
* Update Compare_dirs.xml
* Update Compare_files.xml
* Update Compare_images.xml
* Update Configuration.xml
* Update Filters.xml
* Update Intro_diffs.xml
* Update Introduction.xml
* Update Open_paths.xml
Takashi Sawanaka [Fri, 8 Jan 2021 22:27:51 +0000 (07:27 +0900)]
Added a new feature "Ignored Substitutions", which are the changes that will be ignored by diff panes. (#544) (2)
Takashi Sawanaka [Fri, 8 Jan 2021 22:20:40 +0000 (07:20 +0900)]
Add File->New->Table menu item (2)
Takashi Sawanaka [Fri, 8 Jan 2021 22:18:13 +0000 (07:18 +0900)]
Rename New3_16.bmp to new3.bmp
Takashi Sawanaka [Fri, 8 Jan 2021 22:17:21 +0000 (07:17 +0900)]
Merge pull request #545 from GreyMerlin/master
Various fixes to testing
EugeneLaptev [Fri, 8 Jan 2021 22:16:23 +0000 (22:16 +0000)]
Added a new feature "Ignored Substitutions", which are the changes that will be ignored by diff panes. (#544)
Co-authored-by: EugeneSumo <40354914+EugeneSumo@users.noreply.github.com>
GreyMerlin [Fri, 8 Jan 2021 18:00:20 +0000 (10:00 -0800)]
Fix Failures with GuiTests `InstallerTest` module
* If the `...-x64-PerUser-Setup.exe` file is missing from the `Build/` folder tree, then GuiTests
fails with
a) a system message box suggesting a file name misspelling, plus
b) seven ASSERT failures that have to be manually Ignored
* This patch allows GuiTests to detect the missing file itself and cause a proper GTEST_FAIL()
action.
* The filename for the Setup.exe file is upgraded from version `2.16.7.0` to `2.16.8` (the latest
publicly available setup file that I could find)
GreyMerlin [Fri, 8 Jan 2021 17:38:39 +0000 (09:38 -0800)]
Fix syntax errors with `Test` solution configuration
GreyMerlin [Fri, 8 Jan 2021 17:25:51 +0000 (09:25 -0800)]
?? Bring FreeImage submodule into sync ??
* I have no idea why Git thinks this is necessary
Takashi Sawanaka [Fri, 8 Jan 2021 13:08:08 +0000 (22:08 +0900)]
StringBlacklist.txt: Add AutoIt, JavaScript, Lua and VHDL
Takashi Sawanaka [Fri, 8 Jan 2021 00:24:17 +0000 (09:24 +0900)]
Add File->New->Table menu item
Takashi Sawanaka [Thu, 7 Jan 2021 23:35:05 +0000 (08:35 +0900)]
Update copyright year
Takashi Sawanaka [Thu, 7 Jan 2021 23:15:38 +0000 (08:15 +0900)]
MainFrm.cpp: Fix an issue where items are not displayed in the Recent Files or Folders menu.
Takashi Sawanaka [Thu, 7 Jan 2021 13:20:20 +0000 (22:20 +0900)]
Fix GitHub issue #537: Copy Folder does not copy subfolders and I don't see any option for it
Takashi Sawanaka [Thu, 7 Jan 2021 12:01:50 +0000 (21:01 +0900)]
WIP: Add syntax highlighter for AutoIt
Takashi Sawanaka [Thu, 7 Jan 2021 11:56:52 +0000 (20:56 +0900)]
editlib/Sample: Fix a compilation error
Michał Lipok [Thu, 7 Jan 2021 11:36:20 +0000 (12:36 +0100)]
Update crystallineparser.cpp (#543)
solution to:
https://github.com/WinMerge/winmerge/issues/446
as discussed here:
https://github.com/WinMerge/winmerge/discussions/542
Takashi Sawanaka [Wed, 6 Jan 2021 11:50:35 +0000 (20:50 +0900)]
Fix "C4551: function call missing argument list" warning (2)
Takashi Sawanaka [Tue, 5 Jan 2021 11:43:25 +0000 (20:43 +0900)]
Merge pull request #539 from GreyMerlin/master
Fix Various Warnings
Takashi Sawanaka [Mon, 4 Jan 2021 23:04:38 +0000 (08:04 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 4 Jan 2021 22:51:07 +0000 (07:51 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 4 Jan 2021 22:50:14 +0000 (07:50 +0900)]
Update Galician.po (#538)
Takashi Sawanaka [Mon, 4 Jan 2021 22:45:48 +0000 (07:45 +0900)]
MergeLang.vs*.vcxproj.*: Add *.po files
Takashi Sawanaka [Mon, 4 Jan 2021 22:43:31 +0000 (07:43 +0900)]
Update Galician.po (#538)
LMS [Mon, 4 Jan 2021 22:39:47 +0000 (23:39 +0100)]
Galician translation update (#538)
GreyMerlin [Mon, 4 Jan 2021 17:17:35 +0000 (09:17 -0800)]
Fix "LNT1000: A sub-expression may overflow before being assigned to a wider type" warning
* Also fix a trivial spelling error in an unrelated comment
GreyMerlin [Mon, 4 Jan 2021 17:10:37 +0000 (09:10 -0800)]
Fix various "LNT1006: Local Variable Not Initialized" warnings (2)
GreyMerlin [Mon, 4 Jan 2021 16:59:28 +0000 (08:59 -0800)]
Fix "C4551: function call missing argument list" warning
GreyMerlin [Mon, 4 Jan 2021 16:55:33 +0000 (08:55 -0800)]
Fix various "LNT1006: Local Variable Not Initialized" warnings
GreyMerlin [Mon, 4 Jan 2021 16:50:43 +0000 (08:50 -0800)]
Fix various "C26819: Unannotated fallthrough between switch labels" warnings
Takashi Sawanaka [Sat, 2 Jan 2021 14:11:09 +0000 (23:11 +0900)]
refactor
Takashi Sawanaka [Sat, 2 Jan 2021 13:17:10 +0000 (22:17 +0900)]
Fix command line option / x not working for binary and image comparison
Tichij [Sat, 2 Jan 2021 10:48:40 +0000 (12:48 +0200)]
Update of Lithuanian translation (#536)
Takashi Sawanaka [Sat, 2 Jan 2021 08:20:48 +0000 (17:20 +0900)]
Update TranslationStatus.(html|xml)
Takashi Sawanaka [Sat, 2 Jan 2021 08:20:24 +0000 (17:20 +0900)]
GitHub issue #530: [feature request] Add options to command line to change "compare methods" (2)
Takashi Sawanaka [Sat, 2 Jan 2021 06:37:53 +0000 (15:37 +0900)]
GitHub issue #530: [feature request] Add options to command line to change "compare methods"
Takashi Sawanaka [Sat, 2 Jan 2021 04:39:50 +0000 (13:39 +0900)]
Fix the scrolling position of the inactive window sometimes returning to the first line when pressing the F5 key while splitting the window.
ranjwarrior [Sat, 2 Jan 2021 04:06:57 +0000 (22:06 -0600)]
Making CPropertySheet resizable needs some re-work. For now resized the Line and File Filters dialog to be a bit wider and similarily sized. (#535)
Takashi Sawanaka [Sat, 2 Jan 2021 02:29:45 +0000 (11:29 +0900)]
Swap Panes functionality for 3 way compares (https://github.com/WinMerge/winmerge/issues/507) (#533) (2)
Takashi Sawanaka [Sat, 2 Jan 2021 02:04:25 +0000 (11:04 +0900)]
Fix Warning C26812: Prefer 'enum class' over 'enum' (Enum.3) (2)
Takashi Sawanaka [Sat, 2 Jan 2021 02:04:00 +0000 (11:04 +0900)]
Update translations
ranjwarrior [Fri, 1 Jan 2021 23:27:33 +0000 (17:27 -0600)]
Swap Panes functionality for 3 way compares (https://github.com/WinMerge/winmerge/issues/507) (#533)
Takashi Sawanaka [Fri, 1 Jan 2021 13:31:57 +0000 (22:31 +0900)]
Fix Warning C26812: Prefer 'enum class' over 'enum' (Enum.3)
Takashi Sawanaka [Fri, 1 Jan 2021 11:35:56 +0000 (20:35 +0900)]
Fix some warnings
Takashi Sawanaka [Fri, 1 Jan 2021 01:48:44 +0000 (10:48 +0900)]
Fix GitHub issue #531: WinMerge crashes with mouse double click (3)
Takashi Sawanaka [Fri, 1 Jan 2021 01:37:38 +0000 (10:37 +0900)]
Fix GitHub issue #531: WinMerge crashes with mouse double click (2)
Takashi Sawanaka [Fri, 1 Jan 2021 00:50:38 +0000 (09:50 +0900)]
Fix GitHub issue #531: WinMerge crashes with mouse double click
Mr-Update [Fri, 1 Jan 2021 00:23:36 +0000 (01:23 +0100)]
Update German.po (#532)
Translation completed
Takashi Sawanaka [Thu, 31 Dec 2020 12:50:40 +0000 (21:50 +0900)]
GitHub issue #522: Feature: markings in all panels
Takashi Sawanaka [Thu, 31 Dec 2020 10:41:43 +0000 (19:41 +0900)]
Add View->Diff Context->Invert menu item
Takashi Sawanaka [Thu, 31 Dec 2020 01:32:48 +0000 (10:32 +0900)]
MergeDoc.cpp: Remove unused variables
Takashi Sawanaka [Wed, 30 Dec 2020 08:06:37 +0000 (17:06 +0900)]
Update frhed
Takashi Sawanaka [Wed, 30 Dec 2020 02:48:12 +0000 (11:48 +0900)]
ImgMergeFrm: Change the tab bar icon when the file state changes
Takashi Sawanaka [Wed, 30 Dec 2020 01:03:48 +0000 (10:03 +0900)]
crystaledit: Separate JavaScript and Java parsers. osdn.net #41083
Takashi Sawanaka [Tue, 29 Dec 2020 10:18:30 +0000 (19:18 +0900)]
Add new icons for New -> Binary and New -> image menu items
Takashi Sawanaka [Tue, 29 Dec 2020 09:40:01 +0000 (18:40 +0900)]
ImgMergeFrm.cpp: Display the save dialog so that the contents of the unsaved file are not lost when opening the dragged and dropped file.
Takashi Sawanaka [Tue, 29 Dec 2020 09:36:59 +0000 (18:36 +0900)]
Update Slovenian.po
Takashi Sawanaka [Tue, 29 Dec 2020 08:16:38 +0000 (17:16 +0900)]
Update Slovenian translation. Submitted by Jadran Rudec
Tichij [Tue, 29 Dec 2020 07:04:25 +0000 (09:04 +0200)]
Update of Lithuanian translation (#528)
Takashi Sawanaka [Mon, 28 Dec 2020 15:13:33 +0000 (00:13 +0900)]
Update winimerge and freeimage
Takashi Sawanaka [Mon, 28 Dec 2020 14:30:13 +0000 (23:30 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Mon, 28 Dec 2020 14:18:25 +0000 (23:18 +0900)]
Implement copy and paste images (#524)
* WIP: Implement copy&paste images
* WIP: Implement copy&paste images (2)
* WIP: Implement copy&paste images (3)
* WIP: Implement copy&paste images (4)
* WIP: Implement copy&paste images (5)
* WIP: Implement copy&paste images (6)
* WIP: Implement copy&paste images (7)
* WIP: Implement copy&paste images (8)
Jun Tajima [Sat, 26 Dec 2020 16:53:54 +0000 (01:53 +0900)]
Fixed the problem that the language setting is not applied to the context menu of the MDI tab when the language setting is changed. (#523)
- The menus to be modified are as follows.
- Enable Auto Max Width
- Close Other Tabs
- Close Right Tabs
- Close Left Tabs
- Fixed to set the menu strings based on the language setting every time the context menu is displayed.
Takashi Sawanaka [Thu, 24 Dec 2020 23:51:16 +0000 (08:51 +0900)]
Fix GitHub issue #521: Crash when generating patch
Takashi Sawanaka [Mon, 21 Dec 2020 13:16:00 +0000 (22:16 +0900)]
WinMerge 2.16.x 32bit version probably only works on Windows XP SP3 and above
Rukoto Luther [Fri, 18 Dec 2020 11:26:35 +0000 (20:26 +0900)]
Update Japanese.po (#8)
(cherry picked from commit
551eb71f97093d960760843ba09f607190fce419)
Takashi Sawanaka [Thu, 17 Dec 2020 11:31:25 +0000 (20:31 +0900)]
Update translations
Mr-Update [Wed, 16 Dec 2020 22:28:43 +0000 (23:28 +0100)]
Update Manual (#513)
* Update README.md
* Add files via upload
* Update About_Doc.xml
* Update Command_line.xml
* Update Compare_dirs.xml
* Update Compare_files.xml
* Update Compare_images.xml
* Update Configuration.xml
* Update Faq.xml
* Update Open_paths.xml
* Update build_htmlhelp_en.bat
* Update build_htmlhelp_jp.bat
Tim Gerundt [Tue, 15 Dec 2020 23:29:10 +0000 (00:29 +0100)]
Small tweaks for the Manual (#508)
* Manual: Tweak introduction
* Use <note>
* Drop Experimental versions link
* Drop Version tree
* Link Source Code to website
* Manual: Link to version 2.16.8
* Manual: Don't need to copy "art" files anymore
* Manual: Add some descriptons for some folder compare options
* Manual: Switch to GitHub discussions
sdottaka [Sun, 13 Dec 2020 23:46:01 +0000 (08:46 +0900)]
Update translations
Takashi Sawanaka [Sun, 13 Dec 2020 02:01:41 +0000 (11:01 +0900)]
Update translations
Takashi Sawanaka [Sat, 12 Dec 2020 14:24:43 +0000 (23:24 +0900)]
Add the command line option "/s-" to ensure that another instance is always executed, ignoring the value of the 'Allow only one instance to run' option.
Takashi Sawanaka [Sat, 12 Dec 2020 11:19:44 +0000 (20:19 +0900)]
Update translations
Takashi Sawanaka [Sat, 12 Dec 2020 10:56:42 +0000 (19:56 +0900)]
Merge.rc: fine-tune
Jun Tajima [Sat, 12 Dec 2020 10:44:23 +0000 (19:44 +0900)]
Fixed processing that uses GetAsyncKeyState(). (#505)
- Fixed the behaviour in the function CMainFrame::OnDropFiles() that when drag and drop is performed after pressing the control key,
it behaves as if drag and drop is performed while pressing the control key.
- Fixed the behaviour in the function CImgMergeFrame::OnChildPaneEvent() that when an arrow key is pressed after pressing the shift key or control key,
it behaves as if the arrow key is pressed while pressing the shift key or control key.
Takashi Sawanaka [Sat, 5 Dec 2020 13:17:15 +0000 (22:17 +0900)]
Fix GitHub issue #498: The Location pane doesn't draw a line connecting moved differences by default
Takashi Sawanaka [Sat, 5 Dec 2020 11:12:39 +0000 (20:12 +0900)]
Cppcheck: Found calculation inside sizeof().
Takashi Sawanaka [Sat, 5 Dec 2020 11:00:48 +0000 (20:00 +0900)]
Cppcheck: The function 'IsIndentableLine' overrides a function in a base class but is not marked with a 'override' specifier.
Takashi Sawanaka [Sat, 5 Dec 2020 10:52:11 +0000 (19:52 +0900)]
Cppcheck: Member variable 'PropCompareImage::m_bEnableImageCompare' is not initialized in the constructor.
Takashi Sawanaka [Sat, 5 Dec 2020 10:32:47 +0000 (19:32 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Sat, 5 Dec 2020 10:25:23 +0000 (19:25 +0900)]
Remove unused function