You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ki...@us...> - 2006-10-10 15:33:20
|
Revision: 3698
http://svn.sourceforge.net/winmerge/?rev=3698&view=rev
Author: kimmov
Date: 2006-10-10 08:33:12 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
PATCH: [ 1573933 ] Manual: Update introduction chapter
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Introduction.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-10 01:12:17 UTC (rev 3697)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-10 15:33:12 UTC (rev 3698)
@@ -1,3 +1,7 @@
+2006-10-10 Kimmo
+ PATCH: [ 1573933 ] Manual: Update introduction chapter
+ Manual: Introduction.xml
+
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Manual: Filters.xml
Modified: trunk/Docs/Users/Manual/Introduction.xml
===================================================================
--- trunk/Docs/Users/Manual/Introduction.xml 2006-10-10 01:12:17 UTC (rev 3697)
+++ trunk/Docs/Users/Manual/Introduction.xml 2006-10-10 15:33:12 UTC (rev 3698)
@@ -4,8 +4,8 @@
<para>WinMerge is an <ulink url="http://www.opensource.org/">Open
Source</ulink> visual text file differencing and merging tool for Win32
- platforms. WinMerge can compare directories and files and present
- differences in easy to understand and handle format.</para>
+ platforms. WinMerge can compare folders and files and present differences in
+ easy to understand and handle format.</para>
<para>WinMerge is highly useful for determining what has changed between
project versions, and then merging changes between versions. WinMerge can be
@@ -23,10 +23,8 @@
<para>Goal of WinMerge development is to make comparing and synch/merge of
directories and files easy and fast. While maintaining maximum reliability.
- Easiness reduces user errors. Latest 2.4 version was already good and
- popular version. In-development version 2.5 still improves in many areas.
- Note that 2.5 releases (beta or experimental) are not yet considered
- production-level releases.</para>
+ Easy of use reduces errors. Latest 2.6 version is considered a stable and
+ reliable program to use.</para>
<para>Please note that WinMerge is not a freeware, but it is <ulink
url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licenced. We have
@@ -114,8 +112,8 @@
versions relate to each other. Development always happens with
development versions (experimental versions and beta versions). At
proper points we create a new branch for stable releases. In above
- picture arrows for 2.2.x and 2.4.x are two current stable
- branches.</para>
+ picture arrows for 2.2.x and 2.4.x are two current stable branches.
+ Picture does not show 2.6 which is the latest stable branch.</para>
<important>
<para>Branch always means a separate development. There is no any
@@ -134,10 +132,9 @@
<para>What this branching also means is that stable versions don't get
many new features after a branch is created. Stable versions 2.4.0 and
- 2.4.6 are pretty much similar feature-wise. Next time the new features
- appear in stable release is in version 2.6.0 for which we create a new
- stable branch. Downside here is that it may be over an year between the
- stable branches.</para>
+ 2.4.6 are pretty much similar feature-wise. After 2.4 stable branch we
+ have already a created new stable branch 2.6. It has many imrovements
+ and fixes done after 2.4 branch was created.</para>
<para>Many software vendors always increase their version numbers and
say version with biggest version number is what people should use. If
@@ -205,7 +202,7 @@
<para>WinMerge source codes are available in <ulink
url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
page and from <ulink
- url="https://sourceforge.net/cvs/?group_id=13216">public CVS
+ url="https://sourceforge.net/cvs/?group_id=13216">public Subversion
server</ulink>. We welcome everybody to download the sources, study them
and alter them. If you find (and fix) bugs, improve something etc, please
submit your changes back to us as <ulink
@@ -231,14 +228,16 @@
<para><ulink
url="http://winmerge.sourceforge.net/developer/index.php">Developer
- pages</ulink> are good start if you want to help with
- development.</para>
+ pages</ulink> are good start if you want to help with development. We
+ have also created a <link linkend="???"><ulink
+ url="http://wiki.winmerge.org/">Developers-Wiki</ulink></link> for
+ developer documentation.</para>
- <para><ulink
- url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>
- is best place to discuss about development. If you are interested in
- helping with WinMerge development, let us know. If you want to fix one
- of our <ulink
+ <para><ulink url="???">Development-mailing</ulink> list is the preferred
+ place for development discussions. Another place is in <ulink
+ url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>.
+ If you are interested in helping with WinMerge development, let us know.
+ If you want to fix one of our <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=113216"
userlevel="">bugs</ulink> or implement a <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=363216">new
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <el...@us...> - 2006-10-10 01:13:11
|
Revision: 3697
http://svn.sourceforge.net/winmerge/?rev=3697&view=rev
Author: elsapo
Date: 2006-10-09 18:12:17 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
Merge in changes from my local UI version (no line transformations)
Modified Paths:
--------------
branches/Perry/Src/Common/MessageBoxDialog.h
branches/Perry/Src/Common/dllproxy.c
branches/Perry/Src/Common/unicoder.cpp
branches/Perry/Src/DiffFileData.cpp
branches/Perry/Src/DiffThread.cpp
branches/Perry/Src/DiffThread.h
branches/Perry/Src/DirCompProgressDlg.cpp
branches/Perry/Src/DirCompProgressDlg.h
branches/Perry/Src/DirDoc.cpp
branches/Perry/Src/DirDoc.h
branches/Perry/Src/DirView.cpp
branches/Perry/Src/DirView.h
branches/Perry/Src/DirViewColItems.cpp
branches/Perry/Src/LocationView.cpp
branches/Perry/Src/MainFrm.cpp
branches/Perry/Src/Merge.cpp
branches/Perry/Src/Merge.dsp
branches/Perry/Src/Merge.rc
branches/Perry/Src/MergeDoc.cpp
branches/Perry/Src/MergeEditView.cpp
branches/Perry/Src/MergeEditView.h
branches/Perry/Src/OptionsDef.h
branches/Perry/Src/OptionsInit.cpp
branches/Perry/Src/PropCompare.cpp
branches/Perry/Src/PropCompare.h
branches/Perry/Src/PropGeneral.cpp
branches/Perry/Src/PropGeneral.h
branches/Perry/Src/PropRegistry.cpp
branches/Perry/Src/diffutils/src/IO.C
branches/Perry/Src/editlib/ccrystaleditview.cpp
branches/Perry/Src/editlib/ccrystaleditview.h
branches/Perry/Src/editlib/ccrystaltextview.cpp
branches/Perry/Src/editlib/ccrystaltextview.h
branches/Perry/Src/editlib/ccrystaltextview2.cpp
branches/Perry/Src/editlib/ceditreplacedlg.cpp
branches/Perry/Src/editlib/ceditreplacedlg.h
branches/Perry/Src/editlib/cfindtextdlg.cpp
branches/Perry/Src/editlib/cfindtextdlg.h
branches/Perry/Src/editlib/cplusplus.cpp
branches/Perry/Src/editlib/editreg.h
branches/Perry/Src/editlib/gotodlg.cpp
branches/Perry/Src/editlib/gotodlg.h
branches/Perry/Src/resource.h
branches/Perry/Src/stringdiffs.cpp
branches/Perry/Testing/selftests/testdiff.pl
Added Paths:
-----------
branches/Perry/Src/DisplayProperties.cpp
branches/Perry/Src/DisplayProperties.h
branches/Perry/Src/PropertyDlg.cpp
branches/Perry/Src/PropertyDlg.h
branches/Perry/Src/res/dirstat_binarydiff.bmp
branches/Perry/Src/res/dirstat_binarysame.bmp
branches/Perry/Src/res/dirstat_equal.bmp
branches/Perry/Src/res/dirstat_error.bmp
branches/Perry/Src/res/dirstat_fileskip.bmp
branches/Perry/Src/res/dirstat_folder.bmp
branches/Perry/Src/res/dirstat_folderskip.bmp
branches/Perry/Src/res/dirstat_lfile.bmp
branches/Perry/Src/res/dirstat_lfolder.bmp
branches/Perry/Src/res/dirstat_notequal.bmp
branches/Perry/Src/res/dirstat_rfile.bmp
branches/Perry/Src/res/dirstat_rfolder.bmp
branches/Perry/branch.txt
Modified: branches/Perry/Src/Common/MessageBoxDialog.h
===================================================================
--- branches/Perry/Src/Common/MessageBoxDialog.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/Common/MessageBoxDialog.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -159,7 +159,7 @@
// Methods for handling common window functions.
// Method for displaying the dialog.
- virtual INT_PTR DoModal ( );
+ virtual int DoModal ( );
// Method for closing the dialog.
void EndDialog ( int nResult );
Modified: branches/Perry/Src/Common/dllproxy.c
===================================================================
--- branches/Perry/Src/Common/dllproxy.c 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/Common/dllproxy.c 2006-10-10 01:12:17 UTC (rev 3697)
@@ -93,6 +93,7 @@
return TlsGetValue(ThreadTopOfStack);
}
+#pragma warning (disable:4731) // warning C4731: 'Unresolved' : frame pointer register 'ebp' modified by inline assembly code
static INT NTAPI Unresolved()
{
// declare a variable to produce a stack frame
@@ -126,6 +127,7 @@
#endif
return Unresolved;
}
+#pragma warning (default:4731) // warning C4731: 'Unresolved' : frame pointer register 'ebp' modified by inline assembly code
#else
#ifdef _MSC_VER
Modified: branches/Perry/Src/Common/unicoder.cpp
===================================================================
--- branches/Perry/Src/Common/unicoder.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/Common/unicoder.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -502,6 +502,15 @@
int n = MultiByteToWideChar(codepage, flags, lpd, len, wbuff, wlen-1);
if (n)
{
+ /*
+ NB: MultiByteToWideChar is documented as only zero-terminating
+ if input was zero-terminated, but it appears that it can
+ zero-terminate even if input wasn't.
+ So we check if it zero-terminated and adjust count accordingly.
+ */
+ if (wbuff[n-1] == 0)
+ --n;
+
str.ReleaseBuffer(n);
return str;
}
Modified: branches/Perry/Src/DiffFileData.cpp
===================================================================
--- branches/Perry/Src/DiffFileData.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DiffFileData.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -643,7 +643,8 @@
if (!eof[i] && bfend[i]<countof(buff[i])-1)
{
// Assume our blocks are in range of unsigned int
- unsigned int space = countof(buff[i]) - bfend[i];
+ _int64 space64 = countof(buff[i]) - bfend[i];
+ unsigned int space = static_cast<unsigned int>(space64);
size_t rtn = fread(&buff[i][bfend[i]], 1, space, fp[i]);
if (ferror(fp[i]))
return DIFFCODE::CMPERR;
Modified: branches/Perry/Src/DiffThread.cpp
===================================================================
--- branches/Perry/Src/DiffThread.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DiffThread.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -33,12 +33,7 @@
#include "CompareStats.h"
#include "IAbortable.h"
-// Set this to true in order to single step
-// through entire compare process all in a single thread
-// Either edit this line, or breakpoint & change it in CompareDirectories() below
-static bool bSinglethreaded=false;
-
/**
* @brief Data sent to diff thread
*/
@@ -112,7 +107,7 @@
/**
* @brief Start directory compare thread
*/
-UINT CDiffThread::CompareDirectories(CString dir1, CString dir2, BOOL bRecursive)
+UINT CDiffThread::CompareDirectories(CString dir1, CString dir2, BOOL bRecursive, bool bSingleThreaded)
{
ASSERT(m_pDiffParm->nThreadState != THREAD_COMPARING);
@@ -128,7 +123,7 @@
m_pDiffParm->nThreadState = THREAD_COMPARING;
- if (bSinglethreaded)
+ if (bSingleThreaded)
{
DiffThread(m_pDiffParm);
}
Modified: branches/Perry/Src/DiffThread.h
===================================================================
--- branches/Perry/Src/DiffThread.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DiffThread.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -52,7 +52,7 @@
CDiffThread();
~CDiffThread();
CDiffContext * SetContext(CDiffContext * pCtx);
- UINT CompareDirectories(CString dir1, CString dir2, BOOL bRecursive);
+ UINT CompareDirectories(CString dir1, CString dir2, BOOL bRecursive, bool bSingleThreaded);
void SetHwnd(HWND hWnd);
void SetMessageIDs(UINT updateMsg, UINT statusMsg);
void SetCompareSelected(bool bSelected = false);
Modified: branches/Perry/Src/DirCompProgressDlg.cpp
===================================================================
--- branches/Perry/Src/DirCompProgressDlg.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirCompProgressDlg.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -41,6 +41,19 @@
*/
void DirCompProgressDlg::ClearStat()
{
+ SetDlgItemInt(IDC_COUNT_LFILE, 0);
+ SetDlgItemInt(IDC_COUNT_RFILE, 0);
+ SetDlgItemInt(IDC_COUNT_NOTEQUAL, 0);
+ SetDlgItemInt(IDC_COUNT_EQUAL, 0);
+ SetDlgItemInt(IDC_COUNT_BINARYSAME, 0);
+ SetDlgItemInt(IDC_COUNT_BINARYDIFF, 0);
+ SetDlgItemInt(IDC_COUNT_LFOLDER, 0);
+ SetDlgItemInt(IDC_COUNT_RFOLDER, 0);
+ SetDlgItemInt(IDC_COUNT_FILESKIP, 0);
+ SetDlgItemInt(IDC_COUNT_FOLDERSKIP, 0);
+ SetDlgItemInt(IDC_COUNT_FOLDER, 0);
+ SetDlgItemInt(IDC_COUNT_ERROR, 0);
+
CProgressCtrl *pProg = (CProgressCtrl*) GetDlgItem(IDC_PROGRESSCOMPARE);
pProg->SetPos(0);
@@ -100,6 +113,69 @@
}
/**
+ * @brief Return control ID for result code.
+ */
+UINT DirCompProgressDlg::GetIDFromResult(CompareStats::RESULT res)
+{
+ UINT resID = 0;
+
+ switch ((int)res)
+ {
+ case CompareStats::RESULT_LUNIQUE:
+ resID = IDC_COUNT_LFILE;
+ break;
+ case CompareStats::RESULT_RUNIQUE:
+ resID = IDC_COUNT_RFILE;
+ break;
+ case CompareStats::RESULT_DIFF:
+ resID = IDC_COUNT_NOTEQUAL;
+ break;
+ case CompareStats::RESULT_SAME:
+ resID = IDC_COUNT_EQUAL;
+ break;
+ case CompareStats::RESULT_BINSAME:
+ resID = IDC_COUNT_BINARYSAME;
+ break;
+ case CompareStats::RESULT_BINDIFF:
+ resID = IDC_COUNT_BINARYDIFF;
+ break;
+ case CompareStats::RESULT_LDIRUNIQUE:
+ resID = IDC_COUNT_LFOLDER;
+ break;
+ case CompareStats::RESULT_RDIRUNIQUE:
+ resID = IDC_COUNT_RFOLDER;
+ break;
+ case CompareStats::RESULT_SKIP:
+ resID = IDC_COUNT_FILESKIP;
+ break;
+ case CompareStats::RESULT_DIRSKIP:
+ resID = IDC_COUNT_FOLDERSKIP;
+ break;
+ case CompareStats::RESULT_DIR:
+ resID = IDC_COUNT_FOLDER;
+ break;
+ case CompareStats::RESULT_ERROR:
+ resID = IDC_COUNT_ERROR;
+ break;
+ }
+ return resID;
+}
+
+/**
+ * @brief Update all status counts at current values.
+ */
+void DirCompProgressDlg::UpdateElements()
+{
+ for (int i = 0; i < CompareStats::RESULT_COUNT; i++)
+ {
+ CompareStats::RESULT resnum = static_cast<CompareStats::RESULT>(i);
+ UINT resID = GetIDFromResult(resnum);
+ int count = m_pCompareStats->GetCount(resnum);
+ SetDlgItemInt(resID, count);
+ }
+}
+
+/**
* @brief Handle WM_KEYDOWN messages before normal processing
* to allow any key close stateDlg.
*/
@@ -169,6 +245,7 @@
_itot(comparedItems, num, 10);
pCompared->SetWindowText(num);
pProg->SetPos(comparedItems);
+ UpdateElements();
m_prevState = CompareStats::STATE_COMPARE;
}
// Comparing items
@@ -180,6 +257,7 @@
_itot(comparedItems, num, 10);
pCompared->SetWindowText(num);
pProg->SetPos(comparedItems);
+ UpdateElements();
}
// Compare is ready
// Update total items too since we might get only this one state
@@ -196,6 +274,7 @@
pTotal->SetWindowText(num);
pProg->SetRange32(0, totalItems);
pProg->SetPos(comparedItems);
+ UpdateElements();
EndUpdating();
m_prevState = CompareStats::STATE_COMPARE;
m_bCompareReady = TRUE;
Modified: branches/Perry/Src/DirCompProgressDlg.h
===================================================================
--- branches/Perry/Src/DirCompProgressDlg.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirCompProgressDlg.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -46,6 +46,8 @@
void EndUpdating();
void CloseDialog();
void SetDirDoc(CDirDoc *pDirDoc);
+ void UpdateElements();
+ UINT GetIDFromResult(CompareStats::RESULT res);
// Dialog Data
//{{AFX_DATA(DirCompProgressDlg)
Modified: branches/Perry/Src/DirDoc.cpp
===================================================================
--- branches/Perry/Src/DirDoc.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirDoc.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -324,13 +324,15 @@
m_pDirView->DeleteAllDisplayItems();
m_diffWrapper.StartDirectoryDiff();
+
+ bool bSingleThreaded = GetOptionsMgr()->GetBool(OPT_CMP_SINGLETHREADED);
m_diffThread.SetContext(m_pCtxt);
m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd());
m_diffThread.SetMessageIDs(MSG_UI_UPDATE, MSG_STAT_UPDATE);
m_diffThread.SetCompareSelected(!!m_bMarkedRescan);
m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft(),
- m_pCtxt->GetNormalizedRight(), m_bRecursive);
+ m_pCtxt->GetNormalizedRight(), m_bRecursive, bSingleThreaded);
m_bMarkedRescan = FALSE;
}
Modified: branches/Perry/Src/DirDoc.h
===================================================================
--- branches/Perry/Src/DirDoc.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirDoc.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -151,6 +151,8 @@
void SetItemViewFlag(POSITION key, UINT flag, UINT mask);
void SetItemViewFlag(UINT flag, UINT mask);
const CompareStats * GetCompareStats() const { return m_pCompareStats; };
+ CString GetLeftDesc() const { return m_strLeftDesc; }
+ CString GetRightDesc() const { return m_strRightDesc; }
protected:
CDiffWrapper m_diffWrapper;
Modified: branches/Perry/Src/DirView.cpp
===================================================================
--- branches/Perry/Src/DirView.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirView.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -46,6 +46,7 @@
#include "DirCmpReport.h"
#include "DirCompProgressDlg.h"
#include "CompareStatisticsDlg.h"
+#include "DisplayProperties.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -193,6 +194,8 @@
ON_COMMAND(ID_EDIT_PASTE, OnEditPaste)
ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
+ ON_COMMAND(ID_DIR_ITEM_PROPERTIES, OnItemProperties)
+ ON_UPDATE_COMMAND_UI(ID_DIR_ITEM_PROPERTIES, OnUpdateItemProperties)
//}}AFX_MSG_MAP
ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
@@ -2025,9 +2028,12 @@
ASSERT(pDoc);
// Close and destroy the dialog after compare
- m_pCmpProgressDlg->CloseDialog();
- delete m_pCmpProgressDlg;
- m_pCmpProgressDlg = NULL;
+ if (GetOptionsMgr()->GetBool(OPT_AUTOCLOSE_DIRCOMP_STATS))
+ {
+ m_pCmpProgressDlg->CloseDialog();
+ delete m_pCmpProgressDlg;
+ m_pCmpProgressDlg = NULL;
+ }
pDoc->CompareReady();
Redisplay();
@@ -3052,3 +3058,79 @@
pCmdUI->Enable(FALSE);
}
}
+
+static void AddProps(PropertyList & props, PROPSIDE side, const DiffFileInfo & finfo)
+{
+ props.AddProperty(_T("Attr"), side, finfo.flags.toString());
+ props.AddProperty(_T("Encoding"), side, finfo.encoding.GetName());
+ props.AddProperty(_T("Zeros, number"), side, finfo.m_textStats.nzeros);
+ props.AddProperty(_T("Zeros, first offset"), side, finfo.m_textStats.first_zero);
+ props.AddProperty(_T("Zeros, last offset"), side, finfo.m_textStats.last_zero);
+ props.AddProperty(_T("ncrs"), side, finfo.m_textStats.ncrs);
+ props.AddProperty(_T("nlfs"), side, finfo.m_textStats.nlfs);
+ props.AddProperty(_T("ncrlfs"), side, finfo.m_textStats.ncrlfs);
+ props.AddProperty(_T("nlosses"), side, finfo.m_textStats.nlosses);
+}
+
+/**
+ * @brief For now, just display msgbox with comparison results, so use can see error
+ *
+ * @todo Should do dialog with complete paths and perhaps more info
+ * Maybe a treeview or listview of all known column properties as well
+ */
+void CDirView::DoDisplayItemProperties()
+{
+ int sel = GetSingleSelectedItem();
+ if (sel == -1)
+ return;
+ const DIFFITEM& di = GetDiffItem(sel);
+ if (di.empty)
+ return;
+ PropertyList props;
+ CString filename = (di.isSideRight() ? di.sRightFilename : di.sLeftFilename);
+ props.AddProperty(_T("Filename"), PNONE, filename);
+ props.AddProperty(_T("Subdir"), PRIGHT, di.sRightSubdir);
+ props.AddProperty(_T("Subdir"), PLEFT, di.sLeftSubdir);
+ props.AddProperty(_T("Error"), PNONE, di.errorDesc);
+ props.AddProperty(_T("Diffs(sig)"), PNONE, di.nsdiffs);
+ props.AddProperty(_T("Diffs(insig)"), PNONE, di.nidiffs);
+ AddProps(props, PLEFT, di.left);
+ AddProps(props, PRIGHT, di.right);
+
+ DisplayProperties(this, props);
+}
+
+/**
+ * @brief Display item properties
+ */
+void CDirView::OnItemProperties()
+{
+ DoDisplayItemProperties();
+}
+
+/**
+ * @brief Update "Item Properties" menu item
+ */
+void CDirView::OnUpdateItemProperties(CCmdUI* pCmdUI)
+{
+ DoUpdateItemProperties(pCmdUI);
+}
+
+/**
+ * @brief Update "Item Properties" menu item
+ *
+ * Currently we only display properties for single non-empty items
+ */
+void CDirView::DoUpdateItemProperties(CCmdUI* pCmdUI)
+{
+ BOOL bEnable = FALSE;
+ int sel = GetSingleSelectedItem();
+ if (sel != -1)
+ {
+ const DIFFITEM& di = GetDiffItem(sel);
+ if (!di.empty)
+ bEnable = TRUE;
+ }
+ pCmdUI->Enable(bEnable);
+
+}
Modified: branches/Perry/Src/DirView.h
===================================================================
--- branches/Perry/Src/DirView.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirView.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -173,6 +173,7 @@
void DoUpdateFileEncodingDialog(CCmdUI* pCmdUI);
BOOL DoItemRename(LPCTSTR szNewItemName);
BOOL RenameOnSameDir(LPCTSTR szOldFileName, LPCTSTR szNewFileName);
+ void DoDisplayItemProperties();
// End DirActions.cpp
void ReflectGetdispinfo(NMLVDISPINFO *);
@@ -367,6 +368,8 @@
afx_msg void OnEditPaste();
afx_msg void OnEditUndo();
afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI);
+ afx_msg void OnItemProperties();
+ afx_msg void OnUpdateItemProperties(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
@@ -396,6 +399,7 @@
void DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI);
+ void DoUpdateItemProperties(CCmdUI* pCmdUI);
POSITION GetItemKeyFromData(DWORD dw) const;
DIFFITEM GetDiffItem(int sel) const;
DIFFITEM & GetDiffItemRef(int sel);
Modified: branches/Perry/Src/DirViewColItems.cpp
===================================================================
--- branches/Perry/Src/DirViewColItems.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/DirViewColItems.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -241,11 +241,11 @@
}
else if (di.isSideLeft())
{
- AfxFormatString1(s, IDS_ONLY_IN_FMT, di.getLeftFilepath(pCtxt->GetNormalizedLeft()));
+ AfxFormatString1(s, IDS_LEFT_ONLY_IN_FMT, di.getLeftFilepath(pCtxt->GetNormalizedLeft()));
}
else if (di.isSideRight())
{
- 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())
{
Added: branches/Perry/Src/DisplayProperties.cpp
===================================================================
--- branches/Perry/Src/DisplayProperties.cpp (rev 0)
+++ branches/Perry/Src/DisplayProperties.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -0,0 +1,11 @@
+#include "StdAfx.h"
+#include "resource.h"
+#include "DisplayProperties.h"
+#include "PropertyDlg.h"
+
+void DisplayProperties(CWnd * parent, const PropertyList & props)
+{
+ PropertyDlg dlg(parent, props);
+ dlg.DoModal();
+}
+
Added: branches/Perry/Src/DisplayProperties.h
===================================================================
--- branches/Perry/Src/DisplayProperties.h (rev 0)
+++ branches/Perry/Src/DisplayProperties.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -0,0 +1,26 @@
+#ifndef PropertyDialog_h_included
+#define PropertyDialog_h_included
+
+typedef enum { PLEFT, PRIGHT, PNONE } PROPSIDE;
+struct Property
+{
+ CString name;
+ PROPSIDE side;
+ CString value;
+ Property() { }
+ Property(LPCTSTR tname, PROPSIDE tside, LPCTSTR tvalue) : name(tname), side(tside), value(tvalue) { }
+};
+
+class PropertyList : public CList<Property>
+{
+public:
+ PropertyList() { }
+ void AddProperty(LPCTSTR name, PROPSIDE side, LPCTSTR value) { Property prop(name, side, value); AddTail(prop); }
+ void AddProperty(LPCTSTR name, PROPSIDE side, int value) { CString sval; sval.Format(_T("%d"), value); Property prop(name, side, sval); AddTail(prop); }
+ void AddProperty(LPCTSTR name, PROPSIDE side, unsigned int value) { CString sval; sval.Format(_T("%d"), value); Property prop(name, side, sval); AddTail(prop); }
+ void AddProperty(LPCTSTR name, PROPSIDE side, __int64 value) { CString sval; sval.Format(_T("%d"), value); Property prop(name, side, sval); AddTail(prop); }
+};
+
+void DisplayProperties(CWnd * parent, const PropertyList & props);
+
+#endif // PropertyDialog_h_included
Modified: branches/Perry/Src/LocationView.cpp
===================================================================
--- branches/Perry/Src/LocationView.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/LocationView.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -191,8 +191,8 @@
// Draw bar outlines
CPen* oldObj = (CPen*)pDC->SelectStockObject(BLACK_PEN);
- pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, LineInPix * nbLines + Y_OFFSET);
- pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, LineInPix * nbLines + Y_OFFSET);
+ pDC->Rectangle(m_nLeftBarLeft, Y_OFFSET - 1, m_nLeftBarRight, (int)(LineInPix * nbLines) + Y_OFFSET);
+ pDC->Rectangle(m_nRightBarLeft, Y_OFFSET - 1, m_nRightBarRight, (int)(LineInPix * nbLines) + Y_OFFSET);
pDC->SelectObject(oldObj);
while (true)
Modified: branches/Perry/Src/MainFrm.cpp
===================================================================
--- branches/Perry/Src/MainFrm.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/MainFrm.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -402,7 +402,7 @@
// Finds debug menu by looking for a submenu which
// starts with item ID_DEBUG_LOADCONFIG
- for (int i=0; i< menu->GetMenuItemCount(); ++i)
+ for (UINT i=0; i< menu->GetMenuItemCount(); ++i)
{
if (menu->GetSubMenu(i)->GetMenuItemID(0) == ID_DEBUG_LOADCONFIG)
{
@@ -1232,7 +1232,7 @@
// Add backup extension if pathlength allows it
BOOL success = TRUE;
CString s = pszPath;
- if (s.GetLength() >= (MAX_PATH - _tcslen(BACKUP_FILE_EXT)))
+ if (s.GetLength() >= (MAX_PATH - (int)_tcslen(BACKUP_FILE_EXT)))
success = FALSE;
else
s += BACKUP_FILE_EXT;
Modified: branches/Perry/Src/Merge.cpp
===================================================================
--- branches/Perry/Src/Merge.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/Merge.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -203,19 +203,20 @@
// WinMerge registry settings are stored under HKEY_CURRENT_USER/Software/Thingamahoochie
// This is the name of the company of the original author (Dean Grimm)
- SetRegistryKey(_T("Thingamahoochie"));
+ SetRegistryKey(_T("WinMergeX"));
BOOL bSingleInstance = GetProfileInt(_T("Settings"), _T("SingleInstance"), FALSE) ||
(TRUE == cmdInfo.m_bSingleInstance);
HANDLE hMutex = NULL;
+ CString mutexGuid = _T("{E10D9583-1261-47c8-B973-9E4F88074D72}");
if (bSingleInstance)
{
- hMutex = CreateMutex(NULL, FALSE, _T("WinMerge{05963771-8B2E-11d8-B3B9-000000000000}"));
+ hMutex = CreateMutex(NULL, FALSE, mutexGuid);
WaitForSingleObject(hMutex, INFINITE);
}
- CInstanceChecker instanceChecker(_T("{05963771-8B2E-11d8-B3B9-000000000000}"));
+ CInstanceChecker instanceChecker(mutexGuid);
if (bSingleInstance)
{
if (instanceChecker.PreviousInstanceRunning())
Modified: branches/Perry/Src/Merge.dsp
===================================================================
--- branches/Perry/Src/Merge.dsp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/Merge.dsp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -380,6 +380,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DisplayProperties.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\dlgutil.cpp
# End Source File
# Begin Source File
@@ -683,6 +687,10 @@
# End Source File
# Begin Source File
+SOURCE=.\PropertyDlg.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\PropertyPageHost.cpp
# End Source File
# Begin Source File
@@ -1097,6 +1105,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DisplayProperties.h
+# End Source File
+# Begin Source File
+
SOURCE=.\dlgutil.h
# End Source File
# Begin Source File
@@ -1345,6 +1357,10 @@
# End Source File
# Begin Source File
+SOURCE=.\PropertyDlg.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\PropertyPageHost.h
# End Source File
# Begin Source File
Modified: branches/Perry/Src/Merge.rc
===================================================================
--- branches/Perry/Src/Merge.rc 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/Merge.rc 2006-10-10 01:12:17 UTC (rev 3697)
@@ -531,7 +531,9 @@
MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
MENUITEM SEPARATOR
- MENUITEM "&Refresh", ID_DIR_RESCAN
+ MENUITEM "Properties", ID_DIR_ITEM_PROPERTIES
+ MENUITEM SEPARATOR
+ MENUITEM "&Refresh", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
@@ -632,11 +634,11 @@
IDD_ABOUTBOX DIALOGEX 0, 0, 223, 124
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "About WinMerge"
+CAPTION "About WinMergeX"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDR_MAINFRAME,IDC_STATIC,24,14,21,20
- LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
+ LTEXT "WinMergeX",IDC_STATIC,63,13,63,8,SS_NOPREFIX
LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX
LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
LTEXT "All rights reserved.",IDC_STATIC,7,60,170,8
@@ -753,6 +755,8 @@
IDC_STATIC,7,153,168,31
PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
WS_TABSTOP
+ CONTROL "AutoClose Dir Stats",IDC_AUTOCLOSE_DIRCOMP_STATS,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,139,36,89,10
END
IDD_LANGUAGE_SELECT DIALOGEX 0, 0, 214, 142
@@ -1072,9 +1076,9 @@
ES_READONLY
END
-IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 256, 60
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 330, 110
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
- WS_CAPTION
+ WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -1087,6 +1091,61 @@
LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
LTEXT "Items compared:",IDC_STATIC,7,29,85,8
LTEXT "Items total:",IDC_STATIC,7,19,85,8
+ LTEXT "",IDC_STATIC,3,64,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,3,84,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,56,64,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,56,84,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,109,64,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,109,84,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,162,64,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,162,84,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,215,64,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,215,84,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,268,64,51,17,SS_SUNKEN | NOT WS_GROUP
+ LTEXT "",IDC_STATIC,268,84,51,17,SS_SUNKEN | NOT WS_GROUP
+ CONTROL 7410,IDC_STATIC,"Static",SS_BITMAP,7,68,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7411,IDC_STATIC,"Static",SS_BITMAP,7,87,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7412,IDC_STATIC,"Static",SS_BITMAP,60,68,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7413,IDC_STATIC,"Static",SS_BITMAP,60,87,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7414,IDC_STATIC,"Static",SS_BITMAP,113,68,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7415,IDC_STATIC,"Static",SS_BITMAP,113,87,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7416,IDC_STATIC,"Static",SS_BITMAP,165,68,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7417,IDC_STATIC,"Static",SS_BITMAP,165,87,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7418,IDC_STATIC,"Static",SS_BITMAP,218,68,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7419,IDC_STATIC,"Static",SS_BITMAP,218,87,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7420,IDC_STATIC,"Static",SS_BITMAP,271,68,12,11,
+ WS_EX_STATICEDGE
+ CONTROL 7421,IDC_STATIC,"Static",SS_BITMAP,271,87,12,11,
+ WS_EX_STATICEDGE
+ RTEXT "",IDC_COUNT_FOLDER,24,70,26,8,SS_REALSIZEIMAGE | 0x2000
+ RTEXT "",IDC_COUNT_ERROR,24,89,26,8,SS_REALSIZEIMAGE | 0x2000
+ RTEXT "",IDC_COUNT_LFOLDER,76,70,26,8,SS_REALSIZEIMAGE |
+ 0x2000
+ RTEXT "",IDC_COUNT_RFOLDER,76,89,26,8,SS_REALSIZEIMAGE |
+ 0x2000
+ RTEXT "",IDC_COUNT_EQUAL,129,70,26,8,SS_REALSIZEIMAGE | 0x2000
+ RTEXT "",IDC_COUNT_NOTEQUAL,129,89,26,8,SS_REALSIZEIMAGE |
+ 0x2000
+ RTEXT "",IDC_COUNT_BINARYSAME,182,70,26,8,SS_REALSIZEIMAGE |
+ 0x2000
+ RTEXT "",IDC_COUNT_BINARYDIFF,182,89,26,8,SS_REALSIZEIMAGE |
+ 0x2000
+ RTEXT "",IDC_COUNT_LFILE,235,70,26,8,SS_REALSIZEIMAGE | 0x2000
+ RTEXT "",IDC_COUNT_RFILE,235,89,26,8,SS_REALSIZEIMAGE | 0x2000
+ RTEXT "",IDC_COUNT_FOLDERSKIP,288,70,26,8,SS_REALSIZEIMAGE |
+ 0x2000
+ RTEXT "",IDC_COUNT_FILESKIP,288,89,26,8,SS_REALSIZEIMAGE |
+ 0x2000
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
@@ -1141,6 +1200,8 @@
CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
PUSHBUTTON "Defaults",IDC_COMPARE_DEFAULTS,7,179,50,14
+ CONTROL "SingleThreaded",IDC_SINGLETHREADED,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,128,177,82,9
END
IDD_PROPPAGE_EDITOR DIALOGEX 0, 0, 235, 186
@@ -1569,6 +1630,18 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPERTYDIALOG DIALOGEX 0, 0, 274, 126
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU |
+ WS_THICKFRAME
+CAPTION "Properties"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ CONTROL "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT |
+ WS_BORDER | WS_TABSTOP,7,7,260,59
+ EDITTEXT IDC_EDIT,7,70,260,49,ES_MULTILINE | ES_AUTOHSCROLL |
+ WS_VSCROLL
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1576,8 +1649,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,0,0
- PRODUCTVERSION 0,0,0,0
+ FILEVERSION 1,0,0,16281
+ PRODUCTVERSION 1,0,0,16281
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x9L
@@ -1593,13 +1666,13 @@
BLOCK "040904e4"
BEGIN
VALUE "Comments", "English translation by developers"
- VALUE "FileDescription", "WinMerge Application\0"
+ VALUE "FileDescription", "WinMergeX Application\0"
VALUE "FileVersion", "000.000.000.000\0"
- VALUE "InternalName", "WinMerge\0"
+ VALUE "InternalName", "WinMergeX\0"
VALUE "LegalCopyright", "\xA9 1996-2006 Dean P. Grimm / Thingamahoochie Software\0"
- VALUE "OriginalFilename", "WinMerge.EXE\0"
+ VALUE "OriginalFilename", "WinMergeX.EXE\0"
VALUE "PrivateBuild", ""
- VALUE "ProductName", "WinMerge\0"
+ VALUE "ProductName", "WinMergeX\0"
VALUE "ProductVersion", "000.000.000.000\0"
END
END
@@ -1691,8 +1764,19 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "res\\clear_bookmarks.bmp"
+IDB_FOLDER BITMAP "res\\dirstat_folder.bmp"
+IDB_ERROR BITMAP "res\\dirstat_error.bmp"
+IDB_LFOLDER BITMAP "res\\dirstat_lfolder.bmp"
+IDB_RFOLDER BITMAP "res\\dirstat_rfolder.bmp"
+IDB_EQUAL BITMAP "res\\dirstat_equal.bmp"
+IDB_NOTEQUAL BITMAP "res\\dirstat_notequal.bmp"
+IDB_BINARYSAME BITMAP "res\\dirstat_binarysame.bmp"
+IDB_BINARYDIFF BITMAP "res\\dirstat_binarydiff.bmp"
+IDB_LFILE BITMAP "res\\dirstat_lfile.bmp"
+IDB_RFILE BITMAP "res\\dirstat_rfile.bmp"
+IDB_FOLDERSKIP BITMAP "res\\dirstat_folderskip.bmp"
+IDB_FILESKIP BITMAP "res\\dirstat_fileskip.bmp"
-
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
@@ -1708,7 +1792,7 @@
STRINGTABLE
BEGIN
- AFX_IDS_APP_TITLE "WinMerge"
+ AFX_IDS_APP_TITLE "WinMergeX"
AFX_IDS_IDLEMESSAGE "Ready"
END
@@ -1849,7 +1933,7 @@
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
- IDR_MAINFRAME "WinMerge"
+ IDR_MAINFRAME "WinMergeX"
IDR_MERGEDOCTYPE "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
END
@@ -2279,7 +2363,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"
@@ -2921,6 +3006,17 @@
IDS_AUTOCOMPLETE_MRU "From MRU list"
END
+// Find/Replace customization
+STRINGTABLE
+BEGIN
+ IDS_FIND_IN_LEFT_FILE "Find In Left File"
+ IDS_FIND_IN_RIGHT_FILE "Find In Right File"
+ IDS_REPLACE_IN_LEFT_FILE "Replace In Left File"
+ IDS_REPLACE_IN_RIGHT_FILE "Replace In Right File"
+ IDS_GOTO_IN_LEFT_FILE "Goto (Left)"
+ IDS_GOTO_IN_RIGHT_FILE "Goto (Right)"
+END
+
// END STRINGS SYNCHRO
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
Modified: branches/Perry/Src/MergeDoc.cpp
===================================================================
--- branches/Perry/Src/MergeDoc.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/MergeDoc.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -2369,8 +2369,8 @@
dfi.Update(szPath);
- int timeDiff = dfi.mtime - fileInfo->mtime;
- timeDiff = abs(timeDiff);
+ __int64 timeDiff = dfi.mtime - fileInfo->mtime;
+ timeDiff = abs((int)timeDiff);
if (timeDiff > tolerance ||
dfi.size != fileInfo->size)
{
@@ -2982,19 +2982,23 @@
*/
void CMergeDoc::UpdateHeaderPath(int pane)
{
- CChildFrame *pf = GetParentFrame();
- ASSERT(pf);
CString sText;
BOOL bChanges = FALSE;
- if (m_nBufferType[pane] == BUFFER_UNNAMED ||
- m_nBufferType[pane] == BUFFER_NORMAL_NAMED)
+ sText = m_strDesc[pane];
+ if (sText.IsEmpty())
{
- sText = m_strDesc[pane];
+ if (pane == MERGE_VIEW_LEFT)
+ sText = m_pDirDoc->GetLeftDesc();
+ else
+ sText = m_pDirDoc->GetRightDesc();
}
- else
+
+ if (!(m_nBufferType[pane] == BUFFER_UNNAMED ||
+ m_nBufferType[pane] == BUFFER_NORMAL_NAMED))
{
- sText = m_filePaths.GetPath(pane);
+ sText += _T(": ");
+ sText += m_filePaths.GetPath(pane);
if (m_pDirDoc)
{
if (pane == 0)
@@ -3008,6 +3012,8 @@
if (bChanges)
sText.Insert(0, _T("* "));
+ CChildFrame *pf = GetParentFrame();
+ ASSERT(pf);
pf->GetHeaderInterface()->SetText(pane, sText);
SetTitle(NULL);
Modified: branches/Perry/Src/MergeEditView.cpp
===================================================================
--- branches/Perry/Src/MergeEditView.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/MergeEditView.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -45,6 +45,9 @@
#include "SyntaxColors.h"
#include "SplitterWndEx.h" // For printing (OnPrint, SlavePrint)
#include "MergeLineFlags.h"
+#include "cfindtextdlg.h"
+#include "ceditreplacedlg.h"
+#include "gotodlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -1470,8 +1473,8 @@
// If diff first line outside current view - context OR
// if diff last line outside current view - context OR
// if diff is bigger than screen
- if ((ptStart.y < m_nTopLine + CONTEXT_LINES_ABOVE) ||
- (ptEnd.y >= m_nTopLine + GetScreenLines() - CONTEXT_LINES_BELOW) ||
+ if ((ptStart.y < m_nTopLine + (int)CONTEXT_LINES_ABOVE) ||
+ (ptEnd.y >= m_nTopLine + GetScreenLines() - (int)CONTEXT_LINES_BELOW) ||
(ptEnd.y - ptStart.y) >= GetScreenLines())
{
int line = ptStart.y - CONTEXT_LINES_ABOVE;
@@ -2986,3 +2989,47 @@
m_pLocationView->UpdateVisiblePos(nTopLine, nBottomLine);
}
}
+
+static bool IsLeftPane(int pane)
+{
+ return (pane == MERGE_VIEW_LEFT);
+}
+
+/**
+ * Customize title of Crystal Editor's find dialog
+ */
+void // virtual
+CMergeEditView::OnFindTextDlgInit(CFindTextDlg & dlg)
+{
+ CGhostTextView::OnFindTextDlgInit(dlg);
+ int id = (IsLeftPane(m_nThisPane) ? IDS_FIND_IN_LEFT_FILE : IDS_FIND_IN_RIGHT_FILE);
+ CString title = LoadResString(id);
+ if (!title.IsEmpty())
+ dlg.SetWindowText(title);
+}
+
+/**
+ * Customize title of Crystal Editor's replace dialog
+ */
+void // virtual
+CMergeEditView::OnReplaceTextDlgInit(CEditReplaceDlg & dlg)
+{
+ CGhostTextView::OnReplaceTextDlgInit(dlg);
+ int id = (IsLeftPane(m_nThisPane) ? IDS_REPLACE_IN_LEFT_FILE : IDS_REPLACE_IN_RIGHT_FILE);
+ CString title = LoadResString(id);
+ if (!title.IsEmpty())
+ dlg.SetWindowText(title);
+}
+
+/**
+ * Customize title of Crystal Editor's replace dialog
+ */
+void // virtual
+CMergeEditView::OnGotoDlgInit(CGotoDlg & dlg)
+{
+ CGhostTextView::OnGotoDlgInit(dlg);
+ int id = (IsLeftPane(m_nThisPane) ? IDS_GOTO_IN_LEFT_FILE : IDS_GOTO_IN_RIGHT_FILE);
+ CString title = LoadResString(id);
+ if (!title.IsEmpty())
+ dlg.SetWindowText(title);
+}
Modified: branches/Perry/Src/MergeEditView.h
===================================================================
--- branches/Perry/Src/MergeEditView.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/MergeEditView.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -198,6 +198,10 @@
virtual void OnUpdateCaret();
BOOL MergeModeKeyDown(MSG* pMsg);
int FindPrediffer(const CString & prediffer) const;
+ // Customize Crystal Text Editor
+ virtual void OnFindTextDlgInit(CFindTextDlg & dlg);
+ virtual void OnReplaceTextDlgInit(CEditReplaceDlg & dlg);
+ virtual void OnGotoDlgInit(CGotoDlg & dlg);
// Generated message map functions
Modified: branches/Perry/Src/OptionsDef.h
===================================================================
--- branches/Perry/Src/OptionsDef.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/OptionsDef.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -46,6 +46,7 @@
const TCHAR OPT_SINGLE_INSTANCE[] = _T("Settings/SingleInstance");
const TCHAR OPT_MERGE_MODE[] = _T("Settings/MergingMode");
const TCHAR OPT_CLOSE_WITH_ESC[] = _T("Settings/CloseWithEsc");
+const TCHAR OPT_AUTOCLOSE_DIRCOMP_STATS[] = _T("Settings/AutoCloseDirCompStats");
const TCHAR OPT_LOGGING[] = _T("Settings/Logging");
const TCHAR OPT_VERIFY_OPEN_PATHS[] = _T("Settings/VerifyOpenPaths");
const TCHAR OPT_AUTO_COMPLETE_SOURCE[] = _T("Settings/AutoCompleteSource");
@@ -109,6 +110,7 @@
const TCHAR OPT_CMP_MOVED_BLOCKS[] = _T("Settings/MovedBlocks");
const TCHAR OPT_CMP_STOP_AFTER_FIRST[] = _T("Settings/StopAfterFirst");
const TCHAR OPT_CMP_QUICK_LIMIT[] = _T("Settings/QuickMethodLimit");
+const TCHAR OPT_CMP_SINGLETHREADED[] = _T("Settings/CompareSingleThreaded");
// Multidoc enable/disable per document type
const TCHAR OPT_MULTIDOC_DIRDOCS[] = _T("Settings/MultiDirDocs");
Modified: branches/Perry/Src/OptionsInit.cpp
===================================================================
--- branches/Perry/Src/OptionsInit.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/OptionsInit.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -22,7 +22,7 @@
*/
void CMainFrame::OptionsInit()
{
- m_options.SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
+ m_options.SetRegRootKey(_T("WinMergeX\\WinMergeX\\"));
// Initialise options (name, default value)
m_options.InitOption(OPT_SHOW_UNIQUE_LEFT, true);
@@ -64,6 +64,7 @@
m_options.InitOption(OPT_BREAK_TYPE, 0);
m_options.InitOption(OPT_CLOSE_WITH_ESC, true);
+ m_options.InitOption(OPT_AUTOCLOSE_DIRCOMP_STATS, false);
m_options.InitOption(OPT_LOGGING, 0);
m_options.InitOption(OPT_IGNORE_SMALL_FILETIME, false);
@@ -76,6 +77,7 @@
m_options.InitOption(OPT_CMP_MOVED_BLOCKS, false);
m_options.InitOption(OPT_CMP_STOP_AFTER_FIRST, false);
m_options.InitOption(OPT_CMP_QUICK_LIMIT, 4 * 1024 * 1024); // 4 Megs
+ m_options.InitOption(OPT_CMP_SINGLETHREADED, false);
m_options.InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
m_options.InitOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
Modified: branches/Perry/Src/PropCompare.cpp
===================================================================
--- branches/Perry/Src/PropCompare.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/PropCompare.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -50,6 +50,7 @@
DDX_Radio(pDX, IDC_WHITESPACE, m_nIgnoreWhite);
DDX_Check(pDX, IDC_MOVED_BLOCKS, m_bMovedBlocks);
DDX_Check(pDX, IDC_COMPARE_STOPFIRST, m_bStopAfterFirst);
+ DDX_Check(pDX, IDC_SINGLETHREADED, m_bSingleThreaded);
//}}AFX_DATA_MAP
}
@@ -76,6 +77,7 @@
m_bMovedBlocks = m_pOptionsMgr->GetBool(OPT_CMP_MOVED_BLOCKS);
m_compareMethod = m_pOptionsMgr->GetInt(OPT_CMP_METHOD);
m_bStopAfterFirst = m_pOptionsMgr->GetBool(OPT_CMP_STOP_AFTER_FIRST);
+ m_bSingleThreaded = m_pOptionsMgr->GetBool(OPT_CMP_SINGLETHREADED);
}
/**
@@ -93,6 +95,7 @@
m_pOptionsMgr->SaveOption(OPT_CMP_METHOD, (int)m_compareMethod);
m_pOptionsMgr->SaveOption(OPT_CMP_MOVED_BLOCKS, m_bMovedBlocks == TRUE);
m_pOptionsMgr->SaveOption(OPT_CMP_STOP_AFTER_FIRST, m_bStopAfterFirst == TRUE);
+ m_pOptionsMgr->SaveOption(OPT_CMP_SINGLETHREADED, m_bSingleThreaded == TRUE);
}
/////////////////////////////////////////////////////////////////////////////
Modified: branches/Perry/Src/PropCompare.h
===================================================================
--- branches/Perry/Src/PropCompare.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/PropCompare.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -53,7 +53,8 @@
int m_nIgnoreWhite;
BOOL m_bMovedBlocks;
BOOL m_bStopAfterFirst;
- BOOL m_bFilterCommentsLines;
+ BOOL m_bFilterCommentsLines;
+ BOOL m_bSingleThreaded;
//}}AFX_DATA
Modified: branches/Perry/Src/PropGeneral.cpp
===================================================================
--- branches/Perry/Src/PropGeneral.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/PropGeneral.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -53,6 +53,7 @@
, m_bSingleInstance(FALSE)
, m_bVerifyPaths(FALSE)
, m_bCloseWindowWithEsc(TRUE)
+, m_bAutoCloseDirCompStats(FALSE)
, m_bMultipleFileCmp(FALSE)
, m_bMultipleDirCmp(FALSE)
, m_nAutoCompleteSource(0)
@@ -93,6 +94,7 @@
DDX_Check(pDX, IDC_SINGLE_INSTANCE, m_bSingleInstance);
DDX_Check(pDX, IDC_VERIFY_OPEN_PATHS, m_bVerifyPaths);
DDX_Check(pDX, IDC_ESC_CLOSES_WINDOW, m_bCloseWindowWithEsc);
+ DDX_Check(pDX, IDC_AUTOCLOSE_DIRCOMP_STATS, m_bAutoCloseDirCompStats);
DDX_Check(pDX, IDC_MULTIDOC_FILECMP, m_bMultipleFileCmp);
DDX_Check(pDX, IDC_MULTIDOC_DIRCMP, m_bMultipleDirCmp);
DDX_CBIndex(pDX, IDC_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
@@ -117,6 +119,7 @@
m_bSingleInstance = m_pOptionsMgr->GetBool(OPT_SINGLE_INSTANCE);
m_bVerifyPaths = m_pOptionsMgr->GetBool(OPT_VERIFY_OPEN_PATHS);
m_bCloseWindowWithEsc = m_pOptionsMgr->GetBool(OPT_CLOSE_WITH_ESC);
+ m_bAutoCloseDirCompStats = m_pOptionsMgr->GetBool(OPT_AUTOCLOSE_DIRCOMP_STATS);
m_bMultipleFileCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_MERGEDOCS);
m_bMultipleDirCmp = m_pOptionsMgr->GetBool(OPT_MULTIDOC_DIRDOCS);
m_nAutoCompleteSource = m_pOptionsMgr->GetInt(OPT_AUTO_COMPLETE_SOURCE);
@@ -133,6 +136,7 @@
m_pOptionsMgr->SaveOption(OPT_SINGLE_INSTANCE, m_bSingleInstance == TRUE);
m_pOptionsMgr->SaveOption(OPT_VERIFY_OPEN_PATHS, m_bVerifyPaths == TRUE);
m_pOptionsMgr->SaveOption(OPT_CLOSE_WITH_ESC, m_bCloseWindowWithEsc == TRUE);
+ m_pOptionsMgr->SaveOption(OPT_AUTOCLOSE_DIRCOMP_STATS, m_bAutoCloseDirCompStats == TRUE);
m_pOptionsMgr->SaveOption(OPT_MULTIDOC_MERGEDOCS, m_bMultipleFileCmp == TRUE);
m_pOptionsMgr->SaveOption(OPT_MULTIDOC_DIRDOCS, m_bMultipleDirCmp == TRUE);
m_pOptionsMgr->SaveOption(OPT_AUTO_COMPLETE_SOURCE, m_nAutoCompleteSource);
Modified: branches/Perry/Src/PropGeneral.h
===================================================================
--- branches/Perry/Src/PropGeneral.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/PropGeneral.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -39,6 +39,7 @@
BOOL m_bSingleInstance;
BOOL m_bVerifyPaths;
BOOL m_bCloseWindowWithEsc;
+ BOOL m_bAutoCloseDirCompStats;
BOOL m_bMultipleFileCmp;
BOOL m_bMultipleDirCmp;
int m_nAutoCompleteSource;
Modified: branches/Perry/Src/PropRegistry.cpp
===================================================================
--- branches/Perry/Src/PropRegistry.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/PropRegistry.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -44,7 +44,7 @@
#define CONTEXT_F_SUBFOLDERS 0x04
// registry dir to WinMerge
-static LPCTSTR f_RegDir = _T("Software\\Thingamahoochie\\WinMerge");
+static LPCTSTR f_RegDir = _T("Software\\WinMergeX\\WinMergeX");
// registry values
static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
Added: branches/Perry/Src/PropertyDlg.cpp
===================================================================
--- branches/Perry/Src/PropertyDlg.cpp (rev 0)
+++ branches/Perry/Src/PropertyDlg.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -0,0 +1,96 @@
+// PropertyDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "Merge.h"
+#include "PropertyDlg.h"
+#include "DisplayProperties.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+// PropertyDlg dialog
+
+IMPLEMENT_DYNAMIC(PropertyDlg, CDialog)
+
+PropertyDlg::PropertyDlg(CWnd* pParent, const PropertyList & props)
+ : CDialog(PropertyDlg::IDD, pParent)
+ , m_props(props)
+{
+ //{{AFX_DATA_INIT(PropertyDlg)
+ //}}AFX_DATA_INIT
+}
+
+PropertyDlg::~PropertyDlg()
+{
+}
+
+void PropertyDlg::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(FileFiltersDlg)
+ DDX_Control(pDX, IDC_LIST, m_list);
+ DDX_Control(pDX, IDC_EDIT, m_value_box);
+ //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(PropertyDlg, CDialog)
+ //{{AFX_MSG_MAP(CJunkDlg)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST, OnItemchangedList)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+
+// PropertyDlg message handlers
+
+/**
+ * @brief Called before dialog is shown.
+ */
+BOOL PropertyDlg::OnInitDialog()
+{
+ CDialog::OnInitDialog();
+
+ // setup handler for resizing this dialog
+ m_constraint.InitializeCurrentSize(this);
+ // configure how individual controls adjust when dialog resizes
+ m_constraint.ConstrainItem(IDC_LIST, 0, 1, 0, 0.5); // grows right & 50% down
+ m_constraint.ConstrainItem(IDC_EDIT, 0, 1, 0.5, 0.5); // grows right, slides 50% down grows 50% down
+ m_constraint.SubclassWnd(); // install subclassing
+ m_constraint.LoadPosition(_T("ResizeableDialogs"), _T("ItemPropertyDlg"), false); // persist size via registry
+
+ DisplayProperties();
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void PropertyDlg::DisplayProperties()
+{
+ m_list.InsertColumn(0, _T("Name"), LVCFMT_LEFT, 100, 0);
+ m_list.InsertColumn(1, _T("Side"), LVCFMT_LEFT, 30, 1);
+ m_list.InsertColumn(2, _T("Value"), LVCFMT_LEFT, 100, 2);
+
+ for (POSITION pos = m_props.GetHeadPosition(); pos; m_props.GetNext(pos))
+ {
+ Property prop = m_props.GetAt(pos);
+ int index = m_list.InsertItem(m_list.GetItemCount(), prop.name);
+ CString side = (prop.side == PNONE ? _T("") : (prop.side == PLEFT ? _T("L") : _T("R")));
+ m_list.SetItemText(index, 1, side);
+ m_list.SetItemText(index, 2, prop.value);
+ }
+}
+
+void PropertyDlg::OnItemchangedList(NMHDR* pNMHDR, LRESULT* pResult)
+{
+ NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)pNMHDR;
+ if (pNMListView->iItem < 0) return;
+ CString value = m_list.GetItemText(pNMListView->iItem, 2);
+ m_value_box.SetWindowText(value);
+
+ *pResult = 0;
+}
+
Added: branches/Perry/Src/PropertyDlg.h
===================================================================
--- branches/Perry/Src/PropertyDlg.h (rev 0)
+++ branches/Perry/Src/PropertyDlg.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -0,0 +1,45 @@
+#ifndef PropertyDlg_h_included
+#define PropertyDlg_h_included
+
+#ifndef CMoveConstraint_h
+#include "CMoveConstraint.h"
+#endif
+
+class PropertyList;
+
+// PropertyDlg dialog
+
+class PropertyDlg : public CDialog
+{
+ DECLARE_DYNAMIC(PropertyDlg)
+
+public:
+ PropertyDlg(CWnd* pParent, const PropertyList & props); // standard constructor
+ virtual ~PropertyDlg();
+
+private:
+ void DisplayProperties();
+
+// Dialog Data
+ //{{AFX_DATA(FileFiltersDlg)
+ enum { IDD = IDD_PROPERTYDIALOG };
+ CListCtrl m_list;
+ CEdit m_value_box;
+ //}}AFX_DATA
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+
+ // Generated message map functions
+ //{{AFX_MSG(FileFiltersDlg)
+ virtual BOOL OnInitDialog();
+ afx_msg void OnItemchangedList(NMHDR* pNMHDR, LRESULT* pResult);
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+private:
+ prdlg::CMoveConstraint m_constraint;
+ const PropertyList & m_props;
+};
+
+#endif // PropertyDlg_h_included
Modified: branches/Perry/Src/diffutils/src/IO.C
===================================================================
--- branches/Perry/Src/diffutils/src/IO.C 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/diffutils/src/IO.C 2006-10-10 01:12:17 UTC (rev 3697)
@@ -268,10 +268,12 @@
further down (after hashing_done label)
*/
+ /* Note that all this logic must be essentially repeated in line_cmp */
+
/* Hash this line until we find a newline. */
if (ignore_case_flag)
{
- if (ignore_all_space_flag)
+ if (ignore_all_space_flag) {
while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
{
if (ignore_eol_diff && (c=='\r' || c=='\n'))
@@ -279,7 +281,9 @@
if (! ISWSPACE (c))
h = HASH (h, isupper (c) ? tolower (c) : c);
}
- else if (ignore_space_change_flag)
+ if (c == '\r' && !ignore_eol_diff)
+ h = HASH(h, c);
+ } else if (ignore_space_change_flag) {
/* Note that \r must be hashed (if !ignore_eol_diff) */
while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
{
@@ -314,6 +318,7 @@
{
/* runs of whitespace not ending line hashed as one space */
h = HASH (h, ' ');
+ /* c is not whitespace, so continue to hash it */
}
}
/* c is now the first non-space. */
@@ -322,17 +327,22 @@
if (c == '\r' && *p != '\n')
goto hashing_done;
}
- else
+ if (c == '\r' && !ignore_eol_diff)
+ h = HASH(h, c);
+ } else {
while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
{
if (ignore_eol_diff && (c=='\r' || c=='\n'))
continue;
h = HASH (h, isupper (c) ? tolower (c) : c);
}
+ if (c == '\r' && !ignore_eol_diff)
+ h = HASH(h, c);
+ }
}
else
{
- if (ignore_all_space_flag)
+ if (ignore_all_space_flag) {
while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
{
if (ignore_eol_diff && (c=='\r' || c=='\n'))
@@ -340,7 +350,9 @@
if (! ISWSPACE (c))
h = HASH (h, c);
}
- else if (ignore_space_change_flag)
+ if (c == '\r' && !ignore_eol_diff)
+ h = HASH(h, c);
+ } else if (ignore_space_change_flag) {
/* Note that \r must be hashed (if !ignore_eol_diff) */
while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
{
@@ -375,6 +387,7 @@
{
/* runs of whitespace not ending line hashed as one space */
h = HASH (h, ' ');
+ /* c is not whitespace, so continue to hash it */
}
}
/* c is now the first non-space. */
@@ -383,13 +396,18 @@
if (c == '\r' && *p != '\n')
goto hashing_done;
}
- else
+ if (c == '\r' && !ignore_eol_diff)
+ h = HASH(h, c);
+ } else {
while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
{
if (ignore_eol_diff && (c=='\r' || c=='\n'))
continue;
h = HASH (h, c);
}
+ if (c == '\r' && !ignore_eol_diff)
+ h = HASH(h, c);
+ }
}
hashing_done:;
@@ -404,7 +422,7 @@
((char HUGE *)p)[-2] = 0;
length -= 2;
}
- else if (p[-1] == '\n' || p[-1] == '\r')
+ else if (length>0 && p[-1] == '\n' || p[-1] == '\r')
{
if (p[-1] == '\n')
++current->count_lfs;
Modified: branches/Perry/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/Perry/Src/editlib/ccrystaleditview.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/editlib/ccrystaleditview.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -1081,7 +1081,7 @@
//UpdateSiblingScrollPos(FALSE);
return;
}
- if (point.x < rcClientRect.left + GetMarginWidth () + DRAG_BORDER_X)
+ if (point.x < rcClientRect.left + GetSignedMarginWidth () + DRAG_BORDER_X)
{
HideDropIndicator ();
ScrollLeft ();
@@ -1256,6 +1256,15 @@
}
}
+// Forward callback from CEditReplaceDlg's OnInit to CCrystalEditView's virtual handler
+void CCrystalEditView:: // static
+OnReplaceTextDlgInit(CEditReplaceDlg & dlg, LPVOID param)
+{
+ CCrystalEditView * pView = reinterpret_cast<CCrystalEditView *>(param);
+ pView->OnReplaceTextDlgInit(dlg);
+}
+
+
void CCrystalEditView::
OnEditReplace ()
{
@@ -1315,6 +1324,9 @@
// Execute Replace dialog
// m_bShowInactiveSelection = TRUE; // FP: removed because I like it
+
+ CCrystalEditView * pMe = this;
+ dlg.SetInitHandler(OnReplaceTextDlgInit, reinterpret_cast<LPVOID>(pMe));
dlg.DoModal ();
// m_bShowInactiveSelection = FALSE; // FP: removed because I like it
Modified: branches/Perry/Src/editlib/ccrystaleditview.h
===================================================================
--- branches/Perry/Src/editlib/ccrystaleditview.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/editlib/ccrystaleditview.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -133,7 +133,15 @@
// Implementation
protected :
+ // Virtual hooks for child classes to customize behavior
+protected:
+ virtual void OnReplaceTextDlgInit(CEditReplaceDlg & dlg) { }
+ // Infrastructure for virtual hooks
+private:
+ static void OnReplaceTextDlgInit(CEditReplaceDlg & dlg, LPVOID param);
+
+
// Generated message map functions
protected :
bool m_bMergeUndo;
Modified: branches/Perry/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/Perry/Src/editlib/ccrystaltextview.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/editlib/ccrystaltextview.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -3349,7 +3349,7 @@
CPoint pt;
::GetCursorPos (&pt);
ScreenToClient (&pt);
- if (pt.x < GetMarginWidth ())
+ if (pt.x < GetSignedMarginWidth ())
{
::SetCursor (::LoadCursor (GetResourceHandle (), MAKEINTRESOURCE (IDR_MARGIN_CURSOR)));
}
@@ -3421,7 +3421,7 @@
int nPos = 0;
// Char index for margin area is 0
- if (point.x > GetMarginWidth())
+ if (point.x > GetSignedMarginWidth())
nPos = nOffsetChar + (point.x - GetMarginWidth()) / GetCharWidth();
if (nPos < 0)
nPos = 0;
@@ -4757,6 +4757,14 @@
return FALSE;
}
+// Forward callback from CFindTextDlg's OnInit to CCrystalTextView's virtual handler
+void CCrystalTextView:: // static
+OnFindTextDlgInit(CFindTextDlg & dlg, LPVOID param)
+{
+ CCrystalTextView * pView = reinterpret_cast<CCrystalTextView *>(param);
+ pView->OnFindTextDlgInit(dlg);
+}
+
void CCrystalTextView::
OnEditFind ()
{
@@ -4814,6 +4822,8 @@
dlg.m_ptCurrentPos = m_ptCursorPos; // Search from cursor position
// m_bShowInactiveSelection = TRUE; // FP: removed because I like it
+ CCrystalTextView * pMe = this;
+ dlg.SetInitHandler(OnFindTextDlgInit, reinterpret_cast<LPVOID>(pMe));
dlg.DoModal ();
// m_bShowInactiveSelection = FALSE; // FP: removed because I like it
@@ -4963,7 +4973,7 @@
*/
void CCrystalTextView::ToggleBookmark(UINT nLine)
{
- ASSERT(nLine < GetSubLineCount());
+ ASSERT(nLine < (UINT)GetSubLineCount());
if (m_pTextBuffer != NULL)
{
DWORD dwFlags = GetLineFlags (nLine);
@@ -5428,10 +5438,20 @@
pCmdUI->Enable (ptCursorPos.x < nLength && (bracetype (*pszText) || ptCursorPos.x > 0 && bracetype (pszText[-1])) || ptCursorPos.x > 0 && bracetype (pszText[-1]));
}
+// Forward callback from CFindTextDlg's OnInit to CCrystalTextView's virtual handler
+void CCrystalTextView:: // static
+OnGotoDlgInit(CGotoDlg & dlg, LPVOID param)
+{
+ CCrystalTextView * pView = reinterpret_cast<CCrystalTextView *>(param);
+ pView->OnGotoDlgInit(dlg);
+}
+
void CCrystalTextView::
OnEditGoTo ()
{
CGotoDlg dlg (this);
+ CCrystalTextView * pMe = this;
+ dlg.SetInitHandler(OnGotoDlgInit, reinterpret_cast<LPVOID>(pMe));
dlg.DoModal ();
}
Modified: branches/Perry/Src/editlib/ccrystaltextview.h
===================================================================
--- branches/Perry/Src/editlib/ccrystaltextview.h 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/editlib/ccrystaltextview.h 2006-10-10 01:12:17 UTC (rev 3697)
@@ -48,8 +48,10 @@
class CUpdateContext;
struct ViewableWhitespaceChars;
class SyntaxColors;
+class CFindTextDlg;
+class CEditReplaceDlg;
+class CGotoDlg;
-
////////////////////////////////////////////////////////////////////////////
// CCrystalTextView class declaration
@@ -213,6 +215,8 @@
void UpdateCaret ();
void SetAnchor (const CPoint & ptNewAnchor);
UINT GetMarginWidth ();
+ int GetSignedMarginWidth() { return (int)GetMarginWidth(); }
+
bool IsValidTextPos (const CPoint &point);
bool IsValidTextPosX (const CPoint &point);
bool IsValidTextPosY (const CPoint &point);
@@ -836,6 +840,16 @@
protected :
+ // Virtual hooks for child classes to customize behavior
+protected:
+ virtual void OnFindTextDlgInit(CFindTextDlg & dlg) { }
+ virtual void OnGotoDlgInit(CGotoDlg & dlg) { }
+
+ // Infrastructure for virtual hooks
+private:
+ static void OnFindTextDlgInit(CFindTextDlg & dlg, LPVOID param);
+ static void OnGotoDlgInit(CGotoDlg & dlg, LPVOID param);
+
// Generated message map functions
protected :
#ifdef _DEBUG
Modified: branches/Perry/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- branches/Perry/Src/editlib/ccrystaltextview2.cpp 2006-10-10 00:32:26 UTC (rev 3696)
+++ branches/Perry/Src/editlib/ccrystaltextview2.cpp 2006-10-10 01:12:17 UTC (rev 3697)
@@ -585,7 +585,7 @@
BOOL bShift = GetKeyState (VK_SHIFT) & 0x8000;
BOOL bControl = GetKeyState (VK_CONTROL) & 0x8000;
- if (point.x < GetMarginWidth ())
+ if (point.x < GetSignedMarginWidth ())
{
AdjustTextPoint (point);
if (bControl)
@@ -701,7 +701,7 @@
if (m_bDragSelection)
{
- BOOL bOnMargin = point.x < GetMarginWidth ();
+ BOOL bOnMargin = point.x < GetSignedMarginWidth ();
AdjustTextPoint (point);
CPoint ptNewCursorPos = ClientToText (point);
@@ -1073,7 +1073,7 @@
{
CView::OnLButtonDblClk (nFlags, point);
- if (point.x < GetMarginWi...
[truncated message content] |
|
From: <el...@us...> - 2006-10-10 00:32:51
|
Revision: 3696
http://svn.sourceforge.net/winmerge/?rev=3696&view=rev
Author: elsapo
Date: 2006-10-09 17:32:26 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
Creating a private branch of current trunk
Added Paths:
-----------
branches/Perry/
Copied: branches/Perry (from rev 3695, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-09 22:55:29
|
Revision: 3695
http://svn.sourceforge.net/winmerge/?rev=3695&view=rev
Author: sdottaka
Date: 2006-10-09 15:55:15 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
BUG: [ 1570259 ] Bookmarks GUI get reset after save
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/editlib/ccrystaltextview.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-09 22:46:15 UTC (rev 3694)
+++ branches/R2_6/Src/Changes.txt 2006-10-09 22:55:15 UTC (rev 3695)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-09 Takashi
+ BUG: [ 1570259 ] Bookmarks GUI get reset after save
+ Src/editlib: ccrystaltextview.cpp
+
2006-10-08 Takashi
To fix the bug "BUG: [ 1570173 ] Crash when merging all differences",
revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect"
Modified: branches/R2_6/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.cpp 2006-10-09 22:46:15 UTC (rev 3694)
+++ branches/R2_6/Src/editlib/ccrystaltextview.cpp 2006-10-09 22:55:15 UTC (rev 3695)
@@ -487,6 +487,7 @@
m_bWordWrap = FALSE;
m_bDragSelection = FALSE;
m_bLastSearch = FALSE;
+ m_bBookmarkExist = FALSE;
//BEGIN SW
m_panSubLines = new CArray<int, int>();
ASSERT( m_panSubLines );
@@ -1968,8 +1969,6 @@
m_bPrintHeader = FALSE;
m_bPrintFooter = TRUE;
- m_bBookmarkExist = FALSE; // More bookmarks
-
m_bMultipleSearch = FALSE; // More search
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-09 22:46:24
|
Revision: 3694
http://svn.sourceforge.net/winmerge/?rev=3694&view=rev
Author: sdottaka
Date: 2006-10-09 15:46:15 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
BUG: [ 1570259 ] Bookmarks GUI get reset after save
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-08 20:24:11 UTC (rev 3693)
+++ trunk/Src/Changes.txt 2006-10-09 22:46:15 UTC (rev 3694)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-09 Takashi
+ BUG: [ 1570259 ] Bookmarks GUI get reset after save
+ Src/editlib: ccrystaltextview.cpp
+
2006-10-08 Takashi
BUG: [ 1570173 ] Crash when merging all differences
Src: MergeDoc.cpp
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2006-10-08 20:24:11 UTC (rev 3693)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2006-10-09 22:46:15 UTC (rev 3694)
@@ -487,6 +487,7 @@
m_bWordWrap = FALSE;
m_bDragSelection = FALSE;
m_bLastSearch = FALSE;
+ m_bBookmarkExist = FALSE;
//BEGIN SW
m_panSubLines = new CArray<int, int>();
ASSERT( m_panSubLines );
@@ -1968,8 +1969,6 @@
m_bPrintHeader = FALSE;
m_bPrintFooter = TRUE;
- m_bBookmarkExist = FALSE; // More bookmarks
-
m_bMultipleSearch = FALSE; // More search
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-08 20:24:22
|
Revision: 3693
http://svn.sourceforge.net/winmerge/?rev=3693&view=rev
Author: gerundt
Date: 2006-10-08 13:24:11 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
PATCH: [ 1573243 ] Web: Add info and link for developers-wiki
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/needed.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-08 14:59:46 UTC (rev 3692)
+++ trunk/Web/Changes.txt 2006-10-08 20:24:11 UTC (rev 3693)
@@ -1,3 +1,7 @@
+2006-10-08 Tim
+ PATCH: [ 1573243 ] Web: Add info and link for developers-wiki
+ Web\developer: needed.php
+
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Web: links.php
Modified: trunk/Web/developer/needed.php
===================================================================
--- trunk/Web/developer/needed.php 2006-10-08 14:59:46 UTC (rev 3692)
+++ trunk/Web/developer/needed.php 2006-10-08 20:24:11 UTC (rev 3693)
@@ -54,7 +54,9 @@
them into the subversion repository.</p>
<p>You find more informations about programming WinMerge in the Subversion directory
-<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/Docs/Developers/">Docs/Developers/</a>.</p>
+<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/Docs/Developers/">Docs/Developers/</a>.
+We have also started a <a href="http://wiki.winmerge.org">developer-wiki</a> for WinMerge.
+Our plan is to use the wiki for planning and documenting WinMerge internals.</p>
<p>The general plan is to start people with anonymous Subversion access and let the regular developers commit
their changes to the Subversion repository. Those developers that
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-08 14:59:57
|
Revision: 3692
http://svn.sourceforge.net/winmerge/?rev=3692&view=rev
Author: sdottaka
Date: 2006-10-08 07:59:46 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
BUG: [ 1570173 ] Crash when merging all differences
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-08 14:57:19 UTC (rev 3691)
+++ trunk/Src/Changes.txt 2006-10-08 14:59:46 UTC (rev 3692)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-08 Takashi
+ BUG: [ 1570173 ] Crash when merging all differences
+ Src: MergeDoc.cpp
+
2006-10-08 Kimmo
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Docs/Users: Contributors.txt
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-10-08 14:57:19 UTC (rev 3691)
+++ trunk/Src/MergeDoc.cpp 2006-10-08 14:59:46 UTC (rev 3692)
@@ -910,7 +910,9 @@
}
else
{
- dbuf.DeleteText(dstView, cd_blank, 0, cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
+ // To removing EOL chars of last line, deletes from the end of the line (cd_blank - 1).
+ ASSERT(cd_blank > 0);
+ dbuf.DeleteText(dstView, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
}
limit=cd_blank-1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-08 14:57:30
|
Revision: 3691
http://svn.sourceforge.net/winmerge/?rev=3691&view=rev
Author: sdottaka
Date: 2006-10-08 07:57:19 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
To fix the bug "BUG: [ 1570173 ] Crash when merging all differences",
revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect"
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeDoc.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-08 10:21:26 UTC (rev 3690)
+++ branches/R2_6/Src/Changes.txt 2006-10-08 14:57:19 UTC (rev 3691)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-08 Takashi
+ To fix the bug "BUG: [ 1570173 ] Crash when merging all differences",
+ revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect"
+ Src: MergeDoc.cpp
+
2006-10-08 Kimmo
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Docs/Users: Contributors.txt
Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp 2006-10-08 10:21:26 UTC (rev 3690)
+++ branches/R2_6/Src/MergeDoc.cpp 2006-10-08 14:57:19 UTC (rev 3691)
@@ -894,6 +894,7 @@
}
// if the current diff contains missing lines, remove them from both sides
+ int deleted_lines=0;
int limit = cd_dend;
// curView is the view which is changed, so the opposite of the source view
@@ -904,14 +905,19 @@
{
// text was missing, so delete rest of lines on both sides
// delete only on destination side since rescan will clear the other side
- if (cd_dend + 1 < dbuf.GetLineCount())
+ if(cd_blank==0)
{
dbuf.DeleteText(dstView, cd_blank, 0, cd_dend+1, 0, CE_ACTION_MERGE);
}
else
{
- dbuf.DeleteText(dstView, cd_blank, 0, cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
+ // If you are interesting in this code, please see at URL:
+ // https://sourceforge.net/tracker/index.php?func=detail&aid=1555664&group_id=13216&atid=113216
+ // and
+ // https://sourceforge.net/tracker/index.php?func=detail&aid=1570173&group_id=13216&atid=113216
+ dbuf.DeleteText(dstView, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
}
+ deleted_lines=cd_dend-cd_blank+1;
limit=cd_blank-1;
dbuf.FlushUndoGroup(dstView);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-08 10:21:39
|
Revision: 3690
http://svn.sourceforge.net/winmerge/?rev=3690&view=rev
Author: kimmov
Date: 2006-10-08 03:21:26 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
BUG: [ 1563187 ] Can't close a file compare with -e switch
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeDoc.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-08 10:16:09 UTC (rev 3689)
+++ branches/R2_6/Src/Changes.txt 2006-10-08 10:21:26 UTC (rev 3690)
@@ -5,6 +5,8 @@
2006-10-08 Kimmo
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Docs/Users: Contributors.txt
+ BUG: [ 1563187 ] Can't close a file compare with -e switch
+ Src: MergeDoc.cpp
2006-10-07 Tim
PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp 2006-10-08 10:16:09 UTC (rev 3689)
+++ branches/R2_6/Src/MergeDoc.cpp 2006-10-08 10:21:26 UTC (rev 3690)
@@ -1253,7 +1253,7 @@
BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/)
{
// Allow user to cancel closing
- if (!GetMainFrame()->m_bEscShutdown && PromptAndSaveIfNeeded(TRUE))
+ if (PromptAndSaveIfNeeded(TRUE))
{
// Set modified status to false so that we are not asking
// about saving again in OnCloseDocument()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-08 10:16:21
|
Revision: 3689
http://svn.sourceforge.net/winmerge/?rev=3689&view=rev
Author: kimmov
Date: 2006-10-08 03:16:09 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Modified Paths:
--------------
branches/R2_6/Docs/Users/Contributors.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_6/Docs/Users/Contributors.txt 2006-10-08 10:14:34 UTC (rev 3688)
+++ branches/R2_6/Docs/Users/Contributors.txt 2006-10-08 10:16:09 UTC (rev 3689)
@@ -8,17 +8,19 @@
Project lead:
* Christian List
-Other developers:
-* Laurent Ganier
+Developers:
* Tim Gerundt
* Gal Hammer
+* Perry Rapp
+* Takashi Sawanaka
+* Kimmo Varis
+
+Inactive/past developers:
+* Laurent Ganier
* Dennis Limm
* Chris Mumford
-* Perry Rapp
-* Takashi Sawanaka
* Christian "Seier" Blackburn (Installer)
* Jochen Tucht
-* Kimmo Varis
Graphic Design:
* Alexander Skinner
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-08 10:14:34 UTC (rev 3688)
+++ branches/R2_6/Src/Changes.txt 2006-10-08 10:16:09 UTC (rev 3689)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-08 Kimmo
+ PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
+ Docs/Users: Contributors.txt
+
2006-10-07 Tim
PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
Src/Languages/German: MergeGerman.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-08 10:14:43
|
Revision: 3688
http://svn.sourceforge.net/winmerge/?rev=3688&view=rev
Author: kimmov
Date: 2006-10-08 03:14:34 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
Modified Paths:
--------------
trunk/Docs/Users/Contributors.txt
trunk/Src/Changes.txt
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2006-10-07 09:42:17 UTC (rev 3687)
+++ trunk/Docs/Users/Contributors.txt 2006-10-08 10:14:34 UTC (rev 3688)
@@ -8,17 +8,19 @@
Project lead:
* Christian List
-Other developers:
-* Laurent Ganier
+Developers:
* Tim Gerundt
* Gal Hammer
+* Perry Rapp
+* Takashi Sawanaka
+* Kimmo Varis
+
+Inactive/past developers:
+* Laurent Ganier
* Dennis Limm
* Chris Mumford
-* Perry Rapp
-* Takashi Sawanaka
* Christian "Seier" Blackburn (Installer)
* Jochen Tucht
-* Kimmo Varis
Graphic Design:
* Alexander Skinner
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-07 09:42:17 UTC (rev 3687)
+++ trunk/Src/Changes.txt 2006-10-08 10:14:34 UTC (rev 3688)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-08 Kimmo
+ PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
+ Docs/Users: Contributors.txt
+
2006-10-07 Tim
PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
Src/Languages/German: MergeGerman.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 09:42:26
|
Revision: 3687
http://svn.sourceforge.net/winmerge/?rev=3687&view=rev
Author: gerundt
Date: 2006-10-07 02:42:17 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
Cool, Perry is back! :)
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/developers.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-07 08:59:36 UTC (rev 3686)
+++ trunk/Web/Changes.txt 2006-10-07 09:42:17 UTC (rev 3687)
@@ -1,6 +1,8 @@
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Web: links.php
+ Cool, Perry is back! :)
+ Web\developer: developers.xml
2006-10-03 Tim
PATCH: [ 1569431 ] Couple of typos in Translations -page
Modified: trunk/Web/developer/developers.xml
===================================================================
--- trunk/Web/developer/developers.xml 2006-10-07 08:59:36 UTC (rev 3686)
+++ trunk/Web/developer/developers.xml 2006-10-07 09:42:17 UTC (rev 3687)
@@ -61,7 +61,7 @@
<role>2</role>
<email>ccganier at club-internet dot fr</email>
</developer>
- <developer inactive="1">
+ <developer>
<name>Perry Rapp</name>
<username>elsapo</username>
<role>2</role>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:59:45
|
Revision: 3686
http://svn.sourceforge.net/winmerge/?rev=3686&view=rev
Author: gerundt
Date: 2006-10-07 01:59:36 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/links.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-07 08:55:12 UTC (rev 3685)
+++ trunk/Web/Changes.txt 2006-10-07 08:59:36 UTC (rev 3686)
@@ -1,3 +1,7 @@
+2006-10-07 Tim
+ BUG: [ 1572388 ] Wrong link to regex.pdf
+ Web: links.php
+
2006-10-03 Tim
PATCH: [ 1569431 ] Couple of typos in Translations -page
Web\developer\l10n: index.php
Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php 2006-10-07 08:55:12 UTC (rev 3685)
+++ trunk/Web/links.php 2006-10-07 08:59:36 UTC (rev 3686)
@@ -27,7 +27,7 @@
<dd>Good HOWTO document for regular expressions</dd>
<dt><a href="http://www.zvon.org/other/PerlTutorial/Output/index.html">Tutorial</a></dt>
<dd>Regular expressions tutorial</dd>
- <dt><a href="http://gmckinney.info/resources/regex.pdf">regex.pdf</a></dt>
+ <dt><a href="http://www.night-ray.com/regex.pdf">regex.pdf</a></dt>
<dd>PDF quick reference</dd>
</dl>
<?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:55:24
|
Revision: 3685
http://svn.sourceforge.net/winmerge/?rev=3685&view=rev
Author: gerundt
Date: 2006-10-07 01:55:12 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-07 08:50:28 UTC (rev 3684)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-07 08:55:12 UTC (rev 3685)
@@ -1,3 +1,7 @@
+2006-10-07 Tim
+ BUG: [ 1572388 ] Wrong link to regex.pdf
+ Manual: Filters.xml
+
2006-10-03 Kimmo
PATCH: [ 1569389 ] Manual: fix translations part
Manual: Locales.xml
Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-07 08:50:28 UTC (rev 3684)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-07 08:55:12 UTC (rev 3685)
@@ -55,7 +55,7 @@
<listitem>
<para><ulink
- url="http://gmckinney.info/resources/regex.pdf">http://gmckinney.info/resources/regex.pdf</ulink></para>
+ url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></para>
</listitem>
</varlistentry>
</variablelist>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:50:37
|
Revision: 3684
http://svn.sourceforge.net/winmerge/?rev=3684&view=rev
Author: gerundt
Date: 2006-10-07 01:50:28 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Filters.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-07 08:44:44 UTC (rev 3683)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-07 08:50:28 UTC (rev 3684)
@@ -1,3 +1,7 @@
+2006-10-07 Tim
+ BUG: [ 1572388 ] Wrong link to regex.pdf
+ Manual: Filters.xml
+
2006-10-03 Kimmo
PATCH: [ 1569389 ] Manual: fix translations part
Manual: Locales.xml
Modified: trunk/Docs/Users/Manual/Filters.xml
===================================================================
--- trunk/Docs/Users/Manual/Filters.xml 2006-10-07 08:44:44 UTC (rev 3683)
+++ trunk/Docs/Users/Manual/Filters.xml 2006-10-07 08:50:28 UTC (rev 3684)
@@ -55,7 +55,7 @@
<listitem>
<para><ulink
- url="http://gmckinney.info/resources/regex.pdf">http://gmckinney.info/resources/regex.pdf</ulink></para>
+ url="http://www.night-ray.com/regex.pdf">http://www.night-ray.com/regex.pdf</ulink></para>
</listitem>
</varlistentry>
</variablelist>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:44:53
|
Revision: 3683
http://svn.sourceforge.net/winmerge/?rev=3683&view=rev
Author: gerundt
Date: 2006-10-07 01:44:44 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/German/MergeGerman.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-07 08:43:48 UTC (rev 3682)
+++ branches/R2_6/Src/Changes.txt 2006-10-07 08:44:44 UTC (rev 3683)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-07 Tim
+ PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-10-04 Tim
PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
Src/Languages/German: MergeGerman.rc
Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-07 08:43:48 UTC (rev 3682)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-07 08:44:44 UTC (rev 3683)
@@ -248,7 +248,7 @@
MENUITEM SEPARATOR
MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR
MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
+ MENUITEM "V&ergleichsstatistik", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "Spra&che...", ID_VIEW_LANGUAGE
END
@@ -922,7 +922,7 @@
CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "Wortunterschied (Selektiert):",IDC_STATIC,7,149,90,8
+ RTEXT "Wortunterschied (Selektiert):",IDC_STATIC,2,149,95,8
CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -950,7 +950,7 @@
BEGIN
CONTROL "Gel\xF6schte Dateien in den &Papierkorb verschieben",IDC_USE_RECYCLE_BIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10
- CONTROL "Ignoriere Zeitunterschiede kleiner als 3 Sekunden",
+ CONTROL "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
GROUPBOX "Integration",IDC_STATIC,7,30,218,46
@@ -958,7 +958,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "Er&weitertes Men\xFC verwenden",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "Standardm\xE4\xDFig &Unterordner einbeziehen",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&Externer Editor:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -1076,7 +1076,7 @@
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION " Folder Compare Progress"
+CAPTION " Ordnervergleichsfortschritt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14
@@ -1428,7 +1428,7 @@
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Compare Statistics"
+CAPTION "Vergleichsstatistik"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Ordner:",IDC_STATIC,72,7,38,8
@@ -1878,7 +1878,7 @@
STRINGTABLE
BEGIN
IDS_SPLASH_DEVELOPERS "Entwickler:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
- IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
+ IDS_SPLASH_GPLTEXT "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie k\xF6nnen sie unter bestimmten Bedingungen weiter vertreiben; f\xFCr Details sehen Sie sich die GNU Public Lizenz unter dem Hilfe-Men\xFC an."
END
// "DO NOT SHOW AGAIN" MESSAGEBOXES
@@ -1964,7 +1964,7 @@
IDS_DIFF_OPEN_NO_SET_PROPS "Datei(en) dieses Vergleichs wurden ge\xE4ndert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde."
IDS_FONT_CHANGE "Die \xC4nderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden."
IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ "Der Wert im Feld der Tabulator-Gr\xF6\xDFe ist nicht im Bereich den WinMerge akzeptiert.\n\nBitte benutzen Sie Werte von 1 - %1."
END
// BROWSE FILE
@@ -2007,16 +2007,16 @@
IDS_FILEFILTER_SAVENEW "Dateinamen f\xFCr neuen Filter ausw\xE4hlen"
IDS_FILEFILTER_FILEMASK "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||"
IDS_FILEFILTER_TMPL_MISSING
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder."
+ "Die Filtervorlage konnte nicht gefunden werden!\n\nBitte kopieren Sie die Datei %1 in den WinMerge/Filters-Ordner."
IDS_FILEFILTER_TMPL_COPY
- "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
+ "Die Filtervorlage konnte nicht Filterordner kopiert werden:\n%1\n\nBitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "Der Benutzer-Filterordner ist nicht definiert!\n\nBitte w\xE4hlen Sie den Filterordner unter Einstellungen/System aus."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "Fehler beim L\xF6schen der Filterdatei:\n%1\n\nIst die Datei m\xF6glicherweise schreibgesch\xFCtzt?"
+ IDS_FILEFILTER_INSTALL "Zu installierenden Filter ausw\xE4hlen"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "Installieren der Filterdatei fehlgeschlagen.\n\nDie Filterdatei konnte nicht in den Filterordner kopiert werden."
IDS_FILEFILTER_OVERWRITE
"Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
@@ -2649,11 +2649,11 @@
// CODEPAGE GEOGRAPHIC GROUPS
STRINGTABLE
BEGIN
- IDS_CPG_WESTERN_EUROPEAN "Western European"
- IDS_CPG_EASTERN_EUROPEAN "Eastern European"
- IDS_CPG_EAST_ASIAN "East Asian"
- IDS_CPG_SOUTH_ASIAN "SE & SW Asian"
- IDS_CPG_MIDDLE_EASTERN "Middle Eastern"
+ IDS_CPG_WESTERN_EUROPEAN "Westeurop\xE4isch"
+ IDS_CPG_EASTERN_EUROPEAN "Osteurop\xE4isch"
+ IDS_CPG_EAST_ASIAN "Ostasiatisch"
+ IDS_CPG_SOUTH_ASIAN "SO & SW-Asiatisch"
+ IDS_CPG_MIDDLE_EASTERN "Mitteleurop\xE4isch"
IDS_CPG_NA "Nicht anwendbar"
END
@@ -2817,7 +2817,7 @@
ID_VIEW_WHITESPACE "Zeigt Leerzeichen an."
ID_VIEW_DETAIL_BAR "Blendet die Unterschiedsleiste ein oder aus."
ID_VIEW_LOCATION_BAR "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien."
- ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
+ ID_VIEW_DIR_STATISTICS "Zeigt die Vergleichsstatistik an."
ID_VIEW_LANGUAGE "W\xE4hlt die Sprache der Benutzeroberfl\xE4che.\nSprache"
ID_VIEW_LINEDIFFS "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe.\nZeilenunterschied anzeigen"
ID_VIEW_SWAPPANES "Vertauscht die Position der beiden Ausschnitte."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:43:59
|
Revision: 3682
http://svn.sourceforge.net/winmerge/?rev=3682&view=rev
Author: gerundt
Date: 2006-10-07 01:43:48 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/German/MergeGerman.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-04 20:54:58 UTC (rev 3681)
+++ trunk/Src/Changes.txt 2006-10-07 08:43:48 UTC (rev 3682)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-07 Tim
+ PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-10-04 Tim
PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
Src/Languages/German: MergeGerman.rc
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:58 UTC (rev 3681)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-07 08:43:48 UTC (rev 3682)
@@ -248,7 +248,7 @@
MENUITEM SEPARATOR
MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR
MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
+ MENUITEM "V&ergleichsstatistik", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "Spra&che...", ID_VIEW_LANGUAGE
END
@@ -922,7 +922,7 @@
CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "Wortunterschied (Selektiert):",IDC_STATIC,7,149,90,8
+ RTEXT "Wortunterschied (Selektiert):",IDC_STATIC,2,149,95,8
CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -950,7 +950,7 @@
BEGIN
CONTROL "Gel\xF6schte Dateien in den &Papierkorb verschieben",IDC_USE_RECYCLE_BIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,222,10
- CONTROL "Ignoriere Zeitunterschiede kleiner als 3 Sekunden",
+ CONTROL "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
GROUPBOX "Integration",IDC_STATIC,7,30,218,46
@@ -958,7 +958,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "Er&weitertes Men\xFC verwenden",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "Standardm\xE4\xDFig &Unterordner einbeziehen",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&Externer Editor:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -1076,7 +1076,7 @@
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION " Folder Compare Progress"
+CAPTION " Ordnervergleichsfortschritt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14
@@ -1428,7 +1428,7 @@
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Compare Statistics"
+CAPTION "Vergleichsstatistik"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Ordner:",IDC_STATIC,72,7,38,8
@@ -1878,7 +1878,7 @@
STRINGTABLE
BEGIN
IDS_SPLASH_DEVELOPERS "Entwickler:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
- IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
+ IDS_SPLASH_GPLTEXT "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie k\xF6nnen sie unter bestimmten Bedingungen weiter vertreiben; f\xFCr Details sehen Sie sich die GNU Public Lizenz unter dem Hilfe-Men\xFC an."
END
// "DO NOT SHOW AGAIN" MESSAGEBOXES
@@ -1964,7 +1964,7 @@
IDS_DIFF_OPEN_NO_SET_PROPS "Datei(en) dieses Vergleichs wurden ge\xE4ndert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde."
IDS_FONT_CHANGE "Die \xC4nderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden."
IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ "Der Wert im Feld der Tabulator-Gr\xF6\xDFe ist nicht im Bereich den WinMerge akzeptiert.\n\nBitte benutzen Sie Werte von 1 - %1."
END
// BROWSE FILE
@@ -2007,16 +2007,16 @@
IDS_FILEFILTER_SAVENEW "Dateinamen f\xFCr neuen Filter ausw\xE4hlen"
IDS_FILEFILTER_FILEMASK "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||"
IDS_FILEFILTER_TMPL_MISSING
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder."
+ "Die Filtervorlage konnte nicht gefunden werden!\n\nBitte kopieren Sie die Datei %1 in den WinMerge/Filters-Ordner."
IDS_FILEFILTER_TMPL_COPY
- "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
+ "Die Filtervorlage konnte nicht Filterordner kopiert werden:\n%1\n\nBitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "Der Benutzer-Filterordner ist nicht definiert!\n\nBitte w\xE4hlen Sie den Filterordner unter Einstellungen/System aus."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "Fehler beim L\xF6schen der Filterdatei:\n%1\n\nIst die Datei m\xF6glicherweise schreibgesch\xFCtzt?"
+ IDS_FILEFILTER_INSTALL "Zu installierenden Filter ausw\xE4hlen"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "Installieren der Filterdatei fehlgeschlagen.\n\nDie Filterdatei konnte nicht in den Filterordner kopiert werden."
IDS_FILEFILTER_OVERWRITE
"Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
@@ -2649,11 +2649,11 @@
// CODEPAGE GEOGRAPHIC GROUPS
STRINGTABLE
BEGIN
- IDS_CPG_WESTERN_EUROPEAN "Western European"
- IDS_CPG_EASTERN_EUROPEAN "Eastern European"
- IDS_CPG_EAST_ASIAN "East Asian"
- IDS_CPG_SOUTH_ASIAN "SE & SW Asian"
- IDS_CPG_MIDDLE_EASTERN "Middle Eastern"
+ IDS_CPG_WESTERN_EUROPEAN "Westeurop\xE4isch"
+ IDS_CPG_EASTERN_EUROPEAN "Osteurop\xE4isch"
+ IDS_CPG_EAST_ASIAN "Ostasiatisch"
+ IDS_CPG_SOUTH_ASIAN "SO & SW-Asiatisch"
+ IDS_CPG_MIDDLE_EASTERN "Mitteleurop\xE4isch"
IDS_CPG_NA "Nicht anwendbar"
END
@@ -2817,7 +2817,7 @@
ID_VIEW_WHITESPACE "Zeigt Leerzeichen an."
ID_VIEW_DETAIL_BAR "Blendet die Unterschiedsleiste ein oder aus."
ID_VIEW_LOCATION_BAR "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien."
- ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
+ ID_VIEW_DIR_STATISTICS "Zeigt die Vergleichsstatistik an."
ID_VIEW_LANGUAGE "W\xE4hlt die Sprache der Benutzeroberfl\xE4che.\nSprache"
ID_VIEW_LINEDIFFS "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe.\nZeilenunterschied anzeigen"
ID_VIEW_SWAPPANES "Vertauscht die Position der beiden Ausschnitte."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-04 20:55:13
|
Revision: 3681
http://svn.sourceforge.net/winmerge/?rev=3681&view=rev
Author: gerundt
Date: 2006-10-04 13:54:58 -0700 (Wed, 04 Oct 2006)
Log Message:
-----------
PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/German/MergeGerman.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-04 20:54:13 UTC (rev 3680)
+++ branches/R2_6/Src/Changes.txt 2006-10-04 20:54:58 UTC (rev 3681)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-04 Tim
+ PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-10-02 Gal
BUG: [ 1566783 ] Crash on Save Project when no file is selected
Src: MainFrm.cpp
Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:13 UTC (rev 3680)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:58 UTC (rev 3681)
@@ -230,7 +230,7 @@
MENUITEM "&Einstellungen...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Aktualisieren\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "Ausge&w\xE4hlte aktualisieren\tStrg+F5", ID_DIR_RESCAN
END
POPUP "&Ansicht"
BEGIN
@@ -341,7 +341,7 @@
MENUITEM "L&inks schreibgesch\xFCtzt", ID_FILE_LEFT_READONLY
MENUITEM "R&echts schreibgesch\xFCtzt", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Zeilenenden konvertieren nach"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -650,7 +650,7 @@
IDD_OPEN DIALOGEX 0, 0, 374, 126
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "Dateien oder Verzeichnisse ausw\xE4hlen..."
+CAPTION "Dateien oder Ordner ausw\xE4hlen..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&Links:",IDC_STATIC,13,24,65,8
@@ -671,13 +671,13 @@
EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL |
ES_READONLY
PUSHBUTTON "Ausw\xE4hlen...",IDC_SELECT_UNPACKER,252,70,50,14
- CONTROL "&Unterverzeichnisse einbeziehen",IDC_RECURS_CHECK,"Button",
+ CONTROL "&Unterordner einbeziehen",IDC_RECURS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10
LTEXT "Status:",IDC_OPEN_STATUS,15,102,192,8
DEFPUSHBUTTON "OK",IDOK,316,11,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,316,28,50,14
PUSHBUTTON "Hilfe",ID_HELP,316,45,50,14
- GROUPBOX "Zu vergleichende Dateien oder Verzeichnisse",IDC_FILES_DIRS_GROUP,7,
+ GROUPBOX "Zu vergleichende Dateien oder Ordner",IDC_FILES_DIRS_GROUP,7,
7,302,111
END
@@ -1190,7 +1190,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "Testen",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "Installieren...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "Neu...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "Bearbeiten...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "L\xF6schen...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1596,7 +1596,7 @@
VALUE "FileDescription", "WinMerge Anwendung\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-2006 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
@@ -2018,7 +2018,7 @@
IDS_FILEFILTER_INSTALLFAIL
"Installing filter file failed.\n\nCould not copy new filter file to filter folder."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
// VERSION CONTROL OPTIONS
@@ -2075,14 +2075,14 @@
// OPEN DIALOG
STRINGTABLE
BEGIN
- IDS_ERROR_INCOMPARABLE "W\xE4hlen Sie zwei Dateien oder Verzeichnisse zum Vergleichen aus"
- IDS_DIRSEL_TAG "Verzeichnis-Auswahl"
- IDS_OPEN_FILESDIRS "Zwei Verzeichnisse oder zwei Dateien zum Vergleichen ausw\xE4hlen."
+ IDS_ERROR_INCOMPARABLE "W\xE4hlen Sie zwei Dateien oder Ordner zum Vergleichen aus"
+ IDS_DIRSEL_TAG "Ordnerauswahl"
+ IDS_OPEN_FILESDIRS "Zwei Ordner oder zwei Dateien zum Vergleichen ausw\xE4hlen."
IDS_OPEN_LEFTINVALID "Der linke Pfad ist ung\xFCltig!"
IDS_OPEN_RIGHTINVALID "Der rechte Pfad ist ung\xFCltig!"
IDS_OPEN_BOTHINVALID "Beide Pfade sind ung\xFCltig!"
IDS_OPEN_UNPACKERDISABLED "Zwei Dateien zum Aktivieren der Entpacker-Auswahl ausw\xE4hlen."
- IDS_OPEN_MISMATCH "Datei und Verzeichnis k\xF6nnen nicht verglichen werden!"
+ IDS_OPEN_MISMATCH "Datei und Ordner k\xF6nnen nicht verglichen werden!"
END
// LOADING FILE
@@ -2127,13 +2127,13 @@
BEGIN
IDS_NOPROJECT "Sie m\xFCssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)"
IDS_VSS_CHECKOUT_STATUS "Dateien auschecken vom VSS..."
- IDS_VSSERROR "SourceSafe hat beim Versuch die Datei auszuchecken einen Fehler gemeldet. Der Vorgang kann nicht fortgesetzt werden..."
- IDS_VSS_RUN_ERROR "Fehler beim Versionieren."
+ IDS_VSSERROR "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..."
+ IDS_VSS_RUN_ERROR "Fehler beim Ausf\xFChren eines Befehles des Versionierungssystems."
IDS_VSSFOLDER_AND_FILE_NOMATCH "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht \xFCberein. Fortsetzen?"
IDS_VSS_NODATABASES "Keine VSS Datenbank(en) gefunden!"
IDS_VSS_ERRORFROM "Fehler vom VSS:"
- IDS_VSS_CHECKINERROR "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
- IDS_VSS_UNCOERROR "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
+ IDS_VSS_CHECKINERROR "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei einzuchecken.\n Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht.\n Auschecken r\xFCckg\xE4ngig machen?"
+ IDS_VSS_UNCOERROR "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei r\xFCckg\xE4ngig zu machen.\n Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht."
END
// VSS system
@@ -2178,7 +2178,7 @@
IDS_DEL_LEFT_FMT2 "Links (%1 von %2)"
IDS_DEL_RIGHT_FMT2 "Rechts (%1 von %2)"
IDS_DEL_BOTH_FMT2 "Beide (%1 von %2)"
- IDS_SELECT_DESTFOLDER "Zielverzeichnis ausw\xE4hlen."
+ IDS_SELECT_DESTFOLDER "Zielordner ausw\xE4hlen."
IDS_MOVE_LEFT_TO "Links nach... (%1)"
IDS_MOVE_RIGHT_TO "Rechts nach... (%1)"
IDS_MOVE_LEFT_TO2 "Links nach... (%1 von %2)"
@@ -2236,7 +2236,7 @@
STRINGTABLE
BEGIN
IDS_COLHDR_FILENAME "Dateiname"
- IDS_COLHDR_DIR "Verzeichnis"
+ IDS_COLHDR_DIR "Ordner"
IDS_COLHDR_RESULT "Vergleichs-Ergebnis"
IDS_COLHDR_LTIMEM "Linkes Datum"
IDS_COLHDR_RTIMEM "Rechtes Datum"
@@ -2258,8 +2258,8 @@
IDS_COLHDR_RESULT_ABBR "Kurz-Ergebnis"
IDS_COLHDR_LATTRIBUTES "Linke Attribute"
IDS_COLHDR_RATTRIBUTES "Rechte Attribute"
- IDS_COLHDR_LEOL_TYPE "Left EOL"
- IDS_COLHDR_REOL_TYPE "Right EOL"
+ IDS_COLHDR_LEOL_TYPE "Linkes Zeilenende"
+ IDS_COLHDR_REOL_TYPE "Rechtes Zeilenende"
END
// DIRECTORY DIFFING : COLUMN TITLES #3
@@ -2278,7 +2278,7 @@
IDS_CANT_COMPARE_FILES "Dateien k\xF6nnen nicht verglichen werden"
IDS_ABORTED_ITEM "Objekt abgebrochen"
IDS_FILE_SKIPPED "Datei \xFCbersprungen"
- IDS_DIR_SKIPPED "Verzeichnis \xFCbersprungen"
+ IDS_DIR_SKIPPED "Ordner \xFCbersprungen"
IDS_ONLY_IN_FMT "Nur in %1"
IDS_BIN_FILES_SAME "Bin\xE4rdateien sind identisch"
IDS_IDENTICAL "Identisch"
@@ -2300,8 +2300,8 @@
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1
STRINGTABLE
BEGIN
- IDS_COLDESC_FILENAME "Dateiname oder Verzeichnisname."
- IDS_COLDESC_DIR "Unterverzeichnisname, wenn Unterverzeichnisse vorhanden sind."
+ IDS_COLDESC_FILENAME "Dateiname oder Ordnername."
+ IDS_COLDESC_DIR "Unterordnername, wenn Unterordner vorhanden sind."
IDS_COLDESC_RESULT "Vergleichs-Ergebnis, langes Format."
IDS_COLDESC_LTIMEM "Linkes \xC4nderungsdatum."
IDS_COLDESC_RTIMEM "Rechtes \xC4nderungsdatum."
@@ -2323,8 +2323,8 @@
IDS_COLDESC_RESULT_ABBR "Vergleichs-Ergebnis, kurzes Format."
IDS_COLDESC_LATTRIBUTES "Linke Attribute."
IDS_COLDESC_RATTRIBUTES "Rechte Attribute."
- IDS_COLDESC_LEOL_TYPE "Left side file EOL type"
- IDS_COLDESC_REOL_TYPE "Right side file EOL type"
+ IDS_COLDESC_LEOL_TYPE "Linker Zeilenenden-Typ"
+ IDS_COLDESC_REOL_TYPE "Rechter Zeilenenden-Typ"
END
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)
@@ -2376,11 +2376,11 @@
// Encoding issues
STRINGTABLE
BEGIN
- IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie like to treat both files as being in the default windows codepage (recommended)?"
- IDS_DIFFERENT_UNICODINGS "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
- IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files"
- IDS_LOSSY_TRANSCODING_RIGHT "Information lost due to encoding errors: right file"
- IDS_LOSSY_TRANSCODING_LEFT "Information lost due to encoding errors: left file"
+ IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie beide Dateien behandeln, als w\xE4ren sie im gleichen Zeichensatz (empfohlen)?"
+ IDS_DIFFERENT_UNICODINGS "Warnung: Die Dateien haben unterschiedliche Kodierungen, links=%s und rechts=%s, und das Vermischen f\xFChrt m\xF6glicherweise zu Informationsverlusten."
+ IDS_LOSSY_TRANSCODING_BOTH "Informationsverlust wegen Kodierungsfehlern: Beide Dateien"
+ IDS_LOSSY_TRANSCODING_RIGHT "Informationsverlust wegen Kodierungsfehlern: Rechte Datei"
+ IDS_LOSSY_TRANSCODING_LEFT "Informationsverlust wegen Kodierungsfehlern: Linke Datei"
END
// EDITOR : SHOW LINE DIFF
@@ -2437,8 +2437,8 @@
IDS_NO_ZIP_SUPPORT "Die Archiv-Unterst\xFCtzung ist nicht aktiviert.\n
Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) f\xFCr die Archiv-Unterst\xFCtzung k\xF6nnen nicht gefunden werden.
Entnehmen Sie dem Handbuch mehr Informationen \xFCber die Archiv-Unterst\xFCtzung und wie sie aktiviert wird."
- IDS_MERGE7Z_ENABLE_0 "\nNote: 7-Zip integration is disabled in WinMerge settings."
- IDS_MERGE7Z_ENABLE_2 "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
+ IDS_MERGE7Z_ENABLE_0 "\nHinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert."
+ IDS_MERGE7Z_ENABLE_2 "\nHinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenst\xE4ndige Arbeitsweise beschr\xE4nkt."
IDS_OPT_EXPORT_CAPTION "Datei zum Exportieren ausw\xE4hlen"
IDS_OPT_IMPORT_CAPTION "Datei zum Importieren ausw\xE4hlen"
IDS_OPT_IMPORT_DONE "Einstellungen aus der Datei importiert."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-04 20:54:24
|
Revision: 3680
http://svn.sourceforge.net/winmerge/?rev=3680&view=rev
Author: gerundt
Date: 2006-10-04 13:54:13 -0700 (Wed, 04 Oct 2006)
Log Message:
-----------
PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/German/MergeGerman.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-03 20:30:37 UTC (rev 3679)
+++ trunk/Src/Changes.txt 2006-10-04 20:54:13 UTC (rev 3680)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-04 Tim
+ PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-10-02 Gal
BUG: [ 1566783 ] Crash on Save Project when no file is selected
Src: MainFrm.cpp
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-03 20:30:37 UTC (rev 3679)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-04 20:54:13 UTC (rev 3680)
@@ -230,7 +230,7 @@
MENUITEM "&Einstellungen...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Aktualisieren\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "Ausge&w\xE4hlte aktualisieren\tStrg+F5", ID_DIR_RESCAN
END
POPUP "&Ansicht"
BEGIN
@@ -341,7 +341,7 @@
MENUITEM "L&inks schreibgesch\xFCtzt", ID_FILE_LEFT_READONLY
MENUITEM "R&echts schreibgesch\xFCtzt", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Zeilenenden konvertieren nach"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -650,7 +650,7 @@
IDD_OPEN DIALOGEX 0, 0, 374, 126
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "Dateien oder Verzeichnisse ausw\xE4hlen..."
+CAPTION "Dateien oder Ordner ausw\xE4hlen..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&Links:",IDC_STATIC,13,24,65,8
@@ -671,13 +671,13 @@
EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL |
ES_READONLY
PUSHBUTTON "Ausw\xE4hlen...",IDC_SELECT_UNPACKER,252,70,50,14
- CONTROL "&Unterverzeichnisse einbeziehen",IDC_RECURS_CHECK,"Button",
+ CONTROL "&Unterordner einbeziehen",IDC_RECURS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10
LTEXT "Status:",IDC_OPEN_STATUS,15,102,192,8
DEFPUSHBUTTON "OK",IDOK,316,11,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,316,28,50,14
PUSHBUTTON "Hilfe",ID_HELP,316,45,50,14
- GROUPBOX "Zu vergleichende Dateien oder Verzeichnisse",IDC_FILES_DIRS_GROUP,7,
+ GROUPBOX "Zu vergleichende Dateien oder Ordner",IDC_FILES_DIRS_GROUP,7,
7,302,111
END
@@ -1190,7 +1190,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "Testen",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "Installieren...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "Neu...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "Bearbeiten...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "L\xF6schen...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1596,7 +1596,7 @@
VALUE "FileDescription", "WinMerge Anwendung\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-2006 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
@@ -2018,7 +2018,7 @@
IDS_FILEFILTER_INSTALLFAIL
"Installing filter file failed.\n\nCould not copy new filter file to filter folder."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
// VERSION CONTROL OPTIONS
@@ -2075,14 +2075,14 @@
// OPEN DIALOG
STRINGTABLE
BEGIN
- IDS_ERROR_INCOMPARABLE "W\xE4hlen Sie zwei Dateien oder Verzeichnisse zum Vergleichen aus"
- IDS_DIRSEL_TAG "Verzeichnis-Auswahl"
- IDS_OPEN_FILESDIRS "Zwei Verzeichnisse oder zwei Dateien zum Vergleichen ausw\xE4hlen."
+ IDS_ERROR_INCOMPARABLE "W\xE4hlen Sie zwei Dateien oder Ordner zum Vergleichen aus"
+ IDS_DIRSEL_TAG "Ordnerauswahl"
+ IDS_OPEN_FILESDIRS "Zwei Ordner oder zwei Dateien zum Vergleichen ausw\xE4hlen."
IDS_OPEN_LEFTINVALID "Der linke Pfad ist ung\xFCltig!"
IDS_OPEN_RIGHTINVALID "Der rechte Pfad ist ung\xFCltig!"
IDS_OPEN_BOTHINVALID "Beide Pfade sind ung\xFCltig!"
IDS_OPEN_UNPACKERDISABLED "Zwei Dateien zum Aktivieren der Entpacker-Auswahl ausw\xE4hlen."
- IDS_OPEN_MISMATCH "Datei und Verzeichnis k\xF6nnen nicht verglichen werden!"
+ IDS_OPEN_MISMATCH "Datei und Ordner k\xF6nnen nicht verglichen werden!"
END
// LOADING FILE
@@ -2127,13 +2127,13 @@
BEGIN
IDS_NOPROJECT "Sie m\xFCssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)"
IDS_VSS_CHECKOUT_STATUS "Dateien auschecken vom VSS..."
- IDS_VSSERROR "SourceSafe hat beim Versuch die Datei auszuchecken einen Fehler gemeldet. Der Vorgang kann nicht fortgesetzt werden..."
- IDS_VSS_RUN_ERROR "Fehler beim Versionieren."
+ IDS_VSSERROR "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..."
+ IDS_VSS_RUN_ERROR "Fehler beim Ausf\xFChren eines Befehles des Versionierungssystems."
IDS_VSSFOLDER_AND_FILE_NOMATCH "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht \xFCberein. Fortsetzen?"
IDS_VSS_NODATABASES "Keine VSS Datenbank(en) gefunden!"
IDS_VSS_ERRORFROM "Fehler vom VSS:"
- IDS_VSS_CHECKINERROR "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
- IDS_VSS_UNCOERROR "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
+ IDS_VSS_CHECKINERROR "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei einzuchecken.\n Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht.\n Auschecken r\xFCckg\xE4ngig machen?"
+ IDS_VSS_UNCOERROR "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei r\xFCckg\xE4ngig zu machen.\n Bitte \xFCberpr\xFCfen Sie die Konfiguration der verwendeten Ansicht."
END
// VSS system
@@ -2178,7 +2178,7 @@
IDS_DEL_LEFT_FMT2 "Links (%1 von %2)"
IDS_DEL_RIGHT_FMT2 "Rechts (%1 von %2)"
IDS_DEL_BOTH_FMT2 "Beide (%1 von %2)"
- IDS_SELECT_DESTFOLDER "Zielverzeichnis ausw\xE4hlen."
+ IDS_SELECT_DESTFOLDER "Zielordner ausw\xE4hlen."
IDS_MOVE_LEFT_TO "Links nach... (%1)"
IDS_MOVE_RIGHT_TO "Rechts nach... (%1)"
IDS_MOVE_LEFT_TO2 "Links nach... (%1 von %2)"
@@ -2236,7 +2236,7 @@
STRINGTABLE
BEGIN
IDS_COLHDR_FILENAME "Dateiname"
- IDS_COLHDR_DIR "Verzeichnis"
+ IDS_COLHDR_DIR "Ordner"
IDS_COLHDR_RESULT "Vergleichs-Ergebnis"
IDS_COLHDR_LTIMEM "Linkes Datum"
IDS_COLHDR_RTIMEM "Rechtes Datum"
@@ -2258,8 +2258,8 @@
IDS_COLHDR_RESULT_ABBR "Kurz-Ergebnis"
IDS_COLHDR_LATTRIBUTES "Linke Attribute"
IDS_COLHDR_RATTRIBUTES "Rechte Attribute"
- IDS_COLHDR_LEOL_TYPE "Left EOL"
- IDS_COLHDR_REOL_TYPE "Right EOL"
+ IDS_COLHDR_LEOL_TYPE "Linkes Zeilenende"
+ IDS_COLHDR_REOL_TYPE "Rechtes Zeilenende"
END
// DIRECTORY DIFFING : COLUMN TITLES #3
@@ -2278,7 +2278,7 @@
IDS_CANT_COMPARE_FILES "Dateien k\xF6nnen nicht verglichen werden"
IDS_ABORTED_ITEM "Objekt abgebrochen"
IDS_FILE_SKIPPED "Datei \xFCbersprungen"
- IDS_DIR_SKIPPED "Verzeichnis \xFCbersprungen"
+ IDS_DIR_SKIPPED "Ordner \xFCbersprungen"
IDS_ONLY_IN_FMT "Nur in %1"
IDS_BIN_FILES_SAME "Bin\xE4rdateien sind identisch"
IDS_IDENTICAL "Identisch"
@@ -2300,8 +2300,8 @@
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1
STRINGTABLE
BEGIN
- IDS_COLDESC_FILENAME "Dateiname oder Verzeichnisname."
- IDS_COLDESC_DIR "Unterverzeichnisname, wenn Unterverzeichnisse vorhanden sind."
+ IDS_COLDESC_FILENAME "Dateiname oder Ordnername."
+ IDS_COLDESC_DIR "Unterordnername, wenn Unterordner vorhanden sind."
IDS_COLDESC_RESULT "Vergleichs-Ergebnis, langes Format."
IDS_COLDESC_LTIMEM "Linkes \xC4nderungsdatum."
IDS_COLDESC_RTIMEM "Rechtes \xC4nderungsdatum."
@@ -2323,8 +2323,8 @@
IDS_COLDESC_RESULT_ABBR "Vergleichs-Ergebnis, kurzes Format."
IDS_COLDESC_LATTRIBUTES "Linke Attribute."
IDS_COLDESC_RATTRIBUTES "Rechte Attribute."
- IDS_COLDESC_LEOL_TYPE "Left side file EOL type"
- IDS_COLDESC_REOL_TYPE "Right side file EOL type"
+ IDS_COLDESC_LEOL_TYPE "Linker Zeilenenden-Typ"
+ IDS_COLDESC_REOL_TYPE "Rechter Zeilenenden-Typ"
END
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)
@@ -2376,11 +2376,11 @@
// Encoding issues
STRINGTABLE
BEGIN
- IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie like to treat both files as being in the default windows codepage (recommended)?"
- IDS_DIFFERENT_UNICODINGS "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
- IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files"
- IDS_LOSSY_TRANSCODING_RIGHT "Information lost due to encoding errors: right file"
- IDS_LOSSY_TRANSCODING_LEFT "Information lost due to encoding errors: left file"
+ IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie beide Dateien behandeln, als w\xE4ren sie im gleichen Zeichensatz (empfohlen)?"
+ IDS_DIFFERENT_UNICODINGS "Warnung: Die Dateien haben unterschiedliche Kodierungen, links=%s und rechts=%s, und das Vermischen f\xFChrt m\xF6glicherweise zu Informationsverlusten."
+ IDS_LOSSY_TRANSCODING_BOTH "Informationsverlust wegen Kodierungsfehlern: Beide Dateien"
+ IDS_LOSSY_TRANSCODING_RIGHT "Informationsverlust wegen Kodierungsfehlern: Rechte Datei"
+ IDS_LOSSY_TRANSCODING_LEFT "Informationsverlust wegen Kodierungsfehlern: Linke Datei"
END
// EDITOR : SHOW LINE DIFF
@@ -2437,8 +2437,8 @@
IDS_NO_ZIP_SUPPORT "Die Archiv-Unterst\xFCtzung ist nicht aktiviert.\n
Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) f\xFCr die Archiv-Unterst\xFCtzung k\xF6nnen nicht gefunden werden.
Entnehmen Sie dem Handbuch mehr Informationen \xFCber die Archiv-Unterst\xFCtzung und wie sie aktiviert wird."
- IDS_MERGE7Z_ENABLE_0 "\nNote: 7-Zip integration is disabled in WinMerge settings."
- IDS_MERGE7Z_ENABLE_2 "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings."
+ IDS_MERGE7Z_ENABLE_0 "\nHinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert."
+ IDS_MERGE7Z_ENABLE_2 "\nHinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenst\xE4ndige Arbeitsweise beschr\xE4nkt."
IDS_OPT_EXPORT_CAPTION "Datei zum Exportieren ausw\xE4hlen"
IDS_OPT_IMPORT_CAPTION "Datei zum Importieren ausw\xE4hlen"
IDS_OPT_IMPORT_DONE "Einstellungen aus der Datei importiert."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-03 20:30:55
|
Revision: 3679
http://svn.sourceforge.net/winmerge/?rev=3679&view=rev
Author: gerundt
Date: 2006-10-03 13:30:37 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
PATCH: [ 1569431 ] Couple of typos in Translations -page
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/index.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-03 19:06:48 UTC (rev 3678)
+++ trunk/Web/Changes.txt 2006-10-03 20:30:37 UTC (rev 3679)
@@ -1,3 +1,7 @@
+2006-10-03 Tim
+ PATCH: [ 1569431 ] Couple of typos in Translations -page
+ Web\developer\l10n: index.php
+
2006-10-01 Tim
PATCH: [ 1566474 ] Web: Improve translations index page
Web\developer\l10n: index.php
Modified: trunk/Web/developer/l10n/index.php
===================================================================
--- trunk/Web/developer/l10n/index.php 2006-10-03 19:06:48 UTC (rev 3678)
+++ trunk/Web/developer/l10n/index.php 2006-10-03 20:30:37 UTC (rev 3679)
@@ -19,12 +19,12 @@
}
print("</ul>\n");
?>
-<p>To change languages, select the desired language from the View->Languages
+<p>To change a language, select the desired language from the View->Languages
menu choice; language names are shown in both languages (native language and
current WinMerge language).</p>
<p>If the desired language is not present, then you are missing a language file.
-Language files are names as <code>Merge</code> + <code><var>language name</var></code>
-+ <code>.lang</code> as filename extension. For example, for Catalan, you need
+Language files are named as <code>Merge</code> + <code><var>language name</var></code>
++ <code>.lang</code>, <code><em>.lang</em></code> as filename extension. For example, for Catalan, you need
to have the file <code>MergeCatalan.lang</code> in the <code>Languages</code>
subfolder of WinMerge folder. These would normally be installed for you by
installer, if you did a <em>Full Installation</em>. Installer also allows to
@@ -32,7 +32,7 @@
with installer you can copy the desired language file into the correct folder,
and restart WinMerge.</p>
<p>If you would like to update any of these translations or add another translation,
-then please follow <a href="instructions.php">these instructions</a>.</p>
+please follow <a href="instructions.php">these instructions</a>.</p>
<p>You can also take a look at the <a href="status.php">status of the translations</a>.</p>
<?php
$page->printFoot();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-03 19:06:58
|
Revision: 3678
http://svn.sourceforge.net/winmerge/?rev=3678&view=rev
Author: kimmov
Date: 2006-10-03 12:06:48 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
PATCH: [ 1569400 ] Manual: Update About Doc chapter
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/About_Doc.xml
branches/R2_6/Docs/Users/Manual/Changes.txt
Modified: branches/R2_6/Docs/Users/Manual/About_Doc.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/About_Doc.xml 2006-10-03 18:13:24 UTC (rev 3677)
+++ branches/R2_6/Docs/Users/Manual/About_Doc.xml 2006-10-03 19:06:48 UTC (rev 3678)
@@ -2,38 +2,39 @@
<sect1 id="AboutDoc">
<title>About This Document</title>
- <para>This is a manual for WinMerge 2.5.</para>
+ <para>This is a manual for WinMerge 2.6.</para>
- <para>This manual is important reading for experienced and new users of
- WinMerge 2.5. There are lot of new features and improvements in version 2.5.
- Reading this manual will help ensure the user knows about the various
- functions available in WinMerge, and various limitations.</para>
+ <para>This manual is recommended reading for experienced and new users of
+ WinMerge 2.6. Reading this manual will help ensure the user knows about the
+ various functions available in WinMerge, and various limitations.</para>
<para>Please read at least the following chapters:</para>
<itemizedlist>
<listitem>
- <para>The <link linkend="QuickStart">Quick start</link> chapter will get you
- quickly started with WinMerge. After reading this chapter you will know the
- basic usage of WinMerge.</para>
+ <simpara>The <link linkend="QuickStart">Quick start</link> chapter will
+ get you quickly started with WinMerge. After reading this chapter you
+ will know the basic usage of WinMerge.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="CompareDirs">Comparing Folders</link> chapter
- explains folder comparison, ways to change the results display, and
- operations available in the folder comparison window.</para>
+ <simpara>The <link linkend="CompareDirs">Comparing Folders</link>
+ chapter explains folder comparison, ways to change the results display,
+ and operations available in the folder comparison window.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="CompareFiles">Comparing Files</link> chapter
- explains the file comparison/merge window, its various panes, and methods of
- navigation, modes, and operations available in this window.</para>
+ <simpara>The <link linkend="CompareFiles">Comparing Files</link> chapter
+ explains the file comparison/merge window, its various panes, and
+ methods of navigation, modes, and operations available in this
+ window.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Configuration">Options and Configuration</link>
- chapter helps to customize WinMerge to your needs, including things such as
- whitespace handling, colors, and handling text encoding.</para>
+ <simpara>The <link linkend="Configuration">Options and
+ Configuration</link> chapter helps to customize WinMerge to your needs,
+ including things such as whitespace handling, colors, and handling text
+ encoding.</simpara>
</listitem>
</itemizedlist>
@@ -42,33 +43,33 @@
<itemizedlist>
<listitem>
- <para>The <link linkend="OpenPaths">Opening Files and Folders</link> chapter
- introduces several ways (there are many!) to open files and folders to
- WinMerge. For example, do you know how to use the Shell Extension context
- menu in advanced mode?</para>
+ <simpara>The <link linkend="OpenPaths">Opening Files and Folders</link>
+ chapter introduces several ways (there are many!) to open files and
+ folders to WinMerge. For example, do you know how to use the Shell
+ Extension context menu in advanced mode?</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Plugins">Plugins</link> chapter introduces
- plugins.</para>
+ <simpara>The <link linkend="Plugins">Plugins</link> chapter introduces
+ plugins.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Filters">Filters</link> chapter explains the use of
- both file filters and line filters.</para>
+ <simpara>The <link linkend="Filters">Filters</link> chapter explains the
+ use of both file filters and line filters.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="CommandLine">Commandline</link> chapter lists
- commandline parameters for WinMerge (for using with other tools, or from a
- script).</para>
+ <simpara>The <link linkend="CommandLine">Commandline</link> chapter
+ lists commandline parameters for WinMerge (for using with other tools,
+ or from a script).</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Faq">FAQ chapter</link> contains answers to many
- common questions asked of developers. Please check first if your question is
- answered there before submitting questions to <ulink
- url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>.</para>
+ <simpara>The <link linkend="Faq">FAQ chapter</link> contains answers to
+ many common questions asked of developers. Please check first if your
+ question is answered there before submitting questions to <ulink
+ url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>.</simpara>
</listitem>
</itemizedlist>
</sect1>
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 18:13:24 UTC (rev 3677)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 19:06:48 UTC (rev 3678)
@@ -1,6 +1,8 @@
2006-10-03 Kimmo
PATCH: [ 1569389 ] Manual: fix translations part
Manual: Locales.xml
+ PATCH: [ 1569400 ] Manual: Update About Doc chapter
+ Manual: About_Doc.xml
2006-10-02 Tim
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-03 18:13:38
|
Revision: 3677
http://svn.sourceforge.net/winmerge/?rev=3677&view=rev
Author: kimmov
Date: 2006-10-03 11:13:24 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
PATCH: [ 1569400 ] Manual: Update About Doc chapter
Modified Paths:
--------------
trunk/Docs/Users/Manual/About_Doc.xml
trunk/Docs/Users/Manual/Changes.txt
Modified: trunk/Docs/Users/Manual/About_Doc.xml
===================================================================
--- trunk/Docs/Users/Manual/About_Doc.xml 2006-10-03 15:51:17 UTC (rev 3676)
+++ trunk/Docs/Users/Manual/About_Doc.xml 2006-10-03 18:13:24 UTC (rev 3677)
@@ -2,38 +2,39 @@
<sect1 id="AboutDoc">
<title>About This Document</title>
- <para>This is a manual for WinMerge 2.5.</para>
+ <para>This is a manual for WinMerge 2.6.</para>
- <para>This manual is important reading for experienced and new users of
- WinMerge 2.5. There are lot of new features and improvements in version 2.5.
- Reading this manual will help ensure the user knows about the various
- functions available in WinMerge, and various limitations.</para>
+ <para>This manual is recommended reading for experienced and new users of
+ WinMerge 2.6. Reading this manual will help ensure the user knows about the
+ various functions available in WinMerge, and various limitations.</para>
<para>Please read at least the following chapters:</para>
<itemizedlist>
<listitem>
- <para>The <link linkend="QuickStart">Quick start</link> chapter will get you
- quickly started with WinMerge. After reading this chapter you will know the
- basic usage of WinMerge.</para>
+ <simpara>The <link linkend="QuickStart">Quick start</link> chapter will
+ get you quickly started with WinMerge. After reading this chapter you
+ will know the basic usage of WinMerge.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="CompareDirs">Comparing Folders</link> chapter
- explains folder comparison, ways to change the results display, and
- operations available in the folder comparison window.</para>
+ <simpara>The <link linkend="CompareDirs">Comparing Folders</link>
+ chapter explains folder comparison, ways to change the results display,
+ and operations available in the folder comparison window.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="CompareFiles">Comparing Files</link> chapter
- explains the file comparison/merge window, its various panes, and methods of
- navigation, modes, and operations available in this window.</para>
+ <simpara>The <link linkend="CompareFiles">Comparing Files</link> chapter
+ explains the file comparison/merge window, its various panes, and
+ methods of navigation, modes, and operations available in this
+ window.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Configuration">Options and Configuration</link>
- chapter helps to customize WinMerge to your needs, including things such as
- whitespace handling, colors, and handling text encoding.</para>
+ <simpara>The <link linkend="Configuration">Options and
+ Configuration</link> chapter helps to customize WinMerge to your needs,
+ including things such as whitespace handling, colors, and handling text
+ encoding.</simpara>
</listitem>
</itemizedlist>
@@ -42,33 +43,33 @@
<itemizedlist>
<listitem>
- <para>The <link linkend="OpenPaths">Opening Files and Folders</link> chapter
- introduces several ways (there are many!) to open files and folders to
- WinMerge. For example, do you know how to use the Shell Extension context
- menu in advanced mode?</para>
+ <simpara>The <link linkend="OpenPaths">Opening Files and Folders</link>
+ chapter introduces several ways (there are many!) to open files and
+ folders to WinMerge. For example, do you know how to use the Shell
+ Extension context menu in advanced mode?</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Plugins">Plugins</link> chapter introduces
- plugins.</para>
+ <simpara>The <link linkend="Plugins">Plugins</link> chapter introduces
+ plugins.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Filters">Filters</link> chapter explains the use of
- both file filters and line filters.</para>
+ <simpara>The <link linkend="Filters">Filters</link> chapter explains the
+ use of both file filters and line filters.</simpara>
</listitem>
<listitem>
- <para>The <link linkend="CommandLine">Commandline</link> chapter lists
- commandline parameters for WinMerge (for using with other tools, or from a
- script).</para>
+ <simpara>The <link linkend="CommandLine">Commandline</link> chapter
+ lists commandline parameters for WinMerge (for using with other tools,
+ or from a script).</simpara>
</listitem>
<listitem>
- <para>The <link linkend="Faq">FAQ chapter</link> contains answers to many
- common questions asked of developers. Please check first if your question is
- answered there before submitting questions to <ulink
- url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>.</para>
+ <simpara>The <link linkend="Faq">FAQ chapter</link> contains answers to
+ many common questions asked of developers. Please check first if your
+ question is answered there before submitting questions to <ulink
+ url="http://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>.</simpara>
</listitem>
</itemizedlist>
-</sect1>
+</sect1>
\ No newline at end of file
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-03 15:51:17 UTC (rev 3676)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-03 18:13:24 UTC (rev 3677)
@@ -1,6 +1,8 @@
2006-10-03 Kimmo
PATCH: [ 1569389 ] Manual: fix translations part
Manual: Locales.xml
+ PATCH: [ 1569400 ] Manual: Update About Doc chapter
+ Manual: About_Doc.xml
2006-10-02 Tim
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-03 15:51:24
|
Revision: 3676
http://svn.sourceforge.net/winmerge/?rev=3676&view=rev
Author: kimmov
Date: 2006-10-03 08:51:17 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
PATCH: [ 1569389 ] Manual: fix translations part
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Locales.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 15:49:27 UTC (rev 3675)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-03 15:51:17 UTC (rev 3676)
@@ -1,3 +1,7 @@
+2006-10-03 Kimmo
+ PATCH: [ 1569389 ] Manual: fix translations part
+ Manual: Locales.xml
+
2006-10-02 Tim
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
Manual/build: build_html.bat
Modified: branches/R2_6/Docs/Users/Manual/Locales.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Locales.xml 2006-10-03 15:49:27 UTC (rev 3675)
+++ branches/R2_6/Docs/Users/Manual/Locales.xml 2006-10-03 15:51:17 UTC (rev 3676)
@@ -3,10 +3,8 @@
<title>Locale support</title>
<para>WinMerge allows translating the user interface to other languages than
- English. Several translations have been contributed. At the time of this
- writing, translations are available from <ulink
- url="http://www.winmerge.org/">WinMerge.org</ulink> for the following
- languages:</para>
+ English. Several translations have been contributed. Translations are
+ available for the following languages:</para>
<itemizedlist>
<listitem>
@@ -91,14 +89,14 @@
</itemizedlist>
<note>
- <para>The translations cover interface content, including menus,
- dialogs, tooltips, and messages -- essentially the translation of
- of all strings displayed. However, they do not provide areas
- outside of string translation; they do not handle how numbers
- are divided, or how words are alphabetized. (These issues should
- be addressed in the conventional Windows manner, which is
- via the Regional settings in the Control Panel.)
- </para></note>
+ <para>The translations cover interface content, including menus, dialogs,
+ tooltips, and messages -- essentially the translation of of all strings
+ displayed. However, they do not provide areas outside of string
+ translation; they do not handle how numbers are divided, or how words are
+ alphabetized. (These issues should be addressed in the conventional
+ Windows manner, which is via the Regional settings in the Control
+ Panel.)</para>
+ </note>
<sect2>
<title>Selecting language</title>
@@ -108,16 +106,17 @@
<orderedlist>
<listitem>
- <para>Run WinMerge</para>
+ <simpara>Run WinMerge</simpara>
</listitem>
<listitem>
- <para>Select <guimenuitem>Language</guimenuitem> from the
- <guimenu>View</guimenu> menu</para>
+ <simpara>Select <guimenuitem>Language</guimenuitem> from the
+ <guimenu>View</guimenu> menu</simpara>
</listitem>
<listitem>
- <para>Select your language and click <guibutton>OK</guibutton></para>
+ <simpara>Select your language and click
+ <guibutton>OK</guibutton></simpara>
</listitem>
</orderedlist>
@@ -128,46 +127,39 @@
<sect2>
<title>Installing translation</title>
- <para>The easiest way to install translations is to select them in the installer.
- Translations are selected in the 4th installer dialog (<guilabel>Select
- components</guilabel>). The default install (<guilabel>Typical
- Installation</guilabel>) does not install translations, but they can be
- individually selected from the list.</para>
+ <para>The easiest way to install translations is to select them in the
+ installer. Translations are selected in the 4th installer dialog
+ (<guilabel>Select components</guilabel>). The default install
+ (<guilabel>Typical Installation</guilabel>) does not install translations,
+ but they can be individually selected from the list.</para>
<para>If you don't want to re-run installer, or didn't install WinMerge
with the installer in the first place, then WinMerge translation files are
- available in zipped versions and translation updates. To install new
- translation file:</para>
+ available in zipped versions. To install new translation file:</para>
<para><orderedlist>
<listitem>
- <para>Download the zipped release from <ulink
+ <simpara>Download the zipped release from <ulink
url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717">WinMerge
- download</ulink> site or updated translation file from <ulink
- url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717">Languages
- download</ulink>.</para>
+ download</ulink> site.</simpara>
</listitem>
<listitem>
- <para>If the <filename class="directory">Languages</filename>
+ <simpara>If the <filename class="directory">Languages</filename>
subdirectory does not exist under the WinMerge directory (where
<filename>WinMerge.exe</filename> and/or
- <filename>WinMergeU.exe</filename> is located) create it.</para>
+ <filename>WinMergeU.exe</filename> is located) create it.</simpara>
</listitem>
<listitem>
- <para>a) If you downloaded just the language files, unzip them into the
- <filename class="directory">Languages</filename> directory.</para>
-
- <para>b) If you downloaded an entire WinMerge release, then search for
- <filename>Merge*.lang</filename> files, where * is a language name
- (<filename>MergeSwedish.lang</filename> for Swedish translation).
- Unzip that file to the <filename>Languages</filename>
- directory.</para>
+ <simpara>Search for <filename>Merge*.lang</filename> files, where *
+ is a language name (<filename>MergeSwedish.lang</filename> for
+ Swedish translation) in archive file. Extract that file to the
+ <filename>Languages</filename> directory.</simpara>
</listitem>
<listitem>
- <para>Run WinMerge</para>
+ <simpara>Run WinMerge</simpara>
</listitem>
<listitem>
@@ -176,8 +168,8 @@
</listitem>
<listitem>
- <para>Select your language and click
- <guibutton>OK</guibutton></para>
+ <simpara>Select your language and click
+ <guibutton>OK</guibutton></simpara>
</listitem>
</orderedlist></para>
</sect2>
@@ -187,8 +179,8 @@
<para>Please submit errors you find in translations as bugs to our <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-list</ulink>.
- It would be great if you can provide a corrected version of the translated text
- also.</para>
+ It would be great if you can provide a corrected version of the translated
+ text also.</para>
</sect2>
<sect2>
@@ -197,11 +189,11 @@
<para>If you would like to add your language to the list, look at the
<ulink url="http://www.winmerge.org/developer/l10n/index.php">on-line
documentation</ulink> for the details on how to do it. All translations
- are not complete so it would be nice if you can help improving them too.
+ are not complete so it would be nice if you can help improving them.
Translating (or improving translation) does not require you to have all
compile tools or knowledge of WinMerge internals. Just read instructions
from above link. And if you have problems ask help from us in one of
<ulink url="http://sourceforge.net/forum/?group_id=13216">WinMerge
forums</ulink>.</para>
</sect2>
-</sect1>
\ No newline at end of file
+</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-03 15:49:45
|
Revision: 3675
http://svn.sourceforge.net/winmerge/?rev=3675&view=rev
Author: kimmov
Date: 2006-10-03 08:49:27 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
PATCH: [ 1569389 ] Manual: fix translations part
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Locales.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-02 16:23:06 UTC (rev 3674)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-03 15:49:27 UTC (rev 3675)
@@ -1,3 +1,7 @@
+2006-10-03 Kimmo
+ PATCH: [ 1569389 ] Manual: fix translations part
+ Manual: Locales.xml
+
2006-10-02 Tim
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
Manual/build: build_html.bat
Modified: trunk/Docs/Users/Manual/Locales.xml
===================================================================
--- trunk/Docs/Users/Manual/Locales.xml 2006-10-02 16:23:06 UTC (rev 3674)
+++ trunk/Docs/Users/Manual/Locales.xml 2006-10-03 15:49:27 UTC (rev 3675)
@@ -3,10 +3,8 @@
<title>Locale support</title>
<para>WinMerge allows translating the user interface to other languages than
- English. Several translations have been contributed. At the time of this
- writing, translations are available from <ulink
- url="http://www.winmerge.org/">WinMerge.org</ulink> for the following
- languages:</para>
+ English. Several translations have been contributed. Translations are
+ available for the following languages:</para>
<itemizedlist>
<listitem>
@@ -91,14 +89,14 @@
</itemizedlist>
<note>
- <para>The translations cover interface content, including menus,
- dialogs, tooltips, and messages -- essentially the translation of
- of all strings displayed. However, they do not provide areas
- outside of string translation; they do not handle how numbers
- are divided, or how words are alphabetized. (These issues should
- be addressed in the conventional Windows manner, which is
- via the Regional settings in the Control Panel.)
- </para></note>
+ <para>The translations cover interface content, including menus, dialogs,
+ tooltips, and messages -- essentially the translation of of all strings
+ displayed. However, they do not provide areas outside of string
+ translation; they do not handle how numbers are divided, or how words are
+ alphabetized. (These issues should be addressed in the conventional
+ Windows manner, which is via the Regional settings in the Control
+ Panel.)</para>
+ </note>
<sect2>
<title>Selecting language</title>
@@ -108,16 +106,17 @@
<orderedlist>
<listitem>
- <para>Run WinMerge</para>
+ <simpara>Run WinMerge</simpara>
</listitem>
<listitem>
- <para>Select <guimenuitem>Language</guimenuitem> from the
- <guimenu>View</guimenu> menu</para>
+ <simpara>Select <guimenuitem>Language</guimenuitem> from the
+ <guimenu>View</guimenu> menu</simpara>
</listitem>
<listitem>
- <para>Select your language and click <guibutton>OK</guibutton></para>
+ <simpara>Select your language and click
+ <guibutton>OK</guibutton></simpara>
</listitem>
</orderedlist>
@@ -128,46 +127,39 @@
<sect2>
<title>Installing translation</title>
- <para>The easiest way to install translations is to select them in the installer.
- Translations are selected in the 4th installer dialog (<guilabel>Select
- components</guilabel>). The default install (<guilabel>Typical
- Installation</guilabel>) does not install translations, but they can be
- individually selected from the list.</para>
+ <para>The easiest way to install translations is to select them in the
+ installer. Translations are selected in the 4th installer dialog
+ (<guilabel>Select components</guilabel>). The default install
+ (<guilabel>Typical Installation</guilabel>) does not install translations,
+ but they can be individually selected from the list.</para>
<para>If you don't want to re-run installer, or didn't install WinMerge
with the installer in the first place, then WinMerge translation files are
- available in zipped versions and translation updates. To install new
- translation file:</para>
+ available in zipped versions. To install new translation file:</para>
<para><orderedlist>
<listitem>
- <para>Download the zipped release from <ulink
+ <simpara>Download the zipped release from <ulink
url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717">WinMerge
- download</ulink> site or updated translation file from <ulink
- url="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11403&release_id=283717">Languages
- download</ulink>.</para>
+ download</ulink> site.</simpara>
</listitem>
<listitem>
- <para>If the <filename class="directory">Languages</filename>
+ <simpara>If the <filename class="directory">Languages</filename>
subdirectory does not exist under the WinMerge directory (where
<filename>WinMerge.exe</filename> and/or
- <filename>WinMergeU.exe</filename> is located) create it.</para>
+ <filename>WinMergeU.exe</filename> is located) create it.</simpara>
</listitem>
<listitem>
- <para>a) If you downloaded just the language files, unzip them into the
- <filename class="directory">Languages</filename> directory.</para>
-
- <para>b) If you downloaded an entire WinMerge release, then search for
- <filename>Merge*.lang</filename> files, where * is a language name
- (<filename>MergeSwedish.lang</filename> for Swedish translation).
- Unzip that file to the <filename>Languages</filename>
- directory.</para>
+ <simpara>Search for <filename>Merge*.lang</filename> files, where *
+ is a language name (<filename>MergeSwedish.lang</filename> for
+ Swedish translation) in archive file. Extract that file to the
+ <filename>Languages</filename> directory.</simpara>
</listitem>
<listitem>
- <para>Run WinMerge</para>
+ <simpara>Run WinMerge</simpara>
</listitem>
<listitem>
@@ -176,8 +168,8 @@
</listitem>
<listitem>
- <para>Select your language and click
- <guibutton>OK</guibutton></para>
+ <simpara>Select your language and click
+ <guibutton>OK</guibutton></simpara>
</listitem>
</orderedlist></para>
</sect2>
@@ -187,8 +179,8 @@
<para>Please submit errors you find in translations as bugs to our <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-list</ulink>.
- It would be great if you can provide a corrected version of the translated text
- also.</para>
+ It would be great if you can provide a corrected version of the translated
+ text also.</para>
</sect2>
<sect2>
@@ -197,11 +189,11 @@
<para>If you would like to add your language to the list, look at the
<ulink url="http://www.winmerge.org/developer/l10n/index.php">on-line
documentation</ulink> for the details on how to do it. All translations
- are not complete so it would be nice if you can help improving them too.
+ are not complete so it would be nice if you can help improving them.
Translating (or improving translation) does not require you to have all
compile tools or knowledge of WinMerge internals. Just read instructions
from above link. And if you have problems ask help from us in one of
<ulink url="http://sourceforge.net/forum/?group_id=13216">WinMerge
forums</ulink>.</para>
</sect2>
-</sect1>
\ No newline at end of file
+</sect1>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-10-02 21:02:44
|
Revision: 3673
http://svn.sourceforge.net/winmerge/?rev=3673&view=rev
Author: galh
Date: 2006-10-02 06:48:41 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
BUG: [ 1566783 ] Crash on Save Project when no file is selected
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-02 11:11:23 UTC (rev 3672)
+++ trunk/Src/Changes.txt 2006-10-02 13:48:41 UTC (rev 3673)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-02 Gal
+ BUG: [ 1566783 ] Crash on Save Project when no file is selected
+ Src: MainFrm.cpp
+
2006-10-01 Kimmo
PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
Src: MainFrm.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-02 11:11:23 UTC (rev 3672)
+++ trunk/Src/MainFrm.cpp 2006-10-02 13:48:41 UTC (rev 3673)
@@ -3060,7 +3060,8 @@
{
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
CDirView *pView = pDoc->GetMainView();
- int ind = pView->GetFirstSelectedInd();
+ // 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 += "\\";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
