|
From: <sdo...@us...> - 2007-03-07 20:09:56
|
Revision: 4147
http://svn.sourceforge.net/winmerge/?rev=4147&view=rev
Author: sdottaka
Date: 2007-03-07 12:09:46 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-06 20:09:22 UTC (rev 4146)
+++ trunk/Src/Changes.txt 2007-03-07 20:09:46 UTC (rev 4147)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-07 Takashi
+ PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
+ Src/DirView.cpp
+
2007-03-06 Kimmo
PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
Submitted by Hans Eriksson
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2007-03-06 20:09:22 UTC (rev 4146)
+++ trunk/Src/DirView.cpp 2007-03-07 20:09:46 UTC (rev 4147)
@@ -2725,6 +2725,8 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
POSITION pos = GetItemKey(sel);
+ if (pos == (POSITION) SPECIAL_ITEM_POS)
+ continue;
pDoc->SetItemViewFlag(pos, ViewCustomFlags::HIDDEN, ViewCustomFlags::VISIBILITY);
m_pList->DeleteItem(sel--);
m_nHiddenItems++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-07 22:45:36
|
Revision: 4149
http://svn.sourceforge.net/winmerge/?rev=4149&view=rev
Author: kimmov
Date: 2007-03-07 14:45:16 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
PATCH: [ 1675087 ] New copy confirmation dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirActions.cpp
trunk/Src/FileActionScript.h
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.dsp
trunk/Src/Merge.rc
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/ConfirmFolderCopyDlg.cpp
trunk/Src/ConfirmFolderCopyDlg.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Changes.txt 2007-03-07 22:45:16 UTC (rev 4149)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-07 Kimmo
+ PATCH: [ 1675087 ] New copy confirmation dialog
+ Src: DirActions.cpp FileActionScript.h Merge.dsp Merge.rc resource.h
+ Src new files: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h
+ Src/Languages/*: Merge*.rc
+
2007-03-07 Takashi
PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
Src/DirView.cpp
Added: trunk/Src/ConfirmFolderCopyDlg.cpp
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.cpp (rev 0)
+++ trunk/Src/ConfirmFolderCopyDlg.cpp 2007-03-07 22:45:16 UTC (rev 4149)
@@ -0,0 +1,103 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file ConfirmFolderCopyDlg.cpp
+ *
+ * @brief Implementation file for ConfirmFolderCopyDlg dialog
+ */
+// ID line follows -- this is updated by SVN
+// $Id: $
+
+#include "stdafx.h"
+#include "Merge.h"
+#include "ConfirmFolderCopyDlg.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+
+// ConfirmFolderCopyDlg dialog
+
+IMPLEMENT_DYNAMIC(ConfirmFolderCopyDlg, CDialog)
+ConfirmFolderCopyDlg::ConfirmFolderCopyDlg(CWnd* pParent /*=NULL*/)
+ : CDialog(ConfirmFolderCopyDlg::IDD, pParent)
+{
+}
+
+ConfirmFolderCopyDlg::~ConfirmFolderCopyDlg()
+{
+}
+
+void ConfirmFolderCopyDlg::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(ConfirmFolderCopyDlg)
+ DDX_Text(pDX, IDC_FLDCONFIRM_FROM_TEXT, m_fromText);
+ DDX_Text(pDX, IDC_FLDCONFIRM_TO_TEXT, m_toText);
+ DDX_Text(pDX, IDC_FLDCONFIRM_FROM_PATH, m_fromPath);
+ DDX_Text(pDX, IDC_FLDCONFIRM_TO_PATH, m_toPath);
+ DDX_Text(pDX, IDC_FLDCONFIRM_QUERY, m_question);
+ //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(ConfirmFolderCopyDlg, CDialog)
+ ON_BN_CLICKED(IDNO, OnBnClickedNo)
+ ON_BN_CLICKED(IDYES, OnBnClickedYes)
+END_MESSAGE_MAP()
+
+
+// ConfirmFolderCopyDlg message handlers
+
+/**
+ * @brief Handler for WM_INITDIALOG; conventional location to initialize
+ * controls. At this point dialog and control windows exist.
+ */
+BOOL ConfirmFolderCopyDlg::OnInitDialog()
+{
+ CDialog::OnInitDialog();
+
+ GetDlgItem(IDC_FLDCONFIRM_TO_PATH)->SetFocus();
+
+ // Load warning icon
+ // TODO: we can have per-action icons?
+ HICON icon = AfxGetApp()->LoadStandardIcon(IDI_EXCLAMATION);
+ CStatic * pIcon = (CStatic *) GetDlgItem(IDC_FLDCONFIRM_ICON);
+ pIcon->SetIcon(icon);
+
+ return FALSE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+/**
+ * @brief Close dialog when No button is clicked.
+ */
+void ConfirmFolderCopyDlg::OnBnClickedNo()
+{
+ EndDialog(IDNO);
+}
+
+/**
+ * @brief Close dialog when Yes button is clicked.
+ */
+void ConfirmFolderCopyDlg::OnBnClickedYes()
+{
+ EndDialog(IDYES);
+}
Added: trunk/Src/ConfirmFolderCopyDlg.h
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.h (rev 0)
+++ trunk/Src/ConfirmFolderCopyDlg.h 2007-03-07 22:45:16 UTC (rev 4149)
@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file SaveClosingDlg.h
+ *
+ * @brief Declaration file for ConfirmFolderCopyDlg dialog
+ */
+// ID line follows -- this is updated by SVN
+// $Id: $
+
+/**
+ * @brief Dialog for item copy confirmation.
+ */
+class ConfirmFolderCopyDlg : public CDialog
+{
+ DECLARE_DYNAMIC(ConfirmFolderCopyDlg)
+
+public:
+ ConfirmFolderCopyDlg(CWnd* pParent = NULL); // standard constructor
+ virtual ~ConfirmFolderCopyDlg();
+
+// Dialog Data
+ enum { IDD = IDD_CONFIRM_COPY };
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ virtual BOOL OnInitDialog();
+
+ DECLARE_MESSAGE_MAP()
+public:
+
+ CString m_question;
+ CString m_fromText;
+ CString m_fromPath;
+ CString m_toText;
+ CString m_toPath;
+ afx_msg void OnBnClickedNo();
+ afx_msg void OnBnClickedYes();
+};
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/DirActions.cpp 2007-03-07 22:45:16 UTC (rev 4149)
@@ -7,7 +7,7 @@
*
* @brief Implementation of methods of CDirView that copy/move/delete files
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
// It would be nice to make this independent of the UI (CDirView)
@@ -21,7 +21,6 @@
#include "DirDoc.h"
#include "MainFrm.h"
#include "coretools.h"
-#include "OutputDlg.h"
#include "paths.h"
#include "7zCommon.h"
#include "CShellFileOp.h"
@@ -33,6 +32,7 @@
#include "LoadSaveCodepageDlg.h"
#include "IntToIntMap.h"
#include "FileOrFolderSelect.h"
+#include "ConfirmFolderCopyDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -42,22 +42,41 @@
extern CLogFile gLog;
-// Prompt user to confirm a multiple item copy
-static BOOL ConfirmMultipleCopy(int count, int total)
+// Prompt user to confirm a single item copy
+static BOOL ConfirmCopy(int origin, int destination, int count, LPCTSTR src, LPCTSTR dest)
{
- CString s;
- ASSERT(count>1);
- AfxFormatString2(s, IDS_CONFIRM_COPY2DIR, NumToStr(count), NumToStr(total));
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY2DIR);
- return (rtn==IDYES);
-}
+ ConfirmFolderCopyDlg dlg;
+ CString strQuestion;
+ CString sOrig;
+ CString sDest;
-// Prompt user to confirm a single item copy
-static BOOL ConfirmSingleCopy(LPCTSTR src, LPCTSTR dest)
-{
- CString s;
- AfxFormatString2(s, IDS_CONFIRM_COPY_SINGLE, src, dest);
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY_SINGLE);
+ if (count == 1)
+ {
+ strQuestion = LoadResString(IDS_CONFIRM_SINGLE_COPY);
+ }
+ else
+ {
+ strQuestion = LoadResString(IDS_CONFIRM_MULTIPLE_COPY);
+ strQuestion.Format(strQuestion, count);
+ }
+
+ if (origin == FileActionItem::UI_LEFT)
+ sOrig = LoadResString(IDS_FROM_LEFT);
+ else
+ sOrig = LoadResString(IDS_FROM_RIGHT);
+
+ if (destination == FileActionItem::UI_LEFT)
+ sDest = LoadResString(IDS_TO_LEFT);
+ else
+ sDest = LoadResString(IDS_TO_RIGHT);
+
+ dlg.m_question = strQuestion;
+ dlg.m_fromText = sOrig;
+ dlg.m_toText = sDest;
+ dlg.m_fromPath = src;
+ dlg.m_toPath = dest;
+
+ int rtn = dlg.DoModal();
return (rtn==IDYES);
}
@@ -103,6 +122,8 @@
act.dirflag = di.isDirectory();
act.atype = actType;
act.UIResult = FileActionItem::UI_SYNC;
+ act.UIOrigin = FileActionItem::UI_RIGHT;
+ act.UIDestination = FileActionItem::UI_LEFT;
actionScript.AddActionItem(act);
}
++selCount;
@@ -135,6 +156,8 @@
act.context = sel;
act.atype = actType;
act.UIResult = FileActionItem::UI_SYNC;
+ act.UIOrigin = FileActionItem::UI_LEFT;
+ act.UIDestination = FileActionItem::UI_RIGHT;
actionScript.AddActionItem(act);
}
++selCount;
@@ -542,13 +565,30 @@
case FileAction::ACT_COPY:
if (actionList.GetActionItemCount() == 1)
{
- if (!ConfirmSingleCopy(item.src, item.dest))
+ if (!ConfirmCopy(item.UIOrigin, item.UIDestination,
+ actionList.GetActionItemCount(), item.src, item.dest))
+ {
return FALSE;
+ }
}
else
{
- if (!ConfirmMultipleCopy(actionList.GetActionItemCount(), selCount))
+ CString src;
+ CString dst;
+
+ if (item.UIOrigin == FileActionItem::UI_LEFT)
+ src = GetDocument()->GetLeftBasePath();
+ else
+ src = GetDocument()->GetRightBasePath();
+ if (item.UIDestination == FileActionItem::UI_LEFT)
+ dst = GetDocument()->GetLeftBasePath();
+ else
+ dst = GetDocument()->GetRightBasePath();
+ if (!ConfirmCopy(item.UIOrigin, item.UIDestination,
+ actionList.GetActionItemCount(), src, dst))
+ {
return FALSE;
+ }
}
break;
Modified: trunk/Src/FileActionScript.h
===================================================================
--- trunk/Src/FileActionScript.h 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/FileActionScript.h 2007-03-07 22:45:16 UTC (rev 4149)
@@ -19,7 +19,7 @@
*
* @brief Declaration file for FileActionScript and related classes
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _FILEACTIONSCRIPT_H_
@@ -65,9 +65,12 @@
struct FileActionItem : public FileAction
{
typedef enum { UI_SYNC = 1, UI_DESYNC, UI_DEL_LEFT, UI_DEL_RIGHT, UI_DEL_BOTH,} UI_RESULT;
+ typedef enum { UI_LEFT, UI_RIGHT } UI_SIDE;
int context; /**< UI context */
UI_RESULT UIResult; /**< Resulting UI action */
+ UI_SIDE UIOrigin; /**< Original UI-side */
+ UI_SIDE UIDestination; /**< Destination UI-side */
};
typedef CList<FileActionItem, FileActionItem&> FileActionList;
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Voc\xEA tem certeza que deseja excluir %1 de %2 do(s) objecto(s) selecionado(s)?"
IDS_CONFIRM_DELETE_DIR "Excluir o diret\xF3rio\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Voc\xEA tem certeza que deseja excluir\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1977,6 +1997,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2229,6 +2258,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xD1\xE8\xE3\xF3\xF0\xED\xE8 \xEB\xE8 \xF1\xF2\xE5, \xF7\xE5 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xE8\xE7\xF2\xF0\xE8\xE5\xF2\xE5 %1 \xEE\xF2 %2 \xE8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xEE\xE1\xE5\xEA\xF2(\xE8)?"
IDS_CONFIRM_DELETE_DIR "\xC4\xE0 \xE8\xE7\xF2\xF0\xE8\xFF \xEB\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF\xF2\xE0\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "\xD1\xE8\xE3\xF3\xF0\xED\xE8 \xEB\xE8 \xF1\xF2\xE5, \xF7\xE5 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xE8\xE7\xF2\xF0\xE8\xE5\xF2\xE5\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1978,6 +1997,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2230,6 +2258,8 @@
IDS_CONFIRM_DELETE_ITEMS "Esteu segur que voleu suprimir %1 del(s) %2 element(s) seleccionat(s)?"
IDS_CONFIRM_DELETE_DIR "Voleu suprimir el directori\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Esteu segur que voleu suprimir\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1596,7 +1596,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1961,6 +1980,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2213,6 +2241,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xC4\xFAȷ\xB6\xA8Ҫɾ\xB3\xFD %1 \xD4\xDA %2 ѡ\xD4\xF1\xB5\xC4\xCF\xEEĿ\xC2\xF0\xA3\xBF"
IDS_CONFIRM_DELETE_DIR "ɾ\xB3\xFD\xCEļ\xFE\xBC\xD0\n\n%1\n\xA3\xBF"
IDS_CONFIRM_DELETE_SINGLE "\xC4\xFAȷ\xB6\xA8Ҫɾ\xB3\xFD\n\n%1\n\xC2\xF0\xA3\xBF"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xA7A\xBDT\xA9w\xADn\xA7R\xB0\xA3 %1 \xA6b %2 \xBF\xEF\xA8\xA5ضܡH"
IDS_CONFIRM_DELETE_DIR "\xA7R\xB0\xA3\xB8\xEA\xAEƧ\xA8\n\n%1\n\xA1H"
IDS_CONFIRM_DELETE_SINGLE "\xA7A\xBDT\xA9w\xADn\xA7R\xB0\xA3\n\n%1\n\xB6ܡH"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1959,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2211,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Opravdu chcete odstranit %1 z %2 vybran\xFDch polo\x9Eek?"
IDS_CONFIRM_DELETE_DIR "Odstranit slo\x9Eku\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Opravdu chcete odstranit\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Er du sikker p\xE5 du vil slette %1 af %2 valgt(e) element(er)?"
IDS_CONFIRM_DELETE_DIR "Slet mappen\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Er du sikker p\xE5 du vil slette\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Weet u zeker dat u %1 van %2 geselecteerde item(s) wilt verwijderen?"
IDS_CONFIRM_DELETE_DIR "Map\n\n%1\nverwijderen?"
IDS_CONFIRM_DELETE_SINGLE "Weet u zeker dat u\n\n%1\nwilt verwijderen?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1593,7 +1593,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1953,6 +1972,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2204,6 +2232,8 @@
IDS_CONFIRM_DELETE_ITEMS "Voulez-vous vraiment supprimer %1 \xE9l\xE9ment(s) s\xE9lectionn\xE9(s) parmi %2 ?"
IDS_CONFIRM_DELETE_DIR "Voulez-vous vraiment supprimer le r\xE9pertoire\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Voulez-vous vraiment supprimer le fichier\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Wollen Sie wirklich %1 von %2 ausgew\xE4hlte Objekte l\xF6schen?"
IDS_CONFIRM_DELETE_DIR "Verzeichnis\n\n%1\nl\xF6schen?"
IDS_CONFIRM_DELETE_SINGLE "Wollen Sie wirklich\n\n%1\nl\xF6schen?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1593,7 +1593,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1958,6 +1977,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2210,6 +2238,8 @@
IDS_CONFIRM_DELETE_ITEMS "Biztosan szeretn\xE9l %1/%2 elemet t\xF6r\xF6lni?"
IDS_CONFIRM_DELETE_DIR "T\xF6r\xF6lj\xFCk a k\xF6nyvt\xE1rat:\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Biztosan szeretn\xE9d ezt t\xF6r\xF6lni:\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1959,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2211,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Sei sicuro di voler eliminare %1 elemento(i) selezionato(i) su %2 ?"
IDS_CONFIRM_DELETE_DIR "Eliminare la cartella\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Sei sicuro di voler eliminare\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\x96{\x93\x96\x82ɑI\x91\xF0\x82\xB3\x82ꂽ%2\x8C̍\x80\x96ڂ̓\xE0 %1\x8C\xF0\x8D폜\x82\xB5\x82܂\xB7\x82\xA9?"
IDS_CONFIRM_DELETE_DIR "\x83t\x83H\x83\x8B\x83_\n\n%1\n\x82\xF0\x8D폜\x82\xB5\x82܂\xB7\x82\xA9?"
IDS_CONFIRM_DELETE_SINGLE "\x96{\x93\x96\x82\xC9\n\n%1\n\x82\xF0\x8D폜\x82\xB5\x82܂\xB7\x82\xA9?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xC1\xA4\xB8\xBB \xBB\xE8\xC1\xA6\xC7Ͻðڽ\xC0\xB4ϱ\xEE(%1 \xC1\xDF %2)?"
IDS_CONFIRM_DELETE_DIR "%1\n\xB5\xF0\xB7\xBA\xC5丮\xB8\xA6 \xBB\xE8\xC1\xA6\xC7Ͻðڽ\xC0\xB4ϱ\xEE?"
IDS_CONFIRM_DELETE_SINGLE "\xC1\xA4\xB8\xBB \xBB\xE8\xC1\xA6\xC7Ͻðڽ\xC0\xB4ϱ\xEE\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Er du sikker p\xE5 at du vil slette %1 av %2 valgte element(er)?"
IDS_CONFIRM_DELETE_DIR "Slett mappen\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Er du sikker p\xE5 at du vil slette\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1959,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2211,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Czy rzeczywi\x9Ccie usun\xB9\xE6 %1 z %2 wybranych pozycji?"
IDS_CONFIRM_DELETE_DIR "Usun\xB9\xE6 katalog\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Czy rzeczywi\x9Ccie usun\xB9\xE6\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xC2\xFB \xF3\xE2\xE5\xF0\xE5\xED\xFB, \xF7\xF2\xEE \xF5\xEE\xF2\xE8\xF2\xE5 \xF3\xE4\xE0\xEB\xE8\xF2\xFC %1 \xE8\xE7 %2 \xE2\xFB\xE1\xF0\xE0\xED\xED\xFB\xF5 \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2 ?"
IDS_CONFIRM_DELETE_DIR "\xD3\xE4\xE0\xEB\xE8\xF2\xFC \xEA\xE0\xF2\xE0\xEB\xEE\xE3\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "\xC2\xFB \xF3\xE2\xE5\xF0\xE5\xED\xFB, \xF7\xF2\xEE \xF5\xEE\xF2\xE8\xF2\xE5 \xF3\xE4\xE0\xEB\xE8\xF2\xFC\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1959,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2211,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Chcete naozaj zmaza\x9D %1 z %2 vybran\xFDch polo\x9Eiek?"
IDS_CONFIRM_DELETE_DIR "Zmaza\x9D adres\xE1r\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Chcete naozaj zmaza\x9D\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1959,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2211,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xBFEst\xE1 seguro de que desea eliminar %1 de %2 elementos seleccionados?"
IDS_CONFIRM_DELETE_DIR "\xBFEliminar directorio\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "\xBFEst\xE1 seguro de que desea eliminar\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,6 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1959,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2211,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xC4r du s\xE4ker p\xE5 att du vill ta bort %1 av %2 valda objekt?"
IDS_CONFIRM_DELETE_DIR "Ta bort katalogen\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "\xC4r du s\xE4ker p\xE5 du att vill ta bort\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1595,7 +1595,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1960,6 +1979,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2081,8 +2109,8 @@
// MORE STATUS PANES
STRINGTABLE
BEGIN
- IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"
- IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"
+ IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"
+ IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"
END
// OPEN DIALOG
@@ -2212,6 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "Are you sure you want to delete %1 of %2 selected item(s)?"
IDS_CONFIRM_DELETE_DIR "Delete directory\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Are you sure you want to delete\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Merge.dsp 2007-03-07 22:45:16 UTC (rev 4149)
@@ -241,6 +241,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ConfirmFolderCopyDlg.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\coretools.cpp
# End Source File
# Begin Source File
@@ -1037,6 +1041,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ConfirmFolderCopyDlg.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Common\coretools.h
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/Merge.rc 2007-03-07 22:45:16 UTC (rev 4149)
@@ -1605,7 +1605,26 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
+IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Confirm Copy"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
+ LTEXT "Are you sure you want to copy XXX items?",
+ IDC_FLDCONFIRM_QUERY,45,7,233,8
+ LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Yes",IDYES,174,79,50,14
+ DEFPUSHBUTTON "No",IDNO,228,79,50,14
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1970,6 +1989,15 @@
END
// WINMERGE CUSTOM STRINGS
+
+STRINGTABLE
+BEGIN
+ IDS_FROM_LEFT "From left:"
+ IDS_TO_LEFT "To left:"
+ IDS_FROM_RIGHT "From right:"
+ IDS_TO_RIGHT "To right:"
+END
+
// WINMERGE INFORMATION
STRINGTABLE
BEGIN
@@ -2091,8 +2119,8 @@
// MORE STATUS PANES
STRINGTABLE
BEGIN
- IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"
- IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"
+ IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"
+ IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"
END
// OPEN DIALOG
@@ -2222,6 +2250,8 @@
IDS_CONFIRM_DELETE_ITEMS "Are you sure you want to delete %1 of %2 selected item(s)?"
IDS_CONFIRM_DELETE_DIR "Delete directory\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "Are you sure you want to delete\n\n%1 ?"
+ IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
+ IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
END
// DIRECTORY DIFFING : OPEN FILE
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-03-07 20:10:21 UTC (rev 4148)
+++ trunk/Src/resource.h 2007-03-07 22:45:16 UTC (rev 4149)
@@ -51,6 +51,7 @@
#define IDD_PROPPAGE_COLORS_TEXT 232
#define IDD_PROJFILES_PATHS 233
#define IDD_PROPPAGE_BACKUPS 234
+#define IDD_CONFIRM_COPY 235
#define IDR_SPLASH 308
#define IDB_WINMERGE 309
#define IDB_OLDSPLASH 310
@@ -403,6 +404,12 @@
#define IDC_BACKUP_FOLDER 1318
#define IDC_BACKUP_APPEND_BAK 1319
#define IDC_BACKUP_APPEND_TIME 1320
+#define IDC_FLDCONFIRM_TO_PATH 1321
+#define IDC_FLDCONFIRM_QUERY 1322
+#define IDC_FLDCONFIRM_FROM_TEXT 1323
+#define IDC_FLDCONFIRM_TO_TEXT 1324
+#define IDC_FLDCONFIRM_FROM_PATH 1325
+#define IDC_FLDCONFIRM_ICON 1326
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
@@ -449,6 +456,10 @@
#define IDS_OPTIONSPG_CODEPAGE 9049
#define IDS_OPTIONSPG_ARCHIVE 9050
#define IDS_OPTIONSPG_BACKUPS 9051
+#define IDS_FROM_LEFT 16000
+#defi...
[truncated message content] |
|
From: <ki...@us...> - 2007-03-08 16:12:43
|
Revision: 4150
http://svn.sourceforge.net/winmerge/?rev=4150&view=rev
Author: kimmov
Date: 2007-03-08 08:04:43 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
PATCH: [ 1664689 ] French translation (update2)
- Submitted by Jean-F Jolin
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/French/MergeFrench.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-07 22:45:16 UTC (rev 4149)
+++ trunk/Src/Changes.txt 2007-03-08 16:04:43 UTC (rev 4150)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-08 Kimmo
+ PATCH: [ 1664689 ] French translation (update2)
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
2007-03-07 Kimmo
PATCH: [ 1675087 ] New copy confirmation dialog
Src: DirActions.cpp FileActionScript.h Merge.dsp Merge.rc resource.h
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-03-07 22:45:16 UTC (rev 4149)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-03-08 16:04:43 UTC (rev 4150)
@@ -1035,8 +1035,8 @@
GROUPBOX "Montrer les colonnes",IDC_GROUP_SHOW,7,7,145,102
LISTBOX IDC_LIST_SHOW,52,18,92,83,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Monter",IDC_UP,15,45,30,14
- PUSHBUTTON "&Descendre",IDC_DOWN,15,63,30,14
+ PUSHBUTTON "&Monter",IDC_UP,10,45,40,14
+ PUSHBUTTON "&Descendre",IDC_DOWN,10,63,40,14
GROUPBOX "Cacher les colonnes",IDC_GROUP_HIDE,193,7,108,102
LISTBOX IDC_LIST_HIDE,201,18,92,83,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
@@ -1163,7 +1163,7 @@
CONTROL "Ins\xE9rer &espace",IDC_PROP_INSERT_SPACES,"Button",
BS_AUTORADIOBUTTON,120,62,97,10
GROUPBOX "Colorer les diff\xE9rences de ligne",IDC_LINE_COLORING_GROUP,7,87,
- 221,41
+ 221,61
CONTROL "A&fficher les diff\xE9rences",IDC_VIEW_LINE_DIFFERENCES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,14,98,100,8
CONTROL "Pr\xE9cision au &caract\xE8re",IDC_EDITOR_CHARLEVEL,"Button",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-08 16:22:31
|
Revision: 4151
http://svn.sourceforge.net/winmerge/?rev=4151&view=rev
Author: kimmov
Date: 2007-03-08 08:22:30 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Remove two unused functions, improve comments
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirActions.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-08 16:04:43 UTC (rev 4150)
+++ trunk/Src/Changes.txt 2007-03-08 16:22:30 UTC (rev 4151)
@@ -6,6 +6,8 @@
PATCH: [ 1664689 ] French translation (update2)
Submitted by Jean-F Jolin
Src/Languages/French: MergeFrench.rc
+ Remove two unused functions, improve comments
+ Src: DirActions.cpp
2007-03-07 Kimmo
PATCH: [ 1675087 ] New copy confirmation dialog
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-03-08 16:04:43 UTC (rev 4150)
+++ trunk/Src/DirActions.cpp 2007-03-08 16:22:30 UTC (rev 4151)
@@ -42,8 +42,20 @@
extern CLogFile gLog;
-// Prompt user to confirm a single item copy
-static BOOL ConfirmCopy(int origin, int destination, int count, LPCTSTR src, LPCTSTR dest)
+/**
+ * @brief Ask user a confirmation for copying item(s).
+ * Shows a confirmatino dialog for copy operation. Depending ont item count
+ * dialog shows full paths to items (single item) or base paths of compare
+ * (multiple items).
+ * @param [in] origin Origin side of the item(s).
+ * @param [in] destination Destination side of the item(s).
+ * @param [in] count Number of items.
+ * @param [in] src Source path.
+ * @param [in] dest Destination path.
+ * @return IDYES if copy should proceed, IDNO if aborted.
+ */
+static BOOL ConfirmCopy(int origin, int destination, int count,
+ LPCTSTR src, LPCTSTR dest)
{
ConfirmFolderCopyDlg dlg;
CString strQuestion;
@@ -80,25 +92,7 @@
return (rtn==IDYES);
}
-// Prompt user to confirm a multiple item delete
-static BOOL ConfirmMultipleDelete(int count, int total)
-{
- CString s;
- AfxFormatString2(s, IDS_CONFIRM_DELETE_ITEMS, NumToStr(count), NumToStr(total));
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_ITEMS);
- return (rtn==IDYES);
-}
-
-// Prompt user to confirm a single item delete
-static BOOL ConfirmSingleDelete(LPCTSTR filepath)
-{
- CString s;
- AfxFormatString1(s, IDS_CONFIRM_DELETE_SINGLE, filepath);
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_SINGLE);
- return (rtn==IDYES);
-}
-
-// Prompt & copy item from right to left, if legal
+/// Prompt & copy item from right to left, if legal
void CDirView::DoCopyRightToLeft()
{
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
@@ -132,7 +126,7 @@
// Now we prompt, and execute actions
ConfirmAndPerformActions(actionScript, selCount);
}
-// Prompt & copy item from left to right, if legal
+/// Prompt & copy item from left to right, if legal
void CDirView::DoCopyLeftToRight()
{
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
@@ -167,7 +161,7 @@
ConfirmAndPerformActions(actionScript, selCount);
}
-// Prompt & delete left, if legal
+/// Prompt & delete left, if legal
void CDirView::DoDelLeft()
{
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_DELETEFILES));
@@ -198,7 +192,7 @@
// Now we prompt, and execute actions
ConfirmAndPerformActions(actionScript, selCount);
}
-// Prompt & delete right, if legal
+/// Prompt & delete right, if legal
void CDirView::DoDelRight()
{
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_DELETEFILES));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-08 16:37:52
|
Revision: 4152
http://svn.sourceforge.net/winmerge/?rev=4152&view=rev
Author: kimmov
Date: 2007-03-08 08:37:44 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
BUG: [ 1670991 ] File panes lost focus after delete confirmation dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirActions.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-08 16:22:30 UTC (rev 4151)
+++ trunk/Src/Changes.txt 2007-03-08 16:37:44 UTC (rev 4152)
@@ -8,6 +8,8 @@
Src/Languages/French: MergeFrench.rc
Remove two unused functions, improve comments
Src: DirActions.cpp
+ BUG: [ 1670991 ] File panes lost focus after delete confirmation dialog
+ Src: DirActions.cpp
2007-03-07 Kimmo
PATCH: [ 1675087 ] New copy confirmation dialog
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-03-08 16:22:30 UTC (rev 4151)
+++ trunk/Src/DirActions.cpp 2007-03-08 16:37:44 UTC (rev 4152)
@@ -536,6 +536,10 @@
ASSERT(actionList.GetActionItemCount()>0); // Or else the update handler got it wrong
+ // Set parent window so modality is correct and correct window gets focus
+ // after dialogs.
+ actionList.SetParentWindow(this);
+
if (!ConfirmActionList(actionList, selCount))
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-08 17:54:50
|
Revision: 4153
http://svn.sourceforge.net/winmerge/?rev=4153&view=rev
Author: kimmov
Date: 2007-03-08 09:54:47 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
Fix comment about contributors file
Modified Paths:
--------------
trunk/Src/AboutDlg.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/AboutDlg.cpp
===================================================================
--- trunk/Src/AboutDlg.cpp 2007-03-08 16:37:44 UTC (rev 4152)
+++ trunk/Src/AboutDlg.cpp 2007-03-08 17:54:47 UTC (rev 4153)
@@ -91,7 +91,10 @@
// EXCEPTION: OCX Property Pages should return FALSE
}
-/** @brief Open Contributors.rtf */
+/**
+ * @brief Show contributors list.
+ * Opens Contributors.txt into notepad.
+ */
void CAboutDlg::OnBnClickedOpenContributors()
{
CString defPath = GetModulePath();
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-08 16:37:44 UTC (rev 4152)
+++ trunk/Src/Changes.txt 2007-03-08 17:54:47 UTC (rev 4153)
@@ -10,6 +10,8 @@
Src: DirActions.cpp
BUG: [ 1670991 ] File panes lost focus after delete confirmation dialog
Src: DirActions.cpp
+ Fix comment about contributors file
+ Src: AboutDlg.cpp
2007-03-07 Kimmo
PATCH: [ 1675087 ] New copy confirmation dialog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-08 22:04:46
|
Revision: 4154
http://svn.sourceforge.net/winmerge/?rev=4154&view=rev
Author: kimmov
Date: 2007-03-08 14:04:42 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
PATCH: [ 1676802 ] Move compare options to DiffContext
Modified Paths:
--------------
trunk/Src/ByteComparator.cpp
trunk/Src/ByteComparator.h
trunk/Src/Changes.txt
trunk/Src/CompareOptions.cpp
trunk/Src/CompareOptions.h
trunk/Src/DiffContext.cpp
trunk/Src/DiffContext.h
trunk/Src/DirDoc.cpp
trunk/Src/DirDoc.h
trunk/Src/FolderCmp.cpp
Modified: trunk/Src/ByteComparator.cpp
===================================================================
--- trunk/Src/ByteComparator.cpp 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/ByteComparator.cpp 2007-03-08 22:04:42 UTC (rev 4154)
@@ -3,12 +3,13 @@
*
* @brief Implements ByteComparator class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include "ByteComparator.h"
#include "FileTextStats.h"
+#include "CompareOptions.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -112,21 +113,13 @@
/**
* @brief Constructor taking compare options as parameters.
- * @param [in] ignore_case Ignore character case.
- * @param [in] ignore_space_change Ignore change in whitespace.
- * @param [in] ignore_all_space Ignore all whitespace chars.
- * @param [in] ignore_eol_diff Ignore EOL byte differences.
- * @param [in] ignore_blank_lines Ignore blank lines.
- * @note Parameters are same than diffutils options.
+ * @param [in] options Compare options.
*/
-ByteComparator::ByteComparator(int ignore_case, int ignore_space_change,
- int ignore_all_space, int ignore_eol_diff, int ignore_blank_lines)
+ByteComparator::ByteComparator(const QuickCompareOptions * options)
// settings
-: m_ignore_case(!!ignore_case)
-, m_ignore_space_change(!!ignore_space_change)
-, m_ignore_all_space(!!ignore_all_space)
-, m_ignore_eol_diff(!!ignore_eol_diff)
-, m_ignore_blank_lines(!!ignore_blank_lines)
+: m_ignore_case(options->m_bIgnoreCase)
+, m_ignore_eol_diff(options->m_bIgnoreEOLDifference)
+, m_ignore_blank_lines(options->m_bIgnoreBlankLines)
// state
, m_wsflag(false)
, m_eol0(false)
@@ -136,6 +129,15 @@
, m_bol0(true)
, m_bol1(true)
{
+ if (options->m_ignoreWhitespace == WHITESPACE_IGNORE_CHANGE)
+ m_ignore_space_change = true;
+ else
+ m_ignore_space_change = false;
+
+ if (options->m_ignoreWhitespace == WHITESPACE_IGNORE_ALL)
+ m_ignore_all_space = true;
+ else
+ m_ignore_all_space = false;
}
/**
Modified: trunk/Src/ByteComparator.h
===================================================================
--- trunk/Src/ByteComparator.h 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/ByteComparator.h 2007-03-08 22:04:42 UTC (rev 4154)
@@ -3,12 +3,13 @@
*
* @brief Declaration file for ByteComparator class.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef ByteComparator_h_included
#define ByteComparator_h_included
+class QuickCompareOptions;
struct FileTextStats;
@@ -24,8 +25,7 @@
class ByteComparator
{
public:
- ByteComparator(int ignore_case, int ignore_space_change, int ignore_all_space,
- int ignore_eol_diff, int ignore_blank_lines);
+ ByteComparator(const QuickCompareOptions * options);
public:
/** @brief Return values for CompareBuffers method. */
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/Changes.txt 2007-03-08 22:04:42 UTC (rev 4154)
@@ -12,6 +12,9 @@
Src: DirActions.cpp
Fix comment about contributors file
Src: AboutDlg.cpp
+ PATCH: [ 1676802 ] Move compare options to DiffContext
+ Src: ByteComparator.cpp ByteComparator.h CompareOptions.cpp CompareOptions.h
+ DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h FolderCmp.cpp
2007-03-07 Kimmo
PATCH: [ 1675087 ] New copy confirmation dialog
Modified: trunk/Src/CompareOptions.cpp
===================================================================
--- trunk/Src/CompareOptions.cpp 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/CompareOptions.cpp 2007-03-08 22:04:42 UTC (rev 4154)
@@ -3,6 +3,8 @@
*
* @brief Compare options implementation.
*/
+// ID line follows -- this is updated by SVN
+// $Id: ByteComparator.h 3397 2006-07-27 10:41:24Z kimmov $
#include "stdafx.h"
#include "Diff.h"
@@ -23,20 +25,10 @@
}
/**
- * @brief Default constructor.
- */
-DiffutilsOptions::DiffutilsOptions()
-: m_outputStyle(DIFF_OUTPUT_NORMAL)
-, m_contextLines(0)
-, m_filterCommentsLines(0)
-{
-}
-
-/**
* @brief Sets options from DIFFOPTIONS structure.
* @param [in] options Diffutils options.
*/
-void DiffutilsOptions::SetFromDiffOptions(const DIFFOPTIONS & options)
+void CompareOptions::SetFromDiffOptions(const DIFFOPTIONS &options)
{
switch (options.nIgnoreWhitespace)
{
@@ -53,9 +45,37 @@
_RPTF0(_CRT_ERROR, "Unknown whitespace ignore value!");
break;
}
- m_bIgnoreBlankLines = options.bIgnoreBlankLines;
- m_bIgnoreCase = options.bIgnoreCase;
- m_bIgnoreEOLDifference = options.bIgnoreEol;
+ m_bIgnoreBlankLines = !!options.bIgnoreBlankLines;
+ m_bIgnoreCase = !!options.bIgnoreCase;
+ m_bIgnoreEOLDifference = !!options.bIgnoreEol;
+}
+
+/**
+ * @brief Default constructor.
+ */
+QuickCompareOptions::QuickCompareOptions()
+: m_bStopAfterFirstDiff(FALSE)
+{
+
+}
+
+/**
+ * @brief Default constructor.
+ */
+DiffutilsOptions::DiffutilsOptions()
+: m_outputStyle(DIFF_OUTPUT_NORMAL)
+, m_contextLines(0)
+, m_filterCommentsLines(0)
+{
+}
+
+/**
+ * @brief Sets options from DIFFOPTIONS structure.
+ * @param [in] options Diffutils options.
+ */
+void DiffutilsOptions::SetFromDiffOptions(const DIFFOPTIONS & options)
+{
+ CompareOptions::SetFromDiffOptions(options);
m_filterCommentsLines = options.bFilterCommentsLines;
}
Modified: trunk/Src/CompareOptions.h
===================================================================
--- trunk/Src/CompareOptions.h 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/CompareOptions.h 2007-03-08 22:04:42 UTC (rev 4154)
@@ -3,6 +3,8 @@
*
* @brief Compare options classes and types.
*/
+// ID line follows -- this is updated by SVN
+// $Id$
#ifndef CompareOptions_h_included
#define CompareOptions_h_included
@@ -82,6 +84,7 @@
{
public:
CompareOptions();
+ virtual void SetFromDiffOptions(const DIFFOPTIONS & options);
enum WhitespaceIgnoreChoices m_ignoreWhitespace; /**< Ignore whitespace characters */
bool m_bIgnoreBlankLines; /**< Ignore blank lines (both sides) */
@@ -99,13 +102,26 @@
{
public:
DiffutilsOptions();
- void SetFromDiffOptions(const DIFFOPTIONS & options);
void SetToDiffUtils();
void GetAsDiffOptions(DIFFOPTIONS &options);
+ virtual void SetFromDiffOptions(const DIFFOPTIONS & options);
enum DiffOutputType m_outputStyle; /**< Output style (for patch files) */
int m_contextLines; /**< Number of context lines (for patch files) */
int m_filterCommentsLines;/**< Ignore Multiline comments differences.*/
};
+/**
+ * @brief Compare options used with Quick compare -method.
+ * This class has some Quick Compare specifics in addition to general compare
+ * options.
+ */
+class QuickCompareOptions : public CompareOptions
+{
+public:
+ QuickCompareOptions();
+
+ BOOL m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
+};
+
#endif // CompareOptions_h_included
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/DiffContext.cpp 2007-03-08 22:04:42 UTC (rev 4154)
@@ -23,13 +23,14 @@
*
* @brief Implementation of CDiffContext
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <shlwapi.h>
#include "Merge.h"
+#include "CompareOptions.h"
#include "CompareStats.h"
#include "version.h"
#include "FilterList.h"
@@ -69,6 +70,7 @@
, m_bStopAfterFirstDiff(FALSE)
, m_pFilterList(NULL)
, m_bCollectReady(FALSE)
+, m_pCompareOptions(NULL)
{
m_paths.SetLeft(pszLeft);
m_paths.SetRight(pszRight);
@@ -109,6 +111,7 @@
CDiffContext::~CDiffContext()
{
+ delete m_pCompareOptions;
delete m_pFilterList;
DeleteCriticalSection(&m_criticalSect);
}
@@ -236,8 +239,47 @@
dfi.version = GetFixedFileVersion(spath);
}
+/**
+ * @brief Create compare-method specific compare options class.
+ * This function creates a compare options class that is specific for
+ * selectec compare method. Compare options class is initialized from
+ * given set of options.
+ * @param [in] compareMethod Selectec compare method.
+ * @param [in] options Initial set of compare options.
+ * @return TRUE if creation succeeds.
+ */
+BOOL CDiffContext::CreateCompareOptions(int compareMethod, const DIFFOPTIONS & options)
+{
+ if (m_pCompareOptions)
+ delete m_pCompareOptions;
+
+ switch (compareMethod)
+ {
+ case CMP_CONTENT:
+ m_pCompareOptions = new DiffutilsOptions();
+ break;
+
+ case CMP_QUICK_CONTENT:
+ m_pCompareOptions = new QuickCompareOptions();
+ break;
+
+ default:
+ // No really options to set..
+ break;
+ }
+
+ if (m_pCompareOptions == NULL)
+ return FALSE;
+
+ m_nCompMethod = compareMethod;
+ m_pCompareOptions->SetFromDiffOptions(options);
+
+ return TRUE;
+}
+
/** @brief Forward call to retrieve plugin info (winds up in DirDoc) */
-void CDiffContext::FetchPluginInfos(const CString& filteredFilenames, PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer)
+void CDiffContext::FetchPluginInfos(const CString& filteredFilenames,
+ PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer)
{
ASSERT(m_piPluginInfos);
m_piPluginInfos->FetchPluginInfos(filteredFilenames, infoUnpacker, infoPrediffer);
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/DiffContext.h 2007-03-08 22:04:42 UTC (rev 4154)
@@ -3,7 +3,7 @@
*
* @brief Declarations of CDiffContext and diff structures
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_DIFFCONTEXT_H__D3CC86BE_F11E_11D2_826C_00A024706EDC__INCLUDED_)
@@ -29,6 +29,8 @@
class CompareStats;
class IAbortable;
class FilterList;
+class CompareOptions;
+struct DIFFOPTIONS;
// Interface for reporting current file, as diff traverses file tree
/*class IDiffStatus
@@ -83,8 +85,11 @@
BOOL UpdateInfoFromDiskHalf(DIFFITEM & di, BOOL bLeft);
void UpdateStatusFromDisk(POSITION diffpos, BOOL bLeft, BOOL bRight);
+ BOOL CreateCompareOptions(int compareMethod, const DIFFOPTIONS & options);
+
// retrieve or manufacture plugin info for specified file comparison
- void FetchPluginInfos(const CString& filteredFilenames, PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer);
+ void FetchPluginInfos(const CString& filteredFilenames,
+ PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer);
bool ShouldAbort() const;
void SetAbortable(IAbortable * piAbortable) { m_piAbortable = piAbortable; }
@@ -102,6 +107,7 @@
FilterList * m_pFilterList; /**< Filter list for line filters */
CRITICAL_SECTION m_criticalSect; /**< Critical section protecting list access. */
BOOL m_bCollectReady; /**< Tells collection phase is done. */
+ CompareOptions *m_pCompareOptions; /**< Compare options for folder compare */
private:
CList<DIFFITEM,DIFFITEM&> *m_pList; /**< Pointer to list, used to access list */
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/DirDoc.cpp 2007-03-08 22:04:42 UTC (rev 4154)
@@ -24,7 +24,7 @@
* @brief Implementation file for CDirDoc
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
//
@@ -77,15 +77,6 @@
, m_bMarkedRescan(FALSE)
, m_pTempPathContext(NULL)
{
- DIFFOPTIONS options = {0};
-
- options.nIgnoreWhitespace = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
- options.bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
- options.bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
- options.bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
- options.bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL);
-
- m_diffOptions.SetFromDiffOptions(options);
}
/**
@@ -336,14 +327,21 @@
LoadLineFilterList();
+ DIFFOPTIONS options = {0};
+ options.nIgnoreWhitespace = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
+ options.bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
+ options.bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
+ options.bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
+ options.bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL);
+
+ m_pCtxt->CreateCompareOptions(GetOptionsMgr()->GetInt(OPT_CMP_METHOD), options);
+
m_pCtxt->m_hDirFrame = pf->GetSafeHwnd();
m_pCtxt->m_bGuessEncoding = GetOptionsMgr()->GetBool(OPT_CP_DETECT);
- m_pCtxt->m_nCompMethod = GetOptionsMgr()->GetInt(OPT_CMP_METHOD);
m_pCtxt->m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST);
m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT);
m_pCtxt->m_pCompareStats = m_pCompareStats;
- m_diffOptions.SetToDiffUtils();
// Set total items count since we don't collect items
if (m_bMarkedRescan)
@@ -732,15 +730,6 @@
*/
void CDirDoc::RefreshOptions()
{
- DIFFOPTIONS options = {0};
-
- options.nIgnoreWhitespace = GetOptionsMgr()->GetInt(OPT_CMP_IGNORE_WHITESPACE);
- options.bIgnoreBlankLines = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_BLANKLINES);
- options.bFilterCommentsLines = GetOptionsMgr()->GetBool(OPT_CMP_FILTER_COMMENTLINES);
- options.bIgnoreCase = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CASE);
- options.bIgnoreEol = GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_EOL);
-
- m_diffOptions.SetFromDiffOptions(options);
if (m_pDirView)
m_pDirView->RefreshOptions();
}
Modified: trunk/Src/DirDoc.h
===================================================================
--- trunk/Src/DirDoc.h 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/DirDoc.h 2007-03-08 22:04:42 UTC (rev 4154)
@@ -23,7 +23,7 @@
* @brief Declaration file for CDirDoc
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_DIRDOC_H__0B17B4C1_356F_11D1_95CD_444553540000__INCLUDED_)
@@ -171,7 +171,6 @@
PluginManager m_pluginman;
BOOL m_bReuseCloses; /**< Are we closing because of reuse? */
BOOL m_bMarkedRescan; /**< If TRUE next rescan scans only marked items */
- DiffutilsOptions m_diffOptions; /**< Compare options for folder compare */
};
//{{AFX_INSERT_LOCATION}}
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2007-03-08 17:54:47 UTC (rev 4153)
+++ trunk/Src/FolderCmp.cpp 2007-03-08 22:04:42 UTC (rev 4154)
@@ -3,7 +3,10 @@
*
* @brief Implementation file for FolderCmp
*/
+// ID line follows -- this is updated by SVN
+// $Id: files.cpp 3845 2006-11-24 22:32:35Z kimmov $
+
#include "stdafx.h"
#include "paths.h"
#include "FilterList.h"
@@ -224,6 +227,10 @@
int bin_flag = 0;
int bin_file = 0; // bitmap for binary files
+ DiffutilsOptions *pOptions =
+ dynamic_cast<DiffutilsOptions *>(m_pCtx->m_pCompareOptions);
+ pOptions->SetToDiffUtils();
+
// Do the actual comparison (generating a change script)
struct change *script = NULL;
BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, &bin_file);
@@ -358,6 +365,9 @@
*/
int FolderCmp::byte_compare_files(BOOL bStopAfterFirstDiff, const IAbortable * piAbortable)
{
+ QuickCompareOptions *pOptions =
+ dynamic_cast<QuickCompareOptions*>(m_pCtx->m_pCompareOptions);
+
// Close any descriptors open for diffutils
m_diffFileData.Reset();
@@ -394,8 +404,7 @@
eof[i] = false;
}
- ByteComparator comparator(ignore_case_flag, ignore_space_change_flag
- , ignore_all_space_flag, ignore_eol_diff, ignore_blank_lines_flag);
+ ByteComparator comparator(pOptions);
// Begin loop
// we handle the files in WMCMPBUFF sized buffers (variable buff[][])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-12 17:02:12
|
Revision: 4158
http://svn.sourceforge.net/winmerge/?rev=4158&view=rev
Author: kimmov
Date: 2007-03-12 10:02:02 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Remove unneeded include lines
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-12 16:01:39 UTC (rev 4157)
+++ trunk/Src/Changes.txt 2007-03-12 17:02:02 UTC (rev 4158)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-12 Kimmo
+ Remove unneeded include lines
+ Src: DirDoc.cpp
+
2007-03-11 Jan Hryz
Czech translation - translation of "confirm copy" dialog
Src/Languages/Czech/MergeCzech.rc
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-03-12 16:01:39 UTC (rev 4157)
+++ trunk/Src/DirDoc.cpp 2007-03-12 17:02:02 UTC (rev 4158)
@@ -36,9 +36,6 @@
#include "Ucs2Utf8.h"
#include "DirDoc.h"
#include "DirFrame.h"
-#include "diff.h"
-#include "getopt.h"
-#include "fnmatch.h"
#include "MainFrm.h"
#include "coretools.h"
#include "logfile.h"
@@ -46,7 +43,6 @@
#include "WaitStatusCursor.h"
#include "7zCommon.h"
#include "OptionsDef.h"
-#include "dllver.h"
#include "FileActionScript.h"
#ifdef _DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-12 19:46:33
|
Revision: 4159
http://svn.sourceforge.net/winmerge/?rev=4159&view=rev
Author: kimmov
Date: 2007-03-12 12:46:32 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Remove unneeded initialization
Modified Paths:
--------------
trunk/Src/CCPrompt.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/CCPrompt.cpp
===================================================================
--- trunk/Src/CCPrompt.cpp 2007-03-12 17:02:02 UTC (rev 4158)
+++ trunk/Src/CCPrompt.cpp 2007-03-12 19:46:32 UTC (rev 4159)
@@ -20,9 +20,6 @@
, m_bMultiCheckouts(FALSE)
, m_bCheckin(FALSE)
{
- //{{AFX_DATA_INIT(CCCPrompt)
- m_comments = _T("");
- //}}AFX_DATA_INIT
}
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-12 17:02:02 UTC (rev 4158)
+++ trunk/Src/Changes.txt 2007-03-12 19:46:32 UTC (rev 4159)
@@ -5,6 +5,8 @@
2007-03-12 Kimmo
Remove unneeded include lines
Src: DirDoc.cpp
+ Remove unneeded initialization
+ Src: CCPrompt.cpp
2007-03-11 Jan Hryz
Czech translation - translation of "confirm copy" dialog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-12 21:07:57
|
Revision: 4160
http://svn.sourceforge.net/winmerge/?rev=4160&view=rev
Author: kimmov
Date: 2007-03-12 14:07:55 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
PATCH: [ 1678676 ] Swedish translation of New Copy Confirmation dialog
- Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Swedish/MergeSwedish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-12 19:46:32 UTC (rev 4159)
+++ trunk/Src/Changes.txt 2007-03-12 21:07:55 UTC (rev 4160)
@@ -7,6 +7,9 @@
Src: DirDoc.cpp
Remove unneeded initialization
Src: CCPrompt.cpp
+ PATCH: [ 1678676 ] Swedish translation of New Copy Confirmation dialog
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
2007-03-11 Jan Hryz
Czech translation - translation of "confirm copy" dialog
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-12 19:46:32 UTC (rev 4159)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-12 21:07:55 UTC (rev 4160)
@@ -1598,20 +1598,20 @@
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Confirm Copy"
+CAPTION "Bekr\xE4fta kopiering"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDI_FOLDER,IDC_FLDCONFIRM_ICON,7,7,20,20
- LTEXT "Are you sure you want to copy XXX items?",
+ LTEXT "\xC4r du s\xE4ker p\xE5 att du vill kopiera XXX objekt?",
IDC_FLDCONFIRM_QUERY,45,7,233,8
- LTEXT "From left",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
+ LTEXT "Fr\xE5n v\xE4nster",IDC_FLDCONFIRM_FROM_TEXT,46,19,231,8
EDITTEXT IDC_FLDCONFIRM_FROM_PATH,45,29,233,14,ES_AUTOHSCROLL |
ES_READONLY
- LTEXT "To right",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
+ LTEXT "Till h\xF6ger",IDC_FLDCONFIRM_TO_TEXT,46,48,230,8
EDITTEXT IDC_FLDCONFIRM_TO_PATH,46,58,232,14,ES_AUTOHSCROLL |
ES_READONLY
- PUSHBUTTON "Yes",IDYES,174,79,50,14
- DEFPUSHBUTTON "No",IDNO,228,79,50,14
+ PUSHBUTTON "Ja",IDYES,174,79,50,14
+ DEFPUSHBUTTON "Nej",IDNO,228,79,50,14
END
@@ -1982,10 +1982,10 @@
STRINGTABLE
BEGIN
- IDS_FROM_LEFT "From left:"
- IDS_TO_LEFT "To left:"
- IDS_FROM_RIGHT "From right:"
- IDS_TO_RIGHT "To right:"
+ IDS_FROM_LEFT "Fr\xE5n v\xE4nster:"
+ IDS_TO_LEFT "Till v\xE4nster:"
+ IDS_FROM_RIGHT "Fr\xE5n h\xF6ger:"
+ IDS_TO_RIGHT "Till h\xF6ger:"
END
// WINMERGE INFORMATION
@@ -2240,8 +2240,8 @@
IDS_CONFIRM_DELETE_ITEMS "\xC4r du s\xE4ker p\xE5 att du vill ta bort %1 av %2 valda objekt?"
IDS_CONFIRM_DELETE_DIR "Ta bort katalogen\n\n%1 ?"
IDS_CONFIRM_DELETE_SINGLE "\xC4r du s\xE4ker p\xE5 du att vill ta bort\n\n%1 ?"
- IDS_CONFIRM_SINGLE_COPY "Are you sure you want to copy:"
- IDS_CONFIRM_MULTIPLE_COPY "Are you sure you want to copy %d items:"
+ IDS_CONFIRM_SINGLE_COPY "\xC4r du s\xE4ker p\xE5 att du vill kopiera:"
+ IDS_CONFIRM_MULTIPLE_COPY "\xC4r du s\xE4ker p\xE5 att du vill kopiera %d objekt:"
END
// DIRECTORY DIFFING : OPEN FILE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-13 16:50:08
|
Revision: 4161
http://svn.sourceforge.net/winmerge/?rev=4161&view=rev
Author: kimmov
Date: 2007-03-13 09:50:06 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
PATCH: [ 1679196 ] Cleanup logfile class usage
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/LogFile.cpp
trunk/Src/Common/LogFile.h
trunk/Src/DiffWrapper.cpp
trunk/Src/DirActions.cpp
trunk/Src/DirDoc.cpp
trunk/Src/DirScan.cpp
trunk/Src/FolderCmp.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/MergeDoc.cpp
trunk/Src/Plugins.cpp
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/Changes.txt 2007-03-13 16:50:06 UTC (rev 4161)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-13 Kimmo
+ PATCH: [ 1679196 ] Cleanup logfile class usage
+ Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp FolderCmp.cpp MainFrm.cpp
+ Merge.cpp Merge.h MergeDoc.cpp Plugins.cpp StdAfx.cpp StdAfx.h
+ Src/Common: LogFile.cpp LogFile.h
+
2007-03-12 Kimmo
Remove unneeded include lines
Src: DirDoc.cpp
Modified: trunk/Src/Common/LogFile.cpp
===================================================================
--- trunk/Src/Common/LogFile.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/Common/LogFile.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -4,7 +4,7 @@
* @brief Implementation file for CLogFile
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -17,14 +17,10 @@
#define new DEBUG_NEW
#endif
-/**
- * @brief Global name for mutes protecting log file access.
- */
+/** @brief Global name for mutes protecting log file access. */
static const TCHAR MutexName[] = _T("WINMERGE_LOG_MUTEX");
-/**
- * @brief Constant for Megabyte.
- */
+/** @brief Constant for Megabyte. */
static const int MEGA = 1024 * 1024;
/**
@@ -334,3 +330,9 @@
}
return str;
}
+
+/** @brief Report DeleteFile() failure to Log */
+UINT CLogFile::DeleteFileFailed(LPCTSTR path)
+{
+ return Write(CLogFile::LERROR|CLogFile::LOSERROR|CLogFile::LDEBUG, _T("DeleteFile(%s) failed: "), path);
+}
Modified: trunk/Src/Common/LogFile.h
===================================================================
--- trunk/Src/Common/LogFile.h 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/Common/LogFile.h 2007-03-13 16:50:06 UTC (rev 4161)
@@ -4,7 +4,7 @@
* @brief Declaration file for CLogFile
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_LOGFILE_H__803A3641_FE03_11D0_95CD_444553540000__INCLUDED_)
@@ -66,6 +66,8 @@
UINT Write(UINT level, LPCTSTR pszFormat, ...);
UINT Write(UINT level, DWORD idFormatString, ...);
+ UINT DeleteFileFailed(LPCTSTR path);
+
void SetMaxLogSize(DWORD dwMax) { m_nMaxSize = dwMax; }
CString GetPath() const { return m_strLogPath; }
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/DiffWrapper.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -51,7 +51,6 @@
#endif
extern int recursive;
-extern CLogFile gLog;
static void FreeDiffUtilsScript(struct change * & script);
static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/DirActions.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -40,8 +40,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-extern CLogFile gLog;
-
/**
* @brief Ask user a confirmation for copying item(s).
* Shows a confirmatino dialog for copy operation. Depending ont item count
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/DirDoc.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -51,8 +51,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-extern CLogFile gLog;
-
/////////////////////////////////////////////////////////////////////////////
// CDirDoc
@@ -309,7 +307,7 @@
m_statusCursor = new CustomStatusCursor(0, IDC_APPSTARTING, LoadResString(IDS_STATUS_RESCANNING));
- gLog.Write(CLogFile::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"),
+ GetLog()->Write(CLogFile::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"),
m_pCtxt->GetLeftPath(), m_pCtxt->GetRightPath());
m_pCompareStats->Reset();
m_pDirView->StartCompare(m_pCompareStats);
@@ -709,7 +707,7 @@
*/
void CDirDoc::CompareReady()
{
- gLog.Write(CLogFile::LNOTICE, _T("Directory scan complete\n"));
+ GetLog()->Write(CLogFile::LNOTICE, _T("Directory scan complete\n"));
// finish the cursor (the hourglass/pointer combo) we had open during display
delete m_statusCursor;
@@ -851,7 +849,7 @@
*/
void CDirDoc::AbortCurrentScan()
{
- gLog.Write(CLogFile::LNOTICE, _T("Dircompare aborted!"));
+ GetLog()->Write(CLogFile::LNOTICE, _T("Dircompare aborted!"));
m_diffThread.Abort();
}
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/DirScan.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -3,13 +3,15 @@
*
* @brief Implementation of DirScan (q.v.) and helper functions
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include <shlwapi.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "Merge.h"
+#include "LogFile.h"
#include "DirScan.h"
#include "CompareStats.h"
#include "common/unicoder.h"
@@ -17,7 +19,6 @@
#include "DiffWrapper.h"
#include "FolderCmp.h"
#include "FileFilterHelper.h"
-#include "logfile.h"
#include "paths.h"
#include "FileTransform.h"
#include "codepage.h"
@@ -700,7 +701,7 @@
}
}
- gLog.Write
+ GetLog()->Write
(
CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
(LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), di.diffcode
@@ -757,7 +758,7 @@
di.diffcode = code;
- gLog.Write
+ GetLog()->Write
(
CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
(LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), code
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/FolderCmp.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -8,6 +8,8 @@
#include "stdafx.h"
+#include "LogFile.h"
+#include "Merge.h"
#include "paths.h"
#include "FilterList.h"
#include "DiffContext.h"
@@ -205,13 +207,13 @@
m_diffFileData.Reset();
// delete the temp files after comparison
if (filepathTransformed1 != filepathUnpacked1)
- VERIFY(::DeleteFile(filepathTransformed1) || gLog::DeleteFileFailed(filepathTransformed1));
+ VERIFY(::DeleteFile(filepathTransformed1) || GetLog()->DeleteFileFailed(filepathTransformed1));
if (filepathTransformed2 != filepathUnpacked2)
- VERIFY(::DeleteFile(filepathTransformed2) || gLog::DeleteFileFailed(filepathTransformed2));
+ VERIFY(::DeleteFile(filepathTransformed2) || GetLog()->DeleteFileFailed(filepathTransformed2));
if (filepathUnpacked1 != filepath1)
- VERIFY(::DeleteFile(filepathUnpacked1) || gLog::DeleteFileFailed(filepathUnpacked1));
+ VERIFY(::DeleteFile(filepathUnpacked1) || GetLog()->DeleteFileFailed(filepathUnpacked1));
if (filepathUnpacked2 != filepath2)
- VERIFY(::DeleteFile(filepathUnpacked2) || gLog::DeleteFileFailed(filepathUnpacked2));
+ VERIFY(::DeleteFile(filepathUnpacked2) || GetLog()->DeleteFileFailed(filepathUnpacked2));
return code;
}
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/MainFrm.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -23,7 +23,7 @@
*
* @brief Implementation of the CMainFrame class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -44,7 +44,6 @@
#include "LocationView.h"
#include "SyntaxColors.h"
-#include "diff.h"
#include "coretools.h"
#include "Splash.h"
#include "PropLineFilter.h"
@@ -52,7 +51,6 @@
#include "paths.h"
#include "WaitStatusCursor.h"
#include "PatchTool.h"
-#include "FileTransform.h"
#include "Plugins.h"
#include "SelectUnpackerDlg.h"
#include "files.h"
@@ -89,8 +87,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-extern CLogFile gLog;
-
static void LoadToolbarImageList(UINT nIDResource, CImageList& ImgList);
/////////////////////////////////////////////////////////////////////////////
@@ -213,20 +209,6 @@
// uncomment this when the GUI allows to toggle the mode
// g_bPredifferMode = theApp.GetProfileInt(_T("Settings"), _T("PredifferMode"), PLUGIN_MANUAL);
- // TODO: read preference for logging
-
- int logging = GetOptionsMgr()->GetInt(OPT_LOGGING);
- if (logging > 0)
- {
- gLog.EnableLogging(TRUE);
- gLog.SetFile(_T("WinMerge.log"));
-
- if (logging == 1)
- gLog.SetMaskLevel(CLogFile::LALL);
- else if (logging == 2)
- gLog.SetMaskLevel(CLogFile::LERROR | CLogFile::LWARNING);
- }
-
m_pSyntaxColors = new SyntaxColors();
if (m_pSyntaxColors)
m_pSyntaxColors->Initialize(GetOptionsMgr());
@@ -244,7 +226,7 @@
CMainFrame::~CMainFrame()
{
- gLog.EnableLogging(FALSE);
+ GetLog()->EnableLogging(FALSE);
// Delete all temporary folders belonging to this process
GetClearTempPath(NULL, NULL);
@@ -1060,7 +1042,7 @@
if (1)
{
- gLog.Write(_T("### Begin Comparison Parameters #############################\r\n")
+ GetLog()->Write(_T("### Begin Comparison Parameters #############################\r\n")
_T("\tLeft: %s\r\n")
_T("\tRight: %s\r\n")
_T("\tRecurse: %d\r\n")
@@ -1091,7 +1073,7 @@
break;
if (strLeft.Find(path) == 0)
{
- VERIFY(::DeleteFile(strLeft) || gLog::DeleteFileFailed(strLeft));
+ VERIFY(::DeleteFile(strLeft) || GetLog()->DeleteFileFailed(strLeft));
}
SysFreeString(Assign(strLeft, piHandler->GetDefaultName(m_hWnd, strLeft)));
strLeft.Insert(0, '\\');
@@ -1107,7 +1089,7 @@
break;;
if (strRight.Find(path) == 0)
{
- VERIFY(::DeleteFile(strRight) || gLog::DeleteFileFailed(strRight));
+ VERIFY(::DeleteFile(strRight) || GetLog()->DeleteFileFailed(strRight));
}
SysFreeString(Assign(strRight, piHandler->GetDefaultName(m_hWnd, strRight)));
strRight.Insert(0, '\\');
@@ -1172,7 +1154,7 @@
// Anything that can go wrong inside InitCompare() will yield an
// exception. There is no point in checking return value.
pDirDoc->InitCompare(paths, bRecurse, pTempPathContext);
- gLog.Write(CLogFile::LNOTICE, _T("Open dirs: Left: %s\n\tRight: %s."),
+ GetLog()->Write(CLogFile::LNOTICE, _T("Open dirs: Left: %s\n\tRight: %s."),
strLeft, strRight);
pDirDoc->SetReadOnly(TRUE, bROLeft);
@@ -1187,7 +1169,7 @@
}
else
{
- gLog.Write(CLogFile::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."),
+ GetLog()->Write(CLogFile::LNOTICE, _T("Open files: Left: %s\n\tRight: %s."),
strLeft, strRight);
FileLocation filelocLeft(strLeft);
@@ -1657,7 +1639,7 @@
dsk_rc.bottom = dsk_rc.top + ::GetSystemMetrics(SM_CYVIRTUALSCREEN);
if (nCmdShow != SW_MINIMIZE && theApp.GetProfileInt(_T("Settings"), _T("MainMax"), FALSE))
{
- CMDIFrameWnd::ActivateFrame(SW_MAXIMIZE);
+ CMDIFrameWnd::ActivateFrame(SW_MAXIMIZE);
}
else if (rc.Width() != 0 && rc.Height() != 0)
{
@@ -2097,7 +2079,7 @@
files[1] = files[0];
}
- gLog.Write(CLogFile::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."),
+ GetLog()->Write(CLogFile::LNOTICE, _T("D&D open: Left: %s\n\tRight: %s."),
files[0], files[1]);
// Check if they dropped a project file
@@ -2322,7 +2304,6 @@
LoadConfigBoolSetting(&configLog.m_miscSettings.bAutomaticRescan, options, OPT_AUTOMATIC_RESCAN, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bAllowMixedEol, options, OPT_ALLOW_MIXED_EOL, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bScrollToFirst, options, OPT_SCROLL_TO_FIRST, cfgdir);
-// LoadConfigBoolSetting(&configLog.m_miscSettings.bBackup, options, OPT_CREATE_BACKUPS, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bViewWhitespace, options, OPT_VIEW_WHITESPACE, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bMovedBlocks, options, OPT_CMP_MOVED_BLOCKS, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bShowLinenumbers, options, OPT_VIEW_LINENUMBERS, cfgdir);
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/Merge.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -24,7 +24,7 @@
* @brief Defines the class behaviors for the application.
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -89,8 +89,6 @@
ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup)
END_MESSAGE_MAP()
-extern CLogFile gLog;
-
static void AddEnglishResourceHook();
/**
@@ -109,12 +107,27 @@
LPCTSTR WinMergeOptionName;
};
+/**
+ * @brief Get Options Manager.
+ * @return Pointer to OptionsMgr.
+ */
COptionsMgr * GetOptionsMgr()
{
CMergeApp *pApp = static_cast<CMergeApp *>(AfxGetApp());
return pApp->GetMergeOptionsMgr();
}
+/**
+ * @brief Get Log.
+ * @return Pointer to Log.
+ */
+CLogFile * GetLog()
+{
+ CMergeApp *pApp = static_cast<CMergeApp *>(AfxGetApp());
+ return pApp->GetMergeLog();
+}
+
+
/////////////////////////////////////////////////////////////////////////////
// CMergeApp construction
@@ -126,6 +139,7 @@
, m_nLastCompareResult(0)
, m_bNonInteractive(false)
, m_pOptions(NULL)
+, m_pLog(NULL)
{
// add construction code here,
// Place all significant initialization in InitInstance
@@ -136,6 +150,7 @@
{
delete m_pOptions;
delete m_pLangDlg;
+ delete m_pLog;
}
/////////////////////////////////////////////////////////////////////////////
// The one and only CMergeApp object
@@ -195,6 +210,20 @@
m_pOptions = new CRegOptionsMgr;
OptionsInit(); // Implementation in OptionsInit.cpp
+ m_pLog = new CLogFile();
+
+ int logging = GetOptionsMgr()->GetInt(OPT_LOGGING);
+ if (logging > 0)
+ {
+ m_pLog->EnableLogging(TRUE);
+ m_pLog->SetFile(_T("WinMerge.log"));
+
+ if (logging == 1)
+ m_pLog->SetMaskLevel(CLogFile::LALL);
+ else if (logging == 2)
+ m_pLog->SetMaskLevel(CLogFile::LERROR | CLogFile::LWARNING);
+ }
+
// Parse command-line arguments.
MergeCmdLineInfo cmdInfo(*__targv);
ParseCommandLine(cmdInfo);
@@ -273,7 +302,7 @@
// Initialize i18n (multiple language) support
- m_pLangDlg->SetLogFile(&gLog);
+ m_pLangDlg->SetLogFile(GetLog());
m_pLangDlg->InitializeLanguage();
AddEnglishResourceHook(); // Use English string when l10n (foreign) string missing
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/Merge.h 2007-03-13 16:50:06 UTC (rev 4161)
@@ -23,7 +23,7 @@
* @brief main header file for the MERGE application
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_MERGE_H__BBCD4F88_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
@@ -43,6 +43,7 @@
class CMainFrame;
class CLanguageSelect;
class MergeCmdLineInfo;
+class CLogFile;
/////////////////////////////////////////////////////////////////////////////
// CMergeApp:
@@ -78,6 +79,8 @@
void OptionsInit();
void ResetOptions() { OptionsInit(); }
+ CLogFile * GetMergeLog() { return m_pLog; }
+
// Implementation
protected:
@@ -112,6 +115,7 @@
private:
CRegOptionsMgr *m_pOptions;
CAssureScriptsForThread * m_mainThreadScripts;
+ CLogFile * m_pLog;
int m_nLastCompareResult;
bool m_bNonInteractive;
};
@@ -119,6 +123,7 @@
extern CMergeApp theApp;
COptionsMgr * GetOptionsMgr();
+CLogFile * GetLog();
/////////////////////////////////////////////////////////////////////////////
CMergeDoc *GetDoc();
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/MergeDoc.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -72,8 +72,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-extern CLogFile gLog;
-
/** @brief Max len of path in caption. */
static const UINT CAPTION_PATH_MAX = 50;
Modified: trunk/Src/Plugins.cpp
===================================================================
--- trunk/Src/Plugins.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/Plugins.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -23,7 +23,7 @@
*
* @brief Support for VBS Scriptlets, VB ActiveX DLL, VC++ COM DLL
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "StdAfx.h"
@@ -32,6 +32,8 @@
#endif
#include "pcre.h"
+#include "LogFile.h"
+#include "Merge.h"
#include "Ucs2Utf8.h"
#include "FileTransform.h"
#include "FileFilterMgr.h"
@@ -42,8 +44,6 @@
#include "Exceptions.h"
#include "RegKey.h"
#include "paths.h"
-#include "logfile.h"
-extern CLogFile gLog;
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -570,7 +570,7 @@
if (IsWindowsScriptThere())
GetScriptletsAt(path, _T(".sct"), theScriptletList ); // VBS/JVS scriptlet
else
- gLog.Write(CLogFile::LWARNING, _T("\n .sct plugins disabled (Windows Script Host not found)"));
+ GetLog()->Write(CLogFile::LWARNING, _T("\n .sct plugins disabled (Windows Script Host not found)"));
GetScriptletsAt(path, _T(".ocx"), theScriptletList ); // VB COM object
GetScriptletsAt(path, _T(".dll"), theScriptletList ); // VC++ COM object
scriptletsLoaded = true;
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/StdAfx.cpp 2007-03-13 16:50:06 UTC (rev 4161)
@@ -27,16 +27,8 @@
#include "stdafx.h"
#include "LogFile.h"
+#include "Merge.h"
-// Logging
-CLogFile gLog;
-
-/** @brief Report DeleteFile() failure to gLog */
-UINT gLog::DeleteFileFailed(LPCTSTR path)
-{
- return::gLog.Write(CLogFile::LERROR|CLogFile::LOSERROR|CLogFile::LDEBUG, _T("DeleteFile(%s) failed: "), path);
-}
-
// Convert any negative inputs to negative char equivalents
// This is aimed at correcting any chars mistakenly
// sign-extended to negative ints.
@@ -146,7 +138,7 @@
TRACE(_T("%s: %s\n"), (LPCTSTR)now, sz);
#if defined (_DEBUG) || defined (ENABLE_LOG)
- gLog.Write(CLogFile::LERROR, sz);
+ GetLog()->Write(CLogFile::LERROR, sz);
#endif
}
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2007-03-12 21:07:55 UTC (rev 4160)
+++ trunk/Src/StdAfx.h 2007-03-13 16:50:06 UTC (rev 4161)
@@ -110,15 +110,6 @@
/** @brief Get appropriate clipboard format for TCHAR text, ie, CF_TEXT or CF_UNICODETEXT */
int GetClipTcharTextFormat();
-class CLogFile;
-extern CLogFile gLog;
-
- /** @brief Shortcuts for common gLog messages */
-struct gLog
-{
- static UINT DeleteFileFailed(LPCTSTR path);
-};
-
bool IsUnicodeBuild();
/** @brief include for the custom dialog boxes, with do not ask/display again */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-18 11:23:21
|
Revision: 4171
http://svn.sourceforge.net/winmerge/?rev=4171&view=rev
Author: kimmov
Date: 2007-03-18 04:23:13 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
PATCH: [ 1682475 ] Improve Line filters dialog (add new files I forgot to add)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/LineFiltersList.cpp
trunk/Src/LineFiltersList.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-17 22:55:09 UTC (rev 4170)
+++ trunk/Src/Changes.txt 2007-03-18 11:23:13 UTC (rev 4171)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-18 Kimmo
+ PATCH: [ 1682475 ] Improve Line filters dialog (add new files I forgot to add)
+ Src: Merge.dsp
+ Src new files: LineFiltersList.cpp LineFiltersList.h
+
2007-03-17 Kimmo
PATCH: [ 1682475 ] Improve Line filters dialog
Src: DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc Merge.rc MergeDoc.cpp OptionsDef.h
Added: trunk/Src/LineFiltersList.cpp
===================================================================
--- trunk/Src/LineFiltersList.cpp (rev 0)
+++ trunk/Src/LineFiltersList.cpp 2007-03-18 11:23:13 UTC (rev 4171)
@@ -0,0 +1,186 @@
+/**
+ * @file LineFiltersList.cpp
+ *
+ * @brief Implementation for LineFiltersList class.
+ */
+// ID line follows -- this is updated by SVN
+// $Id: SyntaxColors.cpp 3154 2006-03-10 18:24:58Z elsapo $
+
+#include "stdafx.h"
+#include "LineFiltersList.h"
+#include "OptionsDef.h"
+#include "OptionsMgr.h"
+
+/** @brief Registry key for saving linefilters. */
+static const TCHAR FiltersRegPath[] =_T("LineFilters");
+
+/**
+ * @brief Default constructor.
+ */
+LineFiltersList::LineFiltersList()
+: m_pOptionsMgr(NULL)
+{
+}
+
+/**
+ * @brief Destructor, empties the list.
+ */
+LineFiltersList::~LineFiltersList()
+{
+ Empty();
+}
+
+/**
+ * @brief Add new filter to the list.
+ * @param [in] filter Filter string to add.
+ * @param [in] enabled Is filter enabled?
+ */
+void LineFiltersList::AddFilter(LPCTSTR filter, BOOL enabled)
+{
+ LineFilterItem item;
+ item.enabled = enabled;
+ item.filterStr = _tcsdup(filter);
+
+ m_items.AddTail(item);
+}
+
+/**
+ * @brief Returns count of items in the list.
+ * @return Count of filters in the list.
+ */
+int LineFiltersList::GetCount() const
+{
+ return m_items.GetCount();
+}
+
+/**
+ * @brief Empties the list.
+ */
+void LineFiltersList::Empty()
+{
+ while (!m_items.IsEmpty())
+ {
+ LineFilterItem item = m_items.RemoveHead();
+ free(item.filterStr);
+ }
+}
+
+/**
+ * @brief Returns the filter list as one filter string.
+ * This function returns the list of filters as one string that can be
+ * given to regular expression engine as filter. Filter strings in
+ * the list are separated by "|".
+ * @return Filter string.
+ */
+CString LineFiltersList::GetAsString() const
+{
+ CString filter;
+
+ POSITION pos = m_items.GetHeadPosition();
+
+ while (pos)
+ {
+ LineFilterItem item = m_items.GetNext(pos);
+ if (item.enabled)
+ {
+ if (!filter.IsEmpty())
+ filter += _T("|");
+ filter += item.filterStr;
+ }
+ }
+ return filter;
+}
+
+/**
+ * @brief Return filter from given index.
+ * @param [in] ind Index of filter.
+ * @return Filter item from the index.
+ */
+LineFilterItem LineFiltersList::GetAt(int ind)
+{
+ LineFilterItem item;
+
+ if (ind < m_items.GetCount())
+ {
+ POSITION pos = m_items.FindIndex(ind);
+ if (pos)
+ {
+ return m_items.GetAt(pos);
+ }
+ }
+ return item;
+}
+
+/**
+ * @brief Clone filter list from another list.
+ * This function clones filter list from another list. Current items in the
+ * list are removed and new items added from the given list.
+ * @param [in] list List to clone.
+ */
+void LineFiltersList::CloneFrom(LineFiltersList *list)
+{
+ Empty();
+ int count = list->GetCount();
+
+ for (int i = 0; i < count; i++)
+ {
+ LineFilterItem item = list->GetAt(i);
+ AddFilter(item.filterStr, item.enabled);
+ }
+}
+
+/**
+ * @brief Read filter list from the options system.
+ * @param [in] pOptionsMgr Pointer to options system.
+ */
+void LineFiltersList::Initialize(COptionsMgr *pOptionsMgr)
+{
+ ASSERT(pOptionsMgr);
+ CString valuename(FiltersRegPath);
+
+ m_pOptionsMgr = pOptionsMgr;
+
+ int count = m_items.GetCount();
+ valuename += _T("/Values");
+ m_pOptionsMgr->InitOption(valuename, count);
+ count = m_pOptionsMgr->GetInt(valuename);
+
+ for (unsigned int i = 0; i < count; i++)
+ {
+ valuename.Format(_T("%s/Filter%02u"), FiltersRegPath, i);
+ m_pOptionsMgr->InitOption(valuename, _T(""));
+ CString filter = m_pOptionsMgr->GetString(valuename);
+
+ valuename.Format(_T("%s/Enabled%02u"), FiltersRegPath, i);
+ m_pOptionsMgr->InitOption(valuename, (int)TRUE);
+ int enabled = m_pOptionsMgr->GetInt(valuename);
+ BOOL bEnabled = enabled ? TRUE : FALSE;
+
+ AddFilter(filter, bEnabled);
+ }
+}
+
+/**
+ * @brief Save linefilters to options system.
+ */
+void LineFiltersList::SaveFilters()
+{
+ ASSERT(m_pOptionsMgr);
+ CString valuename(FiltersRegPath);
+
+ int count = m_items.GetCount();
+ valuename += _T("/Values");
+ m_pOptionsMgr->SetInt(valuename, count);
+
+ for (unsigned int i = 0; i < count; i++)
+ {
+ POSITION pos = m_items.FindIndex(i);
+ LineFilterItem item = m_items.GetAt(pos);
+ valuename.Format(_T("%s/Filter%02u"), FiltersRegPath, i);
+ m_pOptionsMgr->InitOption(valuename, _T(""));
+ m_pOptionsMgr->SaveOption(valuename, item.filterStr);
+ valuename.Format(_T("%s/Enabled%02u"), FiltersRegPath, i);
+ m_pOptionsMgr->InitOption(valuename, 0);
+ m_pOptionsMgr->SaveOption(valuename, (int)item.enabled);
+ }
+}
Added: trunk/Src/LineFiltersList.h
===================================================================
--- trunk/Src/LineFiltersList.h (rev 0)
+++ trunk/Src/LineFiltersList.h 2007-03-18 11:23:13 UTC (rev 4171)
@@ -0,0 +1,53 @@
+/**
+ * @file LineFiltersList.h
+ *
+ * @brief Declaration file for LineFiltersList class
+ */
+// ID line follows -- this is updated by SVN
+// $Id: SyntaxColors.h 3126 2006-03-04 02:36:46Z elsapo $
+
+#ifndef _LINEFILTERS_LIST_H_
+#define _LINEFILTERS_LIST_H_
+
+#include "stdafx.h"
+
+class COptionsMgr;
+
+/**
+ @brief Structure for one line filter.
+ */
+struct LineFilterItem
+{
+ BOOL enabled; /**< Is filter enabled? */
+ TCHAR * filterStr; /**< Filter string */
+ LineFilterItem() : enabled(FALSE), filterStr(NULL) { }
+};
+
+typedef CList<LineFilterItem, const LineFilterItem&> LineFilterItems;
+
+/**
+ @brief List of line filters.
+ */
+class LineFiltersList
+{
+public:
+ LineFiltersList();
+ ~LineFiltersList();
+
+ void AddFilter(LPCTSTR filter, BOOL enabled);
+ int GetCount() const;
+ void Empty();
+ CString GetAsString() const;
+ LineFilterItem GetAt(int ind);
+ void CloneFrom(LineFiltersList *list);
+
+ void Initialize(COptionsMgr *pOptionsMgr);
+ void SaveFilters();
+
+private:
+ LineFilterItems m_items; /**< List for linefilter items */
+ COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
+};
+
+#endif // _LINEFILTERS_LIST_H_
+
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-03-17 22:55:09 UTC (rev 4170)
+++ trunk/Src/Merge.dsp 2007-03-18 11:23:13 UTC (rev 4171)
@@ -477,6 +477,10 @@
# End Source File
# Begin Source File
+SOURCE=.\LineFiltersList.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\LoadSaveCodepageDlg.cpp
# End Source File
# Begin Source File
@@ -1245,6 +1249,10 @@
# End Source File
# Begin Source File
+SOURCE=.\LineFiltersList.h
+# End Source File
+# Begin Source File
+
SOURCE=.\LoadSaveCodepageDlg.h
# End Source File
# Begin Source File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-18 11:57:40
|
Revision: 4168
http://svn.sourceforge.net/winmerge/?rev=4168&view=rev
Author: kimmov
Date: 2007-03-17 10:18:05 -0700 (Sat, 17 Mar 2007)
Log Message:
-----------
PATCH: [ 1682475 ] Improve Line filters dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirDoc.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.rc
trunk/Src/MergeDoc.cpp
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropLineFilter.cpp
trunk/Src/PropLineFilter.h
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Changes.txt 2007-03-17 17:18:05 UTC (rev 4168)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-17 Kimmo
+ PATCH: [ 1682475 ] Improve Line filters dialog
+ Src: DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc Merge.rc MergeDoc.cpp OptionsDef.h
+ OptionsInit.cpp PropLineFilter.cpp PropLineFilter.h
+ Src/Languages/*: Merge*.rc
+
2007-03-15 Kimmo
Trivial string initialization fix
Src: SyntaxColors.cpp
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/DirDoc.cpp 2007-03-17 17:18:05 UTC (rev 4168)
@@ -44,6 +44,7 @@
#include "7zCommon.h"
#include "OptionsDef.h"
#include "FileActionScript.h"
+#include "LineFiltersList.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -253,12 +254,17 @@
return AllowUpwardDirectory::No;
}
+/**
+ * @brief Load line filters to the compare context.
+ * Loads linefilters, converts them to UTF-8 and sets them for compare context.
+ */
void CDirDoc::LoadLineFilterList()
{
ASSERT(m_pCtxt);
BOOL bFilters = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
- if (!bFilters)
+ CString filters = GetMainFrame()->m_pLineFilters->GetAsString();
+ if (!bFilters || filters.IsEmpty())
{
delete m_pCtxt->m_pFilterList;
m_pCtxt->m_pFilterList = NULL;
@@ -270,7 +276,6 @@
else
m_pCtxt->m_pFilterList = new FilterList();
- CString filters = GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP);
char * regexp_str;
FilterList::EncodingType type;
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Linefilters"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Express\xF5es (uma por linha):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "\xD4\xE8\xEB\xF2\xF0\xE8 \xE7\xE0 \xF0\xE5\xE4"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 \xE8\xE7\xF0\xE0\xE7\xE8 (\xEF\xEE \xE5\xE4\xE8\xED \xED\xE0 \xF0\xE5\xE4):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2080,6 +2087,12 @@
"\xD4\xE8\xEB\xF2\xFA\xF0\xED\xE8\xFF\xF2 \xF4\xE0\xE9\xEB \xE2\xE5\xF7\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0. \xC4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE7\xE0\xEF\xE8\xF8\xE5 \xEB\xE8 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xE8\xFF\xF2 \xF4\xE8\xEB\xF2\xFA\xF0?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filtres de l\xEDnia"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Expressions ®ulars (una per l\xEDnia):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2080,6 +2087,12 @@
"El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -844,7 +844,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "\xD0й\xFD\xC2\xCB\xC6\xF7"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -854,8 +854,15 @@
7,221,15
LTEXT "\xD5\xFD\xD4\xF2\xB1\xED\xB4\xEFʽ (ÿ\xD0\xD0һ\xB8\xF6):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2063,6 +2070,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "\xA6C\xC2o\xC3\xE8"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "\xA4@\xAF\xEB\xB9B\xBA⦡ (\xA8C\xA6C\xA4@\xAD\xD3):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filtrov\xE1n\xED \xF8\xE1dk\xF9"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regul\xE9rn\xED v\xFDrazy (jeden na \xF8\xE1dek):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Soubor s filtrem ji\x9E existuje. Chcete nahradit st\xE1vaj\xEDc\xED filtr?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Linjefiltre"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regul\xE6re udtryk (et pr linje):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Regelfilters"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Reguliere Expressies (\xE9\xE9n per regel):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -841,7 +841,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filtre des lignes"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -851,8 +851,15 @@
7,221,15
LTEXT "Expressions r\xE9guli\xE8res (une par ligne)",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2055,6 +2062,12 @@
"Le fichier de filtre existe d\xE9j\xE0. \xC9craser le filtre existant?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Zeilenfilter"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regul\xE4re Ausdr\xFCcke (einer pro Zeile):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filterdatei existiert bereits. Existierenden Filter \xFCberschreiben?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Sorsz\xFBr\xF5k"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regul\xE1ris kifejez\xE9sek (soronk\xE9nt egy):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2060,6 +2067,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filtri di linee"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Espressioni regolari (una per linea):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Il file del filtro esiste gi\xE0. Desideri sovrascrivere il file esistente?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "\x8Ds\x83t\x83B\x83\x8B\x83^"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "\x90\xB3\x8BK\x95\\x8C\xBB (\x8Ds\x82\xA0\x82\xBD\x82\xE8\x88\xEA\x82\xC2):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"\x83t\x83B\x83\x8B\x83^\x83t\x83@\x83C\x83\x8B\x82͊\xF9\x82ɑ\xB6\x8D݂\xB5\x82܂\xB7\x81B\x91\xB6\x8D݂\xB5\x82Ă\xA2\x82\xE9\x83t\x83@\x83C\x83\x8B\x82\xF0\x8F㏑\x82\xAB\x82\xB5\x82܂\xB7\x82\xA9?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "\xB6\xF3\xC0\xCE \xC7\xCA\xC5\xCD"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "\xC1\xA4\xB1\xD4 ǥ\xC7\xF6\xBD\xC4 (\xB8\xC51\xB6\xF3\xC0θ\xB6\xB4\xD9 \xC0\xFB\xBF\xEB):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Linjefilter"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regul\xE6re uttrykk (ett pr linje):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filtry wierszy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Wyra\xBFenia regularne (jedno/wiersz):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Plik filtra ju\xBF istnieje. Czy nadpisa\xE6 istniej\xB9cy plik?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "\xD1\xF2\xF0\xEE\xEA\xEE\xE2\xFB\xE5 \xF4\xE8\xEB\xFC\xF2\xF0\xFB"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,224,15
LTEXT "\xD0\xE5\xE3\xF3\xEB\xFF\xF0\xED\xFB\xE5 \xE2\xFB\xF0\xE0\xE6\xE5\xED\xE8\xFF (\xEE\xE4\xED\xEE \xED\xE0 \xF1\xF2\xF0\xEE\xEA\xF3):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Riadkov\xE9 filtre"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regul\xE1rne v\xFDrazy (jeden na riadok):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter u\x9E existuje. Prep\xEDsa\x9D existuj\xFAci filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Filtros de l\xEDnea"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Expresiones regulares (una por l\xEDnea):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"El fichero de filtros ya existe. \xBFDesea sobreescribirlo?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Radfilter"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regulj\xE4ra uttryck (ett per rad):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,7 +2069,14 @@
"Filterfilen \xE4r redan installerad. Vill du skriva \xF6ver existerande filterfil?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
+// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
IDS_CC_CMD "&S\xF6kv\xE4g till Cleartool.exe:"
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -843,7 +843,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Linefilters"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -853,8 +853,15 @@
7,221,15
LTEXT "Regular Expressions (one per line):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2062,6 +2069,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/MainFrm.cpp 2007-03-17 17:18:05 UTC (rev 4168)
@@ -43,6 +43,7 @@
#include "MergeDiffDetailView.h"
#include "LocationView.h"
#include "SyntaxColors.h"
+#include "LineFiltersList.h"
#include "coretools.h"
#include "Splash.h"
@@ -200,6 +201,7 @@
, m_CheckOutMulti(FALSE)
, m_bVCProjSync(FALSE)
, m_bVssSuppressPathCheck(FALSE)
+, m_pLineFilters(NULL)
{
ZeroMemory(&m_pMenus[0], sizeof(m_pMenus));
UpdateCodepageModule();
@@ -213,6 +215,10 @@
if (m_pSyntaxColors)
m_pSyntaxColors->Initialize(GetOptionsMgr());
+ m_pLineFilters = new LineFiltersList();
+ if (m_pLineFilters)
+ m_pLineFilters->Initialize(GetOptionsMgr());
+
// Check if filter folder is set, and create it if not
CString pathMyFolders = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
@@ -231,6 +237,7 @@
// Delete all temporary folders belonging to this process
GetClearTempPath(NULL, NULL);
+ delete m_pLineFilters;
delete m_pMenus[MENU_DEFAULT];
delete m_pMenus[MENU_MERGEVIEW];
delete m_pMenus[MENU_DIRVIEW];
@@ -2419,6 +2426,7 @@
CPropLineFilter filter;
FileFiltersDlg fileFiltersDlg;
FILEFILTER_INFOLIST fileFilters;
+ LineFiltersList * lineFilters = new LineFiltersList();
CString selectedFilter;
sht.AddPage(&fileFiltersDlg);
sht.AddPage(&filter);
@@ -2431,8 +2439,10 @@
fileFiltersDlg.SetFilterArray(&fileFilters);
fileFiltersDlg.SetSelected(selectedFilter);
filter.m_bIgnoreRegExp = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED);
- filter.m_sPattern = GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP);
+ lineFilters->CloneFrom(m_pLineFilters);
+ filter.SetList(lineFilters);
+
if (sht.DoModal() == IDOK)
{
CString strNone;
@@ -2456,8 +2466,11 @@
GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter);
}
GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, filter.m_bIgnoreRegExp == TRUE);
- GetOptionsMgr()->SaveOption(OPT_LINEFILTER_REGEXP, filter.m_sPattern);
+
+ m_pLineFilters->CloneFrom(lineFilters);
+ m_pLineFilters->SaveFilters();
}
+ delete lineFilters;
}
/**
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/MainFrm.h 2007-03-17 17:18:05 UTC (rev 4168)
@@ -23,7 +23,7 @@
* @brief Declaration file for CMainFrame
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
@@ -69,6 +69,7 @@
class CMergeEditView;
class CMergeDiffDetailView;
class SyntaxColors;
+class LineFiltersList;
// typed lists (homogenous pointer lists)
@@ -154,6 +155,7 @@
BOOL m_bClearCaseTool; /**< WinMerge is executed as an external Rational ClearCase compare/merge tool. */
BOOL m_bFlashing; /**< Window is flashing. */
BOOL m_bExitIfNoDiff; /**< If command line switch -x given close application if files are identical. */
+ LineFiltersList *m_pLineFilters; /**< List of linefilters */
/**
* @name Version Control System (VCS) integration.
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/Merge.rc 2007-03-17 17:18:05 UTC (rev 4168)
@@ -853,7 +853,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
-IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 235, 156
+IDD_PROPPAGE_FILTER DIALOGEX 0, 0, 365, 188
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Linefilters"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -863,8 +863,15 @@
7,221,15
LTEXT "Regular Expressions (one per line):",IDC_STATIC,7,28,
221,8
- EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
- ES_AUTOHSCROLL | ES_WANTRETURN
+ CONTROL "",IDC_LFILTER_LIST,"SysListView32",LVS_REPORT |
+ LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS |
+ LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
+ EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
+ ES_READONLY
+ PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2072,6 +2079,12 @@
"Filter file already exists. Overwrite existing filter?"
END
+// LINEFILTER STRINGS
+STRINGTABLE
+BEGIN
+ IDS_FILTERLINE_REGEXP "Regular expression"
+END
+
// VERSION CONTROL OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/MergeDoc.cpp 2007-03-17 17:18:05 UTC (rev 4168)
@@ -24,24 +24,21 @@
* @brief Implementation file for CMergeDoc
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include <Shlwapi.h> // PathCompactPathEx()
#include "Merge.h"
-#include "direct.h"
#include "MainFrm.h"
#include "Ucs2Utf8.h"
-#include "diff.h"
#include "diffcontext.h" // FILE_SAME
#include "MovedLines.h"
#include "getopt.h"
#include "fnmatch.h"
#include "coretools.h"
-#include "VssPrompt.h"
#include "MergeEditView.h"
#include "MergeDiffDetailView.h"
#include "cs2cs.h"
@@ -57,7 +54,6 @@
#include "DiffFileInfo.h"
#include "SaveClosingDlg.h"
#include "DiffList.h"
-#include "sbuffer.h"
#include "dllver.h"
#include "codepage.h"
#include "paths.h"
@@ -65,6 +61,7 @@
#include "ProjectFile.h"
#include "MergeLineFlags.h"
#include "FileOrFolderSelect.h"
+#include "LineFiltersList.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -397,7 +394,7 @@
if (GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED))
{
- CString regexp = GetOptionsMgr()->GetString(OPT_LINEFILTER_REGEXP);
+ CString regexp = GetMainFrame()->m_pLineFilters->GetAsString();
m_diffWrapper.SetFilterList(regexp);
}
else
Modified: trunk/Src/OptionsDef.h
===================================================================
--- trunk/Src/OptionsDef.h 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/OptionsDef.h 2007-03-17 17:18:05 UTC (rev 4168)
@@ -125,8 +125,6 @@
/// Are regular expression linefilters enabled?
const TCHAR OPT_LINEFILTER_ENABLED[] = _T("Settings/IgnoreRegExp");
-///Regular expression linefilters
-const TCHAR OPT_LINEFILTER_REGEXP[] = _T("Settings/RegExps");
/// Currently selected filefilter
const TCHAR OPT_FILEFILTER_CURRENT[] = _T("Settings/FileFilterCurrent");
const TCHAR OPT_FILTER_USERPATH[] = _T("Settings/UserFilterPath");
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/OptionsInit.cpp 2007-03-17 17:18:05 UTC (rev 4168)
@@ -118,7 +118,6 @@
m_pOptions->SaveOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
m_pOptions->InitOption(OPT_LINEFILTER_ENABLED, false);
- m_pOptions->InitOption(OPT_LINEFILTER_REGEXP, _T(""));
m_pOptions->InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
// CMainFrame initializes this when it is empty.
m_pOptions->InitOption(OPT_FILTER_USERPATH, GetDefaultFilterUserPath());
Modified: trunk/Src/PropLineFilter.cpp
===================================================================
--- trunk/Src/PropLineFilter.cpp 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/PropLineFilter.cpp 2007-03-17 17:18:05 UTC (rev 4168)
@@ -8,8 +8,11 @@
#include "stdafx.h"
#include "merge.h"
+#include "LineFiltersList.h"
#include "MainFrm.h"
#include "PropLineFilter.h"
+#include "dllver.h"
+#include ".\proplinefilter.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -17,9 +20,7 @@
static char THIS_FILE[] = __FILE__;
#endif
-/**
- * @brief Location for file compare specific help to open.
- */
+/** @brief Location for file compare specific help to open. */
static TCHAR FilterHelpLocation[] = _T("::/htmlhelp/Filters.html");
/////////////////////////////////////////////////////////////////////////////
@@ -29,10 +30,11 @@
CPropLineFilter::CPropLineFilter()
: CPropertyPage(CPropLineFilter::IDD)
+, m_pList(NULL)
+, m_bEditing(FALSE)
{
//{{AFX_DATA_INIT(CPropLineFilter)
m_bIgnoreRegExp = FALSE;
- m_sPattern = _T("");
//}}AFX_DATA_INIT
}
@@ -44,10 +46,11 @@
{
CPropertyPage::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CPropLineFilter)
- DDX_Control(pDX, IDC_EDITPATTERN, m_cPattern);
DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
- DDX_Text(pDX, IDC_EDITPATTERN, m_sPattern);
//}}AFX_DATA_MAP
+ DDX_Control(pDX, IDC_LFILTER_LIST, m_filtersList);
+ DDX_Control(pDX, IDC_LFILTER_EDITBOX, m_editRegexp);
+ DDX_Control(pDX, IDC_LFILTER_EDITSAVE, m_saveRegexp);
}
@@ -56,8 +59,14 @@
ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
ON_COMMAND(ID_HELP, OnHelp)
//}}AFX_MSG_MAP
+ ON_BN_CLICKED(IDC_LFILTER_ADDBTN, OnBnClickedLfilterAddBtn)
+ ON_BN_CLICKED(IDC_LFILTER_EDITBTN, OnBnClickedLfilterEditbtn)
+ ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
+ ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
+ ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
END_MESSAGE_MAP()
+
/////////////////////////////////////////////////////////////////////////////
// CPropLineFilter message handlers
@@ -65,22 +74,52 @@
{
CPropertyPage::OnInitDialog();
- m_cPattern.EnableWindow(m_bIgnoreRegExp);
+ InitList();
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
+void CPropLineFilter::InitList()
+{
+ // Show selection across entire row.
+ DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT |
+ LVS_EX_ONECLICKACTIVATE;
+ // Also enable infotips if they have new enough version for our
+ // custom draw code
+ // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
+ if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
+ newstyle |= LVS_EX_INFOTIP;
+ m_filtersList.ModifyStyle(0, LVS_EDITLABELS | LVS_SHOWSELALWAYS);
+
+ m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle);
+
+ CString title = LoadResString(IDS_FILTERLINE_REGEXP);
+ m_filtersList.InsertColumn(1, title, LVCFMT_LEFT, 500);
+
+ int count = m_pList->GetCount();
+ int ind = -1;
+ for (int i = 0; i < count; i++)
+ {
+ LineFilterItem item = m_pList->GetAt(i);
+ ind = AddRow(item.filterStr, item.enabled);
+ }
+ if (count > 0)
+ {
+ m_filtersList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
+ BOOL bPartialOk = FALSE;
+ m_filtersList.EnsureVisible(0, bPartialOk);
+ CString text = m_filtersList.GetItemText(0, 0);
+ m_editRegexp.SetWindowText(text);
+ }
+ UpdateData(FALSE);
+}
+
/// User clicked the ignore checkbox
void CPropLineFilter::OnIgnoreregexp()
{
UpdateData();
- // enable or disable the edit box according to
- // the value of the check box
- m_cPattern.EnableWindow(m_bIgnoreRegExp);
- if (m_bIgnoreRegExp)
- m_cPattern.SetFocus();
}
/** @brief Open help from mainframe when user presses F1*/
@@ -88,3 +127,172 @@
{
GetMainFrame()->ShowHelp(FilterHelpLocation);
}
+
+/**
+ * @brief Add new row to the list control.
+ * @param [in] Filter string to add.
+ * @param [in] enabled Is filter enabled?
+ * @return Index of added row.
+ */
+int CPropLineFilter::AddRow(LPCTSTR filter /*= NULL*/, BOOL enabled /*=FALSE*/)
+{
+ int items = m_filtersList.GetItemCount();
+ int ind = m_filtersList.InsertItem(items + 1, filter);
+ m_filtersList.SetCheck(ind, enabled);
+ return ind;
+}
+
+/**
+ * @brief Edit currently selected filter.
+ */
+void CPropLineFilter::EditSelectedFilter()
+{
+ int sel =- 1;
+ m_filtersList.SetFocus();
+ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ if (sel > -1)
+ {
+/* CEdit * pEdit = m_filtersList.EditLabel(sel);
+ if (pEdit)
+ {
+ pEdit->SetFocus();
+ }
+*/
+ CString text = m_filtersList.GetItemText(sel, 0);
+ m_editRegexp.SetWindowText(text);
+ m_editRegexp.SetReadOnly(FALSE);
+ m_saveRegexp.EnableWindow(TRUE);
+ m_editRegexp.SetFocus();
+ m_editRegexp.SetSel(0, -1);
+ m_bEditing = TRUE;
+ }
+}
+
+/**
+ * @brief Called when Add-button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterAddBtn()
+{
+ int ind = AddRow(_T(""));
+ if (ind >= -1)
+ {
+ m_filtersList.SetItemState(ind, LVIS_SELECTED, LVIS_SELECTED);
+ BOOL bPartialOk = FALSE;
+ m_filtersList.EnsureVisible(ind, bPartialOk);
+ EditSelectedFilter();
+ }
+}
+
+/**
+ * @brief Called when Edit button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterEditbtn()
+{
+ EditSelectedFilter();
+}
+
+/**
+ * @brief Save filters to list when exiting the dialog.
+ */
+void CPropLineFilter::OnOK()
+{
+ m_pList->Empty();
+
+ for (int i = 0; i < m_filtersList.GetItemCount(); i++)
+ {
+ CString text = m_filtersList.GetItemText(i, 0);
+ BOOL enabled = m_filtersList.GetCheck(i);
+
+ m_pList->AddFilter(text, enabled);
+ }
+
+ CPropertyPage::OnClose();
+}
+
+/**
+ * @brief Sets external filter list.
+ * @param [in] list External filter list.
+ */
+void CPropLineFilter::SetList(LineFiltersList * list)
+{
+ m_pList = list;
+}
+
+/**
+ * @brief Called when Remove button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterRemovebtn()
+{
+ int sel =- 1;
+ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ if (sel != -1)
+ {
+ m_filtersList.DeleteItem(sel);
+ }
+
+ int newSel = min(m_filtersList.GetItemCount() - 1, sel);
+ if (newSel >= -1)
+ {
+ m_filtersList.SetItemState(newSel, LVIS_SELECTED, LVIS_SELECTED);
+ BOOL bPartialOk = FALSE;
+ m_filtersList.EnsureVisible(newSel, bPartialOk);
+ }
+}
+
+/**
+ * @brief Called when Save button is clicked.
+ */
+void CPropLineFilter::OnBnClickedLfilterEditsave()
+{
+ ASSERT(m_bEditing);
+
+ int sel =- 1;
+ sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+ if (sel != -1)
+ {
+ CString text;
+ m_editRegexp.GetWindowText(text);
+ m_filtersList.SetItemText(sel, 0, text);
+ }
+ m_bEditing = FALSE;
+ m_editRegexp.SetReadOnly(TRUE);
+ m_saveRegexp.EnableWindow(FALSE);
+}
+
+/**
+ * @brief Cancel editing of filter when ESC is pressed.
+ */
+BOOL CPropLineFilter::PreTranslateMessage(MSG* pMsg)
+{
+ if (m_bEditing)
+ {
+ // Handle Esc key press
+ if (pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE)
+ {
+ m_saveRegexp.EnableWindow(FALSE);
+ m_editRegexp.SetReadOnly(TRUE);
+ m_bEditing = FALSE;
+ m_filtersList.SetFocus();
+ return TRUE;
+ }
+ }
+ return CPropertyPage::PreTranslateMessage(pMsg);
+}
+
+/**
+ * @brief Called when selected item in list changes.
+ */
+void CPropLineFilter::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult)
+{
+ LPNMITEMACTIVATE pNMIA = reinterpret_cast<LPNMITEMACTIVATE>(pNMHDR);
+ int item = pNMIA->iItem;
+ if (m_bEditing)
+ {
+ m_saveRegexp.EnableWindow(FALSE);
+ m_editRegexp.SetReadOnly(TRUE);
+ m_bEditing = FALSE;
+ }
+ CString text = m_filtersList.GetItemText(item, 0);
+ m_editRegexp.SetWindowText(text);
+ *pResult = 0;
+}
Modified: trunk/Src/PropLineFilter.h
===================================================================
--- trunk/Src/PropLineFilter.h 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/PropLineFilter.h 2007-03-17 17:18:05 UTC (rev 4168)
@@ -1,6 +1,8 @@
// PropLineFilter.h : header file
//
+#include "afxcmn.h"
+#include "afxwin.h"
#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
@@ -10,9 +12,11 @@
* @brief Declaration file for Line Filter dialog
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
+class LineFiltersList;
+
/// Class for Line filter propertypage
class CPropLineFilter : public CPropertyPage
{
@@ -23,12 +27,12 @@
CPropLineFilter();
~CPropLineFilter();
+ void SetList(LineFiltersList * list);
+
// Dialog Data
//{{AFX_DATA(CPropLineFilter)
enum { IDD = IDD_PROPPAGE_FILTER };
- CEdit m_cPattern;
BOOL m_bIgnoreRegExp;
- CString m_sPattern;
//}}AFX_DATA
// Implementation
@@ -48,9 +52,27 @@
virtual BOOL OnInitDialog();
afx_msg void OnIgnoreregexp();
afx_msg void OnHelp();
+ virtual void OnOK();
+ afx_msg void OnBnClickedLfilterAddBtn();
+ afx_msg void OnBnClickedLfilterEditbtn();
+ afx_msg void OnBnClickedLfilterRemovebtn();
+ virtual BOOL PreTranslateMessage(MSG* pMsg);
+ afx_msg void OnBnClickedLfilterEditsave();
+ afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
+ void InitList();
+ int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
+ void EditSelectedFilter();
+
+private:
+ CListCtrl m_filtersList; /**< List control having filter strings */
+ CEdit m_editRegexp; /**< Editbox for editing filter */
+ CButton m_saveRegexp; /**< Button for saving edited filter */
+
+ LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
+ BOOL m_bEditing; /**< Are we editing a filter string? */
};
//{{AFX_INSERT_LOCATION}}
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-03-16 22:05:46 UTC (rev 4167)
+++ trunk/Src/resource.h 2007-03-17 17:18:05 UTC (rev 4168)
@@ -410,6 +410,13 @@
#define IDC_FLDCONFIRM_TO_TEXT 1324
#define IDC_FLDCONFIRM_FROM_PATH 1325
#define IDC_FLDCONFIRM_ICON 1326
+#define IDC_LFILTER_LIST 1327
+#define IDC_LFILTER_ADDBTN 1328
+#define IDC_LFILTER_EDITBTN 1329
+#define IDC_LFILTER_EDITBOX 1330
+#define IDC_LFILTER_REMOVEBTN 1331
+#define IDC_BUTTON2 1332
+#define IDC_LFILTER_EDITSAVE 1333
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
@@ -493,8 +500,9 @@
#define IDS_FILEFILTER_INSTALL 16459
#define IDS_FILEFILTER_INSTALLFAIL 16460
#define IDS_FILEFILTER_OVERWRITE 16461
-#define IDS_CC_CMD 16464
-#define IDS_VSS_CMD 16465
+#define IDS_FILTERLINE_REGEXP 16480
+#define IDS_CC_CMD 16720
+#define IDS_VSS_CMD 16721
#d...
[truncated message content] |
|
From: <ki...@us...> - 2007-03-18 12:03:00
|
Revision: 4167
http://svn.sourceforge.net/winmerge/?rev=4167&view=rev
Author: kimmov
Date: 2007-03-16 15:05:46 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Trivial string initialization fix
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/SyntaxColors.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-15 20:37:36 UTC (rev 4166)
+++ trunk/Src/Changes.txt 2007-03-16 22:05:46 UTC (rev 4167)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-15 Kimmo
+ Trivial string initialization fix
+ Src: SyntaxColors.cpp
+
2007-03-13 Kimmo
PATCH: [ 1679196 ] Cleanup logfile class usage
Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp FolderCmp.cpp MainFrm.cpp
Modified: trunk/Src/SyntaxColors.cpp
===================================================================
--- trunk/Src/SyntaxColors.cpp 2007-03-15 20:37:36 UTC (rev 4166)
+++ trunk/Src/SyntaxColors.cpp 2007-03-16 22:05:46 UTC (rev 4167)
@@ -186,12 +186,11 @@
void SyntaxColors::Initialize(COptionsMgr *pOptionsMgr)
{
ASSERT(pOptionsMgr);
- CString valuename;
+ CString valuename(DefColorsPath);
m_pOptionsMgr = pOptionsMgr;
int count = COLORINDEX_COUNT;
- valuename = DefColorsPath;
valuename += _T("/Values");
m_pOptionsMgr->InitOption(valuename, count);
@@ -238,11 +237,10 @@
void SyntaxColors::SaveToRegistry()
{
ASSERT(m_pOptionsMgr);
- CString valuename;
+ CString valuename(DefColorsPath);
int count = COLORINDEX_COUNT;
- valuename = DefColorsPath + '/';
- valuename += _T("Values");
+ valuename += _T("/Values");
m_pOptionsMgr->SetInt(valuename, count);
for (unsigned int i = COLORINDEX_NONE; i < COLORINDEX_LAST; i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-19 01:18:48
|
Revision: 4169
http://svn.sourceforge.net/winmerge/?rev=4169&view=rev
Author: kimmov
Date: 2007-03-17 14:11:55 -0700 (Sat, 17 Mar 2007)
Log Message:
-----------
BUG: [ 1682500 ] Crash when comparing empty folders
- Reported and analyzed by Takashi
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirScan.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-17 17:18:05 UTC (rev 4168)
+++ trunk/Src/Changes.txt 2007-03-17 21:11:55 UTC (rev 4169)
@@ -7,6 +7,9 @@
Src: DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc Merge.rc MergeDoc.cpp OptionsDef.h
OptionsInit.cpp PropLineFilter.cpp PropLineFilter.h
Src/Languages/*: Merge*.rc
+ BUG: [ 1682500 ] Crash when comparing empty folders
+ Reported and analyzed by Takashi
+ Src: DirScan.cpp
2007-03-15 Kimmo
Trivial string initialization fix
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-03-17 17:18:05 UTC (rev 4168)
+++ trunk/Src/DirScan.cpp 2007-03-17 21:11:55 UTC (rev 4169)
@@ -317,10 +317,15 @@
// Now we would end the loop, while there are still items in the list.
// So to be sure, lets try again with "last" item, if there are more
// items!
- EnterCriticalSection(&pCtxt->m_criticalSect);
- list->GetNextDiffPosition(prevPos);
- LeaveCriticalSection(&pCtxt->m_criticalSect);
+ // Check that we have items in the list (maybe it was empty folder?)
+ if (list->GetFirstDiffPosition())
+ {
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ list->GetNextDiffPosition(prevPos);
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
+ }
+
if (prevPos != NULL)
{
pos = prevPos;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-19 18:54:47
|
Revision: 4174
http://svn.sourceforge.net/winmerge/?rev=4174&view=rev
Author: kimmov
Date: 2007-03-19 11:37:12 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
Remove extra line from manifest file
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/res/WinMergeU.exe.manifest
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-19 18:32:27 UTC (rev 4173)
+++ trunk/Src/Changes.txt 2007-03-19 18:37:12 UTC (rev 4174)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-19 Kimmo
+ Remove extra line from manifest file
+ Src/res: WinMergeU.exe.manifest
+
2007-03-18 Kimmo
PATCH: [ 1682475 ] Improve Line filters dialog (add new files I forgot to add)
Src: Merge.dsp
Modified: trunk/Src/res/WinMergeU.exe.manifest
===================================================================
--- trunk/Src/res/WinMergeU.exe.manifest 2007-03-19 18:32:27 UTC (rev 4173)
+++ trunk/Src/res/WinMergeU.exe.manifest 2007-03-19 18:37:12 UTC (rev 4174)
@@ -19,7 +19,7 @@
</security>
</trustInfo>
- <dependency>
+ <dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
@@ -31,5 +31,4 @@
/>
</dependentAssembly>
</dependency>
- <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</assembly>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-19 23:05:13
|
Revision: 4176
http://svn.sourceforge.net/winmerge/?rev=4176&view=rev
Author: gerundt
Date: 2007-03-19 13:32:20 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
PATCH: [ 1683289 ] Swedish translation update for Improve Line filters dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Swedish/MergeSwedish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-19 19:59:15 UTC (rev 4175)
+++ trunk/Src/Changes.txt 2007-03-19 20:32:20 UTC (rev 4176)
@@ -6,6 +6,9 @@
PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
Based on icons by Alexander Skinner
Src/res: copy.bmp cut.bmp language.bmp paste.bmp print.bmp select_all.bmp select_font.bmp
+ PATCH: [ 1683289 ] Swedish translation update for Improve Line filters dialog
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
2007-03-19 Kimmo
Remove extra line from manifest file
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-19 19:59:15 UTC (rev 4175)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-19 20:32:20 UTC (rev 4176)
@@ -858,10 +858,10 @@
LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,8,39,350,105
EDITTEXT IDC_LFILTER_EDITBOX,7,149,296,14,ES_AUTOHSCROLL |
ES_READONLY
- PUSHBUTTON "Save",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
- PUSHBUTTON "New",IDC_LFILTER_ADDBTN,7,167,50,14
- PUSHBUTTON "Edit",IDC_LFILTER_EDITBTN,62,167,50,14
- PUSHBUTTON "Remove",IDC_LFILTER_REMOVEBTN,116,167,50,14
+ PUSHBUTTON "Spara",IDC_LFILTER_EDITSAVE,308,148,50,14,WS_DISABLED
+ PUSHBUTTON "Ny",IDC_LFILTER_ADDBTN,7,167,50,14
+ PUSHBUTTON "\xC4ndra",IDC_LFILTER_EDITBTN,62,167,50,14
+ PUSHBUTTON "Ta bort",IDC_LFILTER_REMOVEBTN,116,167,50,14
END
IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
@@ -2072,7 +2072,7 @@
// LINEFILTER STRINGS
STRINGTABLE
BEGIN
- IDS_FILTERLINE_REGEXP "Regular expression"
+ IDS_FILTERLINE_REGEXP "Regulj\xE4ra uttryck"
END
// VERSION CONTROL OPTIONS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-19 23:09:59
|
Revision: 4175
http://svn.sourceforge.net/winmerge/?rev=4175&view=rev
Author: gerundt
Date: 2007-03-19 12:59:15 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/res/copy.bmp
trunk/Src/res/cut.bmp
trunk/Src/res/language.bmp
trunk/Src/res/paste.bmp
trunk/Src/res/print.bmp
trunk/Src/res/select_all.bmp
trunk/Src/res/select_font.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-19 18:37:12 UTC (rev 4174)
+++ trunk/Src/Changes.txt 2007-03-19 19:59:15 UTC (rev 4175)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-19 Tim
+ PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
+ Based on icons by Alexander Skinner
+ Src/res: copy.bmp cut.bmp language.bmp paste.bmp print.bmp select_all.bmp select_font.bmp
+
2007-03-19 Kimmo
Remove extra line from manifest file
Src/res: WinMergeU.exe.manifest
Modified: trunk/Src/res/copy.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/cut.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/language.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/paste.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/print.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/select_all.bmp
===================================================================
(Binary files differ)
Modified: trunk/Src/res/select_font.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-20 15:48:06
|
Revision: 4177
http://svn.sourceforge.net/winmerge/?rev=4177&view=rev
Author: kimmov
Date: 2007-03-20 08:45:48 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
PATCH: [ 1683805 ] Remove unneeded linefilter registry values
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/OptionsMgr.cpp
trunk/Src/Common/OptionsMgr.h
trunk/Src/LineFiltersList.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-19 20:32:20 UTC (rev 4176)
+++ trunk/Src/Changes.txt 2007-03-20 15:45:48 UTC (rev 4177)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-20 Kimmo
+ PATCH: [ 1683805 ] Remove unneeded linefilter registry values
+ Src: LineFiltersList.cpp
+ Src/Common: OptionsMgr.cpp OptionsMgr.h
+
2007-03-19 Tim
PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
Based on icons by Alexander Skinner
Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp 2007-03-19 20:32:20 UTC (rev 4176)
+++ trunk/Src/Common/OptionsMgr.cpp 2007-03-20 15:45:48 UTC (rev 4177)
@@ -4,7 +4,7 @@
* @brief Implementation of Options management classes
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
@@ -374,6 +374,24 @@
return SaveOption(name, xvalue);
}
+int COptionsMgr::RemoveOption(LPCTSTR name)
+{
+ COption tmpOption;
+ int retVal = OPT_OK;
+
+ BOOL optionFound = m_optionsMap.Lookup(name, tmpOption);
+ if (optionFound)
+ {
+ BOOL succeeded = m_optionsMap.RemoveKey(name);
+ if (!succeeded)
+ retVal = OPT_NOTFOUND;
+ }
+ else
+ retVal = OPT_NOTFOUND;
+
+ return retVal;
+}
+
/**
* @brief Reset option value to default
*/
@@ -898,7 +916,7 @@
varprop::VariantValue value;
CString strPath;
CString strValueName;
- CString strRegPath = m_registryRoot;
+ CString strRegPath(m_registryRoot);
HKEY hKey = NULL;
LONG retValReg = 0;
int valType = varprop::VT_NULL;
@@ -1000,6 +1018,35 @@
return retVal;
}
+int CRegOptionsMgr::RemoveOption(LPCTSTR name)
+{
+ HKEY hKey = NULL;
+ LONG retValReg = 0;
+ int retVal = OPT_OK;
+ CString strRegPath(m_registryRoot);
+ CString strPath;
+ CString strValueName;
+
+ SplitName(name, strPath, strValueName);
+ strRegPath += strPath;
+
+ retValReg = RegOpenKey(HKEY_CURRENT_USER, (LPCTSTR)strRegPath, &hKey);
+ if (retValReg == ERROR_SUCCESS)
+ {
+ retValReg = RegDeleteValue(hKey, strValueName);
+ if (retValReg != ERROR_SUCCESS)
+ {
+ retVal = OPT_ERR;
+ }
+ RegCloseKey(hKey);
+ }
+ else
+ retVal = OPT_ERR;
+
+ return retVal;
+
+}
+
/**
* @brief Set registry root path for options.
*
Modified: trunk/Src/Common/OptionsMgr.h
===================================================================
--- trunk/Src/Common/OptionsMgr.h 2007-03-19 20:32:20 UTC (rev 4176)
+++ trunk/Src/Common/OptionsMgr.h 2007-03-20 15:45:48 UTC (rev 4177)
@@ -4,7 +4,7 @@
* @brief Interface for Options management classes
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
/* The MIT License
@@ -102,6 +102,8 @@
virtual int SaveOption(LPCTSTR name, UINT value);
virtual int SaveOption(LPCTSTR name, COLORREF value);
+ virtual int RemoveOption(LPCTSTR name);
+
virtual int ExportOptions(CString filename);
virtual int ImportOptions(CString filename);
@@ -134,6 +136,8 @@
virtual int SaveOption(LPCTSTR name, int value);
virtual int SaveOption(LPCTSTR name, bool value);
+ virtual int RemoveOption(LPCTSTR name);
+
virtual void SetSerializing(bool serializing=true) { m_serializing = serializing; }
protected:
Modified: trunk/Src/LineFiltersList.cpp
===================================================================
--- trunk/Src/LineFiltersList.cpp 2007-03-19 20:32:20 UTC (rev 4176)
+++ trunk/Src/LineFiltersList.cpp 2007-03-20 15:45:48 UTC (rev 4177)
@@ -183,4 +183,19 @@
m_pOptionsMgr->InitOption(valuename, 0);
m_pOptionsMgr->SaveOption(valuename, (int)item.enabled);
}
+
+ // Remove options we don't need anymore
+ // We could have earlier 10 pcs but now we only need 5
+ valuename.Format(_T("%s/Filter%02u"), FiltersRegPath, count);
+ int retval1 = m_pOptionsMgr->RemoveOption(valuename);
+ valuename.Format(_T("%s/Enabled%02u"), FiltersRegPath, count);
+ int retval2 = m_pOptionsMgr->RemoveOption(valuename);
+ while (retval1 == OPT_OK || retval2 == OPT_OK)
+ {
+ ++count;
+ valuename.Format(_T("%s/Filter%02u"), FiltersRegPath, count);
+ retval1 = m_pOptionsMgr->RemoveOption(valuename);
+ valuename.Format(_T("%s/Enabled%02u"), FiltersRegPath, count);
+ retval2 = m_pOptionsMgr->RemoveOption(valuename);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-20 18:46:20
|
Revision: 4178
http://svn.sourceforge.net/winmerge/?rev=4178&view=rev
Author: kimmov
Date: 2007-03-20 08:54:57 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
PATCH: [ 1683842 ] Allow resizing copy confirmation dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ConfirmFolderCopyDlg.cpp
trunk/Src/ConfirmFolderCopyDlg.h
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Changes.txt 2007-03-20 15:54:57 UTC (rev 4178)
@@ -6,6 +6,9 @@
PATCH: [ 1683805 ] Remove unneeded linefilter registry values
Src: LineFiltersList.cpp
Src/Common: OptionsMgr.cpp OptionsMgr.h
+ PATCH: [ 1683842 ] Allow resizing copy confirmation dialog
+ Src: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h Merge.rc
+ Src/Languages/*: Merge*.rc
2007-03-19 Tim
PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
Modified: trunk/Src/ConfirmFolderCopyDlg.cpp
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.cpp 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/ConfirmFolderCopyDlg.cpp 2007-03-20 15:54:57 UTC (rev 4178)
@@ -82,6 +82,20 @@
CStatic * pIcon = (CStatic *) GetDlgItem(IDC_FLDCONFIRM_ICON);
pIcon->SetIcon(icon);
+ // setup handler for resizing this dialog
+ m_constraint.InitializeCurrentSize(this);
+ // configure how individual controls adjust when dialog resizes
+ m_constraint.ConstrainItem(IDC_FLDCONFIRM_FROM_PATH, 0, 1, 0, 0); // grows right
+ m_constraint.ConstrainItem(IDC_FLDCONFIRM_TO_PATH, 0, 1, 0, 0); // grows right
+ // IDC_SAVECLOSING_DISCARDALL doesn't move
+ m_constraint.ConstrainItem(IDYES, 1, 0, 0, 0); // slides right
+ m_constraint.ConstrainItem(IDNO, 1, 0, 0, 0); // slides right
+ m_constraint.DisallowHeightGrowth();
+ m_constraint.SubclassWnd(); // install subclassing
+ // persist size via registry
+ m_constraint.LoadPosition(_T("ResizeableDialogs"), _T("FolderCopyConfirmDlg"), false);
+
+
return FALSE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
Modified: trunk/Src/ConfirmFolderCopyDlg.h
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.h 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/ConfirmFolderCopyDlg.h 2007-03-20 15:54:57 UTC (rev 4178)
@@ -22,6 +22,11 @@
// ID line follows -- this is updated by SVN
// $Id: $
+#ifndef CMoveConstraint_h
+#include "CMoveConstraint.h"
+#endif
+
+
/**
* @brief Dialog for item copy confirmation.
*/
@@ -50,4 +55,7 @@
CString m_toPath;
afx_msg void OnBnClickedNo();
afx_msg void OnBnClickedYes();
+
+private:
+ prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */
};
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1604,8 +1604,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Potvrdit kop\xEDrov\xE1n\xED"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1601,8 +1601,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1601,8 +1601,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Bekr\xE4fta kopiering"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1603,8 +1603,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-03-20 15:45:48 UTC (rev 4177)
+++ trunk/Src/Merge.rc 2007-03-20 15:54:57 UTC (rev 4178)
@@ -1613,8 +1613,8 @@
END
IDD_CONFIRM_COPY DIALOGEX 0, 0, 285, 100
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
- WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME
CAPTION "Confirm Copy"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-03-21 18:41:39
|
Revision: 4182
http://svn.sourceforge.net/winmerge/?rev=4182&view=rev
Author: galh
Date: 2007-03-21 11:31:23 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
BUG: [ 1491334 ] thinly highlighted position is wrong
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/stringdiffs.cpp
trunk/Src/stringdiffsi.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-21 13:08:53 UTC (rev 4181)
+++ trunk/Src/Changes.txt 2007-03-21 18:31:23 UTC (rev 4182)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-21 Gal
+ BUG: [ 1491334 ] thinly highlighted position is wrong
+ Src: stringdiffs.cpp stringdiffsi.h
+
2007-03-20 WinMerge experimental release 2.7.3.1 (SVN revision 4179)
2007-03-20 Kimmo
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2007-03-21 13:08:53 UTC (rev 4181)
+++ trunk/Src/stringdiffs.cpp 2007-03-21 18:31:23 UTC (rev 4182)
@@ -35,8 +35,6 @@
// Hash all words in both lines and then compare them word by word
// storing differences into m_wdiffs
sdiffs.BuildWordDiffList();
- // Now copy m_wdiffs into caller-supplied m_pDiffs (coalescing adjacents if possible)
- sdiffs.PopulateDiffs();
// Adjust the range of the word diff down to byte level.
if (byte_level)
wordLevelToByteLevel(pDiffs, str1, str2, case_sensitive, whitespace);
@@ -57,242 +55,86 @@
{
}
+
/**
- * @brief Add all different elements between lines to the wdiff list
- */
-void
-stringdiffs::BuildWordDiffList()
+* @brief Add all different elements between lines to the m_pDiffs list.
+*/
+void stringdiffs::BuildWordDiffList()
{
BuildWordsArray(m_str1, &m_words1);
BuildWordsArray(m_str2, &m_words2);
- int w1=0, w2=0; // next word
- int bw1, bw2; // internal temporaries
+ INT_PTR nWordsCount = min(m_words1.GetSize(), m_words2.GetSize());
+ INT_PTR nDiffStartAtWord = -1;
+ INT_PTR nWord;
+ bool bInWordDiff = false;
-// We don't have a difference accumulated right now
-insame:
- if (w1 == m_words1.GetSize() || w2 == m_words2.GetSize())
+ // Compare each word against its matching word on the second list. Each
+ // difference starts from the first non-matching word and ends in the
+ // predecessor of the first matching word.
+ for (nWord = 0; nWord < nWordsCount; ++nWord)
{
- int i1 = (w1>0 ? m_words1[w1-1].end+1 : 0); // after end of word before w1
- int i2 = (w2>0 ? m_words2[w2-1].end+1 : 0); // after end of word before w2
- // Done, but handle trailing spaces
- while (i1 < m_str1.GetLength() && i2 < m_str2.GetLength()
- && isSafeWhitespace(m_str1[i1]) && isSafeWhitespace(m_str2[i2]))
+ if (!bInWordDiff)
{
- if (m_whitespace==0)
+ if (!AreWordsSame(m_words1[nWord], m_words2[nWord]))
{
- // Compare all whitespace
- if (!caseMatch(m_str1[i1], m_str2[i2]))
- break;
+ nDiffStartAtWord = nWord;
+ bInWordDiff = true;
}
- ++i1;
- ++i2;
}
- if (i1 != m_str1.GetLength() || i2 != m_str2.GetLength())
+ else
{
- wdiff wdf(i1, m_str1.GetLength()-1, i2, m_str2.GetLength()-1);
- m_wdiffs.Add(wdf);
- }
- return;
- }
- // Check whitespace before current words for difference, if appropriate
- if (m_whitespace==0)
- {
- // Compare all whitespace
- int i1 = (w1>0 ? m_words1[w1-1].end+1 : 0); // after end of word before w1
- int i2 = (w2>0 ? m_words2[w2-1].end+1 : 0); // after end of word before w2
- while (i1<m_words1[w1].start || i2<m_words2[w2].start)
- {
- if (i1==m_words1[w1].start || i2==m_words2[w2].start
- || m_str1[i1] != m_str2[i2])
+ if (AreWordsSame(m_words1[nWord], m_words2[nWord]))
{
- // Found a difference
- break;
+ INT_PTR nDiffEndAtWord = nWord - 1;
+ AddWordDiff(nDiffStartAtWord, nWord - 1);
+ bInWordDiff = false;
}
- // Not difference, keep looking
- ++i1;
- ++i2;
}
- if (i1<m_words1[w1].start || i2<m_words2[w2].start)
- {
- // Found a difference
- // Now backtrack from next word to find end of difference
- int e1 = m_words1[w1].start-1;
- int e2 = m_words2[w2].start-1;
- while (e1>i1 && e2>i2)
- {
- if (m_str1[e1] != m_str2[e2])
- {
- // Found a difference
- break;
- }
- // Not difference, keep looking
- --e1;
- --e2;
- }
- // Add the difference we've found
- wdiff wdf(i1, e1, i2, e2);
- m_wdiffs.Add(wdf);
- }
-
}
- // Now check current words for difference
- if (!AreWordsSame(m_words1[w1], m_words2[w2]))
- goto startdiff;
- ++w1;
- ++w2;
- goto insame; // safe even if at the end of one line's words
-// Just beginning a difference
-startdiff:
- bw1 = w1;
- bw2 = w2;
-
-// Currently in a difference
-// Actually we don't have a label here, because we don't loop to here
-// We always find the end of the difference and jump straight to it
-
- if (!findSync(&w1, &w2))
+ // Ops, we left an open word difference, better close it. This could
+ // happen when there is only one difference. Either a line with a single
+ // word or reaching end of line without finding matching word.
+ if (bInWordDiff)
{
- // Add a diff from bw1 & bw2 to end of both lines
- int s1 = m_words1[bw1].start;
- int e1 = m_words1[m_words1.GetUpperBound()].end;
- int s2 = m_words2[bw2].start;
- int e2 = m_words2[m_words2.GetUpperBound()].end;
- wdiff wdf(s1, e1, s2, e2);
- m_wdiffs.Add(wdf);
- // Now skip directly to end of last word in each line
- w1 = m_words1.GetSize();
- w2 = m_words2.GetSize();
- // go to process trailing spaces and quit
- goto insame;
+ INT_PTR nDiffEndAtWord = nWord - 1;
+ AddWordDiff(nDiffStartAtWord, nWord - 1);
}
- else
- {
- // NB: To get into indiff, must be at least one different word
- // To reach here, must also be be a sync
- // So there is a word at the start of this diff, and a word after us
- // w1 is valid because it is the word after us
- // w1-1 >= bw1 is valid because it is the word at the start of this diff
- // Add a diff from start to just before sync word
- int s1 = m_words1[bw1].start;
- int e1 = 0; // placeholder, set below
- int s2 = m_words2[bw2].start;
- int e2 = 0; // placeholder, set below
- if (m_whitespace == 0)
- {
- // Grab all the trailing whitespace for our diff
- e1 = m_words1[w1].start-1;
- e2 = m_words2[w2].start-1;
- // Now backtrack over matching whitespace
- int pe1 = (w1 ? m_words1[w1-1].end : -1);
- int pe2 = (w2 ? m_words2[w2-1].end : -1);
- while (e1 > pe1
- && e2 > pe2
- && m_str1[e1] == m_str2[e2])
- {
- --e1;
- --e2;
- }
- }
- else
- {
- // ignore whitespace, so leave it out of diff
- e1 = (w1 ? m_words1[w1-1].end+1 : -1);
- e2 = (w2 ? m_words2[w2-1].end+1 : -1);
- }
- wdiff wdf(s1, e1, s2, e2);
- m_wdiffs.Add(wdf);
- // skip past sync words (which we already know match)
- ++w1;
- ++w2;
- // go process sync
- goto insame; // safe even if at the end of one line's words
- }
-}
-
-/**
- * @brief Find closest matching word
- */
-bool
-stringdiffs::findSync(int *w1, int *w2) const
-{
- // Look among remaining words in m_words2 for a word that matches w1
- int cw2 = -1;
- while (*w1 < m_words1.GetSize())
+ // Handle the case where word lists are not in the same size.
+ if (nWordsCount < m_words1.GetSize())
{
- cw2 = FindNextMatchInWords2(m_words1[*w1], *w2);
- if (cw2>=0)
- break;
- // No word matches w1
- ++(*w1);
+ // Left side has more words.
+ AddDiff(m_words1[nWordsCount].start,
+ m_words1[m_words1.GetUpperBound()].end,
+ m_str2.GetLength(), -1);
}
- // Look among remaining words in m_words1 for a word that matches w2
- int cw1 = -1;
- while (*w2 < m_words2.GetSize())
+ else if (nWordsCount < m_words2.GetSize())
{
- cw1 = FindNextMatchInWords1(m_words2[*w2], *w1);
- if (cw1>=0)
- break;
- // No word matches w2
- ++(*w2);
+ // Right side has more words.
+ AddDiff(m_str1.GetLength(), -1,
+ m_words2[nWordsCount].start,
+ m_words2[m_words2.GetUpperBound()].end);
}
- if (cw1 == -1)
- {
- if (cw2 ==-1)
- return false;
- *w2 = cw2;
- }
- else
- {
- if (cw2 ==-1)
- {
- *w1 = cw1;
- }
- else
- {
- // We have candidates advancing along either string
- // Pick closer
- int len1 = m_words1[cw1].end - m_words1[*w1].start;
- int len2 = m_words2[cw2].end - m_words2[*w2].start;
- if (len1 < len2)
- *w1 = cw1;
- else
- *w2 = cw2;
- }
- }
- return true;
}
/**
- * @brief Find next word in m_words2 (starting at bw2) that matches needword1 (in m_words1)
- */
-int
-stringdiffs::FindNextMatchInWords2(const word & needword1, int bw2) const
+* @brief Add a difference using offsets.
+*/
+void stringdiffs::AddDiff(int s1, int e1, int s2, int e2)
{
- while (bw2 < m_words2.GetSize())
- {
- if (AreWordsSame(needword1, m_words2[bw2]))
- return bw2;
- ++bw2;
- }
- return -1;
+ wdiff wdf(s1, e1, s2, e2);
+ m_pDiffs->Add(wdf);
}
/**
- * @brief Find next word in m_words1 (starting at bw1) that matches needword2 (in m_words2)
- */
-int
-stringdiffs::FindNextMatchInWords1(const word & needword2, int bw1) const
+* @brief Add a difference using words range.
+*/
+void stringdiffs::AddWordDiff(int start, int end)
{
- while (bw1 < m_words1.GetSize())
- {
- if (AreWordsSame(m_words1[bw1], needword2))
- return bw1;
- ++bw1;
- }
- return -1;
+ AddDiff(m_words1[start].start, m_words1[end].end,
+ m_words2[start].start, m_words2[end].end);
}
/**
@@ -351,42 +193,6 @@
goto inword; // safe even if we're at the end or no longer in a word
}
-/**
- * @brief Populate m_pDiffs from m_wdiffs (combining adjacent diffs)
- *
- * Doing the combining of adjacent diffs here keeps some complexity out of BuildWordsArray.
- */
-void
-stringdiffs::PopulateDiffs()
-{
- for (int i=0; i<m_wdiffs.GetSize(); ++i)
- {
- bool skipIt = false;
- // combine it with next ?
- if (i+1<m_wdiffs.GetSize())
- {
- if (m_wdiffs[i].end[0] == m_wdiffs[i+1].start[0]
- && m_wdiffs[i].end[1] == m_wdiffs[i+1].start[1])
- {
- // diff[i] and diff[i+1] are contiguous
- // so combine them into diff[i+1] and ignore diff[i]
- m_wdiffs[i+1].start[0] = m_wdiffs[i].start[0];
- m_wdiffs[i+1].start[1] = m_wdiffs[i].start[1];
- skipIt = true;
- }
- }
- if (!skipIt)
- {
- // Should never have a pair where both are missing
- ASSERT(m_wdiffs[i].start[0]>=0 || m_wdiffs[i].start[1]>=0);
-
- // Store the diff[i] in the caller list (m_pDiffs)
- wdiff dr(m_wdiffs[i]);
- m_pDiffs->Add(dr);
- }
- }
-}
-
// diffutils hash
/* Rotate a value n bits to the left. */
Modified: trunk/Src/stringdiffsi.h
===================================================================
--- trunk/Src/stringdiffsi.h 2007-03-21 13:08:53 UTC (rev 4181)
+++ trunk/Src/stringdiffsi.h 2007-03-21 18:31:23 UTC (rev 4182)
@@ -21,7 +21,6 @@
wdiffarray * pDiffs);
void BuildWordDiffList();
- void PopulateDiffs();
// Implementation types
private:
@@ -38,11 +37,9 @@
// Implementation methods
private:
+ void AddDiff(int s1, int e1, int s2, int e2);
+ void AddWordDiff(int w1, int w2);
void BuildWordsArray(const CString & str, wordarray * words);
- bool findSync(int *w1, int *w2) const;
- int FindNextMatchInWords2(const word & needword1, int bw2) const;
- int FindNextMatchInWords1(const word & needword2, int bw1) const;
-
int hash(const CString & str, int begin, int end) const;
bool AreWordsSame(const word & word1, const word & word2) const;
bool caseMatch(TCHAR ch1, TCHAR ch2) const;
@@ -57,7 +54,6 @@
wdiffarray * m_pDiffs;
wordarray m_words1;
wordarray m_words2;
- wdiffarray m_wdiffs;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-03-21 19:33:15
|
Revision: 4183
http://svn.sourceforge.net/winmerge/?rev=4183&view=rev
Author: galh
Date: 2007-03-21 12:33:10 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
trunk/Src/ChildFrm.h
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-21 18:31:23 UTC (rev 4182)
+++ trunk/Src/Changes.txt 2007-03-21 19:33:10 UTC (rev 4183)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2007-03-21 Gal
+ RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
+ Src: ChildFrm.cpp ChildFrm.h MergeDoc.cpp
+
+2007-03-21 Gal
BUG: [ 1491334 ] thinly highlighted position is wrong
Src: stringdiffs.cpp stringdiffsi.h
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2007-03-21 18:31:23 UTC (rev 4182)
+++ trunk/Src/ChildFrm.cpp 2007-03-21 19:33:10 UTC (rev 4183)
@@ -100,6 +100,8 @@
#pragma warning(disable:4355) // 'this' : used in base member initializer list
: m_leftStatus(this, PANE_LEFT_INFO)
, m_rightStatus(this, PANE_RIGHT_INFO)
+, m_hIdentical(NULL)
+, m_hDifferent(NULL)
#pragma warning(default:4355)
{
m_bActivated = FALSE;
@@ -294,6 +296,9 @@
m_wndStatusBar.SetPaneText(PANE_LEFT_RO, sText, TRUE);
m_wndStatusBar.SetPaneText(PANE_RIGHT_RO, sText, TRUE);
+ m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALFILE);
+ m_hDifferent = AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE);
+
SetTimer(0, 250, NULL); // used to update the title headers
return 0;
}
@@ -459,6 +464,19 @@
GetWindowPlacement(&wp);
theApp.WriteProfileInt(_T("Settings"), _T("ActiveFrameMax"), (wp.showCmd == SW_MAXIMIZE));
}
+
+ if (m_hIdentical != NULL)
+ {
+ DestroyIcon(m_hIdentical);
+ m_hIdentical = NULL;
+ }
+
+ if (m_hDifferent != NULL)
+ {
+ DestroyIcon(m_hDifferent);
+ m_hDifferent = NULL;
+ }
+
return CMDIChildWnd::DestroyWindow();
}
@@ -557,6 +575,33 @@
return &m_wndFilePathBar;
}
+/**
+* @brief Reflect comparison result in window's icon.
+* @param nResult [in] Last comparison result which the application returns.
+*/
+void CChildFrame::SetLastCompareResult(int nResult)
+{
+ HICON hCurrent = GetIcon(FALSE);
+ HICON hReplace = (nResult == 0) ? m_hIdentical : m_hDifferent;
+
+ if (hCurrent != hReplace)
+ {
+ SetIcon(hReplace, FALSE);
+
+ BOOL bMaximized;
+ GetMDIFrame()->MDIGetActive(&bMaximized);
+
+ // When MDI maximized the window icon is drawn on the menu bar, so we
+ // need to notify it that our icon has changed.
+ if (bMaximized)
+ {
+ GetMDIFrame()->DrawMenuBar();
+ }
+ }
+
+ theApp.SetLastCompareResult(nResult);
+}
+
void CChildFrame::OnTimer(UINT_PTR nIDEvent)
{
if (IsWindowVisible())
Modified: trunk/Src/ChildFrm.h
===================================================================
--- trunk/Src/ChildFrm.h 2007-03-21 18:31:23 UTC (rev 4182)
+++ trunk/Src/ChildFrm.h 2007-03-21 19:33:10 UTC (rev 4183)
@@ -53,6 +53,7 @@
IHeaderBar * GetHeaderInterface();
void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; };
CMergeDoc * GetMergeDoc() { return m_pMergeDoc; }
+ void SetLastCompareResult(int nResult);
// Attributes
protected:
@@ -114,6 +115,8 @@
void UpdateHeaderSizes();
BOOL m_bActivated;
CMergeDoc * m_pMergeDoc;
+ HICON m_hIdentical;
+ HICON m_hDifferent;
//{{AFX_MSG(CChildFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2007-03-21 18:31:23 UTC (rev 4182)
+++ trunk/Src/MergeDoc.cpp 2007-03-21 19:33:10 UTC (rev 4183)
@@ -525,7 +525,7 @@
m_bEditAfterRescan[1] = FALSE;
}
- theApp.SetLastCompareResult(m_diffList.GetSignificantDiffs());
+ GetParentFrame()->SetLastCompareResult(m_diffList.GetSignificantDiffs());
m_pRescanFileInfo[0]->Update(m_filePaths.GetLeft());
m_pRescanFileInfo[1]->Update(m_filePaths.GetRight());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-03-22 11:56:37
|
Revision: 4184
http://svn.sourceforge.net/winmerge/?rev=4184&view=rev
Author: galh
Date: 2007-03-22 04:56:36 -0700 (Thu, 22 Mar 2007)
Log Message:
-----------
RFE: [ 1683061 ] Bug in highlighting
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/stringdiffs.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-21 19:33:10 UTC (rev 4183)
+++ trunk/Src/Changes.txt 2007-03-22 11:56:36 UTC (rev 4184)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-22 Gal
+ RFE: [ 1683061 ] Bug in highlighting
+ Src: stringdiffs.cpp
+
2007-03-21 Gal
RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
Src: ChildFrm.cpp ChildFrm.h MergeDoc.cpp
Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp 2007-03-21 19:33:10 UTC (rev 4183)
+++ trunk/Src/stringdiffs.cpp 2007-03-22 11:56:36 UTC (rev 4184)
@@ -616,7 +616,7 @@
if (begin1 == -1)
{
// no visible diff on side1
- pDiff->end[0] = pDiff->start[0];
+ pDiff->start[0] = str1.GetLength();
}
else
{
@@ -626,7 +626,7 @@
if (begin2 == -1)
{
// no visible diff on side2
- pDiff->end[1] = pDiff->start[1];
+ pDiff->start[1] = str2.GetLength();
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-25 00:39:25
|
Revision: 4186
http://svn.sourceforge.net/winmerge/?rev=4186&view=rev
Author: gerundt
Date: 2007-03-24 17:39:22 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
PATCH: [ 1687439 ] Add MergeProject.ico to WinMerge EXE
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
trunk/Src/Merge.rc
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/res/MergeProject.ico
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-24 12:53:07 UTC (rev 4185)
+++ trunk/Src/Changes.txt 2007-03-25 00:39:22 UTC (rev 4186)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-25 Tim
+ PATCH: [ 1687439 ] Add MergeProject.ico to WinMerge EXE
+ Src: Merge.dsp Merge.rc resource.h
+ Src/res new file: MergeProject.ico
+
2007-03-24 Tim
PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
(Initially without the 256*256 version)
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-03-24 12:53:07 UTC (rev 4185)
+++ trunk/Src/Merge.dsp 2007-03-25 00:39:22 UTC (rev 4186)
@@ -1689,6 +1689,10 @@
# End Source File
# Begin Source File
+SOURCE=.\res\MergeProject.ico
+# End Source File
+# Begin Source File
+
SOURCE=.\res\Merge.rc2
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-03-24 12:53:07 UTC (rev 4185)
+++ trunk/Src/Merge.rc 2007-03-25 00:39:22 UTC (rev 4186)
@@ -81,6 +81,7 @@
// (in Src\res)
IDR_MAINFRAME ICON "res\\Merge.ico"
+IDR_MERGEPROJECT ICON "res\\MergeProject.ico"
IDR_MERGEDOCTYPE ICON "res\\MergeDoc.ico"
IDR_DIRDOCTYPE ICON "res\\MergeDir.ico"
IDI_FOLDER ICON "res\\folder.ico"
Added: trunk/Src/res/MergeProject.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/MergeProject.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-03-24 12:53:07 UTC (rev 4185)
+++ trunk/Src/resource.h 2007-03-25 00:39:22 UTC (rev 4186)
@@ -3,6 +3,7 @@
// Used by Merge.rc
//
#define IDR_MAINFRAME 100
+#define IDR_MERGEPROJECT 101
#define IDR_POPUP_EDITOR_HEADERBAR 102
#define IDR_POPUP_PLUGINS_SETTINGS 103
#define IDR_POPUP_MERGEVIEW 104
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-25 08:19:42
|
Revision: 4188
http://svn.sourceforge.net/winmerge/?rev=4188&view=rev
Author: kimmov
Date: 2007-03-25 01:19:35 -0700 (Sun, 25 Mar 2007)
Log Message:
-----------
BUG: [ 1680920 ] Line filters are not preserved across sessions
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/OptionsMgr.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-25 00:46:50 UTC (rev 4187)
+++ trunk/Src/Changes.txt 2007-03-25 08:19:35 UTC (rev 4188)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-25 Kimmo
+ BUG: [ 1680920 ] Line filters are not preserved across sessions
+ Src/Common: OptionsMgr.cpp
+
2007-03-25 Tim
PATCH: [ 1687439 ] Add MergeProject.ico to WinMerge EXE
Src: Merge.dsp Merge.rc resource.h
Modified: trunk/Src/Common/OptionsMgr.cpp
===================================================================
--- trunk/Src/Common/OptionsMgr.cpp 2007-03-25 00:46:50 UTC (rev 4187)
+++ trunk/Src/Common/OptionsMgr.cpp 2007-03-25 08:19:35 UTC (rev 4188)
@@ -786,6 +786,8 @@
return OPT_ERR;
// Check previous value
+ // This just checks if the value exists, LoadValueFromReg() below actually
+ // loads the value.
DWORD type = 0;
BYTE dataBuf[MAX_PATH] = {0};
DWORD size = MAX_PATH;
@@ -804,7 +806,7 @@
retVal = SaveValueToReg(hKey, strValueName, defaultValue);
}
// Value already exists so read it.
- else if (retValReg == ERROR_SUCCESS)
+ else if (retValReg == ERROR_SUCCESS || ERROR_MORE_DATA)
{
retVal = LoadValueFromReg(hKey, name, defaultValue);
if (retVal == OPT_OK)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
