|
From: <ki...@us...> - 2006-12-13 08:17:22
|
Revision: 3960
http://svn.sourceforge.net/winmerge/?rev=3960&view=rev
Author: kimmov
Date: 2006-12-13 00:17:21 -0800 (Wed, 13 Dec 2006)
Log Message:
-----------
PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
- Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Swedish/MergeSwedish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-13 07:17:17 UTC (rev 3959)
+++ trunk/Src/Changes.txt 2006-12-13 08:17:21 UTC (rev 3960)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-13 Kimmo
+ PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+
2006-12-13 Gal
BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
Src: LocationView.cpp LocationView.h MergeEditView.cpp
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-12-13 07:17:17 UTC (rev 3959)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-12-13 08:17:21 UTC (rev 3960)
@@ -1130,7 +1130,7 @@
7,80,221,10
CONTROL "M&\xF6jligg\xF6r detektion av flyttade textblock",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ CONTROL "&Matcha liknande rader",IDC_MATCH_SIMILAR_LINES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
LTEXT "&Filj\xE4mf\xF6relsemetod:",IDC_STATIC,7,115,100,9
COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-14 13:22:18
|
Revision: 3965
http://svn.sourceforge.net/winmerge/?rev=3965&view=rev
Author: kimmov
Date: 2006-12-14 05:22:11 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
BUG: [ 1602219 ] Crappy save of project files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/ProjectFilePathsDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-14 09:56:24 UTC (rev 3964)
+++ trunk/Src/Changes.txt 2006-12-14 13:22:11 UTC (rev 3965)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-14 Kimmo
+ BUG: [ 1602219 ] Crappy save of project files
+ Src: MainFrm.cpp ProjectFilePathsDlg.cpp
+
2006-12-13 Kimmo
PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
Submitted by Hans Eriksson
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-12-14 09:56:24 UTC (rev 3964)
+++ trunk/Src/MainFrm.cpp 2006-12-14 13:22:11 UTC (rev 3965)
@@ -3004,6 +3004,8 @@
/**
* @brief Opens dialog for user to Load, edit and save project files.
+ * This dialog gets current compare paths and filter (+other properties
+ * possible in project files) and initializes the dialog with them.
*/
void CMainFrame::OnSaveProject()
{
@@ -3029,15 +3031,16 @@
}
else if (bDirFrame)
{
+ // Get paths currently in compare
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
- CDirView *pView = pDoc->GetMainView();
- // Use first item if no item is selected.
- int ind = max(pView->GetFirstSelectedInd(), 0);
- const DIFFITEM item = pView->GetItemAt(ind);
- left = item.getLeftFilepath(pDoc->GetLeftBasePath());
- left += "\\";
- right = item.getRightFilepath(pDoc->GetRightBasePath());
- right += "\\";
+ left = pDoc->GetLeftBasePath();
+ right = pDoc->GetRightBasePath();
+ if (!paths_EndsWithSlash(left))
+ left += _T("\\");
+ if (!paths_EndsWithSlash(right))
+ right += _T("\\");
+
+ // Set-up the dialog
pathsDlg.SetPaths(left, right);
pathsDlg.m_bIncludeSubfolders = pDoc->GetRecursive();
pathsDlg.m_bLeftPathReadOnly = pDoc->GetReadOnly(TRUE);
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-12-14 09:56:24 UTC (rev 3964)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-12-14 13:22:11 UTC (rev 3965)
@@ -207,16 +207,30 @@
/**
* @brief Set paths for dialog.
- * This function is used to set paths from outside the dialog.
+ * This function is used to set paths from outside the dialog. The dialog
+ * only accepts existing paths, as we expect paths coming from existing
+ * compare windows.
* @param [in] left Left path.
* @param [in] right Right path.
*/
void ProjectFilePathsDlg::SetPaths(LPCTSTR left, LPCTSTR right)
{
if (left != NULL)
- m_sLeftFile = left;
+ {
+ PATH_EXISTENCE pe = paths_DoesPathExist(left);
+ if (pe != DOES_NOT_EXIST)
+ {
+ m_sLeftFile = left;
+ }
+ }
if (right != NULL)
- m_sRightFile = right;
+ {
+ PATH_EXISTENCE pe = paths_DoesPathExist(right);
+ if (pe != DOES_NOT_EXIST)
+ {
+ m_sRightFile = right;
+ }
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-12-17 06:43:36
|
Revision: 3969
http://svn.sourceforge.net/winmerge/?rev=3969&view=rev
Author: galh
Date: 2006-12-16 22:43:34 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-14 23:14:10 UTC (rev 3968)
+++ trunk/Src/Changes.txt 2006-12-17 06:43:34 UTC (rev 3969)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-17 Gal
+ BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
+ Src: MergeEditView.cpp
+
2006-12-14 Kimmo
BUG: [ 1602219 ] Crappy save of project files
Src: MainFrm.cpp ProjectFilePathsDlg.cpp
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2006-12-14 23:14:10 UTC (rev 3968)
+++ trunk/Src/MergeEditView.cpp 2006-12-17 06:43:34 UTC (rev 3969)
@@ -2537,7 +2537,7 @@
ptPos.y = nApparentLine;
// Scroll line to center of view
- int nScrollLine = nApparentLine;
+ int nScrollLine = GetSubLineIndex(nApparentLine);
nScrollLine -= GetScreenLines() / 2;
if (nScrollLine < 0)
nScrollLine = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-18 18:58:03
|
Revision: 3974
http://svn.sourceforge.net/winmerge/?rev=3974&view=rev
Author: kimmov
Date: 2006-12-18 10:57:59 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MovedLines.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-17 22:33:59 UTC (rev 3973)
+++ trunk/Src/Changes.txt 2006-12-18 18:57:59 UTC (rev 3974)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-18 Kimmo
+ PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
+ Src: MovedLines.cpp
+
2006-12-17 Gal
BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
Src: MergeEditView.cpp
Modified: trunk/Src/MovedLines.cpp
===================================================================
--- trunk/Src/MovedLines.cpp 2006-12-17 22:33:59 UTC (rev 3973)
+++ trunk/Src/MovedLines.cpp 2006-12-18 18:57:59 UTC (rev 3974)
@@ -25,7 +25,7 @@
void MovedLines::Add(ML_SIDE side1, unsigned int line1, unsigned int line2)
{
MovedLineMap * list = NULL;
- if (side1 == ML_SIDE::SIDE_LEFT)
+ if (side1 == SIDE_LEFT)
list = &m_moved0;
else
list = &m_moved1;
@@ -40,7 +40,7 @@
*/
int MovedLines::LineInBlock(unsigned int line, ML_SIDE side)
{
- if (side == ML_SIDE::SIDE_LEFT)
+ if (side == SIDE_LEFT)
return SecondSideInMovedBlock(line);
else
return FirstSideInMovedBlock(line);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-19 14:00:27
|
Revision: 3979
http://svn.sourceforge.net/winmerge/?rev=3979&view=rev
Author: kimmov
Date: 2006-12-19 06:00:24 -0800 (Tue, 19 Dec 2006)
Log Message:
-----------
PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-18 22:50:24 UTC (rev 3978)
+++ trunk/Src/Changes.txt 2006-12-19 14:00:24 UTC (rev 3979)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-19 Kimmo
+ PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
+ Src: MainFrm.cpp
+
2006-12-18 Kimmo
PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
Src: MovedLines.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-12-18 22:50:24 UTC (rev 3978)
+++ trunk/Src/MainFrm.cpp 2006-12-19 14:00:24 UTC (rev 3979)
@@ -887,7 +887,7 @@
case IDYES:
CFile::GetStatus(strSavePath, status);
status.m_mtime = 0; // Avoid unwanted changes
- status.m_attribute &= ~CFile::Attribute::readOnly;
+ status.m_attribute &= ~CFile::readOnly;
CFile::SetStatus(strSavePath, status);
nRetVal = IDYES;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-19 14:02:50
|
Revision: 3980
http://svn.sourceforge.net/winmerge/?rev=3980&view=rev
Author: kimmov
Date: 2006-12-19 06:02:49 -0800 (Tue, 19 Dec 2006)
Log Message:
-----------
PATCH: [ 1618364 ] Make GPL URL const string
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-19 14:00:24 UTC (rev 3979)
+++ trunk/Src/Changes.txt 2006-12-19 14:02:49 UTC (rev 3980)
@@ -5,6 +5,8 @@
2006-12-19 Kimmo
PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
Src: MainFrm.cpp
+ PATCH: [ 1618364 ] Make GPL URL const string
+ Src: MainFrm.cpp
2006-12-18 Kimmo
PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-12-19 14:00:24 UTC (rev 3979)
+++ trunk/Src/MainFrm.cpp 2006-12-19 14:02:49 UTC (rev 3980)
@@ -807,9 +807,9 @@
*/
void CMainFrame::OnHelpGnulicense()
{
- CString spath = GetModulePath() + _T("\\Copying");
- CString url = _T("http://www.gnu.org/copyleft/gpl.html");
-
+ const CString spath = GetModulePath() + _T("\\Copying");
+ const TCHAR url[] = _T("http://www.gnu.org/copyleft/gpl.html");
+
OpenFileOrUrl(spath, url);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-20 17:51:26
|
Revision: 3986
http://svn.sourceforge.net/winmerge/?rev=3986&view=rev
Author: kimmov
Date: 2006-12-20 09:51:23 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
BUG: [ 1606583 ] VC6 build is broken
- Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/MergeCmdLineInfo.cpp
trunk/Src/MergeCmdLineInfo.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-20 14:45:12 UTC (rev 3985)
+++ trunk/Src/Changes.txt 2006-12-20 17:51:23 UTC (rev 3986)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-20 Kimmo
+ BUG: [ 1606583 ] VC6 build is broken
+ Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
+ Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
+
2006-12-19 Kimmo
PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
Src: MainFrm.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-12-20 14:45:12 UTC (rev 3985)
+++ trunk/Src/MainFrm.cpp 2006-12-20 17:51:23 UTC (rev 3986)
@@ -2709,34 +2709,51 @@
LRESULT CMainFrame::OnCopyData(WPARAM wParam, LPARAM lParam)
{
COPYDATASTRUCT *pCopyData = (COPYDATASTRUCT*)lParam;
+ LPWSTR p = (LPWSTR)(pCopyData->lpData);
+ int argc = pCopyData->dwData;
+ TCHAR **argv = new (TCHAR *[argc]);
+ USES_CONVERSION;
- BYTE* pBuf = new BYTE[pCopyData->cbData];
- ::CopyMemory(pBuf, pCopyData->lpData, pCopyData->cbData);
+ for (int i = 0; i < argc; i++)
+ {
+ argv[i] = new TCHAR[lstrlenW(p) * (sizeof(WCHAR)/sizeof(TCHAR)) + 1];
+ lstrcpy(argv[i], W2T(p));
+ while (*p) p++;
+ p++;
+ }
- PostMessage(WM_USER, pCopyData->cbData, reinterpret_cast<LPARAM>(pBuf));
+ PostMessage(WM_USER, (WPARAM)argc, (LPARAM)argv);
return TRUE;
}
LRESULT CMainFrame::OnUser(WPARAM wParam, LPARAM lParam)
{
- BYTE* pBuf = reinterpret_cast<BYTE*>(lParam);
+ // MFC's ParseCommandLine method is working with __argc and __targv
+ // variables. We need to send MergeCmdLineInfo object rather than
+ // passing the command line as string. Until we do, we temporary
+ // change these variable values and restore then after parsing.
- CMemFile file;
- file.Attach(pBuf, wParam);
+ int argc = __argc;
+ TCHAR **argv = __targv;
- CArchive ar(&file, CArchive::load);
-
- MergeCmdLineInfo cmdInfo;
- cmdInfo.Serialize(ar);
+ __argc = wParam;
+ __targv = reinterpret_cast<TCHAR **>(lParam);
- ar.Close();
- file.Close();
-
+ MergeCmdLineInfo cmdInfo(*__targv);
+ theApp.ParseCommandLine(cmdInfo);
theApp.ParseArgsAndDoOpen(cmdInfo, this);
- delete pBuf;
+ // Delete memrory allocated in OnCopyData method.
+ for (int i = 0; i < argc; ++i)
+ {
+ delete[] __targv[i];
+ }
+ delete __targv;
+ __argc = argc;
+ __targv = argv;
+
return TRUE;
}
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-12-20 14:45:12 UTC (rev 3985)
+++ trunk/Src/Merge.cpp 2006-12-20 17:51:23 UTC (rev 3986)
@@ -199,23 +199,24 @@
{
USES_CONVERSION;
- // Activate previous instance and send command line to it
+ // Activate previous instance and send commandline to it
HWND hWnd = instanceChecker.ActivatePreviousInstance();
-
- CMemFile file;
- CArchive ar(&file, CArchive::store);
- cmdInfo.Serialize(ar);
- ar.Close();
-
- COPYDATASTRUCT data;
- data.cbData = static_cast<DWORD>(file.GetLength());
- data.lpData = file.Detach();
- data.dwData = 0;
- ::SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data);
+ WCHAR *pszArgs = new WCHAR[_tcslen(__targv[0]) + _tcslen(m_lpCmdLine) + 3];
+ WCHAR *p = pszArgs;
+ for (int i = 0; i < __argc; i++)
+ {
+ wcscpy(p, T2W(__targv[i]));
+ p += lstrlenW(p) + 1;
+ }
+ *p++ = _T('\0');
+ COPYDATASTRUCT data = {0};
+ data.cbData = (DWORD)(p - pszArgs) * sizeof(WCHAR);
+ data.lpData = pszArgs;
+ data.dwData = __argc;
+ SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data);
+ delete[] pszArgs;
- file.Close();
-
ReleaseMutex(hMutex);
CloseHandle(hMutex);
Modified: trunk/Src/MergeCmdLineInfo.cpp
===================================================================
--- trunk/Src/MergeCmdLineInfo.cpp 2006-12-20 14:45:12 UTC (rev 3985)
+++ trunk/Src/MergeCmdLineInfo.cpp 2006-12-20 17:51:23 UTC (rev 3986)
@@ -40,8 +40,6 @@
// MergeCmdLineInfo
-IMPLEMENT_SERIAL(MergeCmdLineInfo, CCommandLineInfo, 1)
-
MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(),
m_nCmdShow(SW_SHOWNORMAL),
m_bClearCaseTool(false),
@@ -93,105 +91,3 @@
m_pCmdLineParser->ParseParam(pszParam, bFlag, bLast);
}
-
-void MergeCmdLineInfo::Serialize(CArchive& ar)
-{
- CCommandLineInfo::Serialize(ar);
-
- if (ar.IsStoring())
- {
- Store(ar);
- }
- else
- {
- Load(ar);
- }
-}
-
-void MergeCmdLineInfo::Store(CArchive& ar)
-{
- ASSERT(ar.IsStoring());
-
- ar << m_nCmdShow;
- ar << m_bClearCaseTool;
- ar << m_bEscShutdown;
- ar << m_bExitIfNoDiff;
- ar << m_bRecurse;
- ar << m_bNonInteractive;
- ar << m_bNoPrefs;
- ar << m_bSingleInstance;
- ar << m_bShowUsage;
- ar << m_dwLeftFlags;
- ar << m_dwRightFlags;
- ar << m_sLeftDesc;
- ar << m_sRightDesc;
- ar << m_sFileFilter;
- ar << m_sPreDiffer;
-
- ar << m_Settings.GetCount();
-
- if (m_Settings.GetCount() > 0)
- {
- CMapStringToString::CPair* pIter = m_Settings.PGetFirstAssoc();
- while (pIter != NULL)
- {
- ar << pIter->key;
- ar << pIter->value;
-
- pIter = m_Settings.PGetNextAssoc(pIter);
- }
- }
-
- ar << m_nFiles;
- for (INT_PTR i = 0; i < m_nFiles; ++i)
- {
- ar << m_Files[i];
- }
-}
-
-void MergeCmdLineInfo::Load(CArchive& ar)
-{
- ASSERT(ar.IsLoading());
-
- INT_PTR i;
-
- ar >> m_nCmdShow;
- ar >> m_bClearCaseTool;
- ar >> m_bEscShutdown;
- ar >> m_bExitIfNoDiff;
- ar >> m_bRecurse;
- ar >> m_bNonInteractive;
- ar >> m_bNoPrefs;
- ar >> m_bSingleInstance;
- ar >> m_bShowUsage;
- ar >> m_dwLeftFlags;
- ar >> m_dwRightFlags;
- ar >> m_sLeftDesc;
- ar >> m_sRightDesc;
- ar >> m_sFileFilter;
- ar >> m_sPreDiffer;
-
- INT_PTR nSettings;
- ar >> nSettings;
-
- for (i = 0; i < nSettings; ++i)
- {
- CString sParam;
- CString sValue;
- ar >> sParam;
- ar >> sValue;
-
- m_Settings[sParam] = sValue;
- }
-
- ar >> m_nFiles;
- m_Files.SetSize(m_nFiles);
-
- for (i = 0; i < m_nFiles; ++i)
- {
- CString sFile;
- ar >> sFile;
-
- m_Files.SetAtGrow(i, sFile);
- }
-}
Modified: trunk/Src/MergeCmdLineInfo.h
===================================================================
--- trunk/Src/MergeCmdLineInfo.h 2006-12-20 14:45:12 UTC (rev 3985)
+++ trunk/Src/MergeCmdLineInfo.h 2006-12-20 17:51:23 UTC (rev 3986)
@@ -40,8 +40,6 @@
*/
class MergeCmdLineInfo : public CCommandLineInfo
{
- DECLARE_SERIAL(MergeCmdLineInfo)
-
public:
/** @brief ClearCaseCmdLineParser's constructor.
@@ -52,16 +50,11 @@
*/
MergeCmdLineInfo(const TCHAR *szExeName);
- // Default constructor is required for CArchive's serialization.
- MergeCmdLineInfo() : m_pCmdLineParser(NULL) { }
-
~MergeCmdLineInfo();
/** @brief Override CCommandLineInfo's method. */
virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast);
- void Serialize(CArchive& ar);
-
public:
int m_nCmdShow; /**< Initial state of the application's window. */
@@ -93,10 +86,6 @@
private:
- void Store(CArchive& ar);
-
- void Load(CArchive& ar);
-
/**< operator= is not implemented. */
MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-12-20 22:55:07
|
Revision: 3991
http://svn.sourceforge.net/winmerge/?rev=3991&view=rev
Author: sdottaka
Date: 2006-12-20 14:55:04 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirActions.cpp
trunk/Src/FileActionScript.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-20 20:25:56 UTC (rev 3990)
+++ trunk/Src/Changes.txt 2006-12-20 22:55:04 UTC (rev 3991)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-20 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
+ Src: FileActionScript.cpp DirActions.cpp
+
2006-12-20 Kimmo
BUG: [ 1606583 ] VC6 build is broken
Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2006-12-20 20:25:56 UTC (rev 3990)
+++ trunk/Src/DirActions.cpp 2006-12-20 22:55:04 UTC (rev 3991)
@@ -300,7 +300,6 @@
*/
void CDirView::DoCopyLeftTo()
{
- CShellFileOp fileOp;
CString destPath;
CString startPath;
CString msg;
@@ -311,10 +310,9 @@
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
- fileOp.SetOperationFlags(FO_COPY, this, FOF_NOCONFIRMMKDIR);
- if (!GetDocument()->GetRecursive())
- fileOp.AddDestFile(destPath);
-
+ FileActionScript actionScript;
+ const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
+ int selCount = 0;
int sel = -1;
CString slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
@@ -323,28 +321,29 @@
if (di.diffcode != 0 && IsItemCopyableToOnLeft(di))
{
+ FileActionItem act;
+ CString sFullDest(destPath);
+ sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- CString sFullDest(destPath);
- sFullDest += _T("\\");
if (!di.sLeftSubdir.IsEmpty())
sFullDest += di.sLeftSubdir + _T("\\");
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sLeftFilename;
- fileOp.AddDestFile(sFullDest);
}
+ sFullDest += di.sLeftFilename;
+ act.dest = sFullDest;
+
GetItemFileNames(sel, slFile, srFile);
- fileOp.AddSourceFile(slFile);
+ act.src = slFile;
+ act.dirflag = di.isDirectory();
+ act.context = sel;
+ act.atype = actType;
+ act.UIResult = FileActionItem::UI_DESYNC;
+ actionScript.AddActionItem(act);
+ ++selCount;
}
}
-
- BOOL bSuccess = FALSE;
- BOOL bAPICalled = FALSE;
- BOOL bAborted = FALSE;
- int nAPIReturn = 0;
- bSuccess = fileOp.Go(&bAPICalled, &nAPIReturn, &bAborted);
+ // Now we prompt, and execute actions
+ ConfirmAndPerformActions(actionScript, selCount);
}
/**
@@ -356,7 +355,6 @@
*/
void CDirView::DoCopyRightTo()
{
- CShellFileOp fileOp;
CString destPath;
CString startPath;
CString msg;
@@ -367,10 +365,9 @@
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
- fileOp.SetOperationFlags(FO_COPY, this, FOF_NOCONFIRMMKDIR);
- if (!GetDocument()->GetRecursive())
- fileOp.AddDestFile(destPath);
-
+ FileActionScript actionScript;
+ const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
+ int selCount = 0;
int sel = -1;
CString slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
@@ -379,28 +376,29 @@
if (di.diffcode != 0 && IsItemCopyableToOnRight(di))
{
+ FileActionItem act;
+ CString sFullDest(destPath);
+ sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- CString sFullDest(destPath);
- sFullDest += _T("\\");
if (!di.sRightSubdir.IsEmpty())
sFullDest += di.sRightSubdir + _T("\\");
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sRightFilename;
- fileOp.AddDestFile(sFullDest);
}
+ sFullDest += di.sRightFilename;
+ act.dest = sFullDest;
+
GetItemFileNames(sel, slFile, srFile);
- fileOp.AddSourceFile(srFile);
+ act.src = srFile;
+ act.dirflag = di.isDirectory();
+ act.context = sel;
+ act.atype = actType;
+ act.UIResult = FileActionItem::UI_DESYNC;
+ actionScript.AddActionItem(act);
+ ++selCount;
}
}
-
- BOOL bSuccess = FALSE;
- BOOL bAPICalled = FALSE;
- BOOL bAborted = FALSE;
- int nAPIReturn = 0;
- bSuccess = fileOp.Go( &bAPICalled, &nAPIReturn, &bAborted );
+ // Now we prompt, and execute actions
+ ConfirmAndPerformActions(actionScript, selCount);
}
/**
@@ -441,10 +439,7 @@
if (!di.sLeftSubdir.IsEmpty())
sFullDest += di.sLeftSubdir + _T("\\");
}
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sLeftFilename;
+ sFullDest += di.sLeftFilename;
act.dest = sFullDest;
GetItemFileNames(sel, slFile, srFile);
@@ -499,10 +494,7 @@
if (!di.sRightSubdir.IsEmpty())
sFullDest += di.sRightSubdir + _T("\\");
}
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sRightFilename;
+ sFullDest += di.sRightFilename;
act.dest = sFullDest;
GetItemFileNames(sel, slFile, srFile);
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2006-12-20 20:25:56 UTC (rev 3990)
+++ trunk/Src/FileActionScript.cpp 2006-12-20 22:55:04 UTC (rev 3991)
@@ -27,6 +27,7 @@
#include "MainFrm.h"
#include "FileActionScript.h"
#include "CShellFileOp.h"
+#include "paths.h"
/**
* @brief Standard constructor.
@@ -171,7 +172,7 @@
// Move operations next
operation = FO_MOVE;
- operFlags = 0;
+ operFlags = FOF_MULTIDESTFILES;
if (m_bUseRecycleBin)
operFlags |= FOF_ALLOWUNDO;
@@ -230,8 +231,18 @@
__try
{
if (m_bHasCopyOperations)
+ {
+ POSITION pos = m_actions.GetHeadPosition();
+ while (pos != NULL)
+ {
+ const FileActionItem &act = m_actions.GetNext(pos);
+ if (act.dirflag)
+ paths_CreateIfNeeded(act.dest);
+ }
+
bFileOpSucceed = m_pCopyOperations->Go(&bOpStarted,
&apiRetVal, &bUserCancelled);
+ }
if (m_bHasMoveOperations)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-30 17:51:38
|
Revision: 3998
http://svn.sourceforge.net/winmerge/?rev=3998&view=rev
Author: kimmov
Date: 2006-12-30 09:51:34 -0800 (Sat, 30 Dec 2006)
Log Message:
-----------
PATCH: [ 1623772 ] Constify PathContext parameter strings
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/PathContext.cpp
trunk/Src/PathContext.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-30 12:39:15 UTC (rev 3997)
+++ trunk/Src/Changes.txt 2006-12-30 17:51:34 UTC (rev 3998)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-30 Kimmo
+ PATCH: [ 1623772 ] Constify PathContext parameter strings
+ Src: PathContext.cpp PathContext.h
+
2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
2006-12-20 Takashi
Modified: trunk/Src/PathContext.cpp
===================================================================
--- trunk/Src/PathContext.cpp 2006-12-30 12:39:15 UTC (rev 3997)
+++ trunk/Src/PathContext.cpp 2006-12-30 17:51:34 UTC (rev 3998)
@@ -40,7 +40,7 @@
* @brief Set path.
* @param [in] sPath New path for item.
*/
-void PathInfo::SetPath(CString sPath)
+void PathInfo::SetPath(LPCTSTR sPath)
{
m_sPath = sPath;
}
@@ -58,7 +58,7 @@
}
-PathContext::PathContext(CString sLeft, CString sRight)
+PathContext::PathContext(LPCTSTR sLeft, LPCTSTR sRight)
{
m_pathLeft.SetPath(sLeft);
m_pathRight.SetPath(sRight);
@@ -214,7 +214,7 @@
* @brief Check if temp files exist.
* @return TRUE if one of temp files exist.
*/
-BOOL TempFileContext::FilesExist()
+BOOL TempFileContext::FilesExist() const
{
BOOL bLeftExists = FALSE;
BOOL bRightExists = FALSE;
Modified: trunk/Src/PathContext.h
===================================================================
--- trunk/Src/PathContext.h 2006-12-30 12:39:15 UTC (rev 3997)
+++ trunk/Src/PathContext.h 2006-12-30 17:51:34 UTC (rev 3998)
@@ -22,7 +22,7 @@
PathInfo(const PathInfo &pi);
CString GetPath(BOOL bNormalized = TRUE) const;
- void SetPath(CString path);
+ void SetPath(LPCTSTR path);
void NormalizePath();
private:
@@ -36,7 +36,7 @@
{
public:
PathContext();
- PathContext(CString sLeft, CString sRight);
+ PathContext(LPCTSTR sLeft, LPCTSTR sRight);
CString GetLeft(BOOL bNormalized = TRUE) const;
CString GetRight(BOOL bNormalized = TRUE) const;
CString GetPath(int index, BOOL bNormalized = TRUE) const;
@@ -57,7 +57,7 @@
public:
~TempFileContext();
BOOL CreateFiles(const PathContext &paths);
- BOOL FilesExist();
+ BOOL FilesExist() const;
void DeleteFiles();
const CString & GetTempPath() const { return m_sTempPath; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-31 11:42:33
|
Revision: 3999
http://svn.sourceforge.net/winmerge/?rev=3999&view=rev
Author: kimmov
Date: 2006-12-31 03:42:28 -0800 (Sun, 31 Dec 2006)
Log Message:
-----------
PATCH: [ 1625022 ] Constify OptionsManager parameters
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/OptionsMgr.cpp
trunk/Src/Common/OptionsMgr.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-12-30 17:51:34 UTC (rev 3998)
+++ trunk/Src/Changes.txt 2006-12-31 11:42:28 UTC (rev 3999)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-31 Kimmo
+ PATCH: [ 1625022 ] Constify OptionsManager parameters
+ Src/Common: OptionsMgr.cpp OptionsMgr.h
+
2006-12-30 Kimmo
PATCH: [ 1623772 ] Constify PathContext parameter strings
Src: PathContext.cpp PathContext.h
Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp 2006-12-30 17:51:34 UTC (rev 3998)
+++ trunk/Src/Common/OptionsMgr.cpp 2006-12-31 11:42:28 UTC (rev 3999)
@@ -34,17 +34,17 @@
/**
* @brief Set name, value and default value for option
- * @param [in] optName Name of option ("Settings/AutomaticRescan")
+ * @param [in] name Name of option with full path ("Settings/AutomaticRescan")
* @param [in] defaultValue Default value for option. This value
* is restored for otion when Reset() is run.
* @sa COption::Reset()
*/
-int COption::Init(CString optName, varprop::VariantValue defaultValue)
+int COption::Init(LPCTSTR name, varprop::VariantValue defaultValue)
{
int retVal = OPT_OK;
// Dont' check type here since we are initing it!
- m_strName = optName;
+ m_strName = name;
varprop::VT_TYPE inType = defaultValue.getType();
switch (inType)
@@ -75,7 +75,7 @@
default:
retVal = OPT_UNKNOWN_TYPE;
}
- return retVal;
+ return retVal;
}
/**
@@ -97,14 +97,18 @@
/**
* @brief Convert string to integer, or return false if not an integer number
*/
-static bool
-getInt(const CString & str, int & val)
+static bool getInt(LPCTSTR str, int & val)
{
- if (str.IsEmpty()) return false;
- for (int i=0; i<str.GetLength(); ++i)
+ if (str == NULL)
+ return false;
+ int len = _tcslen(str);
+ if (len == 0)
+ return false;
+
+ for (int i = 0; i < len; ++i)
{
- TCHAR ch = str[i];
- if (!_istascii(ch) || !_istdigit(ch)) return false;
+ if (!_istascii(str[i]) || !_istdigit(str[i]))
+ return false;
}
val = _ttoi(str);
return true;
@@ -124,7 +128,8 @@
// Convert string to integer
{
int val=0;
- if (!getInt(svalue, val)) return false;
+ if (!getInt(svalue, val))
+ return false;
value.SetInt(val);
return true;
}
@@ -269,7 +274,7 @@
/**
* @brief Add new option to list.
*/
-int COptionsMgr::AddOption(CString name, varprop::VariantValue defaultValue)
+int COptionsMgr::AddOption(LPCTSTR name, varprop::VariantValue defaultValue)
{
int retVal = OPT_OK;
COption tmpOption;
@@ -284,7 +289,7 @@
/**
* @brief Get option value from list by name
*/
-varprop::VariantValue COptionsMgr::Get(CString name) const
+varprop::VariantValue COptionsMgr::Get(LPCTSTR name) const
{
COption tmpOption;
varprop::VariantValue value;
@@ -301,7 +306,7 @@
/**
* @brief Return string option value
*/
-CString COptionsMgr::GetString(CString name) const
+CString COptionsMgr::GetString(LPCTSTR name) const
{
varprop::VariantValue val;
val = Get(name);
@@ -311,7 +316,7 @@
/**
* @brief Return integer option value
*/
-int COptionsMgr::GetInt(const CString & name) const
+int COptionsMgr::GetInt(LPCTSTR name) const
{
varprop::VariantValue val;
val = Get(name);
@@ -321,7 +326,7 @@
/**
* @brief Return boolean option value
*/
-bool COptionsMgr::GetBool(CString name) const
+bool COptionsMgr::GetBool(LPCTSTR name) const
{
varprop::VariantValue val;
val = Get(name);
@@ -331,7 +336,7 @@
/**
* @brief Set new value for option
*/
-int COptionsMgr::Set(CString name, varprop::VariantValue value, COption::coercion_type coercion)
+int COptionsMgr::Set(LPCTSTR name, varprop::VariantValue value, COption::coercion_type coercion)
{
COption tmpOption;
BOOL optionFound = FALSE;
@@ -354,7 +359,7 @@
/*
* @brief Type-convert and forward to SaveOption(CString, int)
*/
-int COptionsMgr::SaveOption(CString name, UINT value)
+int COptionsMgr::SaveOption(LPCTSTR name, UINT value)
{
int xvalue = value;
return SaveOption(name, xvalue);
@@ -363,7 +368,7 @@
/*
* @brief Type-convert and forward to SaveOption(CString, int)
*/
-int COptionsMgr::SaveOption(CString name, COLORREF value)
+int COptionsMgr::SaveOption(LPCTSTR name, COLORREF value)
{
int xvalue = value;
return SaveOption(name, xvalue);
@@ -372,7 +377,7 @@
/**
* @brief Reset option value to default
*/
-int COptionsMgr::Reset(CString name)
+int COptionsMgr::Reset(LPCTSTR name)
{
COption tmpOption;
BOOL optionFound = FALSE;
@@ -394,7 +399,7 @@
/**
* @brief Return default string value
*/
-int COptionsMgr::GetDefault(CString name, CString & value) const
+int COptionsMgr::GetDefault(LPCTSTR name, CString & value) const
{
COption tmpOption;
BOOL optionFound = FALSE;
@@ -419,7 +424,7 @@
/**
* @brief Return default number value
*/
-int COptionsMgr::GetDefault(CString name, DWORD & value) const
+int COptionsMgr::GetDefault(LPCTSTR name, DWORD & value) const
{
COption tmpOption;
BOOL optionFound = FALSE;
@@ -444,7 +449,7 @@
/**
* @brief Return default boolean value
*/
-int COptionsMgr::GetDefault(CString name, bool & value) const
+int COptionsMgr::GetDefault(LPCTSTR name, bool & value) const
{
COption tmpOption;
BOOL optionFound = FALSE;
@@ -610,7 +615,7 @@
* @note This function must handle ANSI and UNICODE data!
* @todo Handles only string and integer types
*/
-int CRegOptionsMgr::LoadValueFromReg(HKEY hKey, CString strName,
+int CRegOptionsMgr::LoadValueFromReg(HKEY hKey, LPCTSTR strName,
varprop::VariantValue &value)
{
CString strPath;
@@ -634,6 +639,7 @@
pData = new BYTE[size];
if (pData == NULL)
return OPT_ERR;
+ ZeroMemory(pData, size);
// Get data
retValReg = RegQueryValueEx(hKey, (LPCTSTR)strValueName,
@@ -691,7 +697,7 @@
* @param [in] value value to write to registry value
* @todo Handles only string and integer types
*/
-int CRegOptionsMgr::SaveValueToReg(HKEY hKey, CString strValueName,
+int CRegOptionsMgr::SaveValueToReg(HKEY hKey, LPCTSTR strValueName,
varprop::VariantValue value)
{
LONG retValReg = 0;
@@ -735,7 +741,7 @@
* Adds new option to list of options. Sets value to default value.
* If option does not exist in registry, saves with default value.
*/
-int CRegOptionsMgr::InitOption(CString name, varprop::VariantValue defaultValue)
+int CRegOptionsMgr::InitOption(LPCTSTR name, varprop::VariantValue defaultValue)
{
// Check type & bail if null
int valType = defaultValue.getType();
@@ -797,7 +803,7 @@
* Adds new option to list of options. Sets value to default value.
* If option does not exist in registry, saves with default value.
*/
-int CRegOptionsMgr::InitOption(CString name, LPCTSTR defaultValue)
+int CRegOptionsMgr::InitOption(LPCTSTR name, LPCTSTR defaultValue)
{
varprop::VariantValue defValue;
int retVal = OPT_OK;
@@ -813,7 +819,7 @@
* Adds new option to list of options. Sets value to default value.
* If option does not exist in registry, saves with default value.
*/
-int CRegOptionsMgr::InitOption(CString name, int defaultValue, bool serializable)
+int CRegOptionsMgr::InitOption(LPCTSTR name, int defaultValue, bool serializable)
{
varprop::VariantValue defValue;
int retVal = OPT_OK;
@@ -832,7 +838,7 @@
* Adds new option to list of options. Sets value to default value.
* If option does not exist in registry, saves with default value.
*/
-int CRegOptionsMgr::InitOption(CString name, bool defaultValue)
+int CRegOptionsMgr::InitOption(LPCTSTR name, bool defaultValue)
{
varprop::VariantValue defValue;
int retVal = OPT_OK;
@@ -846,7 +852,7 @@
* @brief Load option from registry.
* @note Currently handles only integer and string options!
*/
-int CRegOptionsMgr::LoadOption(CString name)
+int CRegOptionsMgr::LoadOption(LPCTSTR name)
{
varprop::VariantValue value;
CString strPath;
@@ -885,7 +891,7 @@
* @brief Save option to registry
* @note Currently handles only integer and string options!
*/
-int CRegOptionsMgr::SaveOption(CString name)
+int CRegOptionsMgr::SaveOption(LPCTSTR name)
{
if (!m_serializing) return OPT_OK;
@@ -925,7 +931,7 @@
/**
* @brief Set new value for option and save option to registry
*/
-int CRegOptionsMgr::SaveOption(CString name, varprop::VariantValue value)
+int CRegOptionsMgr::SaveOption(LPCTSTR name, varprop::VariantValue value)
{
int retVal = OPT_OK;
retVal = Set(name, value);
@@ -937,7 +943,7 @@
/**
* @brief Set new string value for option and save option to registry
*/
-int CRegOptionsMgr::SaveOption(CString name, CString value)
+int CRegOptionsMgr::SaveOption(LPCTSTR name, LPCTSTR value)
{
varprop::VariantValue val;
int retVal = OPT_OK;
@@ -952,7 +958,7 @@
/**
* @brief Set new string value for option, with coercion, and save option to registry
*/
-int CRegOptionsMgr::CoerceAndSaveOption(CString name, CString value)
+int CRegOptionsMgr::CoerceAndSaveOption(LPCTSTR name, LPCTSTR value)
{
varprop::VariantValue val;
int retVal = OPT_OK;
@@ -967,7 +973,7 @@
/**
* @brief Set new integer value for option and save option to registry
*/
-int CRegOptionsMgr::SaveOption(CString name, int value)
+int CRegOptionsMgr::SaveOption(LPCTSTR name, int value)
{
varprop::VariantValue val;
int retVal = OPT_OK;
@@ -982,7 +988,7 @@
/**
* @brief Set new boolean value for option and save option to registry
*/
-int CRegOptionsMgr::SaveOption(CString name, bool value)
+int CRegOptionsMgr::SaveOption(LPCTSTR name, bool value)
{
varprop::VariantValue val;
int retVal = OPT_OK;
Modified: trunk/Src/Common/OptionsMgr.h
===================================================================
--- trunk/Src/Common/OptionsMgr.h 2006-12-30 17:51:34 UTC (rev 3998)
+++ trunk/Src/Common/OptionsMgr.h 2006-12-31 11:42:28 UTC (rev 3999)
@@ -54,7 +54,7 @@
public:
typedef enum { nocoerce, coerce } coercion_type;
public:
- int Init(CString name, varprop::VariantValue defaultVal);
+ int Init(LPCTSTR name, varprop::VariantValue defaultVal);
varprop::VariantValue Get() const;
varprop::VariantValue GetDefault() const;
int Set(varprop::VariantValue value, coercion_type coercion=nocoerce);
@@ -74,33 +74,33 @@
class COptionsMgr
{
public:
- int AddOption(CString name, varprop::VariantValue defaultValue);
- varprop::VariantValue Get(CString name) const;
- CString GetString(CString name) const;
- int GetInt(const CString & name) const;
- void SetInt(const CString & name, int value) { SaveOption(name, value); }
- bool GetBool(CString name) const;
- void SetBool(const CString & name, bool value) { SaveOption(name, value); }
- int Set(CString name, varprop::VariantValue value, COption::coercion_type coercion=COption::nocoerce);
- int Reset(CString name);
- int GetDefault(CString name, CString & value) const;
- int GetDefault(CString name, DWORD & value) const;
- int GetDefault(CString name, bool & value) const;
+ int AddOption(LPCTSTR name, varprop::VariantValue defaultValue);
+ varprop::VariantValue Get(LPCTSTR name) const;
+ CString GetString(LPCTSTR name) const;
+ int GetInt(LPCTSTR name) const;
+ void SetInt(LPCTSTR name, int value) { SaveOption(name, value); }
+ bool GetBool(LPCTSTR name) const;
+ void SetBool(LPCTSTR name, bool value) { SaveOption(name, value); }
+ int Set(LPCTSTR name, varprop::VariantValue value, COption::coercion_type coercion=COption::nocoerce);
+ int Reset(LPCTSTR name);
+ int GetDefault(LPCTSTR name, CString & value) const;
+ int GetDefault(LPCTSTR name, DWORD & value) const;
+ int GetDefault(LPCTSTR name, bool & value) const;
- virtual int InitOption(CString name,
+ virtual int InitOption(LPCTSTR name,
varprop::VariantValue defaultValue) = 0;
- virtual int InitOption(CString name, LPCTSTR defaultValue) = 0;
- virtual int InitOption(CString name, int defaultValue, bool serializable=true) = 0;
- virtual int InitOption(CString name, bool defaultValue) = 0;
+ virtual int InitOption(LPCTSTR name, LPCTSTR defaultValue) = 0;
+ virtual int InitOption(LPCTSTR name, int defaultValue, bool serializable=true) = 0;
+ virtual int InitOption(LPCTSTR name, bool defaultValue) = 0;
- virtual int SaveOption(CString name) = 0;
- virtual int SaveOption(CString name, varprop::VariantValue value) = 0;
- virtual int SaveOption(CString name, CString value) = 0;
- virtual int CoerceAndSaveOption(CString name, CString value) = 0;
- virtual int SaveOption(CString name, int value) = 0;
- virtual int SaveOption(CString name, bool value) = 0;
- virtual int SaveOption(CString name, UINT value);
- virtual int SaveOption(CString name, COLORREF value);
+ virtual int SaveOption(LPCTSTR name) = 0;
+ virtual int SaveOption(LPCTSTR name, varprop::VariantValue value) = 0;
+ virtual int SaveOption(LPCTSTR name, LPCTSTR value) = 0;
+ virtual int CoerceAndSaveOption(LPCTSTR name, LPCTSTR value) = 0;
+ virtual int SaveOption(LPCTSTR name, int value) = 0;
+ virtual int SaveOption(LPCTSTR name, bool value) = 0;
+ virtual int SaveOption(LPCTSTR name, UINT value);
+ virtual int SaveOption(LPCTSTR name, COLORREF value);
virtual int ExportOptions(CString filename);
virtual int ImportOptions(CString filename);
@@ -119,28 +119,28 @@
public:
CRegOptionsMgr() : m_serializing(true) { }
- int LoadOption(CString name);
+ int LoadOption(LPCTSTR name);
int SetRegRootKey(CString path);
- virtual int InitOption(CString name, varprop::VariantValue defaultValue);
- virtual int InitOption(CString name, LPCTSTR defaultValue);
- virtual int InitOption(CString name, int defaultValue, bool serializable=true);
- virtual int InitOption(CString name, bool defaultValue);
+ virtual int InitOption(LPCTSTR name, varprop::VariantValue defaultValue);
+ virtual int InitOption(LPCTSTR name, LPCTSTR defaultValue);
+ virtual int InitOption(LPCTSTR name, int defaultValue, bool serializable=true);
+ virtual int InitOption(LPCTSTR name, bool defaultValue);
- virtual int SaveOption(CString name);
- virtual int SaveOption(CString name, varprop::VariantValue value);
- virtual int CoerceAndSaveOption(CString name, CString value);
- virtual int SaveOption(CString name, CString value);
- virtual int SaveOption(CString name, int value);
- virtual int SaveOption(CString name, bool value);
+ virtual int SaveOption(LPCTSTR name);
+ virtual int SaveOption(LPCTSTR name, varprop::VariantValue value);
+ virtual int CoerceAndSaveOption(LPCTSTR name, LPCTSTR value);
+ virtual int SaveOption(LPCTSTR name, LPCTSTR value);
+ virtual int SaveOption(LPCTSTR name, int value);
+ virtual int SaveOption(LPCTSTR name, bool value);
virtual void SetSerializing(bool serializing=true) { m_serializing = serializing; }
protected:
void SplitName(CString strName, CString &strPath, CString &strValue);
- int LoadValueFromReg(HKEY hKey, CString strName,
+ int LoadValueFromReg(HKEY hKey, LPCTSTR strName,
varprop::VariantValue &value);
- int SaveValueToReg(HKEY hKey, CString strValueName,
+ int SaveValueToReg(HKEY hKey, LPCTSTR strValueName,
varprop::VariantValue value);
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-04 16:40:22
|
Revision: 4004
http://svn.sourceforge.net/winmerge/?rev=4004&view=rev
Author: kimmov
Date: 2007-01-04 08:40:13 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/OptionsMgr.h
trunk/Src/FileActionScript.cpp
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropRegistry.cpp
trunk/Src/PropTextColors.cpp
trunk/Src/SourceControl.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/Changes.txt 2007-01-04 16:40:13 UTC (rev 4004)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-04 Kimmo
+ PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
+ Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
+ OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
+ Src/Common: OptionsMgr.h
+
2006-12-31 Kimmo
PATCH: [ 1625022 ] Constify OptionsManager parameters
Src/Common: OptionsMgr.cpp OptionsMgr.h
Modified: trunk/Src/Common/OptionsMgr.h
===================================================================
--- trunk/Src/Common/OptionsMgr.h 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/Common/OptionsMgr.h 2007-01-04 16:40:13 UTC (rev 4004)
@@ -148,6 +148,5 @@
bool m_serializing;
};
-COptionsMgr * GetOptionsMgr();
#endif // _OPTIONS_MGR_
\ No newline at end of file
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/FileActionScript.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -23,6 +23,7 @@
// $Id$
#include "stdafx.h"
+#include "Merge.h"
#include "OptionsDef.h"
#include "MainFrm.h"
#include "FileActionScript.h"
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/MainFrm.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -213,7 +213,6 @@
, m_bVssSuppressPathCheck(FALSE)
{
ZeroMemory(&m_pMenus[0], sizeof(m_pMenus));
- OptionsInit(); // Implementation in OptionsInit.cpp
UpdateCodepageModule();
InitializeSourceControlMembers();
@@ -223,7 +222,7 @@
// TODO: read preference for logging
- int logging = m_options.GetInt(OPT_LOGGING);
+ int logging = GetOptionsMgr()->GetInt(OPT_LOGGING);
if (logging > 0)
{
gLog.EnableLogging(TRUE);
@@ -237,15 +236,15 @@
m_pSyntaxColors = new SyntaxColors();
if (m_pSyntaxColors)
- m_pSyntaxColors->Initialize(&m_options);
+ m_pSyntaxColors->Initialize(GetOptionsMgr());
// Check if filter folder is set, and create it if not
- CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
+ CString pathMyFolders = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
// No filter path, set it to default and make sure it exists.
CString pathFilters = GetDefaultFilterUserPath(TRUE);
- m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
+ GetOptionsMgr()->SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
}
@@ -307,7 +306,7 @@
}
m_wndStatusBar.SetPaneInfo(1, ID_STATUS_MERGINGMODE, 0, 100);
m_wndStatusBar.SetPaneInfo(2, ID_STATUS_DIFFNUM, 0, 150);
- if (m_options.GetBool(OPT_SHOW_STATUSBAR) == false)
+ if (GetOptionsMgr()->GetBool(OPT_SHOW_STATUSBAR) == false)
CMDIFrameWnd::ShowControlBar(&m_wndStatusBar, false, 0);
// CG: The following line was added by the Splash Screen component.
@@ -717,8 +716,8 @@
*/
void CMainFrame::OnOptionsShowDifferent()
{
- bool val = m_options.GetBool(OPT_SHOW_DIFFERENT);
- m_options.SaveOption(OPT_SHOW_DIFFERENT, !val); // reverse
+ bool val = GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_DIFFERENT, !val); // reverse
RedisplayAllDirDocs();
}
@@ -727,8 +726,8 @@
*/
void CMainFrame::OnOptionsShowIdentical()
{
- bool val = m_options.GetBool(OPT_SHOW_IDENTICAL);
- m_options.SaveOption(OPT_SHOW_IDENTICAL, !val); // reverse
+ bool val = GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_IDENTICAL, !val); // reverse
RedisplayAllDirDocs();
}
@@ -737,8 +736,8 @@
*/
void CMainFrame::OnOptionsShowUniqueLeft()
{
- bool val = m_options.GetBool(OPT_SHOW_UNIQUE_LEFT);
- m_options.SaveOption(OPT_SHOW_UNIQUE_LEFT, !val); // reverse
+ bool val = GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_UNIQUE_LEFT, !val); // reverse
RedisplayAllDirDocs();
}
@@ -747,8 +746,8 @@
*/
void CMainFrame::OnOptionsShowUniqueRight()
{
- bool val = m_options.GetBool(OPT_SHOW_UNIQUE_RIGHT);
- m_options.SaveOption(OPT_SHOW_UNIQUE_RIGHT, !val); // reverse
+ bool val = GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_UNIQUE_RIGHT, !val); // reverse
RedisplayAllDirDocs();
}
@@ -757,8 +756,8 @@
*/
void CMainFrame::OnOptionsShowBinaries()
{
- bool val = m_options.GetBool(OPT_SHOW_BINARIES);
- m_options.SaveOption(OPT_SHOW_BINARIES, !val); // reverse
+ bool val = GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_BINARIES, !val); // reverse
RedisplayAllDirDocs();
}
@@ -767,39 +766,39 @@
*/
void CMainFrame::OnOptionsShowSkipped()
{
- bool val = m_options.GetBool(OPT_SHOW_SKIPPED);
- m_options.SaveOption(OPT_SHOW_SKIPPED, !val); // reverse
+ bool val = GetOptionsMgr()->GetBool(OPT_SHOW_SKIPPED);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_SKIPPED, !val); // reverse
RedisplayAllDirDocs();
}
void CMainFrame::OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_SHOW_DIFFERENT));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT));
}
void CMainFrame::OnUpdateOptionsShowidentical(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_SHOW_IDENTICAL));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL));
}
void CMainFrame::OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_SHOW_UNIQUE_LEFT));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT));
}
void CMainFrame::OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_SHOW_UNIQUE_RIGHT));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT));
}
void CMainFrame::OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_SHOW_BINARIES));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES));
}
void CMainFrame::OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_SHOW_SKIPPED));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_SHOW_SKIPPED));
}
/**
@@ -840,7 +839,7 @@
int nVerSys = 0;
bFileRO = files_isFileReadOnly(strSavePath, &bFileExists);
- nVerSys = m_options.GetInt(OPT_VCS_SYSTEM);
+ nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
if (bFileExists && bFileRO)
{
@@ -921,7 +920,7 @@
/// Wrapper to set the global option 'm_bAllowMixedEol'
void CMainFrame::SetEOLMixed(BOOL bAllow)
{
- m_options.SaveOption(OPT_ALLOW_MIXED_EOL, bAllow == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_ALLOW_MIXED_EOL, bAllow == TRUE);
ApplyViewWhitespace();
}
@@ -931,18 +930,18 @@
void CMainFrame::OnOptions()
{
// Using singleton shared syntax colors
- CPreferencesDlg dlg(&m_options, m_pSyntaxColors);
+ CPreferencesDlg dlg(GetOptionsMgr(), m_pSyntaxColors);
int rv = dlg.DoModal();
if (rv == IDOK)
{
// Set new filterpath
- CString filterPath = m_options.GetString(OPT_FILTER_USERPATH);
+ CString filterPath = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH);
theApp.m_globalFileFilter.SetUserFilterPath(filterPath);
UpdateCodepageModule();
// Call the wrapper to set m_bAllowMixedEol (the wrapper updates the registry)
- SetEOLMixed(m_options.GetBool(OPT_ALLOW_MIXED_EOL));
+ SetEOLMixed(GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
// make an attempt at rescanning any open diff sessions
MergeDocList docs;
@@ -1207,7 +1206,7 @@
{
// first, make a backup copy of the original
// create backup copy of file if destination file exists
- if (m_options.GetBool(OPT_CREATE_BACKUPS)
+ if (GetOptionsMgr()->GetBool(OPT_CREATE_BACKUPS)
&& paths_DoesPathExist(pszPath) == IS_EXISTING_FILE)
{
// Add backup extension if pathlength allows it
@@ -1253,7 +1252,7 @@
CString strSavePath(pszDest);
int nVerSys = 0;
- nVerSys = m_options.GetInt(OPT_VCS_SYSTEM);
+ nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
int nRetVal = HandleReadonlySave(strSavePath, TRUE, bApplyToAll);
if (nRetVal == IDCANCEL || nRetVal == IDNO)
@@ -1315,9 +1314,9 @@
if (ChooseFont(&cf))
{
if (bDirFrame)
- m_options.SaveOption(OPT_FONT_DIRCMP_USECUSTOM, true);
+ GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_USECUSTOM, true);
else
- m_options.SaveOption(OPT_FONT_FILECMP_USECUSTOM, true);
+ GetOptionsMgr()->SaveOption(OPT_FONT_FILECMP_USECUSTOM, true);
AppSerialize appser(AppSerialize::Save, sFontPath);
appser.SerializeFont(_T(""), *lf); // unnamed font
@@ -1393,7 +1392,7 @@
ZeroMemory(&lfnew, sizeof(LOGFONT));
// Get MergeView font
- if (m_options.GetBool(OPT_FONT_FILECMP_USECUSTOM))
+ if (GetOptionsMgr()->GetBool(OPT_FONT_FILECMP_USECUSTOM))
{
AppSerialize appser(AppSerialize::Load, _T("Font"));
appser.SerializeFont(_T(""), lfnew); // unnamed font
@@ -1405,7 +1404,7 @@
// Get DirView font
ZeroMemory(&lfnew, sizeof(LOGFONT));
- if (m_options.GetBool(OPT_FONT_DIRCMP_USECUSTOM))
+ if (GetOptionsMgr()->GetBool(OPT_FONT_DIRCMP_USECUSTOM))
{
AppSerialize appser(AppSerialize::Load, _T("FontDirCompare"));
appser.SerializeFont(_T(""), lfnew); // unnamed font
@@ -1428,9 +1427,9 @@
BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
if (bDirFrame)
- m_options.SaveOption(OPT_FONT_DIRCMP_USECUSTOM, false);
+ GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_USECUSTOM, false);
else
- m_options.SaveOption(OPT_FONT_FILECMP_USECUSTOM, false);
+ GetOptionsMgr()->SaveOption(OPT_FONT_FILECMP_USECUSTOM, false);
GetFontProperties();
ShowFontChangeMessage();
@@ -1619,7 +1618,7 @@
{
// Save last selected filter
CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- m_options.SaveOption(OPT_FILEFILTER_CURRENT, filter);
+ GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, filter);
// save main window position
WINDOWPLACEMENT wp;
@@ -1686,10 +1685,10 @@
// build the new list if the user choose to
// ignore lines matching the reg expression patterns
- if (m_options.GetBool(OPT_LINEFILTER_ENABLED))
+ if (GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED))
{
// find each regular expression and add to list
- _tcsncpy(tmp, m_options.GetString(OPT_LINEFILTER_REGEXP), _MAX_PATH);
+ _tcsncpy(tmp, GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP), _MAX_PATH);
token = _tcstok(tmp, sep);
while (token && valid)
@@ -1820,15 +1819,15 @@
void CMainFrame::OnViewWhitespace()
{
- bool bViewWhitespace = m_options.GetBool(OPT_VIEW_WHITESPACE);
- m_options.SaveOption(OPT_VIEW_WHITESPACE, !bViewWhitespace);
+ bool bViewWhitespace = GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE);
+ GetOptionsMgr()->SaveOption(OPT_VIEW_WHITESPACE, !bViewWhitespace);
ApplyViewWhitespace();
}
/// Enables View/View Whitespace menuitem when merge view is active
void CMainFrame::OnUpdateViewWhitespace(CCmdUI* pCmdUI)
{
- pCmdUI->SetCheck(m_options.GetBool(OPT_VIEW_WHITESPACE));
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_VIEW_WHITESPACE));
}
/// Get list of MergeDocs (documents underlying edit sessions)
@@ -1935,7 +1934,7 @@
CDirDoc * CMainFrame::GetDirDocToShow(BOOL * pNew)
{
CDirDoc * pDirDoc = 0;
- if (!m_options.GetBool(OPT_MULTIDOC_DIRDOCS))
+ if (!GetOptionsMgr()->GetBool(OPT_MULTIDOC_DIRDOCS))
{
POSITION pos = theApp.m_pDirTemplate->GetFirstDocPosition();
while (pos)
@@ -2241,7 +2240,7 @@
CString sExecutable;
CString sCmd;
- sExtEditor = m_options.GetString(OPT_EXT_EDITOR_CMD);
+ sExtEditor = GetOptionsMgr()->GetString(OPT_EXT_EDITOR_CMD);
GetDecoratedCmdLine(sExtEditor, sCmd, sExecutable);
SplitFilename(sExecutable, NULL, NULL, &ext);
@@ -2278,15 +2277,6 @@
}
/**
- * @brief Get default editor path
- */
-CString CMainFrame::GetDefaultEditor()
-{
- CString path = paths_GetWindowsDirectory() + _T("\\NOTEPAD.EXE");
- return path;
-}
-
-/**
* @brief Get default user filter folder path.
* This function returns the default filter path for user filters.
* If wanted so (@p bCreate) path can be created if it does not
@@ -2326,15 +2316,18 @@
* @brief Copy one piece of data from options object to config log, or vice-versa
*/
static void
-LoadConfigIntSetting(int * cfgval, COptionsMgr & options, const CString & name, ConfigLogDirection cfgdir)
+LoadConfigIntSetting(int * cfgval, COptionsMgr * options, const CString & name, ConfigLogDirection cfgdir)
{
+ if (options == NULL)
+ return;
+
if (cfgdir == ToConfigLog)
{
- *cfgval = options.GetInt(name);
+ *cfgval = options->GetInt(name);
}
else
{
- options.SetInt(name, *cfgval);
+ options->SetInt(name, *cfgval);
}
}
@@ -2342,24 +2335,30 @@
* @brief Copy one piece of data from options object to config log, or vice-versa
*/
static void
-LoadConfigBoolSetting(BOOL * cfgval, COptionsMgr & options, const CString & name, ConfigLogDirection cfgdir)
+LoadConfigBoolSetting(BOOL * cfgval, COptionsMgr * options, const CString & name, ConfigLogDirection cfgdir)
{
+ if (options == NULL)
+ return;
+
if (cfgdir == ToConfigLog)
{
- *cfgval = options.GetBool(name);
+ *cfgval = options->GetBool(name);
}
else
{
- options.SetBool(name, !!(*cfgval));
+ options->SetBool(name, !!(*cfgval));
}
}
/**
* @brief Pass options settings from options manager object to config log, or vice-versa
*/
-static void LoadConfigLog(CConfigLog & configLog, COptionsMgr & options,
+static void LoadConfigLog(CConfigLog & configLog, COptionsMgr * options,
LOGFONT & lfDiff, ConfigLogDirection cfgdir)
{
+ if (options == NULL)
+ return;
+
LoadConfigIntSetting(&configLog.m_diffOptions.nIgnoreWhitespace, options, OPT_CMP_IGNORE_WHITESPACE, cfgdir);
LoadConfigBoolSetting(&configLog.m_diffOptions.bIgnoreBlankLines, options, OPT_CMP_IGNORE_BLANKLINES, cfgdir);
LoadConfigBoolSetting(&configLog.m_diffOptions.bFilterCommentsLines, options, OPT_CMP_FILTER_COMMENTLINES, cfgdir);
@@ -2411,7 +2410,7 @@
CConfigLog configLog;
CString sError;
- LoadConfigLog(configLog, m_options, m_lfDiff, ToConfigLog);
+ LoadConfigLog(configLog, GetOptionsMgr(), m_lfDiff, ToConfigLog);
if (configLog.WriteLogFile(sError))
{
@@ -2446,7 +2445,7 @@
if (IsComparing())
return;
- if (!m_options.GetBool(OPT_MULTIDOC_DIRDOCS))
+ if (!GetOptionsMgr()->GetBool(OPT_MULTIDOC_DIRDOCS))
{
pDirDoc = GetDirDocToShow(&docNull);
if (!docNull)
@@ -2503,8 +2502,8 @@
theApp.m_globalFileFilter.GetFileFilters(&fileFilters, selectedFilter);
fileFiltersDlg.SetFilterArray(&fileFilters);
fileFiltersDlg.SetSelected(selectedFilter);
- filter.m_bIgnoreRegExp = m_options.GetBool(OPT_LINEFILTER_ENABLED);
- filter.m_sPattern = m_options.GetString(OPT_LINEFILTER_REGEXP);
+ filter.m_bIgnoreRegExp = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
+ filter.m_sPattern = GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP);
if (sht.DoModal() == IDOK)
{
@@ -2518,7 +2517,7 @@
{
CString sFilter = _T("*.*");
theApp.m_globalFileFilter.SetFilter(sFilter);
- m_options.SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
+ GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
}
}
else
@@ -2526,10 +2525,10 @@
theApp.m_globalFileFilter.SetFileFilterPath(path);
theApp.m_globalFileFilter.UseMask(FALSE);
CString sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- m_options.SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
+ GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
}
- m_options.SaveOption(OPT_LINEFILTER_ENABLED, filter.m_bIgnoreRegExp == TRUE);
- m_options.SaveOption(OPT_LINEFILTER_REGEXP, filter.m_sPattern);
+ GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, filter.m_bIgnoreRegExp == TRUE);
+ GetOptionsMgr()->SaveOption(OPT_LINEFILTER_REGEXP, filter.m_sPattern);
RebuildRegExpList(TRUE);
}
@@ -2563,7 +2562,7 @@
}
else
{
- if (m_options.GetBool(OPT_CLOSE_WITH_ESC))
+ if (GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC))
{
MergeDocList docs;
GetAllMergeDocs(&docs);
@@ -2660,8 +2659,8 @@
*/
void CMainFrame::OnViewStatusBar()
{
- bool bShow = !m_options.GetBool(OPT_SHOW_STATUSBAR);
- m_options.SaveOption(OPT_SHOW_STATUSBAR, bShow);
+ bool bShow = !GetOptionsMgr()->GetBool(OPT_SHOW_STATUSBAR);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_STATUSBAR, bShow);
CMDIFrameWnd::ShowControlBar(&m_wndStatusBar, bShow, 0);
}
@@ -2671,8 +2670,8 @@
*/
void CMainFrame::OnViewToolbar()
{
- bool bShow = !m_options.GetBool(OPT_SHOW_TOOLBAR);
- m_options.SaveOption(OPT_SHOW_TOOLBAR, bShow);
+ bool bShow = !GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR);
+ GetOptionsMgr()->SaveOption(OPT_SHOW_TOOLBAR, bShow);
CMDIFrameWnd::ShowControlBar(&m_wndToolBar, bShow, 0);
}
@@ -2687,14 +2686,14 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
// get the default projects path
- CString strProjectPath = m_options.GetString(OPT_PROJECTS_PATH);
+ CString strProjectPath = GetOptionsMgr()->GetString(OPT_PROJECTS_PATH);
if (!SelectFile(GetSafeHwnd(), sFilepath, strProjectPath, title, IDS_PROJECTFILES,
TRUE))
return;
strProjectPath = paths_GetParentPath(sFilepath);
// store this as the new project path
- m_options.SaveOption(OPT_PROJECTS_PATH,strProjectPath);
+ GetOptionsMgr()->SaveOption(OPT_PROJECTS_PATH,strProjectPath);
theApp.LoadAndOpenProjectFile(sFilepath);
}
@@ -2785,13 +2784,13 @@
CConfigLog configLog;
// set configLog settings to current
- LoadConfigLog(configLog, m_options, m_lfDiff, ToConfigLog);
+ LoadConfigLog(configLog, GetOptionsMgr(), m_lfDiff, ToConfigLog);
// update any settings found in actual config file
configLog.ReadLogFile(filepath);
// set our current settings from configLog settings
- LoadConfigLog(configLog, m_options, m_lfDiff, FromConfigLog);
+ LoadConfigLog(configLog,GetOptionsMgr(), m_lfDiff, FromConfigLog);
}
/**
@@ -2801,7 +2800,7 @@
{
// Get current codepage settings from the options module
// and push them into the codepage module
- updateDefaultCodepage(m_options.GetInt(OPT_CP_DEFAULT_MODE), m_options.GetInt(OPT_CP_DEFAULT_CUSTOM));
+ updateDefaultCodepage(GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_MODE), GetOptionsMgr()->GetInt(OPT_CP_DEFAULT_CUSTOM));
}
/**
@@ -2897,7 +2896,7 @@
// checkin operation
args.Format(_T("checkin -nc \"%s\""), sname);
- CString vssPath = m_options.GetString(OPT_VSS_PATH);
+ CString vssPath = GetOptionsMgr()->GetString(OPT_VSS_PATH);
HANDLE hVss = RunIt(vssPath, args, TRUE, FALSE);
if (hVss!=INVALID_HANDLE_VALUE)
{
@@ -2941,15 +2940,6 @@
}
/**
- * @brief Access to the singleton options manager
- */
-COptionsMgr *
-GetOptionsMgr()
-{
- return GetMainFrame()->GetTheOptionsMgr();
-}
-
-/**
* @brief Access to the singleton main frame (where we have some globals)
*/
CMainFrame * GetMainFrame()
@@ -3135,7 +3125,7 @@
BarCtrl.SetImageList(&m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]);
BarCtrl.SetDisabledImageList(&m_ToolbarImages[TOOLBAR_IMAGES_DISABLED]);
- if (m_options.GetBool(OPT_SHOW_TOOLBAR) == false)
+ if (GetOptionsMgr()->GetBool(OPT_SHOW_TOOLBAR) == false)
{
CMDIFrameWnd::ShowControlBar(&m_wndToolBar, false, 0);
}
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/MainFrm.h 2007-01-04 16:40:13 UTC (rev 4004)
@@ -116,7 +116,6 @@
CString SetStatus(LPCTSTR status);
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
- CString GetDefaultEditor();
CString GetDefaultFilterUserPath(BOOL bCreate = FALSE);
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
@@ -126,8 +125,6 @@
void GetDirViews(DirViewList * pDirViews);
void GetMergeEditViews(MergeEditViewList * pMergeViews);
void CheckinToClearCase(CString strDestinationPath);
- COptionsMgr * GetTheOptionsMgr() { return &m_options; }
- void ResetOptions() { OptionsInit(); }
static void CenterToMainFrame(CDialog * dlg);
static void SetMainIcon(CDialog * dlg);
void StartFlashing();
@@ -215,8 +212,6 @@
MENU_COUNT, // Add new items before this item
};
BCMenu * m_pMenus[MENU_COUNT]; /**< Menus for different views */
-
- CRegOptionsMgr m_options; /**< Options manager */
SyntaxColors *m_pSyntaxColors; /**< Syntax color container */
// Generated message map functions
@@ -297,7 +292,6 @@
CMergeDoc * GetMergeDocToShow(CDirDoc * pDirDoc, BOOL * pNew);
CDirDoc * GetDirDocToShow(BOOL * pNew);
void ShowFontChangeMessage();
- void OptionsInit();
void OpenFileOrUrl(LPCTSTR szFile, LPCTSTR szUrl);
BOOL CreateToobar();
CMergeEditView * GetActiveMergeEditView();
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/Merge.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -28,8 +28,9 @@
// $Id$
#include "stdafx.h"
+
+#include "OptionsMgr.h"
#include "Merge.h"
-
#include "AboutDlg.h"
#include "MainFrm.h"
#include "ChildFrm.h"
@@ -97,6 +98,12 @@
LPCTSTR WinMergeOptionName;
};
+COptionsMgr * GetOptionsMgr()
+{
+ CMergeApp *pApp = static_cast<CMergeApp *>(AfxGetApp());
+ return pApp->GetMergeOptionsMgr();
+}
+
/////////////////////////////////////////////////////////////////////////////
// CMergeApp construction
@@ -107,6 +114,7 @@
, m_mainThreadScripts(NULL)
, m_nLastCompareResult(0)
, m_bNonInteractive(false)
+, m_pOptions(NULL)
{
// add construction code here,
// Place all significant initialization in InitInstance
@@ -115,7 +123,8 @@
CMergeApp::~CMergeApp()
{
- delete m_pLangDlg; m_pLangDlg = NULL;
+ delete m_pOptions;
+ delete m_pLangDlg;
}
/////////////////////////////////////////////////////////////////////////////
// The one and only CMergeApp object
@@ -125,6 +134,13 @@
/////////////////////////////////////////////////////////////////////////////
// CMergeApp initialization
+/**
+ * @brief Initialize WinMerge application instance.
+ * @return TRUE if application initialization succeeds (and we'll run it),
+ * FALSE if something failed and we exit the instance.
+ * @todo We could handle these failure situations more gratefully, i.e. show
+ * at least some error message to the user..
+ */
BOOL CMergeApp::InitInstance()
{
InitCommonControls(); // initialize common control library
@@ -165,6 +181,9 @@
#endif
#endif
+ m_pOptions = new CRegOptionsMgr;
+ OptionsInit(); // Implementation in OptionsInit.cpp
+
// Parse command-line arguments.
MergeCmdLineInfo cmdInfo(*__targv);
ParseCommandLine(cmdInfo);
@@ -182,7 +201,7 @@
// This is the name of the company of the original author (Dean Grimm)
SetRegistryKey(_T("Thingamahoochie"));
- BOOL bSingleInstance = GetProfileInt(_T("Settings"), _T("SingleInstance"), FALSE) ||
+ BOOL bSingleInstance = GetOptionsMgr()->GetBool(OPT_SINGLE_INSTANCE) ||
(true == cmdInfo.m_bSingleInstance);
HANDLE hMutex = NULL;
@@ -225,7 +244,7 @@
}
LoadStdProfileSettings(0); // Load standard INI file options (including MRU)
- BOOL bDisableSplash = GetProfileInt(_T("Settings"), _T("DisableSplash"), FALSE);
+ BOOL bDisableSplash = GetOptionsMgr()->GetBool(OPT_DISABLE_SPLASH);
InitializeFileFilters();
m_globalFileFilter.SetFilter(_T("*.*"));
@@ -503,7 +522,7 @@
// Turn off serializing to registry.
GetOptionsMgr()->SetSerializing(false);
// Load all default settings.
- pMainFrame->ResetOptions();
+ ResetOptions();
}
// Set the global file filter.
@@ -717,3 +736,13 @@
str += _T("\n\n") + LoadResString(IDS_CMDLINE_SEEMANUAL);
return str;
}
+
+/**
+ * @brief Get default editor path.
+ * @return full path to the editor program executable.
+ */
+CString CMergeApp::GetDefaultEditor()
+{
+ CString path = paths_GetWindowsDirectory() + _T("\\NOTEPAD.EXE");
+ return path;
+}
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/Merge.h 2007-01-04 16:40:13 UTC (rev 4004)
@@ -35,7 +35,7 @@
#include "resource.h" // main symbols
#include "MergeDoc.h"
-
+#include "OptionsMgr.h"
#include "FileFilterHelper.h"
struct FileFilter;
@@ -71,7 +71,12 @@
public:
void SetNeedIdleTimer();
void SetLastCompareResult(int nResult) { m_nLastCompareResult = nResult; }
+ CString GetDefaultEditor();
+ COptionsMgr * GetMergeOptionsMgr() { return static_cast<COptionsMgr *> (m_pOptions); }
+ void OptionsInit();
+ void ResetOptions() { OptionsInit(); }
+
// Implementation
protected:
@@ -105,6 +110,7 @@
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
private:
+ CRegOptionsMgr *m_pOptions;
CAssureScriptsForThread * m_mainThreadScripts;
int m_nLastCompareResult;
bool m_bNonInteractive;
@@ -112,6 +118,8 @@
extern CMergeApp theApp;
+COptionsMgr * GetOptionsMgr();
+
/////////////////////////////////////////////////////////////////////////////
CMergeDoc *GetDoc();
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/OptionsInit.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -8,10 +8,10 @@
#include "stdafx.h"
#include "Merge.h"
+#include "MainFrm.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
#include "DiffWrapper.h" // CMP_CONTENT
-#include "MainFrm.h"
/**
* @brief Initialise options and set default values.
@@ -20,120 +20,121 @@
* using WinMerge and many users never change them. So pick
* default values carefully!
*/
-void CMainFrame::OptionsInit()
+void CMergeApp::OptionsInit()
{
- m_options.SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
+ m_pOptions->SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
// Initialise options (name, default value)
- m_options.InitOption(OPT_SHOW_UNIQUE_LEFT, true);
- m_options.InitOption(OPT_SHOW_UNIQUE_RIGHT, true);
- m_options.InitOption(OPT_SHOW_DIFFERENT, true);
- m_options.InitOption(OPT_SHOW_IDENTICAL, true);
- m_options.InitOption(OPT_SHOW_BINARIES, true);
- m_options.InitOption(OPT_SHOW_SKIPPED, false);
+ m_pOptions->InitOption(OPT_SHOW_UNIQUE_LEFT, true);
+ m_pOptions->InitOption(OPT_SHOW_UNIQUE_RIGHT, true);
+ m_pOptions->InitOption(OPT_SHOW_DIFFERENT, true);
+ m_pOptions->InitOption(OPT_SHOW_IDENTICAL, true);
+ m_pOptions->InitOption(OPT_SHOW_BINARIES, true);
+ m_pOptions->InitOption(OPT_SHOW_SKIPPED, false);
- m_options.InitOption(OPT_SHOW_TOOLBAR, true);
- m_options.InitOption(OPT_SHOW_STATUSBAR, true);
+ m_pOptions->InitOption(OPT_SHOW_TOOLBAR, true);
+ m_pOptions->InitOption(OPT_SHOW_STATUSBAR, true);
- m_options.InitOption(OPT_SYNTAX_HIGHLIGHT, true);
- m_options.InitOption(OPT_WORDDIFF_HIGHLIGHT, true);
- m_options.InitOption(OPT_WORDWRAP, false);
- m_options.InitOption(OPT_VIEW_LINENUMBERS, false);
- m_options.InitOption(OPT_DISABLE_SPLASH, false);
- m_options.InitOption(OPT_CREATE_BACKUPS, true);
- m_options.InitOption(OPT_VIEW_WHITESPACE, false);
- m_options.InitOption(OPT_CONNECT_MOVED_BLOCKS, 0);
- m_options.InitOption(OPT_SCROLL_TO_FIRST, false);
- m_options.InitOption(OPT_VERIFY_OPEN_PATHS, true);
- m_options.InitOption(OPT_AUTO_COMPLETE_SOURCE, (int)0);
+ m_pOptions->InitOption(OPT_SYNTAX_HIGHLIGHT, true);
+ m_pOptions->InitOption(OPT_WORDDIFF_HIGHLIGHT, true);
+ m_pOptions->InitOption(OPT_WORDWRAP, false);
+ m_pOptions->InitOption(OPT_VIEW_LINENUMBERS, false);
+ m_pOptions->InitOption(OPT_DISABLE_SPLASH, false);
+ m_pOptions->InitOption(OPT_CREATE_BACKUPS, true);
+ m_pOptions->InitOption(OPT_VIEW_WHITESPACE, false);
+ m_pOptions->InitOption(OPT_CONNECT_MOVED_BLOCKS, 0);
+ m_pOptions->InitOption(OPT_SCROLL_TO_FIRST, false);
+ m_pOptions->InitOption(OPT_VERIFY_OPEN_PATHS, true);
+ m_pOptions->InitOption(OPT_AUTO_COMPLETE_SOURCE, (int)0);
- m_options.InitOption(OPT_DIRVIEW_SORT_COLUMN, (int)-1);
- m_options.InitOption(OPT_DIRVIEW_SORT_ASCENDING, true);
+ m_pOptions->InitOption(OPT_DIRVIEW_SORT_COLUMN, (int)-1);
+ m_pOptions->InitOption(OPT_DIRVIEW_SORT_ASCENDING, true);
- m_options.InitOption(OPT_AUTOMATIC_RESCAN, false);
- m_options.InitOption(OPT_ALLOW_MIXED_EOL, false);
- m_options.InitOption(OPT_TAB_SIZE, (int)4);
- m_options.InitOption(OPT_TAB_TYPE, (int)0); // 0 means tabs inserted
+ m_pOptions->InitOption(OPT_AUTOMATIC_RESCAN, false);
+ m_pOptions->InitOption(OPT_ALLOW_MIXED_EOL, false);
+ m_pOptions->InitOption(OPT_TAB_SIZE, (int)4);
+ m_pOptions->InitOption(OPT_TAB_TYPE, (int)0); // 0 means tabs inserted
- m_options.InitOption(OPT_EXT_EDITOR_CMD, GetDefaultEditor());
- m_options.InitOption(OPT_USE_RECYCLE_BIN, true);
- m_options.InitOption(OPT_SINGLE_INSTANCE, false);
- m_options.InitOption(OPT_MERGE_MODE, false);
+ m_pOptions->InitOption(OPT_EXT_EDITOR_CMD, GetDefaultEditor());
+ m_pOptions->InitOption(OPT_USE_RECYCLE_BIN, true);
+ m_pOptions->InitOption(OPT_SINGLE_INSTANCE, false);
+ m_pOptions->InitOption(OPT_MERGE_MODE, false);
// OPT_WORDDIFF_HIGHLIGHT is initialized above
- m_options.InitOption(OPT_BREAK_ON_WORDS, true);
- m_options.InitOption(OPT_BREAK_TYPE, 0);
+ m_pOptions->InitOption(OPT_BREAK_ON_WORDS, true);
+ m_pOptions->InitOption(OPT_BREAK_TYPE, 0);
- m_options.InitOption(OPT_CLOSE_WITH_ESC, true);
- m_options.InitOption(OPT_LOGGING, 0);
- m_options.InitOption(OPT_IGNORE_SMALL_FILETIME, false);
+ m_pOptions->InitOption(OPT_CLOSE_WITH_ESC, true);
+ m_pOptions->InitOption(OPT_LOGGING, 0);
+ m_pOptions->InitOption(OPT_IGNORE_SMALL_FILETIME, false);
- m_options.InitOption(OPT_CMP_IGNORE_WHITESPACE, (int)0);
- m_options.InitOption(OPT_CMP_IGNORE_BLANKLINES, false);
- m_options.InitOption(OPT_CMP_FILTER_COMMENTLINES, false);
- m_options.InitOption(OPT_CMP_IGNORE_CASE, false);
- m_options.InitOption(OPT_CMP_IGNORE_EOL, false);
- m_options.InitOption(OPT_CMP_METHOD, (int)CMP_CONTENT);
- m_options.InitOption(OPT_CMP_MOVED_BLOCKS, false);
- m_options.InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
- m_options.InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
- m_options.InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
+ m_pOptions->InitOption(OPT_CMP_IGNORE_WHITESPACE, (int)0);
+ m_pOptions->InitOption(OPT_CMP_IGNORE_BLANKLINES, false);
+ m_pOptions->InitOption(OPT_CMP_FILTER_COMMENTLINES, false);
+ m_pOptions->InitOption(OPT_CMP_IGNORE_CASE, false);
+ m_pOptions->InitOption(OPT_CMP_IGNORE_EOL, false);
+ m_pOptions->InitOption(OPT_CMP_METHOD, (int)CMP_CONTENT);
+ m_pOptions->InitOption(OPT_CMP_MOVED_BLOCKS, false);
+ m_pOptions->InitOption(OPT_CMP_MATCH_SIMILAR_LINES, false);
+ m_pOptions->InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
+ m_pOptions->InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
- m_options.InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
- m_options.InitOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
- m_options.InitOption(OPT_CLR_DIFF_DELETED, (int)RGB(192, 192, 192));
- m_options.InitOption(OPT_CLR_SELECTED_DIFF_DELETED, (int)RGB(240, 192, 192));
- m_options.InitOption(OPT_CLR_DIFF_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_SELECTED_DIFF_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_TRIVIAL_DIFF, (int)RGB(251,242,191));
- m_options.InitOption(OPT_CLR_TRIVIAL_DIFF_DELETED, (int)RGB(233,233,233));
- m_options.InitOption(OPT_CLR_TRIVIAL_DIFF_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_MOVEDBLOCK, (int)RGB(228,155,82));
- m_options.InitOption(OPT_CLR_MOVEDBLOCK_DELETED, (int)RGB(192, 192, 192));
- m_options.InitOption(OPT_CLR_MOVEDBLOCK_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_SELECTED_MOVEDBLOCK, (int)RGB(248,112,78));
- m_options.InitOption(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED, (int)RGB(252, 181, 163));
- m_options.InitOption(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_WORDDIFF, (int)RGB(241,226,173));
- m_options.InitOption(OPT_CLR_SELECTED_WORDDIFF, (int)RGB(255,160,160));
- m_options.InitOption(OPT_CLR_WORDDIFF_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_SELECTED_WORDDIFF_TEXT, (int)RGB(0,0,0));
- m_options.InitOption(OPT_CLR_DEFAULT_TEXT_COLORING, true);
+ m_pOptions->InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
+ m_pOptions->InitOption(OPT_CLR_DIFF_DELETED, (int)RGB(192, 192, 192));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_DIFF_DELETED, (int)RGB(240, 192, 192));
+ m_pOptions->InitOption(OPT_CLR_DIFF_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_DIFF_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_TRIVIAL_DIFF, (int)RGB(251,242,191));
+ m_pOptions->InitOption(OPT_CLR_TRIVIAL_DIFF_DELETED, (int)RGB(233,233,233));
+ m_pOptions->InitOption(OPT_CLR_TRIVIAL_DIFF_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_MOVEDBLOCK, (int)RGB(228,155,82));
+ m_pOptions->InitOption(OPT_CLR_MOVEDBLOCK_DELETED, (int)RGB(192, 192, 192));
+ m_pOptions->InitOption(OPT_CLR_MOVEDBLOCK_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_MOVEDBLOCK, (int)RGB(248,112,78));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_MOVEDBLOCK_DELETED, (int)RGB(252, 181, 163));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_MOVEDBLOCK_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_WORDDIFF, (int)RGB(241,226,173));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_WORDDIFF, (int)RGB(255,160,160));
+ m_pOptions->InitOption(OPT_CLR_WORDDIFF_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_SELECTED_WORDDIFF_TEXT, (int)RGB(0,0,0));
+ m_pOptions->InitOption(OPT_CLR_DEFAULT_TEXT_COLORING, true);
- m_options.InitOption(OPT_PROJECTS_PATH,_T(""));
+ m_pOptions->InitOption(OPT_PROJECTS_PATH,_T(""));
- m_options.InitOption(OPT_MULTIDOC_DIRDOCS, false);
- m_options.InitOption(OPT_MULTIDOC_MERGEDOCS, false);
+ m_pOptions->InitOption(OPT_MULTIDOC_DIRDOCS, false);
+ m_pOptions->InitOption(OPT_MULTIDOC_MERGEDOCS, false);
// Overwrite WinMerge 2.0 default colors with new colors
- if (m_options.GetInt(OPT_CLR_DIFF) == RGB(255,255,92))
- m_options.SaveOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
- if (m_options.GetInt(OPT_CLR_SELECTED_DIFF) == RGB(255,0,92))
- m_options.SaveOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
+ if (m_pOptions->GetInt(OPT_CLR_DIFF) == RGB(255,255,92))
+ m_pOptions->SaveOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
+ if (m_pOptions->GetInt(OPT_CLR_SELECTED_DIFF) == RGB(255,0,92))
+ m_pOptions->SaveOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
- m_options.InitOption(OPT_LINEFILTER_ENABLED, false);
- m_options.InitOption(OPT_LINEFILTER_REGEXP, _T(""));
- m_options.InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
- m_options.InitOption(OPT_FILTER_USERPATH, GetDefaultFilterUserPath());
+ m_pOptions->InitOption(OPT_LINEFILTER_ENABLED, false);
+ m_pOptions->InitOption(OPT_LINEFILTER_REGEXP, _T(""));
+ m_pOptions->InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
+ // CMainFrame initializes this when it is empty.
+ m_pOptions->InitOption(OPT_FILTER_USERPATH, _T(""));
- m_options.InitOption(OPT_CP_DEFAULT_MODE, (int)0);
- m_options.InitOption(OPT_CP_DEFAULT_CUSTOM, (int)GetACP());
- m_options.InitOption(OPT_CP_DETECT, false);
+ m_pOptions->InitOption(OPT_CP_DEFAULT_MODE, (int)0);
+ m_pOptions->InitOption(OPT_CP_DEFAULT_CUSTOM, (int)GetACP());
+ m_pOptions->InitOption(OPT_CP_DETECT, false);
- m_options.InitOption(OPT_FONT_FILECMP_USECUSTOM, false);
- m_options.InitOption(OPT_FONT_DIRCMP_USECUSTOM, false);
+ m_pOptions->InitOption(OPT_FONT_FILECMP_USECUSTOM, false);
+ m_pOptions->InitOption(OPT_FONT_DIRCMP_USECUSTOM, false);
- m_options.InitOption(OPT_VCS_SYSTEM, VCS_NONE);
- m_options.InitOption(OPT_VSS_PATH, _T(""));
+ m_pOptions->InitOption(OPT_VCS_SYSTEM, VCS_NONE);
+ m_pOptions->InitOption(OPT_VSS_PATH, _T(""));
- m_options.InitOption(OPT_ARCHIVE_ENABLE, 1); // Enable by default
- m_options.InitOption(OPT_ARCHIVE_PROBETYPE, false);
+ m_pOptions->InitOption(OPT_ARCHIVE_ENABLE, 1); // Enable by default
+ m_pOptions->InitOption(OPT_ARCHIVE_PROBETYPE, false);
// Read last used filter from registry
// If filter fails to set, reset to default
- BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(m_options.GetString(OPT_FILEFILTER_CURRENT));
+ BOOL bFilterSet = theApp.m_globalFileFilter.SetFilter(m_pOptions->GetString(OPT_FILEFILTER_CURRENT));
if (!bFilterSet)
{
CString filter = theApp.m_globalFileFilter.GetFilterNameOrMask();
- m_options.SaveOption(OPT_FILEFILTER_CURRENT, filter);
+ m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter);
}
}
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/PropRegistry.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -28,7 +28,7 @@
#include "RegKey.h"
#include "coretools.h"
#include "FileOrFolderSelect.h"
-#include "MainFrm.h" // GetDefaultEditor()
+#include "Merge.h" // GetDefaultEditor()
#include "OptionsDef.h"
#include "OptionsMgr.h"
@@ -104,7 +104,8 @@
*/
void CPropRegistry::WriteOptions()
{
- CString sDefaultEditor = GetMainFrame()->GetDefaultEditor();
+ CMergeApp *app = static_cast<CMergeApp*>(AfxGetApp());
+ CString sDefaultEditor = app->GetDefaultEditor();
m_pOptionsMgr->SaveOption(OPT_USE_RECYCLE_BIN, m_bUseRecycleBin == TRUE);
m_pOptionsMgr->SaveOption(OPT_IGNORE_SMALL_FILETIME, m_bIgnoreSmallTimeDiff == TRUE);
Modified: trunk/Src/PropTextColors.cpp
===================================================================
--- trunk/Src/PropTextColors.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/PropTextColors.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -8,6 +8,7 @@
#include "stdafx.h"
#include "resource.h"
+#include "Merge.h"
#include "SyntaxColors.h"
#include "PropTextColors.h"
#include "OptionsDef.h"
Modified: trunk/Src/SourceControl.cpp
===================================================================
--- trunk/Src/SourceControl.cpp 2007-01-02 11:18:30 UTC (rev 4003)
+++ trunk/Src/SourceControl.cpp 2007-01-04 16:40:13 UTC (rev 4004)
@@ -22,7 +22,7 @@
m_strCCComment = _T("");
m_bCheckinVCS = FALSE;
- CString vssPath = m_options.GetString(OPT_VSS_PATH);
+ CString vssPath = GetOptionsMgr()->GetString(OPT_VSS_PATH);
if (vssPath.IsEmpty())
{
CRegKeyEx reg;
@@ -32,7 +32,7 @@
reg.ReadChars(_T("SCCServerPath"), temp, _MAX_PATH, _T(""));
CString spath = GetPathOnly(temp);
vssPath = spath + _T("\\Ss.exe");
- m_options.SaveOption(OPT_VSS_PATH, vssPath);
+ GetOptionsMgr()->SaveOption(OPT_VSS_PATH, vssPath);
}
}
}
@@ -50,7 +50,7 @@
UINT userChoice = 0;
int nVerSys = 0;
- nVerSys = m_options.GetInt(OPT_VCS_SYSTEM);
+ nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
switch(nVerSys)
{
@@ -92,7 +92,7 @@
}
CString args;
args.Format(_T("checkout \"%s/%s\""), m_vssHelper.GetProjectBase(), sname);
- CString vssPath = m_options.GetString(OPT_VSS_PATH);
+ CString vssPath = GetOptionsMgr()->GetString(OPT_VSS_PATH);
HANDLE hVss = RunIt(vssPath, args, TRUE, FALSE);
if (hVss != INVALID_HANDLE_VALUE)
{
@@ -333,7 +333,7 @@
// checkout operation
m_strCCComment.Replace(_T("\""), _T("\\\""));
args.Format(_T("checkout -c \"%s\" \"%s\""), m_strCCComment, sname);
- CString vssPath = m_options.GetString(OPT_VSS_PATH);
+ CString vssPath = GetOptionsMgr()->GetString(OPT_VSS_PATH);
HANDLE hVss = RunIt(vssPath, args, TRUE, FALSE);
if (hVss!=INVALID_HANDLE_VALUE)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-04 21:03:33
|
Revision: 4007
http://svn.sourceforge.net/winmerge/?rev=4007&view=rev
Author: kimmov
Date: 2007-01-04 13:03:30 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
Use Empty() method for CString instead of assigning empty string into it
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/varprop.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-04 20:39:08 UTC (rev 4006)
+++ trunk/Src/Changes.txt 2007-01-04 21:03:30 UTC (rev 4007)
@@ -7,6 +7,8 @@
Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
Src/Common: OptionsMgr.h
+ Use Empty() method for CString instead of assigning empty string into it
+ Src/Common: varprop.h
2006-12-31 Kimmo
PATCH: [ 1625022 ] Constify OptionsManager parameters
Modified: trunk/Src/Common/varprop.h
===================================================================
--- trunk/Src/Common/varprop.h 2007-01-04 20:39:08 UTC (rev 4006)
+++ trunk/Src/Common/varprop.h 2007-01-04 21:03:30 UTC (rev 4007)
@@ -33,7 +33,7 @@
void SetTime(const COleDateTime & v) { Clear(); vtype = VT_TIME; tvalue = v; }
void Clear() { vtype = VT_NULL; bvalue = false; ivalue = 0; fvalue = 0;
- svalue = _T(""); tvalue.m_status = COleDateTime::null;}
+ svalue.Empty(); tvalue.m_status = COleDateTime::null;}
bool getBool() const { ASSERT(vtype == VT_BOOL); return bvalue; }
int getInt() const { ASSERT(vtype == VT_INT); return ivalue; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-05 18:41:47
|
Revision: 4010
http://svn.sourceforge.net/winmerge/?rev=4010&view=rev
Author: kimmov
Date: 2007-01-05 10:41:41 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-04 21:24:14 UTC (rev 4009)
+++ trunk/Src/Changes.txt 2007-01-05 18:41:41 UTC (rev 4010)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-05 Kimmo
+ PATCH: [ 1628203 ] Reduce options caching in MergeEditView
+ Src: MergeEditView.cpp MergeEditView.h
+
2007-01-04 Kimmo
PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2007-01-04 21:24:14 UTC (rev 4009)
+++ trunk/Src/MergeEditView.cpp 2007-01-05 18:41:41 UTC (rev 4010)
@@ -79,10 +79,7 @@
, fTimerWaitingForIdle(0)
{
SetParser(&m_xParser);
- m_bCloseWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
- m_bSyntaxHighlight = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
- m_bWordDiffHighlight = GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT);
m_cachedColors.clrDiff = GetOptionsMgr()->GetInt(OPT_CLR_DIFF);
m_cachedColors.clrSelDiff = GetOptionsMgr()->GetInt(OPT_CLR_SELECTED_DIFF);
m_cachedColors.clrDiffDeleted = GetOptionsMgr()->GetInt(OPT_CLR_DIFF_DELETED);
@@ -333,7 +330,7 @@
if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED)
return 0;
- if (!m_bWordDiffHighlight)
+ if (!GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT))
return 0;
int nLineLength = GetLineLength(nLineIndex);
@@ -481,7 +478,7 @@
else
{
// Line not inside diff,
- if (!m_bSyntaxHighlight)
+ if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT))
{
// If no syntax hilighting, get windows default colors
crBkgnd = GetSysColor (COLOR_WINDOW);
@@ -1666,7 +1663,8 @@
}
// Close window if user has allowed it from options
- if (pMsg->wParam == VK_ESCAPE && m_bCloseWithEsc)
+ BOOL bCloseWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
+ if (pMsg->wParam == VK_ESCAPE && bCloseWithEsc)
{
GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
return FALSE;
@@ -2264,11 +2262,10 @@
}
/**
- * @brief Reload cached options.
+ * @brief Reload options.
*/
void CMergeEditView::RefreshOptions()
{
- m_bCloseWithEsc = GetOptionsMgr()->GetBool(OPT_CLOSE_WITH_ESC);
m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
if (GetOptionsMgr()->GetInt(OPT_TAB_TYPE) == 0)
@@ -2276,8 +2273,6 @@
else
SetInsertTabs(FALSE);
- m_bSyntaxHighlight = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
- m_bWordDiffHighlight = GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT);
SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
m_cachedColors.clrDiff = GetOptionsMgr()->GetInt(OPT_CLR_DIFF);
@@ -2739,7 +2734,8 @@
*/
void CMergeEditView::OnViewLineDiffs()
{
- GetOptionsMgr()->SaveOption(OPT_WORDDIFF_HIGHLIGHT, !m_bWordDiffHighlight);
+ BOOL bWordDiffHighlight = GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT);
+ GetOptionsMgr()->SaveOption(OPT_WORDDIFF_HIGHLIGHT, !bWordDiffHighlight);
// Call CMergeDoc RefreshOptions() to refresh *both* views
CMergeDoc *pDoc = GetDocument();
@@ -2750,7 +2746,7 @@
void CMergeEditView::OnUpdateViewLineDiffs(CCmdUI* pCmdUI)
{
pCmdUI->Enable(TRUE);
- pCmdUI->SetCheck(m_bWordDiffHighlight);
+ pCmdUI->SetCheck(GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT));
}
/**
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2007-01-04 21:24:14 UTC (rev 4009)
+++ trunk/Src/MergeEditView.h 2007-01-05 18:41:41 UTC (rev 4010)
@@ -119,9 +119,6 @@
*/
BOOL fTimerWaitingForIdle;
COLORSETTINGS m_cachedColors; /**< Cached color settings */
- BOOL m_bSyntaxHighlight; /**< Cached setting for syntax highlight */
- BOOL m_bWordDiffHighlight; /**< Cached setting for word diff highlight */
- BOOL m_bCloseWithEsc; /**< Cached setting for closing windows with ESC */
/// active prediffer ID : helper to check the radio button
int m_CurrentPredifferID;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-05 18:45:26
|
Revision: 4011
http://svn.sourceforge.net/winmerge/?rev=4011&view=rev
Author: kimmov
Date: 2007-01-05 10:45:20 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
PATCH: [ 1628299 ] Use OptionsMgr for archive options
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2007-01-05 18:41:41 UTC (rev 4010)
+++ trunk/Src/7zCommon.cpp 2007-01-05 18:45:20 UTC (rev 4011)
@@ -85,13 +85,15 @@
2005/08/20 Jochen Tucht Option to guess archive format by signature
Map extensions through ExternalArchiveFormat.ini
2005/08/23 Jochen Tucht Option to entirely disable 7-Zip integration
+2007/01/04 Kimmo Varis Convert using COptionsMgr for options.
*/
// RCS ID line follows -- this is updated by CVS
// $Id$
#include "stdafx.h"
-#include "Merge.h" // DirDocFilter theApp
+#include "OptionsDef.h"
+#include "Merge.h" // DirDocFilter theApp GetOptionsMgr()
#include "resource.h"
#include "DirDoc.h"
#include "MainFrm.h"
@@ -115,7 +117,7 @@
*/
Merge7z::Format *ArchiveGuessFormat(LPCTSTR path)
{
- if (theApp.GetProfileInt(_T("Merge7z"), _T("Enable"), 1) == 0)
+ if (GetOptionsMgr()->GetInt(OPT_ARCHIVE_ENABLE) == 0)
return NULL;
if (PathIsDirectory(path))
return NULL;
@@ -386,7 +388,7 @@
else
{
GetDlgItemText(hWnd, 107, cText.Data, cText.Size);
- switch (theApp.GetProfileInt(_T("Merge7z"), _T("Enable"), 1))
+ switch (GetOptionsMgr()->GetInt(OPT_ARCHIVE_ENABLE))
{
case 0:
lstrcat(cText.Data, CString(MAKEINTRESOURCE(IDS_MERGE7Z_ENABLE_0)));
@@ -688,7 +690,7 @@
char name[MAX_PATH];
DWORD flags = ~0;
CException *pCause = NULL;
- switch (theApp.GetProfileInt(_T("Merge7z"), _T("Enable"), 1))
+ switch (GetOptionsMgr()->GetInt(OPT_ARCHIVE_ENABLE))
{
case 1: //Use installed 7-Zip if present. Otherwise, use local 7-Zip.
if (DWORD ver = VersionOf7z(FALSE))
@@ -741,7 +743,7 @@
flags |= wLangID << 16;
}
}
- if (theApp.GetProfileInt(_T("Merge7z"), _T("ProbeSignature"), 0))
+ if (GetOptionsMgr()->GetBool(OPT_ARCHIVE_PROBETYPE))
{
flags |= Initialize::GuessFormatBySignature | Initialize::GuessFormatByExtension;
}
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-05 18:41:41 UTC (rev 4010)
+++ trunk/Src/Changes.txt 2007-01-05 18:45:20 UTC (rev 4011)
@@ -5,6 +5,8 @@
2007-01-05 Kimmo
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
Src: MergeEditView.cpp MergeEditView.h
+ PATCH: [ 1628299 ] Use OptionsMgr for archive options
+ Src: 7zCommon.cpp
2007-01-04 Kimmo
PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-05 21:09:39
|
Revision: 4012
http://svn.sourceforge.net/winmerge/?rev=4012&view=rev
Author: kimmov
Date: 2007-01-05 13:09:36 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
PATCH: [ 1628263 ] Add debug-menuitem for resetting options
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Changes.txt 2007-01-05 21:09:36 UTC (rev 4012)
@@ -7,6 +7,9 @@
Src: MergeEditView.cpp MergeEditView.h
PATCH: [ 1628299 ] Use OptionsMgr for archive options
Src: 7zCommon.cpp
+ PATCH: [ 1628263 ] Add debug-menuitem for resetting options
+ Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
2007-01-04 Kimmo
PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Ja&nela"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Ja&nela"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Ja&nela"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "A altera\xE7\xE3o da fonte n\xE3o ser\xE1 aplicada a nenhuma das janelas que j\xE1 estejam abertas."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xC7\xE0\xF0\xE5\xE4\xE8 \xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&\xCF\xF0\xEE\xE7\xEE\xF0\xF6\xE8"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xC7\xE0\xF0\xE5\xE4\xE8 \xEA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&\xCF\xF0\xEE\xE7\xEE\xF0\xF6\xE8"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xC7\xE0\xF0\xE5\xE4\xE8 \xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&\xCF\xF0\xEE\xE7\xEE\xF0\xF6\xE8"
BEGIN
@@ -1598,7 +1601,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"
@@ -1613,7 +1616,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-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MergeBulgarian.lang\0"
VALUE "PrivateBuild", "\0"
@@ -1984,6 +1987,8 @@
IDS_FONT_CHANGE "\xC8\xE7\xE1\xF0\xE0\xED\xE8\xFF \xF8\xF0\xE8\xF4\xF2 \xED\xFF\xEC\xE0 \xE4\xE0 \xEE\xEA\xE0\xE7\xE2\xE0 \xE2\xEB\xE8\xFF\xED\xE8\xE5 \xED\xE0 \xED\xE8\xEA\xEE\xE8 \xEE\xF2 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -1597,7 +1600,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", ""
@@ -1612,7 +1615,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-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MergeCatalan.lang\0"
VALUE "PrivateBuild", "\0"
@@ -1983,6 +1986,8 @@
IDS_FONT_CHANGE "El canvi triat de tipus de lletra no ser\xE0 aplicat a totes les finestres de difer\xE8ncies visibles actualment."
IDS_OPTIONS_INVALID_TABSIZE
"El valor del camp de la mida de les tabulacions no \xE9s dins el rang que accepta el WinMerge.\n\nUseu valors entre 1 i %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -180,6 +180,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\xB4\xB0\xBF\xDA(&W)"
BEGIN
@@ -287,6 +288,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\xB4\xB0\xBF\xDA(&W)"
BEGIN
@@ -449,6 +451,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\xB4\xB0\xBF\xDA(&W)"
BEGIN
@@ -1966,6 +1969,8 @@
IDS_FONT_CHANGE "ѡ\xD4\xF1\xB5\xC4\xD7\xD6\xCC\xE5\xB8\xFC\xB8IJ\xBB\xBB\xE1Ӧ\xD3õ\xBD\xD2Ѿ\xAD\xB4ĶԱȴ\xB0\xBFڡ\xA3"
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\xB5\xF8\xB5\xA1(&W)"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\xB5\xF8\xB5\xA1(&W)"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\xB5\xF8\xB5\xA1(&W)"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "\xBF\xEF\xA8\xFA\xAA\xBA\xA6r\xAB\xAC\xC5ܧ|\xAEM\xA5Ψ\xEC\xA5\xF4\xA6\xF3\xA5ثe\xC5\xE3\xB2{\xA4\xA3\xA6P\xAA\xBA\xB5\xF8\xB5\xA1\xA1C"
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Zm\xECna zvolen\xE9ho p\xEDsma nebude pou\x9Eita v \x9E\xE1dn\xE9m aktu\xE1ln\xEC viditeln\xE9m okn\xEC porovn\xE1n\xED."
IDS_OPTIONS_INVALID_TABSIZE
"Hodnota v poli Tabel\xE1tor je mimo povolen\xFD rozsah.\n\nPou\x9Eijte pros\xEDm hodnoty mezi 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Vind&ue"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Vind&ue"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Vind&ue"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Den valgte \xE6ndring af skrifttype vil ikke kunne ses i allerede \xE5bne vinduer."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Venster"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Venster"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Vensters"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "De geselecteerde wijziging van het lettertype wordt niet verwerkt in de openstaande vensters."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -176,6 +176,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -283,6 +284,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -445,6 +447,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -1594,7 +1597,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"
@@ -1958,6 +1961,8 @@
IDS_FONT_CHANGE "Le changement de police sera en vigueur lors de la prochaine comparaison de fichier."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Fenster"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Fenster"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Fenster"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Die \xC4nderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden."
IDS_OPTIONS_INVALID_TABSIZE
"Der Wert im Feld der Tabulator-Gr\xF6\xDFe ist nicht im Bereich den WinMerge akzeptiert.\n\nBitte benutzen Sie Werte von 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Ablak"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Ablak"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Ablak"
BEGIN
@@ -1963,6 +1966,8 @@
IDS_FONT_CHANGE "A be\xE1ll\xEDtott \xFAj bet\xFBt\xEDpus nem lesz \xE9rv\xE9nyes minden egyes ablak felirataira."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carica configurazione...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carica configurazione...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Carica configurazione...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fi&nestra"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Il carattere selezionato non sar\xE0 utilizzato nelle finestre di visualizzazione delle differenze attualmente attive."
IDS_OPTIONS_INVALID_TABSIZE
"Il valore delle tabulazione inserito non \xE8 una dimensione valida per WinMerge.\n\nUtilizza per favore un valore compreso tra 1 e %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "\x83f\x83o\x83b\x83O(&D)" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "\x90ݒ\xE8\x8F\xEE\x95\xF1\x83t\x83@\x83C\x83\x8B\x82̓Ǎ\x9E\x82\xDD(&L)..", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\x83E\x83B\x83\x93\x83h\x83E(&W)"
BEGIN
@@ -285,6 +286,7 @@
POPUP "\x83f\x83o\x83b\x83O(&D)" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "\x90ݒ\xE8\x8F\xEE\x95\xF1\x83t\x83@\x83C\x83\x8B\x82̓Ǎ\x9E\x82\xDD(&L)..", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\x83E\x83B\x83\x93\x83h\x83E(&W)"
BEGIN
@@ -447,6 +449,7 @@
POPUP "\x83f\x83o\x83b\x83O(&D)" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "\x90ݒ\xE8\x8F\xEE\x95\xF1\x83t\x83@\x83C\x83\x8B\x82̓Ǎ\x9E\x82\xDD(&L)..", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "\x83E\x83B\x83\x93\x83h\x83E(&W)"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "\x91I\x91\xF0\x82\xB3\x82ꂽ\x83t\x83H\x83\x93\x83g\x82͌\xBB\x8Dݕ\\x8E\xA6\x82\xB3\x82\xEA\x82Ă\xA2\x82鍷\x88كE\x83C\x83\x93\x83h\x83E\x82ɂ͓K\x97p\x82\xB3\x82\xEA\x82܂\xB9\x82\xF1\x81B"
IDS_OPTIONS_INVALID_TABSIZE
"\x83^\x83u\x83T\x83C\x83Y\x82\xAA\x94͈͊O\x82ł\xB7\x81B\n\n1\x82\xA9\x82\xE7%1\x82܂ł̒l\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "â(&W)"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "â(&W)"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "â(&W)"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "\xB9ٲ\xEF \xC6\xF9Ʈ\xB4\xC2 \xC7\xF6\xC0\xE7 \xBA\xF1\xB1\xB3â\xBF\xA1\xB4\xC2 \xC0\xFB\xBF\xEB\xB5\xC7\xC1\xF6 \xBEʽ\xC0\xB4ϴ\xD9."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Vindu"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Vindu"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Vindu"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Den valgte endring av skrifttype vil ikke kunne ses i allerede \xE5pne vinduer."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Wybrana czcionka nie zostanie zastosowana do widocznych okien z r\xF3\xBFnicami."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&\xCE\xEA\xED\xEE"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&\xCE\xEA\xED\xEE"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&\xCE\xEA\xED\xEE"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "\xC8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xE4\xEB\xFF \xE2\xFB\xE1\xF0\xE0\xED\xED\xEE\xE3\xEE \xF8\xF0\xE8\xF4\xF2\xE0 \xED\xE5 \xE1\xF3\xE4\xF3\xF2 \xEF\xF0\xE8\xEC\xE5\xED\xE5\xED\xFB \xE4\xEB\xFF \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xF5 \xEE\xEA\xEE\xED \xEE\xF2\xEB\xE8\xF7\xE8\xE9."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Nahra\x9D konfigur\xE1ciu...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Ladi\x9D" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Na\xE8\xEDta\x9D konfigur\xE1ciu...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&na\xE8\xEDta\x9D konfigur\xE1ciu...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "Zvolen\xE1 zmena p\xEDsma sa neprejav\xED v pr\xE1ve zobrazen\xFDch paneloch."
IDS_OPTIONS_INVALID_TABSIZE
"Hodnota v poli Tab size nie je v rozsahu, ktor\xFD WinMerge akceptuje.\n\nPou\x9Eite hodnoty 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Ve&ntana"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Ve&ntana"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Ve&ntana"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de diferencias abiertas actualmente."
IDS_OPTIONS_INVALID_TABSIZE
"Valor en Tama\xF1o de Tab - el valor no esta en el rango aceptado por WinMerge.\n\nPor favor, urilice valores 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Fels\xF6kning" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xD6ppna Konfiguration...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "F&\xF6nster"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Fels\xF6kning" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xD6ppna Konfiguration...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "F&\xF6nster"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Fels\xF6kning" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&\xD6ppna Konfiguration...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "F&\xF6nster"
BEGIN
@@ -1596,7 +1599,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"
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "\xC4ndringen av teckensnitt kommer inte att synas i redan \xF6ppna f\xF6nster."
IDS_OPTIONS_INVALID_TABSIZE
"V\xE4rdet i Tabbstorleks-f\xE4ltet \xE4r inte inom vad WinMerge accepterar.\n\nVar god och anv\xE4nd v\xE4rden fr\xE5n 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -178,6 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Pencereler"
BEGIN
@@ -285,6 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Pencereler"
BEGIN
@@ -447,6 +449,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Pencereler"
BEGIN
@@ -1965,6 +1968,8 @@
IDS_FONT_CHANGE "The selected font change will not be applied to any currently visible difference windows."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/MainFrm.cpp 2007-01-05 21:09:36 UTC (rev 4012)
@@ -156,6 +156,7 @@
ON_COMMAND(ID_FILE_SAVEPROJECT, OnSaveProject)
ON_WM_TIMER()
ON_WM_ACTIVATE()
+ ON_COMMAND(ID_DEBUG_RESETOPTIONS, OnDebugResetOptions)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -3156,3 +3157,17 @@
LoadHiColImageList(nIDResource, ImageWidth, ImageHeight, ImageHeight, ImgList);
}
+
+/**
+ * @brief Reset all WinMerge options to default values.
+ */
+void CMainFrame::OnDebugResetOptions()
+{
+ CString msg(LoadResString(IDS_RESET_OPTIONS_WARNING));
+ int res = AfxMessageBox(msg, MB_YESNO | MB_DEFBUTTON2 | MB_ICONWARNING);
+ if (res == IDYES)
+ {
+ CMergeApp *app = dynamic_cast<CMergeApp *>(AfxGetApp());
+ app->ResetOptions();
+ }
+}
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/MainFrm.h 2007-01-05 21:09:36 UTC (rev 4012)
@@ -273,6 +273,7 @@
afx_msg void OnUpdateWindowCloseAll(CCmdUI* pCmdUI);
afx_msg void OnSaveProject();
afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
+ afx_msg void OnDebugResetOptions();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/Merge.rc 2007-01-05 21:09:36 UTC (rev 4012)
@@ -188,6 +188,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Window"
BEGIN
@@ -295,6 +296,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Window"
BEGIN
@@ -457,6 +459,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Window"
BEGIN
@@ -1606,7 +1609,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"
@@ -1975,6 +1978,8 @@
IDS_FONT_CHANGE "The selected font change will not be applied to any currently visible difference windows."
IDS_OPTIONS_INVALID_TABSIZE
"Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
+ "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
// BROWSE FILE
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-01-05 18:45:20 UTC (rev 4011)
+++ trunk/Src/resource.h 2007-01-05 21:09:36 UTC (rev 4012)
@@ -437,6 +437,7 @@
#define IDS_DIFF_OPEN_NO_SET_PROPS 16402
#define IDS_FONT_CHANGE 16403
#define IDS_OPTIONS_INVALID_TABSIZE 16404
+#define IDS_RESET_OPTIONS_WARNING 16405
#define IDS_OPEN_TITLE 16416
#define IDS_PROGRAMFILES 16417
#define IDS_ALLFILES 16418
@@ -1064,6 +1065,7 @@
#define ID_EDIT_GOTO_NEXT_BOOKMARK 33116
#define ID_EDIT_GOTO_PREV_BOOKMARK 33117
#define ID_EDIT_CLEAR_ALL_BOOKMARKS 33118
+#define ID_DEBUG_RESETOPTIONS 33119
// Next default values for new objects
//
@@ -1071,7 +1073,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 232
-#define _APS_NEXT_COMMAND_VALUE 33119
+#define _APS_NEXT_COMMAND_VALUE 33120
#define _APS_NEXT_CONTROL_VALUE 1309
#define _APS_NEXT_SYMED_VALUE 113
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-06 10:12:58
|
Revision: 4013
http://svn.sourceforge.net/winmerge/?rev=4013&view=rev
Author: kimmov
Date: 2007-01-06 02:12:56 -0800 (Sat, 06 Jan 2007)
Log Message:
-----------
TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/LocationView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-05 21:09:36 UTC (rev 4012)
+++ trunk/Src/Changes.txt 2007-01-06 10:12:56 UTC (rev 4013)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-06 Kimmo
+ TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
+ Src: LocationView.cpp
+
2007-01-05 Kimmo
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
Src: MergeEditView.cpp MergeEditView.h
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2007-01-05 21:09:36 UTC (rev 4012)
+++ trunk/Src/LocationView.cpp 2007-01-06 10:12:56 UTC (rev 4013)
@@ -47,21 +47,18 @@
/** @brief Size of empty frame above and below bars (in pixels). */
static const int Y_OFFSET = 5;
-
/** @brief Size of y-margin for visible area indicator (in pixels). */
static const long INDICATOR_MARGIN = 2;
-
/** @brief Max pixels in view per line in file. */
static const double MAX_LINEPIX = 4.0;
-
/** @brief Top of difference marker, relative to difference start. */
static const int DIFFMARKER_TOP = 3;
-
/** @brief Bottom of difference marker, relative to difference start. */
static const int DIFFMARKER_BOTTOM = 3;
-
/** @brief Width of difference marker. */
static const int DIFFMARKER_WIDTH = 6;
+/** @brief Minimum height of the visible area indicator */
+static const int INDICATOR_MIN_HEIGHT = 5;
/**
* @brief Bars in location pane
@@ -689,9 +686,11 @@
if (LineInPix > MAX_LINEPIX)
LineInPix = MAX_LINEPIX;
- int nTopCoord = (int) (Y_OFFSET + ((double)nTopLine * LineInPix));
+ int nTopCoord = static_cast<int>(Y_OFFSET +
+ (static_cast<double>(nTopLine * LineInPix)));
int nLeftCoord = INDICATOR_MARGIN;
- int nBottomCoord = (int) (Y_OFFSET + ((double)nBottomLine * LineInPix));
+ int nBottomCoord = static_cast<int>(Y_OFFSET +
+ (static_cast<double>(nBottomLine * LineInPix)));
int nRightCoord = rc.Width() - INDICATOR_MARGIN;
// Visible area was not changed
@@ -725,6 +724,17 @@
// Make sure bottom coord is in bar range
nBottomCoord = min(nBottomCoord, barBottom);
+ // Ensure visible area is at least minimum height
+ if (nBottomCoord - nTopCoord < INDICATOR_MIN_HEIGHT)
+ {
+ // If area is near top of file, add additional area to bottom
+ // of the bar and vice versa.
+ if (nTopCoord < Y_OFFSET + 20)
+ nBottomCoord += INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord);
+ else
+ nTopCoord -= INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord);
+ }
+
// Store current values for later use (to check if area changes)
m_visibleTop = nTopCoord;
m_visibleBottom = nBottomCoord;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-06 12:17:17
|
Revision: 4014
http://svn.sourceforge.net/winmerge/?rev=4014&view=rev
Author: kimmov
Date: 2007-01-06 04:17:15 -0800 (Sat, 06 Jan 2007)
Log Message:
-----------
TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/Changes.txt
trunk/Src/CompareStats.cpp
trunk/Src/DiffContext.cpp
trunk/Src/DiffFileData.cpp
trunk/Src/DiffItem.cpp
trunk/Src/DiffItem.h
trunk/Src/DirActions.cpp
trunk/Src/DirDoc.cpp
trunk/Src/DirScan.cpp
trunk/Src/DirView.cpp
trunk/Src/DirViewColHandler.cpp
trunk/Src/DirViewColItems.cpp
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/7zCommon.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -829,7 +829,7 @@
if (m_bRight)
{
// Enumerating items on right side
- if (!di.isSideLeft())
+ if (!di.isSideLeftOnly())
{
// Item is present on right side, i.e. folder is implied
m_rgImpliedFoldersRight[di.sRightSubdir] = PVOID(1);
@@ -838,7 +838,7 @@
else
{
// Enumerating items on left side
- if (!di.isSideRight())
+ if (!di.isSideRightOnly())
{
// Item is present on left side, i.e. folder is implied
m_rgImpliedFoldersLeft[di.sLeftSubdir] = PVOID(1);
@@ -911,8 +911,8 @@
return 0;
}
- bool isSideLeft = di.isSideLeft();
- bool isSideRight = di.isSideRight();
+ bool isSideLeft = di.isSideLeftOnly();
+ bool isSideRight = di.isSideRightOnly();
Envelope *envelope = new Envelope;
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/Changes.txt 2007-01-06 12:17:15 UTC (rev 4014)
@@ -5,6 +5,10 @@
2007-01-06 Kimmo
TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
Src: LocationView.cpp
+ TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
+ Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
+ DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
+ DirViewColItems.cpp
2007-01-05 Kimmo
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
Modified: trunk/Src/CompareStats.cpp
===================================================================
--- trunk/Src/CompareStats.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/CompareStats.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -144,7 +144,7 @@
return RESULT_SKIP;
}
}
- else if (di.isSideLeft())
+ else if (di.isSideLeftOnly())
{
// left-only
if (di.isDirectory())
@@ -156,7 +156,7 @@
return RESULT_LUNIQUE;
}
}
- else if (di.isSideRight())
+ else if (di.isSideRightOnly())
{
// right-only
if (di.isDirectory())
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DiffContext.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -126,13 +126,13 @@
if (bLeft)
{
di.left.Clear();
- if (!di.isSideRight())
+ if (!di.isSideRightOnly())
UpdateInfoFromDiskHalf(di, TRUE);
}
if (bRight)
{
di.right.Clear();
- if (!di.isSideLeft())
+ if (!di.isSideLeftOnly())
UpdateInfoFromDiskHalf(di, FALSE);
}
}
@@ -198,7 +198,7 @@
CString spath;
if (bLeft)
{
- if (di.isSideRight())
+ if (di.isSideRightOnly())
return;
LPCTSTR ext = PathFindExtension(di.sLeftFilename);
if (!CheckFileForVersion(ext))
@@ -208,7 +208,7 @@
}
else
{
- if (di.isSideLeft())
+ if (di.isSideLeftOnly())
return;
LPCTSTR ext = PathFindExtension(di.sRightFilename);
if (!CheckFileForVersion(ext))
Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DiffFileData.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -487,7 +487,7 @@
code = diffutils_compare_files(0);
// If unique item, it was being compared to itself to determine encoding
// and the #diffs is invalid
- if (di.isSideRight() || di.isSideLeft())
+ if (di.isSideRightOnly() || di.isSideLeftOnly())
{
m_ndiffs = DiffFileData::DIFFS_UNKNOWN;
m_ntrivialdiffs = DiffFileData::DIFFS_UNKNOWN;
@@ -732,7 +732,7 @@
{
static const TCHAR backslash[] = _T("\\");
- if (!di.isSideRight())
+ if (!di.isSideRightOnly())
{
// Compare file to itself to detect encoding
left = pCtxt->GetNormalizedLeft();
@@ -741,10 +741,10 @@
if (!di.sLeftSubdir.IsEmpty())
left += di.sLeftSubdir + backslash;
left += di.sLeftFilename;
- if (di.isSideLeft())
+ if (di.isSideLeftOnly())
right = left;
}
- if (!di.isSideLeft())
+ if (!di.isSideLeftOnly())
{
// Compare file to itself to detect encoding
right = pCtxt->GetNormalizedRight();
@@ -753,7 +753,7 @@
if (!di.sRightSubdir.IsEmpty())
right += di.sRightSubdir + backslash;
right += di.sRightFilename;
- if (di.isSideRight())
+ if (di.isSideRightOnly())
left = right;
}
}
Modified: trunk/Src/DiffItem.cpp
===================================================================
--- trunk/Src/DiffItem.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DiffItem.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -28,7 +28,7 @@
CString DIFFITEM::getLeftFilepath(const CString &sLeftRoot) const
{
CString sPath;
- if (!isSideRight())
+ if (!isSideRightOnly())
{
sPath = paths_ConcatPath(sLeftRoot, sLeftSubdir);
}
@@ -39,7 +39,7 @@
CString DIFFITEM::getRightFilepath(const CString &sRightRoot) const
{
CString sPath;
- if (!isSideLeft())
+ if (!isSideLeftOnly())
{
sPath = paths_ConcatPath(sRightRoot, sRightSubdir);
}
Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DiffItem.h 2007-01-06 12:17:15 UTC (rev 4014)
@@ -79,11 +79,11 @@
// file/directory
bool isDirectory() const { return Check(diffcode, DIFFCODE::DIRFLAGS, DIFFCODE::DIR); }
// left/right
- bool isSideLeft() const { return CheckSide(diffcode, DIFFCODE::LEFT); }
- bool isSideLeftOrBoth() const { return isSideLeft() || isSideBoth(); }
+ bool isSideLeftOnly() const { return CheckSide(diffcode, DIFFCODE::LEFT); }
+ bool isSideLeftOrBoth() const { return isSideLeftOnly() || isSideBoth(); }
void setSideLeft() { SetSide(DIFFCODE::LEFT); }
- bool isSideRight() const { return CheckSide(diffcode, DIFFCODE::RIGHT); }
- bool isSideRightOrBoth() const { return isSideRight() || isSideBoth(); }
+ bool isSideRightOnly() const { return CheckSide(diffcode, DIFFCODE::RIGHT); }
+ bool isSideRightOrBoth() const { return isSideRightOnly() || isSideBoth(); }
void setSideRight() { SetSide(DIFFCODE::RIGHT); }
bool isSideBoth() const { return CheckSide(diffcode, DIFFCODE::BOTH); }
void setSideBoth() { SetSide(DIFFCODE::BOTH); }
@@ -91,7 +91,7 @@
// compare result
bool isResultSame() const { return CheckCompare(diffcode, DIFFCODE::SAME); }
bool isResultDiff() const { return (!isResultSame() && !isResultFiltered() && !isResultError() &&
- !isSideLeft() && !isSideRight()); }
+ !isSideLeftOnly() && !isSideRightOnly()); }
static bool isResultError(int code) { return CheckCompare(code, DIFFCODE::CMPERR); }
bool isResultError() const { return isResultError(diffcode); }
static bool isResultAbort(int code) { return CheckCompare(code, DIFFCODE::CMPABORT); }
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DirActions.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -636,7 +636,7 @@
break;
case FileActionItem::UI_DEL_LEFT:
- if (di.isSideLeft())
+ if (di.isSideLeftOnly())
{
m_pList->DeleteItem(act.context);
bItemsRemoved = TRUE;
@@ -648,7 +648,7 @@
break;
case FileActionItem::UI_DEL_RIGHT:
- if (di.isSideRight())
+ if (di.isSideRightOnly())
{
m_pList->DeleteItem(act.context);
bItemsRemoved = TRUE;
@@ -707,7 +707,7 @@
// can't copy same items
if (di.isResultSame()) return FALSE;
// impossible if only on left
- if (di.isSideLeft()) return FALSE;
+ if (di.isSideLeftOnly()) return FALSE;
// everything else can be copied to left
return TRUE;
@@ -720,7 +720,7 @@
// can't copy same items
if (di.isResultSame()) return FALSE;
// impossible if only on right
- if (di.isSideRight()) return FALSE;
+ if (di.isSideRightOnly()) return FALSE;
// everything else can be copied to right
return TRUE;
@@ -731,7 +731,7 @@
// don't let them mess with error items
if (di.isResultError()) return FALSE;
// impossible if only on right
- if (di.isSideRight()) return FALSE;
+ if (di.isSideRightOnly()) return FALSE;
// everything else can be deleted on left
return TRUE;
}
@@ -741,7 +741,7 @@
// don't let them mess with error items
if (di.isResultError()) return FALSE;
// impossible if only on right
- if (di.isSideLeft()) return FALSE;
+ if (di.isSideLeftOnly()) return FALSE;
// everything else can be deleted on right
return TRUE;
@@ -752,7 +752,7 @@
// don't let them mess with error items
if (di.isResultError()) return FALSE;
// impossible if only on right or left
- if (di.isSideLeft() || di.isSideRight()) return FALSE;
+ if (di.isSideLeftOnly() || di.isSideRightOnly()) return FALSE;
// everything else can be deleted on both
return TRUE;
@@ -762,7 +762,7 @@
BOOL CDirView::IsItemOpenable(const DIFFITEM & di) const
{
// impossible if unique or binary
- if (di.isSideRight() || di.isSideLeft() || di.isBin()) return FALSE;
+ if (di.isSideRightOnly() || di.isSideLeftOnly() || di.isBin()) return FALSE;
// everything else can be opened
return TRUE;
@@ -796,11 +796,11 @@
if (di1.isDirectory() != di2.isDirectory()) return FALSE;
// Must be on different sides, or one on one side & one on both
- if (di1.isSideLeft() && (di2.isSideRight() || di2.isSideBoth()))
+ if (di1.isSideLeftOnly() && (di2.isSideRightOnly() || di2.isSideBoth()))
return TRUE;
- if (di1.isSideRight() && (di2.isSideLeft() || di2.isSideBoth()))
+ if (di1.isSideRightOnly() && (di2.isSideLeftOnly() || di2.isSideBoth()))
return TRUE;
- if (di1.isSideBoth() && (di2.isSideLeft() || di2.isSideRight()))
+ if (di1.isSideBoth() && (di2.isSideLeftOnly() || di2.isSideRightOnly()))
return TRUE;
// Allow to compare items if left & right path refer to same directory
@@ -815,7 +815,7 @@
BOOL CDirView::IsItemOpenableOnLeft(const DIFFITEM & di) const
{
// impossible if only on right
- if (di.isSideRight()) return FALSE;
+ if (di.isSideRightOnly()) return FALSE;
// everything else can be opened on right
return TRUE;
@@ -824,7 +824,7 @@
BOOL CDirView::IsItemOpenableOnRight(const DIFFITEM & di) const
{
// impossible if only on left
- if (di.isSideLeft()) return FALSE;
+ if (di.isSideLeftOnly()) return FALSE;
// everything else can be opened on left
return TRUE;
@@ -843,7 +843,7 @@
BOOL CDirView::IsItemCopyableToOnLeft(const DIFFITEM & di) const
{
// impossible if only on right
- if (di.isSideRight()) return FALSE;
+ if (di.isSideRightOnly()) return FALSE;
// everything else can be copied to from left
return TRUE;
@@ -852,7 +852,7 @@
BOOL CDirView::IsItemCopyableToOnRight(const DIFFITEM & di) const
{
// impossible if only on left
- if (di.isSideLeft()) return FALSE;
+ if (di.isSideLeftOnly()) return FALSE;
// everything else can be copied to from right
return TRUE;
@@ -969,7 +969,7 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
- if (!di.isDirectory() && !di.isSideLeft() && !di.isSideRight())
+ if (!di.isDirectory() && !di.isSideLeftOnly() && !di.isSideRightOnly())
{
GetItemFileNames(sel, slFile, srFile);
CString filteredFilenames = slFile + (CString)_T("|") + srFile;
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DirDoc.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -357,9 +357,9 @@
return 0;
// left/right filters
- if (di.isSideLeft() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
+ if (di.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
return 0;
- if (di.isSideRight() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
+ if (di.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
return 0;
}
else
@@ -377,9 +377,9 @@
return 0;
// left/right filters
- if (di.isSideLeft() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
+ if (di.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
return 0;
- if (di.isSideRight() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
+ if (di.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
return 0;
}
return 1;
@@ -936,7 +936,7 @@
break;
case FileActionItem::UI_DEL_LEFT:
- if (di.isSideLeft())
+ if (di.isSideLeftOnly())
{
RemoveDiffByKey(pos);
}
@@ -948,7 +948,7 @@
break;
case FileActionItem::UI_DEL_RIGHT:
- if (di.isSideRight())
+ if (di.isSideRightOnly())
{
RemoveDiffByKey(pos);
}
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DirScan.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -385,7 +385,7 @@
di.diffcode |= DIFFCODE::INCLUDED;
// 2. Add unique files
// We must compare unique files to itself to detect encoding
- if (di.isSideLeft() || di.isSideRight())
+ if (di.isSideLeftOnly() || di.isSideRightOnly())
{
if (pCtxt->m_nCompMethod != CMP_DATE &&
pCtxt->m_nCompMethod != CMP_DATE_SIZE &&
@@ -620,12 +620,12 @@
di.nsdiffs = pDiffFileData->m_ndiffs;
di.nidiffs = pDiffFileData->m_ntrivialdiffs;
- if (!di.isSideLeft())
+ if (!di.isSideLeftOnly())
{
di.right.encoding = pDiffFileData->m_FileLocation[1].encoding;
}
- if (!di.isSideRight())
+ if (!di.isSideRightOnly())
{
di.left.encoding = pDiffFileData->m_FileLocation[0].encoding;
}
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DirView.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -307,9 +307,9 @@
if (di.isResultAbort()) return DIFFIMG_ABORT;
if (di.isResultFiltered())
return (di.isDirectory() ? DIFFIMG_DIRSKIP : DIFFIMG_SKIP);
- if (di.isSideLeft())
+ if (di.isSideLeftOnly())
return (di.isDirectory() ? DIFFIMG_LDIRUNIQUE : DIFFIMG_LUNIQUE);
- if (di.isSideRight())
+ if (di.isSideRightOnly())
return (di.isDirectory() ? DIFFIMG_RDIRUNIQUE : DIFFIMG_RUNIQUE);
if (di.isResultSame())
return (di.isBin() ? DIFFIMG_BINSAME : DIFFIMG_SAME);
@@ -582,7 +582,8 @@
++nTotal;
// note the prediffer flag for 'files present on both sides and not skipped'
- if (!di.isDirectory() && !di.isBin() && !di.isSideLeft() && !di.isSideRight() && !di.isResultFiltered())
+ if (!di.isDirectory() && !di.isBin() && !di.isSideLeftOnly() &&
+ !di.isSideRightOnly() && !di.isResultFiltered())
{
CString leftPath = di.getLeftFilepath(pDoc->GetLeftBasePath()) +
_T("\\") + di.sLeftFilename;
@@ -977,7 +978,7 @@
return;
}
// Ensure that di1 is on left (swap if needed)
- if (di1->isSideRight() || (di1->isSideBoth() && di2->isSideLeft()))
+ if (di1->isSideRightOnly() || (di1->isSideBoth() && di2->isSideLeftOnly()))
{
DIFFITEM * temp = di1;
di1 = di2;
@@ -1013,7 +1014,7 @@
if (di1->isDirectory())
isdir = true;
- if (di1->isDirectory() && (di1->isSideLeft() == di1->isSideRight()))
+ if (di1->isDirectory() && (di1->isSideLeftOnly() == di1->isSideRightOnly()))
{
if (pDoc->GetRecursive())
{
@@ -1032,7 +1033,7 @@
// Fall through and compare directories
}
}
- else if (di1->isSideLeft())
+ else if (di1->isSideLeftOnly())
{
// Open left-only item to editor if its not a folder or binary
if (isdir)
@@ -1043,7 +1044,7 @@
DoOpenWithEditor(SIDE_LEFT);
return;
}
- else if (di1->isSideRight())
+ else if (di1->isSideRightOnly())
{
// Open right-only item to editor if its not a folder or binary
if (isdir)
@@ -1941,7 +1942,7 @@
if (di.isResultFiltered() || di.isResultError())
return false;
// Skip identical directories
- if (di.isDirectory() && !di.isSideLeft() && !di.isSideRight())
+ if (di.isDirectory() && !di.isSideLeftOnly() && !di.isSideRightOnly())
return false;
if (di.isResultSame())
return false;
@@ -2590,7 +2591,7 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
- if (!di.isSideRight())
+ if (!di.isSideRightOnly())
{
strPaths += di.getLeftFilepath(GetDocument()->GetLeftBasePath());
strPaths += _T("\\");
@@ -2615,7 +2616,7 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
- if (!di.isSideLeft())
+ if (!di.isSideLeftOnly())
{
strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
strPaths += _T("\\");
@@ -2640,7 +2641,7 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
- if (!di.isSideRight())
+ if (!di.isSideRightOnly())
{
strPaths += di.getLeftFilepath(pDoc->GetLeftBasePath());
strPaths += _T("\\");
@@ -2650,7 +2651,7 @@
strPaths += _T("\r\n");
}
- if (!di.isSideLeft())
+ if (!di.isSideLeftOnly())
{
strPaths += di. getRightFilepath(pDoc->GetRightBasePath());
strPaths += _T("\\");
Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DirViewColHandler.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -225,7 +225,7 @@
}
// Don't show result for folderitems appearing both sides
if ((IsColStatus(i) || IsColStatusAbbr(i)) &&
- di.isDirectory() && !di.isSideLeft() && !di.isSideRight())
+ di.isDirectory() && !di.isSideLeftOnly() && !di.isSideRightOnly())
{
s.Empty();
}
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2007-01-06 10:12:56 UTC (rev 4013)
+++ trunk/Src/DirViewColItems.cpp 2007-01-06 12:17:15 UTC (rev 4014)
@@ -239,11 +239,11 @@
else
VERIFY(s.LoadString(IDS_FILE_SKIPPED));
}
- else if (di.isSideLeft())
+ else if (di.isSideLeftOnly())
{
AfxFormatString1(s, IDS_ONLY_IN_FMT, di.getLeftFilepath(pCtxt->GetNormalizedLeft()));
}
- else if (di.isSideRight())
+ else if (di.isSideRightOnly())
{
AfxFormatString1(s, IDS_ONLY_IN_FMT, di.getRightFilepath(pCtxt->GetNormalizedRight()));
}
@@ -314,11 +314,11 @@
static CString ColNewerGet(const CDiffContext *, const void *p)
{
const DIFFITEM &di = *static_cast<const DIFFITEM *>(p);
- if (di.isSideLeft())
+ if (di.isSideLeftOnly())
{
return _T("<*<");
}
- if (di.isSideRight())
+ if (di.isSideRightOnly())
{
return _T(">*>");
}
@@ -379,11 +379,11 @@
else
id = IDS_FILE_SKIPPED;
}
- else if (di.isSideLeft())
+ else if (di.isSideLeftOnly())
{
id = IDS_LEFTONLY;
}
- else if (di.isSideRight())
+ else if (di.isSideRightOnly())
{
id = IDS_RIGHTONLY;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-06 17:03:04
|
Revision: 4015
http://svn.sourceforge.net/winmerge/?rev=4015&view=rev
Author: kimmov
Date: 2007-01-06 09:02:54 -0800 (Sat, 06 Jan 2007)
Log Message:
-----------
PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirViewColItems.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Changes.txt 2007-01-06 17:02:54 UTC (rev 4015)
@@ -9,6 +9,9 @@
Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
DirViewColItems.cpp
+ PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
+ Src: DirViewColItems.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
2007-01-05 Kimmo
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/DirViewColItems.cpp 2007-01-06 17:02:54 UTC (rev 4015)
@@ -241,11 +241,11 @@
}
else if (di.isSideLeftOnly())
{
- AfxFormatString1(s, IDS_ONLY_IN_FMT, di.getLeftFilepath(pCtxt->GetNormalizedLeft()));
+ AfxFormatString1(s, IDS_LEFT_ONLY_IN_FMT, di.getLeftFilepath(pCtxt->GetNormalizedLeft()));
}
else if (di.isSideRightOnly())
{
- AfxFormatString1(s, IDS_ONLY_IN_FMT, di.getRightFilepath(pCtxt->GetNormalizedRight()));
+ AfxFormatString1(s, IDS_RIGHT_ONLY_IN_FMT, di.getRightFilepath(pCtxt->GetNormalizedRight()));
}
else if (di.isResultSame())
{
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "File skipped"
IDS_DIR_SKIPPED "Folder skipped"
- IDS_ONLY_IN_FMT "Somente em %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Os arquivos bin\xE1rios s\xE3o id\xEAnticos"
IDS_IDENTICAL "Id\xEAnticos"
IDS_BIN_FILES_DIFF "Os arquivos (bin\xE1rios) s\xE3o diferentes"
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2303,7 +2303,8 @@
IDS_ABORTED_ITEM "\xCF\xF0\xE5\xEA\xFA\xF1\xED\xE0\xF2 \xF4\xE0\xE9\xEB"
IDS_FILE_SKIPPED "\xCF\xF0\xEE\xEF\xF3\xF1\xED\xE0\xF2 \xF4\xE0\xE9\xEB"
IDS_DIR_SKIPPED "\xCF\xF0\xEE\xEF\xF3\xF1\xED\xE0\xF2\xE0 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF"
- IDS_ONLY_IN_FMT "\xF1\xE0\xEC\xEE \xE2 %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "\xC1\xE8\xED\xE0\xF0\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8"
IDS_IDENTICAL "\xC5\xE4\xED\xE0\xEA\xE2\xE8"
IDS_BIN_FILES_DIFF "\xC1\xE8\xED\xE0\xF0\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2302,7 +2302,8 @@
IDS_ABORTED_ITEM "Element avortat"
IDS_FILE_SKIPPED "Fitxer om\xE8s"
IDS_DIR_SKIPPED "Directori om\xE8s"
- IDS_ONLY_IN_FMT "Nom\xE9s a %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Els fitxers binaris s\xF3n id\xE8ntics"
IDS_IDENTICAL "Id\xE8ntics"
IDS_BIN_FILES_DIFF "Els fitxers binaris s\xF3n diferents"
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2285,7 +2285,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "\xCEļ\xFE\xD2\xD1\xCC\xF8\xB9\xFD"
IDS_DIR_SKIPPED "\xCEļ\xFE\xBC\xD0\xD2\xD1\xCC\xF8\xB9\xFD"
- IDS_ONLY_IN_FMT "ֻ\xD4\xDA %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "\xB6\xFE\xBD\xF8\xD6\xC6\xCEļ\xFE\xCD\xEAȫ\xCF\xE0ͬ"
IDS_IDENTICAL "\xCD\xEAȫ\xCF\xE0ͬ"
IDS_BIN_FILES_DIFF "\xB6\xFE\xBD\xF8\xD6\xC6\xCEļ\xFE\xB2\xBBͬ"
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "\xC0ɮפw\xB2\xA4\xB9L"
IDS_DIR_SKIPPED "\xB8\xEA\xAEƧ\xA8\xA4w\xB2\xA4\xB9L"
- IDS_ONLY_IN_FMT "\xA5u\xA6b %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "\xA4G\xB6i\xA8\xEE\xC0ɮק\xB9\xA5\xFE\xACۦP"
IDS_IDENTICAL "\xA7\xB9\xA5\xFE\xACۦP"
IDS_BIN_FILES_DIFF "\xA4G\xB6i\xA8\xEE\xC0ɮפ\xA3\xA6P"
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "P\xF8eru\x9Aeno"
IDS_FILE_SKIPPED "Soubor p\xF8esko\xE8en"
IDS_DIR_SKIPPED "Slo\x9Eka p\xF8esko\xE8ena"
- IDS_ONLY_IN_FMT "Pouze v %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Bin\xE1rn\xED soubory jsou shodn\xE9"
IDS_IDENTICAL "Shodn\xE9"
IDS_BIN_FILES_DIFF "Bin\xE1rn\xED soubory jsou rozd\xEDln\xE9"
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "Fil sprunget over"
IDS_DIR_SKIPPED "Mappe sprunget over"
- IDS_ONLY_IN_FMT "Kun i %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Bin\xE6re filer er identiske"
IDS_IDENTICAL "Identiske"
IDS_BIN_FILES_DIFF "Bin\xE6re filer er forskellige"
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "Bestand overgeslagen"
IDS_DIR_SKIPPED "Map overgeslagen"
- IDS_ONLY_IN_FMT "Alleen in %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Binaire bestanden zijn identiek"
IDS_IDENTICAL "Identiek"
IDS_BIN_FILES_DIFF "Binaire bestanden zijn niet gelijk"
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2277,7 +2277,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "Fichier ignor\xE9"
IDS_DIR_SKIPPED "R\xE9pertoire ignor\xE9"
- IDS_ONLY_IN_FMT "Uniquement dans %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Les fichiers binaires sont identiques"
IDS_IDENTICAL "Identiques"
IDS_BIN_FILES_DIFF "Les fichiers binaires sont diff\xE9rents"
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Objekt abgebrochen"
IDS_FILE_SKIPPED "Datei \xFCbersprungen"
IDS_DIR_SKIPPED "Ordner \xFCbersprungen"
- IDS_ONLY_IN_FMT "Nur in %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Bin\xE4rdateien sind identisch"
IDS_IDENTICAL "Identisch"
IDS_BIN_FILES_DIFF "Bin\xE4rdateien sind unterschiedlich"
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2282,7 +2282,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "A f\xE1jl kihagyva"
IDS_DIR_SKIPPED "A k\xF6nyvt\xE1r kihagyva"
- IDS_ONLY_IN_FMT "Csak itt: %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "A bin\xE1ris f\xE1jlok megegyez\xF5ek"
IDS_IDENTICAL "Egyez\xF5"
IDS_BIN_FILES_DIFF "A bin\xE1ris f\xE1jlok k\xFCl\xF6nb\xF6z\xF5ek"
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Elemento annullato"
IDS_FILE_SKIPPED "File saltato"
IDS_DIR_SKIPPED "Cartella saltata"
- IDS_ONLY_IN_FMT "Solo in %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "I file binari sono identici"
IDS_IDENTICAL "Identici"
IDS_BIN_FILES_DIFF "I file non di testo contengono delle differenze"
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "\x92\x86\x92f\x82\xB3\x82ꂽ\x8D\x80\x96\xDA"
IDS_FILE_SKIPPED "\x83X\x83L\x83b\x83v\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B"
IDS_DIR_SKIPPED "\x83X\x83L\x83b\x83v\x82\xB3\x82ꂽ\x83t\x83H\x83\x8B\x83_"
- IDS_ONLY_IN_FMT " %1 \x93\xE0\x82̂ݑ\xB6\x8D\xDD"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82͓\xAF\x88\xEA\x82ł\xB7"
IDS_IDENTICAL "\x93\xAF\x88\xEA"
IDS_BIN_FILES_DIFF "\x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82͈قȂ\xC1\x82Ă\xA2\x82܂\xB7"
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "\xC7\xCA\xC5\xB5\xB5\xC8 \xC6\xC4\xC0\xCF"
IDS_DIR_SKIPPED "\xC7\xCA\xC5\xB5\xB5\xC8 \xB5\xF0\xB7\xBA\xC5丮"
- IDS_ONLY_IN_FMT "\xC7\xD1\xC2ʸ\xB8 \xC1\xB8\xC0\xE7(%1)"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "\xB5\xBF\xC0\xCF\xC7\xD1 \xC6\xC4\xC0\xCF(\xB9\xD9\xC0̳ʸ\xAE \xC6\xC4\xC0\xCF)"
IDS_IDENTICAL "\xB5\xBF\xC0\xCF\xC7\xD1 \xC6\xC4\xC0\xCF"
IDS_BIN_FILES_DIFF "\xB5\xBF\xC0\xCF\xC7\xCF\xC1\xF6 \xBE\xCA\xC0\xBA \xC6\xC4\xC0\xCF(\xB9\xD9\xC0̳ʸ\xAE \xC6\xC4\xC0\xCF)"
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "Fil hoppet over"
IDS_DIR_SKIPPED "Mappe hoppet over"
- IDS_ONLY_IN_FMT "Kun i %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Bin\xE6re filer er identiske"
IDS_IDENTICAL "Identiske"
IDS_BIN_FILES_DIFF "Bin\xE6re filer er forskjellige"
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "Plik pomini\xEAty"
IDS_DIR_SKIPPED "Katalog pomini\xEAty"
- IDS_ONLY_IN_FMT "Tylko w %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Pliki binarne s\xB9 identyczne"
IDS_IDENTICAL "Identyczne"
IDS_BIN_FILES_DIFF "Pliki binarne s\xB9 r\xF3\xBFne"
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "\xD4\xE0\xE9\xEB \xEF\xF0\xEE\xEF\xF3\xF9\xE5\xED"
IDS_DIR_SKIPPED "\xCA\xE0\xF2\xE0\xEB\xEE\xE3 \xEF\xF0\xEE\xEF\xF3\xF9\xE5\xED"
- IDS_ONLY_IN_FMT "\xD2\xEE\xEB\xFC\xEA\xEE \xE2 %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "\xC1\xE8\xED\xE0\xF0\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xED\xE5 \xE8\xEC\xE5\xFE\xF2 \xEE\xF2\xEB\xE8\xF7\xE8\xE9"
IDS_IDENTICAL "\xCE\xE4\xE8\xED\xE0\xEA\xEE\xE2\xFB\xE5"
IDS_BIN_FILES_DIFF "\xC1\xE8\xED\xE0\xF0\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB \xEE\xF2\xEB\xE8\xF7\xE0\xFE\xF2\xF1\xFF"
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Polo\x9Eka zru\x9Aen\xE1"
IDS_FILE_SKIPPED "S\xFAbor presko\xE8en\xFD"
IDS_DIR_SKIPPED "Adres\xE1r presko\xE8en\xFD"
- IDS_ONLY_IN_FMT "Iba v %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Bin\xE1rne s\xFAbory s\xFA identick\xE9"
IDS_IDENTICAL "Identick\xE9"
IDS_BIN_FILES_DIFF "Bin\xE1rne s\xFAbory s\xFA rozdielne"
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Fichero abortado"
IDS_FILE_SKIPPED "Fichero omitido"
IDS_DIR_SKIPPED "Directorio omitido"
- IDS_ONLY_IN_FMT "Solamente en %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Los ficheros binarios son iguales"
IDS_IDENTICAL "Iguales"
IDS_BIN_FILES_DIFF "Los ficheros binarios son diferentes"
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Objekt avbrutet"
IDS_FILE_SKIPPED "Hoppat \xF6ver filen"
IDS_DIR_SKIPPED "Hoppat \xF6ver katalogen"
- IDS_ONLY_IN_FMT "Bara i %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "De bin\xE4ra filerna \xE4r identiska"
IDS_IDENTICAL "Identiska"
IDS_BIN_FILES_DIFF "De bin\xE4ra filerna \xE4r olika"
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2284,7 +2284,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "File skipped"
IDS_DIR_SKIPPED "Folder skipped"
- IDS_ONLY_IN_FMT "Only in %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Binary files are identical"
IDS_IDENTICAL "Identical"
IDS_BIN_FILES_DIFF "Binary files are different"
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/Merge.rc 2007-01-06 17:02:54 UTC (rev 4015)
@@ -2294,7 +2294,8 @@
IDS_ABORTED_ITEM "Item aborted"
IDS_FILE_SKIPPED "File skipped"
IDS_DIR_SKIPPED "Folder skipped"
- IDS_ONLY_IN_FMT "Only in %1"
+ IDS_LEFT_ONLY_IN_FMT "Left only: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
IDS_BIN_FILES_SAME "Binary files are identical"
IDS_IDENTICAL "Identical"
IDS_BIN_FILES_DIFF "Binary files are different"
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-01-06 12:17:15 UTC (rev 4014)
+++ trunk/Src/resource.h 2007-01-06 17:02:54 UTC (rev 4015)
@@ -620,15 +620,16 @@
#define IDS_CANT_COMPARE_FILES 17728
#define IDS_FILE_SKIPPED 17729
#define IDS_DIR_SKIPPED 17730
-#define IDS_ONLY_IN_FMT 17731
-#define IDS_BIN_FILES_SAME 17732
-#define IDS_IDENTICAL 17733
-#define IDS_BIN_FILES_DIFF 17734
-#define IDS_FILES_ARE_DIFFERENT 17735
-#define IDS_LEFTONLY 17736
-#define IDS_RIGHTONLY 17737
-#define IDS_DIFFERENT 17738
-#define IDS_ABORTED_ITEM 17739
+#define IDS_LEFT_ONLY_IN_FMT 17731
+#define IDS_RIGHT_ONLY_IN_FMT 17732
+#define IDS_BIN_FILES_SAME 17733
+#define IDS_IDENTICAL 17734
+#define IDS_BIN_FILES_DIFF 17735
+#define IDS_FILES_ARE_DIFFERENT 17736
+#define IDS_LEFTONLY 17737
+#define IDS_RIGHTONLY 17738
+#define IDS_DIFFERENT 17739
+#define IDS_ABORTED_ITEM 17740
#define IDS_ELAPSED_TIME 17744
#define IDS_STATUS_SELITEM1 17745
#define IDS_STATUS_SELITEMS 17746
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-06 18:22:10
|
Revision: 4016
http://svn.sourceforge.net/winmerge/?rev=4016&view=rev
Author: kimmov
Date: 2007-01-06 10:22:03 -0800 (Sat, 06 Jan 2007)
Log Message:
-----------
ConvertFilter() function in FileOrFolderSelect can be a static function
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-06 17:02:54 UTC (rev 4015)
+++ trunk/Src/Changes.txt 2007-01-06 18:22:03 UTC (rev 4016)
@@ -12,6 +12,8 @@
PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
Src: DirViewColItems.cpp Merge.rc resource.h
Src/Languages/*: Merge*.rc
+ ConvertFilter() function in FileOrFolderSelect can be a static function
+ Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
2007-01-05 Kimmo
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2007-01-06 17:02:54 UTC (rev 4015)
+++ trunk/Src/FileOrFolderSelect.cpp 2007-01-06 18:22:03 UTC (rev 4016)
@@ -44,6 +44,8 @@
#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
#endif
+static void ConvertFilter(LPTSTR filterStr);
+
/**
* @brief Helper function for selecting dir/file
* @param [in] parent Handle to parent window. Can be a NULL, but then
Modified: trunk/Src/FileOrFolderSelect.h
===================================================================
--- trunk/Src/FileOrFolderSelect.h 2007-01-06 17:02:54 UTC (rev 4015)
+++ trunk/Src/FileOrFolderSelect.h 2007-01-06 18:22:03 UTC (rev 4016)
@@ -37,6 +37,4 @@
BOOL SelectFileOrFolder(HWND parent, CString& path, LPCTSTR root_path = NULL);
-void ConvertFilter(LPTSTR filterStr);
-
#endif
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-07 11:38:31
|
Revision: 4017
http://svn.sourceforge.net/winmerge/?rev=4017&view=rev
Author: kimmov
Date: 2007-01-07 03:38:29 -0800 (Sun, 07 Jan 2007)
Log Message:
-----------
BUG: [ 1567749 ] "Unable to compare files" needs short result
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirViewColItems.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Changes.txt 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-07 Kimmo
+ BUG: [ 1567749 ] "Unable to compare files" needs short result
+ Src: DirViewColItems.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+
2007-01-06 Kimmo
TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
Src: LocationView.cpp
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/DirViewColItems.cpp 2007-01-07 11:38:29 UTC (rev 4017)
@@ -366,7 +366,7 @@
// skipped unique items are labeled as skipped, not unique.
if (di.isResultError())
{
- id = IDS_CANT_COMPARE_FILES;
+ id = IDS_CMPRES_ERROR;
}
else if (di.isResultAbort())
{
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Left Only"
IDS_RIGHTONLY "Right Only"
IDS_DIFFERENT "Different"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2312,6 +2312,7 @@
IDS_LEFTONLY "\xD1\xE0\xEC\xEE \xEB\xE5\xE2\xE8\xFF\xF2"
IDS_RIGHTONLY "\xD1\xE0\xEC\xEE \xE4\xE5\xF1\xED\xE8\xFF\xF2"
IDS_DIFFERENT "\xD0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2311,6 +2311,7 @@
IDS_LEFTONLY "Nom\xE9s l'esquerre"
IDS_RIGHTONLY "Nom\xE9s el dret"
IDS_DIFFERENT "Diferents"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2294,6 +2294,7 @@
IDS_LEFTONLY "ֻ\xB4\xE6\xD4\xDA\xD7\xF3\xB2\xE0"
IDS_RIGHTONLY "ֻ\xB4\xE6\xD4\xDA\xD3Ҳ\xE0"
IDS_DIFFERENT "\xB2\xBBͬ"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "\xA5u\xA6\xB3\xA5\xAA\xC3\xE4"
IDS_RIGHTONLY "\xA5u\xA6\xB3\xA5k\xC3\xE4"
IDS_DIFFERENT "\xA4\xA3\xA6P"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Pouze vlevo"
IDS_RIGHTONLY "Pouze vpravo"
IDS_DIFFERENT "Rozd\xEDln\xE9"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Kun venstre"
IDS_RIGHTONLY "Kun h\xF8jre"
IDS_DIFFERENT "Forskellige"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Alleen links"
IDS_RIGHTONLY "Alleen rechts"
IDS_DIFFERENT "Verschillend"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2286,6 +2286,7 @@
IDS_LEFTONLY "Juste \xE0 gauche"
IDS_RIGHTONLY "Juste \xE0 droite"
IDS_DIFFERENT "Diff\xE9rent"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Nur Links"
IDS_RIGHTONLY "Nur Rechts"
IDS_DIFFERENT "Unterschiedlich"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2291,6 +2291,7 @@
IDS_LEFTONLY "Csak bal oldal"
IDS_RIGHTONLY "Csak jobb oldal"
IDS_DIFFERENT "K\xFCl\xF6nb\xF6z\xF5"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Solo a sinistra"
IDS_RIGHTONLY "Solo a destra"
IDS_DIFFERENT "Diverse"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "\x8D\xB6\x82̂\xDD"
IDS_RIGHTONLY "\x89E\x82̂\xDD"
IDS_DIFFERENT "\x88قȂ\xE9"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "\xBF\xDE\xC2ʸ\xB8 \xC1\xB8\xC0\xE7"
IDS_RIGHTONLY "\xBF\xC0\xB8\xA5\xC2ʸ\xB8 \xC1\xB8\xC0\xE7"
IDS_DIFFERENT "\xB4ٸ\xA5 \xC6\xC4\xC0\xCF"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Bare venstre"
IDS_RIGHTONLY "Bare h\xF8yre"
IDS_DIFFERENT "Forskjellig"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Tylko lewa"
IDS_RIGHTONLY "Tylko prawa"
IDS_DIFFERENT "R\xF3\xBFne"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "\xD2\xEE\xEB\xFC\xEA\xEE \xF1\xEB\xE5\xE2\xE0"
IDS_RIGHTONLY "\xD2\xEE\xEB\xFC\xEA\xEE \xF1\xEF\xF0\xE0\xE2\xE0"
IDS_DIFFERENT "\xCE\xF2\xEB\xE8\xF7\xE0\xFE\xF2\xF1\xFF"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Iba v\xBEavo"
IDS_RIGHTONLY "Iba vpravo"
IDS_DIFFERENT "Rozdielne"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "S\xF3lo lado izq."
IDS_RIGHTONLY "S\xF3lo lado dcho."
IDS_DIFFERENT "Diferentes"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Endast v\xE4nster"
IDS_RIGHTONLY "Endast h\xF6ger"
IDS_DIFFERENT "Olika"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2293,6 +2293,7 @@
IDS_LEFTONLY "Left Only"
IDS_RIGHTONLY "Right Only"
IDS_DIFFERENT "Different"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/Merge.rc 2007-01-07 11:38:29 UTC (rev 4017)
@@ -2303,6 +2303,7 @@
IDS_LEFTONLY "Left Only"
IDS_RIGHTONLY "Right Only"
IDS_DIFFERENT "Different"
+ IDS_CMPRES_ERROR "Error"
END
// DIRECTORY DIFFING : SUMMARY BAR
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-01-06 18:22:03 UTC (rev 4016)
+++ trunk/Src/resource.h 2007-01-07 11:38:29 UTC (rev 4017)
@@ -630,6 +630,7 @@
#define IDS_RIGHTONLY 17738
#define IDS_DIFFERENT 17739
#define IDS_ABORTED_ITEM 17740
+#define IDS_CMPRES_ERROR 17741
#define IDS_ELAPSED_TIME 17744
#define IDS_STATUS_SELITEM1 17745
#define IDS_STATUS_SELITEMS 17746
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-08 15:16:30
|
Revision: 4018
http://svn.sourceforge.net/winmerge/?rev=4018&view=rev
Author: galh
Date: 2007-01-08 07:16:24 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-07 11:38:29 UTC (rev 4017)
+++ trunk/Src/Changes.txt 2007-01-08 15:16:24 UTC (rev 4018)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-08 Gal
+ BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
+ Src: DirView.cpp
+
2007-01-07 Kimmo
BUG: [ 1567749 ] "Unable to compare files" needs short result
Src: DirViewColItems.cpp Merge.rc resource.h
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2007-01-07 11:38:29 UTC (rev 4017)
+++ trunk/Src/DirView.cpp 2007-01-08 15:16:24 UTC (rev 4018)
@@ -2827,18 +2827,22 @@
*
* Disable label edit if initiated from a user double-click.
*/
-afx_msg void CDirView::OnBeginLabelEdit(NMHDR* /*pNMHDR*/, LRESULT* pResult)
+afx_msg void CDirView::OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult)
{
*pResult = IsItemSelectedSpecial();
// If label edit is allowed.
if (FALSE == *pResult)
{
- CEdit *pEdit = m_pList->GetEditControl();
- ASSERT(NULL != pEdit);
+ const NMLVDISPINFO *pdi = (NMLVDISPINFO*)pNMHDR;
+ ASSERT(pdi != NULL);
- CString sText;
- pEdit->GetWindowText(sText);
+ // Locate the edit box on the right column in case the user changed the
+ // column order.
+ const int nColPos = ColLogToPhys(0);
+
+ // Get text from the "File Name" column.
+ CString sText = m_pList->GetItemText(pdi->item.iItem, nColPos);
ASSERT(!sText.IsEmpty());
// Keep only left file name (separated by '|'). This form occurs
@@ -2847,9 +2851,13 @@
if (-1 != nPos)
{
sText = sText.Left(nPos);
- pEdit->SetWindowText(sText);
}
+ // Set the edit control with the updated text.
+ CEdit *pEdit = m_pList->GetEditControl();
+ ASSERT(NULL != pEdit);
+ pEdit->SetWindowText(sText);
+
m_bUserCancelEdit = FALSE;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-08 20:48:27
|
Revision: 4021
http://svn.sourceforge.net/winmerge/?rev=4021&view=rev
Author: kimmov
Date: 2007-01-08 12:48:23 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
PATCH: [ 1593810 ] Line-filtering post compare
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.dsp
trunk/Src/MergeDoc.cpp
Added Paths:
-----------
trunk/Src/FilterList.cpp
trunk/Src/FilterList.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/Changes.txt 2007-01-08 20:48:23 UTC (rev 4021)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-08 Kimmo
+ PATCH: [ 1593810 ] Line-filtering post compare
+ Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
+ Src new files: FilterList.cpp FilterList.h
+
2007-01-08 Gal
BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
Src: DirView.cpp
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/DiffWrapper.cpp 2007-01-08 20:48:23 UTC (rev 4021)
@@ -28,10 +28,12 @@
#include <string>
#include <map>
#include <shlwapi.h>
+#include "Ucs2Utf8.h"
#include "coretools.h"
#include "diffcontext.h"
#include "DiffList.h"
#include "MovedLines.h"
+#include "FilterList.h"
#include "diffwrapper.h"
#include "diff.h"
#include "FileTransform.h"
@@ -86,6 +88,7 @@
, m_pDiffList(NULL)
, m_bPathsAreTemp(FALSE)
, m_pMovedLines(NULL)
+, m_pFilterList(NULL)
{
ZeroMemory(&m_settings, sizeof(DIFFSETTINGS));
ZeroMemory(&m_globalSettings, sizeof(DIFFSETTINGS));
@@ -103,6 +106,7 @@
*/
CDiffWrapper::~CDiffWrapper()
{
+ delete m_pFilterList;
delete m_infoPrediffer;
delete m_FilterCommentsManager;
delete m_pMovedLines;
@@ -1121,6 +1125,48 @@
}
/**
+ * @brief Match regular expression list against given difference.
+ * This function matches the regular expression list against the difference
+ * (given as start line and end line). Matching the diff requires that all
+ * lines in difference match.
+ * @param [in] StartPos First line of the difference.
+ * @param [in] endPos Last line of the difference.
+ * @param [in] FileNo File to match.
+ * return true if any of the expressions matches.
+ */
+bool CDiffWrapper::RegExpFilter(int StartPos, int EndPos, int FileNo)
+{
+ if (m_pFilterList == NULL)
+ {
+ _RPTF0(_CRT_ERROR, "CDiffWrapper::RegExpFilter() called when "
+ "filterlist doesn't exist (=NULL)");
+ return false;
+ }
+
+ const char EolIndicators[] = "\r\n"; //List of characters used as EOL
+ bool linesMatch = true; // set to false when non-matching line is found.
+ int line = StartPos;
+
+ while (line <= EndPos && linesMatch == true)
+ // for (int i = StartPos; i <= EndPos; i++)
+ {
+ std::string LineData(files[FileNo].linbuf[line]);
+ size_t EolPos = LineData.find_first_of(EolIndicators);
+ if (EolPos != std::string::npos)
+ {
+ LineData.erase(EolPos);
+ }
+
+ if (!m_pFilterList->Match(LineData.c_str()))
+ {
+ linesMatch = false;
+ }
+ ++line;
+ }
+ return linesMatch;
+}
+
+/**
* @brief Walk the diff utils change script, building the WinMerge list of diff blocks
*/
void
@@ -1214,6 +1260,23 @@
PostFilter(thisob->line0, QtyLinesLeft, thisob->line1, QtyLinesRight, op, *m_FilterCommentsManager, asLwrCaseExt);
}
+ if (m_pFilterList && m_pFilterList->HasRegExps())
+ {
+ //Determine quantity of lines in this block for both sides
+ int QtyLinesLeft = (trans_b0 - trans_a0);
+ int QtyLinesRight = (trans_b1 - trans_a1);
+
+ // Match lines against regular expression filters
+ // Our strategy is that every line in both sides must
+ // match regexp before we mark difference as ignored.
+ bool match2 = false;
+ bool match1 = RegExpFilter(thisob->line0, thisob->line0 + QtyLinesLeft, 0);
+ if (match1)
+ match2 = RegExpFilter(thisob->line1, thisob->line1 + QtyLinesRight, 1);
+ if (match1 && match2)
+ op = OP_TRIVIAL;
+ }
+
AddDiffRange(trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, (BYTE)op);
TRACE(_T("left=%d,%d right=%d,%d op=%d\n"),
trans_a0-1, trans_b0-1, trans_a1-1, trans_b1-1, op);
@@ -1310,6 +1373,54 @@
}
/**
+ * @brief Set line filters, given as one string.
+ * @param [in] filterStr Filters.
+ */
+void CDiffWrapper::SetFilterList(const CString &filterStr)
+{
+ // Remove filterlist if new filter is empty
+ if (filterStr.IsEmpty())
+ {
+ delete m_pFilterList;
+ m_pFilterList = NULL;
+ return;
+ }
+
+ // Adding new filter without previous filter
+ if (!filterStr.IsEmpty() && m_pFilterList == NULL)
+ {
+ m_pFilterList = new FilterList;
+ }
+
+ m_pFilterList->RemoveAllFilters();
+ if (!filterStr.IsEmpty())
+ {
+#ifdef UNICODE
+ // Get the size of UTF-8 string
+ int reg_len = TransformUcs2ToUtf8(filterStr, _tcslen(filterStr), NULL, 0);
+ ++reg_len; // Space for zero at end
+
+ char * regexp_utf = new char[reg_len];
+ ZeroMemory(regexp_utf, reg_len);
+ reg_len = TransformUcs2ToUtf8(filterStr, _tcslen(filterStr), regexp_utf, reg_len);
+#else
+ char *regexp_utf = strdup(filterStr);
+#endif
+
+ // Add every "line" of regexps to regexp list
+ char * token;
+ const char sep[] = "\r\n";
+ token = strtok(regexp_utf, sep);
+ while (token)
+ {
+ m_pFilterList->AddRegExp(token);
+ token = strtok(NULL, sep);
+ }
+ delete [] regexp_utf;
+ }
+}
+
+/**
* @brief Copy text stat results from diffutils back into the FileTextStats structure
*/
void CopyTextStats(const file_data * inf, FileTextStats * myTextStats)
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/DiffWrapper.h 2007-01-08 20:48:23 UTC (rev 4021)
@@ -42,6 +42,7 @@
class FilterCommentsManager;
struct FilterCommentsSet;
class MovedLines;
+class FilterList;
/** @enum COMPARE_TYPE
* @brief Different foldercompare methods.
@@ -228,6 +229,7 @@
void EndDirectoryDiff();
MovedLines * GetMovedLines() { return m_pMovedLines; }
void SetCompareFiles(const CString &OriginalFile1, const CString &OriginalFile2);
+ void SetFilterList(const CString &filterStr);
protected:
void InternalGetOptions(DIFFOPTIONS *options) const;
@@ -239,11 +241,13 @@
int * bin_status, int * bin_file);
void LoadWinMergeDiffsFromDiffUtilsScript(struct change * script, const file_data * inf);
void WritePatchFile(struct change * script, file_data * inf);
+ bool RegExpFilter(int StartPos, int EndPos, int FileNo);
private:
DIFFSETTINGS m_settings; /**< Compare settings for current compare */
DIFFSETTINGS m_globalSettings; /**< Global compare settings */
DIFFSTATUS m_status; /**< Status of last compare */
+ FilterList * m_pFilterList; /**< List of linefilters. */
CString m_s1File; /**< Full path to first diff'ed file. */
CString m_s2File; /**< Full path to second diff'ed file. */
CString m_s1AlternativePath; /**< First file's alternative path (may be relative). */
Added: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp (rev 0)
+++ trunk/Src/FilterList.cpp 2007-01-08 20:48:23 UTC (rev 4021)
@@ -0,0 +1,130 @@
+/**
+ * @file FilterList.h
+ *
+ * @brief Implementation file for FilterList.
+ */
+
+#include "stdafx.h"
+#include <vector>
+#include "FilterList.h"
+#include "pcre.h"
+
+using namespace std;
+
+/**
+ * @brief Constructor.
+ */
+ FilterList::FilterList()
+: m_lastMatchExpression(NULL)
+{
+}
+
+/**
+ * @brief Destructor.
+ */
+FilterList::~FilterList()
+{
+ RemoveAllFilters();
+ free(m_lastMatchExpression);
+}
+
+/**
+ * @brief Add new regular expression to the list.
+ * This function adds new regular expression to the list of expressions.
+ * The regular expression is compiled and studied for better performance.
+ * @param [in] regularExpression Regular expression as UTF-8 string.
+ */
+void FilterList::AddRegExp(const char * regularExpression)
+{
+ filter_item item;
+ item.filterAsString = strdup(regularExpression);
+
+ const char * errormsg = NULL;
+ int erroroffset = 0;
+ pcre *regexp = pcre_compile(regularExpression, PCRE_UTF8, &errormsg,
+ &erroroffset, NULL);
+ if (regexp)
+ {
+ errormsg = NULL;
+ pcre_extra *pe = pcre_study(regexp, 0, &errormsg);
+
+ item.pRegExp = regexp;
+ if (pe != NULL && errormsg != NULL)
+ item.pRegExpExtra = pe;
+ else
+ item.pRegExpExtra = NULL;
+
+ m_list.push_back(item);
+ }
+}
+
+/**
+ * @brief Removes all expressions from the list.
+ */
+void FilterList::RemoveAllFilters()
+{
+ while (!m_list.empty())
+ {
+ filter_item & item = m_list.back();
+ free(item.filterAsString);
+ pcre_free(item.pRegExp);
+ pcre_free(item.pRegExpExtra);
+ m_list.pop_back();
+ }
+}
+
+/**
+ * @brief Returns if list has any expressions.
+ * @return true if list contains one or more expressions.
+ */
+bool FilterList::HasRegExps()
+{
+ return !m_list.empty();
+}
+
+/**
+ * @brief Match string against list of expressions.
+ * This function matches given @p string against the list of regular
+ * expressions. The matching ends when first match is found, so all
+ * expressions may not be matched against.
+ * @param [in] string UTF-8 string to match.
+ * @return true if any of the expressions did match the string.
+ */
+bool FilterList::Match(const char *string)
+{
+ bool retval = false;
+ unsigned int count = m_list.size();
+
+ unsigned int i = 0;
+ while (i < count && retval == false)
+ {
+ filter_item item = m_list[i];
+ int ovector[30];
+ pcre * regexp = item.pRegExp;
+ pcre_extra * extra = item.pRegExpExtra;
+ int result = pcre_exec(regexp, extra, string, strlen(string),
+ 0, 0, ovector, 30);
+
+ if (result >= 0)
+ {
+ if (m_lastMatchExpression != NULL)
+ free(m_lastMatchExpression);
+ m_lastMatchExpression = strdup(item.filterAsString);
+ retval = true;
+ }
+ else
+ ++i;
+ }
+
+ return retval;
+}
+
+/**
+ * @brief Returns the last matched expression (if any).
+ * This function returns the regular expression string that matched last.
+ * @return Last matched expression, or NULL in case no matches yet.
+ */
+const char * FilterList::GetLastMatchExpression()
+{
+ return m_lastMatchExpression;
+}
Added: trunk/Src/FilterList.h
===================================================================
--- trunk/Src/FilterList.h (rev 0)
+++ trunk/Src/FilterList.h 2007-01-08 20:48:23 UTC (rev 4021)
@@ -0,0 +1,53 @@
+/**
+ * @file FilterList.h
+ *
+ * @brief Declaration file for FilterList.
+ */
+
+#ifndef _FILTERLIST_H_
+#define _FILTERLIST_H_
+
+#include <vector>
+#include "pcre.h"
+
+using namespace std;
+
+/**
+ * @brief Container for one filtering rule / compiled expression.
+ * This structure holds compiled regular expression and a original expression
+ * as a string. We need the original expression string in case we want to
+ * know which regular expression did match.
+ */
+struct filter_item
+{
+ char * filterAsString; /** Original regular expression string */
+ pcre *pRegExp; /**< Compiled regular expression */
+ pcre_extra *pRegExpExtra; /**< Additional information got from regex study */
+};
+
+/**
+ * @brief Regular expression list.
+ * This class holds a list of regular expressions for matching strings.
+ * The class also provides simple function for matching and remembers the
+ * last matched expression.
+ */
+class FilterList
+{
+public:
+ FilterList();
+ ~FilterList();
+
+ void AddRegExp(const char *regularExpression);
+ void RemoveAllFilters();
+ bool HasRegExps();
+ bool Match(const char *string);
+ const char * GetLastMatchExpression();
+
+private:
+ vector <filter_item> m_list;
+ char * m_lastMatchExpression;
+
+};
+
+
+#endif // _FILTERLIST_H_
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/MainFrm.cpp 2007-01-08 20:48:23 UTC (rev 4021)
@@ -254,8 +254,6 @@
{
gLog.EnableLogging(FALSE);
- // destroy the reg expression list
- FreeRegExpList();
// Delete all temporary folders belonging to this process
GetClearTempPath(NULL, NULL);
@@ -288,8 +286,6 @@
if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1)
return -1;
- // build the initial reg expression list
- RebuildRegExpList(FALSE);
GetFontProperties();
if (!CreateToobar())
@@ -1650,108 +1646,7 @@
CMDIFrameWnd::OnClose();
}
-/// Empty regexp list used internally
-void CMainFrame::FreeRegExpList()
-{
- struct regexp_list *r;
- r = ignore_regexp_list;
- // iterate through the list, free the reg expression
- // list item
- while (ignore_regexp_list)
- {
- r = r->next;
- free((ignore_regexp_list->buf).fastmap);
- free((ignore_regexp_list->buf).buffer);
- free(ignore_regexp_list);
- ignore_regexp_list = r;
- }
-}
-
/**
- * @brief Add regexps from options to internal list
- * @param [in] bShowError When TRUE error messages are shown to user,
- * otherwise just written to log.
- */
-void CMainFrame::RebuildRegExpList(BOOL bShowError)
-{
- USES_CONVERSION;
-
- TCHAR tmp[_MAX_PATH] = {0};
- TCHAR* token;
- TCHAR sep[] = _T("\r\n");
- BOOL valid = TRUE;
-
- // destroy the old list if the it is not NULL
- FreeRegExpList();
-
- // build the new list if the user choose to
- // ignore lines matching the reg expression patterns
- if (GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED))
- {
- // find each regular expression and add to list
- _tcsncpy(tmp, GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP), _MAX_PATH);
-
- token = _tcstok(tmp, sep);
- while (token && valid)
- {
- valid = add_regexp(&ignore_regexp_list, T2A(token), bShowError);
- token = _tcstok(NULL, sep);
- }
- }
-
- if (ignore_regexp_list)
- {
- ignore_some_changes = 1;
- }
-}
-
-/// Add the compiled form of regexp pattern to reglist
-static BOOL add_regexp(struct regexp_list **reglist, char const* pattern, BOOL bShowError)
-{
- struct regexp_list *r;
- int m;
- BOOL ret = FALSE;
-
- r = (struct regexp_list *) malloc (sizeof (*r));
- if (r)
- {
- bzero (r, sizeof (*r));
- r->buf.fastmap = (char*) malloc (256);
- if (r->buf.fastmap)
- {
- m = re_compile_pattern (pattern, strlen (pattern), &r->buf);
-
- if (m > 0)
- {
- CString msg;
- CString errMsg;
- VERIFY(errMsg.LoadString(IDS_REGEXP_ERROR));
- errMsg += _T(":\n\n");
- errMsg += pattern;
- errMsg += _T("\n\n");
- int errID = IDS_REGEXP_ERROR + m;
- VERIFY(msg.LoadString(errID));
- errMsg += msg;
- LogErrorString(errMsg);
- if (bShowError)
- AfxMessageBox(errMsg, MB_ICONWARNING);
- }
-
- /* Add to the start of the list, since it's easier than the end. */
- r->next = *reglist;
- *reglist = r;
- ret = TRUE;
- }
- else
- {
- free(r->buf.fastmap);
- r->buf.fastmap = NULL;
- }
- }
- return ret;
-}
-
-/**
* @brief Utility function to update CSuperComboBox format MRU
*/
void CMainFrame::addToMru(LPCTSTR szItem, LPCTSTR szRegSubKey, UINT nMaxItems)
@@ -2530,8 +2425,6 @@
}
GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, filter.m_bIgnoreRegExp == TRUE);
GetOptionsMgr()->SaveOption(OPT_LINEFILTER_REGEXP, filter.m_sPattern);
-
- RebuildRegExpList(TRUE);
}
}
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/MainFrm.h 2007-01-08 20:48:23 UTC (rev 4021)
@@ -279,12 +279,6 @@
private:
void addToMru(LPCTSTR szItem, LPCTSTR szRegSubKey, UINT nMaxItems = 20);
- // builds the regular expression list if the
- // user choose to ignore Ignore changes affecting only lines
- // that match the specified regexp.
- void RebuildRegExpList(BOOL bShowError);
- // destroy the regular expression list and free up the memory
- void FreeRegExpList();
void GetAllViews(MergeEditViewList * pEditViews, MergeDetailViewList * pDetailViews, DirViewList * pDirViews);
void GetAllMergeDocs(MergeDocList * pMergeDocs);
void GetAllDirDocs(DirDocList * pDirDocs);
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/Merge.dsp 2007-01-08 20:48:23 UTC (rev 4021)
@@ -445,6 +445,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FilterList.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.cpp
# End Source File
# Begin Source File
@@ -1193,6 +1197,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FilterList.h
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.h
# End Source File
# Begin Source File
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2007-01-08 20:24:54 UTC (rev 4020)
+++ trunk/Src/MergeDoc.cpp 2007-01-08 20:48:23 UTC (rev 4021)
@@ -34,6 +34,7 @@
#include "direct.h"
#include "MainFrm.h"
+#include "Ucs2Utf8.h"
#include "diff.h"
#include "diffcontext.h" // FILE_SAME
#include "MovedLines.h"
@@ -396,6 +397,16 @@
return RESCAN_SUPPRESSED;
}
+ if (GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED))
+ {
+ CString regexp = GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP);
+ m_diffWrapper.SetFilterList(regexp);
+ }
+ else
+ {
+ m_diffWrapper.SetFilterList(_T(""));
+ }
+
bLeftFileChanged = IsFileChangedOnDisk(m_filePaths.GetLeft(), fileInfo,
FALSE, 0);
bRightFileChanged = IsFileChangedOnDisk(m_filePaths.GetRight(), fileInfo,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-10 13:46:29
|
Revision: 4023
http://svn.sourceforge.net/winmerge/?rev=4023&view=rev
Author: galh
Date: 2007-01-10 05:46:26 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
PATCH: [ 1631215 ] Remove used files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
Removed Paths:
-------------
trunk/Src/Common/listvwex.cpp
trunk/Src/Common/listvwex.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 13:44:44 UTC (rev 4022)
+++ trunk/Src/Changes.txt 2007-01-10 13:46:26 UTC (rev 4023)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-10 Gal
+ PATCH: [ 1631215 ] Remove used files
+ Src: Merge.dsp
+ Src/Common deleted: listvwex.cpp listvwex.h
+
2007-01-08 Kimmo
PATCH: [ 1593810 ] Line-filtering post compare
Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
Deleted: trunk/Src/Common/listvwex.cpp
===================================================================
--- trunk/Src/Common/listvwex.cpp 2007-01-10 13:44:44 UTC (rev 4022)
+++ trunk/Src/Common/listvwex.cpp 2007-01-10 13:46:26 UTC (rev 4023)
@@ -1,547 +0,0 @@
-// ListVwEx.cpp : implementation of the CListViewEx class
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992-1996 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and related
-// electronic documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
-
-#include "stdafx.h"
-#include "ListVwEx.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx
-
-IMPLEMENT_DYNCREATE(CListViewEx, CListView)
-
-BEGIN_MESSAGE_MAP(CListViewEx, CListView)
- //{{AFX_MSG_MAP(CListViewEx)
- ON_WM_SIZE()
- ON_WM_PAINT()
- ON_WM_SETFOCUS()
- ON_WM_KILLFOCUS()
- //}}AFX_MSG_MAP
- ON_MESSAGE(LVM_SETIMAGELIST, OnSetImageList)
- ON_MESSAGE(LVM_SETTEXTCOLOR, OnSetTextColor)
- ON_MESSAGE(LVM_SETTEXTBKCOLOR, OnSetTextBkColor)
- ON_MESSAGE(LVM_SETBKCOLOR, OnSetBkColor)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx construction/destruction
-
-BOOL CListViewEx::PreCreateWindow(CREATESTRUCT& cs)
-{
- // default is report view and full row selection
- cs.style&=~LVS_TYPEMASK;
- cs.style|=LVS_REPORT | LVS_OWNERDRAWFIXED;
-
- return(CListView::PreCreateWindow(cs));
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListCtrlEx
-
-IMPLEMENT_DYNCREATE(CListCtrlEx, CListCtrl)
-
-BEGIN_MESSAGE_MAP(CListCtrlEx, CListCtrl)
- //{{AFX_MSG_MAP(CListCtrlEx)
- ON_WM_SIZE()
- ON_WM_PAINT()
- ON_WM_SETFOCUS()
- ON_WM_KILLFOCUS()
- //}}AFX_MSG_MAP
- ON_MESSAGE(LVM_SETIMAGELIST, OnSetImageList)
- ON_MESSAGE(LVM_SETTEXTCOLOR, OnSetTextColor)
- ON_MESSAGE(LVM_SETTEXTBKCOLOR, OnSetTextBkColor)
- ON_MESSAGE(LVM_SETBKCOLOR, OnSetBkColor)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CListCtrlEx construction/destruction
-
-CListCtrlEx::CListCtrlEx()
-#pragma warning(disable:4355) // 'this' : used in base member initializer list
-: m_listex(*this)
-#pragma warning(default:4355) // 'this' : used in base member initializer list
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx
-
-BOOL CListEx::SetFullRowSel(BOOL bFullRowSel)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // no painting during change
- ListCtrl.LockWindowUpdate();
-
- m_bFullRowSel=bFullRowSel;
-
- BOOL bRet;
-
- if(m_bFullRowSel)
- bRet=ListCtrl.ModifyStyle(0L,LVS_OWNERDRAWFIXED);
- else
- bRet=ListCtrl.ModifyStyle(LVS_OWNERDRAWFIXED,0L);
-
- // repaint window if we are not changing view type
- if(bRet && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- ListCtrl.Invalidate();
-
- // repaint changes
- ListCtrl.UnlockWindowUpdate();
-
- return(bRet);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx drawing
-
-// offsets for first and other columns
-#define OFFSET_FIRST 2
-#define OFFSET_OTHER 6
-
-void CListEx::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- CDC* pDC=CDC::FromHandle(lpDrawItemStruct->hDC);
- CRect rcItem(lpDrawItemStruct->rcItem);
- UINT uiFlags=ILD_TRANSPARENT;
- CImageList* pImageList;
- int nItem=lpDrawItemStruct->itemID;
- BOOL bFocus=(ListCtrl.GetFocus()==&ListCtrl);
- COLORREF clrTextSave, clrBkSave;
- COLORREF clrImage=m_clrBkgnd;
- static _TCHAR szBuff[MAX_PATH];
- LPCTSTR pszText;
-
-// get item data
-
- LV_ITEM lvi;
- lvi.mask=LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
- lvi.iItem=nItem;
- lvi.iSubItem=0;
- lvi.pszText=szBuff;
- lvi.cchTextMax=sizeof(szBuff);
- lvi.stateMask=0xFFFF; // get all state flags
- ListCtrl.GetItem(&lvi);
-
- BOOL bSelected=(bFocus || (ListCtrl.GetStyle() & LVS_SHOWSELALWAYS)) && lvi.state & LVIS_SELECTED;
- bSelected=bSelected || (lvi.state & LVIS_DROPHILITED);
-
-// set colors if item is selected
-
- CRect rcAllLabels;
- ListCtrl.GetItemRect(nItem,rcAllLabels,LVIR_BOUNDS);
- CRect rcLabel;
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcAllLabels.left=rcLabel.left;
- if(m_bClientWidthSel && rcAllLabels.right<m_cxClient)
- rcAllLabels.right=m_cxClient;
-
- if(bSelected)
- {
- clrTextSave=pDC->SetTextColor(::GetSysColor(COLOR_HIGHLIGHTTEXT));
- clrBkSave=pDC->SetBkColor(::GetSysColor(COLOR_HIGHLIGHT));
- CBrush brush(::GetSysColor(COLOR_HIGHLIGHT));
- pDC->FillRect(rcAllLabels,&brush);
- }
- else
- {
- clrTextSave=pDC->SetTextColor(m_clrText);
- clrBkSave=pDC->SetBkColor(m_clrTextBk);
- CBrush brush(m_clrTextBk);
- pDC->FillRect(rcAllLabels,&brush);
- }
-
-// set color and mask for the icon
-
- if(lvi.state & LVIS_CUT)
- {
- clrImage=m_clrBkgnd;
- uiFlags|=ILD_BLEND50;
- }
- else if(bSelected)
- {
- clrImage=::GetSysColor(COLOR_HIGHLIGHT);
- uiFlags|=ILD_BLEND50;
- }
-
-// draw state icon
-
- UINT nStateImageMask=lvi.state & LVIS_STATEIMAGEMASK;
- if(nStateImageMask)
- {
- int nImage=(nStateImageMask>>12)-1;
- pImageList=ListCtrl.GetImageList(LVSIL_STATE);
- if(pImageList)
- pImageList->Draw(pDC,nImage,CPoint(rcItem.left,rcItem.top),ILD_TRANSPARENT);
- }
-
-// draw normal and overlay icon
-
- CRect rcIcon;
- ListCtrl.GetItemRect(nItem,rcIcon,LVIR_ICON);
-
- pImageList=ListCtrl.GetImageList(LVSIL_SMALL);
- if(pImageList)
- {
- UINT nOvlImageMask=lvi.state & LVIS_OVERLAYMASK;
- if(rcItem.left<rcItem.right-1)
- ImageList_DrawEx(pImageList->m_hImageList,lvi.iImage,pDC->m_hDC,rcIcon.left,rcIcon.top,16,16,m_clrBkgnd,clrImage,uiFlags | nOvlImageMask);
- }
-
-// draw item label
-
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_LABEL);
- rcItem.right-=m_cxStateImageOffset;
-
- pszText=MakeShortString(pDC,szBuff,rcItem.right-rcItem.left,2*OFFSET_FIRST);
-
- rcLabel=rcItem;
- rcLabel.left+=OFFSET_FIRST;
- rcLabel.right-=OFFSET_FIRST;
-
- pDC->DrawText(pszText,-1,rcLabel, m_nTabFlag | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_NOCLIP | DT_VCENTER);
-
-// draw labels for extra columns
-
- LV_COLUMN lvc;
- lvc.mask=LVCF_FMT | LVCF_WIDTH;
-
- for(int nColumn=1; ListCtrl.GetColumn(nColumn,&lvc); nColumn++)
- {
- rcItem.left=rcItem.right;
- rcItem.right+=lvc.cx;
-
- int nRetLen=ListCtrl.GetItemText(nItem,nColumn,szBuff,sizeof(szBuff));
- if(nRetLen==0) continue;
-
- pszText=MakeShortString(pDC,szBuff,rcItem.right-rcItem.left,2*OFFSET_OTHER);
-
- UINT nJustify=DT_LEFT;
-
- if(pszText==szBuff)
- {
- switch(lvc.fmt & LVCFMT_JUSTIFYMASK)
- {
- case LVCFMT_RIGHT:
- nJustify=DT_RIGHT;
- break;
- case LVCFMT_CENTER:
- nJustify=DT_CENTER;
- break;
- default:
- break;
- }
- }
-
- rcLabel=rcItem;
- rcLabel.left+=OFFSET_OTHER;
- rcLabel.right-=OFFSET_OTHER;
-
- pDC->DrawText(pszText,-1,rcLabel,nJustify | DT_SINGLELINE | DT_NOPREFIX | DT_NOCLIP | DT_VCENTER);
- }
-
-// draw focus rectangle if item has focus
-
- if(lvi.state & LVIS_FOCUSED && bFocus)
- pDC->DrawFocusRect(rcAllLabels);
-
-// set original colors
- pDC->SetTextColor(clrTextSave);
- pDC->SetBkColor(clrBkSave);
-}
-
-LPCTSTR CListEx::MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
-{
- static const _TCHAR szThreeDots[]=_T("...");
-
- int nStringLen=lstrlen(lpszLong);
-
- CSize ext;
- if (m_nTabFlag == DT_EXPANDTABS)
- ext = pDC->GetTabbedTextExtent(lpszLong,nStringLen, 0, NULL);
- else
- ext = pDC->GetTextExtent(lpszLong,nStringLen);
- if(nStringLen==0 || ext.cx+nOffset<=nColumnLen)
- return(lpszLong);
-
- static _TCHAR szShort[MAX_PATH];
-
- lstrcpy(szShort,lpszLong);
- int nAddLen=pDC->GetTextExtent(szThreeDots,sizeof(szThreeDots)).cx;
-
- for(int i=nStringLen-1; i>0; i--)
- {
- szShort[i]=0;
- if (m_nTabFlag == DT_EXPANDTABS)
- ext = pDC->GetTabbedTextExtent(szShort,i, 0, NULL);
- else
- ext = pDC->GetTextExtent(szShort,i);
- if(ext.cx+nOffset+nAddLen<=nColumnLen)
- break;
- }
-
- lstrcat(szShort,szThreeDots);
-
- return(szShort);
-}
-
-void CListEx::RepaintSelectedItems()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- CRect rcItem, rcLabel;
-
-// invalidate focused item so it can repaint properly
-
- int nItem=ListCtrl.GetNextItem(-1,LVNI_FOCUSED);
-
- if(nItem!=-1)
- {
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_BOUNDS);
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcItem.left=rcLabel.left;
-
- ListCtrl.InvalidateRect(rcItem,FALSE);
- }
-
-// if selected items should not be preserved, invalidate them
-
- if(!(ListCtrl.GetStyle() & LVS_SHOWSELALWAYS))
- {
- for(nItem=ListCtrl.GetNextItem(-1,LVNI_SELECTED);
- nItem!=-1; nItem=ListCtrl.GetNextItem(nItem,LVNI_SELECTED))
- {
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_BOUNDS);
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcItem.left=rcLabel.left;
-
- ListCtrl.InvalidateRect(rcItem,FALSE);
- }
- }
-
-// update changes
-
- ListCtrl.UpdateWindow();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx diagnostics
-
-#ifdef _DEBUG
-
-void CListEx::Dump(CDumpContext& dc) const
-{
- dc << "m_bFullRowSel = " << (UINT)m_bFullRowSel;
- dc << "\n";
- dc << "m_cxStateImageOffset = " << m_cxStateImageOffset;
- dc << "\n";
-}
-
-#endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx message handlers
-
-// Class to allow public calls to CWnd::Default
-class WndAccess : public CWnd
-{
-protected:
- LRESULT CallWndDefault() { return CWnd::Default(); }
-public:
- static LRESULT CallDefault(CWnd * pwnd)
- {
- WndAccess * pw = (WndAccess *)pwnd;
- return pw->CallWndDefault();
- }
-};
-
-LRESULT CListEx::Default()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- return WndAccess::CallDefault(&ListCtrl);
-}
-
-LRESULT CListEx::OnSetImageList(WPARAM wParam, LPARAM lParam)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- if((int)wParam==LVSIL_STATE)
- {
- int cx, cy;
-
- if(::ImageList_GetIconSize((HIMAGELIST)lParam,&cx,&cy))
- m_cxStateImageOffset=cx;
- else
- m_cxStateImageOffset=0;
- }
-
- return(Default());
-}
-
-LRESULT CListEx::OnSetTextColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- m_clrText=(COLORREF)lParam;
- return(Default());
-}
-
-LRESULT CListEx::OnSetTextBkColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- m_clrTextBk=(COLORREF)lParam;
- return(Default());
-}
-
-LRESULT CListEx::OnSetBkColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- m_clrBkgnd=(COLORREF)lParam;
- return(Default());
-}
-
-void CListEx::OnSize(UINT nType, int cx, int cy)
-{
- m_cxClient=cx;
-}
-
-void CListEx::OnPaint()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- // in full row select mode, we need to extend the clipping region
- // so we can paint a selection all the way to the right
- if(m_bClientWidthSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT && GetFullRowSel())
- {
- CRect rcAllLabels;
- GetListCtrl().GetItemRect(0,rcAllLabels,LVIR_BOUNDS);
-
- if(rcAllLabels.right<m_cxClient)
- {
- // need to call BeginPaint (in CPaintDC c-tor)
- // to get correct clipping rect
- CPaintDC dc(&ListCtrl);
-
- CRect rcClip;
- dc.GetClipBox(rcClip);
-
- rcClip.left=min(rcAllLabels.right-1,rcClip.left);
- rcClip.right=m_cxClient;
-
- ListCtrl.InvalidateRect(rcClip,FALSE);
- // EndPaint will be called in CPaintDC d-tor
- }
- }
-}
-
-void CListEx::OnSetFocus(CWnd* pOldWnd)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // check if we are getting focus from label edit box
- if(pOldWnd!=NULL && pOldWnd->GetParent()==&ListCtrl)
- return;
-
- // repaint items that should change appearance
- if(m_bFullRowSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- RepaintSelectedItems();
-}
-
-void CListEx::OnKillFocus(CWnd* pNewWnd)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // check if we are losing focus to label edit box
- if(pNewWnd!=NULL && pNewWnd->GetParent()==&ListCtrl)
- return;
-
- // repaint items that should change appearance
- if(m_bFullRowSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- RepaintSelectedItems();
-}
-
-
-void CListEx::AddItem(int nItem,int nSubItem,LPCTSTR strItem)
-{
- LV_ITEM lvItem;
- lvItem.mask = LVIF_TEXT;
- lvItem.iItem = nItem;
-
- lvItem.iSubItem = nSubItem;
- lvItem.pszText = (LPTSTR)strItem;
-
- CListCtrl& lc = GetListCtrl();
- if(lvItem.iSubItem == 0)
- lc.InsertItem(&lvItem);
- else
- lc.SetItem(&lvItem);
-}
-
-
-void CListEx::SetImage(int nItem, UINT nImage)
-{
- LV_ITEM lvItem;
- lvItem.mask = LVIF_IMAGE;
- lvItem.iItem = nItem;
- lvItem.iSubItem = 0;
- lvItem.iImage = nImage;
-
- GetListCtrl().SetItem(&lvItem);
-}
-
-void CListEx::ClearSelection()
-{
- CListCtrl& ctl = GetListCtrl();
- int sel = -1;
-
- while ((sel=ctl.GetNextItem(sel, LVNI_SELECTED)) != -1)
- {
- ctl.SetItemState(sel, 0, LVIS_SELECTED);
- }
-}
-
-void CListEx::SelectItems(int nFirst, int nLast, BOOL bSelected /*=TRUE*/)
-{
- CListCtrl& ctl = GetListCtrl();
- int first = min(nFirst, nLast);
- int last = max(nFirst, nLast);
- UINT state = bSelected? LVIS_SELECTED : 0;
-
- for (int i=first; i <= last; i++)
- ctl.SetItemState(i, state, LVIS_SELECTED);
-}
-
-int CListEx::InsertColumn(int nCol, DWORD idstrColumnHeading, int nFormat /*= LVCFMT_LEFT*/, int nWidth /*= -1*/, int nSubItem /*= -1*/)
-{
- CString s;
- CListCtrl& ctl = GetListCtrl();
- s.LoadString(idstrColumnHeading);
- return ctl.InsertColumn(nCol, s, nFormat, nWidth, nSubItem);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx construction/destruction
-CListEx::CListEx(CListCtrl & listctrl)
-: m_listctrl(listctrl)
-{
- m_bFullRowSel=TRUE;
- m_bClientWidthSel=TRUE;
-
- m_cxClient=0;
- m_cxStateImageOffset=0;
-
- m_clrText=::GetSysColor(COLOR_WINDOWTEXT);
- m_clrTextBk=::GetSysColor(COLOR_WINDOW);
- m_clrBkgnd=::GetSysColor(COLOR_WINDOW);
- m_nTabFlag = DT_EXPANDTABS;
-}
-
Deleted: trunk/Src/Common/listvwex.h
===================================================================
--- trunk/Src/Common/listvwex.h 2007-01-10 13:44:44 UTC (rev 4022)
+++ trunk/Src/Common/listvwex.h 2007-01-10 13:46:26 UTC (rev 4023)
@@ -1,251 +0,0 @@
-// ListVwEx.h : interface of the CListViewEx class
-//
-// This class provedes a full row selection mode for the report
-// mode list view control.
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992-1996 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and related
-// electronic documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
-#ifndef LISTVIEWEX_H
-#define LISTVIEWEX_H
-
-class CListEx
-{
- friend class CListViewEx;
- friend class CListCtrlEx;
-
-// Construction
-public:
- CListEx(CListCtrl & listctrl);
-
-public:
- void SetExpandTabs(BOOL bExpand) { m_nTabFlag = bExpand? DT_EXPANDTABS : 0; }
- BOOL SetFullRowSel(BOOL bFillRowSel);
- BOOL GetFullRowSel() const { return m_bFullRowSel; }
- void AddItem(int nItem,int nSubItem,LPCTSTR strItem);
- void SetImage(int nItem, UINT nImage);
-
-public:
- void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct);
-
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 );
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE);
- void ClearSelection();
- virtual ~CListEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const;
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset);
- void RepaintSelectedItems();
-
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam);
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam);
-
-// message map functions
-protected:
- afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnPaint();
- afx_msg void OnSetFocus(CWnd* pOldWnd);
- afx_msg void OnKillFocus(CWnd* pNewWnd);
-
- LRESULT Default();
-
-
-// Attributes
-protected:
- BOOL m_bFullRowSel;
- UINT m_nTabFlag;
-
- BOOL m_bClientWidthSel;
-
-// Implementation - client area width
- int m_cxClient;
-
-// Implementation - state icon width
- int m_cxStateImageOffset;
-
-// Implementation - list view colors
- COLORREF m_clrText;
- COLORREF m_clrTextBk;
- COLORREF m_clrBkgnd;
-
-// Implementation - MFC object bound to window
- CListCtrl & m_listctrl;
- CListCtrl & GetListCtrl() { return m_listctrl; }
-};
-
-
-#include <afxcview.h>
-
-class CListViewEx : public CListView
-{
- DECLARE_DYNCREATE(CListViewEx)
-
-// Construction
-public:
- CListViewEx() : m_listex(GetListCtrl()) { }
-
-public:
- void SetExpandTabs(BOOL bExpand)
- { m_listex.SetExpandTabs(bExpand); }
- BOOL SetFullRowSel(BOOL bFillRowSel)
- { return m_listex.SetFullRowSel(bFillRowSel); }
- BOOL GetFullRowSel() const
- { return m_listex.GetFullRowSel(); }
- void AddItem(int nItem,int nSubItem, LPCTSTR strItem)
- { m_listex.AddItem(nItem, nSubItem, strItem); }
- void SetImage(int nItem, UINT nImage)
- { m_listex.SetImage(nItem, nImage); }
-
-// Overrides
-protected:
- virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
- { m_listex.DrawItem(lpDrawItemStruct); }
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CListViewEx)
- public:
- virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
- protected:
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 )
- { return m_listex.InsertColumn(nCol, idstrColumnHeading, nFormat, nWidth, nSubItem); }
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE)
- { m_listex.SelectItems(nFirst, nLast, bSelected); }
- void ClearSelection()
- { m_listex.ClearSelection(); }
- virtual ~CListViewEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const
- { CListView::Dump(dc); m_listex.Dump(dc); }
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
- { return m_listex.MakeShortString(pDC, lpszLong, nColumnLen, nOffset); }
- void RepaintSelectedItems()
- { m_listex.RepaintSelectedItems(); }
-
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetImageList(wParam, lParam); }
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextColor(wParam, lParam); }
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextBkColor(wParam, lParam); }
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetBkColor(wParam, lParam); }
-
-// Generated message map functions
-protected:
- //{{AFX_MSG(CListViewEx)
- afx_msg void OnSize(UINT nType, int cx, int cy) { m_listex.OnSize(nType, cx, cy); CListView::OnSize(nType, cx, cy); }
- afx_msg void OnPaint() { m_listex.OnPaint(); CListView::OnPaint(); }
- afx_msg void OnSetFocus(CWnd* pOldWnd) { CListView::OnSetFocus(pOldWnd); m_listex.OnSetFocus(pOldWnd); }
- afx_msg void OnKillFocus(CWnd* pNewWnd) { CListView::OnKillFocus(pNewWnd); m_listex.OnKillFocus(pNewWnd); }
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CListEx m_listex;
-};
-
-class CListCtrlEx : public CListCtrl
-{
- DECLARE_DYNCREATE(CListCtrlEx)
-
-// Construction
-public:
- CListCtrlEx();
-
-public:
- void SetExpandTabs(BOOL bExpand)
- { m_listex.SetExpandTabs(bExpand); }
- BOOL SetFullRowSel(BOOL bFillRowSel)
- { return m_listex.SetFullRowSel(bFillRowSel); }
- BOOL GetFullRowSel() const
- { return m_listex.GetFullRowSel(); }
- void AddItem(int nItem,int nSubItem, LPCTSTR strItem)
- { m_listex.AddItem(nItem, nSubItem, strItem); }
- void SetImage(int nItem, UINT nImage)
- { m_listex.SetImage(nItem, nImage); }
-
-// Overrides
-protected:
- virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
- { m_listex.DrawItem(lpDrawItemStruct); }
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CListCtrlEx)
- public:
- protected:
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 )
- { return m_listex.InsertColumn(nCol, idstrColumnHeading, nFormat, nWidth, nSubItem); }
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE)
- { m_listex.SelectItems(nFirst, nLast, bSelected); }
- void ClearSelection()
- { m_listex.ClearSelection(); }
- virtual ~CListCtrlEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const
- { CListCtrl::Dump(dc); m_listex.Dump(dc); }
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
- { return m_listex.MakeShortString(pDC, lpszLong, nColumnLen, nOffset); }
- void RepaintSelectedItems()
- { m_listex.RepaintSelectedItems(); }
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetImageList(wParam, lParam); }
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextColor(wParam, lParam); }
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextBkColor(wParam, lParam); }
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetBkColor(wParam, lParam); }
-
-// Generated message map functions
-protected:
- //{{AFX_MSG(CListCtrlEx)
- afx_msg void OnSize(UINT nType, int cx, int cy) { m_listex.OnSize(nType, cx, cy); CListCtrl::OnSize(nType, cx, cy); }
- afx_msg void OnPaint() { m_listex.OnPaint(); CListCtrl::OnPaint(); }
- afx_msg void OnSetFocus(CWnd* pOldWnd) { CListCtrl::OnSetFocus(pOldWnd); m_listex.OnSetFocus(pOldWnd); }
- afx_msg void OnKillFocus(CWnd* pNewWnd) { CListCtrl::OnKillFocus(pNewWnd); m_listex.OnKillFocus(pNewWnd); }
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CListEx m_listex;
-};
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-01-10 13:44:44 UTC (rev 4022)
+++ trunk/Src/Merge.dsp 2007-01-10 13:46:26 UTC (rev 4023)
@@ -465,10 +465,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\listvwex.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadSaveCodepageDlg.cpp
# End Source File
# Begin Source File
@@ -1229,10 +1225,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\listvwex.h
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadSaveCodepageDlg.h
# End Source File
# Begin Source File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-10 13:49:02
|
Revision: 4024
http://svn.sourceforge.net/winmerge/?rev=4024&view=rev
Author: galh
Date: 2007-01-10 05:49:00 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 13:46:26 UTC (rev 4023)
+++ trunk/Src/Changes.txt 2007-01-10 13:49:00 UTC (rev 4024)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2007-01-10 Gal
+ PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
+ Src: MergeEditView.cpp MergeEditView.h
+
+2007-01-10 Gal
PATCH: [ 1631215 ] Remove used files
Src: Merge.dsp
Src/Common deleted: listvwex.cpp listvwex.h
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2007-01-10 13:46:26 UTC (rev 4023)
+++ trunk/Src/MergeEditView.cpp 2007-01-10 13:49:00 UTC (rev 4024)
@@ -1464,19 +1464,14 @@
if (bScroll)
{
- int nDiffStart = GetSubLineIndex(curDiff.dbegin0);
- int nDiffEnd = GetSubLineIndex(curDiff.dend0);
-
- // If diff first line outside current view - context OR
- // if diff last line outside current view - context OR
- // if diff is bigger than screen
- // if diff is bigger than screen when word wrap enabled
- if ((nDiffStart < m_nTopSubLine) ||
- (nDiffEnd >= m_nTopSubLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
- (nDiffEnd - nDiffStart) >= GetScreenLines() ||
- (nDiffStart + GetSubLines(ptStart.y)) >= GetScreenLines())
+ if (IsDiffVisible(curDiff, CONTEXT_LINES_BELOW) == FALSE)
{
- int nLine = nDiffStart;
+ // 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;
@@ -2885,24 +2880,38 @@
}
/**
- * @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();
DIFFRANGE diff;
pd->m_diffList.GetDiff(nDiff, diff);
-
- int nDiffStart = GetSubLineIndex(diff.dbegin0);
- int nDiffEnd = GetSubLineIndex(diff.dend0);
+ 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.
+ */
+BOOL CMergeEditView::IsDiffVisible(const DIFFRANGE& diff, int nLinesBelow /*=0*/)
+{
+ const int nDiffStart = GetSubLineIndex(diff.dbegin0);
+ const int nDiffEnd = GetSubLineIndex(diff.dend0);
+ const int nDiffHeight = nDiffEnd - nDiffStart + GetSubLines(diff.dend0);
+
+ // If diff first line outside current view - context OR
+ // if diff last line outside current view - context OR
+ // if diff is bigger than screen
if ((nDiffStart < m_nTopSubLine) ||
- (nDiffEnd >= m_nTopSubLine + GetScreenLines()) ||
- (nDiffEnd - nDiffStart) >= GetScreenLines() ||
- (nDiffStart + GetSubLines(diff.dbegin0)) >= GetScreenLines())
+ (nDiffEnd >= m_nTopSubLine + GetScreenLines() - nLinesBelow) ||
+ (nDiffHeight >= GetScreenLines()))
{
return FALSE;
}
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2007-01-10 13:46:26 UTC (rev 4023)
+++ trunk/Src/MergeEditView.h 2007-01-10 13:49:00 UTC (rev 4024)
@@ -202,8 +202,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: <sdo...@us...> - 2007-01-10 14:13:08
|
Revision: 4025
http://svn.sourceforge.net/winmerge/?rev=4025&view=rev
Author: sdottaka
Date: 2007-01-10 06:12:58 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
BUG: [ 1630630 ] Unexpected selection of text after changing pane
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeEditView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-01-10 13:49:00 UTC (rev 4024)
+++ trunk/Src/Changes.txt 2007-01-10 14:12:58 UTC (rev 4025)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-10 Takashi
+ BUG: [ 1630630 ] Unexpected selection of text after changing pane
+ Src: MergeEditView.cpp
+
2007-01-10 Gal
PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
Src: MergeEditView.cpp MergeEditView.h
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2007-01-10 13:49:00 UTC (rev 4024)
+++ trunk/Src/MergeEditView.cpp 2007-01-10 14:12:58 UTC (rev 4025)
@@ -2183,6 +2183,8 @@
if (ptCursor.y >= pWnd->GetLineCount())
ptCursor.y = pWnd->GetLineCount() - 1;
pWnd->SetCursorPos(ptCursor);
+ pWnd->SetAnchor(ptCursor);
+ pWnd->SetSelection(ptCursor, ptCursor);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
