|
From: <sdo...@us...> - 2007-08-21 17:08:52
|
Revision: 4459
http://winmerge.svn.sourceforge.net/winmerge/?rev=4459&view=rev
Author: sdottaka
Date: 2007-08-21 10:08:44 -0700 (Tue, 21 Aug 2007)
Log Message:
-----------
BUG: [ 1759793 ] Filter test dialog problem with directory filters
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/TestFilterDlg.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-08-21 16:30:19 UTC (rev 4458)
+++ branches/R2_6/Src/Changes.txt 2007-08-21 17:08:44 UTC (rev 4459)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-08-22 Takashi
+ BUG: [ 1759793 ] Filter test dialog problem with directory filters
+ Src: TestFilterDlg.cpp
+
2007-08-12 Tim
PATCH: [ 1772028 ] Russian translation update (from WinMergeMod)
Src/Languages/Russian: MergeRussian.rc
Modified: branches/R2_6/Src/TestFilterDlg.cpp
===================================================================
--- branches/R2_6/Src/TestFilterDlg.cpp 2007-08-21 16:30:19 UTC (rev 4458)
+++ branches/R2_6/Src/TestFilterDlg.cpp 2007-08-21 17:08:44 UTC (rev 4459)
@@ -101,9 +101,6 @@
{
// Convert any forward slashes to canonical Windows-style backslashes
text.Replace('/', '\\');
- // Ensure directory ends in slash
- if (text.IsEmpty() || text[text.GetLength()-1] != '\\')
- text += '\\';
return m_pFileFilterMgr->TestDirNameAgainstFilter(m_pFileFilter, text);
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-15 10:55:32
|
Revision: 4539
http://winmerge.svn.sourceforge.net/winmerge/?rev=4539&view=rev
Author: kimmov
Date: 2007-09-15 03:55:17 -0700 (Sat, 15 Sep 2007)
Log Message:
-----------
BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeEditView.cpp
branches/R2_6/Src/MergeEditView.h
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-09-15 02:33:31 UTC (rev 4538)
+++ branches/R2_6/Src/Changes.txt 2007-09-15 10:55:17 UTC (rev 4539)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-09-15 Kimmo
+ BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
+ Src: MergeEditView.cpp MergeEditView.h
+
2007-08-22 Tim
PATCH: [ 1743623 ] ChineseSimplified language .rc file for trunk rev.4317
Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
Modified: branches/R2_6/Src/MergeEditView.cpp
===================================================================
--- branches/R2_6/Src/MergeEditView.cpp 2007-09-15 02:33:31 UTC (rev 4538)
+++ branches/R2_6/Src/MergeEditView.cpp 2007-09-15 10:55:17 UTC (rev 4539)
@@ -1467,19 +1467,20 @@
if (bScroll)
{
- // If diff first line outside current view - context OR
- // if diff last line outside current view - context OR
- // if diff is bigger than screen
- if ((ptStart.y < m_nTopLine + CONTEXT_LINES_ABOVE) ||
- (ptEnd.y >= m_nTopLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
- (ptEnd.y - ptStart.y) >= GetScreenLines())
+ if (IsDiffVisible(curDiff, CONTEXT_LINES_BELOW) == FALSE)
{
- int line = ptStart.y - CONTEXT_LINES_ABOVE;
- if (line < 0)
- line = 0;
-
- pCurrentView->ScrollToLine(line);
- pOtherView->ScrollToLine(line);
+ // Difference is not visible, scroll it so that max amount of
+ // scrolling is done while keeping the diff in screen. So if
+ // scrolling is downwards, scroll the diff to as up in screen
+ // as possible. This usually brings next diff to the screen
+ // and we don't need to scroll into it.
+ int nLine = GetSubLineIndex(ptStart.y);
+ if (nLine > CONTEXT_LINES_ABOVE)
+ {
+ nLine -= CONTEXT_LINES_ABOVE;
+ }
+ pCurrentView->ScrollToSubLine(nLine);
+ pOtherView->ScrollToSubLine(nLine);
}
pCurrentView->SetCursorPos(ptStart);
pOtherView->SetCursorPos(ptStart);
@@ -2888,25 +2889,39 @@
}
/**
- * @brief Determine if difference is visible on screen.
- * @param [in] nDiff Number of diff to check.
- * @return TRUE if difference is visible.
- */
+* @brief Determine if difference is visible on screen.
+* @param [in] nDiff Number of diff to check.
+* @return TRUE if difference is visible.
+*/
BOOL CMergeEditView::IsDiffVisible(int nDiff)
{
CMergeDoc *pd = GetDocument();
- CPoint ptStart, ptEnd;
DIFFRANGE diff;
pd->m_diffList.GetDiff(nDiff, diff);
- ptStart.x = 0;
- ptStart.y = diff.dbegin0;
- ptEnd.x = 0;
- ptEnd.y = diff.dend0;
- if (ptStart.y < m_nTopLine ||
- (ptEnd.y >= m_nTopLine + GetScreenLines()) ||
- (ptEnd.y - ptStart.y) >= GetScreenLines())
+ return IsDiffVisible(diff);
+}
+
+/**
+ * @brief Determine if difference is visible on screen.
+ * @param [in] diff diff to check.
+ * @param [in] nLinesBelow Allow "minimizing" the number of visible lines.
+ * @return TRUE if difference is visible, FALSE otherwise.
+ */
+BOOL CMergeEditView::IsDiffVisible(const DIFFRANGE& diff, int nLinesBelow /*=0*/)
+{
+ const int nDiffStart = GetSubLineIndex(diff.dbegin0);
+ const int nDiffEnd = GetSubLineIndex(diff.dend0);
+ // Diff's height is last line - first line + last line's line count
+ const int nDiffHeight = nDiffEnd - nDiffStart + GetSubLines(diff.dend0) + 1;
+
+ // If diff first line outside current view - context OR
+ // if diff last line outside current view - context OR
+ // if diff is bigger than screen
+ if ((nDiffStart < m_nTopSubLine) ||
+ (nDiffEnd >= m_nTopSubLine + GetScreenLines() - nLinesBelow) ||
+ (nDiffHeight >= GetScreenLines()))
{
return FALSE;
}
Modified: branches/R2_6/Src/MergeEditView.h
===================================================================
--- branches/R2_6/Src/MergeEditView.h 2007-09-15 02:33:31 UTC (rev 4538)
+++ branches/R2_6/Src/MergeEditView.h 2007-09-15 10:55:17 UTC (rev 4539)
@@ -198,8 +198,8 @@
virtual void OnUpdateCaret();
BOOL MergeModeKeyDown(MSG* pMsg);
int FindPrediffer(const CString & prediffer) const;
+ BOOL IsDiffVisible(const DIFFRANGE& diff, int nLinesBelow = 0);
-
// Generated message map functions
protected:
//{{AFX_MSG(CMergeEditView)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-15 11:08:04
|
Revision: 4543
http://winmerge.svn.sourceforge.net/winmerge/?rev=4543&view=rev
Author: kimmov
Date: 2007-09-15 04:08:02 -0700 (Sat, 15 Sep 2007)
Log Message:
-----------
BUG: [ 1787816 ] Bug in File Rename
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirActions.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-09-15 11:03:58 UTC (rev 4542)
+++ branches/R2_6/Src/Changes.txt 2007-09-15 11:08:02 UTC (rev 4543)
@@ -5,6 +5,8 @@
2007-09-15 Kimmo
BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
Src: MergeEditView.cpp MergeEditView.h
+ BUG: [ 1787816 ] Bug in File Rename
+ Src: DirActions.cpp
2007-08-22 Tim
PATCH: [ 1743623 ] ChineseSimplified language .rc file for trunk rev.4317
Modified: branches/R2_6/Src/DirActions.cpp
===================================================================
--- branches/R2_6/Src/DirActions.cpp 2007-09-15 11:03:58 UTC (rev 4542)
+++ branches/R2_6/Src/DirActions.cpp 2007-09-15 11:08:02 UTC (rev 4543)
@@ -1182,14 +1182,18 @@
ASSERT(-1 != nSelItem);
GetItemFileNames(nSelItem, sLeftFile, sRightFile);
- BOOL bRenameLeft = RenameOnSameDir(sLeftFile, szNewItemName);
- BOOL bRenameRight = RenameOnSameDir(sRightFile, szNewItemName);
-
POSITION key = GetItemKey(nSelItem);
ASSERT(key != (POSITION)SPECIAL_ITEM_POS);
DIFFITEM& di = GetDocument()->GetDiffRefByKey(key);
- if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
+ BOOL bRenameLeft = FALSE;
+ BOOL bRenameRight = FALSE;
+ if (di.isSideLeftOrBoth())
+ bRenameLeft = RenameOnSameDir(sLeftFile, szNewItemName);
+ if (di.isSideRightOrBoth())
+ bRenameRight = RenameOnSameDir(sRightFile, szNewItemName);
+
+ if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
{
di.sLeftFilename = szNewItemName;
di.sRightFilename = szNewItemName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-15 11:17:50
|
Revision: 4545
http://winmerge.svn.sourceforge.net/winmerge/?rev=4545&view=rev
Author: kimmov
Date: 2007-09-15 04:17:48 -0700 (Sat, 15 Sep 2007)
Log Message:
-----------
BUG: [ 1776487 ] REPLACE dialog, copy highlighted text to FIND fileld
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/editlib/ccrystaleditview.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-09-15 11:16:37 UTC (rev 4544)
+++ branches/R2_6/Src/Changes.txt 2007-09-15 11:17:48 UTC (rev 4545)
@@ -7,6 +7,8 @@
Src: MergeEditView.cpp MergeEditView.h
BUG: [ 1787816 ] Bug in File Rename
Src: DirActions.cpp
+ BUG: [ 1776487 ] REPLACE dialog, copy highlighted text to FIND fileld
+ Src/editlib: ccrystaleditview.cpp
2007-08-22 Tim
PATCH: [ 1743623 ] ChineseSimplified language .rc file for trunk rev.4317
Modified: branches/R2_6/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaleditview.cpp 2007-09-15 11:16:37 UTC (rev 4544)
+++ branches/R2_6/Src/editlib/ccrystaleditview.cpp 2007-09-15 11:17:48 UTC (rev 4545)
@@ -1301,6 +1301,10 @@
dlg.m_bEnableScopeSelection = TRUE;
dlg.m_ptBlockBegin = m_ptSavedSelStart;
dlg.m_ptBlockEnd = m_ptSavedSelEnd;
+
+ // If the selection is in one line, copy text to dialog
+ if (m_ptSavedSelStart.y == m_ptSavedSelEnd.y)
+ GetText(m_ptSavedSelStart, m_ptSavedSelEnd, dlg.m_sText);
}
else
{
@@ -1308,7 +1312,9 @@
dlg.m_ptCurrentPos = GetCursorPos ();
dlg.m_bEnableScopeSelection = FALSE;
- CPoint ptCursorPos = GetCursorPos (), ptStart = WordToLeft (ptCursorPos), ptEnd = WordToRight (ptCursorPos);
+ CPoint ptCursorPos = GetCursorPos ();
+ CPoint ptStart = WordToLeft (ptCursorPos);
+ CPoint ptEnd = WordToRight (ptCursorPos);
if (IsValidTextPos (ptStart) && IsValidTextPos (ptEnd) && ptStart != ptEnd)
GetText (ptStart, ptEnd, dlg.m_sText);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-09-17 18:04:35
|
Revision: 4552
http://winmerge.svn.sourceforge.net/winmerge/?rev=4552&view=rev
Author: sdottaka
Date: 2007-09-17 11:04:33 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeDoc.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-09-17 17:30:04 UTC (rev 4551)
+++ branches/R2_6/Src/Changes.txt 2007-09-17 18:04:33 UTC (rev 4552)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-09-17 Takashi
+ BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll
+ Src: MergeDoc.cpp
+
2007-09-15 Kimmo
BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
Src: MergeEditView.cpp MergeEditView.h
Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp 2007-09-17 17:30:04 UTC (rev 4551)
+++ branches/R2_6/Src/MergeDoc.cpp 2007-09-17 18:04:33 UTC (rev 4552)
@@ -2869,14 +2869,6 @@
}
}
- // scroll to first diff
- if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
- m_diffList.HasSignificantDiffs())
- {
- int nDiff = m_diffList.FirstSignificantDiff();
- pLeft->SelectDiff(nDiff, TRUE, FALSE);
- }
-
// set the frame window header
UpdateHeaderPath(0);
UpdateHeaderPath(1);
@@ -2897,6 +2889,14 @@
ShowRescanError(nRescanResult, bBinary, bIdentical);
}
+ // scroll to first diff
+ if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
+ m_diffList.HasSignificantDiffs())
+ {
+ int nDiff = m_diffList.FirstSignificantDiff();
+ pLeft->SelectDiff(nDiff, TRUE, FALSE);
+ }
+
// Exit if files are identical should only work for the first
// comparison and must be disabled afterward.
GetMainFrame()->m_bExitIfNoDiff = FALSE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-18 15:44:25
|
Revision: 4553
http://winmerge.svn.sourceforge.net/winmerge/?rev=4553&view=rev
Author: kimmov
Date: 2007-09-18 08:44:23 -0700 (Tue, 18 Sep 2007)
Log Message:
-----------
BUG: [ 1791351 ] Go To Line Number does not change pane focus.
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeEditView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-09-17 18:04:33 UTC (rev 4552)
+++ branches/R2_6/Src/Changes.txt 2007-09-18 15:44:23 UTC (rev 4553)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-09-18 Kimmo
+ BUG: [ 1791351 ] Go To Line Number does not change pane focus.
+ Src: MergeEditView.cpp
+
2007-09-17 Takashi
BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll
Src: MergeDoc.cpp
Modified: branches/R2_6/Src/MergeEditView.cpp
===================================================================
--- branches/R2_6/Src/MergeEditView.cpp 2007-09-17 18:04:33 UTC (rev 4552)
+++ branches/R2_6/Src/MergeEditView.cpp 2007-09-18 15:44:23 UTC (rev 4553)
@@ -2511,16 +2511,19 @@
* @param [in] nLine Destination linenumber
* @param [in] bRealLine if TRUE linenumber is real line, otherwise
* it is apparent line (including deleted lines)
- * @param [in] bLeft If TRUE linenumber is for left pane
+ * @param [in] pane Pane index of goto target pane (0 = left, 1 = right).
*/
void CMergeEditView::GotoLine(UINT nLine, BOOL bRealLine, int pane)
{
CMergeDoc *pDoc = GetDocument();
+ CSplitterWnd *pSplitterWnd = GetParentSplitter(this, FALSE);
CMergeEditView *pLeftView = pDoc->GetLeftView();
CMergeEditView *pRightView = pDoc->GetRightView();
+ CMergeEditView *pCurrentView = static_cast<CMergeEditView*>
+ (pSplitterWnd->GetActivePane());
+ bool bLeftIsCurrent = pLeftView == pCurrentView ? true : false;
int nRealLine = nLine;
int nApparentLine = nLine;
- int nLineCount = 0;
// Compute apparent (shown linenumber) line
if (bRealLine)
@@ -2535,17 +2538,23 @@
ptPos.y = nApparentLine;
// Scroll line to center of view
- int nScrollLine = nApparentLine;
+ int nScrollLine = GetSubLineIndex(nApparentLine);
nScrollLine -= GetScreenLines() / 2;
if (nScrollLine < 0)
nScrollLine = 0;
- pLeftView->ScrollToLine(nScrollLine);
- pRightView->ScrollToLine(nScrollLine);
+ pLeftView->ScrollToSubLine(nScrollLine);
+ pRightView->ScrollToSubLine(nScrollLine);
pLeftView->SetCursorPos(ptPos);
pRightView->SetCursorPos(ptPos);
pLeftView->SetAnchor(ptPos);
pRightView->SetAnchor(ptPos);
+
+ // If goto target is another view - activate another view.
+ // This is done for user convenience as user probably wants to
+ // work with goto target file.
+ if ((bLeftIsCurrent && pane == 1) || (!bLeftIsCurrent && pane == 0))
+ pSplitterWnd->ActivateNext();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-21 19:51:56
|
Revision: 4653
http://winmerge.svn.sourceforge.net/winmerge/?rev=4653&view=rev
Author: kimmov
Date: 2007-10-21 12:51:25 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
BUG: [ 1815859 ] Still considers Vista as Longhorn
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/ConfigLog.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-10-18 22:23:21 UTC (rev 4652)
+++ branches/R2_6/Src/Changes.txt 2007-10-21 19:51:25 UTC (rev 4653)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-10-21 Kimmo
+ BUG: [ 1815859 ] Still considers Vista as Longhorn
+ Src: ConfigLog.cpp
+
2007-10-11 Kimmo
PATCH: [ 1810171 ] MergeChineseTraditional.rc of 2.6.12 updated
Submitted by Wei-cheng
Modified: branches/R2_6/Src/ConfigLog.cpp
===================================================================
--- branches/R2_6/Src/ConfigLog.cpp 2007-10-18 22:23:21 UTC (rev 4652)
+++ branches/R2_6/Src/ConfigLog.cpp 2007-10-21 19:51:25 UTC (rev 4653)
@@ -651,7 +651,7 @@
else if ( osvi.dwMajorVersion <= 4 )
sVersion = _T("Microsoft Windows NT ");
else if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 )
- sVersion = _T("Microsoft Windows Longhorn ");
+ sVersion = _T("Microsoft Windows Vista ");
else
sVersion.Format(_T("[? WindowsNT %d.%d] "),
osvi.dwMajorVersion, osvi.dwMinorVersion);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-24 16:11:53
|
Revision: 4659
http://winmerge.svn.sourceforge.net/winmerge/?rev=4659&view=rev
Author: kimmov
Date: 2007-10-24 08:58:09 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
PATCH: [ 1816220 ] Bugfix: current position in LocationBar "invisible"
Submitted by xurux at sourceforge.net
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/LocationView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-10-24 07:59:38 UTC (rev 4658)
+++ branches/R2_6/Src/Changes.txt 2007-10-24 15:58:09 UTC (rev 4659)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-10-24 Kimmo
+ PATCH: [ 1816220 ] Bugfix: current position in LocationBar "invisible"
+ Submitted by xurux at sourceforge.net
+ Src: LocationView.cpp
+
2007-10-21 Kimmo
BUG: [ 1815859 ] Still considers Vista as Longhorn
Src: ConfigLog.cpp
Modified: branches/R2_6/Src/LocationView.cpp
===================================================================
--- branches/R2_6/Src/LocationView.cpp 2007-10-24 07:59:38 UTC (rev 4658)
+++ branches/R2_6/Src/LocationView.cpp 2007-10-24 15:58:09 UTC (rev 4659)
@@ -9,6 +9,8 @@
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
+#include <stdlib.h>
+
#include "merge.h"
#include "OptionsMgr.h"
#include "MergeEditView.h"
@@ -42,6 +44,9 @@
/** @brief Width of difference marker. */
static const int DIFFMARKER_WIDTH = 6;
+static int getColorBrightness(DWORD c1);
+static DWORD getColorDistance(DWORD c1, DWORD c2);
+static DWORD getContrastColor(DWORD areaColor, DWORD bkColor, int amount);
/**
* @brief Bars in location pane
*/
@@ -667,7 +672,90 @@
return retVal;
}
+
+
/**
+ * @brief Adds color components (rgb) for calculating brightness.
+ * @note used in getContrastColor()
+ *
+ * @param [in] c1 color
+ * @return sum of color components
+ */
+static int getColorBrightness(DWORD c1)
+{
+ int c1_b=(c1&0xff0000)>>16;
+ int c1_g=(c1&0xff00)>>8;
+ int c1_r=(c1&0xff);
+ return c1_b + c1_g + c1_r;
+}
+
+/**
+ * @brief Distance between 2 colors.
+ * @note used in getContrastColor()
+ *
+ * @param [in] c1 color 1
+ * @param [in] c2 color 2
+ * @return absolute sum of differences of color components
+ */
+static DWORD getColorDistance(DWORD c1, DWORD c2)
+{
+ int c1_b=(c1&0xff0000)>>16;
+ int c1_g=(c1&0xff00)>>8;
+ int c1_r=(c1&0xff);
+ int c2_b=(c2&0xff0000)>>16;
+ int c2_g=(c2&0xff00)>>8;
+ int c2_r=(c2&0xff);
+ return abs(c2_b-c1_b) + abs(c2_g-c1_g) + abs(c2_r-c1_r);
+}
+
+/**
+ * @brief Correct Color to be different than background.
+ *
+ * Correct areaColor if it is too similar to bkColor
+ * (e.g. both are WHITE).
+ * For example:
+ * amount=30 corrects to 255-30=225 (if bkColor==WHITE),
+ * for rgb each
+ *
+ * @note (DWORD=)COLORREF=0x00bbggrr used for parameters.
+ *
+ * @param [in] areaColor drawing (foreground) color
+ * @param [in] bkColor background color
+ * @param [in] amount amount to correct (for one component)
+ *
+ * @return corrected (or uncorrected) areaColor
+ */
+static DWORD getContrastColor(DWORD areaColor, DWORD bkColor, int amount)
+{
+ amount=abs(amount);
+ int add=1;
+ if (getColorBrightness(bkColor) > 127*3) add=-1; // make darker
+
+ // decode
+ int bk_b=(bkColor&0xff0000)>>16;
+ int bk_g=(bkColor&0xff00)>>8;
+ int bk_r=(bkColor&0xff);
+ int ar_b=(areaColor&0xff0000)>>16;
+ int ar_g=(areaColor&0xff00)>>8;
+ int ar_r=(areaColor&0xff);
+
+ // correct color
+ int dist_pre=getColorDistance(areaColor, bkColor);
+ if (dist_pre>=amount*3) return areaColor; // color ok
+ int corr_add=add*(amount*3-dist_pre)/3;
+ ar_b+=corr_add;
+ ar_g+=corr_add;
+ ar_r+=corr_add;
+ if (ar_b<0) ar_b=0;
+ if (ar_b>255) ar_b=255;
+ if (ar_g<0) ar_g=0;
+ if (ar_g>255) ar_g=255;
+ if (ar_r<0) ar_r=0;
+ if (ar_r>255) ar_r=255;
+ return (ar_b<<16)|(ar_g<<8)|ar_r;
+}
+
+/**
* @brief Draws rect indicating visible area in file views.
*
* @param [in] nTopLine New topline for indicator
@@ -677,8 +765,10 @@
void CLocationView::DrawVisibleAreaRect(int nTopLine, int nBottomLine)
{
CMergeDoc* pDoc = GetDocument();
- const DWORD areaColor = GetSysColor(COLOR_3DFACE);
- const DWORD bkColor = GetSysColor(COLOR_WINDOW);
+ DWORD areaColor = GetSysColor(COLOR_3DFACE);
+ DWORD bkColor = GetSysColor(COLOR_WINDOW);
+ //Bugfix: make areaColor darker if both colors are WHITE
+ areaColor=getContrastColor(areaColor, bkColor, 50);
const int nScreenLines = pDoc->GetRightView()->GetScreenLines();
if (nTopLine == -1)
nTopLine = pDoc->GetRightView()->GetTopLine();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-11-05 18:44:32
|
Revision: 4709
http://winmerge.svn.sourceforge.net/winmerge/?rev=4709&view=rev
Author: kimmov
Date: 2007-11-05 10:44:30 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
BUG: [ 1824734 ] "About..." box still has 2006 copyright. :-(
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
branches/R2_6/Src/Languages/Czech/MergeCzech.rc
branches/R2_6/Src/Languages/Danish/MergeDanish.rc
branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
branches/R2_6/Src/Languages/German/MergeGerman.rc
branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
branches/R2_6/Src/Languages/Italian/MergeItalian.rc
branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
branches/R2_6/Src/Languages/Korean/MergeKorean.rc
branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
branches/R2_6/Src/Languages/Russian/MergeRussian.rc
branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
branches/R2_6/Src/Merge.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Changes.txt 2007-11-05 18:44:30 UTC (rev 4709)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-11-05 Kimmo
+ BUG: [ 1824734 ] "About..." box still has 2006 copyright. :-(
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
2007-11-01 Tim
BUG: [ 1807897 ] Button to small in Dutch version
Src/Languages/Dutch: MergeDutch.rc
Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1596,7 +1596,7 @@
VALUE "\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5", "WinMerge Bulgarian resources\0"
VALUE "\xC2\xE5\xF0\xF1\xE8\xFF", "000.000.000.000\0"
VALUE "\xC8\xEC\xE5", "MergeBulgarian\0"
- VALUE "\xC0\xE2\xF2\xEE\xF0\xF1\xEA\xEE \xEF\xF0\xE0\xE2\xEE", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "\xC0\xE2\xF2\xEE\xF0\xF1\xEA\xEE \xEF\xF0\xE0\xE2\xEE", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "\xC7\xE0\xEF\xE0\xE7\xE5\xED\xE0 \xEC\xE0\xF0\xEA\xE0", "\0"
VALUE "\xCE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xEE \xE8\xEC\xE5", "MergeBulgarian.lang\0"
VALUE "\xC2\xFA\xF2\xF0\xE5\xE5\xED \xE1\xE8\xEB\xE4", "\0"
Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1596,7 +1596,7 @@
VALUE "FileDescription", "Recursos en catal\xE0 del WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "MergeCatalan\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MergeCatalan.lang\0"
VALUE "PrivateBuild", ""
Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1598,7 +1598,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(C) 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(C) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Anwendung\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1593,7 +1593,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "Applicazione di WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(C) 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(C) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(C) 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(C) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "Slovak for WinMerge Application \0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "MergeSlovak\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "MergeSlovak.rc\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Applikation\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc 2007-11-04 14:34:43 UTC (rev 4708)
+++ branches/R2_6/Src/Merge.rc 2007-11-05 18:44:30 UTC (rev 4709)
@@ -1605,7 +1605,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-11-11 01:03:16
|
Revision: 4731
http://winmerge.svn.sourceforge.net/winmerge/?rev=4731&view=rev
Author: sdottaka
Date: 2007-11-10 17:03:15 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
BUG: [ 1829572 ] Visible area rect on location bar shakes
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeEditView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-11-11 01:02:44 UTC (rev 4730)
+++ branches/R2_6/Src/Changes.txt 2007-11-11 01:03:15 UTC (rev 4731)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-11-11 Takashi
+ BUG: [ 1829572 ] Visible area rect on location bar shakes
+ Src: MergeEditView.cpp
+
2007-11-05 Kimmo
BUG: [ 1824734 ] "About..." box still has 2006 copyright. :-(
Src: Merge.rc
Modified: branches/R2_6/Src/MergeEditView.cpp
===================================================================
--- branches/R2_6/Src/MergeEditView.cpp 2007-11-11 01:02:44 UTC (rev 4730)
+++ branches/R2_6/Src/MergeEditView.cpp 2007-11-11 01:03:15 UTC (rev 4731)
@@ -2575,61 +2575,18 @@
{
CCrystalTextView::OnVScroll (nSBCode, nPos, pScrollBar);
+ if (nSBCode == SB_ENDSCROLL)
+ return;
+
// Note we cannot use nPos because of its 16-bit nature
SCROLLINFO si = {0};
si.cbSize = sizeof (si);
si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_TRACKPOS;
VERIFY (GetScrollInfo (SB_VERT, &si));
- // Get the minimum and maximum scroll-bar positions.
- int nMinPos = si.nMin;
- int nMaxPos = si.nMax;
-
// Get the current position of scroll box.
int nCurPos = si.nPos;
- BOOL bDisableSmooth = TRUE;
- switch (nSBCode)
- {
- case SB_TOP: // Scroll to top.
- nCurPos = nMinPos;
- bDisableSmooth = FALSE;
- break;
-
- case SB_BOTTOM: // Scroll to bottom.
- nCurPos = nMaxPos;
- bDisableSmooth = FALSE;
- break;
-
- case SB_LINEUP: // Scroll one line up.
- if (nCurPos > nMinPos)
- nCurPos--;
- break;
-
- case SB_LINEDOWN: // Scroll one line down.
- if (nCurPos < nMaxPos)
- nCurPos++;
- break;
-
- case SB_PAGEUP: // Scroll one page up.
- nCurPos = max(nMinPos, nCurPos - (int) si.nPage + 1);
- bDisableSmooth = FALSE;
- break;
-
- case SB_PAGEDOWN: // Scroll one page down.
- nCurPos = min(nMaxPos, nCurPos + (int) si.nPage - 1);
- bDisableSmooth = FALSE;
- break;
-
- case SB_THUMBPOSITION: // Scroll to absolute position. nPos is the position
- nCurPos = si.nTrackPos; // of the scroll box at the end of the drag operation.
- break;
-
- case SB_THUMBTRACK: // Drag scroll box to specified position. nPos is the
- nCurPos = si.nTrackPos; // position that the scroll box has been dragged to.
- break;
- }
-
UpdateLocationViewPosition(nCurPos);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-11-11 16:54:57
|
Revision: 4738
http://winmerge.svn.sourceforge.net/winmerge/?rev=4738&view=rev
Author: kimmov
Date: 2007-11-11 08:54:52 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
PATCH: [ 1811745 ] Do not merge ignored differences (with multi selection)
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeDoc.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-11-11 12:43:23 UTC (rev 4737)
+++ branches/R2_6/Src/Changes.txt 2007-11-11 16:54:52 UTC (rev 4738)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-11-11 Kimmo
+ PATCH: [ 1811745 ] Do not merge ignored differences (with multi selection)
+ Src: MergeDoc.cpp
+
2007-11-11 Takashi
BUG: [ 1829572 ] Visible area rect on location bar shakes
Src: MergeEditView.cpp
Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp 2007-11-11 12:43:23 UTC (rev 4737)
+++ branches/R2_6/Src/MergeDoc.cpp 2007-11-11 16:54:52 UTC (rev 4738)
@@ -731,6 +731,8 @@
/**
* @brief Copy range of diffs from one side to side.
+ * This function copies given range of differences from side to another.
+ * Ignored differences are skipped, and not copied.
* @param [in] srcPane Source side from which diff is copied
* @param [in] dstPane Destination side
* @param [in] firstDiff First diff copied (0-based index)
@@ -758,18 +760,21 @@
// because we don't rescan() so it does not change
SetCurrentDiff(lastDiff);
- bool bGroupWithPrevious=false;
+ bool bGroupWithPrevious = false;
if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious))
return; // sync failure
// copy from bottom up is more efficient
- for(int i = lastDiff - 1; i >= firstDiff; --i)
+ for (int i = lastDiff - 1; i >= firstDiff; --i)
{
- SetCurrentDiff(i);
- // Group merge with previous (merge undo data to one action)
- bGroupWithPrevious=true;
- if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious))
- return; // sync failure
+ if (m_diffList.IsDiffSignificant(i))
+ {
+ SetCurrentDiff(i);
+ // Group merge with previous (merge undo data to one action)
+ bGroupWithPrevious = true;
+ if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious))
+ return; // sync failure
+ }
}
suppressRescan.Clear(); // done suppress Rescan
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-11-21 22:03:33
|
Revision: 4785
http://winmerge.svn.sourceforge.net/winmerge/?rev=4785&view=rev
Author: kimmov
Date: 2007-11-21 14:03:31 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
BUG: [ 1828930 ] Copy Left To Right with VCS
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/FileActionScript.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-11-21 22:01:32 UTC (rev 4784)
+++ branches/R2_6/Src/Changes.txt 2007-11-21 22:03:31 UTC (rev 4785)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-11-21 Kimmo
+ BUG: [ 1828930 ] Copy Left To Right with VCS
+ Src: FileActionScript.cpp
+
2007-11-21 Tim
BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
Src: MainFrm.cpp
Modified: branches/R2_6/Src/FileActionScript.cpp
===================================================================
--- branches/R2_6/Src/FileActionScript.cpp 2007-11-21 22:01:32 UTC (rev 4784)
+++ branches/R2_6/Src/FileActionScript.cpp 2007-11-21 22:03:31 UTC (rev 4785)
@@ -143,7 +143,7 @@
const FileActionItem act = m_actions.GetNext(pos);
if (act.atype == FileAction::ACT_COPY && !act.dirflag)
{
- int retVal = VCSCheckOut(act.src, bApplyToAll);
+ int retVal = VCSCheckOut(act.dest, bApplyToAll);
if (retVal == SCRIPT_USERCANCEL)
bContinue = FALSE;
else if (retVal == SCRIPT_USERSKIP)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-12-07 22:47:21
|
Revision: 4814
http://winmerge.svn.sourceforge.net/winmerge/?rev=4814&view=rev
Author: gerundt
Date: 2007-12-07 14:47:19 -0800 (Fri, 07 Dec 2007)
Log Message:
-----------
BUG: [ 1831512 ] Left Date column of CSV Report from "Generate Report.." menu
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirCmpReport.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-12-06 21:13:37 UTC (rev 4813)
+++ branches/R2_6/Src/Changes.txt 2007-12-07 22:47:19 UTC (rev 4814)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-12-07 Tim
+ BUG: [ 1831512 ] Left Date column of CSV Report from "Generate Report.." menu
+ Src: DirCmpReport.cpp
+
2007-11-21 Kimmo
BUG: [ 1828930 ] Copy Left To Right with VCS
Src: FileActionScript.cpp
Modified: branches/R2_6/Src/DirCmpReport.cpp
===================================================================
--- branches/R2_6/Src/DirCmpReport.cpp 2007-12-06 21:13:37 UTC (rev 4813)
+++ branches/R2_6/Src/DirCmpReport.cpp 2007-12-07 22:47:19 UTC (rev 4814)
@@ -275,7 +275,14 @@
WriteString(_T("\n"));
for (int currCol = 0; currCol < m_nColumns; currCol++)
{
- WriteString(m_pList->GetItemText(currRow, currCol));
+ CString value = m_pList->GetItemText(currRow, currCol);
+ if (value.Find(m_sSeparator) > 0) {
+ WriteString(_T("\""));
+ WriteString(value);
+ WriteString(_T("\""));
+ }
+ else
+ WriteString(value);
// Add col-separator, but not after last column
if (currCol < m_nColumns - 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-12-07 22:52:34
|
Revision: 4815
http://winmerge.svn.sourceforge.net/winmerge/?rev=4815&view=rev
Author: gerundt
Date: 2007-12-07 14:52:32 -0800 (Fri, 07 Dec 2007)
Log Message:
-----------
BUG: [ 1834284 ] "Short Size" columns not rounded in translations
Submitted by Jochen Tucht
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Common/LanguageSelect.cpp
branches/R2_6/Src/locality.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-12-07 22:47:19 UTC (rev 4814)
+++ branches/R2_6/Src/Changes.txt 2007-12-07 22:52:32 UTC (rev 4815)
@@ -5,6 +5,10 @@
2007-12-07 Tim
BUG: [ 1831512 ] Left Date column of CSV Report from "Generate Report.." menu
Src: DirCmpReport.cpp
+ BUG: [ 1834284 ] "Short Size" columns not rounded in translations
+ Submitted by Jochen Tucht
+ Src: locality.cpp
+ Src/Common: LanguageSelect.cpp
2007-11-21 Kimmo
BUG: [ 1828930 ] Copy Left To Right with VCS
Modified: branches/R2_6/Src/Common/LanguageSelect.cpp
===================================================================
--- branches/R2_6/Src/Common/LanguageSelect.cpp 2007-12-07 22:47:19 UTC (rev 4814)
+++ branches/R2_6/Src/Common/LanguageSelect.cpp 2007-12-07 22:52:32 UTC (rev 4815)
@@ -265,11 +265,6 @@
SetThreadLocale(MAKELCID(m_wCurLanguage, SORT_DEFAULT));
int idx = GetLanguageArrayIndex(m_wCurLanguage);
- if (idx != -1
- && *lang_map[idx].pszLocale != _T('\0'))
- {
- _tsetlocale(LC_ALL, lang_map[idx].pszLocale);
- }
}
return result;
Modified: branches/R2_6/Src/locality.cpp
===================================================================
--- branches/R2_6/Src/locality.cpp 2007-12-07 22:47:19 UTC (rev 4814)
+++ branches/R2_6/Src/locality.cpp 2007-12-07 22:52:32 UTC (rev 4815)
@@ -105,9 +105,12 @@
NumFormat.NumDigits = decimalDigits; // LOCALE_IDIGITS
NumFormat.LeadingZero = getLocaleUint(LOCALE_ILZERO, 0);
NumFormat.Grouping = GetLocaleGrouping(3);
- NumFormat.lpDecimalSep = _T("."); // should not be used
- CString sep = getLocaleStr(LOCALE_STHOUSAND, _T(","));
- NumFormat.lpThousandSep = (LPTSTR)(LPCTSTR)sep;
+ TCHAR DecimalSep[8];
+ TCHAR ThousandSep[8];
+ NumFormat.lpDecimalSep = GetLocaleInfo(LOCALE_USER_DEFAULT,
+ LOCALE_SDECIMAL, DecimalSep, 8) ? DecimalSep : _T(".");
+ NumFormat.lpThousandSep = GetLocaleInfo(LOCALE_USER_DEFAULT,
+ LOCALE_STHOUSAND, ThousandSep, 8) ? ThousandSep : _T(",");
NumFormat.NegativeOrder = getLocaleUint(LOCALE_INEGNUMBER , 0);
CString out;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-12-10 22:43:20
|
Revision: 4825
http://winmerge.svn.sourceforge.net/winmerge/?rev=4825&view=rev
Author: gerundt
Date: 2007-12-10 14:43:11 -0800 (Mon, 10 Dec 2007)
Log Message:
-----------
BUG: [ 1655577 ] Spanish Translation
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-12-10 22:42:07 UTC (rev 4824)
+++ branches/R2_6/Src/Changes.txt 2007-12-10 22:43:11 UTC (rev 4825)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-12-10 Tim
+ BUG: [ 1655577 ] Spanish Translation
+ Src/Languages/Spanish: MergeSpanish.rc
+
2007-12-09 Gal
BUG: [ 1738790 ] Unexpected backspace key handling in rename
Src: DirView.cpp
Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-12-10 22:42:07 UTC (rev 4824)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-12-10 22:43:11 UTC (rev 4825)
@@ -1726,9 +1726,9 @@
STRINGTABLE
BEGIN
ID_FILE_NEW "Crear documentos vacios\nNuevo Documento (Ctrl+N)"
- ID_FILE_OPEN "Comparar ficheros o directorios\nComparar"
+ ID_FILE_OPEN "Comparar ficheros o directorios\nComparar (Ctrl+O)"
ID_FILE_CLOSE "Cerrar ventana\nCerrar"
- ID_FILE_SAVE "Guardar los documentos abiertos\nGuardar"
+ ID_FILE_SAVE "Guardar los documentos abiertos\nGuardar (Ctrl+S)"
ID_FILE_SAVE_AS "Guardar el documento activo con otro nombre\nGuardar como"
ID_FILE_PAGE_SETUP "Cambiar las opciones de impresi\xF3n\nConfigurar p\xE1gina"
ID_FILE_PRINT_SETUP "Cambiar la impresora y las opciones de impresi\xF3n\nConfigurar impresora"
@@ -1809,8 +1809,8 @@
ID_EDIT_REPEAT "Repetir la \xFAltima acci\xF3n\nRepetir"
ID_EDIT_REPLACE "Reemplazar un texto especificado con otro\nReemplazar"
ID_EDIT_SELECT_ALL "Seleccionar el documento completo\nSeleccionar todo"
- ID_EDIT_UNDO "Deshacer el \xFAltimo cambio\nDeshacer"
- ID_EDIT_REDO "Rehacer\nRehacer"
+ ID_EDIT_UNDO "Deshacer el \xFAltimo cambio\nDeshacer (Ctrl+Z)"
+ ID_EDIT_REDO "Rehacer\nRehacer (Ctrl+Y)"
END
// View bar commands
@@ -2827,13 +2827,13 @@
// MERGE MENU
STRINGTABLE
BEGIN
- ID_PREVDIFF "Ir a la diferencia anterior\nDif. anterior (Alt Up)"
- ID_NEXTDIFF "Ir al la siguiente diferencia\nDif. siguiente (Alt Down)"
+ ID_PREVDIFF "Ir a la diferencia anterior\nDif. anterior (Alt+Up)"
+ ID_NEXTDIFF "Ir al la siguiente diferencia\nDif. siguiente (Alt+Down)"
ID_FIRSTDIFF "Ir al la primera diferencia\nPrimera dif. (Alt+Home)"
ID_CURDIFF "Ir a la diferencia actual\nDif. actual (Alt+Enter)"
ID_LASTDIFF "Ir a la \xFAltima diferencia\n\xDAltima dif. (Alt+End)"
- ID_L2R "Copiar el texto seleccionado al lado derecho\nCopiar a la derecha (Flecha Derecha)"
- ID_R2L "Copiar el texto seleccionado al lado izquierdo\nCopiar a la izquierda (Flecha Izquierda)"
+ ID_L2R "Copiar el texto seleccionado al lado derecho\nCopiar a la derecha (Alt+Right)"
+ ID_R2L "Copiar el texto seleccionado al lado izquierdo\nCopiar a la izquierda (Alt+Left)"
ID_L2RNEXT "Copiar diferencia al lado derecho e ir a la siguiente\nCopiar a la derecha y avanzar (Ctrl+Alt+Right)"
ID_R2LNEXT "Copiar diferencia al lado izquierdo e ir a la siguiente\nCopiar a la izquierda y avanzar (Ctrl+Alt+Left)"
ID_ALL_RIGHT "Copiar todas las diferencias al lado derecho\nTodas a la derecha"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-12-29 16:00:28
|
Revision: 4850
http://winmerge.svn.sourceforge.net/winmerge/?rev=4850&view=rev
Author: gerundt
Date: 2007-12-29 08:00:15 -0800 (Sat, 29 Dec 2007)
Log Message:
-----------
PATCH: [ 1859657 ] PowerShell syntax highlighter
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Merge.dsp
branches/R2_6/Src/editlib/ccrystaltextview.cpp
branches/R2_6/Src/editlib/ccrystaltextview.h
Added Paths:
-----------
branches/R2_6/Src/editlib/powershell.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-12-29 15:18:56 UTC (rev 4849)
+++ branches/R2_6/Src/Changes.txt 2007-12-29 16:00:15 UTC (rev 4850)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-12-29 Tim
+ PATCH: [ 1859657 ] PowerShell syntax highlighter
+ Src: Merge.dsp
+ editlib: ccrystaltextview.cpp ccrystaltextview.h
+ editlib new file: powershell.cpp
+
2007-12-10 Tim
BUG: [ 1655577 ] Spanish Translation
Src/Languages/Spanish: MergeSpanish.rc
Modified: branches/R2_6/Src/Merge.dsp
===================================================================
--- branches/R2_6/Src/Merge.dsp 2007-12-29 15:18:56 UTC (rev 4849)
+++ branches/R2_6/Src/Merge.dsp 2007-12-29 16:00:15 UTC (rev 4850)
@@ -1909,6 +1909,10 @@
# End Source File
# Begin Source File
+SOURCE=.\editlib\powershell.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\editlib\python.cpp
# End Source File
# Begin Source File
Modified: branches/R2_6/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.cpp 2007-12-29 15:18:56 UTC (rev 4849)
+++ branches/R2_6/Src/editlib/ccrystaltextview.cpp 2007-12-29 16:00:15 UTC (rev 4850)
@@ -273,6 +273,7 @@
CCrystalTextView::SRC_PASCAL, _T ("Pascal"), _T ("pas"), &CCrystalTextView::ParseLinePascal, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("{"), _T ("}"), _T (""), (DWORD)-1,
CCrystalTextView::SRC_PERL, _T ("Perl"), _T ("pl,pm,plx"), &CCrystalTextView::ParseLinePerl, SRCOPT_AUTOINDENT|SRCOPT_EOLNUNIX, /*4,*/ _T (""), _T (""), _T ("#"), (DWORD)-1,
CCrystalTextView::SRC_PHP, _T ("PHP"), _T ("php,php3,php4,php5,phtml"), &CCrystalTextView::ParseLinePhp, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
+ CCrystalTextView::SRC_POWERSHELL, _T ("PowerShell"), _T ("ps1"), &CCrystalTextView::ParseLinePowerShell, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("#"), (DWORD)-1,
CCrystalTextView::SRC_PYTHON, _T ("Python"), _T ("py"), &CCrystalTextView::ParseLinePython, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_REXX, _T ("REXX"), _T ("rex,rexx"), &CCrystalTextView::ParseLineRexx, SRCOPT_AUTOINDENT, /*4,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_RSRC, _T ("Resources"), _T ("rc,dlg,r16,r32,rc2"), &CCrystalTextView::ParseLineRsrc, SRCOPT_AUTOINDENT, /*4,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
Modified: branches/R2_6/Src/editlib/ccrystaltextview.h
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.h 2007-12-29 15:18:56 UTC (rev 4849)
+++ branches/R2_6/Src/editlib/ccrystaltextview.h 2007-12-29 16:00:15 UTC (rev 4850)
@@ -642,6 +642,7 @@
DWORD ParseLinePascal (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePerl (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePhp (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
+ DWORD ParseLinePowerShell (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePython (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineRexx (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineRsrc (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
@@ -721,6 +722,7 @@
SRC_PASCAL,
SRC_PERL,
SRC_PHP,
+ SRC_POWERSHELL,
SRC_PYTHON,
SRC_REXX,
SRC_RSRC,
Added: branches/R2_6/Src/editlib/powershell.cpp
===================================================================
--- branches/R2_6/Src/editlib/powershell.cpp (rev 0)
+++ branches/R2_6/Src/editlib/powershell.cpp 2007-12-29 16:00:15 UTC (rev 4850)
@@ -0,0 +1,602 @@
+///////////////////////////////////////////////////////////////////////////
+// File: powershell.cpp
+// Version: 1.0
+// Created: 23-Dec-2007
+//
+// Copyright: Stcherbatchenko Andrei, portions by Tim Gerundt
+// E-mail: win...@gm...
+//
+// PowerShell syntax highlighing definition
+//
+// You are free to use or modify this code to the following restrictions:
+// - Acknowledge me somewhere in your about box, simple "Parts of code by.."
+// will be enough. If you can't (or don't want to), contact me personally.
+// - LEAVE THIS HEADER INTACT
+////////////////////////////////////////////////////////////////////////////
+
+#include "stdafx.h"
+#include "ccrystaltextview.h"
+#include "ccrystaltextbuffer.h"
+#include "SyntaxColors.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+// PowerShell keywords
+static LPTSTR s_apszPowerShellKeywordList[] =
+ {
+ _T ("break"),
+ _T ("continue"),
+ _T ("do"),
+ _T ("else"),
+ _T ("elseif"),
+ _T ("filter"),
+ _T ("for"),
+ _T ("foreach"),
+ _T ("function"),
+ _T ("if"),
+ _T ("in"),
+ _T ("return"),
+ _T ("switch"),
+ _T ("until"),
+ _T ("where"),
+ _T ("while"),
+ // Operators...
+ _T ("-and"),
+ _T ("-as"),
+ _T ("-band"),
+ _T ("-bor"),
+ _T ("-ccontains"),
+ _T ("-ceq"),
+ _T ("-cge"),
+ _T ("-cgt"),
+ _T ("-cle"),
+ _T ("-clike"),
+ _T ("-clt"),
+ _T ("-cmatch"),
+ _T ("-cne"),
+ _T ("-cnotcontains"),
+ _T ("-cnotlike"),
+ _T ("-cnotmatch"),
+ _T ("-contains"),
+ _T ("-comp"),
+ _T ("-creplace"),
+ _T ("-eq"),
+ _T ("-ge"),
+ _T ("-gt"),
+ _T ("-icontains"),
+ _T ("-ieq"),
+ _T ("-ige"),
+ _T ("-igt"),
+ _T ("-ile"),
+ _T ("-ilike"),
+ _T ("-ilt"),
+ _T ("-imatch"),
+ _T ("-ine"),
+ _T ("-inot"),
+ _T ("-inotcontains"),
+ _T ("-inotlike"),
+ _T ("-inotmatch"),
+ _T ("-ireplace"),
+ _T ("-is"),
+ _T ("-isnot"),
+ _T ("-le"),
+ _T ("-like"),
+ _T ("-lt"),
+ _T ("-match"),
+ _T ("-ne"),
+ _T ("-not"),
+ _T ("-notcontains"),
+ _T ("-notlike"),
+ _T ("-notmatch"),
+ _T ("-or"),
+ _T ("-replace"),
+ _T ("-sl"),
+ _T ("-sr"),
+ _T ("-xor"),
+ NULL
+ };
+
+static LPTSTR s_apszCmdletKeywordList[] =
+ {
+ // Commands...
+ _T ("add-content"),
+ _T ("add-history"),
+ _T ("add-member"),
+ _T ("add-pssnapin"),
+ _T ("clear-content"),
+ _T ("clear-item"),
+ _T ("clear-itemproperty"),
+ _T ("clear-variable"),
+ _T ("compare-object"),
+ _T ("convertfrom-securestring"),
+ _T ("convert-path"),
+ _T ("convertto-html"),
+ _T ("convertto-securestring"),
+ _T ("copy-item"),
+ _T ("copy-itemproperty"),
+ _T ("export-alias"),
+ _T ("export-clixml"),
+ _T ("export-console"),
+ _T ("export-csv"),
+ _T ("foreach-object"),
+ _T ("format-custom"),
+ _T ("format-list"),
+ _T ("format-table"),
+ _T ("format-wide"),
+ _T ("get-acl"),
+ _T ("get-alias"),
+ _T ("get-authenticodesignature"),
+ _T ("get-childitem"),
+ _T ("get-command"),
+ _T ("get-content"),
+ _T ("get-credential"),
+ _T ("get-culture"),
+ _T ("get-date"),
+ _T ("get-eventlog"),
+ _T ("get-executionpolicy"),
+ _T ("get-help"),
+ _T ("get-history"),
+ _T ("get-host"),
+ _T ("get-item"),
+ _T ("get-itemproperty"),
+ _T ("get-location"),
+ _T ("get-member"),
+ _T ("get-pfxcertificate"),
+ _T ("get-process"),
+ _T ("get-psdrive"),
+ _T ("get-psprovider"),
+ _T ("get-pssnapin"),
+ _T ("get-service"),
+ _T ("get-tracesource"),
+ _T ("get-uiculture"),
+ _T ("get-unique"),
+ _T ("get-variable"),
+ _T ("get-wmiobject"),
+ _T ("group-object"),
+ _T ("import-alias"),
+ _T ("import-clixml"),
+ _T ("import-csv"),
+ _T ("invoke-expression"),
+ _T ("invoke-history"),
+ _T ("invoke-item"),
+ _T ("join-path"),
+ _T ("measure-command"),
+ _T ("measure-object"),
+ _T ("move-item"),
+ _T ("move-itemproperty"),
+ _T ("new-alias"),
+ _T ("new-item"),
+ _T ("new-itemproperty"),
+ _T ("new-object"),
+ _T ("new-psdrive"),
+ _T ("new-service"),
+ _T ("new-timespan"),
+ _T ("new-variable"),
+ _T ("out-default"),
+ _T ("out-file"),
+ _T ("out-host"),
+ _T ("out-null"),
+ _T ("out-printer"),
+ _T ("out-string"),
+ _T ("pop-location"),
+ _T ("push-location"),
+ _T ("read-host"),
+ _T ("remove-item"),
+ _T ("remove-itemproperty"),
+ _T ("remove-psdrive"),
+ _T ("remove-pssnapin"),
+ _T ("remove-variable"),
+ _T ("rename-item"),
+ _T ("rename-itemproperty"),
+ _T ("resolve-path"),
+ _T ("restart-service"),
+ _T ("resume-service"),
+ _T ("select-object"),
+ _T ("select-string"),
+ _T ("set-acl"),
+ _T ("set-alias"),
+ _T ("set-authenticodesignature"),
+ _T ("set-content"),
+ _T ("set-date"),
+ _T ("set-executionpolicy"),
+ _T ("set-item"),
+ _T ("set-itemproperty"),
+ _T ("set-location"),
+ _T ("set-psdebug"),
+ _T ("set-service"),
+ _T ("set-tracesource"),
+ _T ("set-variable"),
+ _T ("sort-object"),
+ _T ("split-path"),
+ _T ("start-service"),
+ _T ("start-sleep"),
+ _T ("start-transcript"),
+ _T ("stop-process"),
+ _T ("stop-service"),
+ _T ("stop-transcript"),
+ _T ("suspend-service"),
+ _T ("tee-object"),
+ _T ("test-path"),
+ _T ("trace-command"),
+ _T ("update-formatdata"),
+ _T ("update-typedata"),
+ _T ("where-object"),
+ _T ("write-debug"),
+ _T ("write-error"),
+ _T ("write-host"),
+ _T ("write-output"),
+ _T ("write-progress"),
+ _T ("write-verbose"),
+ _T ("write-warning"),
+ // Aliases...
+ _T ("ac"),
+ _T ("asnp"),
+ _T ("clc"),
+ _T ("cli"),
+ _T ("clp"),
+ _T ("clv"),
+ _T ("cpi"),
+ _T ("cpp"),
+ _T ("cvpa"),
+ _T ("diff"),
+ _T ("epal"),
+ _T ("epcsv"),
+ _T ("fc"),
+ _T ("fl"),
+ _T ("foreach"),
+ _T ("ft"),
+ _T ("fw"),
+ _T ("gal"),
+ _T ("gc"),
+ _T ("gci"),
+ _T ("gcm"),
+ _T ("gdr"),
+ _T ("ghy"),
+ _T ("gi"),
+ _T ("gl"),
+ _T ("gm"),
+ _T ("gp"),
+ _T ("gps"),
+ _T ("group"),
+ _T ("gsv"),
+ _T ("gsnp"),
+ _T ("gu"),
+ _T ("gv"),
+ _T ("gwmi"),
+ _T ("iex"),
+ _T ("ihy"),
+ _T ("ii"),
+ _T ("ipal"),
+ _T ("ipcsv"),
+ _T ("mi"),
+ _T ("mp"),
+ _T ("nal"),
+ _T ("ndr"),
+ _T ("ni"),
+ _T ("nv"),
+ _T ("oh"),
+ _T ("rdr"),
+ _T ("ri"),
+ _T ("rni"),
+ _T ("rnp"),
+ _T ("rp"),
+ _T ("rsnp"),
+ _T ("rv"),
+ _T ("rvpa"),
+ _T ("sal"),
+ _T ("sasv"),
+ _T ("sc"),
+ _T ("select"),
+ _T ("si"),
+ _T ("sl"),
+ _T ("sleep"),
+ _T ("sort"),
+ _T ("sp"),
+ _T ("spps"),
+ _T ("spsv"),
+ _T ("sv"),
+ _T ("tee"),
+ _T ("where"),
+ _T ("write"),
+ _T ("cat"),
+ _T ("cd"),
+ _T ("clear"),
+ _T ("cp"),
+ _T ("h"),
+ _T ("history"),
+ _T ("kill"),
+ _T ("lp"),
+ _T ("ls"),
+ _T ("mount"),
+ _T ("mv"),
+ _T ("popd"),
+ _T ("ps"),
+ _T ("pushd"),
+ _T ("pwd"),
+ _T ("r"),
+ _T ("rm"),
+ _T ("rmdir"),
+ _T ("echo"),
+ _T ("cls"),
+ _T ("chdir"),
+ _T ("copy"),
+ _T ("del"),
+ _T ("dir"),
+ _T ("erase"),
+ _T ("move"),
+ _T ("rd"),
+ _T ("ren"),
+ _T ("set"),
+ _T ("type"),
+ NULL
+ };
+
+static BOOL
+IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
+{
+ for (int L = 0; apszKeywords[L] != NULL; L++)
+ {
+ if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
+ && apszKeywords[L][nLength] == 0)
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static BOOL
+IsPowerShellKeyword (LPCTSTR pszChars, int nLength)
+{
+ return IsXKeyword (s_apszPowerShellKeywordList, pszChars, nLength);
+}
+
+static BOOL
+IsCmdletKeyword (LPCTSTR pszChars, int nLength)
+{
+ return IsXKeyword (s_apszCmdletKeywordList, pszChars, nLength);
+}
+
+static BOOL
+IsPowerShellNumber (LPCTSTR pszChars, int nLength)
+{
+ if (nLength > 2 && pszChars[0] == '0' && pszChars[1] == 'x')
+ {
+ for (int I = 2; I < nLength; I++)
+ {
+ if (_istdigit (pszChars[I]) || (pszChars[I] >= 'A' && pszChars[I] <= 'F') ||
+ (pszChars[I] >= 'a' && pszChars[I] <= 'f'))
+ continue;
+ return FALSE;
+ }
+ return TRUE;
+ }
+ if (!_istdigit (pszChars[0]))
+ return FALSE;
+ for (int I = 1; I < nLength; I++)
+ {
+ if (!_istdigit (pszChars[I]) && pszChars[I] != '+' &&
+ pszChars[I] != '-' && pszChars[I] != '.' && pszChars[I] != 'e' &&
+ pszChars[I] != 'E')
+ return FALSE;
+ }
+ return TRUE;
+}
+
+#define DEFINE_BLOCK(pos, colorindex) \
+ASSERT((pos) >= 0 && (pos) <= nLength);\
+if (pBuf != NULL)\
+ {\
+ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\
+ pBuf[nActualItems].m_nCharPos = (pos);\
+ pBuf[nActualItems].m_nColorIndex = (colorindex);\
+ pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\
+ nActualItems ++;}\
+ }
+
+#define COOKIE_COMMENT 0x0001
+#define COOKIE_PREPROCESSOR 0x0002
+#define COOKIE_EXT_COMMENT 0x0004
+#define COOKIE_STRING 0x0008
+#define COOKIE_CHAR 0x0010
+#define COOKIE_VARIABLE 0x0020
+
+DWORD CCrystalTextView::
+ParseLinePowerShell (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems)
+{
+ int nLength = GetLineLength (nLineIndex);
+ if (nLength == 0)
+ return dwCookie & COOKIE_EXT_COMMENT;
+
+ LPCTSTR pszChars = GetLineChars (nLineIndex);
+ BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ BOOL bRedefineBlock = TRUE;
+ BOOL bDecIndex = FALSE;
+ int nIdentBegin = -1;
+ int nPrevI = -1;
+ int I=0;
+ for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
+ {
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
+ if (bRedefineBlock)
+ {
+ int nPos = I;
+ if (bDecIndex)
+ nPos = nPrevI;
+ if (dwCookie & (COOKIE_COMMENT | COOKIE_EXT_COMMENT))
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_COMMENT);
+ }
+ else if (dwCookie & (COOKIE_CHAR | COOKIE_STRING))
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_STRING);
+ }
+ else if (dwCookie & COOKIE_VARIABLE)
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_USER1);
+ }
+ else
+ {
+ //if (xisalnum (pszChars[nPos]) || pszChars[nPos] == '.' || pszChars[nPos] == '-')
+ if (xisalnum (pszChars[nPos]) || (pszChars[nPos] == '-' && nPos > 0 && (xisalpha (*::CharNext(pszChars + nPos)))))
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_NORMALTEXT);
+ }
+ else
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ goto out;
+ }
+ }
+ bRedefineBlock = FALSE;
+ bDecIndex = FALSE;
+ }
+out:
+
+ // Can be bigger than length if there is binary data
+ // See bug #1474782 Crash when comparing SQL with with binary data
+ if (I >= nLength)
+ break;
+
+ if (dwCookie & COOKIE_COMMENT)
+ {
+ DEFINE_BLOCK (I, COLORINDEX_COMMENT);
+ dwCookie |= COOKIE_COMMENT;
+ break;
+ }
+
+ // String constant "...."
+ if (dwCookie & COOKIE_STRING)
+ {
+ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
+ {
+ dwCookie &= ~COOKIE_STRING;
+ bRedefineBlock = TRUE;
+ }
+ continue;
+ }
+
+ // Char constant '..'
+ if (dwCookie & COOKIE_CHAR)
+ {
+ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
+ {
+ dwCookie &= ~COOKIE_CHAR;
+ bRedefineBlock = TRUE;
+ }
+ continue;
+ }
+
+ // Variable
+ if (dwCookie & COOKIE_VARIABLE)
+ {
+ if (!xisalnum (pszChars[I]))
+ {
+ dwCookie &= ~COOKIE_VARIABLE;
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ }
+ continue;
+ }
+
+ // Comment #
+ if (pszChars[I] == '#')
+ {
+ DEFINE_BLOCK (I, COLORINDEX_COMMENT);
+ dwCookie |= COOKIE_COMMENT;
+ break;
+ }
+
+ // Normal text
+ if (pszChars[I] == '"')
+ {
+ DEFINE_BLOCK (I, COLORINDEX_STRING);
+ dwCookie |= COOKIE_STRING;
+ continue;
+ }
+ if (pszChars[I] == '\'')
+ {
+ // if (I + 1 < nLength && pszChars[I + 1] == '\'' || I + 2 < nLength && pszChars[I + 1] != '\\' && pszChars[I + 2] == '\'' || I + 3 < nLength && pszChars[I + 1] == '\\' && pszChars[I + 3] == '\'')
+ if (!I || !xisalnum (pszChars[nPrevI]))
+ {
+ DEFINE_BLOCK (I, COLORINDEX_STRING);
+ dwCookie |= COOKIE_CHAR;
+ continue;
+ }
+ }
+
+ // Variable
+ if (pszChars[I] == '$')
+ {
+ DEFINE_BLOCK (I, COLORINDEX_USER1);
+ dwCookie |= COOKIE_VARIABLE;
+ continue;
+ }
+
+ if (bFirstChar)
+ {
+ if (!xisspace (pszChars[I]))
+ bFirstChar = FALSE;
+ }
+
+ if (pBuf == NULL)
+ continue; // We don't need to extract keywords,
+ // for faster parsing skip the rest of loop
+
+ if (xisalnum (pszChars[I]) || pszChars[I] == '-')
+ {
+ if (nIdentBegin == -1)
+ nIdentBegin = I;
+ }
+ else
+ {
+ if (nIdentBegin >= 0)
+ {
+ if (IsPowerShellKeyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_KEYWORD);
+ }
+ else if (IsCmdletKeyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
+ }
+ else if (IsPowerShellNumber (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
+ }
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ nIdentBegin = -1;
+ }
+ }
+ }
+
+ if (nIdentBegin >= 0)
+ {
+ if (IsPowerShellKeyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_KEYWORD);
+ }
+ else if (IsCmdletKeyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
+ }
+ else if (IsPowerShellNumber (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
+ }
+ }
+
+ dwCookie &= COOKIE_EXT_COMMENT;
+ return dwCookie;
+}
Property changes on: branches/R2_6/Src/editlib/powershell.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-01-05 12:46:07
|
Revision: 4857
http://winmerge.svn.sourceforge.net/winmerge/?rev=4857&view=rev
Author: sdottaka
Date: 2008-01-05 04:46:03 -0800 (Sat, 05 Jan 2008)
Log Message:
-----------
BUG: [ 1864040 ] Crash when using TrackPoint middle-button scrolling
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Common/SplitterWndEx.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-05 12:45:34 UTC (rev 4856)
+++ branches/R2_6/Src/Changes.txt 2008-01-05 12:46:03 UTC (rev 4857)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-05 Takashi
+ BUG: [ 1864040 ] Crash when using TrackPoint middle-button scrolling
+ Src/Common: SplitterWndEx.cpp
+
2007-12-29 Tim
PATCH: [ 1859657 ] PowerShell syntax highlighter
Src: Merge.dsp
Modified: branches/R2_6/Src/Common/SplitterWndEx.cpp
===================================================================
--- branches/R2_6/Src/Common/SplitterWndEx.cpp 2008-01-05 12:45:34 UTC (rev 4856)
+++ branches/R2_6/Src/Common/SplitterWndEx.cpp 2008-01-05 12:46:03 UTC (rev 4857)
@@ -101,13 +101,13 @@
void CSplitterWndEx::OnVScroll(UINT nSBCode, UINT nPos, CScrollBar *pScrollBar)
{
- // maintain original synchronization functionality (all panes left from the scrollbar)
- CSplitterWnd::OnVScroll(nSBCode, nPos, pScrollBar);
-
// only sync if shared vertical bars
if((GetScrollStyle()&WS_VSCROLL) == 0)
return;
+ // maintain original synchronization functionality (all panes left from the scrollbar)
+ CSplitterWnd::OnVScroll(nSBCode, nPos, pScrollBar);
+
// enhance with proportional vertical scroll synchronization
ASSERT(pScrollBar != NULL);
int curRow = ::GetDlgCtrlID(pScrollBar->m_hWnd) - AFX_IDW_VSCROLL_FIRST;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-08 22:36:54
|
Revision: 4878
http://winmerge.svn.sourceforge.net/winmerge/?rev=4878&view=rev
Author: gerundt
Date: 2008-01-08 14:36:41 -0800 (Tue, 08 Jan 2008)
Log Message:
-----------
PATCH: [ 1866221 ] PO(T) syntax highlighter
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Merge.dsp
branches/R2_6/Src/editlib/ccrystaltextview.cpp
branches/R2_6/Src/editlib/ccrystaltextview.h
Added Paths:
-----------
branches/R2_6/Src/editlib/po.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-08 22:17:25 UTC (rev 4877)
+++ branches/R2_6/Src/Changes.txt 2008-01-08 22:36:41 UTC (rev 4878)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-08 Tim
+ PATCH: [ 1866221 ] PO(T) syntax highlighter
+ Src: Merge.dsp
+ editlib: ccrystaltextview.cpp ccrystaltextview.h
+ editlib new file: po.cpp
+
2008-01-05 Takashi
BUG: [ 1864040 ] Crash when using TrackPoint middle-button scrolling
Src/Common: SplitterWndEx.cpp
Modified: branches/R2_6/Src/Merge.dsp
===================================================================
--- branches/R2_6/Src/Merge.dsp 2008-01-08 22:17:25 UTC (rev 4877)
+++ branches/R2_6/Src/Merge.dsp 2008-01-08 22:36:41 UTC (rev 4878)
@@ -1909,6 +1909,10 @@
# End Source File
# Begin Source File
+SOURCE=.\editlib\po.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\editlib\powershell.cpp
# End Source File
# Begin Source File
Modified: branches/R2_6/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.cpp 2008-01-08 22:17:25 UTC (rev 4877)
+++ branches/R2_6/Src/editlib/ccrystaltextview.cpp 2008-01-08 22:36:41 UTC (rev 4878)
@@ -273,6 +273,7 @@
CCrystalTextView::SRC_PASCAL, _T ("Pascal"), _T ("pas"), &CCrystalTextView::ParseLinePascal, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("{"), _T ("}"), _T (""), (DWORD)-1,
CCrystalTextView::SRC_PERL, _T ("Perl"), _T ("pl,pm,plx"), &CCrystalTextView::ParseLinePerl, SRCOPT_AUTOINDENT|SRCOPT_EOLNUNIX, /*4,*/ _T (""), _T (""), _T ("#"), (DWORD)-1,
CCrystalTextView::SRC_PHP, _T ("PHP"), _T ("php,php3,php4,php5,phtml"), &CCrystalTextView::ParseLinePhp, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
+ CCrystalTextView::SRC_PO, _T ("PO"), _T ("po,pot"), &CCrystalTextView::ParseLinePo, SRCOPT_AUTOINDENT|SRCOPT_EOLNUNIX, /*4,*/ _T (""), _T (""), _T ("#"), (DWORD)-1,
CCrystalTextView::SRC_POWERSHELL, _T ("PowerShell"), _T ("ps1"), &CCrystalTextView::ParseLinePowerShell, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("#"), (DWORD)-1,
CCrystalTextView::SRC_PYTHON, _T ("Python"), _T ("py"), &CCrystalTextView::ParseLinePython, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_REXX, _T ("REXX"), _T ("rex,rexx"), &CCrystalTextView::ParseLineRexx, SRCOPT_AUTOINDENT, /*4,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
Modified: branches/R2_6/Src/editlib/ccrystaltextview.h
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.h 2008-01-08 22:17:25 UTC (rev 4877)
+++ branches/R2_6/Src/editlib/ccrystaltextview.h 2008-01-08 22:36:41 UTC (rev 4878)
@@ -642,6 +642,7 @@
DWORD ParseLinePascal (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePerl (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePhp (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
+ DWORD ParseLinePo (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePowerShell (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLinePython (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineRexx (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
@@ -722,6 +723,7 @@
SRC_PASCAL,
SRC_PERL,
SRC_PHP,
+ SRC_PO,
SRC_POWERSHELL,
SRC_PYTHON,
SRC_REXX,
Added: branches/R2_6/Src/editlib/po.cpp
===================================================================
--- branches/R2_6/Src/editlib/po.cpp (rev 0)
+++ branches/R2_6/Src/editlib/po.cpp 2008-01-08 22:36:41 UTC (rev 4878)
@@ -0,0 +1,285 @@
+///////////////////////////////////////////////////////////////////////////
+// File: po.cpp
+// Version: 1.0
+// Updated: 05-Jan-2008
+//
+// Copyright: Ferdinand Prantl, portions by Stcherbatchenko Andrei,
+// Tim Gerundt
+// E-mail: pr...@ff...
+//
+// PO (Portable Object) syntax highlighing definition
+//
+// You are free to use or modify this code to the following restrictions:
+// - Acknowledge me somewhere in your about box, simple "Parts of code by.."
+// will be enough. If you can't (or don't want to), contact me personally.
+// - LEAVE THIS HEADER INTACT
+////////////////////////////////////////////////////////////////////////////
+
+#include "stdafx.h"
+#include "ccrystaltextview.h"
+#include "ccrystaltextbuffer.h"
+#include "SyntaxColors.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+// PO keywords
+static LPTSTR s_apszPoKeywordList[] =
+ {
+ _T ("msgctxt"),
+ _T ("msgid"),
+ _T ("msgid_plural"),
+ _T ("msgstr"),
+ NULL
+ };
+
+static BOOL
+IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
+{
+ for (int L = 0; apszKeywords[L] != NULL; L++)
+ {
+ if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
+ && apszKeywords[L][nLength] == 0)
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static BOOL
+IsPoKeyword (LPCTSTR pszChars, int nLength)
+{
+ return IsXKeyword (s_apszPoKeywordList, pszChars, nLength);
+}
+
+static BOOL
+IsPoNumber (LPCTSTR pszChars, int nLength)
+{
+ if (!_istdigit (pszChars[0]))
+ return FALSE;
+ return TRUE;
+}
+
+#define DEFINE_BLOCK(pos, colorindex) \
+ASSERT((pos) >= 0 && (pos) <= nLength);\
+if (pBuf != NULL)\
+ {\
+ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\
+ pBuf[nActualItems].m_nCharPos = (pos);\
+ pBuf[nActualItems].m_nColorIndex = (colorindex);\
+ pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\
+ nActualItems ++;}\
+ }
+
+#define COOKIE_COMMENT 0x0001
+#define COOKIE_PREPROCESSOR 0x0002
+#define COOKIE_EXT_COMMENT 0x0004
+#define COOKIE_STRING 0x0008
+#define COOKIE_CHAR 0x0010
+
+DWORD CCrystalTextView::
+ParseLinePo (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems)
+{
+ int nLength = GetLineLength (nLineIndex);
+ if (nLength == 0)
+ return dwCookie & COOKIE_EXT_COMMENT;
+
+ LPCTSTR pszChars = GetLineChars (nLineIndex);
+ BOOL bFirstChar = (dwCookie & ~COOKIE_EXT_COMMENT) == 0;
+ BOOL bRedefineBlock = TRUE;
+ BOOL bDecIndex = FALSE;
+ int nIdentBegin = -1;
+ int nPrevI = -1;
+ int I=0;
+ for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
+ {
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
+ if (bRedefineBlock)
+ {
+ int nPos = I;
+ if (bDecIndex)
+ nPos = nPrevI;
+ if (dwCookie & (COOKIE_COMMENT | COOKIE_EXT_COMMENT))
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_COMMENT);
+ }
+ else if (dwCookie & (COOKIE_CHAR | COOKIE_STRING))
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_STRING);
+ }
+ else
+ {
+ if (xisalnum (pszChars[nPos]) || pszChars[nPos] == '.' && nPos > 0 && (!xisalpha (*::CharPrev(pszChars, pszChars + nPos)) && !xisalpha (*::CharNext(pszChars + nPos))))
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_NORMALTEXT);
+ }
+ else
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ goto out;
+ }
+ }
+ bRedefineBlock = FALSE;
+ bDecIndex = FALSE;
+ }
+out:
+
+ // Can be bigger than length if there is binary data
+ // See bug #1474782 Crash when comparing SQL with with binary data
+ if (I >= nLength)
+ break;
+
+ if (dwCookie & COOKIE_COMMENT)
+ {
+ DEFINE_BLOCK (I, COLORINDEX_COMMENT);
+ dwCookie |= COOKIE_COMMENT;
+ break;
+ }
+
+ // String constant "...."
+ if (dwCookie & COOKIE_STRING)
+ {
+ if (pszChars[I] == '"' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
+ {
+ dwCookie &= ~COOKIE_STRING;
+ bRedefineBlock = TRUE;
+ }
+ continue;
+ }
+
+ // Char constant '..'
+ if (dwCookie & COOKIE_CHAR)
+ {
+ if (pszChars[I] == '\'' && (I == 0 || I == 1 && pszChars[nPrevI] != '\\' || I >= 2 && (pszChars[nPrevI] != '\\' || pszChars[nPrevI] == '\\' && *::CharPrev(pszChars, pszChars + nPrevI) == '\\')))
+ {
+ dwCookie &= ~COOKIE_CHAR;
+ bRedefineBlock = TRUE;
+ }
+ continue;
+ }
+
+ if (pszChars[I] == '#')
+ {
+ DEFINE_BLOCK (I, COLORINDEX_COMMENT);
+ dwCookie |= COOKIE_COMMENT;
+ break;
+ }
+
+ // Normal text
+ if (pszChars[I] == '"')
+ {
+ DEFINE_BLOCK (I, COLORINDEX_STRING);
+ dwCookie |= COOKIE_STRING;
+ continue;
+ }
+ if (pszChars[I] == '\'')
+ {
+ // if (I + 1 < nLength && pszChars[I + 1] == '\'' || I + 2 < nLength && pszChars[I + 1] != '\\' && pszChars[I + 2] == '\'' || I + 3 < nLength && pszChars[I + 1] == '\\' && pszChars[I + 3] == '\'')
+ if (!I || !xisalnum (pszChars[nPrevI]))
+ {
+ DEFINE_BLOCK (I, COLORINDEX_STRING);
+ dwCookie |= COOKIE_CHAR;
+ continue;
+ }
+ }
+
+ if (bFirstChar)
+ {
+ if (!xisspace (pszChars[I]))
+ bFirstChar = FALSE;
+ }
+
+ if (pBuf == NULL)
+ continue; // We don't need to extract keywords,
+ // for faster parsing skip the rest of loop
+
+ if (xisalnum (pszChars[I]) || pszChars[I] == '.' && I > 0 && (!xisalpha (pszChars[nPrevI]) && !xisalpha (pszChars[I + 1])))
+ {
+ if (nIdentBegin == -1)
+ nIdentBegin = I;
+ }
+ else
+ {
+ if (nIdentBegin >= 0)
+ {
+ if (IsPoKeyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_KEYWORD);
+ }
+ else if (IsPoNumber (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
+ }
+ else
+ {
+ bool bFunction = FALSE;
+
+ for (int j = I; j < nLength; j++)
+ {
+ if (!xisspace (pszChars[j]))
+ {
+ if (pszChars[j] == '(')
+ {
+ bFunction = TRUE;
+ }
+ break;
+ }
+ }
+ if (bFunction)
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
+ }
+ }
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ nIdentBegin = -1;
+ }
+ }
+ }
+
+ if (nIdentBegin >= 0)
+ {
+ if (IsPoKeyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_KEYWORD);
+ }
+ else if (IsPoNumber (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_NUMBER);
+ }
+ else
+ {
+ bool bFunction = FALSE;
+
+ for (int j = I; j < nLength; j++)
+ {
+ if (!xisspace (pszChars[j]))
+ {
+ if (pszChars[j] == '(')
+ {
+ bFunction = TRUE;
+ }
+ break;
+ }
+ }
+ if (bFunction)
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_FUNCNAME);
+ }
+ }
+ }
+
+ if (pszChars[nLength - 1] != '\\' || m_pTextBuffer->IsMBSTrail(nLineIndex, nLength - 1))
+ dwCookie &= COOKIE_EXT_COMMENT;
+ return dwCookie;
+}
Property changes on: branches/R2_6/Src/editlib/po.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-09 15:59:08
|
Revision: 4886
http://winmerge.svn.sourceforge.net/winmerge/?rev=4886&view=rev
Author: kimmov
Date: 2008-01-09 07:58:59 -0800 (Wed, 09 Jan 2008)
Log Message:
-----------
Update copyright year for 2008
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
branches/R2_6/Src/Languages/Czech/MergeCzech.rc
branches/R2_6/Src/Languages/Danish/MergeDanish.rc
branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
branches/R2_6/Src/Languages/French/MergeFrench.rc
branches/R2_6/Src/Languages/German/MergeGerman.rc
branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
branches/R2_6/Src/Languages/Italian/MergeItalian.rc
branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
branches/R2_6/Src/Languages/Korean/MergeKorean.rc
branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
branches/R2_6/Src/Languages/Polish/MergePolish.rc
branches/R2_6/Src/Languages/Russian/MergeRussian.rc
branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
branches/R2_6/Src/Merge.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Changes.txt 2008-01-09 15:58:59 UTC (rev 4886)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-09 Kimmo
+ Update copyright year for 2008
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
2008-01-08 Tim
PATCH: [ 1866221 ] PO(T) syntax highlighter
Src: Merge.dsp
Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1596,7 +1596,7 @@
VALUE "\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5", "WinMerge Bulgarian resources\0"
VALUE "\xC2\xE5\xF0\xF1\xE8\xFF", "000.000.000.000\0"
VALUE "\xC8\xEC\xE5", "MergeBulgarian\0"
- VALUE "\xC0\xE2\xF2\xEE\xF0\xF1\xEA\xEE \xEF\xF0\xE0\xE2\xEE", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "\xC0\xE2\xF2\xEE\xF0\xF1\xEA\xEE \xEF\xF0\xE0\xE2\xEE", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "\xC7\xE0\xEF\xE0\xE7\xE5\xED\xE0 \xEC\xE0\xF0\xEA\xE0", "\0"
VALUE "\xCE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xEE \xE8\xEC\xE5", "MergeBulgarian.lang\0"
VALUE "\xC2\xFA\xF2\xF0\xE5\xE5\xED \xE1\xE8\xEB\xE4", "\0"
@@ -1611,7 +1611,7 @@
VALUE "FileDescription", "WinMerge Bulgarian resources\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "MergeBulgarian\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MergeBulgarian.lang\0"
VALUE "PrivateBuild", "\0"
Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1596,7 +1596,7 @@
VALUE "FileDescription", "Recursos en catal\xE0 del WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "MergeCatalan\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MergeCatalan.lang\0"
VALUE "PrivateBuild", ""
@@ -1611,7 +1611,7 @@
VALUE "FileDescription", "WinMerge Catalan resources\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "MergeCatalan\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MergeCatalan.lang\0"
VALUE "PrivateBuild", "\0"
Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1598,7 +1598,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(C) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(C) 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "ChineseTraditional translation for WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(c) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(c) 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "MergeChineseTraditional.lang\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1593,7 +1593,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Anwendung\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1593,7 +1593,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "Applicazione di WinMerge\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(C) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(C) 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,11 +1595,11 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(C) 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(C) 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
- VALUE "ProductVersion", "2.6.4.0"
+ VALUE "ProductVersion", "000.000.000.000\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1593,13 +1593,13 @@
BEGIN
VALUE "Komentarze", "T\xB3umaczenie: Mateo Gola\0"
VALUE "FileDescription", "Aplikacja WinMerge\0"
- VALUE "FileVersion", "2.0.0.1\0"
+ VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
- VALUE "ProductVersion", "2.6.4\0"
+ VALUE "ProductVersion", "000.000.000.000\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "Slovak for WinMerge Application \0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "MergeSlovak\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "MergeSlovak.rc\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Applikation\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1595,7 +1595,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "WinMerge\0"
Modified: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc 2008-01-09 15:44:41 UTC (rev 4885)
+++ branches/R2_6/Src/Merge.rc 2008-01-09 15:58:59 UTC (rev 4886)
@@ -1605,7 +1605,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2008 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-09 23:22:20
|
Revision: 4891
http://winmerge.svn.sourceforge.net/winmerge/?rev=4891&view=rev
Author: gerundt
Date: 2008-01-09 15:22:08 -0800 (Wed, 09 Jan 2008)
Log Message:
-----------
Fix spelling error "succesfully".
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
branches/R2_6/Src/Merge.rc
branches/R2_6/Src/MergeDoc.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-09 23:16:43 UTC (rev 4890)
+++ branches/R2_6/Src/Changes.txt 2008-01-09 23:22:08 UTC (rev 4891)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-10 Tim
+ Fix spelling error "succesfully".
+ Src: Merge.rc MergeDoc.cpp
+ Src/Languages/Brazilian: MergeBrazilian.rc
+ Src/Languages/Turkish: MergeTurkish.rc
+
2008-01-09 Kimmo
Update copyright year for 2008
Src: Merge.rc
Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2008-01-09 23:16:43 UTC (rev 4890)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2008-01-09 23:22:08 UTC (rev 4891)
@@ -2413,7 +2413,7 @@
// CREATE PATCH
STRINGTABLE
BEGIN
- IDS_DIFF_SUCCEEDED "Patch file succesfully written."
+ IDS_DIFF_SUCCEEDED "Patch file successfully written."
IDS_DIFF_ITEM1NOTFOUND "1. item is not found or is directory!"
IDS_DIFF_ITEM2NOTFOUND "2. item is not found or is directory!"
IDS_DIFF_FILEOVERWRITE "The patch file already exists. Do you want to overwrite it?"
Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2008-01-09 23:16:43 UTC (rev 4890)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2008-01-09 23:22:08 UTC (rev 4891)
@@ -2413,7 +2413,7 @@
// CREATE PATCH
STRINGTABLE
BEGIN
- IDS_DIFF_SUCCEEDED "Patch file succesfully written."
+ IDS_DIFF_SUCCEEDED "Patch file successfully written."
IDS_DIFF_ITEM1NOTFOUND "1. item is not found or is directory!"
IDS_DIFF_ITEM2NOTFOUND "2. item is not found or is directory!"
IDS_DIFF_FILEOVERWRITE "The patch file already exists. Do you want to overwrite it?"
Modified: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc 2008-01-09 23:16:43 UTC (rev 4890)
+++ branches/R2_6/Src/Merge.rc 2008-01-09 23:22:08 UTC (rev 4891)
@@ -2423,7 +2423,7 @@
// CREATE PATCH
STRINGTABLE
BEGIN
- IDS_DIFF_SUCCEEDED "Patch file succesfully written."
+ IDS_DIFF_SUCCEEDED "Patch file successfully written."
IDS_DIFF_ITEM1NOTFOUND "1. item is not found or is directory!"
IDS_DIFF_ITEM2NOTFOUND "2. item is not found or is directory!"
IDS_DIFF_FILEOVERWRITE "The patch file already exists. Do you want to overwrite it?"
Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp 2008-01-09 23:16:43 UTC (rev 4890)
+++ branches/R2_6/Src/MergeDoc.cpp 2008-01-09 23:22:08 UTC (rev 4891)
@@ -2561,7 +2561,7 @@
* @param [in] nBuffer Index (0-based) of buffer to load
* @param [out] readOnly whether file is read-only
* @param [in] codepage relevant 8-bit codepage if any (0 if none or unknown)
- * @return Tells if files were loaded succesfully
+ * @return Tells if files were loaded successfully
* @sa CMergeDoc::OpenDocs()
**/
int CMergeDoc::LoadFile(CString sFileName, int nBuffer, BOOL & readOnly, int codepage)
@@ -2715,7 +2715,7 @@
nLeftSuccess = FileLoadResult::FRESULT_OK;
}
- // Load right side only if left side was succesfully loaded
+ // Load right side only if left side was successfully loaded
DWORD nRightSuccess = FileLoadResult::FRESULT_ERROR;
if (!sRightFile.IsEmpty())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-10 21:57:46
|
Revision: 4895
http://winmerge.svn.sourceforge.net/winmerge/?rev=4895&view=rev
Author: gerundt
Date: 2008-01-10 13:57:44 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
PATCH: [ 1743504 ] new keywords (cleaned up)
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/editlib/batch.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-10 17:45:17 UTC (rev 4894)
+++ branches/R2_6/Src/Changes.txt 2008-01-10 21:57:44 UTC (rev 4895)
@@ -7,6 +7,9 @@
Src: Merge.rc MergeDoc.cpp
Src/Languages/Brazilian: MergeBrazilian.rc
Src/Languages/Turkish: MergeTurkish.rc
+ PATCH: [ 1743504 ] new keywords (cleaned up)
+ Submitted by Andre Arpin
+ editlib: batch.cpp
2008-01-09 Kimmo
Update copyright year for 2008
Modified: branches/R2_6/Src/editlib/batch.cpp
===================================================================
--- branches/R2_6/Src/editlib/batch.cpp 2008-01-10 17:45:17 UTC (rev 4894)
+++ branches/R2_6/Src/editlib/batch.cpp 2008-01-10 21:57:44 UTC (rev 4895)
@@ -54,6 +54,8 @@
_T ("DATE"),
_T ("DEFAULT"),
_T ("DEFINED"),
+ _T ("DDEEXEC"),
+ _T ("DEBUGSTRING"),
_T ("DEL"),
_T ("DELAY"),
_T ("DESCRIBE"),
@@ -70,6 +72,7 @@
_T ("ECHOERR"),
_T ("ECHOS"),
_T ("ECHOSERR"),
+ _T ("EJECTMEDIA"),
_T ("ELSE"),
_T ("ELSEIFF"),
_T ("ENDDO"),
@@ -111,6 +114,7 @@
_T ("IN"),
_T ("INKEY"),
_T ("INPUT"),
+ _T ("JABBER"),
_T ("ISALIAS"),
_T ("ISAPP"),
_T ("ISDIR"),
@@ -144,13 +148,17 @@
_T ("NOT"),
_T ("ON"),
_T ("OPTION"),
+ _T ("OSD"),
_T ("PATH"),
_T ("PAUSE"),
_T ("PDIR"),
_T ("PLAYAVI"),
_T ("PLAYSOUND"),
+ _T ("PLUGIN"),
_T ("POPD"),
+ _T ("POSTMSG"),
_T ("PRINT"),
+ _T ("PRIORITY"),
_T ("PROMPT"),
_T ("PUSHD"),
_T ("QUERYBOX"),
@@ -162,7 +170,9 @@
_T ("REN"),
_T ("RENAME"),
_T ("RETURN"),
+ _T ("REXEC"),
_T ("RMDIR"),
+ _T ("RSHELL"),
_T ("SCREEN"),
_T ("SCRPUT"),
_T ("SELECT"),
@@ -174,13 +184,16 @@
_T ("SHORTCUT"),
_T ("SHRALIAS"),
_T ("SMPP"),
+ _T ("SNMP"),
_T ("SNPP"),
_T ("START"),
_T ("SWAPPING"),
_T ("SWITCH"),
+ _T ("SYNC"),
_T ("TAIL"),
_T ("TASKEND"),
_T ("TASKLIST"),
+ _T ("TCTOOLBAR"),
_T ("TEE"),
_T ("TEXT"),
_T ("THEN"),
@@ -188,6 +201,7 @@
_T ("TIMER"),
_T ("TITLE"),
_T ("TOUCH"),
+ _T ("TRANSIENT"),
_T ("TREE"),
_T ("TRUENAME"),
_T ("TYPE"),
@@ -203,6 +217,7 @@
_T ("WHICH"),
_T ("WHILE"),
_T ("WINDOW"),
+ _T ("WMIQUERY"),
_T ("Y"),
NULL
};
@@ -281,11 +296,20 @@
static LPTSTR s_apszUser2KeywordList[] =
{
_T ("@ABS"),
+ _T ("@AFSCELL"),
+ _T ("@AFSMOUNT"),
+ _T ("@AFSPATH"),
+ _T ("@AFSSYMLINK"),
+ _T ("@AFSVOLID"),
+ _T ("@AFSVOLNAME"),
_T ("@AGEDATE"),
_T ("@ALIAS"),
_T ("@ALTNAME"),
_T ("@ASCII"),
+ _T ("@ASSOC"),
_T ("@ATTRIB"),
+ _T ("@AVERAGE"),
+ _T ("@CAPI"),
_T ("@CAPS"),
_T ("@CDROM"),
_T ("@CEILING"),
@@ -294,9 +318,13 @@
_T ("@CLIPW"),
_T ("@COLOR"),
_T ("@COMMA"),
+ _T ("@COMPARE"),
_T ("@CONSOLE"),
_T ("@CONVERT"),
+ _T ("@COUNT"),
_T ("@CRC32"),
+ _T ("@CWD"),
+ _T ("@CWDS"),
_T ("@DATE"),
_T ("@DAY"),
_T ("@DEC"),
@@ -308,12 +336,15 @@
_T ("@DISKFREE"),
_T ("@DISKTOTAL"),
_T ("@DISKUSED"),
+ _T ("@DOMAIN"),
_T ("@DOSMEM"),
_T ("@DOW"),
_T ("@DOWF"),
_T ("@DOWI"),
_T ("@DOY"),
_T ("@EMS"),
+ _T ("@DRIVETYPE"),
+ _T ("@DRIVETYPEEX"),
_T ("@ENUMSERVERS"),
_T ("@ENUMSHARES"),
_T ("@ERRTEXT"),
@@ -346,11 +377,13 @@
_T ("@FORMAT"),
_T ("@FORMATN"),
_T ("@FSTYPE"),
+ _T ("@FTYPE"),
_T ("@FULL"),
_T ("@FUNCTION"),
_T ("@GETDIR"),
_T ("@GETFILE"),
_T ("@GETFOLDER"),
+ _T ("@GROUP"),
_T ("@HISTORY"),
_T ("@IDOW"),
_T ("@IDOWF"),
@@ -359,6 +392,7 @@
_T ("@INDEX"),
_T ("@INIREAD"),
_T ("@INIWRITE"),
+ _T ("@INODE"),
_T ("@INSERT"),
_T ("@INSTR"),
_T ("@INT"),
@@ -373,12 +407,15 @@
_T ("@ISPUNCT"),
_T ("@ISSPACE"),
_T ("@ISXDIGIT"),
+ _T ("@JUNCTION"),
_T ("@LABEL"),
+ _T ("@LCS"),
_T ("@LEFT"),
_T ("@LEN"),
_T ("@LFN"),
_T ("@LINE"),
_T ("@LINES"),
+ _T ("@LINKS"),
_T ("@LOWER"),
_T ("@LPT"),
_T ("@LTRIM"),
@@ -393,13 +430,20 @@
_T ("@NAME"),
_T ("@NUMERIC"),
_T ("@OPTION"),
+ _T ("@OWNER"),
_T ("@PATH"),
+ _T ("@PERL"),
+ _T ("@PING"),
+ _T ("@QUOTE"),
_T ("@RANDOM"),
_T ("@READSCR"),
_T ("@READY"),
_T ("@REGCREATE"),
_T ("@REGDELKEY"),
+ _T ("@REGEX"),
+ _T ("@REGEXINDEX"),
_T ("@REGEXIST"),
+ _T ("@REGEXSUB"),
_T ("@REGQUERY"),
_T ("@REGSET"),
_T ("@REGSETENV"),
@@ -407,41 +451,63 @@
_T ("@REMOVABLE"),
_T ("@REPEAT"),
_T ("@REPLACE"),
+ _T ("@REVERSE"),
_T ("@REXX"),
_T ("@RIGHT"),
_T ("@RTRIM"),
+ _T ("@RUBY"),
+ _T ("@SCRIPT"),
_T ("@SEARCH"),
_T ("@SELECT"),
+ _T ("@SERIAL"),
_T ("@SFN"),
+ _T ("@SHA1"),
+ _T ("@SHA256"),
+ _T ("@SHA384"),
+ _T ("@SHA512"),
+ _T ("@SIMILAR"),
+ _T ("@SNAPSHOT"),
_T ("@STRIP"),
_T ("@SUBST"),
_T ("@SUBSTR"),
+ _T ("@SUMMARY"),
+ _T ("@SYMLINK"),
_T ("@TIME"),
_T ("@TIMER"),
_T ("@TRIM"),
_T ("@TRUENAME"),
+ _T ("@TRUNCATE"),
_T ("@UNC"),
_T ("@UNICODE"),
_T ("@UNIQUE"),
+ _T ("@UNQUOTE"),
+ _T ("@UNQUOTES"),
_T ("@UPPER"),
_T ("@VERINFO"),
_T ("@WATTRIB"),
_T ("@WILD"),
+ _T ("@WINAPI"),
_T ("@WINCLASS"),
_T ("@WINEXENAME"),
_T ("@WININFO"),
_T ("@WINMEMORY"),
_T ("@WINMETRICS"),
+ _T ("@WINPOS"),
_T ("@WINSTATE"),
_T ("@WINSYSTEM"),
+ _T ("@WMI"),
_T ("@WORD"),
_T ("@WORDS"),
+ _T ("@WORKGROUP"),
_T ("@XMS"),
+ _T ("@XMLPATH"),
_T ("@YEAR"),
_T ("_"),
_T ("_4VER"),
_T ("_ACSTATUS"),
+ _T ("_AFSWCELL"),
_T ("_ALIAS"),
+ _T ("_ALT"),
_T ("_ANSI"),
_T ("_APMAC"),
_T ("_APMBATT"),
@@ -453,13 +519,17 @@
_T ("_BATTERY"),
_T ("_BATTERYLIFE"),
_T ("_BATTERYPERCENT"),
+ _T ("_BDEBUGGER"),
_T ("_BG"),
_T ("_BOOT"),
_T ("_BUILD"),
_T ("_CAPSLOCK"),
+ _T ("_CDROMS"),
_T ("_CHILDPID"),
_T ("_CI"),
+ _T ("_CMDLINE"),
_T ("_CMDPROC"),
+ _T ("_CMDSPEC"),
_T ("_CO"),
_T ("_CODEPAGE"),
_T ("_COLUMN"),
@@ -473,6 +543,7 @@
_T ("_CWP"),
_T ("_CWPS"),
_T ("_DATE"),
+ _T ("_DATETIME"),
_T ("_DAY"),
_T ("_DETACHPID"),
_T ("_DISK"),
@@ -484,17 +555,28 @@
_T ("_DOWI"),
_T ("_DOY"),
_T ("_DPMI"),
+ _T ("_DRIVES"),
+ _T ("_DST"),
_T ("_DV"),
+ _T ("_DVDS"),
_T ("_ECHO"),
+ _T ("_EDITMODE"),
_T ("_ENV"),
+ _T ("_EXECSTR"),
+ _T ("_EXIT"),
+ _T ("_EXPANSION"),
_T ("_FG"),
_T ("_FTPERROR"),
+ _T ("_HDRIVES"),
_T ("_HLOGFILE"),
_T ("_HOST"),
_T ("_HOUR"),
_T ("_HWPROFILE"),
+ _T ("_IDLETICKS"),
_T ("_IDOW"),
_T ("_IDOWF"),
+ _T ("_IFTP"),
+ _T ("_IFTPS"),
_T ("_IMONTH"),
_T ("_IMONTHF"),
_T ("_ININAME"),
@@ -514,11 +596,15 @@
_T ("_MOUSE"),
_T ("_NDP"),
_T ("_NUMLOCK"),
+ _T ("_OPENAFS"),
+ _T ("_OSBUILD"),
_T ("_PID"),
_T ("_PIPE"),
_T ("_PPID"),
_T ("_RALT"),
_T ("_RCTRL"),
+ _T ("_READY"),
+ _T ("_REGISTERED"),
_T ("_ROW"),
_T ("_ROWS"),
_T ("_RSHIFT"),
@@ -526,16 +612,26 @@
_T ("_SECOND"),
_T ("_SELECTED"),
_T ("_SHELL"),
+ _T ("_SHELLS"),
_T ("_SHIFT"),
_T ("_SHRALIAS"),
_T ("_STARTPATH"),
_T ("_STARTPID"),
+ _T ("_STDERR"),
+ _T ("_STDIN"),
+ _T ("_STDOUT"),
+ _T ("_STZN"),
+ _T ("_STZO"),
_T ("_SWAPPING"),
_T ("_SYSERR"),
_T ("_TIME"),
_T ("_TRANSIENT"),
+ _T ("_TZN"),
+ _T ("_TZO"),
_T ("_UNICODE"),
_T ("_VIDEO"),
+ _T ("_VIRTUALPC"),
+ _T ("_VMWARE"),
_T ("_WIN"),
_T ("_WINDIR"),
_T ("_WINFGWINDOW"),
@@ -545,6 +641,7 @@
_T ("_WINTITLE"),
_T ("_WINUSER"),
_T ("_WINVER"),
+ _T ("_WOW64"),
_T ("_XPIXELS"),
_T ("_YEAR"),
_T ("_YPIXELS"),
@@ -822,7 +919,7 @@
{
DEFINE_BLOCK (nIdentBegin, COLORINDEX_PREPROCESSOR);
}
- else
+ else
{
if (dwCookie & COOKIE_EXT_COMMENT)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
