OSDN Git Service

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

4 years agoCppcheck: Condition '...' is always true
Takashi Sawanaka [Wed, 6 May 2020 12:51:22 +0000 (21:51 +0900)]
Cppcheck: Condition '...' is always true

4 years agocrystaledit: remove cregexp_pcre.cpp
Takashi Sawanaka [Wed, 6 May 2020 12:38:57 +0000 (21:38 +0900)]
crystaledit: remove cregexp_pcre.cpp

4 years agocrystaledit: cregexp.cpp: Reduce warnings
Takashi Sawanaka [Wed, 6 May 2020 12:38:12 +0000 (21:38 +0900)]
crystaledit: cregexp.cpp: Reduce warnings

4 years agoCppcheck: Variable 'A' is reassigned a value before the old one has been used.
Takashi Sawanaka [Wed, 6 May 2020 12:33:02 +0000 (21:33 +0900)]
Cppcheck: Variable 'A' is reassigned a value before the old one has been used.

4 years agoCppcheck: Parameter '...' can be declared with const
Takashi Sawanaka [Wed, 6 May 2020 11:56:14 +0000 (20:56 +0900)]
Cppcheck: Parameter '...' can be declared with const

4 years agoCppcheck: Due to security concerns it is not recommended to use this function, see...
Takashi Sawanaka [Wed, 6 May 2020 11:53:58 +0000 (20:53 +0900)]
Cppcheck: Due to security concerns it is not recommended to use this function, see MSDN for details.

4 years agoCppcheck: C-style pointer casting
Takashi Sawanaka [Wed, 6 May 2020 11:47:48 +0000 (20:47 +0900)]
Cppcheck: C-style pointer casting

4 years agoCppcheck: The function '...' overrides a function in a base class but is not marked...
Takashi Sawanaka [Wed, 6 May 2020 11:35:24 +0000 (20:35 +0900)]
Cppcheck: The function '...' overrides a function in a base class but is not marked with a 'override' specifier.

4 years agoCppcheck: Class '...' has a constructor with 1 argument that is not explicit.
Takashi Sawanaka [Wed, 6 May 2020 11:27:07 +0000 (20:27 +0900)]
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.

4 years agocrystaledit: Organize the directory structure (2)
Takashi Sawanaka [Wed, 6 May 2020 09:44:29 +0000 (18:44 +0900)]
crystaledit: Organize the directory structure (2)

4 years agocrystaledit/Sample: Fix incorrect saving in the Unicode version
Takashi Sawanaka [Wed, 6 May 2020 01:43:54 +0000 (10:43 +0900)]
crystaledit/Sample: Fix incorrect saving in the Unicode version

4 years agocrystaledit: Refactor the duplicate code found in PMD Duplicate Code Detector
Takashi Sawanaka [Tue, 5 May 2020 14:57:25 +0000 (23:57 +0900)]
crystaledit: Refactor the duplicate code found in PMD Duplicate Code Detector

4 years agoUpdate Galician.po
Takashi Sawanaka [Tue, 5 May 2020 12:02:10 +0000 (21:02 +0900)]
Update Galician.po

4 years agocrystaledit: Organize the directory structure
Takashi Sawanaka [Tue, 5 May 2020 12:01:54 +0000 (21:01 +0900)]
crystaledit: Organize the directory structure

4 years agocrystaledit: Make almost the same code into a common function
Takashi Sawanaka [Tue, 5 May 2020 09:33:29 +0000 (18:33 +0900)]
crystaledit: Make almost the same code into a common function

4 years agocrystaledit: replace tabs with spaces
Takashi Sawanaka [Tue, 5 May 2020 05:38:16 +0000 (14:38 +0900)]
crystaledit: replace tabs with spaces

4 years agocrystaledit/Sample: Remove *inl files from project files
Takashi Sawanaka [Tue, 5 May 2020 05:33:40 +0000 (14:33 +0900)]
crystaledit/Sample: Remove *inl files from project files

4 years agoMerge pull request #334 from qosobrin/master
Takashi Sawanaka [Tue, 5 May 2020 00:23:59 +0000 (09:23 +0900)]
Merge pull request #334 from qosobrin/master

Galician translation update

4 years agoGalician translation update
LMS [Mon, 4 May 2020 21:51:21 +0000 (23:51 +0200)]
Galician translation update

4 years agoMerge pull request #4 from WinMerge/master
LMS [Mon, 4 May 2020 09:04:53 +0000 (11:04 +0200)]
Merge pull request #4 from WinMerge/master

Puesta al día de los ficheros

4 years agoMerge pull request #333 from Tichij/master
Takashi Sawanaka [Mon, 4 May 2020 06:12:40 +0000 (15:12 +0900)]
Merge pull request #333 from Tichij/master

Update of Lithuanian translation

4 years agoUpdate of Lithuanian translation
Tichij [Mon, 4 May 2020 05:42:48 +0000 (08:42 +0300)]
Update of Lithuanian translation

4 years agoGitHub issue #332: Fix the problem that the item of the folder comparison window...
Takashi Sawanaka [Mon, 4 May 2020 03:55:42 +0000 (12:55 +0900)]
GitHub issue #332: Fix the problem that the item of the folder comparison window is not updated at the following operation.

1. Open a file name pair that does not exactly match (e.g., different case) from the folder comparison window
2. Edit it to make a different comparison than before
3. Save the edited file

4 years agocrystaledit/Sample: Do not be asked to save when closing the file after undoing the...
Takashi Sawanaka [Mon, 4 May 2020 01:05:55 +0000 (10:05 +0900)]
crystaledit/Sample: Do not be asked to save when closing the file after undoing the modified document.

4 years agoFix a bug that some characters are not displayed in ANSI build
Takashi Sawanaka [Sun, 3 May 2020 23:29:42 +0000 (08:29 +0900)]
Fix a bug that some characters are not displayed in ANSI build

4 years agoReduce compilation warnings
Takashi Sawanaka [Sun, 3 May 2020 23:26:32 +0000 (08:26 +0900)]
Reduce compilation warnings

4 years agoMerge pull request #331 from tjmprm77/feature/generate_patch_from_directories
Takashi Sawanaka [Sun, 3 May 2020 22:00:52 +0000 (07:00 +0900)]
Merge pull request #331 from tjmprm77/feature/generate_patch_from_directories

Add a feature generating a patch from directories (#283)

4 years agoAdd a feature generating a patch from directories (#283)
Jun Tajima [Sun, 3 May 2020 15:39:37 +0000 (00:39 +0900)]
Add a feature generating a patch from directories (#283)

- Add a feature generating a patch from directories.
- Remove some processing that abort patch generation when attempting to generate a patch from directories.
- Change to open a file or directory selection dialog when clicking [Browse...] buttons in [Patch Generator] dialog.
- Change the behavior if the input is a binary file as follows:
  - Processing is not aborted but continued.
  - "Cannot create a patch file from binary files." message is shown once only at the first time per patch generation process.
  - Even if "Cannot create a patch file from binary files." message is shown, if patch generation succeed for other regular files, "Patch file successfully written." messages is shown.

4 years agocrystaledit/Sample: Add shortcut keys and menu items for various hidden funtions
Takashi Sawanaka [Sun, 3 May 2020 13:09:10 +0000 (22:09 +0900)]
crystaledit/Sample: Add shortcut keys and menu items for various hidden  funtions

4 years agocrystaledit: Fix crash in auto completion
Takashi Sawanaka [Sun, 3 May 2020 08:56:30 +0000 (17:56 +0900)]
crystaledit: Fix crash in auto completion

4 years agocrystaledit: Remove statbar.*
Takashi Sawanaka [Sat, 2 May 2020 23:54:58 +0000 (08:54 +0900)]
crystaledit: Remove statbar.*

4 years agocrystaledit: Remove splash.*
Takashi Sawanaka [Sat, 2 May 2020 14:19:01 +0000 (23:19 +0900)]
crystaledit: Remove splash.*

4 years agoSynaxColors.h: Use std::array instead of std::vector, since the sizes of m_colors...
Takashi Sawanaka [Sat, 2 May 2020 13:51:38 +0000 (22:51 +0900)]
SynaxColors.h: Use std::array instead of std::vector, since the sizes of m_colors and m_bolds are fixed length.

4 years agocrystaledit: Remove unnecessary nullptr checks
Takashi Sawanaka [Sat, 2 May 2020 13:51:18 +0000 (22:51 +0900)]
crystaledit: Remove unnecessary nullptr checks

4 years agoSample.rc: Fix F3 key presses that have no effect.
Takashi Sawanaka [Sat, 2 May 2020 11:11:51 +0000 (20:11 +0900)]
Sample.rc: Fix F3 key presses that have no effect.

4 years agoccrystaltextview.cpp:
Takashi Sawanaka [Sat, 2 May 2020 11:07:01 +0000 (20:07 +0900)]
ccrystaltextview.cpp:
- Fix the problem that searches do not work on lines containing NUL characters.
- Fix memory leak

4 years agocrystalparser.cpp: Fix word wrapping in lines containing control characters that...
Takashi Sawanaka [Sat, 2 May 2020 11:05:33 +0000 (20:05 +0900)]
crystalparser.cpp: Fix word wrapping in lines containing control characters that did not work properly.

4 years agoccrystalrendererdirectwrite.cpp: A temporary workaround for a crash when displaying...
Takashi Sawanaka [Sat, 2 May 2020 11:02:28 +0000 (20:02 +0900)]
ccrystalrendererdirectwrite.cpp: A temporary workaround for a crash when displaying binary files.
It needs to investigate.

4 years agocrystaledit/Sample:
Takashi Sawanaka [Fri, 1 May 2020 13:32:24 +0000 (22:32 +0900)]
crystaledit/Sample:
- Fix compilation errors on non-Unicode build
- Reduce warnings
- Read a text file in UTF-8

4 years agocrystaledit/Sample: Fix warning C4996: 'CWinApp::Enable3dControls': CWinApp::Enable3d...
Takashi Sawanaka [Fri, 1 May 2020 11:04:59 +0000 (20:04 +0900)]
crystaledit/Sample: Fix warning C4996: 'CWinApp::Enable3dControls': CWinApp::Enable3dControls is no longer needed. You should remove this call.

4 years agoUpdate Russian.po
Takashi Sawanaka [Fri, 1 May 2020 08:02:47 +0000 (17:02 +0900)]
Update Russian.po

4 years agoFix build error
Takashi Sawanaka [Fri, 1 May 2020 08:02:34 +0000 (17:02 +0900)]
Fix build error

4 years agowcwidth.cpp: Update to jquast wcwidth 0.1.9
Takashi Sawanaka [Fri, 1 May 2020 07:55:20 +0000 (16:55 +0900)]
wcwidth.cpp: Update to jquast wcwidth 0.1.9

4 years agoGitHub issue #315: Compile WinMerge with ASLR and CFG enabled
Takashi Sawanaka [Fri, 1 May 2020 03:53:17 +0000 (12:53 +0900)]
GitHub issue #315: Compile WinMerge with ASLR and CFG enabled

4 years agoMerge pull request #3 from WinMerge/master
LMS [Thu, 30 Apr 2020 21:12:56 +0000 (23:12 +0200)]
Merge pull request #3 from WinMerge/master

Puesta al día del clonado

4 years agoMerge pull request #328 from wvxwxvw/patch-3
Takashi Sawanaka [Thu, 30 Apr 2020 05:26:03 +0000 (14:26 +0900)]
Merge pull request #328 from wvxwxvw/patch-3

Update Russian.po

4 years agoUpdate Russian.po
wvxwxvw [Thu, 30 Apr 2020 05:08:05 +0000 (08:08 +0300)]
Update Russian.po

4 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Thu, 30 Apr 2020 04:26:48 +0000 (13:26 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

4 years agoMerge pull request #327 from wvxwxvw/patch-2
Takashi Sawanaka [Thu, 30 Apr 2020 04:26:26 +0000 (13:26 +0900)]
Merge pull request #327 from wvxwxvw/patch-2

Update Russian.po

4 years agoWhen comparing large files, display a message box asking if you want to see only...
Takashi Sawanaka [Thu, 30 Apr 2020 04:25:49 +0000 (13:25 +0900)]
When comparing large files, display a message box asking if you want to see only the results of the comparison, not the contents of the files.
If you choose to display only the results of the comparison, WinMerge uses less memory because it does the comparison in the same way as a folder comparison.

ref issue #325

4 years agoUpdate Russian.po
wvxwxvw [Thu, 30 Apr 2020 01:02:39 +0000 (04:02 +0300)]
Update Russian.po

4 years agoMerge pull request #326 from qosobrin/master
Takashi Sawanaka [Mon, 27 Apr 2020 22:53:46 +0000 (07:53 +0900)]
Merge pull request #326 from qosobrin/master

Galician translation update

4 years agoGalician translation update
qosobrin [Mon, 27 Apr 2020 07:52:39 +0000 (09:52 +0200)]
Galician translation update

4 years agoUpdate frhed to 0.10904.2017.4
Takashi Sawanaka [Sun, 26 Apr 2020 14:12:32 +0000 (23:12 +0900)]
Update frhed to 0.10904.2017.4

4 years agoUpdate Contributors.txt
Takashi Sawanaka [Sun, 26 Apr 2020 14:11:29 +0000 (23:11 +0900)]
Update Contributors.txt

4 years agoFix memory leak
Takashi Sawanaka [Sat, 25 Apr 2020 12:45:25 +0000 (21:45 +0900)]
Fix memory leak

4 years agoFolderCompare: Fix crash when clicking [Merge]-> [Delete] menu item while renaming...
Takashi Sawanaka [Sat, 25 Apr 2020 10:55:54 +0000 (19:55 +0900)]
FolderCompare: Fix crash when clicking [Merge]-> [Delete] menu item while renaming a file

4 years agoMerge pull request #2 from WinMerge/master
LMS [Sat, 25 Apr 2020 10:18:45 +0000 (12:18 +0200)]
Merge pull request #2 from WinMerge/master

Puesta al día del clonado

4 years agoUpdate .gitignore
Takashi Sawanaka [Sat, 25 Apr 2020 05:53:22 +0000 (14:53 +0900)]
Update .gitignore

4 years agocrystaledit/Sample: Fix buid error
Takashi Sawanaka [Sat, 25 Apr 2020 05:52:57 +0000 (14:52 +0900)]
crystaledit/Sample: Fix buid error

4 years agoFix GitHub issue #320: Codepage not updated on refresh
Takashi Sawanaka [Sat, 25 Apr 2020 04:15:14 +0000 (13:15 +0900)]
Fix GitHub issue #320: Codepage not updated on refresh

4 years agoUpdate .gitignore
Takashi Sawanaka [Sat, 25 Apr 2020 01:59:11 +0000 (10:59 +0900)]
Update .gitignore

4 years agoFix GitHub issue #314: The markers utility has a drop-down menu that is not internati...
Takashi Sawanaka [Sat, 25 Apr 2020 01:56:15 +0000 (10:56 +0900)]
Fix GitHub issue #314: The markers utility has a drop-down menu that is not internationalizeda

4 years agoImageComapre:
Takashi Sawanaka [Sat, 25 Apr 2020 01:30:05 +0000 (10:30 +0900)]
ImageComapre:
- Make Location Pane translatable
- Add two dragging modes (vertical wipe and horizontal wipe)

4 years agoFix sf.net ticket #2236: PreDiffLineFilter
Takashi Sawanaka [Sat, 25 Apr 2020 01:17:10 +0000 (10:17 +0900)]
Fix sf.net ticket #2236: PreDiffLineFilter

4 years agoAdd "Enable image compare in folder compare" option to Options dialog (2)
Takashi Sawanaka [Wed, 22 Apr 2020 14:03:22 +0000 (23:03 +0900)]
Add "Enable image compare in folder compare" option to Options dialog (2)

4 years agoFix Github issue #316: GUI glitches/bugs #2
Takashi Sawanaka [Wed, 22 Apr 2020 09:02:25 +0000 (18:02 +0900)]
Fix Github issue #316: GUI glitches/bugs #2