OSDN Git Service
Kimmo Varis [Thu, 5 Jun 2008 16:57:46 +0000 (16:57 +0000)]
Bump ShellExtension version number to 1.14.1.
Kimmo Varis [Thu, 5 Jun 2008 16:52:51 +0000 (16:52 +0000)]
Fix project file for real now. Change precompiled headers creation setting to automatic for LineFiltersList. The setting was wrong for release targets.
Kimmo Varis [Thu, 5 Jun 2008 16:48:25 +0000 (16:48 +0000)]
Revert the previous change - it was just wrong to change precompiled headers globally!
Kimmo Varis [Thu, 5 Jun 2008 16:42:13 +0000 (16:42 +0000)]
Fix a typo.
Kimmo Varis [Thu, 5 Jun 2008 16:40:47 +0000 (16:40 +0000)]
Fix project file after earlier patch (Remove MFC dependency from LineFiltersList.h and LineFiltersList.cpp.). Precompiled headers generation wasn't correctly changed to all targets.
Kimmo Varis [Thu, 5 Jun 2008 16:21:35 +0000 (16:21 +0000)]
PATCH: [
1978374 ] Brazilian Portuguese translation update
Submitted by Felipe Periard Lopes
Kimmo Varis [Thu, 5 Jun 2008 13:43:40 +0000 (13:43 +0000)]
PATCH: [
1978362 ] Korean translation update
Submitted by sushizang [at] empal.com
Kimmo Varis [Thu, 5 Jun 2008 12:51:05 +0000 (12:51 +0000)]
Changelog: fix typo.
Kimmo Varis [Thu, 5 Jun 2008 12:48:16 +0000 (12:48 +0000)]
PATCH: [
1984884 ] Allow drag&drop conflict files to main window
Jochen Tucht [Wed, 4 Jun 2008 16:54:04 +0000 (16:54 +0000)]
Kimmo Varis [Wed, 4 Jun 2008 15:56:57 +0000 (15:56 +0000)]
Remove MFC dependency from LineFiltersList.h and LineFiltersList.cpp.
Kimmo Varis [Wed, 4 Jun 2008 13:29:42 +0000 (13:29 +0000)]
PATCH: [
1983958 ] Use std::vector for storing folder compare items
Kimmo Varis [Wed, 4 Jun 2008 12:54:47 +0000 (12:54 +0000)]
PATCH: [
1983670 ] Fix folder compare sorting by binary status
Kimmo Varis [Wed, 4 Jun 2008 06:31:43 +0000 (06:31 +0000)]
Convert line filter list to use vector instead of CList.
Tim Gerundt [Tue, 3 Jun 2008 21:25:17 +0000 (21:25 +0000)]
BUG: [
1976480 ] Mini-Bug: "Differences found"-label is not refreshed...
Tim Gerundt [Tue, 3 Jun 2008 21:06:21 +0000 (21:06 +0000)]
PATCH: [
1977130 ] Manual: Small facelift for the manual
Kimmo Varis [Tue, 3 Jun 2008 15:37:48 +0000 (15:37 +0000)]
Use UINT as diffcode type, not int.
Kimmo Varis [Tue, 3 Jun 2008 15:00:06 +0000 (15:00 +0000)]
Remove method declaration for method that is not implemented.
Kimmo Varis [Sun, 1 Jun 2008 17:45:44 +0000 (17:45 +0000)]
PATCH: [
1980970 ] Swedish.isl translation update for Ukrainian language
Submitted by Hans Eriksson
Jochen Tucht [Sun, 1 Jun 2008 16:45:16 +0000 (16:45 +0000)]
Kimmo Varis [Sun, 1 Jun 2008 13:44:12 +0000 (13:44 +0000)]
Fix a typo in my previous cleanup commit.
Kimmo Varis [Sun, 1 Jun 2008 10:58:45 +0000 (10:58 +0000)]
Add some doxygen comments.
Kimmo Varis [Sun, 1 Jun 2008 09:28:58 +0000 (09:28 +0000)]
Add some doxygen comments to UniMarkdownFile.
Kimmo Varis [Sat, 31 May 2008 14:43:13 +0000 (14:43 +0000)]
Docs: More detailed PCRE building instructions.
Kimmo Varis [Sat, 31 May 2008 14:02:48 +0000 (14:02 +0000)]
Docs: Update pcre building instructions after pcre update to 7.7.
Kimmo Varis [Sat, 31 May 2008 13:02:37 +0000 (13:02 +0000)]
BuildScript: Fix building pcre after pcre update to version 7.7.
Tim Gerundt [Fri, 30 May 2008 23:36:17 +0000 (23:36 +0000)]
Web: Add "WinMerge X.Y" heading to index pages
Kimmo Varis [Fri, 30 May 2008 12:09:27 +0000 (12:09 +0000)]
Add doxygen comments and cleanup header bar edit control code.
Kimmo Varis [Fri, 30 May 2008 06:26:40 +0000 (06:26 +0000)]
BUG: [
1602313 ] WinMerge stays in tasklist after closing
Remove unneeded WM_CLOSE handler CMergeEditView::OnWindowClose()
Tim Gerundt [Thu, 29 May 2008 22:04:54 +0000 (22:04 +0000)]
Web: Optimize heading size
Tim Gerundt [Thu, 29 May 2008 20:30:04 +0000 (20:30 +0000)]
Add meta info for translations status to Ukrainian.po
Kimmo Varis [Thu, 29 May 2008 19:03:27 +0000 (19:03 +0000)]
ChangeLog: Update PCRE (regular expression library) to version 7.7 (#
1941779)
Kimmo Varis [Thu, 29 May 2008 17:54:51 +0000 (17:54 +0000)]
PATCH: [
1973149 ] Ukrainian Translation (WinMerge v2.8.0)
[
1974021 ] Ukrainian translation for WinMerge
Submitted by Warrior and Vitaliy Stopchans'kyy
Kimmo Varis [Thu, 29 May 2008 10:46:23 +0000 (10:46 +0000)]
Remove useless wrapper code in dlgutil. Use CMainFrame functions directly where needed.
- revert the change for expat project file. It was a plain accident.
Kimmo Varis [Thu, 29 May 2008 09:47:36 +0000 (09:47 +0000)]
Remove useless wrapper code in dlgutil. Use CMainFrame functions directly where needed.
Kimmo Varis [Thu, 29 May 2008 08:24:22 +0000 (08:24 +0000)]
Add doxygen comments, remove unneeded include line.
Kimmo Varis [Thu, 29 May 2008 07:34:48 +0000 (07:34 +0000)]
Uninline DiffFileFlags::toString(). Also rename it to ToString() to comply with function naming.
Kimmo Varis [Wed, 28 May 2008 21:53:27 +0000 (21:53 +0000)]
Improve doxygen comment.
Tim Gerundt [Wed, 28 May 2008 21:21:43 +0000 (21:21 +0000)]
Web: Add small facelift from patch #
1943384 to print layout too.
Kimmo Varis [Wed, 28 May 2008 21:05:54 +0000 (21:05 +0000)]
Add doxygen comments.
Kimmo Varis [Wed, 28 May 2008 12:51:28 +0000 (12:51 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Remove custom build steps that referred to CMake installation.
Kimmo Varis [Wed, 28 May 2008 07:14:24 +0000 (07:14 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Remove lots of remaining absolute paths from project files.
Kimmo Varis [Tue, 27 May 2008 21:02:58 +0000 (21:02 +0000)]
Use paths_ConcatPath() to append paths.
Kimmo Varis [Tue, 27 May 2008 19:07:37 +0000 (19:07 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Fix rest of pcre project files - now there are no errors anymore in WinMerge build.
Kimmo Varis [Tue, 27 May 2008 15:21:43 +0000 (15:21 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Fix copying pcre.dll to build dir in prelink.bat
Kimmo Varis [Tue, 27 May 2008 15:05:08 +0000 (15:05 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
pcred.dll was still present in post-build rule.
Kimmo Varis [Tue, 27 May 2008 14:45:33 +0000 (14:45 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Rename debug version of pcre to pcre.dll/lib (was pcred.dll/lib).
Kimmo Varis [Tue, 27 May 2008 14:33:49 +0000 (14:33 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Fix include paths to WinMerge project file, fix Prelink.bat.
Kimmo Varis [Tue, 27 May 2008 14:12:36 +0000 (14:12 +0000)]
TODO: [
1941779 ] Update PCRE to latest version
Updates PCRE to version 7.7 and adds build files for VS2003.net.
Kimmo Varis [Tue, 27 May 2008 13:01:50 +0000 (13:01 +0000)]
BUG: [
1973225 ] Cannot compare files in different paths with TortoiseSVN
Kimmo Varis [Mon, 26 May 2008 18:38:20 +0000 (18:38 +0000)]
Modify compiling doc (Compiling.html) according our decision to stop officially supporting VC6. Remove most references to VC6 (files) and assume VS2003 is the oldest compiler we support.
Kimmo Varis [Mon, 26 May 2008 13:41:56 +0000 (13:41 +0000)]
Rename CPropLineFilter class to LineFiltersDlg - the filename was changed in previous commit.
Kimmo Varis [Mon, 26 May 2008 13:04:56 +0000 (13:04 +0000)]
Rename PropLineFilter.* files to LineFiltersDlg.*. This is consistent with other filter dialog names FileFiltersDlg.*.
Kimmo Varis [Mon, 26 May 2008 09:05:30 +0000 (09:05 +0000)]
Doxygen file comment improvements and fixes.
Tim Gerundt [Sun, 25 May 2008 22:03:02 +0000 (22:03 +0000)]
PATCH: [
1970912 ] Add VB.net keywords to Basic highlighter
Kimmo Varis [Sun, 25 May 2008 21:29:53 +0000 (21:29 +0000)]
BUG: [
1740106 ] Flicker when resizing location pane
Jochen Tucht [Sun, 25 May 2008 19:20:32 +0000 (19:20 +0000)]
Cleanup
Kimmo Varis [Sun, 25 May 2008 17:14:05 +0000 (17:14 +0000)]
Add Greek and Romanian resource files to project file.
Jochen Tucht [Sat, 24 May 2008 13:03:28 +0000 (13:03 +0000)]
Jochen Tucht [Sat, 24 May 2008 09:18:17 +0000 (09:18 +0000)]
Kimmo Varis [Fri, 23 May 2008 15:13:03 +0000 (15:13 +0000)]
WinMerge experimental release 2.9.1.2 (SVN revision 5362)
Kimmo Varis [Fri, 23 May 2008 15:08:26 +0000 (15:08 +0000)]
Changelog: Optimize location pane (r5341, r5342, r5346, r5351, r5355, r5356)
Kimmo Varis [Fri, 23 May 2008 14:47:55 +0000 (14:47 +0000)]
Bump ShellExtension version to 1.14.0 (to make it different from 2.8 branch).
Kimmo Varis [Fri, 23 May 2008 14:46:34 +0000 (14:46 +0000)]
Bump manual revision to 1.4.1.
Tim Gerundt [Fri, 23 May 2008 14:28:05 +0000 (14:28 +0000)]
Add meta info for translations status to Greek.po
Kimmo Varis [Fri, 23 May 2008 14:22:58 +0000 (14:22 +0000)]
PATCH: [
1970074 ] A Swedish Swedish.isl translation update
Submitted by Hans Eriksson
Kimmo Varis [Fri, 23 May 2008 13:29:03 +0000 (13:29 +0000)]
Optimize location pane's diff list enumeration. Remove (unused) code for showing ignored differences in location pane.
Kimmo Varis [Thu, 22 May 2008 20:36:24 +0000 (20:36 +0000)]
Optimize location pane redraws by disabling diff block calculation from cases when pane width changes.
Kimmo Varis [Thu, 22 May 2008 16:34:35 +0000 (16:34 +0000)]
PATCH: [
1968429 ] Greek Translation (WinMerge v2.8.0)
Submitted by Polyvios J. Simopoulos
Kimmo Varis [Thu, 22 May 2008 14:00:00 +0000 (14:00 +0000)]
Remove two unused variables.
Tim Gerundt [Wed, 21 May 2008 23:20:44 +0000 (23:20 +0000)]
PATCH: [
1967419 ] Remove unused files from "Merge.vcproj"
Kimmo Varis [Wed, 21 May 2008 14:18:09 +0000 (14:18 +0000)]
Refactoring LocationPane code: create list of calculated diff blocks and then draw them in one loop.
Kimmo Varis [Wed, 21 May 2008 13:30:03 +0000 (13:30 +0000)]
PATCH: [
1967107 ] Use sntprintf family functions instead of stprintf
Submitted by Marcel Gosselin
Kimmo Varis [Mon, 19 May 2008 17:35:45 +0000 (17:35 +0000)]
PATCH: [
1967133 ] Remove unused function GetFreeSpaceString()
Submitted by Marcel Gosselin
Kimmo Varis [Mon, 19 May 2008 17:07:41 +0000 (17:07 +0000)]
BUG: [
1963523 ] CmdLine: First path ending with \ in parentheses combines
Kimmo Varis [Thu, 15 May 2008 20:15:44 +0000 (20:15 +0000)]
Refactor LocationView's bar coordinate calculation to separate function.
Kimmo Varis [Thu, 15 May 2008 15:52:48 +0000 (15:52 +0000)]
Improve comment for CLocationView class.
Kimmo Varis [Thu, 15 May 2008 13:56:00 +0000 (13:56 +0000)]
Add Marcel Gosselin to Contributors.txt.
Kimmo Varis [Thu, 15 May 2008 13:54:27 +0000 (13:54 +0000)]
PATCH: [
1962816 ] [PATCH] Fix character-level line differences highlighting
Fixes bug #
1883409
Submitted by Marcel Gosselin
Kimmo Varis [Wed, 14 May 2008 22:52:53 +0000 (22:52 +0000)]
Simplify the code to check if position is inside location view's bars.
Kimmo Varis [Wed, 14 May 2008 22:47:37 +0000 (22:47 +0000)]
Refactor LocationView to use two CRects for storing bar coordinates (instead of four integers).
Tim Gerundt [Tue, 6 May 2008 22:14:11 +0000 (22:14 +0000)]
PATCH: [
1957434 ] Bulgarian translation update
Tim Gerundt [Tue, 6 May 2008 21:52:16 +0000 (21:52 +0000)]
PATCH: [
1958283 ] Updated Croatian translation
Tim Gerundt [Tue, 29 Apr 2008 21:34:33 +0000 (21:34 +0000)]
RFE: [
1890083 ] Web: Mention / link license in front page
Kimmo Varis [Sun, 27 Apr 2008 15:42:39 +0000 (15:42 +0000)]
PATCH: [
1950188 ] Swedish.isl translation update
Submitted by Hans Eriksson
Kimmo Varis [Sun, 27 Apr 2008 15:36:42 +0000 (15:36 +0000)]
PATCH: [
1952194 ] Manual: Add Romanian translation
Kimmo Varis [Sat, 26 Apr 2008 10:06:59 +0000 (10:06 +0000)]
BUG: [
1881186 ] Exclude Source Control filter does not hide VSS files
Submitted by chepxxx
Tim Gerundt [Thu, 24 Apr 2008 20:53:09 +0000 (20:53 +0000)]
BUG: [
1838320 ] Links to download page is wrong
Kimmo Varis [Wed, 23 Apr 2008 17:50:52 +0000 (17:50 +0000)]
Add Romanian translator (Cristian Arghiroiu) to the Contributors.txt.
Kimmo Varis [Wed, 23 Apr 2008 17:27:43 +0000 (17:27 +0000)]
PATCH: [
1939729 ] Romanian translation
Couple of fixes for the installer.
Kimmo Varis [Wed, 23 Apr 2008 15:32:20 +0000 (15:32 +0000)]
WinMerge experimental release 2.9.9.1 (SVN revision 5324)
- had to do one compiling fix
Kimmo Varis [Wed, 23 Apr 2008 15:13:44 +0000 (15:13 +0000)]
Fix compiling for ANSI target - was using one undefined variable in ANSI-target only code.
Kimmo Varis [Wed, 23 Apr 2008 14:55:00 +0000 (14:55 +0000)]
WinMerge experimental release 2.9.9.1 (SVN revision 5322)
Kimmo Varis [Wed, 23 Apr 2008 14:32:28 +0000 (14:32 +0000)]
Add Robert Knienider to contributors (patch #
1949068).
Kimmo Varis [Wed, 23 Apr 2008 14:29:45 +0000 (14:29 +0000)]
PATCH: [
1947216 ] Enlarge Discard All -button in Save closing dialog
Submitted by Tim
Kimmo Varis [Wed, 23 Apr 2008 13:34:37 +0000 (13:34 +0000)]
ShellExtension: Bump version to 1.13.2.
Kimmo Varis [Wed, 23 Apr 2008 13:32:17 +0000 (13:32 +0000)]
Manual: Bump revision to 1.4.0.
Tim Gerundt [Tue, 22 Apr 2008 20:00:24 +0000 (20:00 +0000)]
PATCH: [
1949068 ] Trivial: Resolved conflict in German shortcut keys - ChangeLog
Tim Gerundt [Tue, 22 Apr 2008 19:50:49 +0000 (19:50 +0000)]
PATCH: [
1949068 ] Trivial: Resolved conflict in German shortcut keys
Kimmo Varis [Sat, 19 Apr 2008 08:11:31 +0000 (08:11 +0000)]
PATCH: [
1939729 ] Romanian translation