|
From: <ki...@us...> - 2006-11-30 16:03:41
|
Revision: 3874
http://svn.sourceforge.net/winmerge/?rev=3874&view=rev
Author: kimmov
Date: 2006-11-30 08:03:39 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
PATCH: [ 1605682 ] Add Syntax Highlight option to config log
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ConfigLog.cpp
trunk/Src/ConfigLog.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-30 14:28:07 UTC (rev 3873)
+++ trunk/Src/Changes.txt 2006-11-30 16:03:39 UTC (rev 3874)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-11-30 Kimmo
+ PATCH: [ 1605682 ] Add Syntax Highlight option to config log
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
2006-11-30 Takashi
BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2006-11-30 14:28:07 UTC (rev 3873)
+++ trunk/Src/ConfigLog.cpp 2006-11-30 16:03:39 UTC (rev 3874)
@@ -454,6 +454,7 @@
WriteItemYesNo(2, _T("Merge Mode enabled"), &m_miscSettings.bMergeMode);
WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
+ WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
// Font settings
FileWriteString(_T("\n Font:\n"));
Modified: trunk/Src/ConfigLog.h
===================================================================
--- trunk/Src/ConfigLog.h 2006-11-30 14:28:07 UTC (rev 3873)
+++ trunk/Src/ConfigLog.h 2006-11-30 16:03:39 UTC (rev 3874)
@@ -64,6 +64,7 @@
BOOL bShowLinenumbers;
BOOL bWrapLines;
BOOL bMergeMode;
+ BOOL bSyntaxHighlight;
};
/**
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-11-30 14:28:07 UTC (rev 3873)
+++ trunk/Src/MainFrm.cpp 2006-11-30 16:03:39 UTC (rev 3874)
@@ -2384,6 +2384,7 @@
LoadConfigBoolSetting(&configLog.m_miscSettings.bShowLinenumbers, options, OPT_VIEW_LINENUMBERS, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bWrapLines, options, OPT_WORDWRAP, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bMergeMode, options, OPT_MERGE_MODE, cfgdir);
+ LoadConfigBoolSetting(&configLog.m_miscSettings.bSyntaxHighlight, options, OPT_SYNTAX_HIGHLIGHT, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultMode, options, OPT_CP_DEFAULT_MODE, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultCustomValue, options, OPT_CP_DEFAULT_CUSTOM, cfgdir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-11-30 19:42:08
|
Revision: 3878
http://svn.sourceforge.net/winmerge/?rev=3878&view=rev
Author: kimmov
Date: 2006-11-30 11:42:04 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/asp.cpp
trunk/Src/editlib/basic.cpp
trunk/Src/editlib/batch.cpp
trunk/Src/editlib/cplusplus.cpp
trunk/Src/editlib/csharp.cpp
trunk/Src/editlib/dcl.cpp
trunk/Src/editlib/fortran.cpp
trunk/Src/editlib/html.cpp
trunk/Src/editlib/innosetup.cpp
trunk/Src/editlib/is.cpp
trunk/Src/editlib/java.cpp
trunk/Src/editlib/lisp.cpp
trunk/Src/editlib/nsis.cpp
trunk/Src/editlib/pascal.cpp
trunk/Src/editlib/perl.cpp
trunk/Src/editlib/php.cpp
trunk/Src/editlib/python.cpp
trunk/Src/editlib/rexx.cpp
trunk/Src/editlib/rsrc.cpp
trunk/Src/editlib/ruby.cpp
trunk/Src/editlib/sgml.cpp
trunk/Src/editlib/sh.cpp
trunk/Src/editlib/siod.cpp
trunk/Src/editlib/sql.cpp
trunk/Src/editlib/tcl.cpp
trunk/Src/editlib/tex.cpp
trunk/Src/editlib/xml.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/Changes.txt 2006-11-30 19:42:04 UTC (rev 3878)
@@ -5,6 +5,12 @@
2006-11-30 Kimmo
PATCH: [ 1605682 ] Add Syntax Highlight option to config log
Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+ PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
+ Submitted by Perry
+ Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
+ html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
+ python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
+ xml.cpp
2006-11-30 Takashi
BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
Modified: trunk/Src/editlib/asp.cpp
===================================================================
--- trunk/Src/editlib/asp.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/asp.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -629,8 +629,15 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
- if (bRedefineBlock)
+ if (I == nPrevI)
{
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
+ if (bRedefineBlock)
+ {
int nPos = I;
if (bDecIndex)
nPos = nPrevI;
Modified: trunk/Src/editlib/basic.cpp
===================================================================
--- trunk/Src/editlib/basic.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/basic.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -299,6 +299,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/batch.cpp
===================================================================
--- trunk/Src/editlib/batch.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/batch.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -664,6 +664,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/cplusplus.cpp
===================================================================
--- trunk/Src/editlib/cplusplus.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/cplusplus.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -273,6 +273,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/csharp.cpp
===================================================================
--- trunk/Src/editlib/csharp.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/csharp.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -197,8 +197,15 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
- if (bRedefineBlock)
+ if (I == nPrevI)
{
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
+ if (bRedefineBlock)
+ {
int nPos = I;
if (bDecIndex)
nPos = nPrevI;
Modified: trunk/Src/editlib/dcl.cpp
===================================================================
--- trunk/Src/editlib/dcl.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/dcl.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -199,6 +199,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/fortran.cpp
===================================================================
--- trunk/Src/editlib/fortran.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/fortran.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -313,6 +313,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/html.cpp
===================================================================
--- trunk/Src/editlib/html.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/html.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -459,6 +459,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/innosetup.cpp
===================================================================
--- trunk/Src/editlib/innosetup.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/innosetup.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -402,6 +402,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/is.cpp
===================================================================
--- trunk/Src/editlib/is.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/is.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -506,6 +506,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/java.cpp
===================================================================
--- trunk/Src/editlib/java.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/java.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -159,6 +159,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/lisp.cpp
===================================================================
--- trunk/Src/editlib/lisp.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/lisp.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -336,6 +336,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/nsis.cpp
===================================================================
--- trunk/Src/editlib/nsis.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/nsis.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -510,6 +510,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/pascal.cpp
===================================================================
--- trunk/Src/editlib/pascal.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/pascal.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -160,6 +160,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/perl.cpp
===================================================================
--- trunk/Src/editlib/perl.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/perl.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -330,6 +330,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/php.cpp
===================================================================
--- trunk/Src/editlib/php.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/php.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -550,6 +550,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/python.cpp
===================================================================
--- trunk/Src/editlib/python.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/python.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -248,6 +248,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/rexx.cpp
===================================================================
--- trunk/Src/editlib/rexx.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/rexx.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -187,6 +187,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/rsrc.cpp
===================================================================
--- trunk/Src/editlib/rsrc.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/rsrc.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -251,6 +251,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/ruby.cpp
===================================================================
--- trunk/Src/editlib/ruby.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/ruby.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -196,6 +196,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/sgml.cpp
===================================================================
--- trunk/Src/editlib/sgml.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/sgml.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -290,6 +290,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/sh.cpp
===================================================================
--- trunk/Src/editlib/sh.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/sh.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -155,6 +155,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/siod.cpp
===================================================================
--- trunk/Src/editlib/siod.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/siod.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -414,6 +414,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/sql.cpp
===================================================================
--- trunk/Src/editlib/sql.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/sql.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -147,6 +147,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/tcl.cpp
===================================================================
--- trunk/Src/editlib/tcl.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/tcl.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -122,6 +122,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/tex.cpp
===================================================================
--- trunk/Src/editlib/tex.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/tex.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -942,6 +942,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
Modified: trunk/Src/editlib/xml.cpp
===================================================================
--- trunk/Src/editlib/xml.cpp 2006-11-30 19:39:23 UTC (rev 3877)
+++ trunk/Src/editlib/xml.cpp 2006-11-30 19:42:04 UTC (rev 3878)
@@ -259,6 +259,13 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-01 06:56:46
|
Revision: 3879
http://svn.sourceforge.net/winmerge/?rev=3879&view=rev
Author: galh
Date: 2006-11-30 22:56:42 -0800 (Thu, 30 Nov 2006)
Log Message:
-----------
[ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-11-30 19:42:04 UTC (rev 3878)
+++ trunk/Src/Changes.txt 2006-12-01 06:56:42 UTC (rev 3879)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-01 Gal
+ PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
+ Src: MergeEditView.cpp
+
2006-11-30 Kimmo
PATCH: [ 1605682 ] Add Syntax Highlight option to config log
Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2006-11-30 19:42:04 UTC (rev 3878)
+++ trunk/Src/MergeEditView.cpp 2006-12-01 06:56:42 UTC (rev 3879)
@@ -1467,19 +1467,25 @@
if (bScroll)
{
+ int nDiffStart = GetSubLineIndex(curDiff.dbegin0);
+ int nDiffEnd = GetSubLineIndex(curDiff.dend0);
+
// If diff first line outside current view - context OR
// if diff last line outside current view - context OR
// if diff is bigger than screen
- if ((ptStart.y < m_nTopLine + CONTEXT_LINES_ABOVE) ||
- (ptEnd.y >= m_nTopLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
- (ptEnd.y - ptStart.y) >= GetScreenLines())
+ // if diff is bigger than screen when word wrap enabled
+ if ((nDiffStart < m_nTopSubLine + CONTEXT_LINES_ABOVE) ||
+ (nDiffEnd >= m_nTopSubLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
+ (nDiffEnd - nDiffStart) >= GetScreenLines() ||
+ (nDiffStart + GetSubLines(ptStart.y)) >= GetScreenLines())
{
- int line = ptStart.y - CONTEXT_LINES_ABOVE;
- if (line < 0)
- line = 0;
-
- pCurrentView->ScrollToLine(line);
- pOtherView->ScrollToLine(line);
+ int nLine = nDiffStart;
+ if (nLine > CONTEXT_LINES_ABOVE)
+ {
+ nLine -= CONTEXT_LINES_ABOVE;
+ }
+ pCurrentView->ScrollToSubLine(nLine);
+ pOtherView->ScrollToSubLine(nLine);
}
pCurrentView->SetCursorPos(ptStart);
pOtherView->SetCursorPos(ptStart);
@@ -2559,7 +2565,7 @@
/**
* @brief When view is scrolled using scrollbars update location pane.
*/
-void CMergeEditView::OnVScroll (UINT nSBCode, UINT nPos, CScrollBar * pScrollBar)
+void CMergeEditView::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar)
{
CCrystalTextView::OnVScroll (nSBCode, nPos, pScrollBar);
@@ -2893,18 +2899,17 @@
BOOL CMergeEditView::IsDiffVisible(int nDiff)
{
CMergeDoc *pd = GetDocument();
- CPoint ptStart, ptEnd;
DIFFRANGE diff;
pd->m_diffList.GetDiff(nDiff, diff);
- ptStart.x = 0;
- ptStart.y = diff.dbegin0;
- ptEnd.x = 0;
- ptEnd.y = diff.dend0;
+
+ int nDiffStart = GetSubLineIndex(diff.dbegin0);
+ int nDiffEnd = GetSubLineIndex(diff.dend0);
- if (ptStart.y < m_nTopLine ||
- (ptEnd.y >= m_nTopLine + GetScreenLines()) ||
- (ptEnd.y - ptStart.y) >= GetScreenLines())
+ if ((nDiffStart < m_nTopSubLine) ||
+ (nDiffEnd >= m_nTopSubLine + GetScreenLines()) ||
+ (nDiffEnd - nDiffStart) >= GetScreenLines() ||
+ (nDiffStart + GetSubLines(diff.dbegin0)) >= GetScreenLines())
{
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-12-02 06:19:32
|
Revision: 3883
http://svn.sourceforge.net/winmerge/?rev=3883&view=rev
Author: sdottaka
Date: 2006-12-01 22:19:30 -0800 (Fri, 01 Dec 2006)
Log Message:
-----------
BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirActions.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-01 21:39:32 UTC (rev 3882)
+++ trunk/Src/Changes.txt 2006-12-02 06:19:30 UTC (rev 3883)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-02 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
+ Src: DirActions.cpp
+
2006-12-01 Kimmo
PATCH: [ 1606496 ] Slovak translation
Submitted by Ivan Mas\xE1r
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2006-12-01 21:39:32 UTC (rev 3882)
+++ trunk/Src/DirActions.cpp 2006-12-02 06:19:30 UTC (rev 3883)
@@ -329,7 +329,10 @@
sFullDest += _T("\\");
if (!di.sLeftSubdir.IsEmpty())
sFullDest += di.sLeftSubdir + _T("\\");
- sFullDest += di.sLeftFilename;
+ if (di.isDirectory())
+ paths_CreateIfNeeded(sFullDest);
+ else
+ sFullDest += di.sLeftFilename;
fileOp.AddDestFile(sFullDest);
}
GetItemFileNames(sel, slFile, srFile);
@@ -382,7 +385,10 @@
sFullDest += _T("\\");
if (!di.sRightSubdir.IsEmpty())
sFullDest += di.sRightSubdir + _T("\\");
- sFullDest += di.sRightFilename;
+ if (di.isDirectory())
+ paths_CreateIfNeeded(sFullDest);
+ else
+ sFullDest += di.sRightFilename;
fileOp.AddDestFile(sFullDest);
}
GetItemFileNames(sel, slFile, srFile);
@@ -435,7 +441,10 @@
if (!di.sLeftSubdir.IsEmpty())
sFullDest += di.sLeftSubdir + _T("\\");
}
- sFullDest += di.sLeftFilename;
+ if (di.isDirectory())
+ paths_CreateIfNeeded(sFullDest);
+ else
+ sFullDest += di.sLeftFilename;
act.dest = sFullDest;
GetItemFileNames(sel, slFile, srFile);
@@ -490,7 +499,10 @@
if (!di.sRightSubdir.IsEmpty())
sFullDest += di.sRightSubdir + _T("\\");
}
- sFullDest += di.sRightFilename;
+ if (di.isDirectory())
+ paths_CreateIfNeeded(sFullDest);
+ else
+ sFullDest += di.sRightFilename;
act.dest = sFullDest;
GetItemFileNames(sel, slFile, srFile);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-12-02 13:33:50
|
Revision: 3887
http://svn.sourceforge.net/winmerge/?rev=3887&view=rev
Author: sdottaka
Date: 2006-12-02 05:33:48 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
Fix filefilter regexp uppercasing for trunk
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFilterMgr.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-02 13:18:21 UTC (rev 3886)
+++ trunk/Src/Changes.txt 2006-12-02 13:33:48 UTC (rev 3887)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2006-12-02 Takashi
+ Fix filefilter regexp uppercasing for trunk
+ Src: FileFilterMgr.cpp
+
+2006-12-02 Takashi
BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
Filters: Merge_VC_loose.flt
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2006-12-02 13:18:21 UTC (rev 3886)
+++ trunk/Src/FileFilterMgr.cpp 2006-12-02 13:33:48 UTC (rev 3887)
@@ -169,7 +169,6 @@
static void AddFilterPattern(FileFilterList & filterList, CString & str)
{
LPCTSTR commentLeader = _T("##"); // Starts comment
- str.MakeUpper();
str.TrimLeft();
// Ignore lines beginning with '##'
@@ -204,6 +203,7 @@
strcpy(regexString, (LPCTSTR)str);
regexLen = strlen(regexString);
#endif
+ pcre_opts |= PCRE_CASELESS;
pcre *regexp = pcre_compile(regexString, pcre_opts, &errormsg,
&erroroffset, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-12-02 13:51:02
|
Revision: 3888
http://svn.sourceforge.net/winmerge/?rev=3888&view=rev
Author: sdottaka
Date: 2006-12-02 05:51:00 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
BUG: [ 1589324 ] WinMegee crashes on copy
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/CShellFileOp.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-02 13:33:48 UTC (rev 3887)
+++ trunk/Src/Changes.txt 2006-12-02 13:51:00 UTC (rev 3888)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2006-12-02 Takashi
+ BUG: [ 1589324 ] WinMegee crashes on copy
+ Src: FileFilterMgr.cpp
+
+2006-12-02 Takashi
Fix filefilter regexp uppercasing for trunk
Src: FileFilterMgr.cpp
Modified: trunk/Src/Common/CShellFileOp.cpp
===================================================================
--- trunk/Src/Common/CShellFileOp.cpp 2006-12-02 13:33:48 UTC (rev 3887)
+++ trunk/Src/Common/CShellFileOp.cpp 2006-12-02 13:51:00 UTC (rev 3888)
@@ -527,8 +527,9 @@
}
// drum roll please....
+ ((CFrameWnd *)AfxGetMainWnd())->BeginModalState();
nAPIRet = SHFileOperation ( &m_rFOS ); // tah-dah!
-
+ ((CFrameWnd *)AfxGetMainWnd())->EndModalState();
// Save the return value from the API.
if ( NULL != lpnAPIReturn )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-02 22:52:07
|
Revision: 3890
http://svn.sourceforge.net/winmerge/?rev=3890&view=rev
Author: kimmov
Date: 2006-12-02 14:51:58 -0800 (Sat, 02 Dec 2006)
Log Message:
-----------
Remove commented out code
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Plugins.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-02 13:51:25 UTC (rev 3889)
+++ trunk/Src/Changes.txt 2006-12-02 22:51:58 UTC (rev 3890)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-02 Kimmo
+ Remove commented out code
+ Src: Plugins.cpp
+
2006-12-02 Takashi
BUG: [ 1589324 ] WinMegee crashes on copy
Src: FileFilterMgr.cpp
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2006-12-02 13:51:25 UTC (rev 3889)
+++ trunk/Src/Plugins.cpp 2006-12-02 22:51:58 UTC (rev 3890)
@@ -38,7 +38,6 @@
#include "Plugins.h"
#include "lwdisp.h"
#include "coretools.h"
-//#include "RegExp.h"
#include "resource.h"
#include "Exceptions.h"
#include "RegKey.h"
@@ -282,19 +281,8 @@
sPiece.TrimLeft();
sPiece.MakeUpper();
-// CRegExp * regexp = new CRegExp;
FileFilterElement element;
-
-/* if (regexp->RegComp(sPiece))
- {
- element.pRegExp = regexp;
- filters->AddTail(element);
- }
- else
- delete regexp;
-*/
const char * errormsg = NULL;
- //char errormsg[200] = {0};
int erroroffset = 0;
char regexString[200] = {0};
int regexLen = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-03 10:59:06
|
Revision: 3892
http://svn.sourceforge.net/winmerge/?rev=3892&view=rev
Author: kimmov
Date: 2006-12-03 02:59:05 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/unicoder.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-03 10:53:22 UTC (rev 3891)
+++ trunk/Src/Changes.txt 2006-12-03 10:59:05 UTC (rev 3892)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-03 Kimmo
+ PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
+ Src: Common/unicoder.cpp
+
2006-12-02 Kimmo
Remove commented out code
Src: Plugins.cpp
Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp 2006-12-03 10:53:22 UTC (rev 3891)
+++ trunk/Src/Common/unicoder.cpp 2006-12-03 10:59:05 UTC (rev 3892)
@@ -502,6 +502,15 @@
int n = MultiByteToWideChar(codepage, flags, lpd, len, wbuff, wlen-1);
if (n)
{
+ /*
+ NB: MultiByteToWideChar is documented as only zero-terminating
+ if input was zero-terminated, but it appears that it can
+ zero-terminate even if input wasn't.
+ So we check if it zero-terminated and adjust count accordingly.
+ */
+ if (wbuff[n-1] == 0)
+ --n;
+
str.ReleaseBuffer(n);
return str;
}
@@ -515,6 +524,15 @@
n = MultiByteToWideChar(codepage, flags, lpd, len, wbuff, wlen-1);
if (n)
{
+ /*
+ NB: MultiByteToWideChar is documented as only zero-terminating
+ if input was zero-terminated, but it appears that it can
+ zero-terminate even if input wasn't.
+ So we check if it zero-terminated and adjust count accordingly.
+ */
+ if (wbuff[n-1] == 0)
+ --n;
+
str.ReleaseBuffer(n);
return str;
}
@@ -582,6 +600,14 @@
dest[0] = '?';
return 1;
}
+ /*
+ NB: MultiByteToWideChar is documented as only zero-terminating
+ if input was zero-terminated, but it appears that it can
+ zero-terminate even if input wasn't.
+ So we check if it zero-terminated and adjust count accordingly.
+ */
+ if (wbuff[n-1] == 0)
+ --n;
wbuff[n] = 0; // zero-terminate string
// Now convert to TCHAR (which means defcodepage)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-04 06:39:36
|
Revision: 3897
http://svn.sourceforge.net/winmerge/?rev=3897&view=rev
Author: galh
Date: 2006-12-03 22:39:34 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-03 11:31:26 UTC (rev 3896)
+++ trunk/Src/Changes.txt 2006-12-04 06:39:34 UTC (rev 3897)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-04 Gal
+ PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
+ Src: MergeEditView.cpp
+
2006-12-03 Kimmo
PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
Src: Common/unicoder.cpp
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2006-12-03 11:31:26 UTC (rev 3896)
+++ trunk/Src/MergeEditView.cpp 2006-12-04 06:39:34 UTC (rev 3897)
@@ -1474,7 +1474,7 @@
// if diff last line outside current view - context OR
// if diff is bigger than screen
// if diff is bigger than screen when word wrap enabled
- if ((nDiffStart < m_nTopSubLine + CONTEXT_LINES_ABOVE) ||
+ if ((nDiffStart < m_nTopSubLine) ||
(nDiffEnd >= m_nTopSubLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
(nDiffEnd - nDiffStart) >= GetScreenLines() ||
(nDiffStart + GetSubLines(ptStart.y)) >= GetScreenLines())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-04 16:24:27
|
Revision: 3899
http://svn.sourceforge.net/winmerge/?rev=3899&view=rev
Author: kimmov
Date: 2006-12-04 08:24:25 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
PATCH: [ 1607823 ] Remove manifest loading from lang dlls
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Changes.txt 2006-12-04 16:24:25 UTC (rev 3899)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-04 Kimmo
+ PATCH: [ 1607823 ] Remove manifest loading from lang dlls
+ Src/Languages/*: Merge*.rc
+
2006-12-04 Gal
PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
Src: MergeEditView.cpp
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -61,16 +61,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/French/MergeFrench.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-12-04 15:59:49 UTC (rev 3898)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-12-04 16:24:25 UTC (rev 3899)
@@ -59,16 +59,6 @@
#endif // APSTUDIO_INVOKED
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-04 18:13:28
|
Revision: 3905
http://svn.sourceforge.net/winmerge/?rev=3905&view=rev
Author: gerundt
Date: 2006-12-04 10:13:25 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
PATCH: [ 1607193 ] INI Syntax Improvements
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ini.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-04 16:44:54 UTC (rev 3904)
+++ trunk/Src/Changes.txt 2006-12-04 18:13:25 UTC (rev 3905)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-04 Tim
+ PATCH: [ 1607193 ] INI Syntax Improvements
+ Src/editlib: ini.cpp
+
2006-12-04 Kimmo
PATCH: [ 1607823 ] Remove manifest loading from lang dlls
Src/Languages/*: Merge*.rc
Modified: trunk/Src/editlib/ini.cpp
===================================================================
--- trunk/Src/editlib/ini.cpp 2006-12-04 16:44:54 UTC (rev 3904)
+++ trunk/Src/editlib/ini.cpp 2006-12-04 18:13:25 UTC (rev 3905)
@@ -1,7 +1,7 @@
///////////////////////////////////////////////////////////////////////////
// File: ini.cpp
-// Version: 1.1.
-// Updated: 14-Mar-2004
+// Version: 1.2
+// Updated: 02-Dec-2006
//
// Copyright: Ferdinand Prantl, portions by Stcherbatchenko Andrei,
// Tim Gerundt, Kimmo Varis
@@ -17,6 +17,7 @@
#include "stdafx.h"
#include "ccrystaltextview.h"
+#include "ccrystaltextbuffer.h"
#include "SyntaxColors.h"
#ifdef _DEBUG
@@ -68,6 +69,7 @@
#define COOKIE_STRING 0x0008
#define COOKIE_CHAR 0x0010
#define COOKIE_SECTION 0x0020
+#define COOKIE_KEY 0x0040
DWORD CCrystalTextView::
ParseLineIni (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems)
@@ -81,14 +83,22 @@
BOOL bRedefineBlock = TRUE;
BOOL bDecIndex = FALSE;
int nIdentBegin = -1;
+ int nPrevI = -1;
int I=0;
- for (I = 0;; I++)
+ for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
{
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
if (bRedefineBlock)
{
int nPos = I;
if (bDecIndex)
- nPos--;
+ nPos = nPrevI;
if (dwCookie & (COOKIE_COMMENT | COOKIE_EXT_COMMENT))
{
DEFINE_BLOCK (nPos, COLORINDEX_COMMENT);
@@ -101,9 +111,13 @@
{
DEFINE_BLOCK (nPos, COLORINDEX_FUNCNAME);
}
+ else if (dwCookie & COOKIE_KEY)
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_KEYWORD);
+ }
else
{
- if (xisalnum (pszChars[nPos]) || pszChars[nPos] == '.' && nPos > 0 && (!xisalpha (pszChars[nPos - 1]) && !xisalpha (pszChars[nPos + 1])))
+ if (xisalnum (pszChars[nPos]) || pszChars[nPos] == '.' && nPos > 0 && (!xisalpha (*::CharPrev(pszChars, pszChars + nPos)) && !xisalpha (*::CharNext(pszChars + nPos))))
{
DEFINE_BLOCK (nPos, COLORINDEX_NORMALTEXT);
}
@@ -135,7 +149,7 @@
// String constant "...."
if (dwCookie & COOKIE_STRING)
{
- if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[I - 1] != '\\' || I >= 2 && (pszChars[I - 1] != '\\' || pszChars[I - 1] == '\\' && pszChars[I - 2] == '\\')))
+ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_STRING;
bRedefineBlock = TRUE;
@@ -146,7 +160,7 @@
// Char constant '..'
if (dwCookie & COOKIE_CHAR)
{
- if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[I - 1] != '\\' || I >= 2 && (pszChars[I - 1] != '\\' || pszChars[I - 1] == '\\' && pszChars[I - 2] == '\\')))
+ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
{
dwCookie &= ~COOKIE_CHAR;
bRedefineBlock = TRUE;
@@ -157,18 +171,23 @@
// Section header [...]
if (dwCookie & COOKIE_SECTION)
{
- if (pszChars[I] == ']' && (I == 0 || I == 1 && pszChars[I - 1] != '\\' || I >= 2 && (pszChars[I - 1] != '\\' || pszChars[I - 1] == '\\' && pszChars[I - 2] == '\\')))
+ if (pszChars[I] == ']')
{
dwCookie &= ~COOKIE_SECTION;
bRedefineBlock = TRUE;
}
continue;
}
- if (pszChars[I] == ';')
+
+ // Key
+ if (dwCookie & COOKIE_KEY)
{
- DEFINE_BLOCK (I, COLORINDEX_COMMENT);
- dwCookie |= COOKIE_COMMENT;
- break;
+ if (I + 1 < nLength && pszChars[I + 1] == '=')
+ {
+ dwCookie &= ~COOKIE_KEY;
+ bRedefineBlock = TRUE;
+ }
+ continue;
}
// Normal text
@@ -181,7 +200,7 @@
if (pszChars[I] == '\'')
{
// if (I + 1 < nLength && pszChars[I + 1] == '\'' || I + 2 < nLength && pszChars[I + 1] != '\\' && pszChars[I + 2] == '\'' || I + 3 < nLength && pszChars[I + 1] == '\\' && pszChars[I + 3] == '\'')
- if (!I || !xisalnum (pszChars[I - 1]))
+ if (!I || !xisalnum (pszChars[nPrevI]))
{
DEFINE_BLOCK (I, COLORINDEX_STRING);
dwCookie |= COOKIE_CHAR;
@@ -189,20 +208,26 @@
}
}
- // Section header [...]
- if (pszChars[I] == '[')
+ if (bFirstChar)
{
- if (!I || !xisalnum (pszChars[I - 1]))
+ if (pszChars[I] == ';') // Comment
{
+ DEFINE_BLOCK (I, COLORINDEX_COMMENT);
+ dwCookie |= COOKIE_COMMENT;
+ break;
+ }
+ else if (pszChars[I] == '[') // Section header [...]
+ {
DEFINE_BLOCK (I, COLORINDEX_FUNCNAME);
dwCookie |= COOKIE_SECTION;
continue;
}
- }
-
- if (bFirstChar)
- {
- if (!_istspace (pszChars[I]))
+ else // Key
+ {
+ DEFINE_BLOCK (I, COLORINDEX_KEYWORD);
+ dwCookie |= COOKIE_KEY;
+ }
+ if (!xisspace (pszChars[I]))
bFirstChar = FALSE;
}
@@ -210,7 +235,7 @@
continue; // We don't need to extract keywords,
// for faster parsing skip the rest of loop
- if (xisalnum (pszChars[I]) || pszChars[I] == '.' && I > 0 && (!xisalpha (pszChars[I - 1]) && !xisalpha (pszChars[I + 1])))
+ if (xisalnum (pszChars[I]) || pszChars[I] == '.' && I > 0 && (!xisalpha (pszChars[nPrevI]) && !xisalpha (pszChars[I + 1])))
{
if (nIdentBegin == -1)
nIdentBegin = I;
@@ -223,26 +248,6 @@
{
DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
}
- else
- {
- bool bFunction = FALSE;
-
- for (int j = I; j < nLength; j++)
- {
- if (!_istspace (pszChars[j]))
- {
- if (pszChars[j] == '(')
- {
- bFunction = TRUE;
- }
- break;
- }
- }
- if (bFunction)
- {
- DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
- }
- }
bRedefineBlock = TRUE;
bDecIndex = TRUE;
nIdentBegin = -1;
@@ -256,29 +261,8 @@
{
DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
}
- else
- {
- bool bFunction = FALSE;
-
- for (int j = I; j < nLength; j++)
- {
- if (!_istspace (pszChars[j]))
- {
- if (pszChars[j] == '(')
- {
- bFunction = TRUE;
- }
- break;
- }
- }
- if (bFunction)
- {
- DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
- }
- }
}
- if (pszChars[nLength - 1] != '\\')
- dwCookie &= COOKIE_EXT_COMMENT;
+ dwCookie &= COOKIE_EXT_COMMENT;
return dwCookie;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-04 18:19:09
|
Revision: 3906
http://svn.sourceforge.net/winmerge/?rev=3906&view=rev
Author: gerundt
Date: 2006-12-04 10:19:07 -0800 (Mon, 04 Dec 2006)
Log Message:
-----------
PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-04 18:13:25 UTC (rev 3905)
+++ trunk/Src/Changes.txt 2006-12-04 18:19:07 UTC (rev 3906)
@@ -5,6 +5,8 @@
2006-12-04 Tim
PATCH: [ 1607193 ] INI Syntax Improvements
Src/editlib: ini.cpp
+ PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
+ Src/editlib: ccrystaltextview.cpp
2006-12-04 Kimmo
PATCH: [ 1607823 ] Remove manifest loading from lang dlls
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2006-12-04 18:13:25 UTC (rev 3905)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2006-12-04 18:19:07 UTC (rev 3906)
@@ -263,7 +263,7 @@
CCrystalTextView::SRC_DCL, _T ("DCL"), _T ("dcl,dcc"), &CCrystalTextView::ParseLineDcl, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_FORTRAN, _T ("Fortran"), _T ("f,f90,f9p,fpp,for,f77"), &CCrystalTextView::ParseLineFortran, SRCOPT_INSERTTABS|SRCOPT_AUTOINDENT, /*8,*/ _T (""), _T (""), _T ("!"), (DWORD)-1,
CCrystalTextView::SRC_HTML, _T ("HTML"), _T ("html,htm,shtml,ihtml,ssi,stm,stml,jsp"), &CCrystalTextView::ParseLineHtml, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("<!--"), _T ("-->"), _T (""), (DWORD)-1,
- CCrystalTextView::SRC_INI, _T ("INI"), _T ("ini,reg"), &CCrystalTextView::ParseLineIni, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU|SRCOPT_EOLNUNIX, /*2,*/ _T (""), _T (""), _T (";"), (DWORD)-1,
+ CCrystalTextView::SRC_INI, _T ("INI"), _T ("ini,reg,vbp"), &CCrystalTextView::ParseLineIni, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU|SRCOPT_EOLNUNIX, /*2,*/ _T (""), _T (""), _T (";"), (DWORD)-1,
CCrystalTextView::SRC_INNOSETUP, _T ("InnoSetup"), _T ("iss,isl"), &CCrystalTextView::ParseLineInnoSetup, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("{"), _T ("}"), _T (";"), (DWORD)-1,
CCrystalTextView::SRC_INSTALLSHIELD, _T ("InstallShield"), _T ("rul"), &CCrystalTextView::ParseLineIS, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_JAVA, _T ("Java"), _T ("java,jav,js"), &CCrystalTextView::ParseLineJava, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-05 16:39:35
|
Revision: 3916
http://svn.sourceforge.net/winmerge/?rev=3916&view=rev
Author: kimmov
Date: 2006-12-05 08:39:31 -0800 (Tue, 05 Dec 2006)
Log Message:
-----------
PATCH: [ 1608846 ] Create a class for moved blocks
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/Merge.dsp
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
Added Paths:
-----------
trunk/Src/MovedLines.cpp
trunk/Src/MovedLines.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-05 16:00:03 UTC (rev 3915)
+++ trunk/Src/Changes.txt 2006-12-05 16:39:31 UTC (rev 3916)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-05 Kimmo
+ PATCH: [ 1608846 ] Create a class for moved blocks
+ Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
+ Src new files: MovedLines.cpp MovedLines.h
+
2006-12-04 Tim
PATCH: [ 1607193 ] INI Syntax Improvements
Src/editlib: ini.cpp
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2006-12-05 16:00:03 UTC (rev 3915)
+++ trunk/Src/DiffWrapper.cpp 2006-12-05 16:39:31 UTC (rev 3916)
@@ -31,6 +31,7 @@
#include "coretools.h"
#include "diffcontext.h"
#include "DiffList.h"
+#include "MovedLines.h"
#include "diffwrapper.h"
#include "diff.h"
#include "FileTransform.h"
@@ -78,13 +79,13 @@
: m_FilterCommentsManager(new FilterCommentsManager)
, m_bCreatePatchFile(FALSE)
, m_bUseDiffList(FALSE)
-, m_bDetectMovedBlocks(FALSE)
, m_bAddCmdLine(TRUE)
, m_bAppendFiles(FALSE)
, m_nDiffs(0)
, m_infoPrediffer(NULL)
, m_pDiffList(NULL)
, m_bPathsAreTemp(FALSE)
+, m_pMovedLines(NULL)
{
ZeroMemory(&m_settings, sizeof(DIFFSETTINGS));
ZeroMemory(&m_globalSettings, sizeof(DIFFSETTINGS));
@@ -104,6 +105,7 @@
{
delete m_infoPrediffer;
delete m_FilterCommentsManager;
+ delete m_pMovedLines;
}
/**
@@ -197,18 +199,6 @@
}
/**
- * @brief Returns current set of options used for patch-file creation.
- * @param [in, out] options Pointer to structure where options are stored.
- */
-void CDiffWrapper::GetPatchOptions(PATCHOPTIONS *options) const
-{
- ASSERT(options);
- options->nContext = m_settings.context;
- options->outputStyle = m_settings.outputStyle;
- options->bAddCommandline = m_bAddCmdLine;
-}
-
-/**
* @brief Set options used for patch-file creation.
* @param [in] options Pointer to structure having new options.
*/
@@ -221,6 +211,24 @@
}
/**
+ * @brief Enables/disables moved block detection.
+ * @param [in] bDetectMovedBlocks If TRUE moved blocks are detected.
+ */
+void CDiffWrapper::SetDetectMovedBlocks(BOOL bDetectMovedBlocks)
+{
+ if (bDetectMovedBlocks)
+ {
+ if (m_pMovedLines == NULL)
+ m_pMovedLines = new MovedLines;
+ }
+ else
+ {
+ delete m_pMovedLines;
+ m_pMovedLines = NULL;
+ }
+}
+
+/**
* @brief Test for trivial only characters in string
* @param [in] Start - Start position in string
* @param [in] End - One character pass the end position of the string
@@ -1034,14 +1042,6 @@
}
/**
- * @brief Determines if patch-files are appended (not overwritten)
- */
-BOOL CDiffWrapper::GetAppendFiles() const
-{
- return m_bAppendFiles;
-}
-
-/**
* @brief Enables/disables patch-file appending (files with same filename are appended)
*/
BOOL CDiffWrapper::SetAppendFiles(BOOL bAppendFiles)
@@ -1068,39 +1068,6 @@
}
/**
- * @brief clear the lists (left & right) of moved blocks before RunFileDiff
- */
-void CDiffWrapper::ClearMovedLists()
-{
- m_moved0.RemoveAll();
- m_moved1.RemoveAll();
-}
-
-/**
- * @brief Get left->right info for a moved line (real line number)
- */
-int CDiffWrapper::RightLineInMovedBlock(int leftLine)
-{
- int rightLine;
- if (m_moved0.Lookup(leftLine, rightLine))
- return rightLine;
- else
- return -1;
-}
-
-/**
- * @brief Get right->left info for a moved line (real line number)
- */
-int CDiffWrapper::LeftLineInMovedBlock(int rightLine)
-{
- int leftLine;
- if (m_moved1.Lookup(rightLine, leftLine))
- return leftLine;
- else
- return -1;
-}
-
-/**
* @brief Compare two files using diffutils.
*
* Compare two files (in DiffFileData param) using diffutils. Run diffutils
@@ -1125,7 +1092,7 @@
{
// Diff files. depth is zero because we are not comparing dirs
*diffs = diff_2_files (diffData->m_inf, 0, bin_status,
- m_bDetectMovedBlocks, bin_file);
+ (m_pMovedLines != NULL), bin_file);
CopyDiffutilTextStats(diffData->m_inf, diffData);
}
__except (EXCEPTION_EXECUTE_HANDLER)
@@ -1216,24 +1183,27 @@
translate_range(&inf[1], first1, last1, &trans_a1, &trans_b1);
// Store information about these blocks in moved line info
- if (thisob->match0>=0)
+ if (GetDetectMovedBlocks())
{
- ASSERT(thisob->inserted);
- for (int i=0; i<thisob->inserted; ++i)
+ if (thisob->match0>=0)
{
- int line0 = i+thisob->match0 + (trans_a0-first0-1);
- int line1 = i+thisob->line1 + (trans_a1-first1-1);
- m_moved1[line1]=line0;
+ ASSERT(thisob->inserted);
+ for (int i=0; i<thisob->inserted; ++i)
+ {
+ int line0 = i+thisob->match0 + (trans_a0-first0-1);
+ int line1 = i+thisob->line1 + (trans_a1-first1-1);
+ GetMovedLines()->Add(MovedLines::SIDE_RIGHT, line1, line0);
+ }
}
- }
- if (thisob->match1>=0)
- {
- ASSERT(thisob->deleted);
- for (int i=0; i<thisob->deleted; ++i)
+ if (thisob->match1>=0)
{
- int line0 = i+thisob->line0 + (trans_a0-first0-1);
- int line1 = i+thisob->match1 + (trans_a1-first1-1);
- m_moved0[line0]=line1;
+ ASSERT(thisob->deleted);
+ for (int i=0; i<thisob->deleted; ++i)
+ {
+ int line0 = i+thisob->line0 + (trans_a0-first0-1);
+ int line1 = i+thisob->match1 + (trans_a1-first1-1);
+ GetMovedLines()->Add(MovedLines::SIDE_LEFT, line0, line1);
+ }
}
}
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2006-12-05 16:00:03 UTC (rev 3915)
+++ trunk/Src/DiffWrapper.h 2006-12-05 16:39:31 UTC (rev 3916)
@@ -41,6 +41,7 @@
struct file_data;
class FilterCommentsManager;
struct FilterCommentsSet;
+class MovedLines;
/** @enum COMPARE_TYPE
* @brief Different foldercompare methods.
@@ -213,11 +214,9 @@
void SetTextForAutomaticPrediff(const CString &text);
void SetPrediffer(PrediffingInfo * prediffer =NULL);
void GetPrediffer(PrediffingInfo * prediffer);
- void GetPatchOptions(PATCHOPTIONS *options) const;
void SetPatchOptions(const PATCHOPTIONS *options);
- void SetDetectMovedBlocks(BOOL bDetectMovedBlocks) { m_bDetectMovedBlocks = bDetectMovedBlocks; }
- BOOL GetDetectMovedBlocks() { return m_bDetectMovedBlocks; }
- BOOL GetAppendFiles() const;
+ void SetDetectMovedBlocks(BOOL bDetectMovedBlocks);
+ BOOL GetDetectMovedBlocks() { return (m_pMovedLines != NULL); }
BOOL SetAppendFiles(BOOL bAppendFiles);
void SetPaths(const CString &filepath1, const CString &filepath2, BOOL tempPaths);
void SetAlternativePaths(const CString &altPath1, const CString &altPath2);
@@ -227,11 +226,7 @@
void FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left);
void StartDirectoryDiff();
void EndDirectoryDiff();
- const CMap<int, int, int, int> * GetMoved0() { return &m_moved0; }
- const CMap<int, int, int, int> * GetMoved1() { return &m_moved1; }
- int RightLineInMovedBlock(int leftLine);
- int LeftLineInMovedBlock(int rightLine);
- void ClearMovedLists();
+ MovedLines * GetMovedLines() { return m_pMovedLines; }
void SetCompareFiles(const CString &OriginalFile1, const CString &OriginalFile2);
protected:
@@ -262,14 +257,12 @@
/// prediffer info are stored only for MergeDoc
CString m_sToFindPrediffer;
BOOL m_bUseDiffList; /**< Are results returned in difflist? */
- BOOL m_bDetectMovedBlocks; /**< Are moved blocks detected? */
BOOL m_bCreatePatchFile; /**< Do we create a patch file? */
BOOL m_bAddCmdLine; /**< Do we add commandline to patch file? */
BOOL m_bAppendFiles; /**< Do we append to existing patch file? */
int m_nDiffs; /**< Difference count */
DiffList *m_pDiffList; /**< Pointer to external DiffList */
- CMap<int, int, int, int> m_moved0; /**< Moved lines map for first side */
- CMap<int, int, int, int> m_moved1; /**< Moved lines map for second side */
+ MovedLines * m_pMovedLines;
FilterCommentsManager * m_FilterCommentsManager; /**< Comments filtering manager */
};
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-12-05 16:00:03 UTC (rev 3915)
+++ trunk/Src/Merge.dsp 2006-12-05 16:39:31 UTC (rev 3916)
@@ -590,6 +590,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MovedLines.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\multiformatText.cpp
# End Source File
# Begin Source File
@@ -1281,6 +1285,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MovedLines.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\multiformatText.h
# End Source File
# Begin Source File
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-12-05 16:00:03 UTC (rev 3915)
+++ trunk/Src/MergeDoc.cpp 2006-12-05 16:39:31 UTC (rev 3916)
@@ -36,6 +36,7 @@
#include "diff.h"
#include "diffcontext.h" // FILE_SAME
+#include "MovedLines.h"
#include "getopt.h"
#include "fnmatch.h"
#include "coretools.h"
@@ -430,7 +431,8 @@
m_diffList.Clear();
m_nCurDiff = -1;
// Clear moved lines lists
- m_diffWrapper.ClearMovedLists();
+ if (m_diffWrapper.GetDetectMovedBlocks())
+ m_diffWrapper.GetMovedLines()->Clear();
// Set paths for diffing and run diff
m_diffWrapper.SetPaths(m_pTempFiles->GetLeft(), m_pTempFiles->GetRight(), TRUE);
@@ -487,8 +489,8 @@
PrimeTextBuffers();
// Apply flags to lines that moved, to differentiate from appeared/disappeared lines
- FlagMovedLines(m_diffWrapper.GetMoved0(), m_ptBuf[0]);
- FlagMovedLines(m_diffWrapper.GetMoved1(), m_ptBuf[1]);
+ if (m_diffWrapper.GetDetectMovedBlocks())
+ FlagMovedLines(m_diffWrapper.GetMovedLines(), m_ptBuf[0], m_ptBuf[1]);
// After PrimeTextBuffers() we know amount of real diffs
// (m_nDiffs) and trivial diffs (m_nTrivialDiffs)
@@ -534,24 +536,42 @@
}
/** @brief Adjust all different lines that were detected as actually matching moved lines */
-void CMergeDoc::FlagMovedLines(const CMap<int, int, int, int> * movedLines, CDiffTextBuffer * pBuffer)
+void CMergeDoc::FlagMovedLines(MovedLines * pMovedLines, CDiffTextBuffer * pBuffer1,
+ CDiffTextBuffer * pBuffer2)
{
int i;
- for (i=0; i<pBuffer->GetLineCount(); ++i)
+ for (i = 0; i < pBuffer1->GetLineCount(); ++i)
{
- int j=-1;
- if (movedLines->Lookup(i, j))
+ int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_LEFT);
+ if (j != -1)
{
TRACE(_T("%d->%d\n"), i, j);
ASSERT(j>=0);
// We only flag lines that are already marked as being different
- int apparent = pBuffer->ComputeApparentLine(i);
- if (pBuffer->FlagIsSet(apparent, LF_DIFF))
+ int apparent = pBuffer1->ComputeApparentLine(i);
+ if (pBuffer1->FlagIsSet(apparent, LF_DIFF))
{
- pBuffer->SetLineFlag(apparent, LF_MOVED, TRUE, FALSE, FALSE);
+ pBuffer1->SetLineFlag(apparent, LF_MOVED, TRUE, FALSE, FALSE);
}
}
}
+
+ for (i=0; i<pBuffer2->GetLineCount(); ++i)
+ {
+ int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_RIGHT);
+ if (j != -1)
+ {
+ TRACE(_T("%d->%d\n"), i, j);
+ ASSERT(j>=0);
+ // We only flag lines that are already marked as being different
+ int apparent = pBuffer2->ComputeApparentLine(i);
+ if (pBuffer2->FlagIsSet(apparent, LF_DIFF))
+ {
+ pBuffer2->SetLineFlag(apparent, LF_MOVED, TRUE, FALSE, FALSE);
+ }
+ }
+ }
+
// todo: Need to record actual moved information
}
@@ -1233,7 +1253,12 @@
return -1;
int realLeftLine = m_ptBuf[0]->ComputeRealLine(apparentLeftLine);
- int realRightLine = m_diffWrapper.RightLineInMovedBlock(realLeftLine);
+ int realRightLine = -1;
+ if (m_diffWrapper.GetDetectMovedBlocks())
+ {
+ realRightLine = m_diffWrapper.GetMovedLines()->LineInBlock(realLeftLine,
+ MovedLines::SIDE_LEFT);
+ }
if (realRightLine != -1)
return m_ptBuf[1]->ComputeApparentLine(realRightLine);
else
@@ -1249,7 +1274,12 @@
return -1;
int realRightLine = m_ptBuf[1]->ComputeRealLine(apparentRightLine);
- int realLeftLine = m_diffWrapper.LeftLineInMovedBlock(realRightLine);
+ int realLeftLine = -1;
+ if (m_diffWrapper.GetDetectMovedBlocks())
+ {
+ realLeftLine = m_diffWrapper.GetMovedLines()->LineInBlock(realRightLine,
+ MovedLines::SIDE_RIGHT);
+ }
if (realLeftLine != -1)
return m_ptBuf[0]->ComputeApparentLine(realLeftLine);
else
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2006-12-05 16:00:03 UTC (rev 3915)
+++ trunk/Src/MergeDoc.h 2006-12-05 16:39:31 UTC (rev 3916)
@@ -348,7 +348,8 @@
DECLARE_MESSAGE_MAP()
private:
void PrimeTextBuffers();
- void FlagMovedLines(const CMap<int, int, int, int> * movedLines, CDiffTextBuffer * pBuffer);
+ void FlagMovedLines(MovedLines * pMovedLines, CDiffTextBuffer * pBuffer1,
+ CDiffTextBuffer * pBuffer2);
CString GetFileExt(const CString& sFileName, const CString& sDescription);
};
Added: trunk/Src/MovedLines.cpp
===================================================================
--- trunk/Src/MovedLines.cpp (rev 0)
+++ trunk/Src/MovedLines.cpp 2006-12-05 16:39:31 UTC (rev 3916)
@@ -0,0 +1,71 @@
+/**
+ * @file MovedLines.cpp
+ *
+ * @brief Implementation of MovedLines class.
+ */
+
+#include "stdafx.h"
+#include "MovedLines.h"
+
+/**
+ * @brief clear the lists of moved blocks.
+ */
+void MovedLines::Clear()
+{
+ m_moved0.RemoveAll();
+ m_moved1.RemoveAll();
+}
+
+/**
+ * @brief Add moved block to the list.
+ * @param [in] side1 First side we are mapping.
+ * @param [in] line1 Linenumber in side first side.
+ * @param [in] line2 Linenumber in second side.
+ */
+void MovedLines::Add(ML_SIDE side1, unsigned int line1, unsigned int line2)
+{
+ MovedLineMap * list = NULL;
+ if (side1 == ML_SIDE::SIDE_LEFT)
+ list = &m_moved0;
+ else
+ list = &m_moved1;
+
+ (*list)[line1] = line2;
+}
+
+/**
+ * @brief Check if line is in moved block.
+ * @param [in] line Linenumber to check.
+ * @param [in] side Side of the linenumber.
+ */
+int MovedLines::LineInBlock(unsigned int line, ML_SIDE side)
+{
+ if (side == ML_SIDE::SIDE_LEFT)
+ return SecondSideInMovedBlock(line);
+ else
+ return FirstSideInMovedBlock(line);
+}
+
+/**
+ * @brief Get right->left info for a moved line (real line number)
+ */
+int MovedLines::FirstSideInMovedBlock(unsigned int secondSideLine)
+{
+ int firstSideLine;
+ if (m_moved1.Lookup(secondSideLine, firstSideLine))
+ return firstSideLine;
+ else
+ return -1;
+}
+
+/**
+ * @brief Get left->right info for a moved line (real line number)
+ */
+int MovedLines::SecondSideInMovedBlock(unsigned int firstSideLine)
+{
+ int secondSideLine;
+ if (m_moved0.Lookup(firstSideLine, secondSideLine))
+ return secondSideLine;
+ else
+ return -1;
+}
Added: trunk/Src/MovedLines.h
===================================================================
--- trunk/Src/MovedLines.h (rev 0)
+++ trunk/Src/MovedLines.h 2006-12-05 16:39:31 UTC (rev 3916)
@@ -0,0 +1,40 @@
+/**
+ * @file MovedLines.h
+ *
+ * @brief Declaration of MovedLines class
+ */
+
+#ifndef _MOVEDLINES_H_
+#define _MOVEDLINES_H_
+
+typedef CMap<int, int, int, int> MovedLineMap;
+
+/**
+ * @brief Container class for moved lines/blocks.
+ * This class contains list of moved blocs/lines we detect
+ * when comparing files.
+ */
+class MovedLines
+{
+public:
+ /** @brief Sides for mapping functions. */
+ enum ML_SIDE
+ {
+ SIDE_LEFT,
+ SIDE_RIGHT,
+ };
+
+ void Clear();
+ void Add(ML_SIDE side1, unsigned int line1, unsigned int line2);
+ int LineInBlock(unsigned int line, ML_SIDE side);
+
+protected:
+ int FirstSideInMovedBlock(unsigned int secondSideLine);
+ int SecondSideInMovedBlock(unsigned int firstSideLine);
+
+private:
+ MovedLineMap m_moved0; /**< Moved lines map for first side */
+ MovedLineMap m_moved1; /**< Moved lines map for second side */
+};
+
+#endif // _MOVEDLINES_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-06 17:32:31
|
Revision: 3920
http://svn.sourceforge.net/winmerge/?rev=3920&view=rev
Author: kimmov
Date: 2006-12-06 09:32:27 -0800 (Wed, 06 Dec 2006)
Log Message:
-----------
Add missing include to fix ANSI build target
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileOrFolderSelect.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-05 19:11:15 UTC (rev 3919)
+++ trunk/Src/Changes.txt 2006-12-06 17:32:27 UTC (rev 3920)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-06 Kimmo
+ Add missing include to fix ANSI build target
+ Src: FileOrFolderSelect.cpp
+
2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
2006-12-05 Kimmo
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2006-12-05 19:11:15 UTC (rev 3919)
+++ trunk/Src/FileOrFolderSelect.cpp 2006-12-06 17:32:27 UTC (rev 3920)
@@ -25,6 +25,8 @@
*/
#include "stdafx.h"
+#include <sys/stat.h>
+
#include "FileOrFolderSelect.h"
#include "coretools.h"
#include "paths.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-07 15:58:49
|
Revision: 3924
http://svn.sourceforge.net/winmerge/?rev=3924&view=rev
Author: kimmov
Date: 2006-12-07 07:58:45 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
PATCH: [ 1610442 ] Make time getting faster for files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirScan.cpp
trunk/Src/FileInfo.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-06 21:12:21 UTC (rev 3923)
+++ trunk/Src/Changes.txt 2006-12-07 15:58:45 UTC (rev 3924)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-07 Kimmo
+ PATCH: [ 1610442 ] Make time getting faster for files
+ Src: DirScan.cpp FileInfo.cpp
+
2006-12-06 Kimmo
Add missing include to fix ANSI build target
Src: FileOrFolderSelect.cpp
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2006-12-06 21:12:21 UTC (rev 3923)
+++ trunk/Src/DirScan.cpp 2006-12-07 15:58:45 UTC (rev 3924)
@@ -58,6 +58,8 @@
int code, DiffItemList * pList, CDiffContext *pCtxt);
static void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt);
+static __int64 FiletimeToTimeT(FILETIME time);
+
/** @brief cmpmth is a typedef for a pointer to a method */
typedef int (CString::*cmpmth)(LPCTSTR sz) const;
/** @brief CALL_MEMBER_FN calls a method through a pointer to a method */
@@ -488,6 +490,22 @@
}
/**
+ * @brief Convert time in type FILETIME to type int (time_t compatible).
+ * @param [in] time Time in FILETIME type.
+ * @return Time in time_t compiliant integer.
+ */
+static __int64 FiletimeToTimeT(FILETIME time)
+{
+ const __int64 SecsTo100ns = 10000000;
+ const __int64 SecsBetweenEpochs = 11644473600;
+ __int64 converted_time;
+ converted_time = ((__int64)time.dwHighDateTime << 32) + time.dwLowDateTime;
+ converted_time -= (SecsBetweenEpochs * SecsTo100ns);
+ converted_time /= SecsTo100ns;
+ return converted_time;
+}
+
+/**
* @brief Find files and subfolders from given folder.
* This function saves all files and subfolders in given folder to arrays.
* We use 64-bit version of stat() to get times since find doesn't return
@@ -516,26 +534,25 @@
continue;
fentry ent;
- CString fullpath = paths_ConcatPath(sDir, ff.cFileName);
- struct _stati64 fstats;
- if (_tstati64(fullpath, &fstats) == 0)
+
+ // Save filetimes as seconds since January 1, 1970
+ // Note that times can be < 0 if they are around that 1970..
+ // Anyway that is not sensible case for normal files so we can
+ // just use zero for their time.
+ ent.ctime = FiletimeToTimeT(ff.ftCreationTime);
+ if (ent.ctime < 0)
+ ent.ctime = 0;
+ ent.mtime = FiletimeToTimeT(ff.ftLastWriteTime);
+ if (ent.mtime < 0)
+ ent.mtime = 0;
+
+ if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ ent.size = -1; // No size for directories
+ else
{
- // Save filetimes as seconds since January 1, 1970
- // Note that times can be < 0 if they are around that 1970..
- // Anyway that is not sensible case for normal files so we can
- // just use zero for their time.
- ent.ctime = fstats.st_ctime;
- if (ent.ctime < 0)
- ent.ctime = 0;
- ent.mtime = fstats.st_mtime;
- if (ent.mtime < 0)
- ent.mtime = 0;
+ ent.size = ((__int64)ff.nFileSizeHigh << 32) + ff.nFileSizeLow;
+ }
- if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- ent.size = -1; // No size for directories
- else
- ent.size = fstats.st_size;
- }
ent.name = ff.cFileName;
ent.attrs = ff.dwFileAttributes;
(dwIsDirectory ? dirs : files) -> Add(ent);
Modified: trunk/Src/FileInfo.cpp
===================================================================
--- trunk/Src/FileInfo.cpp 2006-12-06 21:12:21 UTC (rev 3923)
+++ trunk/Src/FileInfo.cpp 2006-12-07 15:58:45 UTC (rev 3924)
@@ -52,12 +52,12 @@
else
mtime64 = fstats.st_mtime;
- flags.attributes = GetFileAttributes(sFilePath);
-
// No size for directory ( size remains as -1)
- if ((flags.attributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+ if ((fstats.st_mode | _S_IFDIR) != 0)
size = fstats.st_size;
+ flags.attributes = GetFileAttributes(sFilePath);
+
retVal = TRUE;
}
mtime = mtime64;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-07 16:03:39
|
Revision: 3925
http://svn.sourceforge.net/winmerge/?rev=3925&view=rev
Author: kimmov
Date: 2006-12-07 08:03:38 -0800 (Thu, 07 Dec 2006)
Log Message:
-----------
PATCH: [ 1610477 ] Fix UniFile for weird filetimes
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/UniFile.cpp
trunk/Src/Common/UniFile.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-07 15:58:45 UTC (rev 3924)
+++ trunk/Src/Changes.txt 2006-12-07 16:03:38 UTC (rev 3925)
@@ -5,6 +5,8 @@
2006-12-07 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
Src: DirScan.cpp FileInfo.cpp
+ PATCH: [ 1610477 ] Fix UniFile for weird filetimes
+ Src/Common: UniFile.cpp UniFile.h
2006-12-06 Kimmo
Add missing include to fix ANSI build target
Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp 2006-12-07 15:58:45 UTC (rev 3924)
+++ trunk/Src/Common/UniFile.cpp 2006-12-07 16:03:38 UTC (rev 3925)
@@ -1,9 +1,9 @@
/**
* @file UniFile.cpp
* @author Perry Rapp, Creator, 2003-2006
- * @author Kimmo Varis, 2004-2005
+ * @author Kimmo Varis, 2004-2006
* @date Created: 2003-10
- * @date Edited: 2006-02-20 (Perry Rapp)
+ * @date Edited: 2006-12-07 (Kimmo Varis)
*
* @brief Implementation of Unicode enabled file classes (Memory-mapped reader class, and Stdio replacement class)
*/
@@ -59,11 +59,7 @@
/**
* @brief Get file status into member variables
*
- * Reads filestatus (size and full path) of non-open file.
- * This version of function (See also one with HANDLE parameter)
- * reads filestatus using CRT function, so file cannot be open
- * at the same time.
- *
+ * Reads filestatus (size and full path) of a file.
* @return true on success, false on failure.
* @note Function sets filesize member to zero, and status as read
* also when failing. That is needed so caller doesn't need to waste
@@ -93,64 +89,6 @@
}
}
-/**
- * @brief Get file status into member variables
- *
- * Reads filestatus (size and full path) of already open file.
- * Using already open handle and CFile is more efficient than
- * requiring caller first to close file so we can use CRT
- * functions or CFile static function for reading status for
- * non-open file.
- *
- * @param [in] handle Handle to open file
- * @return true on success, false on failure.
- */
-bool UniLocalFile::DoGetFileStatus(HANDLE handle)
-{
- m_lastError.ClearError();
- m_statusFetched = -1;
-
- if (handle == INVALID_HANDLE_VALUE)
- return false;
-
- // Attach CFile to already open filehandle
-#if _MSC_VER < 1300
- // MSVC6
- CFile file((HFILE)handle);
-#else
-#ifdef _WIN64
- CFile file((HFILE)handle);
-#else // _WIN64
- // MSVC7 (VC.NET)
- CFile file(handle);
-#endif // _WIN64
-#endif
-
- CFileStatus status;
- if (!file.GetStatus(status))
- {
- LastError(_T("CFile::GetStatus"), 0);
- return false;
- }
- m_filepath = status.m_szFullName;
-
- DWORD sizehi = 0;
- DWORD sizelo = GetFileSize(handle, &sizehi);
- if (sizelo == INVALID_FILE_SIZE)
- { // MSDN says errnum will not be NO_ERROR
- int errnum = GetLastError();
- LastError(_T("GetFileSize"), errnum);
- return false;
- }
-
- m_filesize = sizehi;
- m_filesize <<= 32;
- m_filesize += sizelo;
- m_statusFetched = 1;
-
- return true;
-}
-
/** @brief Record an API call failure */
void UniLocalFile::LastError(LPCTSTR apiname, int syserrnum)
{
@@ -217,7 +155,7 @@
bool UniMemFile::GetFileStatus()
{
if (!IsOpen()) return false;
- return DoGetFileStatus(m_handle);
+ return DoGetFileStatus();
}
/** @brief Open file for generic read-only access */
Modified: trunk/Src/Common/UniFile.h
===================================================================
--- trunk/Src/Common/UniFile.h 2006-12-07 15:58:45 UTC (rev 3924)
+++ trunk/Src/Common/UniFile.h 2006-12-07 16:03:38 UTC (rev 3925)
@@ -101,7 +101,6 @@
protected:
virtual bool DoGetFileStatus();
- virtual bool DoGetFileStatus(HANDLE handle);
virtual void LastError(LPCTSTR apiname, int syserrnum);
virtual void LastErrorCustom(LPCTSTR desc);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-09 10:27:46
|
Revision: 3931
http://svn.sourceforge.net/winmerge/?rev=3931&view=rev
Author: gerundt
Date: 2006-12-09 02:27:43 -0800 (Sat, 09 Dec 2006)
Log Message:
-----------
BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Italian/MergeItalian.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-08 15:21:35 UTC (rev 3930)
+++ trunk/Src/Changes.txt 2006-12-09 10:27:43 UTC (rev 3931)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-09 Tim
+ BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
+ Src/Languages/Italian: MergeItalian.rc
+
2006-12-07 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
Src: DirScan.cpp FileInfo.cpp
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-12-08 15:21:35 UTC (rev 3930)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-12-09 10:27:43 UTC (rev 3931)
@@ -2826,8 +2826,8 @@
// MERGE MENU
STRINGTABLE
BEGIN
- ID_PREVDIFF "Visualizza la differenza precedente\nDifferenza precedente (Maiusc+Tab)"
- ID_NEXTDIFF "Visualizza la differenza successiva\nDifferenza successiva (Tab)"
+ ID_PREVDIFF "Visualizza la differenza precedente\nDifferenza precedente (Alt+Gi\xF9)"
+ ID_NEXTDIFF "Visualizza la differenza successiva\nDifferenza successiva (Alt+Su)"
ID_FIRSTDIFF "Scorre fino alla prima differenza\nPrima differenza (Alt+Home)"
ID_CURDIFF "Scorre fino alla differenza corrente\nDifferenza corrente (Alt+Invio)"
ID_LASTDIFF "Scorre fino all'ultima differenza\nUltima differenza (Alt+Fine)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-12-10 04:56:55
|
Revision: 3933
http://svn.sourceforge.net/winmerge/?rev=3933&view=rev
Author: sdottaka
Date: 2006-12-09 20:56:53 -0800 (Sat, 09 Dec 2006)
Log Message:
-----------
BUG: [ 1604115 ] No copyright info in aboutbox for translations
Modified Paths:
--------------
trunk/Src/AboutDlg.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/AboutDlg.cpp
===================================================================
--- trunk/Src/AboutDlg.cpp 2006-12-09 10:28:26 UTC (rev 3932)
+++ trunk/Src/AboutDlg.cpp 2006-12-10 04:56:53 UTC (rev 3933)
@@ -64,10 +64,7 @@
{
CDialog::OnInitDialog();
- CMergeApp *pApp = dynamic_cast<CMergeApp *> (AfxGetApp());
- WORD langId = pApp->GetLangId();
-
- CVersionInfo version(langId);
+ CVersionInfo version(AfxGetResourceHandle());
CString sVersion = version.GetFixedProductVersion();
AfxFormatString1(m_strVersion, IDS_VERSION_FMT, sVersion);
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-09 10:28:26 UTC (rev 3932)
+++ trunk/Src/Changes.txt 2006-12-10 04:56:53 UTC (rev 3933)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-10 Takashi
+ BUG: [ 1604115 ] No copyright info in aboutbox for translations
+ Src: AboutDlg.cpp
+
2006-12-09 Tim
BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
Src/Languages/Italian: MergeItalian.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-10 10:10:51
|
Revision: 3935
http://svn.sourceforge.net/winmerge/?rev=3935&view=rev
Author: galh
Date: 2006-12-10 02:10:48 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
BUG: [ 1584068 ] location pane is inaccurate when word wrap is on.
This is a code clean-up before more fixes.
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-10 04:57:47 UTC (rev 3934)
+++ trunk/Src/Changes.txt 2006-12-10 10:10:48 UTC (rev 3935)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-10 Gal
+ BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
+ Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
+
2006-12-10 Takashi
BUG: [ 1604115 ] No copyright info in aboutbox for translations
Src: AboutDlg.cpp
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2006-12-10 04:57:47 UTC (rev 3934)
+++ trunk/Src/LocationView.cpp 2006-12-10 10:10:48 UTC (rev 3935)
@@ -1,13 +1,34 @@
-//////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//
+// WinMerge: An interactive diff/merge utility
+// Copyright (C) 1997 Dean P. Grimm
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+/////////////////////////////////////////////////////////////////////////////
+
/**
* @file LocationView.cpp
*
* @brief Implementation file for CLocationView
*
*/
-//
-//////////////////////////////////////////////////////////////////////
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
#include "stdafx.h"
#include "merge.h"
#include "OptionsMgr.h"
@@ -382,7 +403,7 @@
* @brief Draw one block of map.
* @param [in] pDC Draw context.
* @param [in] r Rectangle to draw.
- * @param [in] cr Color for rectange.
+ * @param [in] cr Color for rectangle.
* @param [in] bSelected Is rectangle for selected difference?
*/
void CLocationView::DrawRect(CDC* pDC, const CRect& r, COLORREF cr, BOOL bSelected)
@@ -469,26 +490,26 @@
* FALSE if view linenumbers are OK.
* @return TRUE if succeeds, FALSE if point not inside bars.
*/
-BOOL CLocationView::GotoLocation(CPoint point, BOOL bRealLine)
+BOOL CLocationView::GotoLocation(const CPoint& point, BOOL bRealLine)
{
+ if (m_view[MERGE_VIEW_LEFT] == NULL || m_view[MERGE_VIEW_RIGHT] == NULL)
+ return FALSE;
+
CRect rc;
GetClientRect(rc);
- if (m_view[MERGE_VIEW_LEFT] == NULL || m_view[MERGE_VIEW_RIGHT] == NULL)
- return FALSE;
-
int line = -1;
int lineOther = -1;
int bar = IsInsideBar(rc, point);
if (bar == BAR_LEFT || bar == BAR_RIGHT)
{
- line = GetLineFromYPos(point.y, rc, bar, bRealLine);
+ line = GetLineFromYPos(point.y, bar, bRealLine);
}
else if (bar == BAR_YAREA)
{
// Outside bars, use left bar
bar = BAR_LEFT;
- line = GetLineFromYPos(point.y, rc, bar, FALSE);
+ line = GetLineFromYPos(point.y, bar, FALSE);
}
else
return FALSE;
@@ -557,7 +578,7 @@
// If outside bar area use left bar
if (bar == BAR_YAREA)
bar = BAR_LEFT;
- nLine = GetLineFromYPos(pt.y, rc, bar);
+ nLine = GetLineFromYPos(pt.y, bar);
strNum.Format(_T("%d"), nLine + 1); // Show linenumber not lineindex
}
else
@@ -599,13 +620,11 @@
/**
* @brief Calculates view/real line in file from given YCoord in bar.
* @param [in] nYCoord ycoord in pane
- * @param [in] rc size of locationpane
* @param [in] bar bar/file
* @param [in] bRealLine TRUE if real line is returned, FALSE for view line
* @return 0-based index of view/real line in file [0...lines-1]
*/
-int CLocationView::GetLineFromYPos(int nYCoord, CRect rc, int bar,
- BOOL bRealLine)
+int CLocationView::GetLineFromYPos(int nYCoord, int bar, BOOL bRealLine)
{
CMergeDoc* pDoc = GetDocument();
const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetLineCount(),
@@ -634,7 +653,7 @@
* @param pt [in] point we want to check, in client coordinates.
* @return LOCBAR_TYPE area where point is.
*/
-int CLocationView::IsInsideBar(CRect rc, POINT pt)
+int CLocationView::IsInsideBar(const CRect& rc, const POINT& pt)
{
int retVal = BAR_NONE;
BOOL bLeftSide = FALSE;
@@ -659,7 +678,7 @@
if (bLeftSide)
retVal = BAR_LEFT;
- else if(bRightSide)
+ else if (bRightSide)
retVal = BAR_RIGHT;
else if (bYarea)
retVal = BAR_YAREA;
@@ -679,12 +698,15 @@
CMergeDoc* pDoc = GetDocument();
const DWORD areaColor = GetSysColor(COLOR_3DFACE);
const DWORD bkColor = GetSysColor(COLOR_WINDOW);
- const int nScreenLines = pDoc->GetRightView()->GetScreenLines();
+
if (nTopLine == -1)
nTopLine = pDoc->GetRightView()->GetTopLine();
if (nBottomLine == -1)
+ {
+ const int nScreenLines = pDoc->GetRightView()->GetScreenLines();
nBottomLine = nTopLine + nScreenLines;
+ }
CRect rc;
GetClientRect(rc);
@@ -763,7 +785,7 @@
*/
void CLocationView::UpdateVisiblePos(int nTopLine, int nBottomLine)
{
- DrawVisibleAreaRect();
+ DrawVisibleAreaRect(nTopLine, nBottomLine);
if (m_displayMovedBlocks != DISPLAY_MOVED_NONE)
DrawConnectLines();
}
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2006-12-10 04:57:47 UTC (rev 3934)
+++ trunk/Src/LocationView.h 2006-12-10 10:10:48 UTC (rev 3935)
@@ -49,7 +49,7 @@
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMergeDiffDetailView)
public:
- virtual void OnUpdate( CView* pSender, LPARAM lHint, CObject* pHint);
+ virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint);
virtual void OnDraw(CDC* pDC);
//}}AFX_VIRTUAL
@@ -59,9 +59,9 @@
// Return end of block (diff/non-diff)
BOOL GetNextRect(int &nLineIndex);
void DrawRect(CDC* pDC, const CRect& r, COLORREF cr, BOOL bSelected = FALSE);
- BOOL GotoLocation(CPoint point, BOOL bRealLine = TRUE);
- int GetLineFromYPos(int nYCoord, CRect rc, int bar, BOOL bRealLine = TRUE);
- int IsInsideBar(CRect rc, POINT pt);
+ BOOL GotoLocation(const CPoint& point, BOOL bRealLine = TRUE);
+ int GetLineFromYPos(int nYCoord, int bar, BOOL bRealLine = TRUE);
+ int IsInsideBar(const CRect& rc, const POINT& pt);
void DrawVisibleAreaRect(int nTopLine = -1, int nBottomLine = -1);
void DrawConnectLines();
void DrawDiffMarker(CDC* pDC, int yCoord);
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2006-12-10 04:57:47 UTC (rev 3934)
+++ trunk/Src/MergeEditView.cpp 2006-12-10 10:10:48 UTC (rev 3935)
@@ -1790,7 +1790,7 @@
else
m_bCurrentLineIsDiff = FALSE;
- UpdateLocationViewPosition(m_nTopLine, m_nTopLine + GetScreenLines());
+ UpdateLocationViewPosition(m_nTopSubLine, m_nTopSubLine + GetScreenLines());
}
}
/**
@@ -2582,37 +2582,32 @@
// Get the current position of scroll box.
int nCurPos = si.nPos;
- BOOL bDisableSmooth = TRUE;
switch (nSBCode)
{
case SB_TOP: // Scroll to top.
nCurPos = nMinPos;
- bDisableSmooth = FALSE;
break;
case SB_BOTTOM: // Scroll to bottom.
- nCurPos = nMaxPos;
- bDisableSmooth = FALSE;
+ nCurPos = nMaxPos;
break;
case SB_LINEUP: // Scroll one line up.
- if (nCurPos > nMinPos)
+ if (nCurPos > nMinPos)
nCurPos--;
break;
case SB_LINEDOWN: // Scroll one line down.
- if (nCurPos < nMaxPos)
+ if (nCurPos < nMaxPos)
nCurPos++;
break;
case SB_PAGEUP: // Scroll one page up.
- nCurPos = max(nMinPos, nCurPos - (int) si.nPage + 1);
- bDisableSmooth = FALSE;
+ nCurPos = max(nMinPos, nCurPos - (int) si.nPage + 1);
break;
case SB_PAGEDOWN: // Scroll one page down.
- nCurPos = min(nMaxPos, nCurPos + (int) si.nPage - 1);
- bDisableSmooth = FALSE;
+ nCurPos = min(nMaxPos, nCurPos + (int) si.nPage - 1);
break;
case SB_THUMBPOSITION: // Scroll to absolute position. nPos is the position
@@ -2623,8 +2618,8 @@
nCurPos = si.nTrackPos; // position that the scroll box has been dragged to.
break;
}
-
- UpdateLocationViewPosition(nCurPos);
+
+ UpdateLocationViewPosition(nCurPos, nCurPos + GetScreenLines());
}
/**
@@ -2787,6 +2782,9 @@
// Call CMergeDoc RefreshOptions() to refresh *both* views
CMergeDoc *pDoc = GetDocument();
pDoc->RefreshOptions();
+ pDoc->UpdateAllViews(this);
+
+ UpdateCaret();
}
void CMergeEditView::OnUpdateViewWordWrap(CCmdUI* pCmdUI)
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2006-12-10 04:57:47 UTC (rev 3934)
+++ trunk/Src/MergeEditView.h 2006-12-10 10:10:48 UTC (rev 3935)
@@ -160,8 +160,15 @@
, COLORREF & crBkgnd, COLORREF & crText, BOOL & bDrawWhitespace);
void WMGoto() { OnWMGoto(); };
void GotoLine(UINT nLine, BOOL bRealLine, int pane);
- int GetTopLine() { return m_nTopLine; };
- int GetScreenLines() { return CCrystalTextView::GetScreenLines(); };
+ int GetTopLine() { return m_nTopLine; }
+ int GetScreenLines() { return CCrystalTextView::GetScreenLines(); }
+ int GetTopSubLine() { return m_nTopSubLine; }
+ int GetSubLines(int nLineIndex) { return CCrystalTextView::GetSubLines(nLineIndex); }
+ virtual int GetSubLineCount() { return CCrystalTextView::GetSubLineCount(); }
+ virtual int GetSubLineIndex(int nLineIndex) { return CCrystalTextView::GetSubLineIndex(nLineIndex); }
+ virtual void GetLineBySubLine(int nSubLineIndex, int &nLine, int &nSubLine) {
+ CCrystalTextView::GetLineBySubLine(nSubLineIndex, nLine, nSubLine);
+ }
virtual int GetEmptySubLines( int nLineIndex );
void RepaintLocationPane();
void SlavePrint(CDC* pDC, CPrintInfo* pInfo);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-12-10 14:26:59
|
Revision: 3936
http://svn.sourceforge.net/winmerge/?rev=3936&view=rev
Author: sdottaka
Date: 2006-12-10 06:26:56 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffList.h
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.dsp
trunk/Src/Merge.rc
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropCompare.cpp
trunk/Src/PropCompare.h
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Changes.txt 2006-12-10 14:26:56 UTC (rev 3936)
@@ -2,6 +2,13 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-10 Takashi
+ PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
+ Src new files: MergeDocDiffSync.cpp
+ Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
+ PropCompare.cpp PropCompare.h resource.h
+ Src/Languages/*: Merge*.rc
+
2006-12-10 Gal
BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
Modified: trunk/Src/DiffList.h
===================================================================
--- trunk/Src/DiffList.h 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/DiffList.h 2006-12-10 14:26:56 UTC (rev 3936)
@@ -53,6 +53,40 @@
};
/**
+ * @brief Relation from left side (0) to right side (1) of a DIFFRANGE
+ *
+ * Map lines from file1 to file2
+ */
+struct DiffMap : public CArray<int, int>
+{
+ enum { BAD_MAP_ENTRY = -999999999, GHOST_MAP_ENTRY = 888888888 };
+
+ // boilerplate ctr, copy ctr
+ DiffMap() { }
+ DiffMap(const DiffMap & src) { *this = src; }
+ // Simple copy assignment
+ DiffMap & operator=(const DiffMap & src)
+ {
+ this->SetSize(src.GetSize());
+ for (int i=0; i<this->GetSize(); ++i)
+ this->SetAt(i, src.GetAt(i));
+ return *this;
+ }
+ /**
+ * @brief Put DiffMap into known. starting, unfilled state
+ */
+ void InitDiffMap(int nlines)
+ {
+ SetSize(nlines);
+ for (int i=0; i<nlines; ++i)
+ {
+ // sentry value so we can check later that we set them all
+ SetAt(i, BAD_MAP_ENTRY);
+ }
+ }
+};
+
+/**
* @brief DIFFRANGE with links for chain of non-trivial entries
*
* Next and prev are array indices used by the owner (DiffList)
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&File Compare method:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1131,15 +1131,17 @@
7,80,221,10
CONTROL "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xF0\xE0\xE7\xEF\xEE\xE7\xED\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE5\xED &\xE1\xEB\xEE\xEA",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "\xCC\xE5\xF2\xEE\xE4 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "\xCC\xE5\xF2\xEE\xE4 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&\xD1\xEF\xF0\xE8 \xF1\xEB\xE5\xE4 \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "\xCA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "\xCA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8",IDC_STATIC,7,144,221,32
CONTROL "\xD4\xE8\xEB\xF2\xFA\xF0 \xE7\xE0 \xEA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "&Habilita detecci\xF3 de blocs despla\xE7ats",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "M\xE8tode de comparaci\xF3 de &fitxers:",IDC_STATIC,7,105,113,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,120,103,110,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "M\xE8tode de comparaci\xF3 de &fitxers:",IDC_STATIC,7,115,113,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,120,113,110,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Atura despr\xE9s de la primera difer\xE8ncia",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comentaris",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comentaris",IDC_STATIC,7,144,221,32
CONTROL "Filtra els comentaris",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Predeterminats",IDC_COMPARE_DEFAULTS,7,179,63,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Predeterminats",IDC_COMPARE_DEFAULTS,7,189,63,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1131,15 +1131,17 @@
7,80,221,10
CONTROL "\xD4\xCA\xD0\xED\xBC\xEC\xB2\xE2\xD2ƶ\xAF\xC7\xF8\xBF\xE9(&N)",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "\xCEļ\xFE\xB6Աȷ\xBD\xB7\xA8(&F)",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "\xCEļ\xFE\xB6Աȷ\xBD\xB7\xA8(&F)",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "\xD3\xF6\xB5\xBD\xCA״\xA6\xB2\xBBͬ\xBA\xF3ֹͣ(&T)",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Ĭ\xC8\xCF",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Ĭ\xC8\xCF",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "\xB1ҥβ\xBE\xB0ʰ϶\xFA(&N)",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "\xC0ɮפ\xF1\xB8\xFB\xA4\xE8\xAAk(&F):",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "\xC0ɮפ\xF1\xB8\xFB\xA4\xE8\xAAk(&F):",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "\xB9w\xB3]\xAD\xC8",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "\xB9w\xB3]\xAD\xC8",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "Povolit zji\x9A\x9Dov\xE1n\xED p\xF8esunut\xFDch &blok\xF9",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "Zp\xF9sob porovn\xE1n\xED &soubor\xF9:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "Zp\xF9sob porovn\xE1n\xED &soubor\xF9:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Zastavit po prvn\xEDm &rozd\xEDlu",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Koment\xE1\xF8e",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Koment\xE1\xF8e",IDC_STATIC,7,144,221,32
CONTROL "Filtrovat kom&ent\xE1\xF8e",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "&P\xF9vodn\xED",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "&P\xF9vodn\xED",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "&Aktiver detektion af flyttede blokke",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&Fil sammenligningsmetode:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&Fil sammenligningsmetode:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Standard",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Standard",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "Detectie verplaatste blokken i&nschakelen",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "Met&hode bestandsvergelijking:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "Met&hode bestandsvergelijking:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Standaardinstellingen",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Standaardinstellingen",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/French/MergeFrench.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1128,15 +1128,17 @@
7,80,221,10
CONTROL "&Qualifier la d\xE9tection des blocs d\xE9plac\xE9s",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&Methode de comparaison:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&Methode de comparaison:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Arr\xEAter \xE0 la premi\xE8re diff\xE9rence",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "&D\xE9fauts",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "&D\xE9fauts",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "Verschobene &Bl\xF6cke erkennen",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "Vergleichs&methode:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "Vergleichs&methode:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Nach dem ersten Unterschied &stoppen",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Kommentare",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Kommentare",IDC_STATIC,7,144,221,32
CONTROL "Kommentare filtern",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Vorgaben",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Vorgaben",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "Mozgatott &blokk \xE9szlel\xE9s bekapcsol\xE1sa",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&F\xE1jl \xF6sszehasonl\xEDt\xE1si m\xF3dszer:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&F\xE1jl \xF6sszehasonl\xEDt\xE1si m\xF3dszer:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Meg\xE1ll\xE1s az &els\xF5 k\xFCl\xF6nbs\xE9gn\xE9l",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Alap\xE9rt\xE9kek",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Alap\xE9rt\xE9kek",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "Attiva il rilevamento di blocc&hi spostati",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&Metodo confronto file:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&Metodo confronto file:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Fermati dopo la prima differenza",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Commenti",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Commenti",IDC_STATIC,7,144,221,32
CONTROL "Filtra i commenti",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Predefinito",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Predefinito",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "\x88ړ\xAE\x83u\x83\x8D\x83b\x83N\x8C\x9F\x8Fo\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&N)",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "\x83t\x83@\x83C\x83\x8B\x94\xE4\x8Ar\x95\xFB\x96@(&F):",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "\x97ގ\x97\x8Ds\x82\xF0\x83}\x83b\x83`\x82\xB3\x82\xB9\x82\xE9(&M)",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "\x83t\x83@\x83C\x83\x8B\x94\xE4\x8Ar\x95\xFB\x96@(&F):",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "\x8Dŏ\x89\x82̍\xB7\x88قŔ\xE4\x8Ar\x82\xF0\x8FI\x97\xB9\x82\xB7\x82\xE9(&T)",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "\x83R\x83\x81\x83\x93\x83g",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "\x83R\x83\x81\x83\x93\x83g",IDC_STATIC,7,144,221,32
CONTROL "\x83R\x83\x81\x83\x93\x83g\x82̍\xB7\x88ق\x8B\x82\xB7\x82\xE9",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "\x83f\x83t\x83H\x83\x8B\x83g",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "\x83f\x83t\x83H\x83\x8B\x83g",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
@@ -2423,11 +2425,11 @@
IDS_DIFF_UNIFIED "\x83\x86\x83j\x83t\x83@\x83C\x83h"
IDS_FILEWRITE_ERROR "\x83t\x83@\x83C\x83\x8B %1\x82ɏ\x91\x82\xAB\x8D\x9E\x82߂܂\xB9\x82\xF1\x81B"
IDS_PATH_NOT_ABSOLUTE "\x8Ew\x92肵\x82\xBD\x8Fo\x97̓p\x83X\x82́A\x90\xE2\x91p\x83X\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1: %1"
- IDS_MUST_SPECIFY_OUTPUT "\x8Fo\x97̓p\x83X\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2"
+ IDS_MUST_SPECIFY_OUTPUT "\x8Fo\x97̓p\x83X\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2"
IDS_CANNOT_CREATE_BINARYPATCH "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82͐\xB6\x90\xAC\x82ł\xAB\x82܂\xB9\x82\xF1\x81B"
IDS_CANNOT_CREATE_DIRPATCH "\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82͐\xB6\x90\xAC\x82ł\xAB\x82܂\xB9\x82\xF1\x81B"
IDS_SAVEFILES_FORPATCH "\x82܂\xB8\x90\xE6\x82ɑS\x82Ẵt\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B\n\n\x83p\x83b\x83`\x90\xB6\x90\xAC\x82ɂ́A\x95ύX\x82\xAA\x91S\x82ĕۑ\xB6\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B"
- IDS_FOLDER_NOTEXIST "\x83t\x83H\x83\x8B\x83_\x82͑\xB6\x8D݂\xB5\x82܂\xB9\x82\xF1\x81B"
+ IDS_FOLDER_NOTEXIST "\x83t\x83H\x83\x8B\x83_\x82͑\xB6\x8D݂\xB5\x82܂\xB9\x82\xF1\x81B"
END
STRINGTABLE
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "\xC0̵\xBF\xBF\xB5\xBF\xAA ã\xB1\xE2 Ȱ\xBC\xBAȭ",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "\xC6\xC4\xC0\xCF \xBA\xF1\xB1\xB3 \xB9\xE6\xBD\xC4(&F):",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "\xC6\xC4\xC0\xCF \xBA\xF1\xB1\xB3 \xB9\xE6\xBD\xC4(&F):",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "\xB1⺻\xB0\xAA",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "\xB1⺻\xB0\xAA",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "&Aktiver flyttet blokk-oppdagelse",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&Filsammenligningsmetode:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&Filsammenligningsmetode:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Standardverdier",IDC_COMPARE_DEFAULTS,7,179,70,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Standardverdier",IDC_COMPARE_DEFAULTS,7,189,70,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "W\xB3\xB9cz &wykrywanie przeniesionych blok\xF3w",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&Metoda por\xF3wnania plik\xF3w:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&Metoda por\xF3wnania plik\xF3w:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Zatrzymaj po pierwszej r\xF3\xBFnicy",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Domy\x9Clne",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Domy\x9Clne",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "\xCE\xE1\xED\xE0\xF0\xF3\xE6\xE5\xED\xE8\xE5 \xEF\xE5\xF0\xE5\xEC\xE5&\xF9\xE5\xED\xED\xFB\xF5 \xE1\xEB\xEE\xEA\xEE\xE2",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "\xCC\xE5\xF2\xEE\xE4 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF &\xF4\xE0\xE9\xEB\xEE\xE2:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "\xCC\xE5\xF2\xEE\xE4 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF &\xF4\xE0\xE9\xEB\xEE\xE2:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&\xCE\xF1\xF2\xE0\xED\xE0\xE2\xEB\xE8\xE2\xE0\xF2\xFC\xF1\xFF \xEF\xEE\xF1\xEB\xE5 \xEF\xE5\xF0\xE2\xEE\xE3\xEE \xEE\xF2\xEB\xE8\xF7\xE8\xFF",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE",IDC_COMPARE_DEFAULTS,7,179,61,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE",IDC_COMPARE_DEFAULTS,7,189,61,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "Zapn\xFA\x9D &detekciu pohybliv\xE9ho bloku",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "Me&t\xF3da porovn\xE1vania s\xFAborov:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "Me&t\xF3da porovn\xE1vania s\xFAborov:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Stop po prvom rozdiele",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Koment\xE1re",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Koment\xE1re",IDC_STATIC,7,144,221,32
CONTROL "Filtrova\x9D koment\xE1re",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Predvolen\xE9",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Predvolen\xE9",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "&Habilitar detecci\xF3n de bloques movidos",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "Com¶r:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "Com¶r:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "&Parar despu\xE9s de la primera diferencia",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comentarios",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comentarios",IDC_STATIC,7,144,221,32
CONTROL "Filtrar comentarios",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Por defecto",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Por defecto",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "M&\xF6jligg\xF6r detektion av flyttade textblock",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&Filj\xE4mf\xF6relsemetod:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&Filj\xE4mf\xF6relsemetod:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&toppa efter f\xF6rsta skillnaden",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Kommentarer",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Kommentarer",IDC_STATIC,7,144,221,32
CONTROL "Filterkommentarer",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Standard",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Standard",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 259, 186
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1130,15 +1130,17 @@
7,80,221,10
CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&File Compare method:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Merge.dsp 2006-12-10 14:26:56 UTC (rev 3936)
@@ -570,6 +570,10 @@
# End Source File
# Begin Source File
+SOURCE=.\MergeDocDiffSync.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\MergeDocEncoding.cpp
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/Merge.rc 2006-12-10 14:26:56 UTC (rev 3936)
@@ -1140,15 +1140,17 @@
7,80,221,10
CONTROL "E&nable moved block detection",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- LTEXT "&File Compare method:",IDC_STATIC,7,105,100,9
- COMBOBOX IDC_COMPAREMETHODCOMBO,110,103,114,70,CBS_DROPDOWNLIST |
+ CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
+ LTEXT "&File Compare method:",IDC_STATIC,7,115,100,9
+ COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "S&top after first difference",IDC_COMPARE_STOPFIRST,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
+ GROUPBOX "Comments",IDC_STATIC,7,144,221,32
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
- PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,179,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
+ PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,189,50,14
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/MergeDoc.cpp 2006-12-10 14:26:56 UTC (rev 3936)
@@ -484,6 +484,10 @@
m_ptBuf[0]->prepareForRescan();
m_ptBuf[1]->prepareForRescan();
+ // Divide diff blocks to match lines.
+ if (GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES))
+ AdjustDiffBlocks();
+
// Analyse diff-list (updating real line-numbers)
// this operation does not change the modified flag
PrimeTextBuffers();
Modified: trunk/Src/MergeDoc.h
===================================================================
--- trunk/Src/MergeDoc.h 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/MergeDoc.h 2006-12-10 14:26:56 UTC (rev 3936)
@@ -348,6 +348,9 @@
DECLARE_MESSAGE_MAP()
private:
void PrimeTextBuffers();
+ void AdjustDiffBlocks();
+ void AdjustDiffBlock(DiffMap & diffmap, const DIFFRANGE & diffrange, int lo0, int hi0, int lo1, int hi1);
+ int GetMatchCost(const CString &Line0, const CString &Line1);
void FlagMovedLines(MovedLines * pMovedLines, CDiffTextBuffer * pBuffer1,
CDiffTextBuffer * pBuffer2);
CString GetFileExt(const CString& sFileName, const CString& sDescription);
Modified: trunk/Src/OptionsDef.h
===================================================================
--- trunk/Src/OptionsDef.h 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/OptionsDef.h 2006-12-10 14:26:56 UTC (rev 3936)
@@ -107,6 +107,7 @@
const TCHAR OPT_CMP_IGNORE_EOL[] = _T("Settings/IgnoreEol");
const TCHAR OPT_CMP_METHOD[] = _T("Settings/CompMethod");
const TCHAR OPT_CMP_MOVED_BLOCKS[] = _T("Settings/MovedBlocks");
+const TCHAR OPT_CMP_MATCH_SIMILAR_LINES[] = _T("Settings/MatchSimilarLines");
const TCHAR OPT_CMP_STOP_AFTER_FIRST[] = _T("Settings/StopAfterFirst");
const TCHAR OPT_CMP_QUICK_LIMIT[] = _T("Settings/QuickMethodLimit");
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/OptionsInit.cpp 2006-12-10 14:26:56 UTC (rev 3936)
@@ -74,6 +74,7 @@
m_options.InitOption(OPT_CMP_IGNORE_EOL, false);
m_options.InitOption(OPT_CMP_METHOD, (int)CMP_CONTENT);
m_options.InitOption(OPT_CMP_MOVED_BLOCKS, false);
+ m_options.InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
m_options.InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
m_options.InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
Modified: trunk/Src/PropCompare.cpp
===================================================================
--- trunk/Src/PropCompare.cpp 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/PropCompare.cpp 2006-12-10 14:26:56 UTC (rev 3936)
@@ -33,6 +33,7 @@
, m_bIgnoreEol(TRUE)
, m_nIgnoreWhite(-1)
, m_bMovedBlocks(FALSE)
+ , m_bMatchSimilarLines(FALSE)
, m_bStopAfterFirst(FALSE)
, m_bFilterCommentsLines(FALSE)
{
@@ -49,6 +50,7 @@
DDX_Check(pDX, IDC_EOL_SENSITIVE, m_bIgnoreEol);
DDX_Radio(pDX, IDC_WHITESPACE, m_nIgnoreWhite);
DDX_Check(pDX, IDC_MOVED_BLOCKS, m_bMovedBlocks);
+ DDX_Check(pDX, IDC_MATCH_SIMILAR_LINES, m_bMatchSimilarLines);
DDX_Check(pDX, IDC_COMPARE_STOPFIRST, m_bStopAfterFirst);
//}}AFX_DATA_MAP
}
@@ -74,6 +76,7 @@
m_bIgnoreCase = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_CASE);
m_bIgnoreEol = m_pOptionsMgr->GetBool(OPT_CMP_IGNORE_EOL) ? true : false;
m_bMovedBlocks = m_pOptionsMgr->GetBool(OPT_CMP_MOVED_BLOCKS);
+ m_bMatchSimilarLines = m_pOptionsMgr->GetBool(OPT_CMP_MATCH_SIMILAR_LINES);
m_compareMethod = m_pOptionsMgr->GetInt(OPT_CMP_METHOD);
m_bStopAfterFirst = m_pOptionsMgr->GetBool(OPT_CMP_STOP_AFTER_FIRST);
}
@@ -92,6 +95,7 @@
m_pOptionsMgr->SaveOption(OPT_CMP_IGNORE_CASE, m_bIgnoreCase == TRUE);
m_pOptionsMgr->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
m_pOptionsMgr->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
+ m_pOptionsMgr->SaveOption(OPT_CMP_MATCH_SIMILAR_LINES, m_bMatchSimilarLines == TRUE);
m_pOptionsMgr->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
}
@@ -148,6 +152,8 @@
m_bIgnoreCase = tmp;
m_pOptionsMgr->GetDefault(OPT_CMP_MOVED_BLOCKS, tmp);
m_bMovedBlocks = tmp;
+ m_pOptionsMgr->GetDefault(OPT_CMP_MATCH_SIMILAR_LINES, tmp);
+ m_bMatchSimilarLines = tmp;
m_pOptionsMgr->GetDefault(OPT_CMP_STOP_AFTER_FIRST, tmp);
m_bStopAfterFirst = tmp;
UpdateData(FALSE);
Modified: trunk/Src/PropCompare.h
===================================================================
--- trunk/Src/PropCompare.h 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/PropCompare.h 2006-12-10 14:26:56 UTC (rev 3936)
@@ -52,6 +52,7 @@
BOOL m_bIgnoreBlankLines;
int m_nIgnoreWhite;
BOOL m_bMovedBlocks;
+ BOOL m_bMatchSimilarLines;
BOOL m_bStopAfterFirst;
BOOL m_bFilterCommentsLines;
//}}AFX_DATA
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-12-10 10:10:48 UTC (rev 3935)
+++ trunk/Src/resource.h 2006-12-10 14:26:56 UTC (rev 3936)
@@ -384,6 +384,7 @@
#define IDC_REPORT_COPYCLIPBOARD 1309
#define IDC_EXPLORER_SUBFOLDERS 1310
#define IDC_FILTERFILE_INSTALL 1311
+#define IDC_MATCH_SIMILAR_LINES 1312
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-10 14:36:10
|
Revision: 3938
http://svn.sourceforge.net/winmerge/?rev=3938&view=rev
Author: galh
Date: 2006-12-10 06:36:06 -0800 (Sun, 10 Dec 2006)
Log Message:
-----------
BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDiffDetailView.cpp
trunk/Src/MergeDiffDetailView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-10 14:33:16 UTC (rev 3937)
+++ trunk/Src/Changes.txt 2006-12-10 14:36:06 UTC (rev 3938)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-10 Gal
+ BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
+ Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
+
2006-12-10 Takashi
PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
Src new files: MergeDocDiffSync.cpp
Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp 2006-12-10 14:33:16 UTC (rev 3937)
+++ trunk/Src/MergeDiffDetailView.cpp 2006-12-10 14:36:06 UTC (rev 3938)
@@ -70,6 +70,7 @@
ON_UPDATE_COMMAND_UI(ID_L2R, OnUpdateL2r)
ON_COMMAND(ID_R2L, OnR2l)
ON_UPDATE_COMMAND_UI(ID_R2L, OnUpdateR2l)
+ ON_UPDATE_COMMAND_UI(ID_VIEW_WORDWRAP, OnUpdateViewWordWrap)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -801,3 +802,9 @@
GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
SetWordWrapping(FALSE);
}
+
+void CMergeDiffDetailView::OnUpdateViewWordWrap(CCmdUI *pCmdUI)
+{
+ pCmdUI->Enable(FALSE);
+ pCmdUI->SetCheck(m_bWordWrap);
+}
Modified: trunk/Src/MergeDiffDetailView.h
===================================================================
--- trunk/Src/MergeDiffDetailView.h 2006-12-10 14:33:16 UTC (rev 3937)
+++ trunk/Src/MergeDiffDetailView.h 2006-12-10 14:36:06 UTC (rev 3938)
@@ -136,6 +136,7 @@
afx_msg void OnUpdateL2r(CCmdUI* pCmdUI);
afx_msg void OnR2l();
afx_msg void OnUpdateR2l(CCmdUI* pCmdUI);
+ afx_msg void OnUpdateViewWordWrap(CCmdUI *pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-11 22:33:10
|
Revision: 3946
http://svn.sourceforge.net/winmerge/?rev=3946&view=rev
Author: kimmov
Date: 2006-12-11 14:18:50 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
Fix error in logical condition for checking if item is directory
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileInfo.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-11 22:12:20 UTC (rev 3945)
+++ trunk/Src/Changes.txt 2006-12-11 22:18:50 UTC (rev 3946)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-11 Kimmo
+ Fix error in logical condition for checking if item is directory
+ Src: FileInfo.cpp
+
2006-12-10 Gal
BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
Modified: trunk/Src/FileInfo.cpp
===================================================================
--- trunk/Src/FileInfo.cpp 2006-12-11 22:12:20 UTC (rev 3945)
+++ trunk/Src/FileInfo.cpp 2006-12-11 22:18:50 UTC (rev 3946)
@@ -53,7 +53,7 @@
mtime64 = fstats.st_mtime;
// No size for directory ( size remains as -1)
- if ((fstats.st_mode | _S_IFDIR) != 0)
+ if ((fstats.st_mode & _S_IFDIR) == 0)
size = fstats.st_size;
flags.attributes = GetFileAttributes(sFilePath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-11 22:33:14
|
Revision: 3948
http://svn.sourceforge.net/winmerge/?rev=3948&view=rev
Author: kimmov
Date: 2006-12-11 14:30:16 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/Merge.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-11 22:27:30 UTC (rev 3947)
+++ trunk/Src/Changes.txt 2006-12-11 22:30:16 UTC (rev 3948)
@@ -7,6 +7,8 @@
Src: FileInfo.cpp
PATCH: [ 1610998 ] Splash screen does not stop timer
Src: Splash.cpp
+ PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
+ Src: FileOrFolderSelect.cpp Merge.cpp
2006-12-10 Gal
BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2006-12-11 22:27:30 UTC (rev 3947)
+++ trunk/Src/FileOrFolderSelect.cpp 2006-12-11 22:30:16 UTC (rev 3948)
@@ -31,6 +31,19 @@
#include "coretools.h"
#include "paths.h"
+// VC 6 headers don't define these constants for folder browse dialog
+// so define them here. Copied from shlobj.h
+#ifndef BIF_EDITBOX
+#define BIF_EDITBOX 0x0010 // Add an editbox to the dialog
+#endif
+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE 0x0040 // Use the new dialog layout with the ability to resize
+ // Caller needs to call OleInitialize() before using this API
+#endif
+#ifndef BIF_USENEWUI
+#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
+#endif
+
/**
* @brief Helper function for selecting dir/file
* @param [in] parent Handle to parent window. Can be a NULL, but then
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-12-11 22:27:30 UTC (rev 3947)
+++ trunk/Src/Merge.cpp 2006-12-11 22:30:16 UTC (rev 3948)
@@ -60,20 +60,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-// VC 6 headers don't define these constants for folder browse dialog
-// so define them here. Copied from shlobj.h
-#ifndef BIF_EDITBOX
-#define BIF_EDITBOX 0x0010 // Add an editbox to the dialog
-#endif
-#ifndef BIF_NEWDIALOGSTYLE
-#define BIF_NEWDIALOGSTYLE 0x0040 // Use the new dialog layout with the ability to resize
- // Caller needs to call OleInitialize() before using this API
-#endif
-#ifndef BIF_USENEWUI
-#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
-#endif
-
-
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-11 22:38:45
|
Revision: 3947
http://svn.sourceforge.net/winmerge/?rev=3947&view=rev
Author: kimmov
Date: 2006-12-11 14:27:30 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
PATCH: [ 1610998 ] Splash screen does not stop timer
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Splash.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-11 22:18:50 UTC (rev 3946)
+++ trunk/Src/Changes.txt 2006-12-11 22:27:30 UTC (rev 3947)
@@ -5,6 +5,8 @@
2006-12-11 Kimmo
Fix error in logical condition for checking if item is directory
Src: FileInfo.cpp
+ PATCH: [ 1610998 ] Splash screen does not stop timer
+ Src: Splash.cpp
2006-12-10 Gal
BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
Modified: trunk/Src/Splash.cpp
===================================================================
--- trunk/Src/Splash.cpp 2006-12-11 22:18:50 UTC (rev 3946)
+++ trunk/Src/Splash.cpp 2006-12-11 22:27:30 UTC (rev 3947)
@@ -53,6 +53,9 @@
/** @brief Area for copyright text. */
static const CRect CopyrightArea(20, 210, 190, 330);
+/** @brief ID for the timer closing splash screen. */
+static const UINT_PTR SplashTimerID = 1;
+
/////////////////////////////////////////////////////////////////////////////
// Splash Screen class
@@ -161,6 +164,7 @@
*/
void CSplashWnd::HideSplashScreen()
{
+ KillTimer(SplashTimerID);
m_pPicture->Free();
delete m_pPicture;
m_pPicture = NULL;
@@ -188,7 +192,7 @@
CenterWindow();
// Set a timer to destroy the splash screen.
- SetTimer(1, 5000, NULL);
+ SetTimer(SplashTimerID, 5000, NULL);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-13 07:17:21
|
Revision: 3959
http://svn.sourceforge.net/winmerge/?rev=3959&view=rev
Author: galh
Date: 2006-12-12 23:17:17 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/LocationView.cpp
trunk/Src/LocationView.h
trunk/Src/MergeEditView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-12 22:26:09 UTC (rev 3958)
+++ trunk/Src/Changes.txt 2006-12-13 07:17:17 UTC (rev 3959)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-13 Gal
+ BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
+ Src: LocationView.cpp LocationView.h MergeEditView.cpp
+
2006-12-11 Kimmo
Fix error in logical condition for checking if item is directory
Src: FileInfo.cpp
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2006-12-12 22:26:09 UTC (rev 3958)
+++ trunk/Src/LocationView.cpp 2006-12-13 07:17:17 UTC (rev 3959)
@@ -46,7 +46,7 @@
#endif
/** @brief Size of empty frame above and below bars (in pixels). */
-static const DWORD Y_OFFSET = 5;
+static const int Y_OFFSET = 5;
/** @brief Size of y-margin for visible area indicator (in pixels). */
static const long INDICATOR_MARGIN = 2;
@@ -161,9 +161,6 @@
* every difference is drawn with same colors as in editview.
* @note We MUST use doubles when calculating coords to avoid rounding
* to integers. Rounding causes miscalculation of coords.
- * @todo Use of GetNextRect() is inefficient, it reads diffs sometimes
- * twice when it first asks next diff when line is not in any diff. And
- * then reads same diff again when in diff.
* @sa CLocationView::DrawRect()
*/
void CLocationView::OnDraw(CDC* pDC)
@@ -186,15 +183,14 @@
m_nRightBarLeft = 2 * m_nLeftBarLeft + w;
m_nRightBarRight = m_nRightBarLeft + w;
const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
- const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetLineCount(),
- m_view[MERGE_VIEW_RIGHT]->GetLineCount());
+ const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
+ m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
+
double LineInPix = hTotal / nbLines;
COLORREF cr0 = CLR_NONE; // Left side color
COLORREF cr1 = CLR_NONE; // Right side color
COLORREF crt = CLR_NONE; // Text color
BOOL bwh = FALSE;
- int nstart0 = -1;
- int nend0 = -1;
m_pixInLines = nbLines / hTotal;
if (LineInPix > MAX_LINEPIX)
@@ -215,37 +211,50 @@
// Draw bar outlines
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, LineInPix * nbLines + Y_OFFSET + 1);
- pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, LineInPix * nbLines + Y_OFFSET + 1);
+ const int nBottom = (int)(LineInPix * nbLines + Y_OFFSET + 1);
+ pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, nBottom);
+ pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, nBottom);
pDC->SelectObject(oldObj);
- while (true)
+ // Iterate the differences list and draw differences as colored blocks.
+ for (int nDiff = 0; nDiff < pDoc->m_diffList.GetSize(); ++nDiff)
{
- // here nstart0 = last line before block
- BOOL ok0 = GetNextRect(nend0);
- if (!ok0)
- break;
+ DIFFRANGE diff;
+ VERIFY(pDoc->m_diffList.GetDiff(nDiff, diff));
- // here nend0 = last line of block
- int blockHeight = nend0 - nstart0;
- nstart0++;
+ // Skip trivial differences.
+ if (m_bIgnoreTrivials && diff.op == OP_TRIVIAL)
+ {
+ continue;
+ }
- // here nstart0 = first line of block
- int nBeginY = (int) (nstart0 * LineInPix + Y_OFFSET);
- int nEndY = (int) ((blockHeight + nstart0) * LineInPix + Y_OFFSET);
- BOOL bInsideDiff = m_view[MERGE_VIEW_LEFT]->IsLineInCurrentDiff(nstart0);
+ // Find end of diff. If first side has blank lines use other side.
+ const int nLineEndDiff = (diff.blank0 > 0) ? diff.dend1 : diff.dend0;
+ CMergeEditView *pView = m_view[MERGE_VIEW_LEFT];
+
+ // Count how many line does the diff block have.
+ const int nBlockStart = pView->GetSubLineIndex(diff.dbegin0);
+ const int nBlockEnd = pView->GetSubLineIndex(nLineEndDiff);
+ const int nBlockHeight = nBlockEnd - nBlockStart + pView->GetSubLines(nLineEndDiff);
+
+ // Convert diff block size from lines to pixels.
+ const int nBeginY = (int)(nBlockStart * LineInPix + Y_OFFSET);
+ const int nEndY = (int)((nBlockStart + nBlockHeight) * LineInPix + Y_OFFSET);
+
// If no selected diff, remove diff marker
if (pDoc->GetCurrentDiff() == -1)
DrawDiffMarker(pDC, -1);
+ const BOOL bInsideDiff = pView->IsLineInCurrentDiff(diff.dbegin0);
+
// Draw left side block
- m_view[MERGE_VIEW_LEFT]->GetLineColors2(nstart0, ignoreFlags, cr0, crt, bwh);
+ m_view[MERGE_VIEW_LEFT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr0, crt, bwh);
CRect r0(m_nLeftBarLeft, nBeginY, m_nLeftBarRight, nEndY);
DrawRect(pDC, r0, cr0, bInsideDiff);
-
+
// Draw right side block
- m_view[MERGE_VIEW_RIGHT]->GetLineColors2(nstart0, ignoreFlags, cr1, crt, bwh);
+ m_view[MERGE_VIEW_RIGHT]->GetLineColors2(diff.dbegin0, ignoreFlags, cr1, crt, bwh);
CRect r1(m_nRightBarLeft, nBeginY, m_nRightBarRight, nEndY);
DrawRect(pDC, r1, cr1, bInsideDiff);
@@ -273,7 +282,7 @@
if (bDisplayConnectorFromLeft)
{
- int apparent0 = nstart0;
+ int apparent0 = diff.dbegin0;
int apparent1 = pDoc->RightLineInMovedBlock(apparent0);
if (apparent1 != -1)
{
@@ -281,13 +290,16 @@
CPoint start;
CPoint end;
+ apparent0 = pView->GetSubLineIndex(apparent0);
+ apparent1 = pView->GetSubLineIndex(apparent1);
+
start.x = m_nLeftBarRight;
int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
- int leftLower = (int) ((blockHeight + apparent0) * LineInPix + Y_OFFSET);
+ int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
end.x = m_nRightBarLeft;
int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
- int rightLower = (int) ((blockHeight + apparent1) * LineInPix + Y_OFFSET);
+ int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
line.ptLeft = start;
line.ptRight = end;
@@ -297,7 +309,7 @@
if (bDisplayConnectorFromRight)
{
- int apparent1 = nstart0;
+ int apparent1 = diff.dbegin0;
int apparent0 = pDoc->LeftLineInMovedBlock(apparent1);
if (apparent0 != -1)
{
@@ -305,101 +317,29 @@
CPoint start;
CPoint end;
+ apparent0 = pView->GetSubLineIndex(apparent0);
+ apparent1 = pView->GetSubLineIndex(apparent1);
+
start.x = m_nLeftBarRight;
int leftUpper = (int) (apparent0 * LineInPix + Y_OFFSET);
- int leftLower = (int) ((blockHeight + apparent0) * LineInPix + Y_OFFSET);
+ int leftLower = (int) ((nBlockHeight + apparent0) * LineInPix + Y_OFFSET);
start.y = leftUpper + (leftLower - leftUpper) / 2;
end.x = m_nRightBarLeft;
int rightUpper = (int) (apparent1 * LineInPix + Y_OFFSET);
- int rightLower = (int) ((blockHeight + apparent1) * LineInPix + Y_OFFSET);
+ int rightLower = (int) ((nBlockHeight + apparent1) * LineInPix + Y_OFFSET);
end.y = rightUpper + (rightLower - rightUpper) / 2;
line.ptLeft = start;
line.ptRight = end;
m_movedLines.AddTail(line);
}
}
+ }
- nstart0 = nend0;
-
- } // blocks loop
-
if (m_displayMovedBlocks != DISPLAY_MOVED_NONE)
DrawConnectLines();
}
/**
- * @brief Return end of block.
- *
- * Starting from lineindex (not number!) given, finds last line in same block.
- * A block is either all the lines of a diff, or all the lines that separates
- * two diffs, or the beginning lines before the first diff, or the last lines
- * after the last diff.
- * @param nLineIndex [in,out]
- * - [in] Lineindex where search begins
- * - [out] Lineindex of last line in same block
- * @return TRUE if last line found.
- */
-BOOL CLocationView::GetNextRect(int &nLineIndex)
-{
- CMergeDoc *pDoc = GetDocument();
- const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetLineCount(),
- m_view[MERGE_VIEW_RIGHT]->GetLineCount());
-
- while(1)
- {
- ++nLineIndex;
- if (nLineIndex >= nbLines)
- return FALSE;
-
- // If no diffs, return last line of file.
- if (!pDoc->m_diffList.HasSignificantDiffs())
- {
- nLineIndex = nbLines - 1;
- return TRUE;
- }
-
- int nextDiff = -1;
- BOOL bInDiff = pDoc->m_diffList.GetNextDiff(nLineIndex, nextDiff);
-
- // No diffs after line, return last line of file.
- if (nextDiff == -1)
- {
- nLineIndex = nbLines - 1;
- return TRUE;
- }
-
- const DIFFRANGE * dfi = pDoc->m_diffList.DiffRangeAt(nextDiff);
- if (!dfi)
- {
- _RPTF1(_CRT_ERROR, "DiffList error, GetNextDiff() returned "
- "%d but DiffRangeAt() failed to get that diff!",
- nextDiff);
- return FALSE;
- }
-
- bool ignoreDiff = (m_bIgnoreTrivials && dfi->op == OP_TRIVIAL);
-
- if (!ignoreDiff && !bInDiff)
- {
- // Next diff to line was found and line is not inside it.
- // Return previous line to diff. This is safe since line has
- // next diff so there must be lines before the diff.
- nLineIndex = dfi->dbegin0 - 1;
- return TRUE;
- }
-
- // Find end of diff. If first side has blank lines use other side.
- int nLineEndDiff = (dfi->blank0 > 0) ? dfi->dend1 : dfi->dend0;
-
- nLineIndex = nLineEndDiff;
-
- if (!ignoreDiff)
- return TRUE;
- // Fall through loop & look for next diff (we ignored this one)
- }
-}
-
-/**
* @brief Draw one block of map.
* @param [in] pDC Draw context.
* @param [in] r Rectangle to draw.
@@ -457,10 +397,30 @@
*/
void CLocationView::OnMouseMove(UINT nFlags, CPoint point)
{
- if(GetCapture() == this)
+ if (GetCapture() == this)
{
- if(GotoLocation(point, FALSE))
- return;
+ // Don't go above bars.
+ point.y = max(point.y, Y_OFFSET);
+
+ // Vertical scroll handlers are range safe, so there is no need to
+ // make sure value is valid and in range.
+ const int nSubLine = (int) (m_pixInLines * (point.y - Y_OFFSET));
+
+ // Just a random choose as both view share the same scroll bar.
+ CWnd *pView = m_view[MERGE_VIEW_LEFT];
+
+ SCROLLINFO si = {0};
+ si.cbSize = sizeof(si);
+ si.fMask = SIF_POS;
+ si.nPos = nSubLine;
+ pView->SetScrollInfo(SB_VERT, &si);
+
+ // The views are child windows of a splitter windows. Splitter window
+ // doesn't accept scroll bar updates not send from scroll bar control.
+ // So we need to update both views.
+ pView->SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, 0), NULL);
+ pView = m_view[MERGE_VIEW_RIGHT];
+ pView->SendMessage(WM_VSCROLL, MAKEWPARAM(SB_THUMBPOSITION, 0), NULL);
}
CView::OnMouseMove(nFlags, point);
@@ -492,9 +452,6 @@
*/
BOOL CLocationView::GotoLocation(const CPoint& point, BOOL bRealLine)
{
- if (m_view[MERGE_VIEW_LEFT] == NULL || m_view[MERGE_VIEW_RIGHT] == NULL)
- return FALSE;
-
CRect rc;
GetClientRect(rc);
@@ -626,24 +583,39 @@
*/
int CLocationView::GetLineFromYPos(int nYCoord, int bar, BOOL bRealLine)
{
- CMergeDoc* pDoc = GetDocument();
- const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetLineCount(),
- m_view[MERGE_VIEW_RIGHT]->GetLineCount());
- int line = (int) (m_pixInLines * (nYCoord - Y_OFFSET));
- int nRealLine = -1;
+ CMergeEditView *pView = (bar == BAR_LEFT) ? m_view[MERGE_VIEW_LEFT] :
+ m_view[MERGE_VIEW_RIGHT];
- line--; // Convert linenumber to lineindex
- if (line < 0)
- line = 0;
- if (line > (nbLines - 1))
- line = nbLines - 1;
+ int nSubLineIndex = (int) (m_pixInLines * (nYCoord - Y_OFFSET));
+ // Keep sub-line index in range.
+ if (nSubLineIndex < 0)
+ {
+ nSubLineIndex = 0;
+ }
+ else if (nSubLineIndex >= pView->GetSubLineCount())
+ {
+ nSubLineIndex = pView->GetSubLineCount() - 1;
+ }
+
+ // Find the real (not wrapped) line number from sub-line index.
+ int nLine = 0;
+ int nSubLine = 0;
+ pView->GetLineBySubLine(nSubLineIndex, nLine, nSubLine);
+
+ // Convert line number to line index.
+ if (nLine > 0)
+ {
+ nLine -= 1;
+ }
+
// We've got a view line now
if (bRealLine == FALSE)
- return line;
+ return nLine;
// Get real line (exclude ghost lines)
- nRealLine = pDoc->m_ptBuf[bar]->ComputeRealLine(line);
+ CMergeDoc* pDoc = GetDocument();
+ const int nRealLine = pDoc->m_ptBuf[bar]->ComputeRealLine(nLine);
return nRealLine;
}
@@ -661,8 +633,8 @@
BOOL bYarea = FALSE;
const int w = rc.Width() / 4;
const int x = (rc.Width() - 2 * w) / 3;
- const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetLineCount(),
- m_view[MERGE_VIEW_RIGHT]->GetLineCount());
+ const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
+ m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
// We need '1 / m_pixInLines' to get line in pixels and
// that multiplied by linecount gives us bottom coord for bars.
double xbarBottom = min(nbLines / m_pixInLines + Y_OFFSET, rc.Height() - Y_OFFSET);
@@ -700,7 +672,7 @@
const DWORD bkColor = GetSysColor(COLOR_WINDOW);
if (nTopLine == -1)
- nTopLine = pDoc->GetRightView()->GetTopLine();
+ nTopLine = pDoc->GetRightView()->GetTopSubLine();
if (nBottomLine == -1)
{
@@ -711,8 +683,8 @@
CRect rc;
GetClientRect(rc);
const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area
- const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetLineCount(),
- m_view[MERGE_VIEW_RIGHT]->GetLineCount());
+ const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(),
+ m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
double LineInPix = hTotal / nbLines;
if (LineInPix > MAX_LINEPIX)
LineInPix = MAX_LINEPIX;
Modified: trunk/Src/LocationView.h
===================================================================
--- trunk/Src/LocationView.h 2006-12-12 22:26:09 UTC (rev 3958)
+++ trunk/Src/LocationView.h 2006-12-13 07:17:17 UTC (rev 3959)
@@ -56,8 +56,6 @@
CMergeDoc* GetDocument();
protected:
- // Return end of block (diff/non-diff)
- BOOL GetNextRect(int &nLineIndex);
void DrawRect(CDC* pDC, const CRect& r, COLORREF cr, BOOL bSelected = FALSE);
BOOL GotoLocation(const CPoint& point, BOOL bRealLine = TRUE);
int GetLineFromYPos(int nYCoord, int bar, BOOL bRealLine = TRUE);
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2006-12-12 22:26:09 UTC (rev 3958)
+++ trunk/Src/MergeEditView.cpp 2006-12-13 07:17:17 UTC (rev 3959)
@@ -2523,7 +2523,6 @@
CMergeEditView *pRightView = pDoc->GetRightView();
int nRealLine = nLine;
int nApparentLine = nLine;
- int nLineCount = 0;
// Compute apparent (shown linenumber) line
if (bRealLine)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
