You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ge...@us...> - 2010-10-22 18:30:44
|
Revision: 7344
http://winmerge.svn.sourceforge.net/winmerge/?rev=7344&view=rev
Author: gerundt
Date: 2010-10-22 18:30:38 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Remove MFC dependency from CompareStats class. - R2_14 (Forgot the CompareStats.h file)
Modified Paths:
--------------
branches/R2_14/Src/CompareStats.h
Modified: branches/R2_14/Src/CompareStats.h
===================================================================
--- branches/R2_14/Src/CompareStats.h 2010-10-22 18:22:59 UTC (rev 7343)
+++ branches/R2_14/Src/CompareStats.h 2010-10-22 18:30:38 UTC (rev 7344)
@@ -4,7 +4,7 @@
* @brief Declaration of class CompareStats
*/
//
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _COMPARESTATS_H_
@@ -68,9 +68,9 @@
void SetCompareState(CompareStats::CMP_STATE state);
CompareStats::CMP_STATE GetCompareState() const;
BOOL IsCompareDone() const { return m_bCompareDone; }
-
- static CompareStats::RESULT CompareStats::GetResultFromCode(UINT diffcode);
+ static CompareStats::RESULT GetResultFromCode(UINT diffcode);
+
private:
int m_counts[RESULT_COUNT]; /**< Table storing result counts */
CRITICAL_SECTION m_csProtect; /**< For synchronizing read/write of counts */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-22 18:23:06
|
Revision: 7343
http://winmerge.svn.sourceforge.net/winmerge/?rev=7343&view=rev
Author: gerundt
Date: 2010-10-22 18:22:59 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Remove MFC dependency from CompareStats class. - R2_14
Modified Paths:
--------------
branches/R2_14/Src/CompareStats.cpp
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/MergeX64.vcproj
Modified: branches/R2_14/Src/CompareStats.cpp
===================================================================
--- branches/R2_14/Src/CompareStats.cpp 2010-10-22 17:45:52 UTC (rev 7342)
+++ branches/R2_14/Src/CompareStats.cpp 2010-10-22 18:22:59 UTC (rev 7343)
@@ -6,7 +6,9 @@
// ID line follows -- this is updated by SVN
// $Id$
-#include "stdafx.h"
+#include <windows.h>
+#include <assert.h>
+#include <crtdbg.h>
#include "DiffItem.h"
#include "CompareStats.h"
@@ -53,7 +55,7 @@
int index = static_cast<int>(res);
m_counts[index] += 1;
++m_nComparedItems;
- ASSERT(m_nComparedItems <= m_nTotalItems);
+ assert(m_nComparedItems <= m_nTotalItems);
LeaveCriticalSection(&m_csProtect);
}
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2010-10-22 17:45:52 UTC (rev 7342)
+++ branches/R2_14/Src/Merge.vcproj 2010-10-22 18:22:59 UTC (rev 7343)
@@ -866,7 +866,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -875,6 +878,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -884,6 +890,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -892,7 +901,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-10-22 17:45:52 UTC (rev 7342)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-10-22 18:22:59 UTC (rev 7343)
@@ -3042,6 +3042,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3052,6 +3055,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3062,6 +3068,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3073,6 +3082,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3084,6 +3096,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3095,6 +3110,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3106,6 +3124,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3116,6 +3137,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3126,6 +3150,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3137,6 +3164,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -3148,6 +3178,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -3158,6 +3191,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-22 17:45:59
|
Revision: 7342
http://winmerge.svn.sourceforge.net/winmerge/?rev=7342&view=rev
Author: gerundt
Date: 2010-10-22 17:45:52 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Remove MFC dependency from CompareOptions class. - R2_14
Modified Paths:
--------------
branches/R2_14/Src/CompareOptions.cpp
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/MergeX64.vcproj
Modified: branches/R2_14/Src/CompareOptions.cpp
===================================================================
--- branches/R2_14/Src/CompareOptions.cpp 2010-10-22 16:45:47 UTC (rev 7341)
+++ branches/R2_14/Src/CompareOptions.cpp 2010-10-22 17:45:52 UTC (rev 7342)
@@ -6,7 +6,8 @@
// ID line follows -- this is updated by SVN
// $Id: ByteComparator.h 3397 2006-07-27 10:41:24Z kimmov $
-#include "StdAfx.h"
+#include <windows.h>
+#include <crtdbg.h>
#include "DIFF.H"
#include "CompareOptions.h"
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2010-10-22 16:45:47 UTC (rev 7341)
+++ branches/R2_14/Src/Merge.vcproj 2010-10-22 17:45:52 UTC (rev 7342)
@@ -780,7 +780,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -789,6 +792,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -798,6 +804,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -806,7 +815,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-10-22 16:45:47 UTC (rev 7341)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-10-22 17:45:52 UTC (rev 7342)
@@ -2746,6 +2746,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2756,6 +2759,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2766,6 +2772,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2777,6 +2786,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2788,6 +2800,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2799,6 +2814,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2810,6 +2828,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2820,6 +2841,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2830,6 +2854,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2841,6 +2868,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -2852,6 +2882,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -2862,6 +2895,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-22 16:45:53
|
Revision: 7341
http://winmerge.svn.sourceforge.net/winmerge/?rev=7341&view=rev
Author: gerundt
Date: 2010-10-22 16:45:47 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
PATCH: [ 2205583 ] Use new compare status icons for editor windows
- The other part was committed with r7278
Modified Paths:
--------------
branches/R2_14/Src/ChildFrm.cpp
Modified: branches/R2_14/Src/ChildFrm.cpp
===================================================================
--- branches/R2_14/Src/ChildFrm.cpp 2010-10-21 23:18:41 UTC (rev 7340)
+++ branches/R2_14/Src/ChildFrm.cpp 2010-10-22 16:45:47 UTC (rev 7341)
@@ -310,8 +310,8 @@
m_wndStatusBar.SetPaneText(PANE_LEFT_RO, sText.c_str(), TRUE);
m_wndStatusBar.SetPaneText(PANE_RIGHT_RO, sText.c_str(), TRUE);
- m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALFILE);
- m_hDifferent = AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE);
+ m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALTEXTFILE);
+ m_hDifferent = AfxGetApp()->LoadIcon(IDI_NOTEQUALTEXTFILE);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 23:18:48
|
Revision: 7340
http://winmerge.svn.sourceforge.net/winmerge/?rev=7340&view=rev
Author: gerundt
Date: 2010-10-21 23:18:41 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Update developers docs style in R2_14
Modified Paths:
--------------
branches/R2_14/Docs/Developers/Compiling.html
branches/R2_14/Docs/Developers/Options.html
branches/R2_14/Docs/Developers/Releasing.html
branches/R2_14/Docs/Developers/Translations.html
branches/R2_14/Docs/Developers/index.html
branches/R2_14/Docs/Developers/readme-InnoSetup.html
branches/R2_14/Docs/Developers/readme-developers.html
branches/R2_14/Docs/Developers/readme-manual.html
Modified: branches/R2_14/Docs/Developers/Compiling.html
===================================================================
--- branches/R2_14/Docs/Developers/Compiling.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/Compiling.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -32,12 +32,12 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
p.note {
padding: 5px;
background-color: #DDDDFF;
- border: 1px solid blue;
+ border: 1px solid #6666FF;
}
acronym {
cursor: help;
Modified: branches/R2_14/Docs/Developers/Options.html
===================================================================
--- branches/R2_14/Docs/Developers/Options.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/Options.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -24,7 +24,7 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
-->
</style>
Modified: branches/R2_14/Docs/Developers/Releasing.html
===================================================================
--- branches/R2_14/Docs/Developers/Releasing.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/Releasing.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -32,12 +32,12 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
p.note {
padding: 5px;
background-color: #DDDDFF;
- border: 1px solid blue;
+ border: 1px solid #6666FF;
}
acronym {
cursor: help;
Modified: branches/R2_14/Docs/Developers/Translations.html
===================================================================
--- branches/R2_14/Docs/Developers/Translations.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/Translations.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -29,7 +29,7 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
p.important {
padding: 5px;
@@ -40,7 +40,7 @@
p.note {
padding: 5px;
background-color: #DDDDFF;
- border: 1px solid blue;
+ border: 1px solid #6666FF;
}
acronym {
cursor: help;
Modified: branches/R2_14/Docs/Developers/index.html
===================================================================
--- branches/R2_14/Docs/Developers/index.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/index.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -32,12 +32,12 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
p.note {
padding: 5px;
background-color: #DDDDFF;
- border: 1px solid blue;
+ border: 1px solid #6666FF;
}
acronym {
cursor: help;
Modified: branches/R2_14/Docs/Developers/readme-InnoSetup.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/readme-InnoSetup.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -19,6 +19,13 @@
border-left: 4px solid #FFCC00;
border-bottom: 1px solid #FFCC00;
}
+ pre {
+ margin-left: 25px;
+ margin-right: 25px;
+ padding: 5px;
+ background-color: #EEEEEE;
+ border-left: 10px solid #CCCCCC;
+ }
-->
</style>
</head>
Modified: branches/R2_14/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-developers.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/readme-developers.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -32,12 +32,12 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
p.note {
padding: 5px;
background-color: #DDDDFF;
- border: 1px solid blue;
+ border: 1px solid #6666FF;
}
acronym {
cursor: help;
Modified: branches/R2_14/Docs/Developers/readme-manual.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-manual.html 2010-10-21 23:01:45 UTC (rev 7339)
+++ branches/R2_14/Docs/Developers/readme-manual.html 2010-10-21 23:18:41 UTC (rev 7340)
@@ -29,7 +29,7 @@
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
- border: 1px solid black;
+ border-left: 10px solid #CCCCCC;
}
-->
</style>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 23:01:51
|
Revision: 7339
http://winmerge.svn.sourceforge.net/winmerge/?rev=7339&view=rev
Author: gerundt
Date: 2010-10-21 23:01:45 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Add 2.14 branch to readme-Subversion.html
Modified Paths:
--------------
trunk/Docs/Developers/readme-Subversion.html
Modified: trunk/Docs/Developers/readme-Subversion.html
===================================================================
--- trunk/Docs/Developers/readme-Subversion.html 2010-10-21 22:48:11 UTC (rev 7338)
+++ trunk/Docs/Developers/readme-Subversion.html 2010-10-21 23:01:45 UTC (rev 7339)
@@ -100,6 +100,8 @@
<code><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10</a></code></li>
<li>2.12 release branch<br>
<code><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_12">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_12</a></code></li>
+ <li>2.14 release branch<br>
+ <code><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_14">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_14</a></code></li>
</ul>
<p>Old branches (2.0 - 2.4 releases) are in CVS repository.</p>
<p>For every beta- and stable-release we add a tag. Tags are in folder:<br>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 22:48:18
|
Revision: 7338
http://winmerge.svn.sourceforge.net/winmerge/?rev=7338&view=rev
Author: gerundt
Date: 2010-10-21 22:48:11 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
PATCH: [ 3015416 ] LineFiltersDlg: Employ listview in-place editing capability
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/LineFiltersDlg.cpp
branches/R2_14/Src/LineFiltersDlg.h
branches/R2_14/Src/Merge.rc
branches/R2_14/Src/resource.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 22:20:18 UTC (rev 7337)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 22:48:11 UTC (rev 7338)
@@ -7,6 +7,7 @@
Improve startup time (#2788142)
Add menuitems for selecting automatic or manual prediffing (#2638608)
Add accelerator keys for Shell context menu (#2823536)
+ Improve editing of linefilter regular expressions (#3015416)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Modified: branches/R2_14/Src/LineFiltersDlg.cpp
===================================================================
--- branches/R2_14/Src/LineFiltersDlg.cpp 2010-10-21 22:20:18 UTC (rev 7337)
+++ branches/R2_14/Src/LineFiltersDlg.cpp 2010-10-21 22:48:11 UTC (rev 7338)
@@ -11,7 +11,6 @@
#include "LineFiltersList.h"
#include "MainFrm.h"
#include "LineFiltersDlg.h"
-#include "dllver.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -33,8 +32,6 @@
LineFiltersDlg::LineFiltersDlg()
: CPropertyPage(LineFiltersDlg::IDD)
, m_pList(NULL)
-, m_bEditing(FALSE)
-, m_editedIndex(-1)
{
//{{AFX_DATA_INIT(LineFiltersDlg)
m_bIgnoreRegExp = FALSE;
@@ -53,22 +50,19 @@
DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
//}}AFX_DATA_MAP
DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList);
- DDX_Control(pDX, IDC_LFILTER_EDITBOX, m_editRegexp);
- DDX_Control(pDX, IDC_LFILTER_EDITSAVE, m_saveRegexp);
}
BEGIN_MESSAGE_MAP(LineFiltersDlg, CPropertyPage)
//{{AFX_MSG_MAP(LineFiltersDlg)
- ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedLfilterAddBtn)
ON_BN_CLICKED(IDC_LFILTER_EDITBTN, OnBnClickedLfilterEditbtn)
ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
- ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
- ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox)
+ ON_NOTIFY(LVN_KEYDOWN, IDC_LFILTER_LIST, OnLvnKeyDownLfilterList)
+ ON_NOTIFY(LVN_ENDLABELEDIT, IDC_LFILTER_LIST, OnEndLabelEditLfilterList)
END_MESSAGE_MAP()
@@ -96,48 +90,23 @@
void LineFiltersDlg::InitList()
{
// Show selection across entire row.
- DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT |
- LVS_EX_ONECLICKACTIVATE;
- // Also enable infotips if they have new enough version for our
- // custom draw code
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
- newstyle |= LVS_EX_INFOTIP;
+ // Also enable infotips.
+ m_filtersList.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
- m_filtersList.ModifyStyle(0, LVS_EDITLABELS | LVS_SHOWSELALWAYS);
-
- m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle);
-
String title = theApp.LoadString(IDS_FILTERLINE_REGEXP);
m_filtersList.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 500);
int count = m_pList->GetCount();
- int ind = -1;
for (int i = 0; i < count; i++)
{
const LineFilterItem &item = m_pList->GetAt(i);
- ind = AddRow(item.filterStr.c_str(), item.enabled);
+ AddRow(item.filterStr.c_str(), item.enabled);
}
- if (count > 0)
- {
- m_filtersList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
- BOOL bPartialOk = FALSE;
- m_filtersList.EnsureVisible(0, bPartialOk);
- CString text = m_filtersList.GetItemText(0, 0);
- m_editRegexp.SetWindowText(text);
- }
+ m_filtersList.SetItemState(0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED);
UpdateData(FALSE);
}
/**
- * @brief User clicked filter enable/disable checkbox.
- */
-void LineFiltersDlg::OnIgnoreregexp()
-{
- UpdateData();
-}
-
-/**
* @brief Open help from mainframe when user presses F1.
*/
void LineFiltersDlg::OnHelp()
@@ -154,7 +123,7 @@
int LineFiltersDlg::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
{
int items = m_filtersList.GetItemCount();
- int ind = m_filtersList.InsertItem(items + 1, filter);
+ int ind = m_filtersList.InsertItem(items, filter);
m_filtersList.SetCheck(ind, enabled);
return ind;
}
@@ -168,14 +137,7 @@
int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED);
if (sel > -1)
{
- CString text = m_filtersList.GetItemText(sel, 0);
- m_editRegexp.SetWindowText(text);
- m_editRegexp.SetReadOnly(FALSE);
- m_saveRegexp.EnableWindow(TRUE);
- m_editRegexp.SetFocus();
- m_editRegexp.SetSel(0, -1);
- m_bEditing = TRUE;
- m_editedIndex = sel;
+ m_filtersList.EditLabel(sel);
}
}
@@ -188,8 +150,7 @@
if (ind >= -1)
{
m_filtersList.SetItemState(ind, LVIS_SELECTED, LVIS_SELECTED);
- BOOL bPartialOk = FALSE;
- m_filtersList.EnsureVisible(ind, bPartialOk);
+ m_filtersList.EnsureVisible(ind, FALSE);
EditSelectedFilter();
}
}
@@ -234,8 +195,7 @@
*/
void LineFiltersDlg::OnBnClickedLfilterRemovebtn()
{
- int sel =- 1;
- sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED);
if (sel != -1)
{
m_filtersList.DeleteItem(sel);
@@ -251,78 +211,31 @@
}
/**
- * @brief Called when Save button is clicked.
+ * @brief Called when the user activates an item.
*/
-void LineFiltersDlg::OnBnClickedLfilterEditsave()
-{
- SaveItem();
-}
-
-/**
- * @brief Cancel editing of filter when ESC is pressed.
- */
-BOOL LineFiltersDlg::PreTranslateMessage(MSG* pMsg)
-{
- if (m_bEditing)
- {
- // Handle Esc key press
- if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE)
- {
- m_saveRegexp.EnableWindow(FALSE);
- m_editRegexp.SetReadOnly(TRUE);
- m_bEditing = FALSE;
- m_filtersList.SetFocus();
- int sel = m_filtersList.GetNextItem(-1, LVNI_SELECTED);
- if (sel > -1)
- {
- CString text = m_filtersList.GetItemText(sel, 0);
- m_editRegexp.SetWindowText(text);
- }
- return TRUE;
- }
- }
- return CPropertyPage::PreTranslateMessage(pMsg);
-}
-
-/**
- * @brief Called when selected item in list changes.
- */
void LineFiltersDlg::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
{
- LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
- int item = pNMIA->iItem;
- if (m_bEditing)
- {
- m_saveRegexp.EnableWindow(FALSE);
- m_editRegexp.SetReadOnly(TRUE);
- m_bEditing = FALSE;
- }
- CString text = m_filtersList.GetItemText(item, 0);
- m_editRegexp.SetWindowText(text);
+ EditSelectedFilter();
*pResult = 0;
}
/**
- * @brief Save the current filter in edit box.
+ * @brief Called when a key has been pressed while the list has the focus.
*/
-void LineFiltersDlg::SaveItem()
+void LineFiltersDlg::OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
{
- if (m_bEditing)
+ LPNMKEY pNMKey = reinterpret_cast<LPNMKEY>(pNMHDR);
+ if (LOWORD(pNMKey->nVKey) == VK_F2)
{
- CString text;
- m_editRegexp.GetWindowText(text);
- m_filtersList.SetItemText(m_editedIndex, 0, text);
- m_bEditing = FALSE;
- m_editRegexp.SetReadOnly(TRUE);
- m_saveRegexp.EnableWindow(FALSE);
- m_editedIndex = -1;
+ EditSelectedFilter();
}
+ *pResult = 0;
}
/**
- * @brief Called when filter edit box loses its focus.
+ * @brief Called when in-place editing has finished.
*/
-void LineFiltersDlg::OnEnKillfocusLfilterEditbox()
+void LineFiltersDlg::OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
{
- SaveItem();
+ *pResult = 1;
}
Modified: branches/R2_14/Src/LineFiltersDlg.h
===================================================================
--- branches/R2_14/Src/LineFiltersDlg.h 2010-10-21 22:20:18 UTC (rev 7337)
+++ branches/R2_14/Src/LineFiltersDlg.h 2010-10-21 22:48:11 UTC (rev 7338)
@@ -46,32 +46,25 @@
// Generated message map functions
//{{AFX_MSG(LineFiltersDlg)
virtual BOOL OnInitDialog();
- afx_msg void OnIgnoreregexp();
afx_msg void OnHelp();
virtual void OnOK();
afx_msg void OnBnClickedLfilterAddBtn();
afx_msg void OnBnClickedLfilterEditbtn();
afx_msg void OnBnClickedLfilterRemovebtn();
- virtual BOOL PreTranslateMessage(MSG* pMsg);
- afx_msg void OnBnClickedLfilterEditsave();
afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
- afx_msg void OnEnKillfocusLfilterEditbox();
+ afx_msg void OnLvnKeyDownLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
+ afx_msg void OnEndLabelEditLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
void InitList();
int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
void EditSelectedFilter();
- void SaveItem();
private:
CListCtrl m_filtersList; /**< List control having filter strings */
- CEdit m_editRegexp; /**< Editbox for editing filter */
- CButton m_saveRegexp; /**< Button for saving edited filter */
LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
- BOOL m_bEditing; /**< Are we editing a filter string? */
- int m_editedIndex; /**< Index of the item being edited. */
};
//{{AFX_INSERT_LOCATION}}
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2010-10-21 22:20:18 UTC (rev 7337)
+++ branches/R2_14/Src/Merge.rc 2010-10-21 22:48:11 UTC (rev 7338)
@@ -895,10 +895,7 @@
351,8
CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
- LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
- EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
- ES_READONLY
- PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,121
PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h 2010-10-21 22:20:18 UTC (rev 7337)
+++ branches/R2_14/Src/resource.h 2010-10-21 22:48:11 UTC (rev 7338)
@@ -430,10 +430,8 @@
#define IDC_LFILTER_LIST 1327
#define IDC_LFILTER_ADDBTN 1328
#define IDC_LFILTER_EDITBTN 1329
-#define IDC_LFILTER_EDITBOX 1330
#define IDC_LFILTER_REMOVEBTN 1331
#define IDC_BUTTON2 1332
-#define IDC_LFILTER_EDITSAVE 1333
#define IDC_ABOUTBOX_ICON 1334
#define IDC_ASK_MULTIWINDOW_CLOSE 1335
#define IDC_COLDLG_LIST 1336
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 22:20:24
|
Revision: 7337
http://winmerge.svn.sourceforge.net/winmerge/?rev=7337&view=rev
Author: gerundt
Date: 2010-10-21 22:20:18 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Remove unnecessary #include "dllver.h" - R2_14
Modified Paths:
--------------
branches/R2_14/Src/ConfigLog.cpp
branches/R2_14/Src/DirViewColHandler.cpp
branches/R2_14/Src/FilepathEdit.cpp
branches/R2_14/Src/MergeDoc.cpp
Modified: branches/R2_14/Src/ConfigLog.cpp
===================================================================
--- branches/R2_14/Src/ConfigLog.cpp 2010-10-21 21:31:24 UTC (rev 7336)
+++ branches/R2_14/Src/ConfigLog.cpp 2010-10-21 22:20:18 UTC (rev 7337)
@@ -28,7 +28,6 @@
#endif
#include "Constants.h"
#include "version.h"
-#include "dllver.h"
#include "DiffWrapper.h"
#include "ConfigLog.h"
#include "winnt_supp.h"
Modified: branches/R2_14/Src/DirViewColHandler.cpp
===================================================================
--- branches/R2_14/Src/DirViewColHandler.cpp 2010-10-21 21:31:24 UTC (rev 7336)
+++ branches/R2_14/Src/DirViewColHandler.cpp 2010-10-21 22:20:18 UTC (rev 7337)
@@ -15,7 +15,6 @@
#include "DirDoc.h"
#include "resource.h"
#include "coretools.h"
-#include "dllver.h"
#include "DirViewColItems.h"
#include "DirColsDlg.h"
#include "OptionsDef.h"
Modified: branches/R2_14/Src/FilepathEdit.cpp
===================================================================
--- branches/R2_14/Src/FilepathEdit.cpp 2010-10-21 21:31:24 UTC (rev 7336)
+++ branches/R2_14/Src/FilepathEdit.cpp 2010-10-21 22:20:18 UTC (rev 7337)
@@ -31,7 +31,6 @@
#include "BCMenu.h"
#include "FilepathEdit.h"
#include "Shlwapi.h"
-#include "dllVer.h"
#ifdef _DEBUG
#define new DEBUG_NEW
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2010-10-21 21:31:24 UTC (rev 7336)
+++ branches/R2_14/Src/MergeDoc.cpp 2010-10-21 22:20:18 UTC (rev 7337)
@@ -54,7 +54,6 @@
#include "DiffFileInfo.h"
#include "SaveClosingDlg.h"
#include "DiffList.h"
-#include "dllver.h"
#include "codepage.h"
#include "paths.h"
#include "OptionsMgr.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 21:31:31
|
Revision: 7336
http://winmerge.svn.sourceforge.net/winmerge/?rev=7336&view=rev
Author: gerundt
Date: 2010-10-21 21:31:24 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
PATCH: [ 3015396 ] Remove obsolete dll version checks
Modified Paths:
--------------
branches/R2_14/Src/DirColsDlg.cpp
branches/R2_14/Src/DirView.cpp
branches/R2_14/Src/FileFiltersDlg.cpp
branches/R2_14/Src/PluginsListDlg.cpp
Modified: branches/R2_14/Src/DirColsDlg.cpp
===================================================================
--- branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 21:19:24 UTC (rev 7335)
+++ branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 21:31:24 UTC (rev 7336)
@@ -12,7 +12,6 @@
#include "stdafx.h"
#include "merge.h"
#include "DirColsDlg.h"
-#include "dllver.h"
#include <algorithm>
#ifdef _DEBUG
@@ -63,13 +62,8 @@
void CDirColsDlg::InitList()
{
// Show selection across entire row.
- DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT;
- // Also enable infotips if they have new enough version for our
- // custom draw code
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
- newstyle |= LVS_EX_INFOTIP;
- m_listColumns.SetExtendedStyle(m_listColumns.GetExtendedStyle() | newstyle);
+ // Also enable infotips.
+ m_listColumns.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
m_listColumns.InsertColumn(0, _T(""), LVCFMT_LEFT, 150);
}
Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp 2010-10-21 21:19:24 UTC (rev 7335)
+++ branches/R2_14/Src/DirView.cpp 2010-10-21 21:31:24 UTC (rev 7336)
@@ -38,7 +38,6 @@
#include "resource.h"
#include "coretools.h"
#include "WaitStatusCursor.h"
-#include "dllver.h"
#include "locality.h"
#include "FileTransform.h"
#include "SelectUnpackerDlg.h"
@@ -329,14 +328,9 @@
ReloadColumns();
// Show selection across entire row.
- // Also allow user to rearrange columns via drag&drop of headers
- // if they have a new enough common controls
- DWORD exstyle = LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP;
- // Also enable infotips if they have new enough version for our
- // custom draw code
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
- exstyle |= LVS_EX_INFOTIP;
+ // Also allow user to rearrange columns via drag&drop of headers.
+ // Also enable infotips.
+ DWORD exstyle = LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP | LVS_EX_INFOTIP;
m_pList->SetExtendedStyle(exstyle);
}
@@ -2613,10 +2607,6 @@
*/
void CDirView::FixReordering()
{
- // LVCOLUMN.iOrder is present with version 4.70+
- if (GetDllVersion(_T("shlwapi.dll")) < PACKVERSION(4,70))
- return;
-
LVCOLUMN lvcol;
lvcol.mask = LVCF_ORDER;
lvcol.fmt = 0;
Modified: branches/R2_14/Src/FileFiltersDlg.cpp
===================================================================
--- branches/R2_14/Src/FileFiltersDlg.cpp 2010-10-21 21:19:24 UTC (rev 7335)
+++ branches/R2_14/Src/FileFiltersDlg.cpp 2010-10-21 21:31:24 UTC (rev 7336)
@@ -28,7 +28,6 @@
#include "MainFrm.h"
#include "FileFiltersDlg.h"
#include "coretools.h"
-#include "dllver.h"
#include "FileFilterMgr.h"
#include "paths.h"
#include "SharedFilterDlg.h"
@@ -125,13 +124,8 @@
void FileFiltersDlg::InitList()
{
// Show selection across entire row.
- DWORD newstyle = LVS_EX_FULLROWSELECT;
- // Also enable infotips if they have new enough version for our
- // custom draw code
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
- newstyle |= LVS_EX_INFOTIP;
- m_listFilters.SetExtendedStyle(m_listFilters.GetExtendedStyle() | newstyle);
+ // Also enable infotips.
+ m_listFilters.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
String title = theApp.LoadString(IDS_FILTERFILE_NAMETITLE);
m_listFilters.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150);
@@ -320,12 +314,6 @@
NMLVGETINFOTIP * pInfoTip = reinterpret_cast<NMLVGETINFOTIP*>(pNMHDR);
ASSERT(pInfoTip);
- if (GetDllVersion(_T("comctl32.dll")) < PACKVERSION(4,71))
- {
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- return;
- }
-
// Get subitem under mouse cursor
lvhti.pt = m_ptLastMousePos;
m_listFilters.SubItemHitTest(&lvhti);
Modified: branches/R2_14/Src/PluginsListDlg.cpp
===================================================================
--- branches/R2_14/Src/PluginsListDlg.cpp 2010-10-21 21:19:24 UTC (rev 7335)
+++ branches/R2_14/Src/PluginsListDlg.cpp 2010-10-21 21:31:24 UTC (rev 7336)
@@ -10,7 +10,6 @@
#include "UnicodeString.h"
#include "Merge.h"
#include "Plugins.h"
-#include "dllver.h"
#include "PluginsListDlg.h"
#include "OptionsDef.h"
@@ -69,13 +68,8 @@
void PluginsListDlg::InitList()
{
// Show selection across entire row.
- DWORD newstyle = LVS_EX_FULLROWSELECT;
- // Also enable infotips if they have new enough version for our
- // custom draw code
- // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
- newstyle |= LVS_EX_INFOTIP;
- m_list.SetExtendedStyle(m_list.GetExtendedStyle() | newstyle);
+ // Also enable infotips.
+ m_list.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP);
String title = LoadResString(IDS_PLUGINSLIST_NAME);
m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 21:19:30
|
Revision: 7335
http://winmerge.svn.sourceforge.net/winmerge/?rev=7335&view=rev
Author: gerundt
Date: 2010-10-21 21:19:24 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
CSortHeaderCtrl: Replace GetDllVersion() by SendMessage(CCM_GETVERSION), which works for comctl32.dll 5.80 and better. - R2_14
Modified Paths:
--------------
branches/R2_14/Src/Common/SortHeaderCtrl.cpp
Modified: branches/R2_14/Src/Common/SortHeaderCtrl.cpp
===================================================================
--- branches/R2_14/Src/Common/SortHeaderCtrl.cpp 2010-10-21 20:47:08 UTC (rev 7334)
+++ branches/R2_14/Src/Common/SortHeaderCtrl.cpp 2010-10-21 21:19:24 UTC (rev 7335)
@@ -9,7 +9,6 @@
#include "StdAfx.h"
#include "SortHeaderCtrl.h"
-#include "dllver.h"
#ifndef HDF_SORTUP
#define HDF_SORTUP 0x0400
@@ -60,7 +59,7 @@
}
GetItem( nCol, &hditem );
- if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(6,00))
+ if (SendMessage(CCM_GETVERSION) >= 6)
{
// We can use HDF_SORTUP and HDF_SORTDOWN flag to draw a sort arrow on the header.
hditem.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 20:47:14
|
Revision: 7334
http://winmerge.svn.sourceforge.net/winmerge/?rev=7334&view=rev
Author: gerundt
Date: 2010-10-21 20:47:08 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Remove unused variables in R2_14
Modified Paths:
--------------
branches/R2_14/Src/Common/LanguageSelect.cpp
branches/R2_14/Src/DiffWrapper.cpp
branches/R2_14/Src/DirColsDlg.cpp
branches/R2_14/Src/DirView.cpp
branches/R2_14/Src/LocationView.cpp
branches/R2_14/Src/MergeDoc.cpp
branches/R2_14/Src/UniMarkdownFile.cpp
branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp
branches/R2_14/Src/editlib/ccrystaltextview.cpp
branches/R2_14/Src/editlib/crystalparser.cpp
Modified: branches/R2_14/Src/Common/LanguageSelect.cpp
===================================================================
--- branches/R2_14/Src/Common/LanguageSelect.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/Common/LanguageSelect.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -978,7 +978,6 @@
while (i > 0)
{
--i;
- UINT id = 0;
MENUITEMINFO mii;
mii.cbSize = sizeof mii;
mii.fMask = MIIM_STATE|MIIM_ID|MIIM_SUBMENU|MIIM_DATA;
@@ -1088,10 +1087,6 @@
HMENU hNewDirMenu = pMainFrame->NewDirViewMenu();
if (hNewDefaultMenu && hNewMergeMenu && hNewDirMenu)
{
- CMenu* pOldDefaultMenu = CMenu::FromHandle(pMainFrame->m_hMenuDefault);
- CMenu* hOldMergeMenu = CMenu::FromHandle(pApp->m_pDiffTemplate->m_hMenuShared);
- CMenu* hOldDirMenu = CMenu::FromHandle(pApp->m_pDirTemplate->m_hMenuShared);
-
// Note : for Windows98 compatibility, use FromHandle and not Attach/Detach
CMenu * pNewDefaultMenu = CMenu::FromHandle(hNewDefaultMenu);
CMenu * pNewMergeMenu = CMenu::FromHandle(hNewMergeMenu);
Modified: branches/R2_14/Src/DiffWrapper.cpp
===================================================================
--- branches/R2_14/Src/DiffWrapper.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/DiffWrapper.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -359,7 +359,6 @@
LineData.erase(EolPos);
}
- int Len = LineData.size();
const char * StartOfComment = strstr(LineData.c_str(), filtercommentsset.StartMarker.c_str());
const char * EndOfComment = strstr(LineData.c_str(), filtercommentsset.EndMarker.c_str());
const char * InLineComment = strstr(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
Modified: branches/R2_14/Src/DirColsDlg.cpp
===================================================================
--- branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -274,7 +274,6 @@
*/
void CDirColsDlg::OnLvnItemchangedColdlgList(NMHDR *pNMHDR, LRESULT *pResult)
{
- LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
POSITION pos = m_listColumns.GetFirstSelectedItemPosition();
if (pos)
Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/DirView.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -534,7 +534,6 @@
}
int alldiffs = 0;
- int level = 0;
UINT_PTR diffpos = ctxt.GetFirstDiffPosition();
RedisplayChildren(diffpos, 0, cnt, alldiffs);
theApp.SetLastCompareResult(alldiffs);
Modified: branches/R2_14/Src/LocationView.cpp
===================================================================
--- branches/R2_14/Src/LocationView.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/LocationView.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -672,7 +672,6 @@
GetClientRect(rc);
int line = -1;
- int lineOther = -1;
int bar = IsInsideBar(rc, point);
if (bar == BAR_LEFT || bar == BAR_RIGHT)
{
@@ -898,16 +897,13 @@
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]->GetSubLineCount(),
m_view[MERGE_VIEW_RIGHT]->GetSubLineCount());
int nTopCoord = static_cast<int>(Y_OFFSET +
(static_cast<double>(nTopLine * m_lineInPix)));
- int nLeftCoord = INDICATOR_MARGIN;
int nBottomCoord = static_cast<int>(Y_OFFSET +
(static_cast<double>(nBottomLine * m_lineInPix)));
- int nRightCoord = rc.Width() - INDICATOR_MARGIN;
double xbarBottom = min(nbLines / m_pixInLines + Y_OFFSET, rc.Height() - Y_OFFSET);
int barBottom = (int)xbarBottom;
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/MergeDoc.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -1353,7 +1353,6 @@
*/
static void UnescapeControlChars(CString &s)
{
- int n = s.GetLength();
LPTSTR p = s.LockBuffer();
LPTSTR q = p;
while ((*p = *q) != _T('\0'))
Modified: branches/R2_14/Src/UniMarkdownFile.cpp
===================================================================
--- branches/R2_14/Src/UniMarkdownFile.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/UniMarkdownFile.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -193,7 +193,6 @@
{
while (m_current < m_base + m_filesize && isspace(*m_current))
{
- LPBYTE current = m_current;
BYTE eol = *m_current++;
if (eol == '\r' || eol == '\n')
{
Modified: branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -1831,8 +1831,6 @@
// You must call InitNew() or LoadFromFile() first!
#ifdef _UNICODE
- LPCTSTR string = (LPCTSTR) GetLineChars (nLine);
- LPCTSTR current = string + nCol;
return FALSE;
#else // _UNICODE
const unsigned char *string = (const unsigned char *) GetLineChars (nLine);
@@ -1850,8 +1848,6 @@
// You must call InitNew() or LoadFromFile() first!
#ifdef _UNICODE
- LPCTSTR string = (LPCTSTR) GetLineChars (nLine);
- LPCTSTR current = string + nCol;
return FALSE;
#else // _UNICODE
const unsigned char *string = (const unsigned char *) GetLineChars (nLine);
Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -983,7 +983,6 @@
const int nCharWidthNarrowed = nCharWidth / 2;
const int nCharWidthWidened = nCharWidth * 2 - nCharWidthNarrowed;
const int nLineHeight = GetLineHeight();
- int nSumWidth = 0;
// i the character index, from 0 to lineLen-1
int i = 0;
@@ -2102,7 +2101,6 @@
rcCacheLine.OffsetRect( 0, nSubLineOffset * nLineHeight );
}
- const int nMaxLineChars = GetScreenChars();
//END SW
int nCurrentLine = m_nTopLine;
@@ -2941,8 +2939,6 @@
int nCurrentLine;
for (nCurrentLine = nTopLine; nCurrentLine <= nEndLine; nCurrentLine++)
{
- int nSubLines = GetSubLines (nCurrentLine);
-
rcLine.bottom = rcLine.top + GetSubLines (nCurrentLine) * nLineHeight;
rcMargin.bottom = rcLine.bottom;
Modified: branches/R2_14/Src/editlib/crystalparser.cpp
===================================================================
--- branches/R2_14/Src/editlib/crystalparser.cpp 2010-10-21 18:29:15 UTC (rev 7333)
+++ branches/R2_14/Src/editlib/crystalparser.cpp 2010-10-21 20:47:08 UTC (rev 7334)
@@ -58,7 +58,6 @@
int nTabWidth = m_pTextView->GetTabSize();
int nLineCharCount = 0;
int nCharCount = 0;
- int nCharPos = 0;
LPCTSTR szLine = m_pTextView->GetLineChars( nLineIndex );
int nLastBreakPos = 0;
int nLastCharBreakPos = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 18:29:23
|
Revision: 7333
http://winmerge.svn.sourceforge.net/winmerge/?rev=7333&view=rev
Author: gerundt
Date: 2010-10-21 18:29:15 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
PATCH: [ 2823536 ] Add accelerator keys for Shell context menu
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/ShellExtension/ShellExtension.rc
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 17:17:04 UTC (rev 7332)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 18:29:15 UTC (rev 7333)
@@ -6,6 +6,7 @@
WinMerge 2.13.21
Improve startup time (#2788142)
Add menuitems for selecting automatic or manual prediffing (#2638608)
+ Add accelerator keys for Shell context menu (#2823536)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Modified: branches/R2_14/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_14/ShellExtension/ShellExtension.rc 2010-10-21 17:17:04 UTC (rev 7332)
+++ branches/R2_14/ShellExtension/ShellExtension.rc 2010-10-21 18:29:15 UTC (rev 7333)
@@ -358,15 +358,15 @@
STRINGTABLE
BEGIN
IDS_PROJNAME "ShellExtension"
- IDS_CONTEXT_MENU "WinMerge"
+ IDS_CONTEXT_MENU "&WinMerge"
IDS_CONTEXT_HELP "Open with WinMerge"
IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
+ IDS_COMPARE "&Compare"
+ IDS_COMPARE_ELLIPSIS "&Compare..."
+ IDS_COMPARE_TO "&Compare To"
IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_RESELECT_FIRST "&Re-select First"
END
#endif // English (U.S.) resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 17:17:11
|
Revision: 7332
http://winmerge.svn.sourceforge.net/winmerge/?rev=7332&view=rev
Author: gerundt
Date: 2010-10-21 17:17:04 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Initialize folder selection dialog to currently selected folder in options dialog - R2_14
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/PropBackups.cpp
branches/R2_14/Src/PropRegistry.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 07:06:13 UTC (rev 7331)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 17:17:04 UTC (rev 7332)
@@ -17,6 +17,8 @@
context menu (#2600787)
Expand/collapse folders from keyboard (#2203904)
Improve detecting XML files in file compare (#2726531)
+ Initialize folder selection dialog to currently selected folder in
+ options dialog (r6570)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
Modified: branches/R2_14/Src/PropBackups.cpp
===================================================================
--- branches/R2_14/Src/PropBackups.cpp 2010-10-21 07:06:13 UTC (rev 7331)
+++ branches/R2_14/Src/PropBackups.cpp 2010-10-21 17:17:04 UTC (rev 7332)
@@ -113,7 +113,7 @@
void CPropBackups::OnBnClickedBackupBrowse()
{
CString path;
- if (SelectFolder(path, NULL, 0, GetSafeHwnd()))
+ if (SelectFolder(path, m_sGlobalFolder, 0, GetSafeHwnd()))
{
SetDlgItemText(IDC_BACKUP_FOLDER, path);
}
Modified: branches/R2_14/Src/PropRegistry.cpp
===================================================================
--- branches/R2_14/Src/PropRegistry.cpp 2010-10-21 07:06:13 UTC (rev 7331)
+++ branches/R2_14/Src/PropRegistry.cpp 2010-10-21 17:17:04 UTC (rev 7332)
@@ -148,7 +148,7 @@
void CPropRegistry::OnBrowseFilterPath()
{
CString path;
- if (SelectFolder(path, NULL, IDS_OPEN_TITLE, GetSafeHwnd()))
+ if (SelectFolder(path, m_strUserFilterPath, IDS_OPEN_TITLE, GetSafeHwnd()))
{
SetDlgItemText(IDC_FILTER_USER_PATH, path);
}
@@ -158,7 +158,7 @@
void CPropRegistry::OnBrowseTmpFolder()
{
CString path;
- if (SelectFolder(path, NULL, NULL, GetSafeHwnd()))
+ if (SelectFolder(path, m_tempFolder, NULL, GetSafeHwnd()))
{
SetDlgItemText(IDC_TMPFOLDER_NAME, path);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-21 07:06:20
|
Revision: 7331
http://winmerge.svn.sourceforge.net/winmerge/?rev=7331&view=rev
Author: gerundt
Date: 2010-10-21 07:06:13 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
BUG: [ 3025855 ] Untranslated strings in folder compare window
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/DirFrame.cpp
branches/R2_14/Src/DirFrame.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 00:37:16 UTC (rev 7330)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 07:06:13 UTC (rev 7331)
@@ -6,6 +6,8 @@
WinMerge 2.13.21
Improve startup time (#2788142)
Add menuitems for selecting automatic or manual prediffing (#2638608)
+ Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
+ in status bar (#3025855)
WinMerge 2.13.20 - 2010-10-20 (r7319)
Add missing keywords to Pascal highlighter (#2834192)
Modified: branches/R2_14/Src/DirFrame.cpp
===================================================================
--- branches/R2_14/Src/DirFrame.cpp 2010-10-21 00:37:16 UTC (rev 7330)
+++ branches/R2_14/Src/DirFrame.cpp 2010-10-21 07:06:13 UTC (rev 7331)
@@ -151,6 +151,20 @@
}
/**
+ * @brief Handle translation of default messages on the status bar
+ */
+void CDirFrame::GetMessageString(UINT nID, CString& rMessage) const
+{
+ // load appropriate string
+ const String s = theApp.LoadString(nID);
+ if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+ {
+ // not found
+ TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
+ }
+}
+
+/**
* @brief Get the interface to the header (path) bar
*/
IHeaderBar * CDirFrame::GetHeaderInterface() {
Modified: branches/R2_14/Src/DirFrame.h
===================================================================
--- branches/R2_14/Src/DirFrame.h 2010-10-21 00:37:16 UTC (rev 7330)
+++ branches/R2_14/Src/DirFrame.h 2010-10-21 07:06:13 UTC (rev 7331)
@@ -57,6 +57,7 @@
void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; };
// Overrides
+ virtual void GetMessageString(UINT nID, CString& rMessage) const;
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDirFrame)
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2010-10-21 00:37:22
|
Revision: 7330
http://winmerge.svn.sourceforge.net/winmerge/?rev=7330&view=rev
Author: christianlist
Date: 2010-10-21 00:37:16 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Installer: Add OpenCandy to the InnoSetup installer (#3088720)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-10-21 00:36:26 UTC (rev 7329)
+++ trunk/Docs/Users/ChangeLog.txt 2010-10-21 00:37:16 UTC (rev 7330)
@@ -7,6 +7,7 @@
Update version number in trunk
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
+ Installer: Add OpenCandy to the InnoSetup installer (#3088720)
Translation updates:
- Bulgarian (#3082392)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2010-10-21 00:36:36
|
Revision: 7329
http://winmerge.svn.sourceforge.net/winmerge/?rev=7329&view=rev
Author: christianlist
Date: 2010-10-21 00:36:26 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Update to reflect the experimental released yesterday at revision 7319
Revision Links:
--------------
http://winmerge.svn.sourceforge.net/winmerge/?rev=7319&view=rev
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 20:40:36 UTC (rev 7328)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-21 00:36:26 UTC (rev 7329)
@@ -3,7 +3,11 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
-WinMerge 2.13.19
+WinMerge 2.13.21
+ Improve startup time (#2788142)
+ Add menuitems for selecting automatic or manual prediffing (#2638608)
+
+WinMerge 2.13.20 - 2010-10-20 (r7319)
Add missing keywords to Pascal highlighter (#2834192)
Recognize .ascx files as ASP files (#3042393)
Fix help locations (#2988974)
@@ -11,14 +15,13 @@
context menu (#2600787)
Expand/collapse folders from keyboard (#2203904)
Improve detecting XML files in file compare (#2726531)
- Improve startup time (#2788142)
- Add menuitems for selecting automatic or manual prediffing (#2638608)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
libraries installer (#3070254)
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
+ Installer: Add OpenCandy to the InnoSetup installer (#3088720)
Bugfix: WinMerge was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (2269637) (#33056008)
Bugfix: Location pane focus enabled "Save" (#3022292)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-20 20:40:42
|
Revision: 7328
http://winmerge.svn.sourceforge.net/winmerge/?rev=7328&view=rev
Author: gerundt
Date: 2010-10-20 20:40:36 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Remove MFC dependency from varprop class in R2_14
Modified Paths:
--------------
branches/R2_14/Src/Common/varprop.cpp
branches/R2_14/Src/Common/varprop.h
branches/R2_14/Src/Merge.vcproj
branches/R2_14/Src/MergeX64.vcproj
Modified: branches/R2_14/Src/Common/varprop.cpp
===================================================================
--- branches/R2_14/Src/Common/varprop.cpp 2010-10-20 20:25:08 UTC (rev 7327)
+++ branches/R2_14/Src/Common/varprop.cpp 2010-10-20 20:40:36 UTC (rev 7328)
@@ -7,15 +7,10 @@
// $Id$
//////////////////////////////////////////////////////////////////////
-#include "StdAfx.h"
+#include "windows.h"
#include "varprop.h"
+#include "assert.h"
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-
namespace varprop
{
/**
@@ -145,7 +140,7 @@
*/
bool VariantValue::GetBool() const
{
- ASSERT(m_vtype == VT_BOOL);
+ assert(m_vtype == VT_BOOL);
return m_bvalue;
}
@@ -155,7 +150,7 @@
*/
int VariantValue::GetInt() const
{
- ASSERT(m_vtype == VT_INT);
+ assert(m_vtype == VT_INT);
return m_ivalue;
}
@@ -165,7 +160,7 @@
*/
double VariantValue::GetFloat() const
{
- ASSERT(m_vtype == VT_FLOAT);
+ assert(m_vtype == VT_FLOAT);
return m_fvalue;
}
@@ -175,7 +170,7 @@
*/
String VariantValue::GetString() const
{
- ASSERT(m_vtype == VT_STRING);
+ assert(m_vtype == VT_STRING);
return m_svalue;
}
@@ -185,7 +180,7 @@
*/
time_t VariantValue::GetTime() const
{
- ASSERT(m_vtype == VT_TIME);
+ assert(m_vtype == VT_TIME);
return m_tvalue;
}
Modified: branches/R2_14/Src/Common/varprop.h
===================================================================
--- branches/R2_14/Src/Common/varprop.h 2010-10-20 20:25:08 UTC (rev 7327)
+++ branches/R2_14/Src/Common/varprop.h 2010-10-20 20:40:36 UTC (rev 7328)
@@ -10,6 +10,8 @@
#ifndef varprop_h_included
#define varprop_h_included
+#include "UnicodeString.h"
+
namespace varprop
{
Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj 2010-10-20 20:25:08 UTC (rev 7327)
+++ branches/R2_14/Src/Merge.vcproj 2010-10-20 20:40:36 UTC (rev 7328)
@@ -5673,7 +5673,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
<FileConfiguration
Name="UnicodeDebug|Win32">
@@ -5682,6 +5685,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -5691,6 +5697,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"/>
</FileConfiguration>
<FileConfiguration
@@ -5699,7 +5708,10 @@
Name="VCCLCompilerTool"
Optimization="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
+ PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""/>
</FileConfiguration>
</File>
<File
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-10-20 20:25:08 UTC (rev 7327)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-10-20 20:40:36 UTC (rev 7328)
@@ -19465,6 +19465,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -19475,6 +19478,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -19485,6 +19491,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19496,6 +19505,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19507,6 +19519,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19518,6 +19533,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19529,6 +19547,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -19539,6 +19560,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -19549,6 +19573,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19560,6 +19587,9 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -19571,6 +19601,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
<FileConfiguration
@@ -19581,6 +19614,9 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
/>
</FileConfiguration>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-20 20:25:15
|
Revision: 7327
http://winmerge.svn.sourceforge.net/winmerge/?rev=7327&view=rev
Author: gerundt
Date: 2010-10-20 20:25:08 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Fix whitespace in "CompareEngines" files from R2_14
Modified Paths:
--------------
branches/R2_14/Src/CompareEngines/ByteComparator.cpp
branches/R2_14/Src/CompareEngines/ByteComparator.h
branches/R2_14/Src/CompareEngines/ByteCompare.cpp
branches/R2_14/Src/CompareEngines/ByteCompare.h
branches/R2_14/Src/CompareEngines/DiffUtils.cpp
branches/R2_14/Src/CompareEngines/DiffUtils.h
Modified: branches/R2_14/Src/CompareEngines/ByteComparator.cpp
===================================================================
--- branches/R2_14/Src/CompareEngines/ByteComparator.cpp 2010-10-20 20:04:08 UTC (rev 7326)
+++ branches/R2_14/Src/CompareEngines/ByteComparator.cpp 2010-10-20 20:25:08 UTC (rev 7327)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteComparator.cpp
*
* @brief Implements ByteComparator class.
@@ -24,7 +24,7 @@
*/
static inline bool iseolch(TCHAR ch)
{
- return ch=='\n' || ch=='\r';
+ return ch == '\n' || ch == '\r';
}
/**
@@ -35,7 +35,7 @@
*/
static inline bool iswsch(TCHAR ch)
{
- return ch==' ' || ch=='\t';
+ return ch == ' ' || ch == '\t';
}
/**
@@ -50,7 +50,7 @@
* @param [in] offset Byte offset in whole file (among several buffers).
*/
static void TextScan(FileTextStats & stats, LPCSTR ptr, LPCSTR end, bool eof,
- bool crflag, __int64 offset)
+ bool crflag, __int64 offset)
{
LPCSTR start = ptr; // remember for recording zero-byte offsets
@@ -67,7 +67,7 @@
++stats.ncrs;
}
}
- for ( ; ptr < end; ++ptr)
+ for (; ptr < end; ++ptr)
{
char ch = *ptr;
if (ch == 0)
@@ -80,7 +80,7 @@
}
else if (ch == '\r')
{
- if (ptr+1 < end)
+ if (ptr + 1 < end)
{
if (ptr[1] == '\n')
{
@@ -119,17 +119,17 @@
*/
ByteComparator::ByteComparator(const QuickCompareOptions * options)
// settings
-: m_ignore_case(options->m_bIgnoreCase)
-, m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
-, m_ignore_blank_lines(options->m_bIgnoreBlankLines)
+ : m_ignore_case(options->m_bIgnoreCase)
+ , m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
+ , m_ignore_blank_lines(options->m_bIgnoreBlankLines)
// state
-, m_wsflag(false)
-, m_eol0(false)
-, m_eol1(false)
-, m_cr0(false)
-, m_cr1(false)
-, m_bol0(true)
-, m_bol1(true)
+ , m_wsflag(false)
+ , m_eol0(false)
+ , m_eol1(false)
+ , m_cr0(false)
+ , m_cr1(false)
+ , m_bol0(true)
+ , m_bol1(true)
{
if (options->m_ignoreWhitespace == WHITESPACE_IGNORE_CHANGE)
m_ignore_space_change = true;
@@ -183,16 +183,16 @@
// skip over all whitespace
while (ptr0 < end0 && iswsch(*ptr0))
{
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
// skip over all whitespace
while (ptr1 < end1 && iswsch(*ptr1))
{
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
@@ -200,9 +200,9 @@
if (m_ignore_space_change)
{
// Skip over whitespace change
- // Also skip whitespace on one side if
+ // Also skip whitespace on one side if
// either end of line or end of file on other
-
+
// Handle case of whitespace on side0
// (First four cases)
if (ptr0 < end0 && iswsch(*ptr0))
@@ -215,16 +215,16 @@
{
// whitespace on both sides
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
else if (iseolch(*ptr1))
{
// whitespace on side 0 (end of line on side 1)
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
}
@@ -240,7 +240,7 @@
{
// Whitespace on side0, eof on side1
m_wsflag = true;
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
}
@@ -265,7 +265,7 @@
{
// whitespace on side 1 (eol on side 0)
m_wsflag = true;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
}
@@ -281,7 +281,7 @@
{
// Whitespace on side1, eof on side0
m_wsflag = true;
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
}
@@ -293,16 +293,16 @@
// skip over consecutive whitespace
while (ptr0 < end0 && iswsch(*ptr0))
{
- m_bol0=false;
+ m_bol0 = false;
++ptr0;
}
// skip over consecutive whitespace
while (ptr1 < end1 && iswsch(*ptr1))
{
- m_bol1=false;
+ m_bol1 = false;
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
// if run out of buffer on either side
// must fetch more, to continue skipping whitespace
@@ -327,7 +327,7 @@
// m_bol1 not used because m_ignore_eol_diff
++ptr1;
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
@@ -339,7 +339,7 @@
if (m_cr0 || m_cr1)
{
- // these flags mean possible split CR/LF
+ // these flags mean possible split CR/LF
goto need_more;
}
if (m_eol0 || m_eol1)
@@ -373,16 +373,16 @@
++ptr1;
}
}
- if ( (ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1) )
+ if ((ptr0 == end0 && !eof0) || (ptr1 == end1 && !eof1))
{
goto need_more;
}
}
}
- if ( ptr0 == end0 || ptr1 == end1)
+ if (ptr0 == end0 || ptr1 == end1)
{
- if ( ptr0 == end0 && ptr1 == end1)
+ if (ptr0 == end0 && ptr1 == end1)
{
if (!eof0 || !eof1)
goto need_more;
@@ -428,7 +428,7 @@
else
return NEED_MORE_0;
}
- else if(ptr1 == end1 && !eof1)
+ else if (ptr1 == end1 && !eof1)
{
return NEED_MORE_1;
}
Modified: branches/R2_14/Src/CompareEngines/ByteComparator.h
===================================================================
--- branches/R2_14/Src/CompareEngines/ByteComparator.h 2010-10-20 20:04:08 UTC (rev 7326)
+++ branches/R2_14/Src/CompareEngines/ByteComparator.h 2010-10-20 20:25:08 UTC (rev 7327)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteComparator.h
*
* @brief Declaration file for ByteComparator class.
@@ -41,8 +41,8 @@
} COMP_RESULT;
COMP_RESULT CompareBuffers(FileTextStats & stats0, FileTextStats & stats1,
- const char* &ptr0, const char* &ptr1, const char* end0, const char* end1,
- bool eof0, bool eof1, __int64 offset0, __int64 offset1);
+ const char* &ptr0, const char* &ptr1, const char* end0, const char* end1,
+ bool eof0, bool eof1, __int64 offset0, __int64 offset1);
protected:
void HandleSide0Eol(char **ptr, const char *end, bool eof);
Modified: branches/R2_14/Src/CompareEngines/ByteCompare.cpp
===================================================================
--- branches/R2_14/Src/CompareEngines/ByteCompare.cpp 2010-10-20 20:04:08 UTC (rev 7326)
+++ branches/R2_14/Src/CompareEngines/ByteCompare.cpp 2010-10-20 20:25:08 UTC (rev 7327)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteCompare.cpp
*
* @brief Implementation file for ByteCompare
@@ -31,9 +31,9 @@
* @brief Default constructor.
*/
ByteCompare::ByteCompare()
-: m_pOptions(NULL)
-, m_piAbortable(NULL)
-, m_inf(NULL)
+ : m_pOptions(NULL)
+ , m_piAbortable(NULL)
+ , m_inf(NULL)
{
}
@@ -102,7 +102,7 @@
}
-/**
+/**
* @brief Compare two specified files, byte-by-byte
* @param [in] bStopAfterFirstDiff Stop compare after we find first difference?
* @param [in] piAbortable Interface allowing to abort compare
@@ -127,7 +127,7 @@
bool eof[2]; // if we've finished file
// initialize our buffer pointers and end of file flags
- for (i=0; i<2; ++i)
+ for (i = 0; i < 2; ++i)
{
bfstart[i] = bfend[i] = 0;
eof[i] = false;
@@ -146,13 +146,13 @@
return DIFFCODE::CMPABORT;
// load or update buffers as appropriate
- for (i=0; i<2; ++i)
+ for (i = 0; i < 2; ++i)
{
- if (!eof[i] && bfstart[i]==countof(buff[i]))
+ if (!eof[i] && bfstart[i] == countof(buff[i]))
{
bfstart[i] = bfend[i] = 0;
}
- if (!eof[i] && bfend[i]<countof(buff[i])-1)
+ if (!eof[i] && bfend[i] < countof(buff[i]) - 1)
{
// Assume our blocks are in range of unsigned int
int space = countof(buff[i]) - bfend[i];
@@ -186,7 +186,7 @@
// are these two buffers the same?
result = comparator.CompareBuffers(m_textStats[0], m_textStats[1],
- ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1);
+ ptr0, ptr1, end0, end1, eof[0], eof[1], offset0, offset1);
if (result == ByteComparator::RESULT_DIFF)
{
if (m_pOptions->m_bStopAfterFirstDiff)
@@ -212,7 +212,7 @@
const int m = ptr0 - &buff[0][0];
const int l = end0 - ptr0;
//move uncompared data to begin of buff0
- memcpy( &buff[0][0], &buff[0][m], l );
+ memcpy(&buff[0][0], &buff[0][m], l);
bfstart[0] = 0;
bfstart[1] = ptr1 - orig1;
bfend[0] = l;
@@ -222,9 +222,9 @@
const int m = ptr1 - &buff[1][0];
const int l = end1 - ptr1;
//move uncompared data to begin of buff1
- memcpy( &buff[1][0], &buff[1][m], l );
- bfstart[1]=0;
- bfstart[0]=ptr0 - orig0;
+ memcpy(&buff[1][0], &buff[1][m], l);
+ bfstart[1] = 0;
+ bfstart[0] = ptr0 - orig0;
bfend[1] = l;
}
else if (result == ByteComparator::NEED_MORE_BOTH)
@@ -243,7 +243,7 @@
const int m = ptr0 - orig0;
const int l = end0 - ptr0;
//move uncompared data to begin of buff0
- memcpy( &buff[0][0], &buff[0][m], l );
+ memcpy(&buff[0][0], &buff[0][m], l);
bfstart[0] = 0;
bfend[0] = l;
}
@@ -252,7 +252,7 @@
const int m = ptr1 - orig1;
const int l = end1 - ptr1;
//move uncompared data to begin of buff1
- memcpy( &buff[1][0], &buff[1][ m], l );
+ memcpy(&buff[1][0], &buff[1][ m], l);
bfstart[1] = 0;
bfend[1] = l;
}
@@ -264,8 +264,8 @@
// then the result is reliable.
if (eof[0] && eof[1])
{
- BOOL bBin0 = (m_textStats[0].nzeros>0);
- BOOL bBin1 = (m_textStats[1].nzeros>0);
+ BOOL bBin0 = (m_textStats[0].nzeros > 0);
+ BOOL bBin1 = (m_textStats[1].nzeros > 0);
if (bBin0 && bBin1)
diffcode |= DIFFCODE::BIN;
Modified: branches/R2_14/Src/CompareEngines/ByteCompare.h
===================================================================
--- branches/R2_14/Src/CompareEngines/ByteCompare.h 2010-10-20 20:04:08 UTC (rev 7326)
+++ branches/R2_14/Src/CompareEngines/ByteCompare.h 2010-10-20 20:25:08 UTC (rev 7327)
@@ -1,4 +1,4 @@
-/**
+/**
* @file ByteCompare.h
*
* @brief Declaration file for ByteCompare
@@ -20,6 +20,11 @@
namespace CompareEngines
{
+/**
+ * @brief A quick compare -compare method implementation class.
+ * This compare method compares files in small blocks. Code assumes block size
+ * is in range of 32-bit int-type.
+ */
class ByteCompare
{
public:
Modified: branches/R2_14/Src/CompareEngines/DiffUtils.cpp
===================================================================
--- branches/R2_14/Src/CompareEngines/DiffUtils.cpp 2010-10-20 20:04:08 UTC (rev 7326)
+++ branches/R2_14/Src/CompareEngines/DiffUtils.cpp 2010-10-20 20:25:08 UTC (rev 7327)
@@ -1,5 +1,5 @@
-/**
- * @file FolderCmp.cpp
+/**
+ * @file DiffUtils.cpp
*
* @brief Implementation file for DiffUtils class.
*/
@@ -22,9 +22,9 @@
* @brief Default constructor.
*/
DiffUtils::DiffUtils()
- : m_pOptions(NULL)
- , m_pFilterList(NULL)
- , m_inf(NULL)
+ : m_pOptions(NULL)
+ , m_pFilterList(NULL)
+ , m_inf(NULL)
{
}
@@ -120,14 +120,14 @@
if (script && m_pFilterList && m_pFilterList->HasRegExps())
{
struct change *next = script;
- struct change *thisob=0, *end=0;
-
+ struct change *thisob = 0, *end = 0;
+
while (next)
{
/* Find a set of changes that belong together. */
thisob = next;
end = find_change(next);
-
+
/* Disconnect them from the rest of the changes,
making them a hunk, and remember the rest for next iteration. */
next = end->link;
@@ -136,21 +136,21 @@
debug_script(thisob);
#endif
- {
+ {
/* Determine range of line numbers involved in each file. */
- int first0=0, last0=0, first1=0, last1=0, deletes=0, inserts=0;
- analyze_hunk (thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
+ int first0 = 0, last0 = 0, first1 = 0, last1 = 0, deletes = 0, inserts = 0;
+ analyze_hunk(thisob, &first0, &last0, &first1, &last1, &deletes, &inserts);
if (deletes || inserts || thisob->trivial)
{
/* Print the lines that the first file has. */
- int trans_a0=0, trans_b0=0, trans_a1=0, trans_b1=0;
+ int trans_a0 = 0, trans_b0 = 0, trans_a1 = 0, trans_b1 = 0;
translate_range(&m_inf[0], first0, last0, &trans_a0, &trans_b0);
translate_range(&m_inf[1], first1, last1, &trans_a1, &trans_b1);
//Determine quantity of lines in this block for both sides
int QtyLinesLeft = (trans_b0 - trans_a0);
int QtyLinesRight = (trans_b1 - trans_a1);
-
+
// Match lines against regular expression filters
// Our strategy is that every line in both sides must
// match regexp before we mark difference as ignored.
@@ -172,7 +172,7 @@
// Free change script (which we don't want)
if (script != NULL)
{
- struct change *p,*e;
+ struct change *p, *e;
for (e = script; e; e = p)
{
if (!e->trivial)
@@ -180,7 +180,7 @@
else
++m_ntrivialdiffs;
p = e->link;
- free (e);
+ free(e);
}
if (m_ndiffs > 0)
code = code & ~DIFFCODE::SAME | DIFFCODE::DIFF;
@@ -196,11 +196,14 @@
code = code & ~DIFFCODE::TEXT;
switch (bin_file)
{
- case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1;
+ case BINFILE_SIDE1:
+ code |= DIFFCODE::BINSIDE1;
break;
- case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2;
+ case BINFILE_SIDE2:
+ code |= DIFFCODE::BINSIDE2;
break;
- case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN;
+ case BINFILE_SIDE1 | BINFILE_SIDE2:
+ code |= DIFFCODE::BIN;
break;
default:
_RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
@@ -231,9 +234,9 @@
bool DiffUtils::RegExpFilter(int StartPos, int EndPos, int FileNo)
{
if (m_pFilterList == NULL)
- {
+ {
_RPTF0(_CRT_ERROR, "DiffUtils::RegExpFilter() called when "
- "filterlist doesn't exist (=NULL)");
+ "filterlist doesn't exist (=NULL)");
return false;
}
@@ -276,14 +279,14 @@
* @return TRUE when compare succeeds, FALSE if error happened during compare.
*/
bool DiffUtils::Diff2Files(struct change ** diffs, int depth,
- int * bin_status, bool bMovedBlocks, int * bin_file)
+ int * bin_status, bool bMovedBlocks, int * bin_file)
{
bool bRet = true;
__try
{
- *diffs = diff_2_files (m_inf, depth, bin_status, bMovedBlocks, bin_file);
+ *diffs = diff_2_files(m_inf, depth, bin_status, bMovedBlocks, bin_file);
}
- __except (EXCEPTION_EXECUTE_HANDLER)
+ __except(EXCEPTION_EXECUTE_HANDLER)
{
*diffs = NULL;
bRet = false;
Modified: branches/R2_14/Src/CompareEngines/DiffUtils.h
===================================================================
--- branches/R2_14/Src/CompareEngines/DiffUtils.h 2010-10-20 20:04:08 UTC (rev 7326)
+++ branches/R2_14/Src/CompareEngines/DiffUtils.h 2010-10-20 20:25:08 UTC (rev 7327)
@@ -1,4 +1,4 @@
-/**
+/**
* @file DiffUtils.h
*
* @brief Declaration of DiffUtils class.
@@ -41,7 +41,7 @@
void GetDiffCounts(int & diffs, int & trivialDiffs);
void GetTextStats(int side, FileTextStats *stats);
bool Diff2Files(struct change ** diffs, int depth,
- int * bin_status, bool bMovedBlocks, int * bin_file);
+ int * bin_status, bool bMovedBlocks, int * bin_file);
void SetCodepage(int codepage) { m_codepage = codepage; }
protected:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-20 20:04:14
|
Revision: 7326
http://winmerge.svn.sourceforge.net/winmerge/?rev=7326&view=rev
Author: gerundt
Date: 2010-10-20 20:04:08 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Fix whitespace in unicoder.[cpp|h] and UniFile.[cpp|h] from R2_14
Modified Paths:
--------------
branches/R2_14/Src/Common/UniFile.cpp
branches/R2_14/Src/Common/UniFile.h
branches/R2_14/Src/Common/unicoder.cpp
branches/R2_14/Src/Common/unicoder.h
Modified: branches/R2_14/Src/Common/UniFile.cpp
===================================================================
--- branches/R2_14/Src/Common/UniFile.cpp 2010-10-20 17:50:53 UTC (rev 7325)
+++ branches/R2_14/Src/Common/UniFile.cpp 2010-10-20 20:04:08 UTC (rev 7326)
@@ -52,7 +52,7 @@
*/
UniFile::UniError::UniError()
{
- ClearError();
+ ClearError();
}
/**
@@ -195,11 +195,11 @@
/////////////
UniMemFile::UniMemFile()
-: m_handle(INVALID_HANDLE_VALUE)
-, m_hMapping(INVALID_HANDLE_VALUE)
-, m_base(NULL)
-, m_data(NULL)
-, m_current(NULL)
+ : m_handle(INVALID_HANDLE_VALUE)
+ , m_hMapping(INVALID_HANDLE_VALUE)
+ , m_base(NULL)
+ , m_data(NULL)
+ , m_current(NULL)
{
}
@@ -354,7 +354,7 @@
m_charsize = 1;
bool unicode = false;
bool bom = false;
-
+
m_unicoding = ucr::DetermineEncoding(lpByte, m_filesize, &bom);
switch (m_unicoding)
{
@@ -463,9 +463,9 @@
line.erase();
eol.erase();
LPCTSTR pchLine = (LPCTSTR)m_current;
-
+
// shortcut methods in case file is in the same encoding as our Strings
-
+
#ifdef _UNICODE
if (m_unicoding == ucr::UCS2LE)
{
@@ -560,19 +560,19 @@
}
#endif
- if (m_current - m_base + (m_charsize-1) >= m_filesize)
+ if (m_current - m_base + (m_charsize - 1) >= m_filesize)
return false;
// Handle 8-bit strings in line chunks because of multibyte codings (eg, 936)
if (m_unicoding == ucr::NONE)
{
- bool eof=true;
- LPBYTE eolptr=0;
- for (eolptr = m_current; (eolptr - m_base + (m_charsize-1) < m_filesize); ++eolptr)
+ bool eof = true;
+ LPBYTE eolptr = 0;
+ for (eolptr = m_current; (eolptr - m_base + (m_charsize - 1) < m_filesize); ++eolptr)
{
if (*eolptr == '\n' || *eolptr == '\r')
{
- eof=false;
+ eof = false;
break;
}
if (*eolptr == 0)
@@ -581,16 +581,16 @@
RecordZero(m_txtstats, offset);
}
}
- line = ucr::maketstring((LPCSTR)m_current, eolptr-m_current, m_codepage, lossy);
+ line = ucr::maketstring((LPCSTR)m_current, eolptr - m_current, m_codepage, lossy);
if (lossy && *lossy)
++m_txtstats.nlosses;
if (!eof)
{
- eol += (TCHAR)*eolptr;
+ eol += (TCHAR) * eolptr;
++m_lineno;
if (*eolptr == '\r')
{
- if (eolptr - m_base + (m_charsize-1) < m_filesize && eolptr[1] == '\n')
+ if (eolptr - m_base + (m_charsize - 1) < m_filesize && eolptr[1] == '\n')
{
eol += '\n';
++m_txtstats.ncrlfs;
@@ -606,11 +606,11 @@
return !eof;
}
- while (m_current - m_base + (m_charsize-1) < m_filesize)
+ while (m_current - m_base + (m_charsize - 1) < m_filesize)
{
- UINT ch=0;
- UINT utf8len=0;
- bool doneline=false;
+ UINT ch = 0;
+ UINT utf8len = 0;
+ bool doneline = false;
if (m_unicoding == ucr::UTF8)
{
@@ -627,7 +627,7 @@
else if (utf8len < 1 || utf8len > 4)
{
ch = '?';
- utf8len=1;
+ utf8len = 1;
}
else
{
@@ -662,7 +662,7 @@
{
// For UTF-8, this ch will be wrong if character is non-ASCII
// but we only check it against \n here, so it doesn't matter
- UINT ch = ucr::get_unicode_char(m_current+m_charsize, (ucr::UNICODESET)m_unicoding);
+ UINT ch = ucr::get_unicode_char(m_current + m_charsize, (ucr::UNICODESET)m_unicoding);
if (ch == '\n')
{
crlf = true;
@@ -725,8 +725,8 @@
/////////////
UniStdioFile::UniStdioFile()
-: m_fp(0)
-, m_data(0)
+ : m_fp(0)
+ , m_data(0)
{
m_pucrbuff = new ucr::buffer(128);
}
@@ -734,7 +734,7 @@
UniStdioFile::~UniStdioFile()
{
Close();
- delete (ucr::buffer *)m_pucrbuff;
+ delete(ucr::buffer *)m_pucrbuff;
m_pucrbuff = 0;
}
@@ -781,11 +781,11 @@
}
bool UniStdioFile::OpenCreateUtf8(LPCTSTR filename)
{
- if (!OpenCreate(filename))
+ if (!OpenCreate(filename))
return false;
SetUnicoding(ucr::UTF8);
return true;
-
+
}
bool UniStdioFile::Open(LPCTSTR filename, LPCTSTR mode)
{
@@ -800,7 +800,7 @@
bool UniStdioFile::DoOpen(LPCTSTR filename, LPCTSTR mode)
{
Close();
-
+
m_filepath = filename;
m_filename = filename; // TODO: Make canonical ?
@@ -866,7 +866,7 @@
m_charsize = 1;
bool unicode = false;
bool bom = false;
-
+
m_unicoding = ucr::DetermineEncoding(buff, bytes, &bom);
switch (m_unicoding)
{
@@ -975,8 +975,8 @@
}
ucr::buffer * buff = (ucr::buffer *)m_pucrbuff;
- ucr::UNICODESET unicoding1=ucr::NONE;
- int codepage1=0;
+ ucr::UNICODESET unicoding1 = ucr::NONE;
+ int codepage1 = 0;
ucr::getInternalEncoding(&unicoding1, &codepage1); // What String & TCHARs represent
const unsigned char * src = (const UCHAR *)line.c_str();
int srcbytes = line.length() * sizeof(TCHAR);
Modified: branches/R2_14/Src/Common/UniFile.h
===================================================================
--- branches/R2_14/Src/Common/UniFile.h 2010-10-20 17:50:53 UTC (rev 7325)
+++ branches/R2_14/Src/Common/UniFile.h 2010-10-20 20:04:08 UTC (rev 7326)
@@ -1,4 +1,4 @@
-/**
+/**
* @file UniFile.h
* @author Perry Rapp, Creator, 2003-2006
* @date Created: 2003-10
@@ -20,7 +20,7 @@
class UniFile
{
public:
-
+
/**
* @brief A struct for error message or error code.
*/
Modified: branches/R2_14/Src/Common/unicoder.cpp
===================================================================
--- branches/R2_14/Src/Common/unicoder.cpp 2010-10-20 17:50:53 UTC (rev 7325)
+++ branches/R2_14/Src/Common/unicoder.cpp 2010-10-20 20:04:08 UTC (rev 7326)
@@ -32,10 +32,11 @@
#define WC_NO_BEST_FIT_CHARS 0x00000400
#endif
-namespace ucr {
+namespace ucr
+{
// current OS version
-static bool f_osvi_fetched=false;
+static bool f_osvi_fetched = false;
static OSVERSIONINFO f_osvi;
/**
@@ -132,7 +133,7 @@
}
/**
- * @brief return #bytes required to represent Unicode codepoint as UTF-8
+ * @brief return #bytes required to represent Unicode codepoint as UTF-8
*/
int Utf8len_fromCodepoint(unsigned int ch)
{
@@ -146,7 +147,7 @@
}
/**
- * @brief How many bytes will it take to write string as UTF-8 ?
+ * @brief How many bytes will it take to write string as UTF-8 ?
*
* @param size size argument as filemapping are not 0 terminated
*
@@ -154,8 +155,8 @@
*/
unsigned int Utf8len_of_string(const wchar_t* text, int size)
{
- unsigned int len=0;
- for (int i=0; i<size; ++i)
+ unsigned int len = 0;
+ for (int i = 0; i < size; ++i)
{
int chlen = Utf8len_fromCodepoint(text[i]);
if (chlen < 1) chlen = 1;
@@ -164,7 +165,7 @@
return len;
}
/**
- * @brief How many chars in this UTF-8 string ?
+ * @brief How many chars in this UTF-8 string ?
*
* @param size size argument as filemapping are not 0 terminated
*
@@ -172,8 +173,8 @@
*/
unsigned int stringlen_of_utf8(const char* text, int size)
{
- unsigned int len=0;
- for (int i=0; i<size; )
+ unsigned int len = 0;
+ for (int i = 0; i < size;)
{
int chlen = Utf8len_fromLeadByte(text[i]);
if (chlen < 1) chlen = 1;
@@ -189,41 +190,48 @@
unsigned int GetUtf8Char(unsigned char * str)
{
/* test short cases first, as probably much more common */
- if (!(*str & 0x80 && *str & 0x40)) {
+ if (!(*str & 0x80 && *str & 0x40))
+ {
return str[0];
}
- if (!(*str & 0x20)) {
+ if (!(*str & 0x20))
+ {
unsigned int ch = ((str[0] & 0x1F) << 6)
- + (str[1] & 0x3F);
+ + (str[1] & 0x3F);
return ch;
}
- if (!(*str & 0x10)) {
+ if (!(*str & 0x10))
+ {
unsigned int ch = ((str[0] & 0x0f) << 12)
- + ((str[1] & 0x3F) << 6)
- + (str[2] & 0x3F);
+ + ((str[1] & 0x3F) << 6)
+ + (str[2] & 0x3F);
return ch;
}
- if (!(*str & 0x08)) {
+ if (!(*str & 0x08))
+ {
unsigned int ch = ((str[0] & 0x0F) << 18)
- + ((str[1] & 0x3F) << 12)
- + ((str[2] & 0x3F) << 6)
- + (str[3] & 0x3F);
+ + ((str[1] & 0x3F) << 12)
+ + ((str[2] & 0x3F) << 6)
+ + (str[3] & 0x3F);
return ch;
}
- if (!(*str & 0x04)) {
+ if (!(*str & 0x04))
+ {
unsigned int ch = ((str[0] & 0x0F) << 24)
- + ((str[1] & 0x3F) << 18)
- + ((str[2] & 0x3F) << 12)
- + ((str[3] & 0x3F) << 6)
- + (str[4] & 0x3F);
+ + ((str[1] & 0x3F) << 18)
+ + ((str[2] & 0x3F) << 12)
+ + ((str[3] & 0x3F) << 6)
+ + (str[4] & 0x3F);
return ch;
- } else {
+ }
+ else
+ {
unsigned int ch = ((str[0] & 0x0F) << 30)
- + ((str[1] & 0x3F) << 24)
- + ((str[2] & 0x3F) << 18)
- + ((str[3] & 0x3F) << 12)
- + ((str[4] & 0x3F) << 6)
- + (str[5] & 0x3F);
+ + ((str[1] & 0x3F) << 24)
+ + ((str[2] & 0x3F) << 18)
+ + ((str[3] & 0x3F) << 12)
+ + ((str[4] & 0x3F) << 6)
+ + (str[5] & 0x3F);
return ch;
}
}
@@ -322,21 +330,21 @@
wchar_t wch = (wchar_t)unich;
if (!lossy)
{
- static bool vercheck=false;
- static bool has_no_best_fit=false;
+ static bool vercheck = false;
+ static bool has_no_best_fit = false;
if (!vercheck)
{
if (!f_osvi_fetched) fetch_verinfo();
// Need 2000 (5.x) or 98 (4.10)
- has_no_best_fit = f_osvi.dwMajorVersion>=5 || (f_osvi.dwMajorVersion==4 && f_osvi.dwMinorVersion>=10);
+ has_no_best_fit = f_osvi.dwMajorVersion >= 5 || (f_osvi.dwMajorVersion == 4 && f_osvi.dwMinorVersion >= 10);
vercheck = true;
}
// So far it isn't lossy, so try for lossless conversion
TCHAR outch;
- BOOL defaulted=FALSE;
+ BOOL defaulted = FALSE;
DWORD flags = has_no_best_fit ? WC_NO_BEST_FIT_CHARS : 0;
if (WideCharToMultiByte(codepage, flags, &wch, 1, &outch, 1, NULL, &defaulted)
- && !defaulted)
+ && !defaulted)
{
String s(1, outch);
return s;
@@ -344,12 +352,12 @@
lossy = TRUE;
}
// already lossy, so make our best shot
- DWORD flags = WC_COMPOSITECHECK+WC_DISCARDNS+WC_SEPCHARS+WC_DEFAULTCHAR;
+ DWORD flags = WC_COMPOSITECHECK + WC_DISCARDNS + WC_SEPCHARS + WC_DEFAULTCHAR;
TCHAR outbuff[16];
- int n = WideCharToMultiByte(codepage, flags, &wch, 1, outbuff, sizeof(outbuff)-1, NULL, NULL);
- if (n>0)
+ int n = WideCharToMultiByte(codepage, flags, &wch, 1, outbuff, sizeof(outbuff) - 1, NULL, NULL);
+ if (n > 0)
{
- outbuff[n] =0;
+ outbuff[n] = 0;
return outbuff;
}
return _T("?");
@@ -359,7 +367,7 @@
/**
* @brief convert 8-bit character input to Unicode codepoint and return it
*/
-unsigned int byteToUnicode (unsigned char ch)
+unsigned int byteToUnicode(unsigned char ch)
{
static unsigned int codepage = CP_ACP;
// NB: Windows always draws in CP_ACP, not CP_THREAD_ACP, so we must use CP_ACP as an internal codepage
@@ -370,7 +378,7 @@
/**
* @brief convert 8-bit character input to Unicode codepoint and return it
*/
-unsigned int byteToUnicode (unsigned char ch, unsigned int codepage)
+unsigned int byteToUnicode(unsigned char ch, unsigned int codepage)
{
if (ch < 0x80)
@@ -378,8 +386,8 @@
DWORD flags = 0;
wchar_t wbuff;
- int n = MultiByteToWideChar(codepage, flags, (const char*)&ch, 1, &wbuff, 1);
- if (n>0)
+ int n = MultiByteToWideChar(codepage, flags, (const char*) & ch, 1, &wbuff, 1);
+ if (n > 0)
return wbuff;
else
return '?';
@@ -482,12 +490,12 @@
LPWSTR wbuff = &*str.begin();
do
{
- int n = MultiByteToWideChar(codepage, flags, lpd, len, wbuff, wlen-1);
+ 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
+ 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.
*/
@@ -505,7 +513,8 @@
}
*lossy = true;
flags ^= MB_ERR_INVALID_CHARS;
- } while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION);
+ }
+ while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION);
str = _T('?');
return str;
@@ -528,7 +537,7 @@
#ifndef UNICODE
String CrossConvertToStringA(const char* src, unsigned int srclen, int cpin, int cpout, bool * lossy)
{
- int wlen = srclen*2+6;
+ int wlen = srclen * 2 + 6;
int clen = wlen * 2 + 6;
String str;
str.resize(clen);
@@ -550,9 +559,9 @@
// Convert input to Unicode, using specified codepage
DWORD flags = 0;
- int wlen = srclen*2+6;
+ int wlen = srclen * 2 + 6;
wchar_t * wbuff = new wchar_t[wlen];
- int n = MultiByteToWideChar(cpin, flags, (const char*)src, srclen, wbuff, wlen-1);
+ int n = MultiByteToWideChar(cpin, flags, (const char*)src, srclen, wbuff, wlen - 1);
if (!n)
{
int nsyserr = ::GetLastError();
@@ -562,8 +571,8 @@
return 1;
}
/*
- NB: MultiByteToWideChar is documented as only zero-terminating
- if input was zero-terminated, but it appears that it can
+ 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.
*/
@@ -574,14 +583,14 @@
// Now convert to TCHAR (which means defcodepage)
flags = WC_NO_BEST_FIT_CHARS; // TODO: Think about this
wlen = n;
- BOOL defaulted=FALSE;
+ BOOL defaulted = FALSE;
BOOL * pdefaulted = &defaulted;
if (cpout == CP_UTF8)
{
flags = 0;
pdefaulted = NULL;
}
- n = WideCharToMultiByte(cpout, flags, wbuff, n, dest, destsize-1, NULL, pdefaulted);
+ n = WideCharToMultiByte(cpout, flags, wbuff, n, dest, destsize - 1, NULL, pdefaulted);
if (!n)
{
int nsyserr = ::GetLastError();
@@ -642,11 +651,11 @@
return true;
}
if ((unicoding1 == UCS2LE && unicoding2 == UCS2BE)
- || (unicoding1 == UCS2BE && unicoding2 == UCS2LE))
+ || (unicoding1 == UCS2BE && unicoding2 == UCS2LE))
{
// simple byte swap
dest->resize(srcbytes);
- for (int i=0; i<srcbytes; i += 2)
+ for (int i = 0; i < srcbytes; i += 2)
{
// Byte-swap into destination
dest->ptr[i] = src[i+1];
@@ -671,12 +680,12 @@
int destcp = (unicoding2 == UTF8 ? CP_UTF8 : codepage2);
DWORD flags = 0;
- int bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes/2, 0, 0, NULL, NULL);
+ int bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes / 2, 0, 0, NULL, NULL);
dest->resize(bytes);
int losses = 0;
- bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes/2, (char *)dest->ptr, dest->capacity, NULL, NULL);
+ bytes = WideCharToMultiByte(destcp, flags, (const wchar_t*)src, srcbytes / 2, (char *)dest->ptr, dest->capacity, NULL, NULL);
dest->size = bytes;
- return losses==0;
+ return losses == 0;
}
else
{
@@ -685,7 +694,7 @@
DWORD flags = 0;
int wchars = MultiByteToWideChar(srccp, flags, (const char*)src, srcbytes, 0, 0);
dest->resize(wchars*2);
- wchars = MultiByteToWideChar(srccp, flags, (const char*)src, srcbytes, (LPWSTR)dest->ptr, dest->capacity/2);
+ wchars = MultiByteToWideChar(srccp, flags, (const char*)src, srcbytes, (LPWSTR)dest->ptr, dest->capacity / 2);
dest->size = wchars * 2;
return true;
}
@@ -697,6 +706,11 @@
* @param [in] size Size of the buffer.
* @param [out] pBom Returns true if buffer had BOM bytes, false otherwise.
* @return One of UNICODESET values as encoding.
+ * EF BB BF UTF-8
+ * FF FE UTF-16, little endian
+ * FE FF UTF-16, big endian
+ * FF FE 00 00 UTF-32, little endian
+ * 00 00 FE FF UTF-32, big-endian
*/
UNICODESET DetermineEncoding(unsigned char* pBuffer, int size, bool * pBom)
{
@@ -707,12 +721,12 @@
{
if (pBuffer[0] == 0xFF && pBuffer[1] == 0xFE)
{
- unicoding = ucr::UCS2LE;
+ unicoding = ucr::UCS2LE; //UNI little endian
*pBom = true;
}
else if (pBuffer[0] == 0xFE && pBuffer[1] == 0xFF)
{
- unicoding = ucr::UCS2BE;
+ unicoding = ucr::UCS2BE; //UNI big endian
*pBom = true;
}
}
@@ -750,7 +764,7 @@
if (cp == CP_THREAD_ACP) // should only happen on Win2000+
{
TCHAR buff[32];
- if (GetLocaleInfo(GetThreadLocale(), LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof(buff)/sizeof(buff[0])))
+ if (GetLocaleInfo(GetThreadLocale(), LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof(buff) / sizeof(buff[0])))
cp = _ttol(buff);
else
// a valid codepage is better than no codepage
@@ -767,5 +781,5 @@
bool EqualCodepages(int cp1, int cp2)
{
return (cp1 == cp2)
- || (NormalizeCodepage(cp1) == NormalizeCodepage(cp2));
+ || (NormalizeCodepage(cp1) == NormalizeCodepage(cp2));
}
Modified: branches/R2_14/Src/Common/unicoder.h
===================================================================
--- branches/R2_14/Src/Common/unicoder.h 2010-10-20 17:50:53 UTC (rev 7325)
+++ branches/R2_14/Src/Common/unicoder.h 2010-10-20 20:04:08 UTC (rev 7326)
@@ -5,7 +5,7 @@
* @date Edited: 2006-02-20 (Perry Rapp)
*
* @brief Declaration of utility unicode conversion routines
- */
+ */
// ID line follows -- this is updated by SVN
// $Id$
@@ -14,12 +14,14 @@
#include "UnicodeString.h"
-namespace ucr {
+namespace ucr
+{
/**
* @brief A simple buffer struct.
*/
-struct buffer {
+struct buffer
+{
unsigned char * ptr; /**< Pointer to a buffer. */
unsigned int capacity; /**< Buffer's size in bytes. */
unsigned int size; /**< Size of the data in the buffer, <= capacity. */
@@ -47,7 +49,7 @@
int to_utf8_advance(unsigned int u, unsigned char * &lpd);
String maketchar(unsigned int ch, bool & lossy);
int writeBom(void* dest, UNICODESET unicoding);
-unsigned int get_unicode_char(unsigned char * ptr, UNICODESET unicoding, int codepage=0);
+unsigned int get_unicode_char(unsigned char * ptr, UNICODESET unicoding, int codepage = 0);
String maketstring(const char* lpd, unsigned int len, int codepage, bool * lossy);
String maketchar(unsigned int unich, bool & lossy);
String maketchar(unsigned int unich, bool & lossy, unsigned int codepage);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-20 17:51:00
|
Revision: 7325
http://winmerge.svn.sourceforge.net/winmerge/?rev=7325&view=rev
Author: gerundt
Date: 2010-10-20 17:50:53 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
PATCH: [ 2638608 ] Autoprediff
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/MainFrm.cpp
branches/R2_14/Src/MainFrm.h
branches/R2_14/Src/Merge.rc
branches/R2_14/Src/resource.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 16:59:57 UTC (rev 7324)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 17:50:53 UTC (rev 7325)
@@ -12,6 +12,7 @@
Expand/collapse folders from keyboard (#2203904)
Improve detecting XML files in file compare (#2726531)
Improve startup time (#2788142)
+ Add menuitems for selecting automatic or manual prediffing (#2638608)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
Modified: branches/R2_14/Src/MainFrm.cpp
===================================================================
--- branches/R2_14/Src/MainFrm.cpp 2010-10-20 16:59:57 UTC (rev 7324)
+++ branches/R2_14/Src/MainFrm.cpp 2010-10-20 17:50:53 UTC (rev 7325)
@@ -189,6 +189,8 @@
ON_WM_SETCURSOR()
ON_COMMAND_RANGE(ID_UNPACK_MANUAL, ID_UNPACK_AUTO, OnPluginUnpackMode)
ON_UPDATE_COMMAND_UI_RANGE(ID_UNPACK_MANUAL, ID_UNPACK_AUTO, OnUpdatePluginUnpackMode)
+ ON_COMMAND_RANGE(ID_PREDIFFER_MANUAL, ID_PREDIFFER_AUTO, OnPluginPrediffMode)
+ ON_UPDATE_COMMAND_UI_RANGE(ID_PREDIFFER_MANUAL, ID_PREDIFFER_AUTO, OnUpdatePluginPrediffMode)
ON_UPDATE_COMMAND_UI(ID_RELOAD_PLUGINS, OnUpdateReloadPlugins)
ON_COMMAND(ID_RELOAD_PLUGINS, OnReloadPlugins)
ON_COMMAND(ID_HELP_GETCONFIG, OnSaveConfigData)
@@ -284,8 +286,7 @@
InitializeSourceControlMembers();
g_bUnpackerMode = theApp.GetProfileInt(_T("Settings"), _T("UnpackerMode"), PLUGIN_MANUAL);
- // uncomment this when the GUI allows to toggle the mode
-// g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL);
+ g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL);
m_pSyntaxColors = new SyntaxColors();
if (m_pSyntaxColors)
@@ -1081,6 +1082,9 @@
CString strLeft = pszLeft;
CString strRight = pszRight;
+ g_bUnpackerMode = theApp.GetProfileInt(_T("Settings"), _T("UnpackerMode"), PLUGIN_MANUAL);
+ g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL);
+
PackingInfo infoUnpacker;
BOOL bROLeft = dwLeftFlags & FFILEOPEN_READONLY;
@@ -2230,7 +2234,32 @@
if (pCmdUI->m_nID == ID_UNPACK_AUTO)
pCmdUI->SetRadio(PLUGIN_AUTO == g_bUnpackerMode);
}
+void CMainFrame::OnPluginPrediffMode(UINT nID )
+{
+ switch (nID)
+ {
+ case ID_PREDIFFER_MANUAL:
+ g_bPredifferMode = PLUGIN_MANUAL;
+ break;
+ case ID_PREDIFFER_AUTO:
+ g_bPredifferMode = PLUGIN_AUTO;
+ break;
+ }
+ theApp.WriteProfileInt(_T("Settings"), _T("PredifferMode"), g_bPredifferMode);
+}
+void CMainFrame::OnUpdatePluginPrediffMode(CCmdUI* pCmdUI)
+{
+ if (GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
+ pCmdUI->Enable(TRUE);
+ else
+ pCmdUI->Enable(FALSE);
+
+ if (pCmdUI->m_nID == ID_PREDIFFER_MANUAL)
+ pCmdUI->SetRadio(PLUGIN_MANUAL == g_bPredifferMode);
+ if (pCmdUI->m_nID == ID_PREDIFFER_AUTO)
+ pCmdUI->SetRadio(PLUGIN_AUTO == g_bPredifferMode);
+}
/**
* @brief Called when "Reload Plugins" item is updated
*/
Modified: branches/R2_14/Src/MainFrm.h
===================================================================
--- branches/R2_14/Src/MainFrm.h 2010-10-20 16:59:57 UTC (rev 7324)
+++ branches/R2_14/Src/MainFrm.h 2010-10-20 17:50:53 UTC (rev 7325)
@@ -307,6 +307,8 @@
afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
afx_msg void OnUpdatePluginUnpackMode(CCmdUI* pCmdUI);
afx_msg void OnPluginUnpackMode(UINT nID);
+ afx_msg void OnUpdatePluginPrediffMode(CCmdUI* pCmdUI);
+ afx_msg void OnPluginPrediffMode(UINT nID);
afx_msg void OnUpdateReloadPlugins(CCmdUI* pCmdUI);
afx_msg void OnReloadPlugins();
afx_msg void OnSaveConfigData();
Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc 2010-10-20 16:59:57 UTC (rev 7324)
+++ branches/R2_14/Src/Merge.rc 2010-10-20 17:50:53 UTC (rev 7325)
@@ -149,6 +149,9 @@
BEGIN
MENUITEM "&List...", ID_PLUGINS_LIST
MENUITEM SEPARATOR
+ MENUITEM "Ma&nual Prediffer", ID_PREDIFFER_MANUAL
+ MENUITEM "A&utomatic Prediffer", ID_PREDIFFER_AUTO
+ MENUITEM SEPARATOR
MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL
MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO
MENUITEM SEPARATOR
Modified: branches/R2_14/Src/resource.h
===================================================================
--- branches/R2_14/Src/resource.h 2010-10-20 16:59:57 UTC (rev 7324)
+++ branches/R2_14/Src/resource.h 2010-10-20 17:50:53 UTC (rev 7325)
@@ -1071,6 +1071,8 @@
#define ID_HELP_TRANSLATIONS 33171
#define ID_VIEW_ZOOMNORMAL 33172
#define ID_PLUGINS_LIST 33173
+#define ID_PREDIFFER_MANUAL 33174
+#define ID_PREDIFFER_AUTO 33175
#define ID_VIEW_EXPAND 33176
#define ID_VIEW_COLLAPSE 33177
// Next default values for new objects
@@ -1078,8 +1080,8 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 237
-#define _APS_NEXT_COMMAND_VALUE 33174
+#define _APS_NEXT_RESOURCE_VALUE 238
+#define _APS_NEXT_COMMAND_VALUE 33178
#define _APS_NEXT_CONTROL_VALUE 1345
#define _APS_NEXT_SYMED_VALUE 113
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-20 17:00:03
|
Revision: 7324
http://winmerge.svn.sourceforge.net/winmerge/?rev=7324&view=rev
Author: gerundt
Date: 2010-10-20 16:59:57 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
PATCH: [ 2788142 ] Improve startup time
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/BCMenu.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 15:40:39 UTC (rev 7323)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-20 16:59:57 UTC (rev 7324)
@@ -11,6 +11,7 @@
context menu (#2600787)
Expand/collapse folders from keyboard (#2203904)
Improve detecting XML files in file compare (#2726531)
+ Improve startup time (#2788142)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
Modified: branches/R2_14/Src/BCMenu.cpp
===================================================================
--- branches/R2_14/Src/BCMenu.cpp 2010-10-20 15:40:39 UTC (rev 7323)
+++ branches/R2_14/Src/BCMenu.cpp 2010-10-20 16:59:57 UTC (rev 7324)
@@ -2237,35 +2237,33 @@
void BCMenu::GetTransparentBitmap(CBitmap &bmp)
{
CDC ddc;
- COLORREF bgcol,col,newcol;
BITMAP BitMap;
bmp.GetBitmap(&BitMap);
ddc.CreateCompatibleDC(NULL);
CBitmap * pddcOldBmp = ddc.SelectObject(&bmp);
- // use this to get the background color, takes into account color shifting
- CDC ddc2;
- CBrush brush;
- CBitmap bmp2;
- ddc2.CreateCompatibleDC(NULL);
- bmp2.CreateCompatibleBitmap(&ddc,BitMap.bmWidth,BitMap.bmHeight);
- col=RGB(255,0,255); // Original was RGB(192,192,192)
- brush.CreateSolidBrush(col);
- CBitmap * pddcOldBmp2 = ddc2.SelectObject(&bmp2);
- CRect rect(0,0,BitMap.bmWidth,BitMap.bmHeight);
- ddc2.FillRect(rect,&brush);
- bgcol=ddc2.GetPixel(1,1);
- brush.DeleteObject();
- ddc2.SelectObject(pddcOldBmp2);
- newcol=GetSysColor(COLOR_3DFACE);
+ CDC ddcMask;
+ CBitmap bmpMask;
+ ddcMask.CreateCompatibleDC(NULL);
+ bmpMask.CreateBitmap(BitMap.bmWidth, BitMap.bmHeight, 1, 1, NULL);
+ CBitmap * pddcMaskOldBmp = ddcMask.SelectObject(&bmpMask);
- for(int i=0;i<BitMap.bmWidth;++i){
- for(int j=0;j<BitMap.bmHeight;++j){
- col=ddc.GetPixel(i,j);
- if(col==bgcol)ddc.SetPixel(i,j,newcol);
- }
- }
+ /* Generate mask */
+ ddc.SetBkColor(RGB(255, 0, 255));
+ ddcMask.BitBlt(0, 0, BitMap.bmWidth, BitMap.bmHeight, &ddc, 0, 0, SRCCOPY);
+
+ /* Remove transparent areas from bmp */
+ ddc.SetBkColor(RGB(0, 0, 0));
+ ddc.SetTextColor(RGB(255, 255, 255));
+ ddc.BitBlt(0, 0, BitMap.bmWidth, BitMap.bmHeight, &ddcMask, 0, 0, SRCAND);
+
+ /* Fill transparent areas with COLOR_3DFACE */
+ ddc.SetBkColor(GetSysColor(COLOR_3DFACE));
+ ddc.SetTextColor(RGB(0, 0, 0));
+ ddc.BitBlt(0, 0, BitMap.bmWidth, BitMap.bmHeight, &ddcMask, 0, 0, SRCPAINT);
+
+ ddcMask.SelectObject(pddcMaskOldBmp);
ddc.SelectObject(pddcOldBmp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-20 15:40:47
|
Revision: 7323
http://winmerge.svn.sourceforge.net/winmerge/?rev=7323&view=rev
Author: kimmov
Date: 2010-10-20 15:40:39 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Scripts: Support VS2010 and make VS2008 default.
Modified Paths:
--------------
branches/R2_14/Tools/Scripts/ToolSettings.py
Modified: branches/R2_14/Tools/Scripts/ToolSettings.py
===================================================================
--- branches/R2_14/Tools/Scripts/ToolSettings.py 2010-10-20 15:35:39 UTC (rev 7322)
+++ branches/R2_14/Tools/Scripts/ToolSettings.py 2010-10-20 15:40:39 UTC (rev 7323)
@@ -1,6 +1,6 @@
#
# The MIT License
-# Copyright (c) 2007-2009 Kimmo Varis
+# Copyright (c) 2007-2010 Kimmo Varis
# Copyright (c) 2008 Matthias Mayer
#
# Permission is hereby granted, free of charge, to any person obtaining
@@ -39,10 +39,12 @@
self.vs_path7 = r'C:\Program Files\Microsoft Visual Studio .NET 2003'
self.vs_path8 = r'C:\Program Files\Microsoft Visual Studio 8'
self.vs_path9 = r'C:\Program Files\Microsoft Visual Studio 9.0'
+ self.vs_path10 = r'C:\Program Files\Microsoft Visual Studio 10.0'
self.innosetup_path = r'C:\Program Files\Inno Setup 5'
+ self.nsis_path = r'C:\Program Files\NSIS'
# Checkout sources from local workspace or from SVN server (give URL)
self.source = 'workspace'
- self.vs_version = 2005
+ self.vs_version = 2008
def create_ini(self, filename):
config = ConfigParser.RawConfigParser()
@@ -65,8 +67,12 @@
config.set(sect, 'vs_path8', self.vs_path8)
if not config.has_option(sect, 'vs_path9'):
config.set(sect, 'vs_path9', self.vs_path9)
+ if not config.has_option(sect, 'vs_path10'):
+ config.set(sect, 'vs_path10', self.vs_path10)
if not config.has_option(sect, 'innosetup_path'):
config.set(sect, 'innosetup_path', self.innosetup_path)
+ if not config.has_option(sect, 'nsis_path'):
+ config.set(sect, 'nsis_path', self.nsis_path)
# Writing our configuration file to 'Tools.ini'
with open(filename, 'w') as configfile:
@@ -88,7 +94,9 @@
self.vs_path7 = config.get('RUNTIME', 'vs_path7')
self.vs_path8 = config.get('RUNTIME', 'vs_path8')
self.vs_path9 = config.get('RUNTIME', 'vs_path9')
+ self.vs_path10 = config.get('RUNTIME', 'vs_path10')
self.innosetup_path = config.get('RUNTIME', 'innosetup_path')
+ self.nsis_path = config.get('RUNTIME', 'nsis_path')
self.source = config.get('RUNTIME', 'Source')
self.vs_version = config.getint('RUNTIME', 'VSStudio')
@@ -98,3 +106,5 @@
self.vs_path = self.vs_path8
elif self.vs_version == 2008:
self.vs_path = self.vs_path9
+ elif self.vs_version == 2010:
+ self.vs_path = self.vs_path10
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-20 15:35:45
|
Revision: 7322
http://winmerge.svn.sourceforge.net/winmerge/?rev=7322&view=rev
Author: kimmov
Date: 2010-10-20 15:35:39 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Scripts: Make VS2008 default when converting project files.
Modified Paths:
--------------
trunk/Tools/Scripts/ToolSettings.py
Modified: trunk/Tools/Scripts/ToolSettings.py
===================================================================
--- trunk/Tools/Scripts/ToolSettings.py 2010-10-20 15:34:36 UTC (rev 7321)
+++ trunk/Tools/Scripts/ToolSettings.py 2010-10-20 15:35:39 UTC (rev 7322)
@@ -44,7 +44,7 @@
self.nsis_path = r'C:\Program Files\NSIS'
# Checkout sources from local workspace or from SVN server (give URL)
self.source = 'workspace'
- self.vs_version = 2005
+ self.vs_version = 2008
def create_ini(self, filename):
config = ConfigParser.RawConfigParser()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-20 15:34:42
|
Revision: 7321
http://winmerge.svn.sourceforge.net/winmerge/?rev=7321&view=rev
Author: kimmov
Date: 2010-10-20 15:34:36 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Scripts: Support VS2010 in VS project conversion.
Modified Paths:
--------------
trunk/Tools/Scripts/ToolSettings.py
Modified: trunk/Tools/Scripts/ToolSettings.py
===================================================================
--- trunk/Tools/Scripts/ToolSettings.py 2010-10-20 06:04:07 UTC (rev 7320)
+++ trunk/Tools/Scripts/ToolSettings.py 2010-10-20 15:34:36 UTC (rev 7321)
@@ -1,6 +1,6 @@
#
# The MIT License
-# Copyright (c) 2007-2009 Kimmo Varis
+# Copyright (c) 2007-2010 Kimmo Varis
# Copyright (c) 2008 Matthias Mayer
#
# Permission is hereby granted, free of charge, to any person obtaining
@@ -39,7 +39,9 @@
self.vs_path7 = r'C:\Program Files\Microsoft Visual Studio .NET 2003'
self.vs_path8 = r'C:\Program Files\Microsoft Visual Studio 8'
self.vs_path9 = r'C:\Program Files\Microsoft Visual Studio 9.0'
+ self.vs_path10 = r'C:\Program Files\Microsoft Visual Studio 10.0'
self.innosetup_path = r'C:\Program Files\Inno Setup 5'
+ self.nsis_path = r'C:\Program Files\NSIS'
# Checkout sources from local workspace or from SVN server (give URL)
self.source = 'workspace'
self.vs_version = 2005
@@ -65,8 +67,12 @@
config.set(sect, 'vs_path8', self.vs_path8)
if not config.has_option(sect, 'vs_path9'):
config.set(sect, 'vs_path9', self.vs_path9)
+ if not config.has_option(sect, 'vs_path10'):
+ config.set(sect, 'vs_path10', self.vs_path10)
if not config.has_option(sect, 'innosetup_path'):
config.set(sect, 'innosetup_path', self.innosetup_path)
+ if not config.has_option(sect, 'nsis_path'):
+ config.set(sect, 'nsis_path', self.nsis_path)
# Writing our configuration file to 'Tools.ini'
with open(filename, 'w') as configfile:
@@ -88,7 +94,9 @@
self.vs_path7 = config.get('RUNTIME', 'vs_path7')
self.vs_path8 = config.get('RUNTIME', 'vs_path8')
self.vs_path9 = config.get('RUNTIME', 'vs_path9')
+ self.vs_path10 = config.get('RUNTIME', 'vs_path10')
self.innosetup_path = config.get('RUNTIME', 'innosetup_path')
+ self.nsis_path = config.get('RUNTIME', 'nsis_path')
self.source = config.get('RUNTIME', 'Source')
self.vs_version = config.getint('RUNTIME', 'VSStudio')
@@ -98,3 +106,5 @@
self.vs_path = self.vs_path8
elif self.vs_version == 2008:
self.vs_path = self.vs_path9
+ elif self.vs_version == 2010:
+ self.vs_path = self.vs_path10
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-20 06:04:13
|
Revision: 7320
http://winmerge.svn.sourceforge.net/winmerge/?rev=7320&view=rev
Author: gerundt
Date: 2010-10-20 06:04:07 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
BUG: [ 2791093 ] TortoiseSVN integration should omit -x
Modified Paths:
--------------
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-20 04:36:19 UTC (rev 7319)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-20 06:04:07 UTC (rev 7320)
@@ -576,7 +576,7 @@
Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
;Set WinMerge as TortoiseSVN diff tool
-Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
;(unless the user already has a startup language specified)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
