|
From: <ge...@us...> - 2007-09-12 20:15:23
|
Revision: 4531
http://winmerge.svn.sourceforge.net/winmerge/?rev=4531&view=rev
Author: gerundt
Date: 2007-09-12 13:15:16 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
BUG: [ 1792565 ] Theming broken in 2.7.5.1 and onwards
Modified Paths:
--------------
trunk/Src/Merge.rc
trunk/Src/Merge2.rc
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-09-12 14:47:19 UTC (rev 4530)
+++ trunk/Src/Merge.rc 2007-09-12 20:15:16 UTC (rev 4531)
@@ -60,16 +60,6 @@
#endif // APSTUDIO_INVOKED
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400 && LANGUAGE == LANG_ENGLISH
- #ifdef UNICODE
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest"
- #else
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest"
- #endif
-#endif // MSC_VER
-
-
/////////////////////////////////////////////////////////////////////////////
//
// Menu
Modified: trunk/Src/Merge2.rc
===================================================================
--- trunk/Src/Merge2.rc 2007-09-12 14:47:19 UTC (rev 4530)
+++ trunk/Src/Merge2.rc 2007-09-12 20:15:16 UTC (rev 4531)
@@ -3,6 +3,16 @@
// $Id$
+// Include the manifest file for VC6 and VS2003.Net
+#if _MSC_VER < 1400
+ #ifdef UNICODE
+ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest"
+ #else
+ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest"
+ #endif
+#endif // MSC_VER
+
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-09-30 19:38:53
|
Revision: 4573
http://winmerge.svn.sourceforge.net/winmerge/?rev=4573&view=rev
Author: kimmov
Date: 2007-09-30 12:38:51 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
PATCH: [ 1804555 ] New folder compare column selection dialog
Modified Paths:
--------------
trunk/Src/DirColsDlg.cpp
trunk/Src/DirColsDlg.h
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/DirColsDlg.cpp
===================================================================
--- trunk/Src/DirColsDlg.cpp 2007-09-27 15:10:35 UTC (rev 4572)
+++ trunk/Src/DirColsDlg.cpp 2007-09-30 19:38:51 UTC (rev 4573)
@@ -5,13 +5,14 @@
*
* @date Created: 2003-08-19
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include "merge.h"
#include "DirColsDlg.h"
+#include "dllver.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -22,50 +23,64 @@
/////////////////////////////////////////////////////////////////////////////
// CDirColsDlg dialog
-
+/**
+ * @brief Default dialog constructor.
+ * @param [in] pParent Dialog's parent component (window).
+ */
CDirColsDlg::CDirColsDlg(CWnd* pParent /*=NULL*/)
: CDialog(CDirColsDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(CDirColsDlg)
m_bReset = FALSE;
- m_bFromKeyboard = FALSE;
//}}AFX_DATA_INIT
}
+/**
+ * @brief Handle dialog data exchange between controls and variables.
+ */
void CDirColsDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CDirColsDlg)
- DDX_Control(pDX, IDC_LIST_SHOW, m_list_show);
- DDX_Control(pDX, IDC_LIST_HIDE, m_list_hide);
+ DDX_Control(pDX, IDC_COLDLG_LIST, m_listColumns);
//}}AFX_DATA_MAP
}
-
BEGIN_MESSAGE_MAP(CDirColsDlg, CDialog)
//{{AFX_MSG_MAP(CDirColsDlg)
ON_BN_CLICKED(IDC_UP, OnUp)
ON_BN_CLICKED(IDC_DOWN, OnDown)
- ON_BN_CLICKED(IDC_ADD, OnAdd)
- ON_BN_CLICKED(IDC_REMOVE, OnRemove)
ON_BN_CLICKED(IDC_COLDLG_DEFAULTS, OnDefaults)
//}}AFX_MSG_MAP
- ON_LBN_SELCHANGE(IDC_LIST_SHOW, OnLbnSelchangeListShow)
- ON_LBN_SELCHANGE(IDC_LIST_HIDE, OnLbnSelchangeListHide)
- ON_LBN_DBLCLK(IDC_LIST_SHOW, OnLbnDblclkListShow)
- ON_LBN_DBLCLK(IDC_LIST_HIDE, OnLbnDblclkListHide)
+ ON_NOTIFY(LVN_ITEMCHANGED, IDC_COLDLG_LIST, OnLvnItemchangedColdlgList)
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CDirColsDlg message handlers
/**
+ * @brief Initialize listcontrol in dialog.
+ */
+void CDirColsDlg::InitList()
+{
+ // Show selection across entire row.
+ DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT;
+ // Also enable infotips if they have new enough version for our
+ // custom draw code
+ // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71
+ if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71))
+ newstyle |= LVS_EX_INFOTIP;
+ m_listColumns.SetExtendedStyle(m_listColumns.GetExtendedStyle() | newstyle);
+ m_listColumns.InsertColumn(0, _T(""), LVCFMT_LEFT, 150);
+}
+
+/**
* @brief Dialog initialisation. Load column lists.
*/
BOOL CDirColsDlg::OnInitDialog()
{
CDialog::OnInitDialog();
-
+ InitList();
LoadLists();
return TRUE; // return TRUE unless you set the focus to a control
@@ -73,19 +88,23 @@
}
/**
- * @brief Load listboxes on screen from column array
+ * @brief Load listboxes on screen from column array.
*/
void CDirColsDlg::LoadLists()
{
- for (int i=0; i<m_cols.GetSize(); ++i)
+ for (int i = 0; i < m_cols.GetSize(); i++)
{
const column & c = m_cols[i];
- CListBox * list = (c.phy_col >= 0) ? &m_list_show : &m_list_hide;
- int x = list->AddString(m_cols[i].name);
- list->SetItemData(x, c.log_col);
+ int x = m_listColumns.InsertItem(m_listColumns.GetItemCount(),
+ m_cols[i].name);
+ m_listColumns.SetItemData(x, c.log_col);
+ if (c.phy_col >= 0)
+ m_listColumns.SetCheck(x, TRUE);
}
SortArrayToLogicalOrder();
- UpdateEnables();
+
+ // Set first item to selected state
+ m_listColumns.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
}
/**
@@ -96,14 +115,14 @@
for (int i=0; i<m_cols.GetSize(); ++i)
{
const column & c = m_defCols[i];
- CListBox * list = (c.phy_col >= 0) ? &m_list_show : &m_list_hide;
- int x = list->AddString(m_defCols[i].name);
- list->SetItemData(x, c.log_col);
+ int x = m_listColumns.InsertItem(m_listColumns.GetItemCount(),
+ m_cols[i].name);
+ m_listColumns.SetItemData(x, c.log_col);
+ if (c.phy_col >= 0)
+ m_listColumns.SetCheck(x, TRUE);
}
SortArrayToLogicalOrder();
- UpdateEnables();
}
-
/**
* @brief Sort m_cols so that it is in logical column order.
*/
@@ -112,6 +131,12 @@
qsort(m_cols.GetData(), m_cols.GetSize(), sizeof(m_cols[0]), &cmpcols);
}
+/**
+ * @brief Compare column order of two columns.
+ * @param [in] el1 First column to compare.
+ * @param [in] el2 Second column to compare.
+ * @return Column order.
+ */
int __cdecl CDirColsDlg::cmpcols(const void * el1, const void * el2)
{
const column * col1 = reinterpret_cast<const column *>(el1);
@@ -120,146 +145,104 @@
}
/**
- * @brief Move selected items up (in show list)
+ * @brief Move column name in the list.
+ * @param [in] index Index of column to move.
+ * @param [in] newIndex New index for the column to move.
*/
-void CDirColsDlg::OnUp()
+void CDirColsDlg::MoveItem(int index, int newIndex)
{
- CHScrollListBox * list = &m_list_show;
- // find the first item not selected
- int i=0;
- for (i=0; i<list->GetCount(); ++i)
- {
- if (!list->GetSel(i))
- break;
- }
- // continue down, moving up all selected items
- for (++i; i<list->GetCount(); ++i)
- {
- if (list->GetSel(i))
- {
- int data = list->GetItemData(i);
- CString str;
- list->GetText(i, str);
- list->DeleteString(i);
- int inew = i-1;
- list->InsertString(inew, str);
- list->SetItemData(inew, data);
- if (m_bFromKeyboard) // If from keyboard, don't move selection anymore
- {
- list->SetSel(inew + 1);
- m_bFromKeyboard = FALSE;
- }
- else
- list->SetSel(inew);
- }
- }
+ // Get current column data
+ CString text = m_listColumns.GetItemText(index, 0);
+ BOOL checked = m_listColumns.GetCheck(index);
+ UINT state = m_listColumns.GetItemState(index, LVIS_SELECTED);
+ DWORD_PTR data = m_listColumns.GetItemData(index);
+
+ // Delete column
+ m_listColumns.DeleteItem(index);
+
+ // Insert column in new index
+ m_listColumns.InsertItem(newIndex, text);
+ m_listColumns.SetItemState(newIndex, state, LVIS_SELECTED);
+ m_listColumns.SetItemData(newIndex, data);
+ if (checked)
+ m_listColumns.SetCheck(newIndex);
}
/**
- * @brief Move selected items down (in show list)
+ * @brief Move selected items one position up or down.
+ * @param [in] bUp If TRUE items are moved up,
+ * if FALSE items are moved down.
*/
-void CDirColsDlg::OnDown()
+void CDirColsDlg::MoveSelectedItems(BOOL bUp)
{
- CHScrollListBox * list = &m_list_show;
- // find the lst item not selected
- int i=0;
- for (i=list->GetCount()-1; i>=0; --i)
+ POSITION pos = m_listColumns.GetFirstSelectedItemPosition();
+
+ while (pos)
{
- if (!list->GetSel(i))
- break;
+ int ind = m_listColumns.GetNextSelectedItem(pos);
+ int newInd = bUp ? ind - 1: ind + 1;
+ MoveItem(ind, newInd);
}
- // continue down, moving up all selected items
- for (--i; i>=0; --i)
- {
- if (list->GetSel(i))
- {
- int data = list->GetItemData(i);
- CString str;
- list->GetText(i, str);
- list->DeleteString(i);
- int inew = i+1;
- list->InsertString(inew, str);
- list->SetItemData(inew, data);
- if (m_bFromKeyboard) // If from keyboard, don't move selection anymore
- {
- list->SetSel(inew - 1);
- m_bFromKeyboard = FALSE;
- }
- else
- list->SetSel(inew);
- }
- }
}
/**
- * @brief Move selected items from hide list to show list
+ * @brief Move selected items up in list.
*/
-void CDirColsDlg::OnAdd()
+void CDirColsDlg::OnUp()
{
- MoveItems(&m_list_hide, &m_list_show, false);
+ MoveSelectedItems(TRUE);
}
/**
- * @brief Move selected items from show list to hide list
+ * @brief Move selected items down (in show list)
*/
-void CDirColsDlg::OnRemove()
+void CDirColsDlg::OnDown()
{
- MoveItems(&m_list_show, &m_list_hide, true);
+ MoveSelectedItems(FALSE);
}
/**
- * @brief Move selected items from list1 to list2, putting at top if top==true
+ * @brief Move hidden columns as last items in the list.
*/
-void CDirColsDlg::MoveItems(CHScrollListBox * list1, CHScrollListBox * list2, bool top)
+void CDirColsDlg::SanitizeOrder()
{
- for (int i=0; i<list1->GetCount(); ++i)
+ // Find last visible column.
+ int i = m_listColumns.GetItemCount() - 1;
+ for ( ; i >= 0; i--)
{
- if (list1->GetSel(i))
+ if (m_listColumns.GetCheck(i))
+ break;
+ }
+
+ // Move all hidden columns below last visible column.
+ for (int j = i; j >= 0; j--)
+ {
+ if (!m_listColumns.GetCheck(j))
{
- int data = list1->GetItemData(i);
- CString str;
- list1->GetText(i, str);
- list1->DeleteString(i);
- --i; // new item promoted to slot#i in list1, we need to check it next
- int inew = top ? 0 : list2->GetCount();
- list2->InsertString(inew, str);
- list2->SetItemData(inew, data);
- list2->SetSel(inew);
+ MoveItem(j, i);
+ i--;
}
}
- UpdateEnables();
}
/**
- * @brief Enable/disable the Add/Remove buttons appropriately
+ * @brief User clicked ok, so we update m_cols and close.
*/
-void CDirColsDlg::UpdateEnables()
-{
- // TODO: We could enable/disable Up/Down buttons also, but
- // we'd have to trap selection events
-
- GetDlgItem(IDC_ADD)->EnableWindow(m_list_hide.GetCount() > 0);
- GetDlgItem(IDC_REMOVE)->EnableWindow(m_list_show.GetCount() > 0);
-}
-
-/**
- * @brief User clicked ok, so we update m_cols and close
- */
void CDirColsDlg::OnOK()
{
- // Update all the data in m_cols according to layout on screen
- int i=0;
- for (i=0; i<m_list_show.GetCount(); ++i)
+ SanitizeOrder();
+
+ for (int i = 0; i < m_listColumns.GetItemCount(); i++)
{
- column * col1 = &m_cols[m_list_show.GetItemData(i)];
- col1->phy_col = i;
+ BOOL checked = m_listColumns.GetCheck(i);
+ DWORD_PTR data = m_listColumns.GetItemData(i);
+ column * col1 = &m_cols[data];
+ if (checked)
+ col1->phy_col = i;
+ else
+ col1->phy_col = -1;
}
- for (i=0; i<m_list_hide.GetCount(); ++i)
- {
- column * col1 = &m_cols[m_list_hide.GetItemData(i)];
- col1->phy_col = -1;
- }
-
+
CDialog::OnOK();
}
@@ -268,118 +251,31 @@
*/
void CDirColsDlg::OnDefaults()
{
+ m_listColumns.DeleteAllItems();
m_bReset = TRUE;
- m_list_show.ResetContent();
- m_list_hide.ResetContent();
LoadDefLists();
}
/**
* @brief Update description when selected item changes.
*/
-void CDirColsDlg::OnLbnSelchangeListShow()
+void CDirColsDlg::OnLvnItemchangedColdlgList(NMHDR *pNMHDR, LRESULT *pResult)
{
- for (int i=0; i<m_list_show.GetCount(); ++i)
- {
- if (m_list_show.GetSel(i))
- {
- int data = m_list_show.GetItemData(i);
- CString str;
-
- int j=0;
- for (j = 0; j < m_cols.GetSize(); j++)
- {
- if (m_cols.GetAt(j).log_col == data)
- break;
- }
- GetDlgItem(IDC_COLDLG_DESC)->SetWindowText(m_cols[j].desc);
- break;
- }
- }
-}
+ LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
+ POSITION pos = m_listColumns.GetFirstSelectedItemPosition();
-/**
- * @brief Update description when selected item changes.
- */
-void CDirColsDlg::OnLbnSelchangeListHide()
-{
- for (int i=0; i<m_list_hide.GetCount(); ++i)
+ if (pos)
{
- if (m_list_hide.GetSel(i))
- {
- int data = m_list_hide.GetItemData(i);
- CString str;
-
- int j=0;
- for (j = 0; j < m_cols.GetSize(); j++)
- {
- if (m_cols.GetAt(j).log_col == data)
- break;
- }
- GetDlgItem(IDC_COLDLG_DESC)->SetWindowText(m_cols[j].desc);
- break;
- }
- }
-}
+ int ind = m_listColumns.GetNextSelectedItem(pos);
+ DWORD_PTR data = m_listColumns.GetItemData(ind);
-/**
- * @brief Handle keyboard events.
- */
-BOOL CDirColsDlg::PreTranslateMessage(MSG* pMsg)
-{
- if (pMsg->message == WM_KEYDOWN && pMsg->wParam != VK_CONTROL)
- {
- if (GetAsyncKeyState(VK_CONTROL))
+ int j = 0;
+ for (j = 0; j < m_cols.GetSize(); j++)
{
- HWND hwndFocus = 0;
- switch (pMsg->wParam)
- {
- case VK_LEFT:
- OnAdd();
+ if (m_cols.GetAt(j).log_col == data)
break;
- case VK_RIGHT:
- OnRemove();
- break;
- case VK_UP:
- m_bFromKeyboard = TRUE;
- OnUp();
- break;
- case VK_DOWN:
- m_bFromKeyboard = TRUE;
- OnDown();
- break;
- case VK_TAB:
- // When CTRL-TAB pressed, switch focus between listboxes
- hwndFocus = ::GetFocus();
- if (m_list_show.GetSafeHwnd() == hwndFocus)
- {
- m_list_hide.SetFocus();
- }
- else if (m_list_hide.GetSafeHwnd() == hwndFocus)
- {
- m_list_show.SetFocus();
- }
- break;
- }
- return FALSE;
}
+ GetDlgItem(IDC_COLDLG_DESC)->SetWindowText(m_cols[j].desc);
}
-
- return CDialog::PreTranslateMessage(pMsg);
+ *pResult = 0;
}
-
-/**
- * @brief Called when mouse is double-clicked over shown columns list.
- */
-void CDirColsDlg::OnLbnDblclkListShow()
-{
- OnRemove();
-}
-
-/**
- * @brief Called when mouse is double-clicked over hidden columns list.
- */
-void CDirColsDlg::OnLbnDblclkListHide()
-{
- OnAdd();
-}
Modified: trunk/Src/DirColsDlg.h
===================================================================
--- trunk/Src/DirColsDlg.h 2007-09-27 15:10:35 UTC (rev 4572)
+++ trunk/Src/DirColsDlg.h 2007-09-30 19:38:51 UTC (rev 4573)
@@ -5,7 +5,7 @@
*
* @date Created: 2003-08-19
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
@@ -13,13 +13,20 @@
#define AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_
#pragma once
-#include "HScrollListBox.h"
/////////////////////////////////////////////////////////////////////////////
// CDirColsDlg dialog
/**
- * @brief Dialog to choose & order columns to be shown in dirview of differing files
+ * @brief A Dialog for choosing visible folder compare columns.
+ * This class implements a dialog for choosing visible columns in folder
+ * compare. Columns can be also re-ordered. There is one listview component
+ * which lists all available columns. Every column name has a checkbox with
+ * it. If the checkbox is checked, the column is visible.
+ *
+ * @note: Due to how columns handling code is implemented, hidden columns
+ * must be always be last in the list with order number -1.
+ * @todo: Allow hidden columns between visible columns.
*/
class CDirColsDlg : public CDialog
{
@@ -49,9 +56,8 @@
// Dialog Data
//{{AFX_DATA(CDirColsDlg)
enum { IDD = IDD_DIRCOLS };
- CHScrollListBox m_list_show;
- CHScrollListBox m_list_hide;
- BOOL m_bReset;
+ CListCtrl m_listColumns;
+ BOOL m_bReset;
//}}AFX_DATA
@@ -60,40 +66,35 @@
//{{AFX_VIRTUAL(CDirColsDlg)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
- virtual BOOL PreTranslateMessage(MSG* pMsg);
//}}AFX_VIRTUAL
// Implementation methods
protected:
+ void InitList();
void LoadLists();
void LoadDefLists();
- void MoveItems(CHScrollListBox * list1, CHScrollListBox * list2, bool top);
- void UpdateEnables();
void SortArrayToLogicalOrder();
+ void MoveItem(int index, int newIndex);
+ void MoveSelectedItems(BOOL bUp);
+ void SanitizeOrder();
static int cmpcols(const void * el1, const void * el2);
// Implementation data
private:
- ColumnArray m_cols;
- ColumnArray m_defCols;
- BOOL m_bFromKeyboard; /**< Is up/down movement originating from keyboard? */
+ ColumnArray m_cols; /**< Column list. */
+ ColumnArray m_defCols; /**< Default columns. */
// Generated message map functions
//{{AFX_MSG(CDirColsDlg)
virtual BOOL OnInitDialog();
afx_msg void OnUp();
afx_msg void OnDown();
- afx_msg void OnAdd();
- afx_msg void OnRemove();
virtual void OnOK();
afx_msg void OnDefaults();
- afx_msg void OnLbnSelchangeListShow();
- afx_msg void OnLbnSelchangeListHide();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
public:
- afx_msg void OnLbnDblclkListShow();
- afx_msg void OnLbnDblclkListHide();
+ afx_msg void OnLvnItemchangedColdlgList(NMHDR *pNMHDR, LRESULT *pResult);
};
//{{AFX_INSERT_LOCATION}}
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2007-09-27 15:10:35 UTC (rev 4572)
+++ trunk/Src/Languages/English.pot 2007-09-30 19:38:51 UTC (rev 4573)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2007-09-25 00:36+0000\n"
+"POT-Creation-Date: 2007-09-30 22:37+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -22,7 +22,7 @@
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
#: Merge.rc:51
-#: Merge.rc:2941
+#: Merge.rc:2936
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr ""
@@ -30,7 +30,7 @@
#. Codepage
#: Merge.rc:23
#: Merge.rc:52
-#: Merge.rc:2942
+#: Merge.rc:2937
#, c-format
msgid "1252"
msgstr ""
@@ -371,7 +371,7 @@
#: Merge.rc:172
#: Merge.rc:286
#: Merge.rc:462
-#: Merge.rc:1870
+#: Merge.rc:1865
#, c-format
msgid "&Help"
msgstr ""
@@ -688,7 +688,7 @@
msgstr ""
#: Merge.rc:357
-#: Merge.rc:2849
+#: Merge.rc:2844
#, c-format
msgid "< Empty >"
msgstr ""
@@ -849,15 +849,15 @@
msgstr ""
#: Merge.rc:496
-#: Merge.rc:1108
-#: Merge.rc:1487
+#: Merge.rc:1103
+#: Merge.rc:1482
#, c-format
msgid "&Left"
msgstr ""
#: Merge.rc:497
-#: Merge.rc:1110
-#: Merge.rc:1490
+#: Merge.rc:1105
+#: Merge.rc:1485
#, c-format
msgid "&Right"
msgstr ""
@@ -1012,13 +1012,13 @@
#: Merge.rc:762
#: Merge.rc:948
#: Merge.rc:1022
-#: Merge.rc:1056
-#: Merge.rc:1066
-#: Merge.rc:1229
-#: Merge.rc:1293
-#: Merge.rc:1306
-#: Merge.rc:1398
-#: Merge.rc:1413
+#: Merge.rc:1051
+#: Merge.rc:1061
+#: Merge.rc:1224
+#: Merge.rc:1288
+#: Merge.rc:1301
+#: Merge.rc:1393
+#: Merge.rc:1408
#, c-format
msgid "OK"
msgstr ""
@@ -1034,7 +1034,7 @@
msgstr ""
#: Merge.rc:654
-#: Merge.rc:1564
+#: Merge.rc:1559
#, c-format
msgid "&Left:"
msgstr ""
@@ -1048,7 +1048,7 @@
msgstr ""
#: Merge.rc:659
-#: Merge.rc:1568
+#: Merge.rc:1563
#, c-format
msgid "&Right:"
msgstr ""
@@ -1060,13 +1060,13 @@
msgstr ""
#: Merge.rc:664
-#: Merge.rc:1572
+#: Merge.rc:1567
#, c-format
msgid "&Filter:"
msgstr ""
#: Merge.rc:667
-#: Merge.rc:1574
+#: Merge.rc:1569
#, c-format
msgid "Select..."
msgstr ""
@@ -1082,7 +1082,7 @@
msgstr ""
#: Merge.rc:672
-#: Merge.rc:1575
+#: Merge.rc:1570
#, c-format
msgid "&Include Subfolders"
msgstr ""
@@ -1099,19 +1099,19 @@
#: Merge.rc:825
#: Merge.rc:835
#: Merge.rc:1023
-#: Merge.rc:1057
-#: Merge.rc:1067
-#: Merge.rc:1118
-#: Merge.rc:1230
-#: Merge.rc:1307
-#: Merge.rc:1399
-#: Merge.rc:1414
+#: Merge.rc:1052
+#: Merge.rc:1062
+#: Merge.rc:1113
+#: Merge.rc:1225
+#: Merge.rc:1302
+#: Merge.rc:1394
+#: Merge.rc:1409
#, c-format
msgid "Cancel"
msgstr ""
#: Merge.rc:677
-#: Merge.rc:1308
+#: Merge.rc:1303
#, c-format
msgid "Help"
msgstr ""
@@ -1184,7 +1184,7 @@
msgstr ""
#: Merge.rc:724
-#: Merge.rc:1878
+#: Merge.rc:1873
#, c-format
msgid "General"
msgstr ""
@@ -1230,13 +1230,13 @@
msgstr ""
#: Merge.rc:746
-#: Merge.rc:1587
+#: Merge.rc:1582
#, c-format
msgid "&Folder compare"
msgstr ""
#: Merge.rc:748
-#: Merge.rc:1589
+#: Merge.rc:1584
#, c-format
msgid "Fil&e compare"
msgstr ""
@@ -1357,7 +1357,7 @@
msgstr ""
#: Merge.rc:831
-#: Merge.rc:2103
+#: Merge.rc:2098
#, c-format
msgid "Rational ClearCase"
msgstr ""
@@ -1368,7 +1368,7 @@
msgstr ""
#: Merge.rc:839
-#: Merge.rc:1149
+#: Merge.rc:1144
#, c-format
msgid "Comments"
msgstr ""
@@ -1414,7 +1414,7 @@
msgstr ""
#: Merge.rc:869
-#: Merge.rc:1881
+#: Merge.rc:1876
#, c-format
msgid "Colors"
msgstr ""
@@ -1430,7 +1430,7 @@
msgstr ""
#: Merge.rc:880
-#: Merge.rc:1539
+#: Merge.rc:1534
#, c-format
msgid "Background"
msgstr ""
@@ -1441,8 +1441,8 @@
msgstr ""
#: Merge.rc:894
-#: Merge.rc:1334
-#: Merge.rc:1540
+#: Merge.rc:1329
+#: Merge.rc:1535
#, c-format
msgid "Text"
msgstr ""
@@ -1474,22 +1474,22 @@
#: Merge.rc:939
#: Merge.rc:1021
-#: Merge.rc:1055
-#: Merge.rc:1152
-#: Merge.rc:1380
+#: Merge.rc:1050
+#: Merge.rc:1147
+#: Merge.rc:1375
#, c-format
msgid "Defaults"
msgstr ""
#: Merge.rc:945
-#: Merge.rc:1322
-#: Merge.rc:1528
+#: Merge.rc:1317
+#: Merge.rc:1523
#, c-format
msgid "Dialog"
msgstr ""
#: Merge.rc:955
-#: Merge.rc:1884
+#: Merge.rc:1879
#, c-format
msgid "System"
msgstr ""
@@ -1535,10 +1535,10 @@
msgstr ""
#: Merge.rc:975
-#: Merge.rc:1392
-#: Merge.rc:1566
-#: Merge.rc:1570
-#: Merge.rc:1597
+#: Merge.rc:1387
+#: Merge.rc:1561
+#: Merge.rc:1565
+#: Merge.rc:1592
#, c-format
msgid "Browse..."
msgstr ""
@@ -1638,11 +1638,6 @@
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1044
-#, c-format
-msgid "Show columns"
-msgstr ""
-
#: Merge.rc:1047
#, c-format
msgid "Move &Up"
@@ -1653,498 +1648,484 @@
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1049
+#: Merge.rc:1058
#, c-format
-msgid "Hide columns"
+msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1052
-#, c-format
-msgid "<<"
-msgstr ""
-
-#: Merge.rc:1053
-#, c-format
-msgid ">>"
-msgstr ""
-
#: Merge.rc:1063
#, c-format
-msgid "Select Unpacker"
-msgstr ""
-
-#: Merge.rc:1068
-#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1071
+#: Merge.rc:1066
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1074
+#: Merge.rc:1069
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1075
+#: Merge.rc:1070
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1086
+#: Merge.rc:1081
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1089
-#: Merge.rc:1831
+#: Merge.rc:1084
+#: Merge.rc:1826
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1094
+#: Merge.rc:1089
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1095
+#: Merge.rc:1090
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1096
+#: Merge.rc:1091
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1102
+#: Merge.rc:1097
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1105
+#: Merge.rc:1100
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1107
+#: Merge.rc:1102
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1112
+#: Merge.rc:1107
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1113
+#: Merge.rc:1108
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1115
+#: Merge.rc:1110
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1117
+#: Merge.rc:1112
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1123
-#: Merge.rc:1879
+#: Merge.rc:1118
+#: Merge.rc:1874
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1126
+#: Merge.rc:1121
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1127
+#: Merge.rc:1122
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1129
+#: Merge.rc:1124
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1131
+#: Merge.rc:1126
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1133
+#: Merge.rc:1128
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1135
+#: Merge.rc:1130
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1137
+#: Merge.rc:1132
#, c-format
msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
msgstr ""
-#: Merge.rc:1140
+#: Merge.rc:1135
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1142
+#: Merge.rc:1137
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1144
+#: Merge.rc:1139
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1147
+#: Merge.rc:1142
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1150
+#: Merge.rc:1145
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1157
-#: Merge.rc:1880
+#: Merge.rc:1152
+#: Merge.rc:1875
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1155
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1162
+#: Merge.rc:1157
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1164
+#: Merge.rc:1159
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1166
+#: Merge.rc:1161
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1167
+#: Merge.rc:1162
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1170
+#: Merge.rc:1165
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1172
+#: Merge.rc:1167
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1174
+#: Merge.rc:1169
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1178
+#: Merge.rc:1173
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1180
+#: Merge.rc:1175
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1195
+#: Merge.rc:1190
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1201
+#: Merge.rc:1196
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1202
+#: Merge.rc:1197
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1203
+#: Merge.rc:1198
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1204
+#: Merge.rc:1199
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1205
+#: Merge.rc:1200
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1211
+#: Merge.rc:1206
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1214
+#: Merge.rc:1209
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1217
+#: Merge.rc:1212
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1219
+#: Merge.rc:1214
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1221
+#: Merge.rc:1216
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1224
+#: Merge.rc:1219
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1226
+#: Merge.rc:1221
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1228
+#: Merge.rc:1223
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1235
-#: Merge.rc:1483
-#: Merge.rc:1886
+#: Merge.rc:1230
+#: Merge.rc:1478
+#: Merge.rc:1881
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1238
+#: Merge.rc:1233
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1234
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1241
+#: Merge.rc:1236
#, c-format
msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1244
+#: Merge.rc:1239
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1246
+#: Merge.rc:1241
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1248
+#: Merge.rc:1243
#, c-format
msgid "Custom codepage :"
msgstr ""
-#: Merge.rc:1256
+#: Merge.rc:1251
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1259
+#: Merge.rc:1254
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1262
+#: Merge.rc:1257
#, c-format
msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1264
+#: Merge.rc:1259
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1266
+#: Merge.rc:1261
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1268
+#: Merge.rc:1263
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1270
+#: Merge.rc:1265
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1272
+#: Merge.rc:1267
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1275
-#: Merge.rc:1278
+#: Merge.rc:1270
+#: Merge.rc:1273
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1276
+#: Merge.rc:1271
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1279
+#: Merge.rc:1274
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
+#: Merge.rc:1276
#: Merge.rc:1281
-#: Merge.rc:1286
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1283
+#: Merge.rc:1278
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1284
+#: Merge.rc:1279
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1288
+#: Merge.rc:1283
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1284
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1290
+#: Merge.rc:1285
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1289
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1303
+#: Merge.rc:1298
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1314
+#: Merge.rc:1309
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1316
+#: Merge.rc:1311
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1317
+#: Merge.rc:1312
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1325
+#: Merge.rc:1320
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1326
+#: Merge.rc:1321
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1327
+#: Merge.rc:1322
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1328
+#: Merge.rc:1323
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1329
+#: Merge.rc:1324
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1330
+#: Merge.rc:1325
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1331
+#: Merge.rc:1326
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1332
+#: Merge.rc:1327
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1333
+#: Merge.rc:1328
#, c-format
msgid "User 2:"
msgstr ""
+#: Merge.rc:1333
#: Merge.rc:1338
#: Merge.rc:1343
#: Merge.rc:1348
@@ -2153,502 +2134,506 @@
#: Merge.rc:1363
#: Merge.rc:1368
#: Merge.rc:1373
-#: Merge.rc:1378
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1386
+#: Merge.rc:1381
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1389
+#: Merge.rc:1384
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1393
+#: Merge.rc:1388
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1396
+#: Merge.rc:1391
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1404
+#: Merge.rc:1399
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1407
+#: Merge.rc:1402
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1409
+#: Merge.rc:1404
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1411
+#: Merge.rc:1406
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1419
-#: Merge.rc:1887
+#: Merge.rc:1414
+#: Merge.rc:1882
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1422
+#: Merge.rc:1417
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1424
+#: Merge.rc:1419
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1425
+#: Merge.rc:1420
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1427
+#: Merge.rc:1422
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1430
+#: Merge.rc:1425
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1432
+#: Merge.rc:1427
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1440
+#: Merge.rc:1435
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1443
+#: Merge.rc:1438
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1444
+#: Merge.rc:1439
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1445
-#: Merge.rc:2251
+#: Merge.rc:1440
+#: Merge.rc:2246
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1446
+#: Merge.rc:1441
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1449
-#: Merge.rc:1468
+#: Merge.rc:1444
+#: Merge.rc:1463
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1452
+#: Merge.rc:1447
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1453
+#: Merge.rc:1448
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1458
+#: Merge.rc:1453
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1463
-#: Merge.rc:2246
+#: Merge.rc:1458
+#: Merge.rc:2241
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1472
+#: Merge.rc:1467
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1477
+#: Merge.rc:1472
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1486
+#: Merge.rc:1481
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1489
-#: Merge.rc:1492
+#: Merge.rc:1484
+#: Merge.rc:1487
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1493
+#: Merge.rc:1488
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1494
+#: Merge.rc:1489
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1496
-#: Merge.rc:1499
+#: Merge.rc:1491
+#: Merge.rc:1494
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1497
+#: Merge.rc:1492
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1500
+#: Merge.rc:1495
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1503
+#: Merge.rc:1498
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1504
-#: Merge.rc:1853
+#: Merge.rc:1499
+#: Merge.rc:1848
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1509
+#: Merge.rc:1504
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1512
+#: Merge.rc:1507
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1514
+#: Merge.rc:1509
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1516
+#: Merge.rc:1511
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1518
+#: Merge.rc:1513
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1522
+#: Merge.rc:1517
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1523
+#: Merge.rc:1518
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1531
+#: Merge.rc:1526
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1534
+#: Merge.rc:1529
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1536
+#: Merge.rc:1531
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1537
+#: Merge.rc:1532
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1538
+#: Merge.rc:1533
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1561
+#: Merge.rc:1556
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1567
+#: Merge.rc:1562
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1571
+#: Merge.rc:1566
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1577
+#: Merge.rc:1572
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1578
+#: Merge.rc:1573
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1583
-#: Merge.rc:1888
+#: Merge.rc:1578
+#: Merge.rc:1883
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1586
+#: Merge.rc:1581
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1591
+#: Merge.rc:1586
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1592
+#: Merge.rc:1587
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1594
+#: Merge.rc:1589
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1598
+#: Merge.rc:1593
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1599
+#: Merge.rc:1594
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1601
+#: Merge.rc:1596
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1608
+#: Merge.rc:1603
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1612
+#: Merge.rc:1607
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1614
+#: Merge.rc:1609
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1617
+#: Merge.rc:1612
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1620
+#: Merge.rc:1615
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1621
+#: Merge.rc:1616
#, c-format
msgid "No"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1646
+#: Merge.rc:1641
#, c-format
msgid "040904e4"
msgstr ""
#. You should use a string like "Translated by " followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!
-#: Merge.rc:1648
+#: Merge.rc:1643
#, c-format
msgid "English translation by developers"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1661
+#: Merge.rc:1656
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1676
+#: Merge.rc:1671
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1682
+#: Merge.rc:1677
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1683
+#: Merge.rc:1678
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1684
+#: Merge.rc:1679
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1685
+#: Merge.rc:1680
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1686
+#: Merge.rc:1681
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1687
+#: Merge.rc:1682
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1693
+#: Merge.rc:1688
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1694
+#: Merge.rc:1689
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1695
+#: Merge.rc:1690
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1691
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1697
+#: Merge.rc:1692
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1698
+#: Merge.rc:1693
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1699
+#: Merge.rc:1694
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1700
+#: Merge.rc:1695
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1701
+#: Merge.rc:1696
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1706
+#: Merge.rc:1701
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1712
+#: Merge.rc:1707
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1713
+#: Merge.rc:1708
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1714
+#: Merge.rc:1709
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1715
+#: Merge.rc:1710
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1716
+#: Merge.rc:1711
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1717
+#: Merge.rc:1712
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1718
+#: Merge.rc:1713
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1723
+#: Merge.rc:1718
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1724
+#: Merge.rc:1719
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
+#: Merge.rc:1725
+#: Merge.rc:1726
+#: Merge.rc:1727
+#: Merge.rc:1728
+#: Merge.rc:1729
#: Merge.rc:1730
#: Merge.rc:1731
#: Merge.rc:1732
@@ -2660,3391 +2645,3386 @@
#: Merge.rc:1738
#: Merge.rc:1739
#: Merge.rc:1740
-#: Merge.rc:1741
-#: Merge.rc:1742
-#: Merge.rc:1743
-#: Merge.rc:1744
-#: Merge.rc:1745
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1750
+#: Merge.rc:1745
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1751
+#: Merge.rc:1746
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1757
+#: Merge.rc:1752
#, c-format
msgid "Open another window for the active document\nNew Window"
msgstr ""
-#: Merge.rc:1758
+#: Merge.rc:1753
#, c-format
msgid "Arrange icons at the bottom of the window\nArrange Icons"
msgstr ""
-#: Merge.rc:1759
+#: Merge.rc:1754
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1755
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1756
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1762
+#: Merge.rc:1757
#, c-format
msgid "Split the active window into panes\nSplit"
msgstr ""
-#: Merge.rc:1768
+#: Merge.rc:1763
#, c-format
msgid "Erase the selection\nErase"
msgstr ""
-#: Merge.rc:1769
+#: Merge.rc:1764
#, c-format
msgid "Erase everything\nErase All"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1765
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1766
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1767
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1773
+#: Merge.rc:1768
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1774
+#: Merge.rc:1769
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1775
+#: Merge.rc:1770
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1776
+#: Merge.rc:1771
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1777
+#: Merge.rc:1772
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1778
+#: Merge.rc:1773
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1779
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1780
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1781
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1792
+#: Merge.rc:1787
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1793
+#: Merge.rc:1788
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1794
+#: Merge.rc:1789
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1795
+#: Merge.rc:1790
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1796
+#: Merge.rc:1791
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1797
+#: Merge.rc:1792
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1798
+#: Merge.rc:1793
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1803
+#: Merge.rc:1798
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1804
+#: Merge.rc:1799
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1805
+#: Merge.rc:1800
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1811
+#: Merge.rc:1806
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1818
+#: Merge.rc:1813
#, c-format
msgid "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
msgstr ""
-#: Merge.rc:1825
+#: Merge.rc:1820
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1832
+#: Merge.rc:1827
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1838
-#: Merge.rc:1839
+#: Merge.rc:1833
+#: Merge.rc:1834
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1845
+#: Merge.rc:1840
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
msgstr ""
-#: Merge.rc:1846
+#: Merge.rc:1841
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1852
+#: Merge.rc:1847
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1854
+#: Merge.rc:1849
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1855
+#: Merge.rc:1850
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1856
+#: Merge.rc:1851
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1857
+#: Merge.rc:1852
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1858
+#: Merge.rc:1853
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1864
+#: Merge.rc:1859
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1865
+#: Merge.rc:1860
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1866
+#: Merge.rc:1861
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1862
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1863
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:1864
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1871
+#: Merge.rc:1866
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1872
+#: Merge.rc:1867
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1882
+#: Merge.rc:1877
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1883
+#: Merge.rc:1878
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1885
+#: Merge.rc:1880
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1895
+#: Merge.rc:1890
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1896
+#: Merge.rc:1891
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1897
+#: Merge.rc:1892
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1898
+#: Merge.rc:1893
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1899
+#: Merge.rc:1894
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1905
+#: Merge.rc:1900
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1906
+#: Merge.rc:1901
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1907
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1913
+#: Merge.rc:1908
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1914
+#: Merge.rc:1909
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr ""
-#: Merge.rc:1915
+#: Merge.rc:1910
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1917
+#: Merge.rc:1912
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1919
+#: Merge.rc:1914
#, c-format
msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1920
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1926
+#: Merge.rc:1921
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1927
+#: Merge.rc:1922
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1928
+#: Merge.rc:1923
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1930
+#: Merge.rc:1925
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1936
+#: Merge.rc:1931
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1937
+#: Merge.rc:1932
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1938
+#: Merge.rc:1933
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1944
+#: Merge.rc:1939
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:1945
+#: Merge.rc:1940
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:1946
+#: Merge.rc:1941
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:1947
+#: Merge.rc:1942
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1943
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:1954
+#: Merge.rc:1949
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:1955
+#: Merge.rc:1950
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:1956
+#: Merge.rc:1951
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:1957
+#: Merge.rc:1952
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:1958
+#: Merge.rc:1953
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1954
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1955
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1962
+#: Merge.rc:1957
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:1964
+#: Merge.rc:1959
#, c-format
msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:1966
+#: Merge.rc:1961
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:1968
+#: Merge.rc:1963
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1964
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1966
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:1973
+#: Merge.rc:1968
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1974
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:1985
+#: Merge.rc:1980
#, c-format
msgid "&Path to cleartool.exe :"
msgstr ""
-#: Merge.rc:1986
+#: Merge.rc:1981
#, c-format
msgid "&Path to SS.EXE :"
msgstr ""
-#: Merge.rc:1992
+#: Merge.rc:1987
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:1993
+#: Merge.rc:1988
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:1994
+#: Merge.rc:1989
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:1995
+#: Merge.rc:1990
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2001
+#: Merge.rc:1996
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2002
+#: Merge.rc:1997
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2003
+#: Merge.rc:1998
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2004
+#: Merge.rc:1999
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2000
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2006
+#: Merge.rc:2001
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2007
+#: Merge.rc:2002
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2008
+#: Merge.rc:2003
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2009
+#: Merge.rc:2004
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2005
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2011
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2017
+#: Merge.rc:2012
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2013
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2019
+#: Merge.rc:2014
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2020
+#: Merge.rc:2015
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2021
+#: Merge.rc:2016
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2022
+#: Merge.rc:2017
#, c-format
msgid "1 Difference Found"
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2018
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2029
+#: Merge.rc:2024
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2030
+#: Merge.rc:2025
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2036
+#: Merge.rc:2031
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2037
+#: Merge.rc:2032
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2038
+#: Merge.rc:2033
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2039
+#: Merge.rc:2034
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2040
+#: Merge.rc:2035
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2041
+#: Merge.rc:2036
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2042
+#: Merge.rc:2037
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2043
+#: Merge.rc:2038
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2049
+#: Merge.rc:2044
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2050
+#: Merge.rc:2045
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2051
+#: Merge.rc:2046
#, c-format
msgid "%1\n%2\n\nare identical binary files."
msgstr ""
-#: Merge.rc:2052
+#: Merge.rc:2047
#, c-format
msgid "%1\n%2\n\nare different binary files."
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2048
#, c-format
msgid "%1\n\nis binary file. Cannot compare binary and text files."
msgstr ""
-#: Merge.rc:2054
+#: Merge.rc:2049
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2060
+#: Merge.rc:2055
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2061
+#: Merge.rc:2056
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2062
+#: Merge.rc:2057
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2063
+#: Merge.rc:2058
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2064
+#: Merge.rc:2059
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2066
+#: Merge.rc:2061
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2067
+#: Merge.rc:2062
#, c-format
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
msgstr ""
-#: Merge.rc:2068
+#: Merge.rc:2063
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2069
+#: Merge.rc:2064
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2070
+#: Merge.rc:2065
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2071
+#: Merge.rc:2066
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2072
+#: Merge.rc:2067
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nIf you want to refresh files close current file compare and load files again."
msgstr ""
-#: Merge.rc:2073
+#: Merge.rc:2068
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2069
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2080
+#: Merge.rc:2075
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2086
+#: Merge.rc:2081
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2087
+#: Merge.rc:2082
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2083
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2084
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2085
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2086
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2092
+#: Merge.rc:2087
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2093
+#: Merge.rc:2088
#, c-format
msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
msgstr ""
-#: Merge.rc:2094
+#: Merge.rc:2089
#, c-format
msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
msgstr ""
-#: Merge.rc:2100
-#: Merge.rc:2885
+#: Merge.rc:2095
+#: Merge.rc:2880
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2096
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2097
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2099
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2105
+#: Merge.rc:2100
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2111
-#: Merge.rc:2113
+#: Merge.rc:2106
+#: Merge.rc:2108
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2112
-#: Merge.rc:2114
+#: Merge.rc:2107
+#: Merge.rc:2109
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2115
+#: Merge.rc:2110
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2116
+#: Merge.rc:2111
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2117
+#: Merge.rc:2112
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2118
+#: Merge.rc:2113
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2119
+#: Merge.rc:2114
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2120
+#: Merge.rc:2115
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2116
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2117
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2123
+#: Merge.rc:2118
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2124
-#: Merge.rc:2140
+#: Merge.rc:2119
+#: Merge.rc:2135
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2125
-#: Merge.rc:2141
+#: Merge.rc:2120
+#: Merge.rc:2136
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2126
-#: Merge.rc:2142
+#: Merge.rc:2121
+#: Merge.rc:2137
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2127
-#: Merge.rc:2143
+#: Merge.rc:2122
+#: Merge.rc:2138
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2133
+#: Merge.rc:2128
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2134
+#: Merge.rc:2129
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2135
+#: Merge.rc:2130
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2136
+#: Merge.rc:2131
#, c-format
msgid "L...
[truncated message content] |
|
From: <ki...@us...> - 2007-10-03 15:08:24
|
Revision: 4579
http://winmerge.svn.sourceforge.net/winmerge/?rev=4579&view=rev
Author: kimmov
Date: 2007-10-03 08:08:18 -0700 (Wed, 03 Oct 2007)
Log Message:
-----------
PATCH: [ 1806416 ] FileInfo struct rename to DirItem, add version info class
Modified Paths:
--------------
trunk/Src/Common/version.cpp
trunk/Src/Common/version.h
trunk/Src/DiffContext.cpp
trunk/Src/DiffFileInfo.cpp
trunk/Src/DiffFileInfo.h
trunk/Src/DirViewColItems.cpp
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/DirItem.cpp
trunk/Src/DirItem.h
Removed Paths:
-------------
trunk/Src/FileInfo.cpp
trunk/Src/FileInfo.h
Modified: trunk/Src/Common/version.cpp
===================================================================
--- trunk/Src/Common/version.cpp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/Common/version.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -223,6 +223,18 @@
}
/**
+ * @brief Return numeric file's version number.
+ * This function returns version number given as two DWORDs.
+ * @param [out] versionMS High DWORD for version number.
+ * @param [out] versionLS Low DWORD for version number.
+ */
+void CVersionInfo::GetFixedFileVersion(DWORD &versionMS, DWORD &versionLS)
+{
+ versionMS = m_FixedFileInfo.dwFileVersionMS;
+ versionLS = m_FixedFileInfo.dwFileVersionLS;
+}
+
+/**
* @brief Return comment string.
* @return Comment string.
*/
Modified: trunk/Src/Common/version.h
===================================================================
--- trunk/Src/Common/version.h 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/Common/version.h 2007-10-03 15:08:18 UTC (rev 4579)
@@ -66,6 +66,7 @@
CString GetFixedProductVersion();
CString GetFixedFileVersion();
DLLVERSIONINFO m_dvi;
+ void GetFixedFileVersion(DWORD &versionMS, DWORD &versionLS);
protected:
void GetVersionInfo();
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/DiffContext.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -118,15 +118,6 @@
}
/**
- * @brief Fetch & return the fixed file version as a dotted string
- */
-static CString GetFixedFileVersion(const CString & path)
-{
- CVersionInfo ver(path);
- return ver.GetFixedFileVersion();
-}
-
-/**
* @brief Add new diffitem to CDiffContext array
*/
void CDiffContext::AddDiff(const DIFFITEM & di)
@@ -211,7 +202,7 @@
{
DiffFileInfo & dfi = bLeft ? di.left : di.right;
// Check only binary files
- dfi.version = _T("");
+ dfi.version.Clear();
dfi.bVersionChecked = true;
if (di.diffcode.isDirectory())
@@ -238,7 +229,12 @@
spath = di.getRightFilepath(GetNormalizedRight());
spath = paths_ConcatPath(spath, di.sRightFilename);
}
- dfi.version = GetFixedFileVersion(spath);
+
+ CVersionInfo ver(spath);
+ DWORD verMS = 0;
+ DWORD verLS = 0;
+ ver.GetFixedFileVersion(verMS, verLS);
+ dfi.version.SetFileVersion(verMS, verLS);
}
/**
Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/DiffFileInfo.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -23,7 +23,7 @@
// $Id$
#include "stdafx.h"
-#include "FileInfo.h"
+#include "DirItem.h"
#include "DiffFileInfo.h"
#include "unicoder.h"
@@ -32,7 +32,7 @@
*/
void DiffFileInfo::Clear()
{
- FileInfo::Clear();
+ DirItem::Clear();
bVersionChecked = false;
encoding.Clear();
m_textStats.clear();
Modified: trunk/Src/DiffFileInfo.h
===================================================================
--- trunk/Src/DiffFileInfo.h 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/DiffFileInfo.h 2007-10-03 15:08:18 UTC (rev 4579)
@@ -25,8 +25,8 @@
#ifndef _DIFF_FILE_INFO_H_INCLUDED
#define _DIFF_FILE_INFO_H_INCLUDED
-#ifndef _FILE_INFO_H_INCLUDED
-#include "FileInfo.h"
+#ifndef _DIR_ITEM_H_INCLUDED
+#include "DirItem.h"
#endif
#ifndef FileTextEncoding_h_included
@@ -88,7 +88,7 @@
* This class expands FileInfo class with encoding information and
* text stats information.
*/
-struct DiffFileInfo : public FileInfo
+struct DiffFileInfo : public DirItem
{
// data
bool bVersionChecked; /**< true if version string is up-to-date */
Copied: trunk/Src/DirItem.cpp (from rev 4572, trunk/Src/FileInfo.cpp)
===================================================================
--- trunk/Src/DirItem.cpp (rev 0)
+++ trunk/Src/DirItem.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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 DirItem.cpp
+ *
+ * @brief Implementation for DirItem routines
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "UnicodeString.h"
+#include "DirItem.h"
+
+/**
+ * @brief Update fileinfo from given file
+ * @param [in] sFilePath Full path to file/directory to update
+ * @return TRUE if information was updated (item was found).
+ */
+BOOL DirItem::Update(const String &sFilePath)
+{
+ struct _stati64 fstats;
+ __int64 mtime64 = 0;
+ BOOL retVal = FALSE;
+
+ size = -1;
+ flags.reset();
+ mtime = 0;
+
+ if (_tstati64(sFilePath.c_str(), &fstats) == 0)
+ {
+ // There can be files without modification date.
+ // Then we must use creation date. Of course we assume
+ // creation date then exists...
+ if (fstats.st_mtime == 0)
+ mtime64 = fstats.st_ctime;
+ else
+ mtime64 = fstats.st_mtime;
+
+ // No size for directory ( size remains as -1)
+ if ((fstats.st_mode & _S_IFDIR) == 0)
+ size = fstats.st_size;
+
+ flags.attributes = GetFileAttributes(sFilePath.c_str());
+
+ retVal = TRUE;
+ }
+ mtime = mtime64;
+ return retVal;
+}
+
+/**
+ * @brief Clears FileInfo data.
+ */
+void DirItem::Clear()
+{
+ ctime = 0;
+ mtime = 0;
+ size = -1;
+ version.Clear();
+ flags.reset();
+}
Copied: trunk/Src/DirItem.h (from rev 4572, trunk/Src/FileInfo.h)
===================================================================
--- trunk/Src/DirItem.h (rev 0)
+++ trunk/Src/DirItem.h 2007-10-03 15:08:18 UTC (rev 4579)
@@ -0,0 +1,60 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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 DirItem.h
+ *
+ * @brief Declaration file for DirItem
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _DIR_ITEM_H_INCLUDED
+#define _DIR_ITEM_H_INCLUDED
+
+#include "UnicodeString.h"
+#include "FileVersion.h"
+
+/**
+ * @brief Class for fileflags.
+ */
+struct FileFlags
+{
+ DWORD attributes; /**< Fileattributes for item */
+ FileFlags() : attributes(0) { }
+ void reset() { attributes = 0; } /// Reset fileattributes
+};
+
+/**
+ * @brief Information for file.
+ * This class stores basic information from a file or folder.
+ * Information consists of item name, times, size and attributes.
+ * Also version info can be get for files supporting it.
+ */
+struct DirItem
+{
+ __int64 ctime; /**< time of creation */
+ __int64 mtime; /**< time of last modify */
+ __int64 size; /**< file size in bytes, -1 means file does not exist*/
+ FileVersion version; /**< string of fixed file version, eg, 1.2.3.4 */
+ FileFlags flags; /**< file attributes */
+ DirItem() { Clear(); }
+
+ BOOL Update(const String &sFilePath);
+ void Clear();
+};
+
+#endif // _DIR_ITEM_H_INCLUDED
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/DirViewColItems.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -344,7 +344,7 @@
{
pCtxt->UpdateVersion(di, bLeft);
}
- return dfi.version.c_str();
+ return dfi.version.GetFileVersionString().c_str();
}
static CString ColLversionGet(const CDiffContext * pCtxt, const void *p)
{
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/FileFilterHelper.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -25,7 +25,7 @@
#include "stdafx.h"
#include "Ucs2Utf8.h"
#include "FilterList.h"
-#include "FileInfo.h"
+#include "DirItem.h"
#include "FileFilterMgr.h"
#include "FileFilterHelper.h"
#include "Coretools.h"
@@ -460,8 +460,8 @@
void FileFilterHelper::ReloadUpdatedFilters()
{
FILEFILTER_INFOLIST filters;
- FileInfo fileInfo;
- FileInfo *fileInfoStored = NULL;
+ DirItem fileInfo;
+ DirItem *fileInfoStored = NULL;
FileFilterInfo filter;
CString selected;
Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/FileFilterHelper.h 2007-10-03 15:08:18 UTC (rev 4579)
@@ -47,7 +47,7 @@
CString name; /**< Name of filter */
CString description; /**< Description of filter (shown in UI) */
CString fullpath; /**< Full path to filter file */
- FileInfo fileinfo; /**< For tracking if file has been modified */
+ DirItem fileinfo; /**< For tracking if file has been modified */
};
typedef CArray<FileFilterInfo, FileFilterInfo&> FILEFILTER_INFOLIST;
Deleted: trunk/Src/FileInfo.cpp
===================================================================
--- trunk/Src/FileInfo.cpp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/FileInfo.cpp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -1,78 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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 FileInfo.cpp
- *
- * @brief Implementation for FileInfo routines
- */
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#include "stdafx.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "UnicodeString.h"
-#include "FileInfo.h"
-
-/**
- * @brief Update fileinfo from given file
- * @param [in] sFilePath Full path to file/directory to update
- * @return TRUE if information was updated (item was found).
- */
-BOOL FileInfo::Update(const String &sFilePath)
-{
- struct _stati64 fstats;
- __int64 mtime64 = 0;
- BOOL retVal = FALSE;
-
- size = -1;
- flags.reset();
- mtime = 0;
-
- if (_tstati64(sFilePath.c_str(), &fstats) == 0)
- {
- // There can be files without modification date.
- // Then we must use creation date. Of course we assume
- // creation date then exists...
- if (fstats.st_mtime == 0)
- mtime64 = fstats.st_ctime;
- else
- mtime64 = fstats.st_mtime;
-
- // No size for directory ( size remains as -1)
- if ((fstats.st_mode & _S_IFDIR) == 0)
- size = fstats.st_size;
-
- flags.attributes = GetFileAttributes(sFilePath.c_str());
-
- retVal = TRUE;
- }
- mtime = mtime64;
- return retVal;
-}
-
-/**
- * @brief Clears FileInfo data.
- */
-void FileInfo::Clear()
-{
- ctime = 0;
- mtime = 0;
- size = -1;
- version.erase();
- flags.reset();
-}
Deleted: trunk/Src/FileInfo.h
===================================================================
--- trunk/Src/FileInfo.h 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/FileInfo.h 2007-10-03 15:08:18 UTC (rev 4579)
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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 FileInfo.h
- *
- * @brief Declaration file for FileInfo
- */
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _FILE_INFO_H_INCLUDED
-#define _FILE_INFO_H_INCLUDED
-
-#include "UnicodeString.h"
-
-/**
- * @brief Class for fileflags.
- */
-struct FileFlags
-{
- DWORD attributes; /**< Fileattributes for item */
- FileFlags() : attributes(0) { }
- void reset() { attributes = 0; } /// Reset fileattributes
-};
-
-/**
- * @brief Information for file.
- * This class stores basic information from a file or folder.
- * Information consists of file times, size and attributes.
- * Also version info can be get for files supporting it.
- */
-struct FileInfo
-{
- __int64 ctime; /**< time of creation */
- __int64 mtime; /**< time of last modify */
- __int64 size; /**< file size in bytes, -1 means file does not exist*/
- String version; /**< string of fixed file version, eg, 1.2.3.4 */
- FileFlags flags; /**< file attributes */
- FileInfo() { Clear(); }
-
- BOOL Update(const String &sFilePath);
- void Clear();
-};
-
-#endif // _FILE_INFO_H_INCLUDED
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-10-03 11:07:10 UTC (rev 4578)
+++ trunk/Src/Merge.dsp 2007-10-03 15:08:18 UTC (rev 4579)
@@ -351,6 +351,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DirItem.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\DirScan.cpp
# End Source File
# Begin Source File
@@ -421,10 +425,6 @@
# End Source File
# Begin Source File
-SOURCE=.\FileInfo.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\FileOrFolderSelect.cpp
# End Source File
# Begin Source File
@@ -1117,6 +1117,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DirItem.h
+# End Source File
+# Begin Source File
+
SOURCE=.\DirReportTypes.h
# End Source File
# Begin Source File
@@ -1173,10 +1177,6 @@
# End Source File
# Begin Source File
-SOURCE=.\FileInfo.h
-# End Source File
-# Begin Source File
-
SOURCE=.\FileLocation.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-10-04 19:24:35
|
Revision: 4581
http://winmerge.svn.sourceforge.net/winmerge/?rev=4581&view=rev
Author: kimmov
Date: 2007-10-04 12:24:26 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
PATCH: [ 1806416 ] FileInfo struct rename to DirItem, add version info class
Add missing files FileVersion.cpp and FileVersion.h
Modified Paths:
--------------
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/FileVersion.cpp
trunk/Src/FileVersion.h
Added: trunk/Src/FileVersion.cpp
===================================================================
--- trunk/Src/FileVersion.cpp (rev 0)
+++ trunk/Src/FileVersion.cpp 2007-10-04 19:24:26 UTC (rev 4581)
@@ -0,0 +1,93 @@
+/**
+ * @file FileVersion.cpp
+ *
+ * @brief Implementation for FileVersion
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include "stdafx.h"
+#include "UnicodeString.h"
+#include "FileVersion.h"
+
+/**
+ * @brief Default constructor.
+ */
+FileVersion::FileVersion()
+: m_bFileVersionSet(FALSE)
+, m_fileVersionMS(0)
+, m_fileVersionLS(0)
+, m_bProductVersionSet(FALSE)
+, m_productVersionMS(0)
+, m_productVersionLS(0)
+{
+}
+
+/**
+ * @brief Reset version data to zeroes.
+ */
+void FileVersion::Clear()
+{
+ m_bFileVersionSet = FALSE;
+ m_fileVersionMS = 0;
+ m_fileVersionLS = 0;
+ m_bProductVersionSet = FALSE;
+ m_productVersionMS = 0;
+ m_productVersionLS = 0;
+}
+
+/**
+ * @brief Set file version number.
+ * @param [in] versionMS Most significant dword for version.
+ * @param [in] versionLS Least significant dword for version.
+ */
+void FileVersion::SetFileVersion(DWORD versionMS, DWORD versionLS)
+{
+ m_bFileVersionSet = TRUE;
+ m_fileVersionMS = versionMS;
+ m_fileVersionLS = versionLS;
+}
+
+/**
+ * @brief Set product version number.
+ * @param [in] versionMS Most significant dword for version.
+ * @param [in] versionLS Least significant dword for version.
+ */
+void FileVersion::SetProductVersion(DWORD versionMS, DWORD versionLS)
+{
+ m_bProductVersionSet = TRUE;
+ m_fileVersionMS = versionMS;
+ m_fileVersionLS = versionLS;
+}
+
+/**
+ * @brief Get file version as a string.
+ * @return File version number as a string.
+ */
+String FileVersion::GetFileVersionString()
+{
+ if (!m_bFileVersionSet)
+ return _T("0.0.0.0");
+
+ TCHAR ver[30] = {0};
+ _stprintf(ver, _T("%u.%u.%u.%u"), HIWORD(m_fileVersionMS),
+ LOWORD(m_fileVersionMS), HIWORD(m_fileVersionLS),
+ LOWORD(m_fileVersionLS));
+ return ver;
+}
+
+/**
+ * @brief Get product version as a string.
+ * @return Product version number as a string.
+ */
+String FileVersion::GetProductVersionString()
+{
+ if (!m_bProductVersionSet)
+ return _T("0.0.0.0");
+
+ TCHAR ver[30] = {0};
+ _stprintf(ver, _T("%u.%u.%u.%u"), HIWORD(m_productVersionMS),
+ LOWORD(m_productVersionMS), HIWORD(m_productVersionLS),
+ LOWORD(m_productVersionLS));
+ return ver;
+}
Property changes on: trunk/Src/FileVersion.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Src/FileVersion.h
===================================================================
--- trunk/Src/FileVersion.h (rev 0)
+++ trunk/Src/FileVersion.h 2007-10-04 19:24:26 UTC (rev 4581)
@@ -0,0 +1,37 @@
+/**
+ * @file FileVersion.h
+ *
+ * @brief Declaration file for FileVersion
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _FILE_VERSION_H_
+#define _FILE_VERSION_H_
+
+/**
+ * @brief A class that contains file version information.
+ * This class contains file version information that Windows allows
+ * file to have (file version, product version).
+ */
+class FileVersion
+{
+private:
+ BOOL m_bFileVersionSet; //*< Is file version set? */
+ BOOL m_bProductVersionSet; //*< Is product version set? */
+ DWORD m_fileVersionMS; //*< File version most significant dword. */
+ DWORD m_fileVersionLS; //*< File version least significant dword. */
+ DWORD m_productVersionMS; //*< Product version most significant dword. */
+ DWORD m_productVersionLS; //*< Product version least significant dword. */
+
+public:
+ FileVersion();
+ void Clear();
+ void SetFileVersion(DWORD versionMS, DWORD versionLS);
+ void SetProductVersion(DWORD versionMS, DWORD versionLS);
+
+ String GetFileVersionString();
+ String GetProductVersionString();
+};
+
+#endif // _FILE_VERSION_H_
Property changes on: trunk/Src/FileVersion.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-10-04 10:11:09 UTC (rev 4580)
+++ trunk/Src/Merge.dsp 2007-10-04 19:24:26 UTC (rev 4581)
@@ -445,6 +445,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FileVersion.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\FilterCommentsManager.cpp
# End Source File
# Begin Source File
@@ -1205,6 +1209,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FileVersion.h
+# End Source File
+# Begin Source File
+
SOURCE=.\FilterCommentsManager.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: <jt...@us...> - 2007-10-05 09:03:31
|
Revision: 4583
http://winmerge.svn.sourceforge.net/winmerge/?rev=4583&view=rev
Author: jtuc
Date: 2007-10-05 02:03:29 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/OpenDlg.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-10-05 07:27:00 UTC (rev 4582)
+++ trunk/Src/MainFrm.cpp 2007-10-05 09:03:29 UTC (rev 4583)
@@ -375,6 +375,7 @@
*/
static void FixupDebugMenu(BCMenu * menu)
{
+ theApp.TranslateMenu(menu->m_hMenu);
bool DebugMenu = false;
#ifdef _DEBUG
DebugMenu = true;
@@ -1566,7 +1567,7 @@
*/
void CMainFrame::UpdateResources()
{
- m_wndStatusBar.SetPaneText(0, LoadResString(AFX_IDS_IDLEMESSAGE));
+ m_wndStatusBar.SetPaneText(0, theApp.LoadString(AFX_IDS_IDLEMESSAGE).c_str());
DirDocList dirdocs;
GetAllDirDocs(&dirdocs);
@@ -1687,6 +1688,20 @@
pCmdUI->Enable(TRUE);
}
+/**
+ * @brief Handle translation of default messages on the status bar
+ */
+void CMainFrame::GetMessageString(UINT nID, CString& rMessage) const
+{
+ // load appropriate string
+ const String s = theApp.LoadString(nID);
+ if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+ {
+ // not found
+ TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
+ }
+}
+
void CMainFrame::ActivateFrame(int nCmdShow)
{
if (!m_bFirstTime)
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2007-10-05 07:27:00 UTC (rev 4582)
+++ trunk/Src/MainFrm.h 2007-10-05 09:03:29 UTC (rev 4583)
@@ -131,6 +131,7 @@
bool AskCloseConfirmation();
// Overrides
+ virtual void GetMessageString(UINT nID, CString& rMessage) const;
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CMainFrame)
public:
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-10-05 07:27:00 UTC (rev 4582)
+++ trunk/Src/Merge.cpp 2007-10-05 09:03:29 UTC (rev 4583)
@@ -753,6 +753,30 @@
}
/**
+ * @brief Translate menu to current WinMerge GUI language
+ */
+void CMergeApp::TranslateMenu(HMENU h) const
+{
+ m_pLangDlg->TranslateMenu(h);
+}
+
+/**
+ * @brief Translate dialog to current WinMerge GUI language
+ */
+void CMergeApp::TranslateDialog(HWND h) const
+{
+ m_pLangDlg->TranslateDialog(h);
+}
+
+/**
+ * @brief Load string an translate to current WinMerge GUI language
+ */
+String CMergeApp::LoadString(UINT id) const
+{
+ return m_pLangDlg->LoadString(id);
+}
+
+/**
* @brief Reload main menu(s) (for language change)
*/
void CMergeApp::ReloadMenu()
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-10-05 07:27:00 UTC (rev 4582)
+++ trunk/Src/Merge.h 2007-10-05 09:03:29 UTC (rev 4583)
@@ -65,6 +65,9 @@
FileFilterHelper m_globalFileFilter;
WORD GetLangId() const;
+ void TranslateMenu(HMENU) const;
+ void TranslateDialog(HWND) const;
+ String LoadString(UINT) const;
CMergeApp();
~CMergeApp();
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2007-10-05 07:27:00 UTC (rev 4582)
+++ trunk/Src/OpenDlg.cpp 2007-10-05 09:03:29 UTC (rev 4583)
@@ -131,6 +131,7 @@
*/
BOOL COpenDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
// setup handler for resizing this dialog
@@ -513,18 +514,14 @@
void COpenDlg::SetStatus(UINT msgID)
{
- CString msg;
- if (msgID > 0)
- VERIFY(msg.LoadString(msgID));
- SetDlgItemText(IDC_OPEN_STATUS, msg);
+ String msg = theApp.LoadString(msgID);
+ SetDlgItemText(IDC_OPEN_STATUS, msg.c_str());
}
void COpenDlg::SetUnpackerStatus(UINT msgID)
{
- CString msg;
- if (msgID > 0)
- VERIFY(msg.LoadString(msgID));
- SetDlgItemText(IDC_UNPACKER_EDIT, msg);
+ String msg = theApp.LoadString(msgID);
+ SetDlgItemText(IDC_UNPACKER_EDIT, msg.c_str());
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-05 09:39:29
|
Revision: 4584
http://winmerge.svn.sourceforge.net/winmerge/?rev=4584&view=rev
Author: kimmov
Date: 2007-10-05 02:39:27 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Cleanup dir compare thread code.
Modified Paths:
--------------
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
trunk/Src/DirDoc.cpp
trunk/Src/DirView.cpp
trunk/Src/MainFrm.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2007-10-05 09:03:29 UTC (rev 4583)
+++ trunk/Src/DiffThread.cpp 2007-10-05 09:39:27 UTC (rev 4584)
@@ -19,7 +19,7 @@
*
* @brief Code for DiffThread class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -32,10 +32,17 @@
#include "CompareStats.h"
#include "IAbortable.h"
-// Set this to true in order to single step
-// through entire compare process all in a single thread
-// Either edit this line, or breakpoint & change it in CompareDirectories() below
-static bool bSinglethreaded=false;
+/**
+ * @brief Force compare to be single-threaded.
+ * Set this to true in order to single step through entire compare process all
+ * in a single thread. Either edit this line, or breakpoint & change it in
+ * CompareDirectories() below.
+ *
+ * If you are going to debug compare procdure, you most probably need to set
+ * this to true. As Visual Studio seems to have real problems with debugging
+ * these threads otherwise.
+ */
+static bool bSinglethreaded = false;
/**
* @brief Structure used in sending data to the threads.
@@ -44,23 +51,23 @@
*/
struct DiffFuncStruct
{
- CString path1;
- CString path2;
- CDiffContext * context;
- UINT msgUIUpdate;
- HWND hWindow;
- UINT nThreadState;
- BOOL bRecursive;
- DiffThreadAbortable * m_pAbortgate;
- bool bOnlyRequested;
- DiffItemList *pItemList;
- HANDLE hEvent;
+ CString path1; /**< First path to compare. */
+ CString path2; /**< Second path to compare. */
+ CDiffContext * context; /**< Compare context. */
+ UINT msgUIUpdate; /**< Windows message for updating GUI. */
+ HWND hWindow; /**< Window getting status updates. */
+ CDiffThread::ThreadState nThreadState; /**< Thread state. */
+ BOOL bRecursive; /**< Is compare recursive (subfolders included)? */
+ DiffThreadAbortable * m_pAbortgate; /**< Interface for aborting compare. */
+ bool bOnlyRequested; /**< Compare only requested items? */
+ DiffItemList *pItemList; /**< List of items to compare. */
+ HANDLE hEvent; /**< Event for synchronizing thread start. */
DiffFuncStruct()
: context(NULL)
, msgUIUpdate(0)
, hWindow(0)
- , nThreadState(THREAD_NOTSTARTED)
+ , nThreadState(CDiffThread::THREAD_NOTSTARTED)
, bRecursive(FALSE)
, m_pAbortgate(NULL)
, bOnlyRequested(false)
@@ -84,7 +91,7 @@
};
/**
- * @brief Default constructor
+ * @brief Default constructor.
*/
CDiffThread::CDiffThread()
: m_pDiffContext(NULL)
@@ -97,6 +104,9 @@
m_pAbortgate = new DiffThreadAbortable(this);
}
+/**
+ * @brief Destructor, release resources.
+ */
CDiffThread::~CDiffThread()
{
CloseHandle(m_pDiffParm->hEvent);
@@ -105,7 +115,8 @@
}
/**
- * @brief Sets context pointer forwarded to thread
+ * @brief Sets context pointer forwarded to thread.
+ * @param [in] pCtx Pointer to compare context.
*/
void CDiffThread::SetContext(CDiffContext * pCtx)
{
@@ -113,7 +124,11 @@
}
/**
- * @brief Start directory compare thread
+ * @brief Start and run directory compare thread.
+ * @param [in] dir1 First directory to compare.
+ * @param [in] dir2 Second directory to compare.
+ * @param [in] bRecursive Is the compare recursive (subfolders included)?
+ * @return Success (1) or error for thread. Currently always 1.
*/
UINT CDiffThread::CompareDirectories(const CString & dir1,
const CString & dir2, BOOL bRecursive)
@@ -150,7 +165,8 @@
}
/**
- * @brief Set window receiving messages thread sends
+ * @brief Set window receiving messages thread sends.
+ * @param [in] hWnd Hand to window to receive messages.
*/
void CDiffThread::SetHwnd(HWND hWnd)
{
@@ -158,9 +174,10 @@
}
/**
- * @brief Set message-id and -number for messages thread sends to window
+ * @brief Set message-id for update message.
+ * @param [in] updateMsg Message-id for update message.
*/
-void CDiffThread::SetMessageIDs(UINT updateMsg, UINT statusMsg)
+void CDiffThread::SetMessageIDs(UINT updateMsg)
{
m_msgUpdateUI = updateMsg;
}
@@ -194,7 +211,6 @@
{
PathContext paths;
DiffFuncStruct *myStruct = (DiffFuncStruct *) lpParam;
- HWND hWnd = myStruct->hWindow;
UINT msgID = myStruct->msgUIUpdate;
bool bOnlyRequested = myStruct->bOnlyRequested;
myStruct->context->m_bCollectReady = FALSE;
@@ -297,7 +313,7 @@
myStruct->pItemList->RemoveAll();
// Send message to UI to update
- myStruct->nThreadState = THREAD_COMPLETED;
+ myStruct->nThreadState = CDiffThread::THREAD_COMPLETED;
// msgID=MSG_UI_UPDATE=1025 (2005-11-29, Perry)
PostMessage(hWnd, msgID, NULL, NULL);
return 1;
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2007-10-05 09:03:29 UTC (rev 4583)
+++ trunk/Src/DiffThread.h 2007-10-05 09:39:27 UTC (rev 4584)
@@ -19,10 +19,10 @@
*
* @brief Declaration file for CDiffThread
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
-#ifndef _DIFFTTHREAD_H
+#ifndef _DIFFTHREAD_H
#define _DIFFTHREAD_H
#include "diffcontext.h"
@@ -31,17 +31,6 @@
class DiffThreadAbortable;
/**
- * @brief Thread's statuses.
- */
-enum
-{
- THREAD_NOTSTARTED = 0,
- THREAD_COMPARING,
- THREAD_COMPLETED,
-};
-
-
-/**
* @brief Class for threaded folder compare.
* This class implements folder compare in two phases and in two threads:
* - first thread collects items to compare to compare-time list
@@ -51,13 +40,21 @@
class CDiffThread
{
public:
+ /** @brief Thread's states. */
+ enum ThreadState
+ {
+ THREAD_NOTSTARTED = 0, /**< Thread not started, idle. */
+ THREAD_COMPARING, /**< Thread running (comparing). */
+ THREAD_COMPLETED, /**< Thread has completed its task. */
+ };
+
// creation and use, called on main thread
CDiffThread();
~CDiffThread();
void SetContext(CDiffContext * pCtx);
UINT CompareDirectories(const CString & dir1, const CString & dir2, BOOL bRecursive);
void SetHwnd(HWND hWnd);
- void SetMessageIDs(UINT updateMsg, UINT statusMsg);
+ void SetMessageIDs(UINT updateMsg);
void SetCompareSelected(bool bSelected = false);
// runtime interface for main thread, called on main thread
@@ -84,4 +81,4 @@
UINT DiffThreadCollect(LPVOID lpParam);
UINT DiffThreadCompare(LPVOID lpParam);
-#endif /* _DIFFTHREAD_H */
\ No newline at end of file
+#endif /* _DIFFTHREAD_H */
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-10-05 09:03:29 UTC (rev 4583)
+++ trunk/Src/DirDoc.cpp 2007-10-05 09:39:27 UTC (rev 4584)
@@ -318,7 +318,7 @@
// If we're already doing a rescan, bail out
UINT threadState = m_diffThread.GetThreadState();
- if (threadState == THREAD_COMPARING)
+ if (threadState == CDiffThread::THREAD_COMPARING)
return;
m_statusCursor = new CustomStatusCursor(0, IDC_APPSTARTING, LoadResString(IDS_STATUS_RESCANNING));
@@ -374,7 +374,7 @@
m_diffThread.SetContext(m_pCtxt);
m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd());
- m_diffThread.SetMessageIDs(MSG_UI_UPDATE, MSG_STAT_UPDATE);
+ m_diffThread.SetMessageIDs(MSG_UI_UPDATE);
m_diffThread.SetCompareSelected(!!m_bMarkedRescan);
m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft(),
m_pCtxt->GetNormalizedRight(), m_bRecursive);
@@ -853,7 +853,7 @@
BOOL CDirDoc::SaveModified()
{
// Do not allow closing if there is a thread running
- if (m_diffThread.GetThreadState() == THREAD_COMPARING)
+ if (m_diffThread.GetThreadState() == CDiffThread::THREAD_COMPARING)
return FALSE;
return CDocument::SaveModified();
@@ -875,7 +875,7 @@
*/
bool CDirDoc::IsCurrentScanAbortable() const
{
- return (m_diffThread.GetThreadState() == THREAD_COMPARING
+ return (m_diffThread.GetThreadState() == CDiffThread::THREAD_COMPARING
&& !m_diffThread.IsAborting());
}
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2007-10-05 09:03:29 UTC (rev 4583)
+++ trunk/Src/DirView.cpp 2007-10-05 09:39:27 UTC (rev 4584)
@@ -2100,7 +2100,7 @@
void CDirView::OnUpdateRefresh(CCmdUI* pCmdUI)
{
UINT threadState = GetDocument()->m_diffThread.GetThreadState();
- pCmdUI->Enable(threadState != THREAD_COMPARING);
+ pCmdUI->Enable(threadState != CDiffThread::THREAD_COMPARING);
}
/**
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-10-05 09:03:29 UTC (rev 4583)
+++ trunk/Src/MainFrm.cpp 2007-10-05 09:39:27 UTC (rev 4584)
@@ -1594,7 +1594,7 @@
{
CDirDoc * pDirDoc = dirdocs.RemoveHead();
UINT threadState = pDirDoc->m_diffThread.GetThreadState();
- if (threadState == THREAD_COMPARING)
+ if (threadState == CDiffThread::THREAD_COMPARING)
return TRUE;
}
return FALSE;
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2007-10-05 09:03:29 UTC (rev 4583)
+++ trunk/Src/StdAfx.h 2007-10-05 09:39:27 UTC (rev 4584)
@@ -64,10 +64,8 @@
/* @{ */
/// Directory compare thread asks UI (view) update
const UINT MSG_UI_UPDATE = WM_USER + 1;
-/// New item compared, update statepane
-const UINT MSG_STAT_UPDATE = WM_USER + 2;
/// Request to save panesizes
-const UINT MSG_STORE_PANESIZES = WM_USER + 3;
+const UINT MSG_STORE_PANESIZES = WM_USER + 2;
/* @} */
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-05 10:24:05
|
Revision: 4586
http://winmerge.svn.sourceforge.net/winmerge/?rev=4586&view=rev
Author: kimmov
Date: 2007-10-05 03:24:01 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Cleanup SaveClosing dialog code, add comments.
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
trunk/Src/SaveClosingDlg.cpp
trunk/Src/SaveClosingDlg.h
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2007-10-05 09:39:58 UTC (rev 4585)
+++ trunk/Src/MergeDoc.cpp 2007-10-05 10:24:01 UTC (rev 4586)
@@ -2496,13 +2496,13 @@
if (dlg.DoModal() == IDOK)
{
- if (bLModified && dlg.m_leftSave == SAVECLOSING_SAVE)
+ if (bLModified && dlg.m_leftSave == SaveClosingDlg::SAVECLOSING_SAVE)
{
if (!DoSave(m_filePaths.GetLeft(), bLSaveSuccess, 0))
result = FALSE;
}
- if (bRModified && dlg.m_rightSave == SAVECLOSING_SAVE)
+ if (bRModified && dlg.m_rightSave == SaveClosingDlg::SAVECLOSING_SAVE)
{
if (!DoSave(m_filePaths.GetRight(), bRSaveSuccess, 1))
result = FALSE;
Modified: trunk/Src/SaveClosingDlg.cpp
===================================================================
--- trunk/Src/SaveClosingDlg.cpp 2007-10-05 09:39:58 UTC (rev 4585)
+++ trunk/Src/SaveClosingDlg.cpp 2007-10-05 10:24:01 UTC (rev 4586)
@@ -19,7 +19,7 @@
*
* @brief Implementation file for SaveClosingDlg dialog
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -36,16 +36,18 @@
IMPLEMENT_DYNAMIC(SaveClosingDlg, CDialog)
+/**
+ * @brief Constructor.
+ * @param [in] pParent Dialog's parent window.
+ */
SaveClosingDlg::SaveClosingDlg(CWnd* pParent /*=NULL*/)
- : CDialog(SaveClosingDlg::IDD, pParent)
+ : CDialog(SaveClosingDlg::IDD, pParent)
+ , m_leftSave(SAVECLOSING_SAVE)
+ , m_rightSave(SAVECLOSING_SAVE)
+ , m_bAskForLeft(FALSE)
+ , m_bAskForRight(FALSE)
+ , m_bDisableCancel(FALSE)
{
- //{{AFX_DATA_INIT(SaveClosingDlg)
- m_leftSave = SAVECLOSING_SAVE; // Default to save
- m_rightSave = SAVECLOSING_SAVE;
- m_bAskForLeft = FALSE;
- m_bAskForRight = FALSE;
- m_bDisableCancel = FALSE;
- //}}AFX_DATA_INIT
}
void SaveClosingDlg::DoDataExchange(CDataExchange* pDX)
@@ -70,6 +72,10 @@
/////////////////////////////////////////////////////////////////////////////
// SaveClosingDlg message handlers
+/**
+ * @brief Initialize dialog.
+ * @return Always TRUE.
+ */
BOOL SaveClosingDlg::OnInitDialog()
{
CDialog::OnInitDialog();
@@ -117,13 +123,14 @@
m_constraint.SubclassWnd(); // install subclassing
m_constraint.LoadPosition(_T("ResizeableDialogs"), _T("SaveClosingDlg"), false); // persist size via registry
-
return FALSE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
/**
* @brief Select files to ask about saving.
+ * @param [in] bLeft Do we ask about left-side file?
+ * @param [in] bRight Do we ask about right-side file?
*/
void SaveClosingDlg::DoAskFor(BOOL bLeft /*= FALSE*/, BOOL bRight /*= FALSE*/)
{
Modified: trunk/Src/SaveClosingDlg.h
===================================================================
--- trunk/Src/SaveClosingDlg.h 2007-10-05 09:39:58 UTC (rev 4585)
+++ trunk/Src/SaveClosingDlg.h 2007-10-05 10:24:01 UTC (rev 4586)
@@ -31,15 +31,6 @@
#include "CMoveConstraint.h"
#endif
-/**
- * @brief Choices for modified files: save/discard changes.
- */
-enum SAVECLOSING_CHOICE
-{
- SAVECLOSING_SAVE = 0, //*< Save changes */
- SAVECLOSING_DISCARD, //*< Discard changes */
-};
-
/////////////////////////////////////////////////////////////////////////////
// SaveClosingDlg dialog
@@ -56,17 +47,25 @@
DECLARE_DYNAMIC(SaveClosingDlg)
public:
+
+ /** @brief Choices for modified files: save/discard changes. */
+ enum SAVECLOSING_CHOICE
+ {
+ SAVECLOSING_SAVE = 0, /**< Save changes */
+ SAVECLOSING_DISCARD, /**< Discard changes */
+ };
+
SaveClosingDlg(CWnd* pParent = NULL); // standard constructor
void DoAskFor(BOOL bLeft = FALSE, BOOL bRight = FALSE);
// Dialog Data
//{{AFX_DATA(SaveClosingDlg)
enum { IDD = IDD_SAVECLOSING };
- CString m_sLeftFile;
- CString m_sRightFile;
- int m_leftSave;
- int m_rightSave;
- BOOL m_bDisableCancel;
+ CString m_sLeftFile; /**< Path to left-file to save. */
+ CString m_sRightFile; /**< Path to right-side file to save. */
+ int m_leftSave; /**< User's choice for left-side save. */
+ int m_rightSave; /**< User's choice for righ-side save. */
+ BOOL m_bDisableCancel; /**< Should we disable Cancel-button? */
//}}AFX_DATA
protected:
@@ -81,9 +80,9 @@
// Implementation data
private:
- prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */
- BOOL m_bAskForLeft; //*< Is left file modified? */
- BOOL m_bAskForRight; //*< Is right file modified? */
+ prdlg::CMoveConstraint m_constraint; /**< Resizes dialog controls when dialog resized */
+ BOOL m_bAskForLeft; /**< Is left file modified? */
+ BOOL m_bAskForRight; /**< Is right file modified? */
};
#endif // _SAVECLOSINGDLG_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-05 10:59:04
|
Revision: 4587
http://winmerge.svn.sourceforge.net/winmerge/?rev=4587&view=rev
Author: kimmov
Date: 2007-10-05 03:59:01 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Add comments to VSS properties dialog.
Modified Paths:
--------------
trunk/Src/PropVss.cpp
trunk/Src/PropVss.h
Modified: trunk/Src/PropVss.cpp
===================================================================
--- trunk/Src/PropVss.cpp 2007-10-05 10:24:01 UTC (rev 4586)
+++ trunk/Src/PropVss.cpp 2007-10-05 10:59:01 UTC (rev 4587)
@@ -18,8 +18,13 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
/////////////////////////////////////////////////////////////////////////////
-// PropVss.cpp : implementation file
-//
+/**
+ * @file PropVss.cpp
+ *
+ * @brief VSS properties dialog implementation.
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
#include "stdafx.h"
#include "FileOrFolderSelect.h"
@@ -37,16 +42,16 @@
/////////////////////////////////////////////////////////////////////////////
// CPropVss property page
+/**
+ * @brief Constructor.
+ * @param [in] optionsMgr Pointer to options manager.
+ */
CPropVss::CPropVss(COptionsMgr *optionsMgr) : CPropertyPage(CPropVss::IDD)
, m_pOptionsMgr(optionsMgr)
, m_nVerSys(-1)
{
}
-CPropVss::~CPropVss()
-{
-}
-
void CPropVss::DoDataExchange(CDataExchange* pDX)
{
CPropertyPage::DoDataExchange(pDX);
@@ -88,7 +93,10 @@
/////////////////////////////////////////////////////////////////////////////
// CPropVss message handlers
-void CPropVss::OnBrowseButton()
+/**
+ * @brief Called when Browse-button is selected.
+ */
+void CPropVss::OnBrowseButton()
{
CString s;
if (SelectFile(GetSafeHwnd(), s))
@@ -98,6 +106,10 @@
}
}
+/**
+ * @brief Initialized the dialog.
+ * @return Always TRUE.
+ */
BOOL CPropVss::OnInitDialog()
{
CPropertyPage::OnInitDialog();
@@ -110,6 +122,9 @@
return TRUE;
}
+/**
+ * @brief Called when user has selected VSS version.
+ */
void CPropVss::OnSelendokVerSys()
{
UpdateData(TRUE);
Modified: trunk/Src/PropVss.h
===================================================================
--- trunk/Src/PropVss.h 2007-10-05 10:24:01 UTC (rev 4586)
+++ trunk/Src/PropVss.h 2007-10-05 10:59:01 UTC (rev 4587)
@@ -1,8 +1,10 @@
/**
* @file PropVss.h
*
- * @brief Declaration of CPropVss
+ * @brief Declaration of VSS properties dialog.
*/
+// ID line follows -- this is updated by SVN
+// $Id$
#if !defined(AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
#define AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_
@@ -21,7 +23,6 @@
// Construction & Destruction
public:
CPropVss(COptionsMgr *optionsMgr);
- ~CPropVss();
// Implement IOptionsPanel
virtual void ReadOptions();
@@ -59,7 +60,7 @@
DECLARE_MESSAGE_MAP()
private:
- COptionsMgr * m_pOptionsMgr;
+ COptionsMgr * m_pOptionsMgr; /**< Options manager. */
};
//{{AFX_INSERT_LOCATION}}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-05 11:35:55
|
Revision: 4588
http://winmerge.svn.sourceforge.net/winmerge/?rev=4588&view=rev
Author: jtuc
Date: 2007-10-05 04:35:46 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/DirActions.cpp
trunk/Src/DirCmpReportDlg.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
trunk/Src/MainFrm.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/PropArchive.cpp
trunk/Src/PropBackups.cpp
trunk/Src/PropCodepage.cpp
trunk/Src/PropColors.cpp
trunk/Src/PropColors.h
trunk/Src/PropCompare.cpp
trunk/Src/PropEditor.cpp
trunk/Src/PropGeneral.cpp
trunk/Src/PropLineFilter.cpp
trunk/Src/PropRegistry.cpp
trunk/Src/PropSyntaxColors.cpp
trunk/Src/PropSyntaxColors.h
trunk/Src/PropTextColors.cpp
trunk/Src/PropVss.cpp
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/DirActions.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -495,10 +495,8 @@
{
CString destPath;
CString startPath;
- CString msg;
- VERIFY(msg.LoadString(IDS_SELECT_DEST_LEFT));
- if (!SelectFolder(destPath, startPath, msg))
+ if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_LEFT))
return;
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
@@ -564,10 +562,8 @@
{
CString destPath;
CString startPath;
- CString msg;
- VERIFY(msg.LoadString(IDS_SELECT_DEST_RIGHT));
- if (!SelectFolder(destPath, startPath, msg))
+ if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_RIGHT))
return;
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
@@ -633,10 +629,8 @@
{
CString destPath;
CString startPath;
- CString msg;
- VERIFY(msg.LoadString(IDS_SELECT_DEST_LEFT));
- if (!SelectFolder(destPath, startPath, msg))
+ if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_LEFT))
return;
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_MOVEFILES));
@@ -699,10 +693,8 @@
{
CString destPath;
CString startPath;
- CString msg;
- VERIFY(msg.LoadString(IDS_SELECT_DEST_RIGHT));
- if (!SelectFolder(destPath, startPath, msg))
+ if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_RIGHT))
return;
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_MOVEFILES));
Modified: trunk/Src/DirCmpReportDlg.cpp
===================================================================
--- trunk/Src/DirCmpReportDlg.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/DirCmpReportDlg.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -14,6 +14,7 @@
#include "DirReportTypes.h"
#include "paths.h"
#include "FileOrFolderSelect.h"
+#include "Merge.h"
IMPLEMENT_DYNAMIC(DirCmpReportDlg, CDialog)
@@ -86,6 +87,7 @@
*/
BOOL DirCmpReportDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
m_ctlReportFile.LoadState(_T("ReportFiles"));
@@ -113,12 +115,11 @@
{
UpdateData(TRUE);
- CString title = LoadResString(IDS_SAVE_AS_TITLE);
CString folder = m_sReportFile;
int filterid = f_types[m_ctlStyle.GetCurSel()].browseFilter;
CString chosenFilepath;
- if (SelectFile(GetSafeHwnd(), chosenFilepath, folder, title,
+ if (SelectFile(GetSafeHwnd(), chosenFilepath, folder, IDS_SAVE_AS_TITLE,
filterid, FALSE))
{
m_sReportFile = chosenFilepath;
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/FileFiltersDlg.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -128,17 +128,17 @@
newstyle |= LVS_EX_INFOTIP;
m_listFilters.SetExtendedStyle(m_listFilters.GetExtendedStyle() | newstyle);
- CString title = LoadResString(IDS_FILTERFILE_NAMETITLE);
- m_listFilters.InsertColumn(0, title,LVCFMT_LEFT, 150);
- title = LoadResString(IDS_FILTERFILE_DESCTITLE);
- m_listFilters.InsertColumn(1, title, LVCFMT_LEFT, 350);
- title = LoadResString(IDS_FILTERFILE_PATHTITLE);
- m_listFilters.InsertColumn(2, title,LVCFMT_LEFT, 350);
+ String title = theApp.LoadString(IDS_FILTERFILE_NAMETITLE);
+ m_listFilters.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150);
+ title = theApp.LoadString(IDS_FILTERFILE_DESCTITLE);
+ m_listFilters.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 350);
+ title = theApp.LoadString(IDS_FILTERFILE_PATHTITLE);
+ m_listFilters.InsertColumn(2, title.c_str(), LVCFMT_LEFT, 350);
- title = LoadResString(IDS_USERCHOICE_NONE);
- m_listFilters.InsertItem(1, title);
- m_listFilters.SetItemText(0, 1, title);
- m_listFilters.SetItemText(0, 2, title);
+ title = theApp.LoadString(IDS_USERCHOICE_NONE);
+ m_listFilters.InsertItem(1, title.c_str());
+ m_listFilters.SetItemText(0, 1, title.c_str());
+ m_listFilters.SetItemText(0, 2, title.c_str());
int count = m_Filters->GetSize();
@@ -164,6 +164,7 @@
*/
BOOL FileFiltersDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
InitList();
@@ -268,10 +269,10 @@
*/
bool FileFiltersDlg::IsFilterItemNone(int item) const
{
- CString txtNone = LoadResString(IDS_USERCHOICE_NONE);
+ String txtNone = theApp.LoadString(IDS_USERCHOICE_NONE);
CString txt = m_listFilters.GetItemText(item, 0);
- return (txt.CompareNoCase(txtNone) == 0);
+ return (txt.CompareNoCase(txtNone.c_str()) == 0);
}
/**
@@ -377,7 +378,6 @@
*/
void FileFiltersDlg::OnBnClickedFilterfileNewbutton()
{
- CString title = LoadResString(IDS_FILEFILTER_SAVENEW);
CString globalPath = theApp.m_globalFileFilter.GetGlobalFilterPathWithCreate();
CString userPath = theApp.m_globalFileFilter.GetUserFilterPathWithCreate();
@@ -414,7 +414,7 @@
path += '\\';
CString s;
- if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ if (SelectFile(GetSafeHwnd(), s, path, IDS_FILEFILTER_SAVENEW, IDS_FILEFILTER_FILEMASK,
FALSE))
{
// Fix file extension
@@ -542,9 +542,8 @@
CString s;
CString path;
CString userPath = theApp.m_globalFileFilter.GetUserFilterPathWithCreate();
- CString title = LoadResString(IDS_FILEFILTER_INSTALL);
- if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ if (SelectFile(GetSafeHwnd(), s, path, IDS_FILEFILTER_INSTALL, IDS_FILEFILTER_FILEMASK,
TRUE))
{
String sfile, sext;
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/FileOrFolderSelect.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -30,6 +30,7 @@
#include "FileOrFolderSelect.h"
#include "coretools.h"
#include "paths.h"
+#include "Merge.h"
// VC 6 headers don't define these constants for folder browse dialog
// so define them here. Copied from shlobj.h
@@ -65,7 +66,7 @@
* @param [in] defaultExtension Extension to append if user doesn't provide one
*/
BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
- LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
+ UINT titleid /*=0*/, UINT filterid /*=0*/,
BOOL is_open /*=TRUE*/, LPCTSTR defaultExtension /*=NULL*/)
{
path.Empty(); // Clear output param
@@ -93,13 +94,13 @@
if (!filterid)
filterid = IDS_ALLFILES;
- CString filters = LoadResString(filterid);
+ String title = theApp.LoadString(titleid);
+ String filters = theApp.LoadString(filterid);
// Convert extension mask from MFC style separators ('|')
// to Win32 style separators ('\0')
- LPTSTR filtersStr = filters.GetBuffer(0);
+ LPTSTR filtersStr = &*filters.begin();
ConvertFilter(filtersStr);
- filters.ReleaseBuffer();
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(ofn));
@@ -111,7 +112,7 @@
ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
ofn.nMaxFile = MAX_PATH;
ofn.lpstrInitialDir = initialPath;
- ofn.lpstrTitle = title;
+ ofn.lpstrTitle = title.c_str();
ofn.lpstrFileTitle = NULL;
if (defaultExtension)
ofn.lpstrDefExt = defaultExtension;
@@ -141,7 +142,7 @@
* @return TRUE if valid folder selected (not cancelled)
*/
BOOL SelectFolder(CString& path, LPCTSTR root_path /*=NULL*/,
- LPCTSTR title /*=NULL*/,
+ UINT titleid /*=0*/,
HWND hwndOwner /*=NULL*/)
{
UNREFERENCED_PARAMETER(root_path);
@@ -150,11 +151,12 @@
LPITEMIDLIST pidl;
TCHAR szPath[MAX_PATH] = {0};
BOOL bRet = FALSE;
-
+ String title = theApp.LoadString(titleid);
+
bi.hwndOwner = hwndOwner;
bi.pidlRoot = NULL; // Start from desktop folder
bi.pszDisplayName = szPath;
- bi.lpszTitle = title;
+ bi.lpszTitle = title.c_str();
bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
bi.lpfn = NULL;
bi.lParam = NULL;
@@ -192,11 +194,8 @@
*/
BOOL SelectFileOrFolder(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/)
{
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
+ String title = theApp.LoadString(IDS_OPEN_TITLE);
- CString dirSelTag;
-
// This will tell common file dialog what to show
// and also this will hold its return value
CString sSelectedFile;
@@ -222,18 +221,19 @@
if (!filterid)
filterid = IDS_ALLFILES;
- CString filters;
- VERIFY(filters.LoadString(filterid));
+
+ String filters = theApp.LoadString(filterid);
+
// Convert extension mask from MFC style separators ('|')
// to Win32 style separators ('\0')
- LPTSTR filtersStr = filters.GetBuffer(0);
+ LPTSTR filtersStr = &*filters.begin();
ConvertFilter(filtersStr);
- VERIFY(dirSelTag.LoadString(IDS_DIRSEL_TAG));
+ String dirSelTag = theApp.LoadString(IDS_DIRSEL_TAG);
// Set initial filename to folder selection tag
dirSelTag += _T("."); // Treat it as filename
- sSelectedFile = dirSelTag;
+ sSelectedFile = dirSelTag.c_str(); // What is assignment above good for?
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(ofn));
@@ -245,7 +245,7 @@
ofn.lpstrFile = sSelectedFile.GetBuffer(MAX_PATH);
ofn.nMaxFile = MAX_PATH;
ofn.lpstrInitialDir = initialPath;
- ofn.lpstrTitle = title;
+ ofn.lpstrTitle = title.c_str();
ofn.lpstrFileTitle = NULL;
ofn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | OFN_NOTESTFILECREATE;
@@ -284,16 +284,9 @@
*/
void ConvertFilter(LPTSTR filterStr)
{
- TCHAR *ch = 0;
- TCHAR *strPtr = filterStr;
- do
+ while (TCHAR *ch = _tcschr(filterStr, '|'))
{
- ch = _tcschr(strPtr, '|');
- if (ch)
- {
- strPtr = ch + 1;
- *ch = '\0';
- }
+ filterStr = ch + 1;
+ *ch = '\0';
}
- while (ch != 0);
}
Modified: trunk/Src/FileOrFolderSelect.h
===================================================================
--- trunk/Src/FileOrFolderSelect.h 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/FileOrFolderSelect.h 2007-10-05 11:35:46 UTC (rev 4588)
@@ -28,11 +28,11 @@
#define _FILE_OR_FOLDER_SELECTION_H_
BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath = NULL,
- LPCTSTR title = _T("Open"), UINT filterid = 0,
+ UINT titleid = IDS_OPEN_TITLE, UINT filterid = 0,
BOOL is_open =TRUE, LPCTSTR defaultExtension = NULL);
BOOL SelectFolder(CString& path, LPCTSTR root_path = NULL,
- LPCTSTR title = NULL,
+ UINT titleid = 0,
HWND hwndOwner = NULL);
BOOL SelectFileOrFolder(HWND parent, CString& path, LPCTSTR root_path = NULL);
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/MainFrm.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -916,8 +916,7 @@
case IDNO:
if (!bMultiFile)
{
- VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
- if (SelectFile(GetSafeHwnd(), s, strSavePath, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, strSavePath, IDS_SAVE_AS_TITLE, NULL, FALSE))
{
strSavePath = s;
nRetVal = IDNO;
@@ -2726,12 +2725,10 @@
void CMainFrame::OnFileOpenproject()
{
CString sFilepath;
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
// get the default projects path
String strProjectPath = GetOptionsMgr()->GetString(OPT_PROJECTS_PATH);
- if (!SelectFile(GetSafeHwnd(), sFilepath, strProjectPath.c_str(), title,
+ if (!SelectFile(GetSafeHwnd(), sFilepath, strProjectPath.c_str(), IDS_OPEN_TITLE,
IDS_PROJECTFILES, TRUE))
return;
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/MergeDoc.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -1010,7 +1010,7 @@
{
CString s;
CString strSavePath; // New path for next saving try
- CString title;
+ UINT titleid = 0;
BOOL result = TRUE;
int answer = IDOK; // Set default we use for scratchpads
int nActiveViewIndexType = GetActiveMergeViewIndexType();
@@ -1052,11 +1052,11 @@
{
case IDOK:
if (nBuffer == 0)
- VERIFY(title.LoadString(IDS_SAVE_LEFT_AS));
+ titleid = IDS_SAVE_LEFT_AS;
else
- VERIFY(title.LoadString(IDS_SAVE_RIGHT_AS));
+ titleid = IDS_SAVE_RIGHT_AS;
- if (SelectFile(parent, s, strPath, title, NULL, FALSE))
+ if (SelectFile(parent, s, strPath, titleid, NULL, FALSE))
{
CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer];
strSavePath = s;
@@ -1990,7 +1990,7 @@
if (!bForced)
if (!m_bEnableRescan) return;
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
+ WaitStatusCursor waitstatus(theApp.LoadString(IDS_STATUS_RESCANNING).c_str());
int nActiveViewIndexType = GetActiveMergeViewIndexType();
@@ -2867,8 +2867,8 @@
// Sensitive to EOL on, allow mixing EOL off, and files have a different EOL style.
// All lines will differ, that is not very interesting and probably not wanted.
// Propose to turn off the option 'sensitive to EOL'
- CString s = LoadResString(IDS_SUGGEST_IGNOREEOL);
- if (AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES)
+ String s = theApp.LoadString(IDS_SUGGEST_IGNOREEOL);
+ if (AfxMessageBox(s.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES)
{
diffOptions.bIgnoreEol = TRUE;
m_diffWrapper.SetOptions(&diffOptions);
@@ -3287,10 +3287,9 @@
*/
void CMergeDoc::OnToolsGenerateReport()
{
- CString s, folder, name, title;
+ CString s, folder;
- VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
- if (!SelectFile(GetMainFrame()->GetSafeHwnd(), s, folder, title, IDS_HTML_REPORT_FILES, FALSE, _T("htm")))
+ if (!SelectFile(GetMainFrame()->GetSafeHwnd(), s, folder, IDS_SAVE_AS_TITLE, IDS_HTML_REPORT_FILES, FALSE, _T("htm")))
return;
// calculate HTML font size
Modified: trunk/Src/PatchDlg.cpp
===================================================================
--- trunk/Src/PatchDlg.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PatchDlg.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -191,6 +191,7 @@
*/
BOOL CPatchDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
// Load combobox history
@@ -253,12 +254,9 @@
{
CString s;
CString folder;
- CString name;
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file1;
- if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, IDS_OPEN_TITLE, NULL, TRUE))
{
ChangeFile(s, TRUE);
m_ctlFile1.SetWindowText(s);
@@ -272,12 +270,9 @@
{
CString s;
CString folder;
- CString name;
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file2;
- if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, IDS_OPEN_TITLE, NULL, TRUE))
{
ChangeFile(s, FALSE);
m_ctlFile2.SetWindowText(s);
@@ -330,11 +325,9 @@
{
CString s;
CString folder;
- CString title;
- VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
folder = m_fileResult;
- if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, folder, IDS_SAVE_AS_TITLE, NULL, FALSE))
{
m_fileResult = s;
m_ctlResult.SetWindowText(s);
Modified: trunk/Src/PropArchive.cpp
===================================================================
--- trunk/Src/PropArchive.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropArchive.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -78,6 +78,7 @@
*/
BOOL CPropArchive::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
m_wwwLink.m_link = _T("http://winmerge.org/downloads.php");
UpdateData(FALSE);
Modified: trunk/Src/PropBackups.cpp
===================================================================
--- trunk/Src/PropBackups.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropBackups.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -100,6 +100,7 @@
*/
BOOL CPropBackups::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
return TRUE; // return TRUE unless you set the focus to a control
@@ -112,7 +113,7 @@
void CPropBackups::OnBnClickedBackupBrowse()
{
CString path;
- if (SelectFolder(path, NULL, _T(""), GetSafeHwnd()))
+ if (SelectFolder(path, NULL, 0, GetSafeHwnd()))
{
m_sGlobalFolder = path;
UpdateData(FALSE);
Modified: trunk/Src/PropCodepage.cpp
===================================================================
--- trunk/Src/PropCodepage.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropCodepage.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -99,6 +99,7 @@
BOOL CPropCodepage::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
CEdit * pEdit = (CEdit *) GetDlgItem(IDC_CUSTOM_CP_NUMBER);
Modified: trunk/Src/PropColors.cpp
===================================================================
--- trunk/Src/PropColors.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropColors.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -85,6 +85,15 @@
END_MESSAGE_MAP()
/**
+ * @brief Called before propertysheet is drawn.
+ */
+BOOL CPropMergeColors::OnInitDialog()
+{
+ theApp.TranslateDialog(m_hWnd);
+ return CPropertyPage::OnInitDialog();
+}
+
+/**
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
Modified: trunk/Src/PropColors.h
===================================================================
--- trunk/Src/PropColors.h 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropColors.h 2007-10-05 11:35:46 UTC (rev 4588)
@@ -83,6 +83,7 @@
//{{AFX_VIRTUAL(CPropMergeColors)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ virtual BOOL OnInitDialog();
//}}AFX_VIRTUAL
// Implementation
Modified: trunk/Src/PropCompare.cpp
===================================================================
--- trunk/Src/PropCompare.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropCompare.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -107,19 +107,20 @@
*/
BOOL CPropCompare::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
CComboBox * combo = (CComboBox*) GetDlgItem(IDC_COMPAREMETHODCOMBO);
- CString item = LoadResString(IDS_COMPMETHOD_FULL_CONTENTS);
- combo->AddString(item);
- item = LoadResString(IDS_COMPMETHOD_QUICK_CONTENTS);
- combo->AddString(item);
- item = LoadResString(IDS_COMPMETHOD_MODDATE);
- combo->AddString(item);
- item = LoadResString(IDS_COMPMETHOD_DATESIZE);
- combo->AddString(item);
- item = LoadResString(IDS_COMPMETHOD_SIZE);
- combo->AddString(item);
+ String item = theApp.LoadString(IDS_COMPMETHOD_FULL_CONTENTS);
+ combo->AddString(item.c_str());
+ item = theApp.LoadString(IDS_COMPMETHOD_QUICK_CONTENTS);
+ combo->AddString(item.c_str());
+ item = theApp.LoadString(IDS_COMPMETHOD_MODDATE);
+ combo->AddString(item.c_str());
+ item = theApp.LoadString(IDS_COMPMETHOD_DATESIZE);
+ combo->AddString(item.c_str());
+ item = theApp.LoadString(IDS_COMPMETHOD_SIZE);
+ combo->AddString(item.c_str());
combo->SetCurSel(m_compareMethod);
CButton * pBtn = (CButton*) GetDlgItem(IDC_COMPARE_STOPFIRST);
Modified: trunk/Src/PropEditor.cpp
===================================================================
--- trunk/Src/PropEditor.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropEditor.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -112,9 +112,9 @@
*/
BOOL CPropEditor::OnInitDialog()
{
- CDialog::OnInitDialog();
-
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
+
CEdit * pEdit = (CEdit *) GetDlgItem(IDC_TAB_EDIT);
// Limit max text of tabsize to 2 chars
@@ -135,8 +135,8 @@
void CPropEditor::LoadBreakTypeStrings()
{
CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_BREAK_TYPE);
- cbo->AddString(LoadResString(IDS_BREAK_ON_WHITESPACE));
- cbo->AddString(LoadResString(IDS_BREAK_ON_PUNCTUATION));
+ cbo->AddString(theApp.LoadString(IDS_BREAK_ON_WHITESPACE).c_str());
+ cbo->AddString(theApp.LoadString(IDS_BREAK_ON_PUNCTUATION).c_str());
}
/**
Modified: trunk/Src/PropGeneral.cpp
===================================================================
--- trunk/Src/PropGeneral.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropGeneral.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -65,18 +65,15 @@
BOOL CPropGeneral::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
CComboBox *pWnd = (CComboBox*)GetDlgItem(IDC_AUTO_COMPLETE_SOURCE);
ASSERT(NULL != pWnd);
- CString str;
- VERIFY(str.LoadString(IDS_AUTOCOMPLETE_DISABLED));
- pWnd->AddString(str);
- VERIFY(str.LoadString(IDS_AUTOCOMPLETE_FILE_SYS));
- pWnd->AddString(str);
- VERIFY(str.LoadString(IDS_AUTOCOMPLETE_MRU));
- pWnd->AddString(str);
+ pWnd->AddString(theApp.LoadString(IDS_AUTOCOMPLETE_DISABLED).c_str());
+ pWnd->AddString(theApp.LoadString(IDS_AUTOCOMPLETE_FILE_SYS).c_str());
+ pWnd->AddString(theApp.LoadString(IDS_AUTOCOMPLETE_MRU).c_str());
pWnd->SetCurSel(m_nAutoCompleteSource);
Modified: trunk/Src/PropLineFilter.cpp
===================================================================
--- trunk/Src/PropLineFilter.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropLineFilter.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -71,6 +71,7 @@
BOOL CPropLineFilter::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
InitList();
@@ -94,8 +95,8 @@
m_filtersList.SetExtendedStyle(m_filtersList.GetExtendedStyle() | newstyle);
- CString title = LoadResString(IDS_FILTERLINE_REGEXP);
- m_filtersList.InsertColumn(1, title, LVCFMT_LEFT, 500);
+ String title = theApp.LoadString(IDS_FILTERLINE_REGEXP);
+ m_filtersList.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 500);
int count = m_pList->GetCount();
int ind = -1;
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropRegistry.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -130,6 +130,7 @@
BOOL CPropRegistry::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
// Update shell extension checkboxes
@@ -235,10 +236,7 @@
void CPropRegistry::OnBrowseEditor()
{
CString path;
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
-
- if (SelectFile(GetSafeHwnd(), path, NULL, title, IDS_PROGRAMFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), path, NULL, IDS_OPEN_TITLE, IDS_PROGRAMFILES, TRUE))
{
m_strEditorPath = path;
UpdateData(FALSE);
@@ -275,10 +273,7 @@
void CPropRegistry::OnBrowseFilterPath()
{
CString path;
- CString title;
- VERIFY(title.LoadString(IDS_OPEN_TITLE));
-
- if (SelectFolder(path, NULL, title, GetSafeHwnd()))
+ if (SelectFolder(path, NULL, IDS_OPEN_TITLE, GetSafeHwnd()))
{
m_strUserFilterPath = path;
UpdateData(FALSE);
Modified: trunk/Src/PropSyntaxColors.cpp
===================================================================
--- trunk/Src/PropSyntaxColors.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropSyntaxColors.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -10,6 +10,7 @@
#include "resource.h"
#include "SyntaxColors.h"
#include "PropSyntaxColors.h"
+#include "Merge.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -121,6 +122,15 @@
// CPropSyntaxColor message handlers
/**
+ * @brief Called before propertysheet is drawn.
+ */
+BOOL CPropSyntaxColors::OnInitDialog()
+{
+ theApp.TranslateDialog(m_hWnd);
+ return CPropertyPage::OnInitDialog();
+}
+
+/**
* @brief Reads options values from storage to UI.
* (Property sheet calls this before displaying all property pages)
*/
Modified: trunk/Src/PropSyntaxColors.h
===================================================================
--- trunk/Src/PropSyntaxColors.h 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropSyntaxColors.h 2007-10-05 11:35:46 UTC (rev 4588)
@@ -43,6 +43,7 @@
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ virtual BOOL OnInitDialog();
afx_msg void OnBnClickedEcolorKeywords();
afx_msg void OnBnClickedEcolorFunctions();
afx_msg void OnBnClickedEcolorComments();
Modified: trunk/Src/PropTextColors.cpp
===================================================================
--- trunk/Src/PropTextColors.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropTextColors.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -72,6 +72,7 @@
*/
BOOL CPropTextColors::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
if (m_bCustomColors)
Modified: trunk/Src/PropVss.cpp
===================================================================
--- trunk/Src/PropVss.cpp 2007-10-05 10:59:01 UTC (rev 4587)
+++ trunk/Src/PropVss.cpp 2007-10-05 11:35:46 UTC (rev 4588)
@@ -29,6 +29,7 @@
#include "stdafx.h"
#include "FileOrFolderSelect.h"
#include "MainFrm.h" // VCS_* constants
+#include "Merge.h"
#include "PropVss.h"
#include "OptionsDef.h"
#include "OptionsMgr.h"
@@ -112,6 +113,7 @@
*/
BOOL CPropVss::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CPropertyPage::OnInitDialog();
LoadVssOptionStrings();
@@ -128,8 +130,8 @@
void CPropVss::OnSelendokVerSys()
{
UpdateData(TRUE);
- CString tempStr((LPCTSTR)(m_nVerSys == VCS_CLEARCASE ? IDS_CC_CMD : IDS_VSS_CMD));
- m_ctlVssL1.SetWindowText(tempStr);
+ String tempStr = theApp.LoadString(m_nVerSys == VCS_CLEARCASE ? IDS_CC_CMD : IDS_VSS_CMD);
+ m_ctlVssL1.SetWindowText(tempStr.c_str());
m_ctlPath.EnableWindow(m_nVerSys == VCS_VSS4 || m_nVerSys == VCS_CLEARCASE);
m_ctlVssL1.EnableWindow(m_nVerSys == VCS_VSS4 || m_nVerSys == VCS_CLEARCASE);
m_ctlBrowse.EnableWindow(m_nVerSys == VCS_VSS4 || m_nVerSys == VCS_CLEARCASE);
@@ -148,8 +150,8 @@
VCS_CLEARCASE,
*/
- m_ctlVerSys.AddString(LoadResString(IDS_VCS_NONE));
- m_ctlVerSys.AddString(LoadResString(IDS_VCS_VSS4));
- m_ctlVerSys.AddString(LoadResString(IDS_VCS_VSS5));
- m_ctlVerSys.AddString(LoadResString(IDS_VCS_CLEARCASE));
+ m_ctlVerSys.AddString(theApp.LoadString(IDS_VCS_NONE).c_str());
+ m_ctlVerSys.AddString(theApp.LoadString(IDS_VCS_VSS4).c_str());
+ m_ctlVerSys.AddString(theApp.LoadString(IDS_VCS_VSS5).c_str());
+ m_ctlVerSys.AddString(theApp.LoadString(IDS_VCS_CLEARCASE).c_str());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-05 13:48:21
|
Revision: 4591
http://winmerge.svn.sourceforge.net/winmerge/?rev=4591&view=rev
Author: kimmov
Date: 2007-10-05 06:48:17 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
PATCH: [ 1807661 ] Create DirTravel.h/cpp for directory traversal code
Modified Paths:
--------------
trunk/Src/DirItem.cpp
trunk/Src/DirItem.h
trunk/Src/DirScan.cpp
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/DirTravel.cpp
trunk/Src/DirTravel.h
Modified: trunk/Src/DirItem.cpp
===================================================================
--- trunk/Src/DirItem.cpp 2007-10-05 12:14:05 UTC (rev 4590)
+++ trunk/Src/DirItem.cpp 2007-10-05 13:48:17 UTC (rev 4591)
@@ -73,6 +73,9 @@
ctime = 0;
mtime = 0;
size = -1;
+ filename.erase();
+ path.erase();
+ bIsDir = false;
version.Clear();
flags.reset();
}
Modified: trunk/Src/DirItem.h
===================================================================
--- trunk/Src/DirItem.h 2007-10-05 12:14:05 UTC (rev 4590)
+++ trunk/Src/DirItem.h 2007-10-05 13:48:17 UTC (rev 4591)
@@ -49,6 +49,9 @@
__int64 ctime; /**< time of creation */
__int64 mtime; /**< time of last modify */
__int64 size; /**< file size in bytes, -1 means file does not exist*/
+ String filename; /**< filename for this item */
+ String path; /**< full path (excluding filename) for the item */
+ bool bIsDir; /**< is this a directory item or file item? */
FileVersion version; /**< string of fixed file version, eg, 1.2.3.4 */
FileFlags flags; /**< file attributes */
DirItem() { Clear(); }
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-10-05 12:14:05 UTC (rev 4590)
+++ trunk/Src/DirScan.cpp 2007-10-05 13:48:17 UTC (rev 4591)
@@ -10,6 +10,7 @@
#include <shlwapi.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "UnicodeString.h"
#include "Merge.h"
#include "LogFile.h"
#include "DirScan.h"
@@ -26,6 +27,8 @@
#include "PathContext.h"
#include "IAbortable.h"
#include "FolderCmp.h"
+#include "DirItem.h"
+#include "DirTravel.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -33,30 +36,11 @@
static char THIS_FILE[] = __FILE__;
#endif
-// Static types (ie, types only used locally)
-/**
- * @brief directory or file info for one row in diff result
- * @note times are seconds since January 1, 1970.
- */
-struct fentry
-{
- CString name; /**< Item name */
- __int64 mtime; /**< Last modify time */
- __int64 ctime; /**< Creation modify time */
- __int64 size; /**< File size */
- int attrs; /**< Item attributes */
-};
-typedef CArray<fentry, fentry&> fentryArray;
-
// Static functions (ie, functions only used locally)
void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt);
-static void LoadFiles(const CString & sDir, fentryArray * dirs, fentryArray * files);
-void LoadAndSortFiles(const CString & sDir, fentryArray * dirs, fentryArray * files, bool casesensitive);
-static void Sort(fentryArray * dirs, bool casesensitive);;
-static int collstr(const CString & s1, const CString & s2, bool casesensitive);
static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt,
const FolderCmp * pCmpData);
-static void AddToList(const CString & sLeftDir, const CString & sRightDir, const fentry * lent, const fentry * rent,
+static void AddToList(const CString & sLeftDir, const CString & sRightDir, const DirItem * lent, const DirItem * rent,
int code, DiffItemList * pList, CDiffContext *pCtxt);
static void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt);
@@ -113,7 +97,7 @@
) rightsubdir + backslash;
}
- fentryArray leftDirs, leftFiles, rightDirs, rightFiles;
+ DirItemArray leftDirs, leftFiles, rightDirs, rightFiles;
LoadAndSortFiles(sLeftDir, &leftDirs, &leftFiles, casesensitive);
LoadAndSortFiles(sRightDir, &rightDirs, &rightFiles, casesensitive);
@@ -128,13 +112,13 @@
// If there is only one directory on each side, and no files
// then pretend the directories have the same name
bool bTreatDirAsEqual =
- (leftDirs.GetSize() == 1)
- && (rightDirs.GetSize() == 1)
- && (leftFiles.GetSize() == 0)
- && (rightFiles.GetSize() == 0)
+ (leftDirs.size() == 1)
+ && (rightDirs.size() == 1)
+ && (leftFiles.size() == 0)
+ && (rightFiles.size() == 0)
;
- int i=0, j=0;
+ int i = 0, j = 0;
while (1)
{
if (pCtxt->ShouldAbort())
@@ -144,7 +128,7 @@
if (!bTreatDirAsEqual)
{
- if (i<leftDirs.GetSize() && (j==rightDirs.GetSize() || collstr(leftDirs[i].name, rightDirs[j].name, casesensitive)<0))
+ if (i<leftDirs.size() && (j == rightDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)<0))
{
int nDiffCode = DIFFCODE::LEFT | DIFFCODE::DIR;
AddToList(leftsubdir, rightsubdir, &leftDirs[i], 0, nDiffCode, pList, pCtxt);
@@ -152,7 +136,7 @@
++i;
continue;
}
- if (j<rightDirs.GetSize() && (i==leftDirs.GetSize() || collstr(leftDirs[i].name, rightDirs[j].name, casesensitive)>0))
+ if (j<rightDirs.size() && (i == leftDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)>0))
{
int nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR;
AddToList(leftsubdir, rightsubdir, 0, &rightDirs[j], nDiffCode, pList, pCtxt);
@@ -161,9 +145,9 @@
continue;
}
}
- if (i<leftDirs.GetSize())
+ if (i<leftDirs.size())
{
- ASSERT(j<rightDirs.GetSize());
+ ASSERT(j<rightDirs.size());
if (!depth)
{
// Non-recursive compare
@@ -175,13 +159,13 @@
else
{
// Recursive compare
- CString leftnewsub = leftsubprefix + leftDirs[i].name;
+ CString leftnewsub = leftsubprefix + leftDirs[i].filename.c_str();
// minimize memory footprint by having left/rightnewsub share CStringData if possible
CString rightnewsub = OPTIMIZE_SHARE_CSTRINGDATA
(
(LPCTSTR)leftsubprefix == (LPCTSTR)rightsubprefix
- && leftDirs[i].name == rightDirs[j].name ? leftnewsub :
- ) rightsubprefix + rightDirs[j].name;
+ && leftDirs[i].filename == rightDirs[j].filename ? leftnewsub :
+ ) rightsubprefix + rightDirs[j].filename.c_str();
// Test against filter so we don't include contents of filtered out directories
// Also this is only place we can test for both-sides directories in recursive compare
if (!pCtxt->m_piFilterGlobal->includeDir(leftnewsub, rightnewsub))
@@ -217,8 +201,8 @@
// Comparing file leftFiles[i].name to rightFiles[j].name
- if (i<leftFiles.GetSize() && (j==rightFiles.GetSize() ||
- collstr(leftFiles[i].name, rightFiles[j].name, casesensitive) < 0))
+ if (i<leftFiles.size() && (j == rightFiles.size() ||
+ collstr(leftFiles[i].filename, rightFiles[j].filename, casesensitive) < 0))
{
const int nDiffCode = DIFFCODE::LEFT | DIFFCODE::FILE;
AddToList(leftsubdir, rightsubdir, &leftFiles[i], 0, nDiffCode, pList, pCtxt);
@@ -226,8 +210,8 @@
++i;
continue;
}
- if (j<rightFiles.GetSize() && (i==leftFiles.GetSize() ||
- collstr(leftFiles[i].name, rightFiles[j].name, casesensitive) > 0))
+ if (j<rightFiles.size() && (i == leftFiles.size() ||
+ collstr(leftFiles[i].filename, rightFiles[j].filename, casesensitive) > 0))
{
const int nDiffCode = DIFFCODE::RIGHT | DIFFCODE::FILE;
AddToList(leftsubdir, rightsubdir, 0, &rightFiles[j], nDiffCode, pList, pCtxt);
@@ -235,9 +219,9 @@
++j;
continue;
}
- if (i<leftFiles.GetSize())
+ if (i<leftFiles.size())
{
- ASSERT(j<rightFiles.GetSize());
+ ASSERT(j<rightFiles.size());
const int nDiffCode = DIFFCODE::BOTH | DIFFCODE::FILE;
AddToList(leftsubdir, rightsubdir, &leftFiles[i], &rightFiles[j], nDiffCode, pList, pCtxt);
++i;
@@ -493,130 +477,6 @@
}
/**
- * @brief Load arrays with all directories & files in specified dir
- */
-void LoadAndSortFiles(const CString & sDir, fentryArray * dirs, fentryArray * files, bool casesensitive)
-{
- LoadFiles(sDir, dirs, files);
- Sort(dirs, casesensitive);
- Sort(files, casesensitive);
-}
-
-/**
- * @brief Convert time in type FILETIME to type int (time_t compatible).
- * @param [in] time Time in FILETIME type.
- * @return Time in time_t compiliant integer.
- */
-static __int64 FiletimeToTimeT(FILETIME time)
-{
- const __int64 SecsTo100ns = 10000000;
- const __int64 SecsBetweenEpochs = 11644473600;
- __int64 converted_time;
- converted_time = ((__int64)time.dwHighDateTime << 32) + time.dwLowDateTime;
- converted_time -= (SecsBetweenEpochs * SecsTo100ns);
- converted_time /= SecsTo100ns;
- return converted_time;
-}
-
-/**
- * @brief Find files and subfolders from given folder.
- * This function saves all files and subfolders in given folder to arrays.
- * We use 64-bit version of stat() to get times since find doesn't return
- * valid times for very old files (around year 1970). Even stat() seems to
- * give negative time values but we can live with that. Those around 1970
- * times can happen when file is created so that it doesn't get valid
- * creation or modificatio dates.
- * @param [in] sDir Base folder for files and subfolders.
- * @param [in, out] dirs Array where subfolders are stored.
- * @param [in, out] files Array where files are stored.
- */
-void LoadFiles(const CString & sDir, fentryArray * dirs, fentryArray * files)
-{
- CString sPattern = sDir;
- sPattern.TrimRight(_T("\\"));
- sPattern += _T("\\*.*");
-
- WIN32_FIND_DATA ff;
- HANDLE h = FindFirstFile(sPattern, &ff);
- if (h != INVALID_HANDLE_VALUE)
- {
- do
- {
- DWORD dwIsDirectory = ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
- if (dwIsDirectory && StrStr(_T(".."), ff.cFileName))
- continue;
-
- fentry ent;
-
- // Save filetimes as seconds since January 1, 1970
- // Note that times can be < 0 if they are around that 1970..
- // Anyway that is not sensible case for normal files so we can
- // just use zero for their time.
- ent.ctime = FiletimeToTimeT(ff.ftCreationTime);
- if (ent.ctime < 0)
- ent.ctime = 0;
- ent.mtime = FiletimeToTimeT(ff.ftLastWriteTime);
- if (ent.mtime < 0)
- ent.mtime = 0;
-
- if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- ent.size = -1; // No size for directories
- else
- {
- ent.size = ((__int64)ff.nFileSizeHigh << 32) + ff.nFileSizeLow;
- }
-
- ent.name = ff.cFileName;
- ent.attrs = ff.dwFileAttributes;
- (dwIsDirectory ? dirs : files) -> Add(ent);
- } while (FindNextFile(h, &ff));
- FindClose(h);
- }
-}
-
-/**
- * @brief case-sensitive collate function for qsorting an array
- */
-static int __cdecl cmpstring(const void *elem1, const void *elem2)
-{
- const fentry * s1 = static_cast<const fentry *>(elem1);
- const fentry * s2 = static_cast<const fentry *>(elem2);
- return s1->name.Collate(s2->name);
-}
-
-/**
- * @brief case-insensitive collate function for qsorting an array
- */
-static int __cdecl cmpistring(const void *elem1, const void *elem2)
-{
- const fentry * s1 = static_cast<const fentry *>(elem1);
- const fentry * s2 = static_cast<const fentry *>(elem2);
- return s1->name.CollateNoCase(s2->name);
-}
-
-/**
- * @brief sort specified array
- */
-void Sort(fentryArray * dirs, bool casesensitive)
-{
- fentry * data = dirs->GetData();
- if (!data) return;
- int (__cdecl *comparefnc)(const void *elem1, const void *elem2) = (casesensitive ? cmpstring : cmpistring);
- qsort(data, dirs->GetSize(), sizeof(dirs->GetAt(0)), comparefnc);
-}
-
-/**
- * @brief Compare (NLS aware) two strings, either case-sensitive or case-insensitive as caller specifies
- */
-static int collstr(const CString & s1, const CString & s2, bool casesensitive)
-{
- if (casesensitive)
- return s1.Collate(s2);
- else
- return s1.CollateNoCase(s2);
-}
-
-/**
* @brief Send one file or directory result back through the diff context
*/
static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt,
@@ -656,7 +516,7 @@
/**
* @brief Add one compare item to list.
*/
-static void AddToList(const CString & sLeftDir, const CString & sRightDir, const fentry * lent, const fentry * rent,
+static void AddToList(const CString & sLeftDir, const CString & sRightDir, const DirItem * lent, const DirItem * rent,
int code, DiffItemList * pList, CDiffContext *pCtxt)
{
// We must store both paths - we cannot get paths later
@@ -670,33 +530,33 @@
if (lent)
{
- di.sLeftFilename = lent->name;
+ di.sLeftFilename = lent->filename.c_str();
di.left.mtime = lent->mtime;
di.left.ctime = lent->ctime;
di.left.size = lent->size;
- di.left.flags.attributes = lent->attrs;
+ di.left.flags.attributes = lent->flags.attributes;
}
else
{
// Don't break CDirView::DoCopyRightToLeft()
- di.sLeftFilename = rent->name;
+ di.sLeftFilename = rent->filename.c_str();
}
if (rent)
{
di.sRightFilename = OPTIMIZE_SHARE_CSTRINGDATA
(
- di.sLeftFilename == rent->name ? di.sLeftFilename :
- ) rent->name;
+ di.sLeftFilename == rent->filename.c_str() ? di.sLeftFilename :
+ ) rent->filename.c_str();
di.right.mtime = rent->mtime;
di.right.ctime = rent->ctime;
di.right.size = rent->size;
- di.right.flags.attributes = rent->attrs;
+ di.right.flags.attributes = rent->flags.attributes;
}
else
{
// Don't break CDirView::DoCopyLeftToRight()
- di.sRightFilename = lent->name;
+ di.sRightFilename = lent->filename.c_str();
}
di.diffcode = code;
Added: trunk/Src/DirTravel.cpp
===================================================================
--- trunk/Src/DirTravel.cpp (rev 0)
+++ trunk/Src/DirTravel.cpp 2007-10-05 13:48:17 UTC (rev 4591)
@@ -0,0 +1,162 @@
+/**
+ * @file DirTravel.cpp
+ *
+ * @brief Implementation file for Directory traversal functions.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#include <algorithm>
+#include <windows.h>
+#include <tchar.h>
+#include "UnicodeString.h"
+#include "DirItem.h"
+#include "DirTravel.h"
+
+static void LoadFiles(LPCTSTR sDir, DirItemArray * dirs, DirItemArray * files);
+static void Sort(DirItemArray * dirs, bool casesensitive);
+
+/**
+ * @brief Load arrays with all directories & files in specified dir
+ */
+void LoadAndSortFiles(LPCTSTR sDir, DirItemArray * dirs, DirItemArray * files, bool casesensitive)
+{
+ LoadFiles(sDir, dirs, files);
+ Sort(dirs, casesensitive);
+ Sort(files, casesensitive);
+}
+
+/**
+ * @brief Convert time in type FILETIME to type int (time_t compatible).
+ * @param [in] time Time in FILETIME type.
+ * @return Time in time_t compiliant integer.
+ */
+static __int64 FiletimeToTimeT(FILETIME time)
+{
+ const __int64 SecsTo100ns = 10000000;
+ const __int64 SecsBetweenEpochs = 11644473600;
+ __int64 converted_time;
+ converted_time = ((__int64)time.dwHighDateTime << 32) + time.dwLowDateTime;
+ converted_time -= (SecsBetweenEpochs * SecsTo100ns);
+ converted_time /= SecsTo100ns;
+ return converted_time;
+}
+
+/**
+ * @brief Find files and subfolders from given folder.
+ * This function saves all files and subfolders in given folder to arrays.
+ * We use 64-bit version of stat() to get times since find doesn't return
+ * valid times for very old files (around year 1970). Even stat() seems to
+ * give negative time values but we can live with that. Those around 1970
+ * times can happen when file is created so that it doesn't get valid
+ * creation or modificatio dates.
+ * @param [in] sDir Base folder for files and subfolders.
+ * @param [in, out] dirs Array where subfolders are stored.
+ * @param [in, out] files Array where files are stored.
+ */
+static void LoadFiles(LPCTSTR sDir, DirItemArray * dirs, DirItemArray * files)
+{
+ String sPattern(sDir);
+ size_t len = sPattern.length();
+ if (sPattern[len - 1] != '\\')
+ sPattern += _T("\\*.*");
+ else
+ sPattern += _T("*.*");
+
+ WIN32_FIND_DATA ff;
+ HANDLE h = FindFirstFile(sPattern.c_str(), &ff);
+ if (h != INVALID_HANDLE_VALUE)
+ {
+ do
+ {
+ BOOL bIsDirectory = (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) > 0;
+ if (bIsDirectory && _tcsstr(_T(".."), ff.cFileName))
+ continue;
+
+ DirItem ent;
+ ent.bIsDir = !!bIsDirectory;
+
+ // Save filetimes as seconds since January 1, 1970
+ // Note that times can be < 0 if they are around that 1970..
+ // Anyway that is not sensible case for normal files so we can
+ // just use zero for their time.
+ ent.ctime = FiletimeToTimeT(ff.ftCreationTime);
+ if (ent.ctime < 0)
+ ent.ctime = 0;
+ ent.mtime = FiletimeToTimeT(ff.ftLastWriteTime);
+ if (ent.mtime < 0)
+ ent.mtime = 0;
+
+ if (ff.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ ent.size = -1; // No size for directories
+ else
+ {
+ ent.size = ((__int64)ff.nFileSizeHigh << 32) + ff.nFileSizeLow;
+ }
+
+ ent.path = sDir;
+ ent.filename = ff.cFileName;
+ ent.flags.attributes = ff.dwFileAttributes;
+
+ (bIsDirectory ? dirs : files)->push_back(ent);
+ } while (FindNextFile(h, &ff));
+ FindClose(h);
+ }
+}
+
+static int collate(const String &str1, const String &str2)
+{
+ return _tcscoll(str1.c_str(), str2.c_str());
+}
+
+/**
+ * @brief case-sensitive collate function for qsorting an array
+ */
+static bool __cdecl cmpstring(const DirItem &elem1, const DirItem &elem2)
+{
+ return collate(elem1.filename, elem2.filename) < 0;
+}
+
+static int collate_ignore_case(const String &str1, const String &str2)
+{
+ String s1(str1);
+ String s2(str2);
+ int i = 0;
+ for (i = 0; i < s1.length(); i++)
+ s1[i] = _totlower(s1[i]);
+ for (i = 0; i < s2.length(); i++)
+ s2[i] = _totlower(s2[i]);
+ return _tcscoll(s1.c_str(), s2.c_str());
+}
+
+/**
+ * @brief case-insensitive collate function for qsorting an array
+ */
+static bool __cdecl cmpistring(const DirItem &elem1, const DirItem &elem2)
+{
+ return collate_ignore_case(elem1.filename, elem2.filename) < 0;
+}
+
+/**
+ * @brief sort specified array
+ */
+static void Sort(DirItemArray * dirs, bool casesensitive)
+{
+ if (casesensitive)
+ std::sort(dirs->begin(), dirs->end(), cmpstring);
+ else
+ std::sort(dirs->begin(), dirs->end(), cmpistring);
+}
+
+/**
+ * @brief Compare (NLS aware) two strings, either case-sensitive or
+ * case-insensitive as caller specifies
+ */
+int collstr(const String & s1, const String & s2, bool casesensitive)
+{
+ if (casesensitive)
+ return collate(s1, s2);
+ else
+ return collate_ignore_case(s1, s2);
+}
Property changes on: trunk/Src/DirTravel.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Src/DirTravel.h
===================================================================
--- trunk/Src/DirTravel.h (rev 0)
+++ trunk/Src/DirTravel.h 2007-10-05 13:48:17 UTC (rev 4591)
@@ -0,0 +1,23 @@
+/**
+ * @file DirTravel.h
+ *
+ * @brief Declaration file for Directory traversal functions.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
+
+#ifndef _DIR_TRAVEL_H_
+#define _DIR_TRAVEL_H_
+
+#include <vector>
+#include "UnicodeString.h"
+
+struct DirItem;
+
+typedef std::vector<DirItem> DirItemArray;
+
+void LoadAndSortFiles(LPCTSTR sDir, DirItemArray * dirs, DirItemArray * files, bool casesensitive);
+int collstr(const String & s1, const String & s2, bool casesensitive);
+
+#endif // _DIR_TRAVEL_H_
Property changes on: trunk/Src/DirTravel.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-10-05 12:14:05 UTC (rev 4590)
+++ trunk/Src/Merge.dsp 2007-10-05 13:48:17 UTC (rev 4591)
@@ -359,6 +359,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DirTravel.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\DirView.cpp
!IF "$(CFG)" == "Merge - Win32 Debug"
@@ -1133,6 +1137,10 @@
# End Source File
# Begin Source File
+SOURCE=.\DirTravel.h
+# End Source File
+# Begin Source File
+
SOURCE=.\DirView.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-10-05 14:38:50
|
Revision: 4592
http://winmerge.svn.sourceforge.net/winmerge/?rev=4592&view=rev
Author: kimmov
Date: 2007-10-05 07:38:43 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Show version number only when it exists in the file.
Modified Paths:
--------------
trunk/Src/Common/version.cpp
trunk/Src/Common/version.h
trunk/Src/DiffContext.cpp
trunk/Src/FileVersion.cpp
Modified: trunk/Src/Common/version.cpp
===================================================================
--- trunk/Src/Common/version.cpp 2007-10-05 13:48:17 UTC (rev 4591)
+++ trunk/Src/Common/version.cpp 2007-10-05 14:38:43 UTC (rev 4592)
@@ -3,7 +3,7 @@
*
* @brief Implementation of CVersionInfo class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
@@ -203,7 +203,7 @@
*/
CString CVersionInfo::GetFixedProductVersion()
{
- if (!m_dwVerInfoSize)
+ if (!m_bVersionFound)
return _T("");
return MakeVersionString(m_FixedFileInfo.dwProductVersionMS
, m_FixedFileInfo.dwProductVersionLS);
@@ -216,7 +216,7 @@
*/
CString CVersionInfo::GetFixedFileVersion()
{
- if (!m_dwVerInfoSize)
+ if (!m_bVersionFound)
return _T("");
return MakeVersionString(m_FixedFileInfo.dwFileVersionMS
, m_FixedFileInfo.dwFileVersionLS);
@@ -227,11 +227,17 @@
* This function returns version number given as two DWORDs.
* @param [out] versionMS High DWORD for version number.
* @param [out] versionLS Low DWORD for version number.
+ * @return TRUE if version info was found, FALSE otherwise.
*/
-void CVersionInfo::GetFixedFileVersion(DWORD &versionMS, DWORD &versionLS)
+BOOL CVersionInfo::GetFixedFileVersion(DWORD &versionMS, DWORD &versionLS)
{
- versionMS = m_FixedFileInfo.dwFileVersionMS;
- versionLS = m_FixedFileInfo.dwFileVersionLS;
+ if (m_bVersionFound)
+ {
+ versionMS = m_FixedFileInfo.dwFileVersionMS;
+ versionLS = m_FixedFileInfo.dwFileVersionLS;
+ return TRUE;
+ }
+ return FALSE;
}
/**
@@ -262,11 +268,12 @@
else
_tcsncpy(szFileName, m_strFileName, MAX_PATH - 1);
- m_dwVerInfoSize = GetFileVersionInfoSize(szFileName, &dwVerHnd);
- if (m_dwVerInfoSize)
+ DWORD dwVerInfoSize = GetFileVersionInfoSize(szFileName, &dwVerHnd);
+ if (dwVerInfoSize)
{
- m_pVffInfo = new BYTE[m_dwVerInfoSize];
- if (GetFileVersionInfo(szFileName, dwVerHnd, m_dwVerInfoSize, m_pVffInfo))
+ m_bVersionFound = TRUE;
+ m_pVffInfo = new BYTE[dwVerInfoSize];
+ if (GetFileVersionInfo(szFileName, dwVerHnd, dwVerInfoSize, m_pVffInfo))
{
GetFixedVersionInfo();
if (m_bVersionOnly == FALSE)
Modified: trunk/Src/Common/version.h
===================================================================
--- trunk/Src/Common/version.h 2007-10-05 13:48:17 UTC (rev 4591)
+++ trunk/Src/Common/version.h 2007-10-05 14:38:43 UTC (rev 4592)
@@ -3,7 +3,7 @@
*
* @brief Declaration of CVersionInfo class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef VERSIONTOOLS_H
@@ -23,11 +23,11 @@
{
private:
VS_FIXEDFILEINFO m_FixedFileInfo; /**< Fixed file information */
- DWORD m_dwVerInfoSize; /**< Size of version information block (0 if missing) */
BYTE * m_pVffInfo; /**< Pointer to version information block */
BOOL m_bVersionOnly; /**< Ask version numbers only */
- BOOL m_bDllVersion;
+ BOOL m_bDllVersion; /**< Dll file version is being queried */
WORD m_wLanguage; /**< Language-ID to use (if given) */
+ BOOL m_bVersionFound; /**< Was version info found from file? */
CString m_strFileName;
CString m_strLanguage;
@@ -66,7 +66,7 @@
CString GetFixedProductVersion();
CString GetFixedFileVersion();
DLLVERSIONINFO m_dvi;
- void GetFixedFileVersion(DWORD &versionMS, DWORD &versionLS);
+ BOOL GetFixedFileVersion(DWORD &versionMS, DWORD &versionLS);
protected:
void GetVersionInfo();
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-10-05 13:48:17 UTC (rev 4591)
+++ trunk/Src/DiffContext.cpp 2007-10-05 14:38:43 UTC (rev 4592)
@@ -230,11 +230,12 @@
spath = paths_ConcatPath(spath, di.sRightFilename);
}
+ // Get version info if it exists
CVersionInfo ver(spath);
DWORD verMS = 0;
DWORD verLS = 0;
- ver.GetFixedFileVersion(verMS, verLS);
- dfi.version.SetFileVersion(verMS, verLS);
+ if (ver.GetFixedFileVersion(verMS, verLS))
+ dfi.version.SetFileVersion(verMS, verLS);
}
/**
Modified: trunk/Src/FileVersion.cpp
===================================================================
--- trunk/Src/FileVersion.cpp 2007-10-05 13:48:17 UTC (rev 4591)
+++ trunk/Src/FileVersion.cpp 2007-10-05 14:38:43 UTC (rev 4592)
@@ -62,12 +62,13 @@
/**
* @brief Get file version as a string.
- * @return File version number as a string.
+ * @return File version number as a string. Returns empty string if there is
+ * no version number for the file.
*/
String FileVersion::GetFileVersionString()
{
if (!m_bFileVersionSet)
- return _T("0.0.0.0");
+ return _T("");
TCHAR ver[30] = {0};
_stprintf(ver, _T("%u.%u.%u.%u"), HIWORD(m_fileVersionMS),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-06 12:20:11
|
Revision: 4594
http://winmerge.svn.sourceforge.net/winmerge/?rev=4594&view=rev
Author: jtuc
Date: 2007-10-06 05:20:08 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/ConfirmFolderCopyDlg.cpp
trunk/Src/DirActions.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/PropLineFilter.cpp
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
trunk/Src/WaitStatusCursor.cpp
trunk/Src/WaitStatusCursor.h
Modified: trunk/Src/ConfirmFolderCopyDlg.cpp
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/ConfirmFolderCopyDlg.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -72,6 +72,7 @@
*/
BOOL ConfirmFolderCopyDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
GetDlgItem(IDNO)->SetFocus();
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/DirActions.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -76,36 +76,29 @@
{
ConfirmFolderCopyDlg dlg;
CString strQuestion;
- CString sOrig;
- CString sDest;
+ String sOrig;
+ String sDest;
- if (count == 1)
- {
- strQuestion = LoadResString(IDS_CONFIRM_SINGLE_COPY);
- }
- else
- {
- strQuestion = LoadResString(IDS_CONFIRM_MULTIPLE_COPY);
- strQuestion.Format(strQuestion, count);
- }
+ UINT id = count == 1 ? IDS_CONFIRM_SINGLE_COPY : IDS_CONFIRM_MULTIPLE_COPY;
+ strQuestion.Format(theApp.LoadString(id).c_str(), count);
if (origin == FileActionItem::UI_LEFT)
- sOrig = LoadResString(IDS_FROM_LEFT);
+ sOrig = theApp.LoadString(IDS_FROM_LEFT);
else
- sOrig = LoadResString(IDS_FROM_RIGHT);
+ sOrig = theApp.LoadString(IDS_FROM_RIGHT);
if (destIsSide)
{
// Copy to left / right
if (destination == FileActionItem::UI_LEFT)
- sDest = LoadResString(IDS_TO_LEFT);
+ sDest = theApp.LoadString(IDS_TO_LEFT);
else
- sDest = LoadResString(IDS_TO_RIGHT);
+ sDest = theApp.LoadString(IDS_TO_RIGHT);
}
else
{
// Copy left/right to..
- sDest = LoadResString(IDS_TO);
+ sDest = theApp.LoadString(IDS_TO);
}
CString strSrc(src);
@@ -122,8 +115,8 @@
}
dlg.m_question = strQuestion;
- dlg.m_fromText = sOrig;
- dlg.m_toText = sDest;
+ dlg.m_fromText = sOrig.c_str();
+ dlg.m_toText = sDest.c_str();
dlg.m_fromPath = strSrc;
dlg.m_toPath = strDest;
@@ -197,7 +190,7 @@
/// Prompt & copy item from right to left, if legal
void CDirView::DoCopyRightToLeft()
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_COPYFILES);
// First we build a list of desired actions
FileActionScript actionScript;
@@ -243,7 +236,7 @@
/// Prompt & copy item from left to right, if legal
void CDirView::DoCopyLeftToRight()
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_COPYFILES);
// First we build a list of desired actions
FileActionScript actionScript;
@@ -289,7 +282,7 @@
/// Prompt & delete left, if legal
void CDirView::DoDelLeft()
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_DELETEFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_DELETEFILES);
// First we build a list of desired actions
FileActionScript actionScript;
@@ -331,7 +324,7 @@
/// Prompt & delete right, if legal
void CDirView::DoDelRight()
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_DELETEFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_DELETEFILES);
// First we build a list of desired actions
FileActionScript actionScript;
@@ -377,7 +370,7 @@
*/
void CDirView::DoDelBoth()
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_DELETEFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_DELETEFILES);
// First we build a list of desired actions
FileActionScript actionScript;
@@ -424,7 +417,7 @@
*/
void CDirView::DoDelAll()
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_DELETEFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_DELETEFILES);
// First we build a list of desired actions
FileActionScript actionScript;
@@ -499,7 +492,7 @@
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_LEFT))
return;
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_COPYFILES);
FileActionScript actionScript;
const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
@@ -566,7 +559,7 @@
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_RIGHT))
return;
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_COPYFILES);
FileActionScript actionScript;
const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
@@ -633,7 +626,7 @@
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_LEFT))
return;
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_MOVEFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_MOVEFILES);
FileActionScript actionScript;
const FileAction::ACT_TYPE actType = FileAction::ACT_MOVE;
@@ -697,7 +690,7 @@
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_RIGHT))
return;
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_MOVEFILES));
+ WaitStatusCursor waitstatus(IDS_STATUS_MOVEFILES);
FileActionScript actionScript;
const FileAction::ACT_TYPE actType = FileAction::ACT_MOVE;
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/FileFiltersDlg.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -56,6 +56,9 @@
//{{AFX_DATA_INIT(FileFiltersDlg)
// NOTE: the ClassWizard will add member initialization here
//}}AFX_DATA_INIT
+ m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
+ m_psp.pszTitle = m_strCaption;
+ m_psp.dwFlags |= PSP_USETITLE;
}
void FileFiltersDlg::DoDataExchange(CDataExchange* pDX)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/MainFrm.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -2518,7 +2518,8 @@
*/
void CMainFrame::OnToolsFilters()
{
- CPropertySheet sht(IDS_FILTER_TITLE);
+ String title = theApp.LoadString(IDS_FILTER_TITLE);
+ CPropertySheet sht(title.c_str());
CPropLineFilter filter;
FileFiltersDlg fileFiltersDlg;
FILEFILTER_INFOLIST fileFilters;
@@ -2541,10 +2542,9 @@
if (sht.DoModal() == IDOK)
{
- CString strNone;
- VERIFY(strNone.LoadString(IDS_USERCHOICE_NONE));
+ String strNone = theApp.LoadString(IDS_USERCHOICE_NONE);
CString path = fileFiltersDlg.GetSelected();
- if (path.Find(strNone) > -1)
+ if (path.Find(strNone.c_str()) > -1)
{
// Don't overwrite mask we already have
if (!theApp.m_globalFileFilter.IsUsingMask())
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/Merge.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -769,7 +769,7 @@
}
/**
- * @brief Load string an translate to current WinMerge GUI language
+ * @brief Load string and translate to current WinMerge GUI language
*/
String CMergeApp::LoadString(UINT id) const
{
@@ -777,6 +777,14 @@
}
/**
+ * @brief Load dialog caption and translate to current WinMerge GUI language
+ */
+std::wstring CMergeApp::LoadDialogCaption(LPCTSTR lpDialogTemplateID) const
+{
+ return m_pLangDlg->LoadDialogCaption(lpDialogTemplateID);
+}
+
+/**
* @brief Reload main menu(s) (for language change)
*/
void CMergeApp::ReloadMenu()
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/Merge.h 2007-10-06 12:20:08 UTC (rev 4594)
@@ -68,6 +68,7 @@
void TranslateMenu(HMENU) const;
void TranslateDialog(HWND) const;
String LoadString(UINT) const;
+ std::wstring LoadDialogCaption(LPCTSTR) const;
CMergeApp();
~CMergeApp();
Modified: trunk/Src/PropLineFilter.cpp
===================================================================
--- trunk/Src/PropLineFilter.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/PropLineFilter.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -35,6 +35,9 @@
//{{AFX_DATA_INIT(CPropLineFilter)
m_bIgnoreRegExp = FALSE;
//}}AFX_DATA_INIT
+ m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
+ m_psp.pszTitle = m_strCaption;
+ m_psp.dwFlags |= PSP_USETITLE;
}
CPropLineFilter::~CPropLineFilter()
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/StdAfx.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -82,7 +82,7 @@
* @param [in] id Resource string ID.
* @return Resource string as CString.
*/
-CString LoadResString(int id)
+CString LoadResString(UINT id)
{
CString s;
VERIFY(s.LoadString(id));
@@ -90,6 +90,32 @@
}
/**
+ * @brief Lang aware version of AfxFormatStrings()
+ */
+void NTAPI LangFormatStrings(CString &rString, UINT id, LPCTSTR const *rglpsz, int nString)
+{
+ String fmt = theApp.LoadString(id);
+ AfxFormatStrings(rString, fmt.c_str(), rglpsz, nString);
+}
+
+/**
+ * @brief Lang aware version of AfxFormatString1()
+ */
+void NTAPI LangFormatString1(CString &rString, UINT id, LPCTSTR lpsz1)
+{
+ LangFormatStrings(rString, id, &lpsz1, 1);
+}
+
+/**
+ * @brief Lang aware version of AfxFormatString2()
+ */
+void NTAPI LangFormatString2(CString &rString, UINT id, LPCTSTR lpsz1, LPCTSTR lpsz2)
+{
+ LPCTSTR rglpsz[2] = { lpsz1, lpsz2 };
+ LangFormatStrings(rString, id, rglpsz, 2);
+}
+
+/**
* @brief Show messagebox with resource string having parameter.
* @param [in] msgid Resource string ID.
* @param [in] arg Argument string.
@@ -97,10 +123,10 @@
* @param [in] nIDHelp Help string ID.
* @return User choice from the messagebox (see MessageBox()).
*/
-int ResMsgBox1(int msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
+int ResMsgBox1(UINT msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
{
CString msg;
- AfxFormatString1(msg, msgid, arg);
+ LangFormatString1(msg, msgid, arg);
if (!nIDHelp)
nIDHelp = msgid;
return AfxMessageBox(msg, nType, nIDHelp);
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/StdAfx.h 2007-10-06 12:20:08 UTC (rev 4594)
@@ -91,10 +91,19 @@
int xisspace (wint_t c);
/** @brief Load string from string resources; shortcut for CString::LoadString */
-CString LoadResString(int id);
+CString LoadResString(UINT id);
+ /** @brief Lang aware version of AfxFormatStrings() */
+void NTAPI LangFormatStrings(CString &, UINT, LPCTSTR const *, int);
+
+ /** @brief Lang aware version of AfxFormatString1() */
+void NTAPI LangFormatString1(CString &, UINT, LPCTSTR);
+
+ /** @brief Lang aware version of AfxFormatString2() */
+void NTAPI LangFormatString2(CString &, UINT, LPCTSTR, LPCTSTR);
+
/** @brief Format single-argument resource string and display via AfxMessageBox */
-int ResMsgBox1(int msgid, LPCTSTR arg, UINT nType = MB_OK, UINT nIDHelp = 0);
+int ResMsgBox1(UINT msgid, LPCTSTR arg, UINT nType = MB_OK, UINT nIDHelp = 0);
/** @brief Retrieve error description from Windows; uses FormatMessage */
CString GetSysError(int nerr);
Modified: trunk/Src/WaitStatusCursor.cpp
===================================================================
--- trunk/Src/WaitStatusCursor.cpp 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/WaitStatusCursor.cpp 2007-10-06 12:20:08 UTC (rev 4594)
@@ -14,6 +14,7 @@
#include "stdafx.h"
#include "WaitStatusCursor.h"
+#include "Merge.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -253,4 +254,20 @@
EnterStackCriticalSection();
return TRUE;
}
-*/
\ No newline at end of file
+*/
+
+WaitStatusCursor::WaitStatusCursor(LPCTSTR fmt, ...)
+{
+ va_list argp;
+ va_start(argp, fmt);
+ Create(NULL, IDC_WAIT, fmt, argp);
+ va_end(argp);
+}
+
+WaitStatusCursor::WaitStatusCursor(UINT fmtid, ...)
+{
+ va_list argp;
+ va_start(argp, fmtid);
+ Create(NULL, IDC_WAIT, theApp.LoadString(fmtid).c_str(), argp);
+ va_end(argp);
+}
Modified: trunk/Src/WaitStatusCursor.h
===================================================================
--- trunk/Src/WaitStatusCursor.h 2007-10-06 11:38:43 UTC (rev 4593)
+++ trunk/Src/WaitStatusCursor.h 2007-10-06 12:20:08 UTC (rev 4594)
@@ -91,13 +91,8 @@
{
// public interface
public:
- WaitStatusCursor(LPCTSTR fmt, ...) : CustomStatusCursor()
- {
- va_list argp;
- va_start(argp, fmt);
- Create(NULL, IDC_WAIT, fmt, argp);
- va_end(argp);
- }
+ WaitStatusCursor(LPCTSTR fmt, ...);
+ WaitStatusCursor(UINT fmtid, ...);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-07 09:44:12
|
Revision: 4596
http://winmerge.svn.sourceforge.net/winmerge/?rev=4596&view=rev
Author: jtuc
Date: 2007-10-07 02:44:06 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/CompareStatisticsDlg.cpp
trunk/Src/CompareStatisticsDlg.h
trunk/Src/CompareStats.cpp
trunk/Src/CompareStats.h
trunk/Src/DirColsDlg.cpp
trunk/Src/DirColsDlg.h
trunk/Src/DirCompProgressDlg.cpp
trunk/Src/DirView.h
trunk/Src/DirViewColHandler.cpp
trunk/Src/MainFrm.cpp
Modified: trunk/Src/CompareStatisticsDlg.cpp
===================================================================
--- trunk/Src/CompareStatisticsDlg.cpp 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/CompareStatisticsDlg.cpp 2007-10-07 09:44:06 UTC (rev 4596)
@@ -25,6 +25,7 @@
#include "stdafx.h"
#include "CompareStatisticsDlg.h"
#include "CompareStats.h"
+#include "Merge.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -49,25 +50,6 @@
//}}AFX_DATA_INIT
}
-void CompareStatisticsDlg::DoDataExchange(CDataExchange* pDX)
-{
- CDialog::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CompareStatisticsDlg)
- DDX_Text(pDX, IDC_STAT_IDENTICFOLDER, m_sIdenticalFolders);
- DDX_Text(pDX, IDC_STAT_IDENTICFILE, m_sIdenticalFiles);
- DDX_Text(pDX, IDC_STAT_IDENTICBINARY, m_sIdenticalBinaries);
- DDX_Text(pDX, IDC_STAT_DIFFFILE, m_sDifferentFiles);
- DDX_Text(pDX, IDC_STAT_DIFFBINARY, m_sDifferentBinaries);
- DDX_Text(pDX, IDC_STAT_LUNIQFOLDER, m_sLUniqueFolders);
- DDX_Text(pDX, IDC_STAT_LUNIQFILE, m_sLUniqueFiles);
- DDX_Text(pDX, IDC_STAT_RUNIQFOLDER, m_sRUniqueFolders);
- DDX_Text(pDX, IDC_STAT_RUNIQFILE, m_sRUniqueFiles);
- DDX_Text(pDX, IDC_STAT_TOTALFOLDER, m_sTotalFolders);
- DDX_Text(pDX, IDC_STAT_TOTALFILE, m_sTotalFiles);
- //}}AFX_DATA_MAP
-}
-
-
BEGIN_MESSAGE_MAP(CompareStatisticsDlg, CDialog)
//{{AFX_MSG_MAP(SaveClosingDlg)
//}}AFX_MSG_MAP
@@ -79,6 +61,7 @@
BOOL CompareStatisticsDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
int totalFiles = 0;
int totalFolders = 0;
@@ -86,39 +69,39 @@
// Identicals
int count = m_pCompareStats->GetCount(CompareStats::RESULT_DIR);
totalFolders += count;
- m_sIdenticalFolders.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_IDENTICFOLDER, count);
count = m_pCompareStats->GetCount(CompareStats::RESULT_SAME);
totalFiles += count;
- m_sIdenticalFiles.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_IDENTICFILE, count);
count = m_pCompareStats->GetCount(CompareStats::RESULT_BINSAME);
totalFiles += count;
- m_sIdenticalBinaries.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_IDENTICBINARY, count);
// Different
count = m_pCompareStats->GetCount(CompareStats::RESULT_DIFF);
totalFiles += count;
- m_sDifferentFiles.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_DIFFFILE, count);
count = m_pCompareStats->GetCount(CompareStats::RESULT_BINDIFF);
totalFiles += count;
- m_sDifferentBinaries.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_DIFFBINARY, count);
// Unique
count = m_pCompareStats->GetCount(CompareStats::RESULT_LDIRUNIQUE);
totalFolders += count;
- m_sLUniqueFolders.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_LUNIQFOLDER, count);
count = m_pCompareStats->GetCount(CompareStats::RESULT_LUNIQUE);
totalFiles += count;
- m_sLUniqueFiles.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_LUNIQFILE, count);
count = m_pCompareStats->GetCount(CompareStats::RESULT_RDIRUNIQUE);
totalFolders += count;
- m_sRUniqueFolders.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_RUNIQFOLDER, count);
count = m_pCompareStats->GetCount(CompareStats::RESULT_RUNIQUE);
totalFiles += count;
- m_sRUniqueFiles.Format(_T("%d"), count);
+ SetDlgItemInt(IDC_STAT_RUNIQFILE, count);
// Total
- m_sTotalFolders.Format(_T("%d"), totalFolders);
- m_sTotalFiles.Format(_T("%d"), totalFiles);
+ SetDlgItemInt(IDC_STAT_TOTALFOLDER, totalFolders);
+ SetDlgItemInt(IDC_STAT_TOTALFILE, totalFiles);
// Load small folder icons
CStatic * pBitmapCtrl = (CStatic *) GetDlgItem(IDC_STAT_ILUNIQFOLDER);
@@ -176,13 +159,11 @@
MAKEINTRESOURCE(IDI_SIGMA), IMAGE_ICON, IconCX, IconCY, LR_SHARED);
pBitmapCtrl->SetIcon(hIcon);
- UpdateData(FALSE);
-
return FALSE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
void CompareStatisticsDlg::SetCompareStats(const CompareStats * pStats)
{
- m_pCompareStats = const_cast<CompareStats*>(pStats);
+ m_pCompareStats = pStats;
}
\ No newline at end of file
Modified: trunk/Src/CompareStatisticsDlg.h
===================================================================
--- trunk/Src/CompareStatisticsDlg.h 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/CompareStatisticsDlg.h 2007-10-07 09:44:06 UTC (rev 4596)
@@ -38,22 +38,9 @@
// Dialog Data
//{{AFX_DATA(CompareStatisticsDlg)
enum { IDD = IDD_COMPARE_STATISTICS };
- CString m_sIdenticalFolders;
- CString m_sIdenticalFiles;
- CString m_sIdenticalBinaries;
- CString m_sDifferentFiles;
- CString m_sDifferentBinaries;
- CString m_sLUniqueFolders;
- CString m_sLUniqueFiles;
- CString m_sRUniqueFolders;
- CString m_sRUniqueFiles;
- CString m_sTotalFolders;
- CString m_sTotalFiles;
//}}AFX_DATA
protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
-
// Generated message map functions
//{{AFX_MSG(CompareStatisticsDlg)
afx_msg BOOL OnInitDialog();
@@ -62,7 +49,7 @@
// Implementation data
private:
- CompareStats * m_pCompareStats;
+ const CompareStats * m_pCompareStats;
};
#endif // _COMPARESTATISTICSDLG_H_
Modified: trunk/Src/CompareStats.cpp
===================================================================
--- trunk/Src/CompareStats.cpp 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/CompareStats.cpp 2007-10-07 09:44:06 UTC (rev 4596)
@@ -62,14 +62,16 @@
* @param [in] result Resultcode to return.
* @return Count of items for given resultcode.
*/
-int CompareStats::GetCount(CompareStats::RESULT result)
+int CompareStats::GetCount(CompareStats::RESULT result) const
{
- int currentValue = 0;
+ // What is the point in doing thread synchronization here?
+ return m_counts[result];
+ /*int currentValue = 0;
EnterCriticalSection(&m_csProtect);
int resInd = static_cast<int>(result);
currentValue = m_counts[resInd];
LeaveCriticalSection(&m_csProtect);
- return currentValue;
+ return currentValue;*/
}
/**
Modified: trunk/Src/CompareStats.h
===================================================================
--- trunk/Src/CompareStats.h 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/CompareStats.h 2007-10-07 09:44:06 UTC (rev 4596)
@@ -61,7 +61,7 @@
~CompareStats();
void AddItem(int code);
void IncreaseTotalItems(int count = 1);
- int GetCount(CompareStats::RESULT result);
+ int GetCount(CompareStats::RESULT result) const;
int GetTotalItems() const;
int GetComparedItems() const { return m_nComparedItems; }
void Reset();
Modified: trunk/Src/DirColsDlg.cpp
===================================================================
--- trunk/Src/DirColsDlg.cpp 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/DirColsDlg.cpp 2007-10-07 09:44:06 UTC (rev 4596)
@@ -79,6 +79,7 @@
*/
BOOL CDirColsDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
InitList();
LoadLists();
Modified: trunk/Src/DirColsDlg.h
===================================================================
--- trunk/Src/DirColsDlg.h 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/DirColsDlg.h 2007-10-07 09:44:06 UTC (rev 4596)
@@ -47,9 +47,9 @@
// Construction
public:
CDirColsDlg(CWnd* pParent = NULL); // standard constructor
- void AddColumn(CString name, CString desc, int log, int phy=-1)
+ void AddColumn(LPCTSTR name, LPCTSTR desc, int log, int phy=-1)
{ column c(name, desc, log, phy); m_cols.Add(c); }
- void AddDefColumn(CString name, int log, int phy=-1)
+ void AddDefColumn(LPCTSTR name, int log, int phy=-1)
{ column c(name, _T(""), log, phy); m_defCols.Add(c); }
const ColumnArray & GetColumns() const { return m_cols; }
Modified: trunk/Src/DirCompProgressDlg.cpp
===================================================================
--- trunk/Src/DirCompProgressDlg.cpp 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/DirCompProgressDlg.cpp 2007-10-07 09:44:06 UTC (rev 4596)
@@ -84,6 +84,7 @@
*/
BOOL DirCompProgressDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
GetMainFrame()->CenterToMainFrame(this);
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/DirView.h 2007-10-07 09:44:06 UTC (rev 4596)
@@ -33,6 +33,7 @@
// CDirView view
#include <afxcview.h>
#include "SortHeaderCtrl.h"
+#include "UnicodeString.h"
class FileActionScript;
@@ -197,8 +198,8 @@
bool IsDefaultSortAscending(int col) const;
int ColPhysToLog(int i) const { return m_invcolorder[i]; }
int ColLogToPhys(int i) const { return m_colorder[i]; } /**< -1 if not displayed */
- CString GetColDisplayName(int col) const;
- CString GetColDescription(int col) const;
+ String GetColDisplayName(int col) const;
+ String GetColDescription(int col) const;
int GetColLogCount() const;
void LoadColumnOrders();
void ValidateColumnOrdering();
Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/DirViewColHandler.cpp 2007-10-07 09:44:06 UTC (rev 4596)
@@ -88,11 +88,10 @@
int phys = ColLogToPhys(subitem);
if (phys>=0)
{
- CString s;
- VERIFY(s.LoadString(id));
+ String s = theApp.LoadString(id);
LV_COLUMN lvc;
lvc.mask = LVCF_TEXT;
- lvc.pszText = (LPTSTR)((LPCTSTR)s);
+ lvc.pszText = const_cast<LPTSTR>(s.c_str());
m_pList->SetColumn(m_colorder[subitem], &lvc);
}
}
@@ -367,23 +366,19 @@
/**
* @brief Return display name of column
*/
-CString CDirView::GetColDisplayName(int col) const
+String CDirView::GetColDisplayName(int col) const
{
const DirColInfo * colinfo = DirViewColItems_GetDirColInfo(col);
- CString s;
- s.LoadString(colinfo->idName);
- return s;
+ return theApp.LoadString(colinfo->idName);
}
/**
* @brief Return description of column
*/
-CString CDirView::GetColDescription(int col) const
+String CDirView::GetColDescription(int col) const
{
const DirColInfo * colinfo = DirViewColItems_GetDirColInfo(col);
- CString s;
- s.LoadString(colinfo->idDesc);
- return s;
+ return theApp.LoadString(colinfo->idDesc);
}
/**
@@ -429,7 +424,7 @@
for (int col=0; col<GetListCtrl().GetHeaderCtrl()->GetItemCount(); ++col)
{
int l = ColPhysToLog(col);
- dlg.AddColumn(GetColDisplayName(l), GetColDescription(l), l, col);
+ dlg.AddColumn(GetColDisplayName(l).c_str(), GetColDescription(l).c_str(), l, col);
}
// Now add all the columns not currently displayed
int l=0;
@@ -437,7 +432,7 @@
{
if (ColLogToPhys(l)==-1)
{
- dlg.AddColumn(GetColDisplayName(l), GetColDescription(l), l);
+ dlg.AddColumn(GetColDisplayName(l).c_str(), GetColDescription(l).c_str(), l);
}
}
@@ -445,7 +440,7 @@
for (l = 0; l < m_numcols; ++l)
{
int phy = GetColDefaultOrder(l);
- dlg.AddDefColumn(GetColDisplayName(l), l, phy);
+ dlg.AddDefColumn(GetColDisplayName(l).c_str(), l, phy);
}
if (dlg.DoModal() != IDOK)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-10-06 12:21:28 UTC (rev 4595)
+++ trunk/Src/MainFrm.cpp 2007-10-07 09:44:06 UTC (rev 4596)
@@ -3251,12 +3251,11 @@
*/
void CMainFrame::OnDebugResetOptions()
{
- CString msg(LoadResString(IDS_RESET_OPTIONS_WARNING));
- int res = AfxMessageBox(msg, MB_YESNO | MB_DEFBUTTON2 | MB_ICONWARNING);
+ String msg = theApp.LoadString(IDS_RESET_OPTIONS_WARNING);
+ int res = AfxMessageBox(msg.c_str(), MB_YESNO | MB_DEFBUTTON2 | MB_ICONWARNING);
if (res == IDYES)
{
- CMergeApp *app = dynamic_cast<CMergeApp *>(AfxGetApp());
- app->ResetOptions();
+ theApp.ResetOptions();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-14 08:19:28
|
Revision: 4614
http://winmerge.svn.sourceforge.net/winmerge/?rev=4614&view=rev
Author: jtuc
Date: 2007-10-14 01:19:26 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/WaitStatusCursor.cpp
trunk/Src/WaitStatusCursor.h
Modified: trunk/Src/WaitStatusCursor.cpp
===================================================================
--- trunk/Src/WaitStatusCursor.cpp 2007-10-12 19:26:13 UTC (rev 4613)
+++ trunk/Src/WaitStatusCursor.cpp 2007-10-14 08:19:26 UTC (rev 4614)
@@ -38,30 +38,36 @@
CustomStatusCursor::CustomStatusCursor()
: m_ended(false)
{
-};
+}
CustomStatusCursor::CustomStatusCursor(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR fmt, ...)
: m_ended(false)
{
va_list argp;
va_start(argp, fmt);
- Create(hinst, lpCursorName, fmt, argp);
+ CString msg;
+ msg.FormatV(fmt, argp);
+ Create(hinst, lpCursorName, msg);
va_end(argp);
}
-void CustomStatusCursor::Create(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR fmt, ...)
+CustomStatusCursor::CustomStatusCursor(HINSTANCE hinst, LPCTSTR lpCursorName, UINT fmtid, ...)
+: m_ended(false)
{
- CString m_msg;
+ va_list argp;
+ va_start(argp, fmtid);
+ CString msg;
+ msg.FormatV(theApp.LoadString(fmtid).c_str(), argp);
+ Create(hinst, lpCursorName, msg);
+ va_end(argp);
+}
+
+void CustomStatusCursor::Create(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR m_msg)
+{
CString m_oldmsg;
HCURSOR m_prevCursor = NULL;
HCURSOR m_myCursor = NULL;
- // update status text
- va_list args;
- va_start(args, fmt);
- m_msg.FormatV(fmt, args);
- va_end(args);
-
if (c_piStatusDisplay)
m_oldmsg = c_piStatusDisplay->BeginStatus(m_msg);
@@ -260,7 +266,9 @@
{
va_list argp;
va_start(argp, fmt);
- Create(NULL, IDC_WAIT, fmt, argp);
+ CString msg;
+ msg.FormatV(fmt, argp);
+ Create(NULL, IDC_WAIT, fmt);
va_end(argp);
}
@@ -268,6 +276,8 @@
{
va_list argp;
va_start(argp, fmtid);
- Create(NULL, IDC_WAIT, theApp.LoadString(fmtid).c_str(), argp);
+ CString msg;
+ msg.FormatV(theApp.LoadString(fmtid).c_str(), argp);
+ Create(NULL, IDC_WAIT, msg);
va_end(argp);
}
Modified: trunk/Src/WaitStatusCursor.h
===================================================================
--- trunk/Src/WaitStatusCursor.h 2007-10-12 19:26:13 UTC (rev 4613)
+++ trunk/Src/WaitStatusCursor.h 2007-10-14 08:19:26 UTC (rev 4614)
@@ -23,6 +23,7 @@
// public interface
public:
CustomStatusCursor(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR fmt, ...);
+ CustomStatusCursor(HINSTANCE hinst, LPCTSTR lpCursorName, UINT fmtid, ...);
void ChangeMsg(LPCTSTR fmt, ...);
void End();
~CustomStatusCursor();
@@ -31,7 +32,7 @@
protected:
// default constructor for derivation, in two steps 'cause of variable argument list
CustomStatusCursor();
- void Create(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR fmt, ...);
+ void Create(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR m_msg);
private:
int posInStack;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-14 08:25:51
|
Revision: 4617
http://winmerge.svn.sourceforge.net/winmerge/?rev=4617&view=rev
Author: jtuc
Date: 2007-10-14 01:25:48 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/ChildFrm.cpp
trunk/Src/ChildFrm.h
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2007-10-14 08:22:14 UTC (rev 4616)
+++ trunk/Src/ChildFrm.cpp 2007-10-14 08:25:48 UTC (rev 4617)
@@ -145,9 +145,8 @@
// Merge frame has also a dockable bar at the very left
// This is not the client area, but we create it now because we want
// to use the CCreateContext
- CString sCaption;
- VERIFY(sCaption.LoadString(IDS_LOCBAR_CAPTION));
- if (!m_wndLocationBar.Create(this, sCaption, WS_CHILD | WS_VISIBLE, ID_VIEW_LOCATION_BAR))
+ String sCaption = theApp.LoadString(IDS_LOCBAR_CAPTION);
+ if (!m_wndLocationBar.Create(this, sCaption.c_str(), WS_CHILD | WS_VISIBLE, ID_VIEW_LOCATION_BAR))
{
TRACE0("Failed to create LocationBar\n");
return FALSE;
@@ -160,8 +159,8 @@
// Merge frame has also a dockable bar at the very bottom
// This is not the client area, but we create it now because we want
// to use the CCreateContext
- VERIFY(sCaption.LoadString(IDS_DIFFBAR_CAPTION));
- if (!m_wndDetailBar.Create(this, sCaption, WS_CHILD | WS_VISIBLE, ID_VIEW_DETAIL_BAR))
+ sCaption = theApp.LoadString(IDS_DIFFBAR_CAPTION);
+ if (!m_wndDetailBar.Create(this, sCaption.c_str(), WS_CHILD | WS_VISIBLE, ID_VIEW_DETAIL_BAR))
{
TRACE0("Failed to create DiffViewBar\n");
return FALSE;
@@ -293,10 +292,9 @@
// Set text to read-only info panes
// Text is hidden if file is writable
- CString sText;
- VERIFY(sText.LoadString(IDS_STATUSBAR_READONLY));
- m_wndStatusBar.SetPaneText(PANE_LEFT_RO, sText, TRUE);
- m_wndStatusBar.SetPaneText(PANE_RIGHT_RO, sText, TRUE);
+ String sText = theApp.LoadString(IDS_STATUSBAR_READONLY);
+ m_wndStatusBar.SetPaneText(PANE_LEFT_RO, sText.c_str(), TRUE);
+ m_wndStatusBar.SetPaneText(PANE_RIGHT_RO, sText.c_str(), TRUE);
m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALFILE);
m_hDifferent = AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE);
@@ -387,6 +385,20 @@
return TRUE;
}
+/**
+ * @brief Handle translation of default messages on the status bar
+ */
+void CChildFrame::GetMessageString(UINT nID, CString& rMessage) const
+{
+ // load appropriate string
+ const String s = theApp.LoadString(nID);
+ if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
+ {
+ // not found
+ TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
+ }
+}
+
void CChildFrame::ActivateFrame(int nCmdShow)
{
BOOL bMaximized = FALSE;
@@ -656,17 +668,18 @@
CString str;
if (m_nChars == -1)
{
- str.Format(IDS_EMPTY_LINE_STATUS_INFO, m_sLine);
+ str.Format(theApp.LoadString(IDS_EMPTY_LINE_STATUS_INFO).c_str(),
+ m_sLine);
}
- else if (m_sEolDisplay == _T(""))
+ else if (m_sEolDisplay.IsEmpty())
{
- str.Format(IDS_LINE_STATUS_INFO, m_sLine, m_nColumn, m_nColumns,
- m_nChar, m_nChars);
+ str.Format(theApp.LoadString(IDS_LINE_STATUS_INFO).c_str(),
+ m_sLine, m_nColumn, m_nColumns, m_nChar, m_nChars);
}
else
{
- str.Format(IDS_LINE_STATUS_INFO_EOL, m_sLine, m_nColumn,
- m_nColumns, m_nChar, m_nChars, m_sEolDisplay);
+ str.Format(theApp.LoadString(IDS_LINE_STATUS_INFO_EOL).c_str(),
+ m_sLine, m_nColumn, m_nColumns, m_nChar, m_nChars, m_sEolDisplay);
}
m_pFrame->m_wndStatusBar.SetPaneText(m_base, str);
Modified: trunk/Src/ChildFrm.h
===================================================================
--- trunk/Src/ChildFrm.h 2007-10-14 08:22:14 UTC (rev 4616)
+++ trunk/Src/ChildFrm.h 2007-10-14 08:25:48 UTC (rev 4617)
@@ -97,6 +97,8 @@
// Overrides
+public:
+ virtual void GetMessageString(UINT nID, CString& rMessage) const;
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CChildFrame)
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-14 08:45:31
|
Revision: 4618
http://winmerge.svn.sourceforge.net/winmerge/?rev=4618&view=rev
Author: jtuc
Date: 2007-10-14 01:45:30 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/Merge.cpp
trunk/Src/Merge.h
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-10-14 08:25:48 UTC (rev 4617)
+++ trunk/Src/Merge.cpp 2007-10-14 08:45:30 UTC (rev 4618)
@@ -673,7 +673,7 @@
* @param [in] filepath Full path to file to check.
* @return true if file is a projectfile.
*/
-bool CMergeApp::IsProjectFile(const CString & filepath) const
+bool CMergeApp::IsProjectFile(LPCTSTR filepath) const
{
String ext;
SplitFilename(filepath, NULL, NULL, &ext);
@@ -689,19 +689,19 @@
* @param [in] sProject Full path to project file.
* @return TRUE if loading project file and starting compare succeeded.
*/
-bool CMergeApp::LoadAndOpenProjectFile(const CString & sProject)
+bool CMergeApp::LoadAndOpenProjectFile(LPCTSTR sProject)
{
- if (sProject.IsEmpty())
+ if (*sProject == '\0')
return false;
ProjectFile project;
- CString sErr;
+ String sErr;
if (!project.Read(sProject, &sErr))
{
- if (sErr.IsEmpty())
- sErr = LoadResString(IDS_UNK_ERROR_READING_PROJECT);
+ if (sErr.empty())
+ sErr = theApp.LoadString(IDS_UNK_ERROR_READING_PROJECT);
CString msg;
- AfxFormatString2(msg, IDS_ERROR_FILEOPEN, sProject, sErr);
+ LangFormatString2(msg, IDS_ERROR_FILEOPEN, sProject, sErr.c_str());
AfxMessageBox(msg, MB_ICONSTOP);
return false;
}
@@ -793,9 +793,9 @@
}
/** @brief Wrap one line of cmdline help in appropriate whitespace */
-static CString CmdlineOption(int idres)
+static String CmdlineOption(int idres)
{
- CString str = LoadResString(idres) + _T(" \n");
+ String str = theApp.LoadString(idres) + _T(" \n");
return str;
}
@@ -848,7 +848,7 @@
* @brief Adds specified file to the recent projects list.
* @param [in] sPathName Path to project file
*/
-void CMergeApp::AddToRecentProjectsMRU(const CString& sPathName)
+void CMergeApp::AddToRecentProjectsMRU(LPCTSTR sPathName)
{
// sPathName will be added to the top of the MRU list.
// If sPathName already exists in the MRU list, it will be moved to the top
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-10-14 08:25:48 UTC (rev 4617)
+++ trunk/Src/Merge.h 2007-10-14 08:45:30 UTC (rev 4618)
@@ -74,7 +74,7 @@
~CMergeApp();
public:
- void AddToRecentProjectsMRU(const CString& sPathName);
+ void AddToRecentProjectsMRU(LPCTSTR sPathName);
void SetNeedIdleTimer();
void SetLastCompareResult(int nResult) { m_nLastCompareResult = nResult; }
CString GetDefaultEditor();
@@ -106,8 +106,8 @@
void SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo);
// End MergeArgs.cpp
- bool LoadAndOpenProjectFile(const CString & sFilepath);
- bool IsProjectFile(const CString & filepath) const;
+ bool LoadAndOpenProjectFile(LPCTSTR sFilepath);
+ bool IsProjectFile(LPCTSTR filepath) const;
void ReloadMenu();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-14 08:50:22
|
Revision: 4619
http://winmerge.svn.sourceforge.net/winmerge/?rev=4619&view=rev
Author: jtuc
Date: 2007-10-14 01:50:20 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/7zCommon.h
trunk/Src/AboutDlg.cpp
trunk/Src/ClearCaseCmdLineParser.cpp
trunk/Src/ClearCaseCmdLineParser.h
trunk/Src/DiffContext.cpp
trunk/Src/DiffContext.h
trunk/Src/DiffFileData.cpp
trunk/Src/DiffFileData.h
trunk/Src/DiffItem.cpp
trunk/Src/DiffItem.h
trunk/Src/DiffThread.cpp
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/DirActions.cpp
trunk/Src/DirCmpReport.cpp
trunk/Src/DirCmpReportDlg.cpp
trunk/Src/DirDoc.cpp
trunk/Src/DirDoc.h
trunk/Src/DirScan.cpp
trunk/Src/DirView.cpp
trunk/Src/DirView.h
trunk/Src/DirViewColHandler.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/DirViewColItems.h
trunk/Src/FileActionScript.cpp
trunk/Src/FileActionScript.h
trunk/Src/FileFilterHelper.cpp
trunk/Src/FileFilterHelper.h
trunk/Src/FileFiltersDlg.cpp
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileTransform.cpp
trunk/Src/FileTransform.h
trunk/Src/FilterCommentsManager.cpp
trunk/Src/FilterCommentsManager.h
trunk/Src/FolderCmp.cpp
trunk/Src/FolderCmp.h
trunk/Src/LocationView.cpp
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/MergeDiffDetailView.cpp
trunk/Src/MergeDoc.cpp
trunk/Src/MergeDoc.h
trunk/Src/MergeEditView.cpp
trunk/Src/OpenDlg.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/PatchDlg.h
trunk/Src/PatchTool.cpp
trunk/Src/PatchTool.h
trunk/Src/PathContext.cpp
trunk/Src/PathContext.h
trunk/Src/PluginManager.cpp
trunk/Src/PluginManager.h
trunk/Src/Plugins.cpp
trunk/Src/ProjectFile.cpp
trunk/Src/ProjectFile.h
trunk/Src/ProjectFilePathsDlg.cpp
trunk/Src/SharedFilterDlg.cpp
trunk/Src/SharedFilterDlg.h
trunk/Src/SourceControl.cpp
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
trunk/Src/VSSHelper.cpp
trunk/Src/WinMergeCmdLineParser.cpp
trunk/Src/locality.cpp
trunk/Src/locality.h
trunk/Src/paths.cpp
trunk/Src/paths.h
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/7zCommon.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -372,6 +372,7 @@
{
case WM_INITDIALOG:
{
+ theApp.TranslateDialog(hWnd);
if (GetDlgItem(hWnd, 9001) == NULL)
{
// Dialog template isn't up to date. Give it a second chance.
@@ -833,7 +834,7 @@
if (!di.diffcode.isSideLeftOnly())
{
// Item is present on right side, i.e. folder is implied
- m_rgImpliedFoldersRight[di.sRightSubdir] = PVOID(1);
+ m_rgImpliedFoldersRight[di.sRightSubdir.c_str()] = PVOID(1);
}
}
else
@@ -842,7 +843,7 @@
if (!di.diffcode.isSideRightOnly())
{
// Item is present on left side, i.e. folder is implied
- m_rgImpliedFoldersLeft[di.sLeftSubdir] = PVOID(1);
+ m_rgImpliedFoldersLeft[di.sLeftSubdir.c_str()] = PVOID(1);
}
}
}
@@ -917,17 +918,17 @@
Envelope *envelope = new Envelope;
- const CString &sFilename = m_bRight ? di.sRightFilename : di.sLeftFilename;
- const CString &sSubdir = m_bRight ? di.sRightSubdir : di.sLeftSubdir;
+ const String &sFilename = m_bRight ? di.sRightFilename : di.sLeftFilename;
+ const String &sSubdir = m_bRight ? di.sRightSubdir : di.sLeftSubdir;
envelope->Name = sFilename;
- if (sSubdir.GetLength())
+ if (sSubdir.length())
{
- envelope->Name.Insert(0, '\\');
- envelope->Name.Insert(0, sSubdir);
+ envelope->Name.insert(0, '\\');
+ envelope->Name.insert(0, sSubdir);
}
envelope->FullPath = sFilename;
- envelope->FullPath.Insert(0, '\\');
- envelope->FullPath.Insert(0, m_bRight ?
+ envelope->FullPath.insert(0, '\\');
+ envelope->FullPath.insert(0, m_bRight ?
di.getRightFilepath(pDoc->GetRightBasePath()) :
di.getLeftFilepath(pDoc->GetLeftBasePath()));
@@ -941,7 +942,7 @@
if (isSideLeft)
{
// Item is missing on right side
- PVOID &implied = m_rgImpliedFoldersRight[di.sLeftSubdir];
+ PVOID &implied = m_rgImpliedFoldersRight[di.sLeftSubdir.c_str()];
if (!implied)
{
// Folder is not implied by some other file, and has
@@ -960,7 +961,7 @@
if (isSideRight)
{
// Item is missing on left side
- PVOID &implied = m_rgImpliedFoldersLeft[di.sRightSubdir];
+ PVOID &implied = m_rgImpliedFoldersLeft[di.sRightSubdir.c_str()];
if (!implied)
{
// Folder is not implied by some other file, and has
@@ -982,14 +983,14 @@
if (m_strFolderPrefix.GetLength())
{
- if (envelope->Name.GetLength())
- envelope->Name.Insert(0, '\\');
- envelope->Name.Insert(0, m_strFolderPrefix);
+ if (envelope->Name.length())
+ envelope->Name.insert(0, '\\');
+ envelope->Name.insert(0, m_strFolderPrefix);
}
item.Mask.Item = item.Mask.Name|item.Mask.FullPath|item.Mask.CheckIfPresent|Recurse;
- item.Name = envelope->Name;
- item.FullPath = envelope->FullPath;
+ item.Name = envelope->Name.c_str();
+ item.FullPath = envelope->FullPath.c_str();
return envelope;
}
@@ -1111,8 +1112,8 @@
void CDirView::DirItemEnumerator::CollectFiles(CString &strBuffer)
{
CDirDoc *pDoc = m_pView->GetDocument();
- const CString sLeftRootPath = pDoc->GetLeftBasePath();
- const CString sRightRootPath = pDoc->GetRightBasePath();
+ const String sLeftRootPath = pDoc->GetLeftBasePath();
+ const String sRightRootPath = pDoc->GetRightBasePath();
UINT i;
int cchBuffer = 0;
for (i = Open() ; i-- ; )
@@ -1123,7 +1124,7 @@
cchBuffer +=
(
m_bRight ? di.getRightFilepath(sLeftRootPath) : di.getLeftFilepath(sRightRootPath)
- ).GetLength() + (m_bRight ? di.sRightFilename : di.sLeftFilename).GetLength() + 2;
+ ).length() + (m_bRight ? di.sRightFilename : di.sLeftFilename).length() + 2;
}
}
LPTSTR pchBuffer = strBuffer.GetBufferSetLength(cchBuffer);
@@ -1136,8 +1137,8 @@
(
pchBuffer,
_T("%s\\%s"),
- m_bRight ? di.getRightFilepath(sLeftRootPath) : di.getLeftFilepath(sRightRootPath),
- m_bRight ? di.sRightFilename : di.sLeftFilename
+ m_bRight ? di.getRightFilepath(sLeftRootPath).c_str() : di.getLeftFilepath(sRightRootPath).c_str(),
+ m_bRight ? di.sRightFilename.c_str() : di.sLeftFilename.c_str()
) + 1;
}
}
Modified: trunk/Src/7zCommon.h
===================================================================
--- trunk/Src/7zCommon.h 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/7zCommon.h 2007-10-14 08:50:20 UTC (rev 4619)
@@ -20,10 +20,10 @@
{
public:
CTempPathContext *m_pParent;
- CString m_strLeftDisplayRoot;
- CString m_strRightDisplayRoot;
- CString m_strLeftRoot;
- CString m_strRightRoot;
+ String m_strLeftDisplayRoot;
+ String m_strRightDisplayRoot;
+ String m_strLeftRoot;
+ String m_strRightRoot;
CTempPathContext *DeleteHead();
};
@@ -52,8 +52,8 @@
typedef CListCtrl *pView;
struct Envelope : public Merge7z::Envelope
{
- CString Name;
- CString FullPath;
+ String Name;
+ String FullPath;
virtual void Free()
{
delete this;
Modified: trunk/Src/AboutDlg.cpp
===================================================================
--- trunk/Src/AboutDlg.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/AboutDlg.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -62,6 +62,7 @@
*/
BOOL CAboutDlg::OnInitDialog()
{
+ theApp.TranslateDialog(m_hWnd);
CDialog::OnInitDialog();
// Load application icon
@@ -73,7 +74,7 @@
CVersionInfo version(AfxGetResourceHandle());
CString sVersion = version.GetFixedProductVersion();
- AfxFormatString1(m_strVersion, IDS_VERSION_FMT, sVersion);
+ LangFormatString1(m_strVersion, IDS_VERSION_FMT, sVersion);
#ifdef _UNICODE
CString strUnicode;
@@ -85,7 +86,7 @@
CString sPrivateBuild = version.GetPrivateBuild();
if (!sPrivateBuild.IsEmpty())
{
- AfxFormatString1(m_strPrivateBuild, IDS_PRIVATEBUILD_FMT, sPrivateBuild);
+ LangFormatString1(m_strPrivateBuild, IDS_PRIVATEBUILD_FMT, sPrivateBuild);
}
CString copyright = version.GetLegalCopyright();
@@ -104,30 +105,30 @@
*/
void CAboutDlg::OnBnClickedOpenContributors()
{
- CString defPath = GetModulePath();
+ String defPath = GetModulePath();
// Don't add quotation marks yet, CFile doesn't like them
- CString docPath = defPath + _T("\\contributors.txt");
+ String docPath = defPath + _T("\\contributors.txt");
HINSTANCE ret = 0;
- if (paths_DoesPathExist(docPath) == IS_EXISTING_FILE)
+ if (paths_DoesPathExist(docPath.c_str()) == IS_EXISTING_FILE)
{
// Now, add quotation marks so ShellExecute() doesn't fail if path
// includes spaces
- docPath.Insert(0, _T("\""));
- docPath.Insert(docPath.GetLength(), _T("\""));
- ret = ShellExecute(m_hWnd, NULL, _T("notepad"), docPath, defPath, SW_SHOWNORMAL);
+ docPath.insert(0, _T("\""));
+ docPath.insert(docPath.length(), _T("\""));
+ ret = ShellExecute(m_hWnd, NULL, _T("notepad"), docPath.c_str(), defPath.c_str(), SW_SHOWNORMAL);
// values < 32 are errors (ref to MSDN)
if ((int)ret < 32)
{
// Try to open with associated application (.txt)
- ret = ShellExecute(m_hWnd, _T("open"), docPath, NULL, NULL, SW_SHOWNORMAL);
+ ret = ShellExecute(m_hWnd, _T("open"), docPath.c_str(), NULL, NULL, SW_SHOWNORMAL);
if ((int)ret < 32)
ResMsgBox1(IDS_ERROR_EXECUTE_FILE, _T("Notepad.exe"), MB_ICONSTOP);
}
}
else
- ResMsgBox1(IDS_ERROR_FILE_NOT_FOUND, docPath, MB_ICONSTOP);
+ ResMsgBox1(IDS_ERROR_FILE_NOT_FOUND, docPath.c_str(), MB_ICONSTOP);
}
Modified: trunk/Src/ClearCaseCmdLineParser.cpp
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/ClearCaseCmdLineParser.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -80,15 +80,15 @@
}
else
{
- if ((m_bBaseFile == true) && m_sBaseFile.IsEmpty())
+ if ((m_bBaseFile == true) && m_sBaseFile.empty())
{
m_sBaseFile = pszParam;
}
- else if ((m_bOutFile == true) && m_sOutFile.IsEmpty())
+ else if ((m_bOutFile == true) && m_sOutFile.empty())
{
m_sOutFile = pszParam;
}
- else if ((m_bDesc == true) && m_sBaseDesc.IsEmpty())
+ else if ((m_bDesc == true) && m_sBaseDesc.empty())
{
m_sBaseDesc = pszParam;
m_bDesc = false;
@@ -104,18 +104,18 @@
}
else
{
- CString sFile = paths_GetLongPath(pszParam);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ String sFile = paths_GetLongPath(pszParam);
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile.c_str());
m_CmdLineInfo.m_nFiles += 1;
}
}
if (TRUE == bLast)
{
- if (FALSE == m_sOutFile.IsEmpty())
+ if (FALSE == m_sOutFile.empty())
{
- CString sFile = paths_GetLongPath(m_sOutFile);
- m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile);
+ String sFile = paths_GetLongPath(m_sOutFile.c_str());
+ m_CmdLineInfo.m_Files.SetAtGrow(m_CmdLineInfo.m_nFiles, sFile.c_str());
m_CmdLineInfo.m_nFiles += 1;
}
}
Modified: trunk/Src/ClearCaseCmdLineParser.h
===================================================================
--- trunk/Src/ClearCaseCmdLineParser.h 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/ClearCaseCmdLineParser.h 2007-10-14 08:50:20 UTC (rev 4619)
@@ -33,6 +33,7 @@
// $Id$
#include "CmdLineParser.h"
+#include "UnicodeString.h"
/**
* @brief Rational ClearCase's command line parser.
@@ -63,9 +64,9 @@
bool m_bBaseFile; /**< Files' common ancestor. Used till we'll have a 3-ways merge. */
bool m_bOutFile;
- CString m_sBaseFile;
- CString m_sBaseDesc;
- CString m_sOutFile;
+ String m_sBaseFile;
+ String m_sBaseDesc;
+ String m_sOutFile;
};
#endif // _CLEAR_CASE_CMD_LINE_PARSER_INCLUDED_
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffContext.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -158,7 +158,7 @@
*/
BOOL CDiffContext::UpdateInfoFromDiskHalf(DIFFITEM & di, BOOL bLeft)
{
- CString filepath;
+ String filepath;
if (bLeft == TRUE)
filepath = paths_ConcatPath(di.getLeftFilepath(GetNormalizedLeft()), di.sLeftFilename);
@@ -166,10 +166,10 @@
filepath = paths_ConcatPath(di.getRightFilepath(GetNormalizedRight()), di.sRightFilename);
DiffFileInfo & dfi = bLeft ? di.left : di.right;
- if (!dfi.Update((LPCTSTR)filepath))
+ if (!dfi.Update(filepath.c_str()))
return FALSE;
UpdateVersion(di, bLeft);
- GuessCodepageEncoding(filepath, &dfi.encoding, m_bGuessEncoding);
+ GuessCodepageEncoding(filepath.c_str(), &dfi.encoding, m_bGuessEncoding);
return TRUE;
}
@@ -208,12 +208,12 @@
if (di.diffcode.isDirectory())
return;
- CString spath;
+ String spath;
if (bLeft)
{
if (di.diffcode.isSideRightOnly())
return;
- LPCTSTR ext = PathFindExtension(di.sLeftFilename);
+ LPCTSTR ext = PathFindExtension(di.sLeftFilename.c_str());
if (!CheckFileForVersion(ext))
return;
spath = di.getLeftFilepath(GetNormalizedLeft());
@@ -223,7 +223,7 @@
{
if (di.diffcode.isSideLeftOnly())
return;
- LPCTSTR ext = PathFindExtension(di.sRightFilename);
+ LPCTSTR ext = PathFindExtension(di.sRightFilename.c_str());
if (!CheckFileForVersion(ext))
return;
spath = di.getRightFilepath(GetNormalizedRight());
@@ -231,7 +231,7 @@
}
// Get version info if it exists
- CVersionInfo ver(spath);
+ CVersionInfo ver(spath.c_str());
DWORD verMS = 0;
DWORD verLS = 0;
if (ver.GetFixedFileVersion(verMS, verLS))
@@ -315,7 +315,7 @@
}
/** @brief Forward call to retrieve plugin info (winds up in DirDoc) */
-void CDiffContext::FetchPluginInfos(const CString& filteredFilenames,
+void CDiffContext::FetchPluginInfos(LPCTSTR filteredFilenames,
PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer)
{
ASSERT(m_piPluginInfos);
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffContext.h 2007-10-14 08:50:20 UTC (rev 4619)
@@ -44,7 +44,7 @@
class IPluginInfos
{
public:
- virtual void FetchPluginInfos(const CString& filteredFilenames,
+ virtual void FetchPluginInfos(LPCTSTR filteredFilenames,
PackingInfo ** infoUnpacker,
PrediffingInfo ** infoPrediffer) = 0;
};
@@ -81,10 +81,10 @@
* Normalized paths are preferred to use - short paths are expanded
* and trailing slashes removed (except from root path).
*/
- CString GetLeftPath() const { return m_paths.GetLeft(FALSE); }
- CString GetRightPath() const { return m_paths.GetRight(FALSE); }
- CString GetNormalizedLeft() const { return m_paths.GetLeft(); }
- CString GetNormalizedRight() const { return m_paths.GetRight(); }
+ String GetLeftPath() const { return m_paths.GetLeft(FALSE); }
+ String GetRightPath() const { return m_paths.GetRight(FALSE); }
+ String GetNormalizedLeft() const { return m_paths.GetLeft(); }
+ String GetNormalizedRight() const { return m_paths.GetRight(); }
//@}
// change an existing difference
@@ -95,7 +95,7 @@
CompareOptions * GetCompareOptions(int compareMethod);
// retrieve or manufacture plugin info for specified file comparison
- void FetchPluginInfos(const CString& filteredFilenames,
+ void FetchPluginInfos(LPCTSTR filteredFilenames,
PackingInfo ** infoUnpacker, PrediffingInfo ** infoPrediffer);
bool ShouldAbort() const;
Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffFileData.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -220,8 +220,8 @@
* return false if anything fails
* caller has to DeleteFile filepathTransformed, if it differs from filepath
*/
-bool DiffFileData::Filepath_Transform(FileLocation & fpenc, const CString & filepath, CString & filepathTransformed,
- const CString & filteredFilenames, PrediffingInfo * infoPrediffer, int fd)
+bool DiffFileData::Filepath_Transform(FileLocation & fpenc, const String & filepath, String & filepathTransformed,
+ LPCTSTR filteredFilenames, PrediffingInfo * infoPrediffer, int fd)
{
BOOL bMayOverwrite = FALSE; // temp variable set each time it is used
@@ -265,7 +265,7 @@
{
// fourth step : prepare for diffing
// may overwrite if we've already copied to temp file
- BOOL bMayOverwrite = (0 != filepathTransformed.CompareNoCase(filepath));
+ BOOL bMayOverwrite = 0 != lstrcmpi(filepathTransformed.c_str(), filepath.c_str());
if (!FileTransform_UCS2ToUTF8(filepathTransformed, bMayOverwrite))
return false;
}
Modified: trunk/Src/DiffFileData.h
===================================================================
--- trunk/Src/DiffFileData.h 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffFileData.h 2007-10-14 08:50:20 UTC (rev 4619)
@@ -45,8 +45,8 @@
void Close() { Reset(); }
void SetDisplayFilepaths(LPCTSTR szTrueFilepath1, LPCTSTR szTrueFilepath2);
- bool Filepath_Transform(FileLocation & fpenc, const CString & filepath, CString & filepathTransformed,
- const CString & filteredFilenames, PrediffingInfo * infoPrediffer, int fd);
+ bool Filepath_Transform(FileLocation & fpenc, const String & filepath, String & filepathTransformed,
+ LPCTSTR filteredFilenames, PrediffingInfo * infoPrediffer, int fd);
void GuessEncoding_from_buffer_in_DiffContext(int side, CDiffContext * pCtxt);
static void GuessEncoding_from_buffer(FileLocation & fpenc, const char **data, int count);
void GuessEncoding_from_FileLocation(FileLocation & fpenc);
Modified: trunk/Src/DiffItem.cpp
===================================================================
--- trunk/Src/DiffItem.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffItem.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -70,9 +70,9 @@
}
/** @brief Return path to left file, including all but file name */
-CString DIFFITEM::getLeftFilepath(const CString &sLeftRoot) const
+String DIFFITEM::getLeftFilepath(const String &sLeftRoot) const
{
- CString sPath;
+ String sPath;
if (!diffcode.isSideRightOnly())
{
sPath = paths_ConcatPath(sLeftRoot, sLeftSubdir);
@@ -81,9 +81,9 @@
}
/** @brief Return path to right file, including all but file name */
-CString DIFFITEM::getRightFilepath(const CString &sRightRoot) const
+String DIFFITEM::getRightFilepath(const String &sRightRoot) const
{
- CString sPath;
+ String sPath;
if (!diffcode.isSideLeftOnly())
{
sPath = paths_ConcatPath(sRightRoot, sRightSubdir);
Modified: trunk/Src/DiffItem.h
===================================================================
--- trunk/Src/DiffItem.h 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffItem.h 2007-10-14 08:50:20 UTC (rev 4619)
@@ -118,13 +118,13 @@
{
DiffFileInfo left; /**< Fileinfo for left file */
DiffFileInfo right; /**< Fileinfo for right file */
- CString sLeftFilename; /**< Left filename (without path!) */
- CString sRightFilename; /**< Right filename (without path!) */
- CString sLeftSubdir; /**< Left subdirectory from root of comparison */
- CString sRightSubdir; /**< Right subdirectory from root of comparison */
+ String sLeftFilename; /**< Left filename (without path!) */
+ String sRightFilename; /**< Right filename (without path!) */
+ String sLeftSubdir; /**< Left subdirectory from root of comparison */
+ String sRightSubdir; /**< Right subdirectory from root of comparison */
int nsdiffs; /**< Amount of non-ignored differences */
int nidiffs; /**< Amount of ignored differences */
- CString errorDesc; /**< technical note about error */
+ String errorDesc; /**< technical note about error */
UINT customFlags1; /**< Custom flags set 1 */
bool empty; /**< flag to mark diffitem that doesn't have any data */
DIFFCODE diffcode; /**< Compare result */
@@ -135,8 +135,8 @@
DIFFITEM(const DIFFITEM& di);
DIFFITEM& operator=(const DIFFITEM& di);
- CString getLeftFilepath(const CString &sLeftRoot) const;
- CString getRightFilepath(const CString &sRightRoot) const;
+ String getLeftFilepath(const String &sLeftRoot) const;
+ String getRightFilepath(const String &sRightRoot) const;
};
#endif // _DIFF_ITEM_H_
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffThread.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -225,8 +225,8 @@
bool casesensitive = false;
int depth = myStruct->bRecursive ? -1 : 0;
- paths.SetLeft(myStruct->context->GetNormalizedLeft());
- paths.SetRight(myStruct->context->GetNormalizedRight());
+ paths.SetLeft(myStruct->context->GetNormalizedLeft().c_str());
+ paths.SetRight(myStruct->context->GetNormalizedRight().c_str());
if (bOnlyRequested)
{
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffWrapper.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -177,7 +177,7 @@
* @brief Set text tested to find the prediffer automatically.
* Most probably a concatenated string of both filenames.
*/
-void CDiffWrapper::SetTextForAutomaticPrediff(const CString &text)
+void CDiffWrapper::SetTextForAutomaticPrediff(const String &text)
{
m_sToFindPrediffer = text;
}
@@ -615,7 +615,7 @@
* @param [in] filepath2 Second file to compare "changed file".
* @param [in] tempPaths Are given paths temporary (can be deleted)?.
*/
-void CDiffWrapper::SetPaths(const CString &filepath1, const CString &filepath2,
+void CDiffWrapper::SetPaths(const String &filepath1, const String &filepath2,
BOOL tempPaths)
{
m_s1File = filepath1;
@@ -629,7 +629,7 @@
* @param [in] OriginalFile1 First file to compare "(NON-TEMP) file".
* @param [in] OriginalFile2 Second file to compare "(NON-TEMP) file".
*/
-void CDiffWrapper::SetCompareFiles(const CString &OriginalFile1, const CString &OriginalFile2)
+void CDiffWrapper::SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2)
{
m_sOriginalFile1 = OriginalFile1;
m_sOriginalFile2 = OriginalFile2;
@@ -643,7 +643,7 @@
* @param [in] altPath1 Alternative file path of first file.
* @param [in] altPath2 Alternative file path of second file.
*/
-void CDiffWrapper::SetAlternativePaths(const CString &altPath1, const CString &altPath2)
+void CDiffWrapper::SetAlternativePaths(const String &altPath1, const String &altPath2)
{
m_s1AlternativePath = altPath1;
m_s2AlternativePath = altPath2;
@@ -654,15 +654,15 @@
*/
BOOL CDiffWrapper::RunFileDiff()
{
- CString filepath1(m_s1File);
- CString filepath2(m_s2File);
- filepath1.Replace('/', '\\');
- filepath2.Replace('/', '\\');
+ String filepath1(m_s1File);
+ String filepath2(m_s2File);
+ replace_char(&*filepath1.begin(), '/', '\\');
+ replace_char(&*filepath2.begin(), '/', '\\');
BOOL bRet = TRUE;
USES_CONVERSION;
- CString strFile1Temp = filepath1;
- CString strFile2Temp = filepath2;
+ String strFile1Temp = filepath1;
+ String strFile2Temp = filepath2;
m_options.SetToDiffUtils();
//SwapToInternalSettings();
@@ -678,7 +678,7 @@
{
// this can only fail if the data can not be saved back (no more
// place on disk ???) What to do then ??
- FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer, m_infoPrediffer,
+ FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer.c_str(), m_infoPrediffer,
m_bPathsAreTemp);
}
else
@@ -689,7 +689,7 @@
{
// display a message box
CString sError;
- AfxFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp,
+ LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp.c_str(),
m_infoPrediffer->pluginName);
AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
// don't use any more this prediffer
@@ -707,19 +707,19 @@
{
// display a message box
CString sError;
- AfxFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp,
+ LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp.c_str(),
m_infoPrediffer->pluginName);
AfxMessageBox(sError, MB_OK | MB_ICONSTOP);
// don't use any more this prediffer
m_infoPrediffer->bToBeScanned = FALSE;
- m_infoPrediffer->pluginName = _T("");
+ m_infoPrediffer->pluginName.Empty();
}
FileTransform_UCS2ToUTF8(strFile2Temp, m_bPathsAreTemp);
DiffFileData diffdata;
- diffdata.SetDisplayFilepaths(filepath1, filepath2); // store true names for diff utils patch file
+ diffdata.SetDisplayFilepaths(filepath1.c_str(), filepath2.c_str()); // store true names for diff utils patch file
// This opens & fstats both files (if it succeeds)
- if (!diffdata.OpenFiles(strFile1Temp, strFile2Temp))
+ if (!diffdata.OpenFiles(strFile1Temp.c_str(), strFile2Temp.c_str()))
{
return FALSE;
}
@@ -738,10 +738,10 @@
// what differences diff-engine sees!
#ifdef _DEBUG
// throw the diff into a temp file
- CString sTempPath = paths_GetTempPath(); // get path to Temp folder
- CString path = paths_ConcatPath(sTempPath, _T("Diff.txt"));
+ String sTempPath = paths_GetTempPath(); // get path to Temp folder
+ String path = paths_ConcatPath(sTempPath, _T("Diff.txt"));
- outfile = _tfopen(path, _T("w+"));
+ outfile = _tfopen(path.c_str(), _T("w+"));
if (outfile != NULL)
{
print_normal_script(script);
@@ -793,23 +793,23 @@
diffdata.Close();
// Delete temp files transformation functions possibly created
- if (filepath1.CompareNoCase(strFile1Temp) != 0)
+ if (lstrcmpi(filepath1.c_str(), strFile1Temp.c_str()) != 0)
{
- if (!::DeleteFile(strFile1Temp))
+ if (!::DeleteFile(strFile1Temp.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile1Temp, GetSysError(GetLastError())));
+ strFile1Temp.c_str(), GetSysError(GetLastError())));
}
- strFile1Temp.Empty();
+ strFile1Temp.erase();
}
- if (filepath2.CompareNoCase(strFile2Temp) != 0)
+ if (lstrcmpi(filepath2.c_str(), strFile2Temp.c_str()) != 0)
{
- if (!::DeleteFile(strFile2Temp))
+ if (!::DeleteFile(strFile2Temp.c_str()))
{
LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"),
- strFile2Temp, GetSysError(GetLastError())));
+ strFile2Temp.c_str(), GetSysError(GetLastError())));
}
- strFile2Temp.Empty();
+ strFile2Temp.erase();
}
return bRet;
@@ -899,9 +899,9 @@
/**
* @brief Formats command-line for diff-engine last run (like it was called from command-line)
*/
-CString CDiffWrapper::FormatSwitchString()
+String CDiffWrapper::FormatSwitchString()
{
- CString switches;
+ String switches;
TCHAR tmpNum[5] = {0};
switch (m_options.m_outputStyle)
@@ -1066,15 +1066,15 @@
//Logic needed for Ignore comment option
DIFFOPTIONS options;
GetOptions(&options);
- CString asLwrCaseExt;
+ String asLwrCaseExt;
if (options.bFilterCommentsLines)
{
- CString LowerCaseExt = m_sOriginalFile1;
- int PosOfDot = LowerCaseExt.ReverseFind('.');
+ String LowerCaseExt = m_sOriginalFile1;
+ int PosOfDot = LowerCaseExt.rfind('.');
if (PosOfDot != -1)
{
- LowerCaseExt = LowerCaseExt.Mid(PosOfDot+1);
- LowerCaseExt.MakeLower();
+ LowerCaseExt.erase(0, PosOfDot + 1);
+ CharLower(&*LowerCaseExt.begin());
asLwrCaseExt = LowerCaseExt;
}
}
@@ -1148,7 +1148,7 @@
{
int QtyLinesLeft = (trans_b0 - trans_a0) + 1; //Determine quantity of lines in this block for left side
int QtyLinesRight = (trans_b1 - trans_a1) + 1;//Determine quantity of lines in this block for right side
- PostFilter(thisob->line0, QtyLinesLeft, thisob->line1, QtyLinesRight, op, *m_FilterCommentsManager, asLwrCaseExt);
+ PostFilter(thisob->line0, QtyLinesLeft, thisob->line1, QtyLinesRight, op, *m_FilterCommentsManager, asLwrCaseExt.c_str());
}
if (m_pFilterList && m_pFilterList->HasRegExps())
@@ -1194,16 +1194,16 @@
// Get paths, primarily use alternative paths, only if they are empty
// use full filepaths
- CString path1(m_s1AlternativePath);
- CString path2(m_s2AlternativePath);
- if (path1.IsEmpty())
+ String path1(m_s1AlternativePath);
+ String path2(m_s2AlternativePath);
+ if (path1.empty())
path1 = m_s1File;
- if (path2.IsEmpty())
+ if (path2.empty())
path2 = m_s2File;
- path1.Replace('\\', '/');
- path2.Replace('\\', '/');
- inf_patch[0].name = strdup(T2CA(path1));
- inf_patch[1].name = strdup(T2CA(path2));
+ replace_char(&*path1.begin(), '\\', '/');
+ replace_char(&*path2.begin(), '\\', '/');
+ inf_patch[0].name = strdup(T2CA(path1.c_str()));
+ inf_patch[1].name = strdup(T2CA(path2.c_str()));
outfile = NULL;
if (!m_sPatchFile.IsEmpty())
@@ -1221,9 +1221,9 @@
// Print "command line"
if (m_bAddCmdLine)
{
- CString switches = FormatSwitchString();
+ String switches = FormatSwitchString();
_ftprintf(outfile, _T("diff%s %s %s\n"),
- switches, path1, path2);
+ switches.c_str(), path1.c_str(), path2.c_str());
}
// Output patchfile
@@ -1267,10 +1267,10 @@
* @brief Set line filters, given as one string.
* @param [in] filterStr Filters.
*/
-void CDiffWrapper::SetFilterList(const CString &filterStr)
+void CDiffWrapper::SetFilterList(LPCTSTR filterStr)
{
// Remove filterlist if new filter is empty
- if (filterStr.IsEmpty())
+ if (*filterStr == '\0')
{
delete m_pFilterList;
m_pFilterList = NULL;
@@ -1278,41 +1278,39 @@
}
// Adding new filter without previous filter
- if (!filterStr.IsEmpty() && m_pFilterList == NULL)
+ if (m_pFilterList == NULL)
{
m_pFilterList = new FilterList;
}
m_pFilterList->RemoveAllFilters();
- if (!filterStr.IsEmpty())
- {
- char * regexp_str;
- FilterList::EncodingType type;
-
+
+ char * regexp_str;
+ FilterList::EncodingType type;
+
#ifdef UNICODE
- regexp_str = UCS2UTF8_ConvertToUtf8(filterStr);
- type = FilterList::ENC_UTF8;
+ regexp_str = UCS2UTF8_ConvertToUtf8(filterStr.c_str());
+ type = FilterList::ENC_UTF8;
#else
- CString tmp_str(filterStr);
- regexp_str = tmp_str.LockBuffer();
- type = FilterList::ENC_ANSI;
+ CString tmp_str(filterStr);
+ regexp_str = tmp_str.LockBuffer();
+ type = FilterList::ENC_ANSI;
#endif
- // Add every "line" of regexps to regexp list
- char * token;
- const char sep[] = "\r\n";
- token = strtok(regexp_str, sep);
- while (token)
- {
- m_pFilterList->AddRegExp(token, type);
- token = strtok(NULL, sep);
- }
+ // Add every "line" of regexps to regexp list
+ char * token;
+ const char sep[] = "\r\n";
+ token = strtok(regexp_str, sep);
+ while (token)
+ {
+ m_pFilterList->AddRegExp(token, type);
+ token = strtok(NULL, sep);
+ }
#ifdef UNICODE
- UCS2UTF8_Dealloc(regexp_str);
+ UCS2UTF8_Dealloc(regexp_str);
#else
- tmp_str.UnlockBuffer();
+ tmp_str.UnlockBuffer();
#endif
- }
}
/**
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DiffWrapper.h 2007-10-14 08:50:20 UTC (rev 4619)
@@ -157,25 +157,25 @@
void SetDiffList(DiffList *diffList);
void GetOptions(DIFFOPTIONS *options);
void SetOptions(const DIFFOPTIONS *options);
- void SetTextForAutomaticPrediff(const CString &text);
+ void SetTextForAutomaticPrediff(const String &text);
void SetPrediffer(PrediffingInfo * prediffer =NULL);
void GetPrediffer(PrediffingInfo * prediffer);
void SetPatchOptions(const PATCHOPTIONS *options);
void SetDetectMovedBlocks(BOOL bDetectMovedBlocks);
BOOL GetDetectMovedBlocks() { return (m_pMovedLines != NULL); }
BOOL SetAppendFiles(BOOL bAppendFiles);
- void SetPaths(const CString &filepath1, const CString &filepath2, BOOL tempPaths);
- void SetAlternativePaths(const CString &altPath1, const CString &altPath2);
+ void SetPaths(const String &filepath1, const String &filepath2, BOOL tempPaths);
+ void SetAlternativePaths(const String &altPath1, const String &altPath2);
BOOL RunFileDiff();
void GetDiffStatus(DIFFSTATUS *status);
void AddDiffRange(UINT begin0, UINT end0, UINT begin1, UINT end1, BYTE op);
void FixLastDiffRange(int leftBufferLines, int rightBufferLines, BOOL left);
MovedLines * GetMovedLines() { return m_pMovedLines; }
- void SetCompareFiles(const CString &OriginalFile1, const CString &OriginalFile2);
- void SetFilterList(const CString &filterStr);
+ void SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2);
+ void SetFilterList(LPCTSTR filterStr);
protected:
- CString FormatSwitchString();
+ String FormatSwitchString();
BOOL Diff2Files(struct change ** diffs, DiffFileData *diffData,
int * bin_status, int * bin_file);
void LoadWinMergeDiffsFromDiffUtilsScript(struct change * script, const file_data * inf);
@@ -186,18 +186,18 @@
DiffutilsOptions m_options;
DIFFSTATUS m_status; /**< Status of last compare */
FilterList * m_pFilterList; /**< List of linefilters. */
- CString m_s1File; /**< Full path to first diff'ed file. */
- CString m_s2File; /**< Full path to second diff'ed file. */
- CString m_s1AlternativePath; /**< First file's alternative path (may be relative). */
- CString m_s2AlternativePath; /**< Second file's alternative path (may be relative). */
- CString m_sOriginalFile1; /**< First file's original (NON-TEMP) path. */
- CString m_sOriginalFile2; /**< Second file's original (NON-TEMP) path. */
+ String m_s1File; /**< Full path to first diff'ed file. */
+ String m_s2File; /**< Full path to second diff'ed file. */
+ String m_s1AlternativePath; /**< First file's alternative path (may be relative). */
+ String m_s2AlternativePath; /**< Second file's alternative path (may be relative). */
+ String m_sOriginalFile1; /**< First file's original (NON-TEMP) path. */
+ String m_sOriginalFile2; /**< Second file's original (NON-TEMP) path. */
CString m_sPatchFile; /**< Full path to created patch file. */
BOOL m_bPathsAreTemp; /**< Are compared paths temporary? */
/// prediffer info are stored only for MergeDoc
PrediffingInfo * m_infoPrediffer;
/// prediffer info are stored only for MergeDoc
- CString m_sToFindPrediffer;
+ String m_sToFindPrediffer;
BOOL m_bUseDiffList; /**< Are results returned in difflist? */
BOOL m_bCreatePatchFile; /**< Do we create a patch file? */
BOOL m_bAddCmdLine; /**< Do we add commandline to patch file? */
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DirActions.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -101,13 +101,13 @@
sDest = theApp.LoadString(IDS_TO);
}
- CString strSrc(src);
+ String strSrc(src);
if (paths_DoesPathExist(src) == IS_EXISTING_DIR)
{
if (!paths_EndsWithSlash(src))
strSrc += _T("\\");
}
- CString strDest(dest);
+ String strDest(dest);
if (paths_DoesPathExist(dest) == IS_EXISTING_DIR)
{
if (!paths_EndsWithSlash(dest))
@@ -117,8 +117,8 @@
dlg.m_question = strQuestion;
dlg.m_fromText = sOrig.c_str();
dlg.m_toText = sDest.c_str();
- dlg.m_fromPath = strSrc;
- dlg.m_toPath = strDest;
+ dlg.m_fromPath = strSrc.c_str();
+ dlg.m_toPath = strDest.c_str();
int rtn = dlg.DoModal();
return (rtn==IDYES);
@@ -197,7 +197,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -207,7 +207,7 @@
// We must check that paths still exists
CString failpath;
- BOOL succeed = CheckPathsExist(srFile, slFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(srFile.c_str(), slFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -243,7 +243,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -253,7 +253,7 @@
// We must first check that paths still exists
CString failpath;
- BOOL succeed = CheckPathsExist(slFile, srFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(slFile.c_str(), srFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -289,7 +289,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_DEL;
int selCount = 0;
int sel=-1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -299,7 +299,7 @@
// We must check that path still exists
CString failpath;
- BOOL succeed = CheckPathsExist(slFile, srFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(slFile.c_str(), srFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -331,7 +331,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_DEL;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -342,7 +342,7 @@
// We must first check that path still exists
CString failpath;
- BOOL succeed = CheckPathsExist(srFile, slFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(srFile.c_str(), slFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -377,7 +377,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_DEL;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -388,7 +388,7 @@
// We must first check that paths still exists
CString failpath;
- BOOL succeed = CheckPathsExist(srFile, slFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(srFile.c_str(), slFile.c_str(), ALLOW_ALL,
ALLOW_ALL, failpath);
if (succeed == FALSE)
{
@@ -424,7 +424,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_DEL;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -456,7 +456,7 @@
// We must first check that paths still exists
CString failpath;
- BOOL succeed = CheckPathsExist(slFile, srFile, leftFlags,
+ BOOL succeed = CheckPathsExist(slFile.c_str(), srFile.c_str(), leftFlags,
rightFlags, failpath);
if (succeed == FALSE)
{
@@ -498,7 +498,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -509,7 +509,7 @@
// We must check that path still exists
CString failpath;
- BOOL succeed = CheckPathsExist(slFile, srFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(slFile.c_str(), srFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -525,10 +525,13 @@
if (GetDocument()->GetRecursive())
{
- if (!di.sLeftSubdir.IsEmpty())
- sFullDest += di.sLeftSubdir + _T("\\");
+ if (!di.sLeftSubdir.empty())
+ {
+ sFullDest += di.sLeftSubdir.c_str();
+ sFullDest += _T("\\");
+ }
}
- sFullDest += di.sLeftFilename;
+ sFullDest += di.sLeftFilename.c_str();
act.dest = sFullDest;
act.src = slFile;
@@ -565,7 +568,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -576,7 +579,7 @@
// We must check that path still exists
CString failpath;
- BOOL succeed = CheckPathsExist(srFile, slFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(srFile.c_str(), slFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -592,10 +595,13 @@
if (GetDocument()->GetRecursive())
{
- if (!di.sRightSubdir.IsEmpty())
- sFullDest += di.sRightSubdir + _T("\\");
+ if (!di.sRightSubdir.empty())
+ {
+ sFullDest += di.sRightSubdir.c_str();
+ sFullDest += _T("\\");
+ }
}
- sFullDest += di.sRightFilename;
+ sFullDest += di.sRightFilename.c_str();
act.dest = sFullDest;
act.src = srFile;
@@ -632,7 +638,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_MOVE;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -643,7 +649,7 @@
// We must check that path still exists
CString failpath;
- BOOL succeed = CheckPathsExist(slFile, srFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(slFile.c_str(), srFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -656,10 +662,13 @@
sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- if (!di.sLeftSubdir.IsEmpty())
- sFullDest += di.sLeftSubdir + _T("\\");
+ if (!di.sLeftSubdir.empty())
+ {
+ sFullDest += di.sLeftSubdir.c_str();
+ sFullDest += _T("\\");
+ }
}
- sFullDest += di.sLeftFilename;
+ sFullDest += di.sLeftFilename.c_str();
act.dest = sFullDest;
act.src = slFile;
@@ -696,7 +705,7 @@
const FileAction::ACT_TYPE actType = FileAction::ACT_MOVE;
int selCount = 0;
int sel = -1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -707,7 +716,7 @@
// We must check that path still exists
CString failpath;
- BOOL succeed = CheckPathsExist(srFile, slFile, ALLOW_ALL,
+ BOOL succeed = CheckPathsExist(srFile.c_str(), slFile.c_str(), ALLOW_ALL,
ALLOW_DONT_CARE, failpath);
if (succeed == FALSE)
{
@@ -720,10 +729,13 @@
sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- if (!di.sRightSubdir.IsEmpty())
- sFullDest += di.sRightSubdir + _T("\\");
+ if (!di.sRightSubdir.empty())
+ {
+ sFullDest += di.sRightSubdir.c_str();
+ sFullDest += _T("\\");
+ }
}
- sFullDest += di.sRightFilename;
+ sFullDest += di.sRightFilename.c_str();
act.dest = sFullDest;
act.src = srFile;
@@ -780,7 +792,7 @@
if (actionList.GetActionItemCount() == 1)
{
if (!ConfirmCopy(item.UIOrigin, item.UIDestination,
- actionList.GetActionItemCount(), item.src, item.dest,
+ actionList.GetActionItemCount(), item.src.c_str(), item.dest.c_str(),
bDestIsSide))
{
return FALSE;
@@ -788,8 +800,8 @@
}
else
{
- CString src;
- CString dst;
+ String src;
+ String dst;
if (item.UIOrigin == FileActionItem::UI_LEFT)
src = GetDocument()->GetLeftBasePath();
@@ -813,7 +825,7 @@
}
if (!ConfirmCopy(item.UIOrigin, item.UIDestination,
- actionList.GetActionItemCount(), src, dst, bDestIsSide))
+ actionList.GetActionItemCount(), src.c_str(), dst.c_str(), bDestIsSide))
{
return FALSE;
}
@@ -885,7 +897,7 @@
if (act.UIResult == FileActionItem::UI_SYNC)
{
if (GetMainFrame()->m_bCheckinVCS)
- GetMainFrame()->CheckinToClearCase(act.dest);
+ GetMainFrame()->CheckinToClearCase(act.dest.c_str());
}
// Update doc (difflist)
@@ -955,14 +967,14 @@
}
/// Get directories of first selected item
-BOOL CDirView::GetSelectedDirNames(CString& strLeft, CString& strRight) const
+BOOL CDirView::GetSelectedDirNames(String& strLeft, String& strRight) const
{
BOOL bResult = GetSelectedFileNames(strLeft, strRight);
if (bResult)
{
- strLeft = GetPathOnly(strLeft);
- strRight = GetPathOnly(strRight);
+ strLeft = GetPathOnly(strLeft.c_str());
+ strRight = GetPathOnly(strRight.c_str());
}
return bResult;
}
@@ -1042,22 +1054,22 @@
/// is it possible to compare these two items?
BOOL CDirView::AreItemsOpenable(const DIFFITEM & di1, const DIFFITEM & di2) const
{
- CString sLeftBasePath = GetDocument()->GetLeftBasePath();
- CString sRightBasePath = GetDocument()->GetRightBasePath();
- CString sLeftPath1 = paths_ConcatPath(di1.getLeftFilepath(sLeftBasePath), di1.sLeftFilename);
- CString sLeftPath2 = paths_ConcatPath(di2.getLeftFilepath(sLeftBasePath), di2.sLeftFilename);
- CString sRightPath1 = paths_ConcatPath(di1.getRightFilepath(sRightBasePath), di1.sRightFilename);
- CString sRightPath2 = paths_ConcatPath(di2.getRightFilepath(sRightBasePath), di2.sRightFilename);
+ String sLeftBasePath = GetDocument()->GetLeftBasePath();
+ String sRightBasePath = GetDocument()->GetRightBasePath();
+ String sLeftPath1 = paths_ConcatPath(di1.getLeftFilepath(sLeftBasePath), di1.sLeftFilename);
+ String sLeftPath2 = paths_ConcatPath(di2.getLeftFilepath(sLeftBasePath), di2.sLeftFilename);
+ String sRightPath1 = paths_ConcatPath(di1.getRightFilepath(sRightBasePath), di1.sRightFilename);
+ String sRightPath2 = paths_ConcatPath(di2.getRightFilepath(sRightBasePath), di2.sRightFilename);
// Must not be binary (unless archive)
if
(
(di1.diffcode.isBin() || di2.diffcode.isBin())
&&! (
HasZipSupport()
- && (sLeftPath1.IsEmpty() || ArchiveGuessFormat(sLeftPath1))
- && (sRightPath1.IsEmpty() || ArchiveGuessFormat(sRightPath1))
- && (sLeftPath2.IsEmpty() || ArchiveGuessFormat(sLeftPath2))
- && (sRightPath2.IsEmpty() || ArchiveGuessFormat(sRightPath2))
+ && (sLeftPath1.empty() || ArchiveGuessFormat(sLeftPath1.c_str()))
+ && (sRightPath1.empty() || ArchiveGuessFormat(sRightPath1.c_str()))
+ && (sLeftPath2.empty() || ArchiveGuessFormat(sLeftPath2.c_str()))
+ && (sRightPath2.empty() || ArchiveGuessFormat(sRightPath2.c_str()))
)
)
{
@@ -1081,7 +1093,7 @@
// Allow to compare items if left & right path refer to same directory
// (which means there is effectively two files involved). No need to check
// side flags. If files weren't on both sides, we'd have no DIFFITEMs.
- if (sLeftBasePath.CompareNoCase(sRightBasePath) == 0)
+ if (lstrcmpi(sLeftBasePath.c_str(), sRightBasePath.c_str()) == 0)
return TRUE;
return FALSE;
@@ -1134,7 +1146,7 @@
}
/// get the file names on both sides for first selected item
-BOOL CDirView::GetSelectedFileNames(CString& strLeft, CString& strRight) const
+BOOL CDirView::GetSelectedFileNames(String& strLeft, String& strRight) const
{
int sel = m_pList->GetNextItem(-1, LVNI_SELECTED);
if (sel == -1)
@@ -1143,9 +1155,9 @@
return TRUE;
}
/// get file name on specified side for first selected item
-CString CDirView::GetSelectedFileName(SIDE_TYPE stype) const
+String CDirView::GetSelectedFileName(SIDE_TYPE stype) const
{
- CString left, right;
+ String left, right;
if (!GetSelectedFileNames(left, right)) return _T("");
return stype==SIDE_LEFT ? left : right;
}
@@ -1153,21 +1165,21 @@
* @brief Get the file names on both sides for specified item.
* @note Return empty strings if item is special item.
*/
-void CDirView::GetItemFileNames(int sel, CString& strLeft, CString& strRight) const
+void CDirView::GetItemFileNames(int sel, String& strLeft, String& strRight) const
{
POSITION diffpos = GetItemKey(sel);
if (diffpos == (POSITION)SPECIAL_ITEM_POS)
{
- strLeft.Empty();
- strRight.Empty();
+ strLeft.empty();
+ strRight.empty();
}
else
{
const DIFFITEM & di = GetDocument()->GetDiffByKey(diffpos);
- const CString leftrelpath = paths_ConcatPath(di.sLeftSubdir, di.sLeftFilename);
- const CString rightrelpath = paths_ConcatPath(di.sRightSubdir, di.sRightFilename);
- const CString & leftpath = GetDocument()->GetLeftBasePath();
- const CString & rightpath = GetDocument()->GetRightBasePath();
+ const String leftrelpath = paths_ConcatPath(di.sLeftSubdir, di.sLeftFilename);
+ const String rightrelpath = paths_ConcatPath(di.sRightSubdir, di.sRightFilename);
+ const String & leftpath = GetDocument()->GetLeftBasePath();
+ const String & rightpath = GetDocument()->GetRightBasePath();
strLeft = paths_ConcatPath(leftpath, leftrelpath);
strRight = paths_ConcatPath(rightpath, rightrelpath);
}
@@ -1179,11 +1191,11 @@
*/
void CDirView::GetItemFileNames(int sel, PathContext * paths) const
{
- CString strLeft;
- CString strRight;
+ String strLeft;
+ String strRight;
GetItemFileNames(sel, strLeft, strRight);
- paths->SetLeft(strLeft);
- paths->SetRight(strRight);
+ paths->SetLeft(strLeft.c_str());
+ paths->SetRight(strRight.c_str());
}
/**
@@ -1198,11 +1210,11 @@
{
int sel = GetSingleSelectedItem();
if (sel == -1) return;
- CString file = GetSelectedFileName(stype);
- if (file.IsEmpty()) return;
- int rtn = (int)ShellExecute(::GetDesktopWindow(), _T("edit"), file, 0, 0, SW_SHOWNORMAL);
+ String file = GetSelectedFileName(stype);
+ if (file.empty()) return;
+ int rtn = (int)ShellExecute(::GetDesktopWindow(), _T("edit"), file.c_str(), 0, 0, SW_SHOWNORMAL);
if (rtn==SE_ERR_NOASSOC)
- rtn = (int)ShellExecute(::GetDesktopWindow(), _T("open"), file, 0, 0, SW_SHOWNORMAL);
+ rtn = (int)ShellExecute(::GetDesktopWindow(), _T("open"), file.c_str(), 0, 0, SW_SHOWNORMAL);
if (rtn==SE_ERR_NOASSOC)
DoOpenWith(stype);
}
@@ -1212,12 +1224,12 @@
{
int sel = GetSingleSelectedItem();
if (sel == -1) return;
- CString file = GetSelectedFileName(stype);
- if (file.IsEmpty()) return;
+ String file = GetSelectedFileName(stype);
+ if (file.empty()) return;
CString sysdir;
if (!GetSystemDirectory(sysdir.GetBuffer(MAX_PATH), MAX_PATH)) return;
sysdir.ReleaseBuffer();
- CString arg = (CString)_T("shell32.dll,OpenAs_RunDLL ") + file;
+ CString arg = (CString)_T("shell32.dll,OpenAs_RunDLL ") + file.c_str();
ShellExecute(::GetDesktopWindow(), 0, _T("RUNDLL32.EXE"), arg, sysdir, SW_SHOWNORMAL);
}
@@ -1226,10 +1238,10 @@
{
int sel = GetSingleSelectedItem();
if (sel == -1) return;
- CString file = GetSelectedFileName(stype);
- if (file.IsEmpty()) return;
+ String file = GetSelectedFileName(stype);
+ if (file.empty()) return;
- GetMainFrame()->OpenFileToExternalEditor(file);
+ GetMainFrame()->OpenFileToExternalEditor(file.c_str());
}
/**
@@ -1240,7 +1252,7 @@
// Unlike other group actions, here we don't build an action list
// to execute; we just apply this change directly
int sel=-1;
- CString slFile, srFile;
+ String slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1248,8 +1260,8 @@
!di.diffcode.isSideRightOnly())
{
GetItemFileNames(sel, slFile, srFile);
- CString filteredFilenames = slFile + (CString)_T("|") + srFile;
- GetDocument()->SetPluginPrediffSetting(filteredFilenames, newsetting);
+ String filteredFilenames = slFile + _T("|") + srFile;
+ GetDocument()->SetPluginPrediffSetting(filteredFilenames.c_str(), newsetting);
}
}
}
@@ -1261,7 +1273,6 @@
UINT CDirView::MarkSelectedForRescan()
{
int sel = -1;
- CString slFile, srFile;
int items = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
@@ -1287,9 +1298,9 @@
{
CString fmt;
if (nFilesAffected == nFilesTotal)
- AfxFormatString1(fmt, IDS_FILES_AFFECTED_FMT, NumToStr(nFilesTotal));
+ LangFormatString1(fmt, IDS_FILES_AFFECTED_FMT, NumToStr(nFilesTotal).c_str());
else
- AfxFormatString2(fmt, IDS_FILES_AFFECTED_FMT2, NumToStr(nFilesAffected), NumToStr(nFilesTotal));
+ LangFormatString2(fmt, IDS_FILES_AFFECTED_FMT2, NumToStr(nFilesAffected).c_str(), NumToStr(nFilesTotal).c_str());
return fmt;
}
@@ -1454,7 +1465,7 @@
{
ASSERT(NULL != szNewItemName);
- CString sLeftFile, sRightFile;
+ String sLeftFile, sRightFile;
int nSelItem = m_pList->GetNextItem(-1, LVNI_SELECTED);
ASSERT(-1 != nSelItem);
@@ -1463,7 +1474,7 @@
// We must check that paths still exists
CString failpath;
DIFFITEM &di = GetDiffItemRef(nSelItem);
- BOOL succeed = CheckPathsExist(sLeftFile, sRightFile,
+ BOOL succeed = CheckPathsExist(sLeftFile.c_str(), sRightFile.c_str(),
di.diffcode.isSideLeftOrBoth() ? ALLOW_FILE | ALLOW_FOLDER : ALLOW_DONT_CARE,
di.diffcode.isSideRightOrBoth() ? ALLOW_FILE | ALLOW_FOLDER : ALLOW_DONT_CARE,
failpath);
@@ -1480,9 +1491,9 @@
BOOL bRenameLeft = FALSE;
BOOL bRenameRight = FALSE;
if (di.diffcode.isSideLeftOrBoth())
- bRenameLeft = RenameOnSameDir(sLeftFile, szNewItemName);
+ bRenameLeft = RenameOnSameDir(sLeftFile.c_str(), szNewItemName);
if (di.diffcode.isSideRightOrBoth())
- bRenameRight = RenameOnSameDir(sRightFile, szNewItemName);
+ bRenameRight = RenameOnSameDir(sRightFile.c_str(), szNewItemName);
if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
{
@@ -1492,11 +1503,11 @@
else if (TRUE == bRenameLeft)
{
di.sLeftFilename = szNewItemName;
- di.sRightFilename.Empty();
+ di.sRightFilename.erase();
}
else if (TRUE == bRenameRight)
{
- di.sLeftFilename.Empty();
+ di.sLeftFilename.erase();
di.sRightFilename = szNewItemName;
}
Modified: trunk/Src/DirCmpReport.cpp
===================================================================
--- trunk/Src/DirCmpReport.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DirCmpReport.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -24,12 +24,12 @@
* @brief Return current time as string.
* @return Current time as CString.
*/
-static CString GetCurrentTimeString()
+static String GetCurrentTimeString()
{
time_t nTime = 0;
time(&nTime);
_int64 nTime64 = nTime;
- CString str = TimeString(&nTime64);
+ String str = TimeString(&nTime64);
return str;
}
@@ -82,10 +82,10 @@
*/
void DirCmpReport::SetRootPaths(const PathContext &paths)
{
- m_rootPaths.SetLeft(paths.GetLeft());
- m_rootPaths.SetRight(paths.GetRight());
- AfxFormatString2(m_sTitle, IDS_DIRECTORY_REPORT_TITLE,
- m_rootPaths.GetLeft(), m_rootPaths.GetRight());
+ m_rootPaths.SetLeft(paths.GetLeft().c_str());
+ m_rootPaths.SetRight(paths.GetRight().c_str());
+ LangFormatString2(m_sTitle, IDS_DIRECTORY_REPORT_TITLE,
+ m_rootPaths.GetLeft().c_str(), m_rootPaths.GetRight().c_str());
}
/**
@@ -117,7 +117,7 @@
DirCmpReportDlg dlg;
if (dlg.DoModal() == IDOK) try
{
- WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_CREATEREPORT));
+ WaitStatusCursor waitstatus(IDS_STATUS_CREATEREPORT);
if (dlg.m_bCopyToClipboard)
{
if (!CWnd::GetSafeOwner()->OpenClipboard())
@@ -245,7 +245,7 @@
{
WriteString(m_sTitle);
WriteString(_T("\n"));
- WriteString(GetCurrentTimeString());
+ WriteString(GetCurrentTimeString().c_str());
WriteString(_T("\n"));
for (int currCol = 0; currCol < m_nColumns; currCol++)
{
@@ -327,7 +327,7 @@
WriteString(_T("<h2>"));
WriteString(m_sTitle);
WriteString(_T("</h2>\n<p>"));
- WriteString(GetCurrentTimeString());
+ WriteString(GetCurrentTimeString().c_str());
WriteString(_T("</p>\n"));
WriteString(_T("<table border=\"1\">\n<tr>\n"));
@@ -357,7 +357,7 @@
WriteString(_T("<WinMergeDiffReport version=\"1\">\n"));
WriteString(Fmt(_T("<left>%s</left>\n"), m_rootPaths.GetLeft()));
WriteString(Fmt(_T("<right>%s</right>\n"), m_rootPaths.GetRight()));
- WriteString(Fmt(_T("<time>%s</time>\n"), GetCurrentTimeString()));
+ WriteString(Fmt(_T("<time>%s</time>\n"), GetCurrentTimeString().c_str()));
// Add column headers
const CString rowEl = _T("column_name");
Modified: trunk/Src/DirCmpReportDlg.cpp
===================================================================
--- trunk/Src/DirCmpReportDlg.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DirCmpReportDlg.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -95,7 +95,7 @@
for (int i = 0; i < sizeof(f_types) / sizeof(f_types[0]); ++i)
{
const ReportTypeInfo & info = f_types[i];
- int ind = m_ctlStyle.InsertString(i, LoadResString(info.idDisplay));
+ int ind = m_ctlStyle.InsertString(i, theApp.LoadString(info.idDisplay).c_str());
m_ctlStyle.SetItemData(ind, info.reportType);
}
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2007-10-14 08:45:30 UTC (rev 4618)
+++ trunk/Src/DirDoc.cpp 2007-10-14 08:50:20 UTC (rev 4619)
@@ -178,7 +178,7 @@
if (m_pCompareStats == NULL)
m_pCompareStats = new CompareStats();
- m_pCtxt = new CDiffContext(paths.GetLeft(), paths.GetRight());
+ m_pCtxt = new CDiffContext(paths.GetLeft().c_str(), paths.GetRight().c_str());
if (pTempPathContext)
{
@@ -211,44 +211,44 @@
* - ParentIsTempPath : upward ENABLED
*/
CDirDoc::AllowUpwardDirectory::ReturnCode
-CDirDoc::AllowUpwardDirectory(CString &leftParent, CString &rightParent)
+CDirDoc::AllowUpwardDirectory(String &leftParent, String &rightParent)
{
- const CString & left = GetLeftBasePath();
- const CString & right = GetRightBasePath();
+ const String & left = GetLeftBasePath();
+ const String & right = GetRightBasePath();
// If we have temp context it means we are comparing archives
if (m_pTempPathContext)
{
- LPCTSTR lname = PathFindFileName(left);
- LPCTSTR rname = PathFindFileName(right);
- int cchLeftRoot = m_pTempPathContext->m_strLeftRoot.GetLength();
+ LPCTSTR lname = PathFindFileName(left.c_str());
+ LPCTSTR rname = PathFindFileName(right.c_str());
+ int cchLeftRoot = m_pTempPathContext->m_strLeftRoot.length();
- if (left.GetLength() <= cchLeftRoot)
+ if (left.length() <= cchLeftRoot)
{
if (m_pTempPathContext->m_pParent)
{
leftParent = m_pTempPathContext->m_pParent->m_strLeftRoot;
rightParent = m_pTempPathContext->m_pParent->m_strRightRoot;
- if (GetPairComparability(leftParent, rightParent) != IS_EXISTING_DIR)
+ if (GetPairComparability(leftParent.c_str(), rightParent.c_str()) != IS_EXISTING_DIR)
return AllowUpwardDirectory::Never;
return AllowUpwardDirectory::ParentIsTempPath;
}
leftParent = m_pTempPathContext->m_strLeftDisplayRoot;
rightParent = m_pTempPathContext->m_strRightDisplayRoot;
- if (!m_pCtxt->m_piFilterGlobal->includeFile(leftParent, rightParent))
+ if (!m_pCtxt->m_piFilterGlobal->includeFile(leftParent.c_str(), rightParent.c_str()))
return AllowUpwardDirectory::Never;
if (lstrcmpi(lname, _T("ORIGINAL")) == 0 && lstrcmpi(rname, _T("ALTERED")) == 0)
{
- leftParent = paths_GetParentPath(leftParent);
- rightParent = paths_GetParentPath(rightParent);
+ leftParent = paths_GetParentPath(leftParent.c_str());
+ rightParent = paths_GetParentPath(rightParent.c_str());
}
- lname = PathFindFileName(leftParent);
- rname = PathFindFileName(rightParent);
+ lname = PathFindFileName(leftParent.c_str());
+ rname = PathFindFileName(rightParent.c_str());
if (lstrcmpi(lname, rname) == 0)
{
- leftParent = paths_GetParentPath(leftParent);
- rightParent = paths_GetParentPath(rightParent);
- if (GetPairComparability(leftParent, rightParent) != IS_EXISTING_DIR)
+ leftParent = paths_GetParentPath(leftParent.c_str());
+ rightParent = paths_GetParentPath(rightParent.c_str());
+ if (GetPairComparability(leftParent.c_str(), rightParent.c_str()) != IS_EXISTING_DIR)
return AllowUpwardDirectory::Never;
return AllowUpwardDirectory::ParentIsTempPath;
}
@@ -258,9 +258,9 @@
}
// If regular parent folders exist, allow opening them
- leftParent = paths_GetParentPath(left);
- rightParent = paths_GetParentPath(right);
- if (GetPairComparability(leftParent, rightParent) != IS_EXISTING_DIR)
+ leftParent = paths_GetParentPath(left.c_str());
+ rightParent = paths_GetParentPath(right.c_str());
+ if (GetPairComparability(leftParent.c_str(), rightParent.c_str()) != IS_EXISTING_DIR)
return AllowUpwardDirectory::Never;
return AllowUpwardDirectory::ParentIsRegularPath;
}
@@ -321,7 +321,7 @@
if (threadState == CDiffThread::THREAD_COMPARING)
return;
- m_statusCursor = new CustomStatusCursor(0, IDC_APPSTARTING, LoadResString(IDS_STATUS_RESCANNING));
+ m_statusCursor = new CustomStatusCursor(0, IDC_APPSTARTING, IDS_STATUS_RESCANNING);
GetLog()->Write(CLogFile::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"),
m_pCtxt->GetLeftPath(), m_pCtxt->GetRightPath());
@@ -376,8 +376,8 @@
m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd());
m_diffThread.SetMessageIDs(MSG_UI_UPDATE);
m_diffThread.SetCompareSelected(!!m_bMarkedRescan);
- m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft(),
- m_pCtxt->GetNormalizedRight(), m_bRecursive);
+ m_diffThread.Comp...
[truncated message content] |
|
From: <jt...@us...> - 2007-10-14 12:11:50
|
Revision: 4622
http://winmerge.svn.sourceforge.net/winmerge/?rev=4622&view=rev
Author: jtuc
Date: 2007-10-14 05:11:48 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/DirCmpReport.cpp
trunk/Src/DirViewColItems.cpp
trunk/Src/locality.cpp
trunk/Src/locality.h
Modified: trunk/Src/DirCmpReport.cpp
===================================================================
--- trunk/Src/DirCmpReport.cpp 2007-10-14 08:59:45 UTC (rev 4621)
+++ trunk/Src/DirCmpReport.cpp 2007-10-14 12:11:48 UTC (rev 4622)
@@ -10,7 +10,7 @@
#include "stdafx.h"
#include <time.h>
-#include "UnicodeString.h"
+#include "locality.h"
#include "DirCmpReport.h"
#include "DirCmpReportDlg.h"
#include "coretools.h"
@@ -29,7 +29,7 @@
time_t nTime = 0;
time(&nTime);
_int64 nTime64 = nTime;
- String str = TimeString(&nTime64);
+ String str = locality::TimeString(&nTime64);
return str;
}
Modified: trunk/Src/DirViewColItems.cpp
===================================================================
--- trunk/Src/DirViewColItems.cpp 2007-10-14 08:59:45 UTC (rev 4621)
+++ trunk/Src/DirViewColItems.cpp 2007-10-14 12:11:48 UTC (rev 4622)
@@ -268,7 +268,7 @@
{
const __int64 &r = *static_cast<const __int64*>(p);
if (r)
- return TimeString(&r);
+ return locality::TimeString(&r);
else
return _T("");
}
Modified: trunk/Src/locality.cpp
===================================================================
--- trunk/Src/locality.cpp 2007-10-14 08:59:45 UTC (rev 4621)
+++ trunk/Src/locality.cpp 2007-10-14 12:11:48 UTC (rev 4622)
@@ -8,6 +8,7 @@
#include "StdAfx.h"
#include "locality.h"
+#include "Merge.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -129,5 +130,32 @@
return out;
}
+/**
+ * @brief Return time displayed appropriately, as string
+ */
+String TimeString(const __int64 * tim)
+{
+ USES_CONVERSION;
+ if (!tim) return _T("---");
+ // _tcsftime does not respect user date customizations from
+ // Regional Options/Configuration Regional; COleDateTime::Format does so.
+#if _MSC_VER < 1300
+ // MSVC6
+ COleDateTime odt = (time_t)*tim;
+#else
+ // MSVC7 (VC.NET)
+ COleDateTime odt = *tim;
+#endif
+ // If invalid, return DateTime resource string
+ if (odt.GetStatus() == COleDateTime::null)
+ return String();
+ if (odt.GetStatus() == COleDateTime::invalid)
+ return theApp.LoadString(AFX_IDS_INVALID_DATETIME);
+ COleVariant var;
+ // Don't need to trap error. Should not fail due to type mismatch
+ AfxCheckError(VarBstrFromDate(odt.m_dt, LANG_USER_DEFAULT, 0, &V_BSTR(&var)));
+ var.vt = VT_BSTR;
+ return OLE2CT(V_BSTR(&var));
+}
}; // namespace locality
Modified: trunk/Src/locality.h
===================================================================
--- trunk/Src/locality.h 2007-10-14 08:59:45 UTC (rev 4621)
+++ trunk/Src/locality.h 2007-10-14 12:11:48 UTC (rev 4622)
@@ -14,6 +14,7 @@
String NumToLocaleStr(int n);
String NumToLocaleStr(__int64 n);
String GetLocaleStr(LPCTSTR str, int decimalDigits = 0);
+String TimeString(const __int64 * tim);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-14 18:50:35
|
Revision: 4624
http://winmerge.svn.sourceforge.net/winmerge/?rev=4624&view=rev
Author: kimmov
Date: 2007-10-14 11:50:24 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
PATCH: [ 1804762 ] UI translation without compiled lang files
Fix compile with VS2003
Modified Paths:
--------------
trunk/Src/DiffWrapper.cpp
trunk/Src/DirViewColHandler.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/FolderCmp.cpp
trunk/Src/paths.cpp
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-10-14 12:12:20 UTC (rev 4623)
+++ trunk/Src/DiffWrapper.cpp 2007-10-14 18:50:24 UTC (rev 4624)
@@ -1289,7 +1289,7 @@
FilterList::EncodingType type;
#ifdef UNICODE
- regexp_str = UCS2UTF8_ConvertToUtf8(filterStr.c_str());
+ regexp_str = UCS2UTF8_ConvertToUtf8(filterStr);
type = FilterList::ENC_UTF8;
#else
CString tmp_str(filterStr);
Modified: trunk/Src/DirViewColHandler.cpp
===================================================================
--- trunk/Src/DirViewColHandler.cpp 2007-10-14 12:12:20 UTC (rev 4623)
+++ trunk/Src/DirViewColHandler.cpp 2007-10-14 18:50:24 UTC (rev 4624)
@@ -5,7 +5,7 @@
*
* @date Created: 2003-08-19
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
@@ -31,17 +31,23 @@
/**
- * @brief Get text for specified column (forwards to specific column handler)
+ * @brief Get text for specified column.
+ * This function retrieves the text for the specified colum. Text is
+ * retrieved by using column-specific handler functions.
+ * @param [in] pCtxt Compare context.
+ * @param [in] col Column number.
+ * @param [in] di Difference data.
+ * @return Text for the specified column.
*/
-String
-CDirView::ColGetTextToDisplay(const CDiffContext *pCtxt, int col, const DIFFITEM & di)
+String CDirView::ColGetTextToDisplay(const CDiffContext *pCtxt, int col,
+ const DIFFITEM & di)
{
// Custom properties have custom get functions
const DirColInfo * pColInfo = DirViewColItems_GetDirColInfo(col);
if (!pColInfo)
{
ASSERT(0); // fix caller, should not ask for nonexistent columns
- return "???";
+ return _T("???");
}
ColGetFncPtrType fnc = pColInfo->getfnc;
SIZE_T offset = pColInfo->offset;
@@ -49,10 +55,17 @@
}
/**
- * @brief Sort two items on specified column (forwards to specific column handler)
+ * @brief Sort two items on specified column.
+ * This function determines order of two items in specified column. Order
+ * is determined by column-specific functions.
+ * @param [in] pCtxt Compare context.
+ * @param [in] col Column number to sort.
+ * @param [in] ldi Left difference item data.
+ * @param [in] rdi Right difference item data.
+ * @return Order of items.
*/
-int
-CDirView::ColSort(const CDiffContext *pCtxt, int col, const DIFFITEM & ldi, const DIFFITEM &rdi) const
+int CDirView::ColSort(const CDiffContext *pCtxt, int col, const DIFFITEM & ldi,
+ const DIFFITEM & rdi) const
{
// Custom properties have custom sort functions
const DirColInfo * pColInfo = DirViewColItems_GetDirColInfo(col);
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2007-10-14 12:12:20 UTC (rev 4623)
+++ trunk/Src/FileFiltersDlg.cpp 2007-10-14 18:50:24 UTC (rev 4624)
@@ -393,7 +393,7 @@
// Format path to template file
String templatePath(globalPath);
if (templatePath[templatePath.length() - 1] != '\\')
- templatePath += "\\";
+ templatePath += '\\';
templatePath += FILE_FILTER_TEMPLATE;
if (paths_DoesPathExist(templatePath.c_str()) != IS_EXISTING_FILE)
Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp 2007-10-14 12:12:20 UTC (rev 4623)
+++ trunk/Src/FolderCmp.cpp 2007-10-14 18:50:24 UTC (rev 4624)
@@ -49,7 +49,9 @@
// Transformation happens here
// text used for automatic mode : plugin filter must match it
- String filteredFilenames = plugCtxt->origFileName1 + "|" + plugCtxt->origFileName2;
+ String filteredFilenames(plugCtxt->origFileName1);
+ filteredFilenames += '|';
+ filteredFilenames += plugCtxt->origFileName2;
// Get existing or new plugin infos
pCtxt->FetchPluginInfos(filteredFilenames.c_str(), &plugCtxt->infoUnpacker,
Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp 2007-10-14 12:12:20 UTC (rev 4623)
+++ trunk/Src/paths.cpp 2007-10-14 18:50:24 UTC (rev 4624)
@@ -3,7 +3,7 @@
*
* @brief Path handling routines
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -219,7 +219,6 @@
*end = 0;
sLong += ptr;
ptr = &end[1];
- String sTemp; // used at each step to hold fully qualified short name
// now walk down each directory and do short to long name conversion
while (ptr)
@@ -230,7 +229,9 @@
if (end)
*end = 0;
- sTemp = sLong + '\\' + ptr;
+ String sTemp(sLong);
+ sTemp += '\\';
+ sTemp += ptr;
// advance to next component (or set ptr==0 to flag end)
ptr = (end ? end+1 : 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-15 20:59:46
|
Revision: 4627
http://winmerge.svn.sourceforge.net/winmerge/?rev=4627&view=rev
Author: kimmov
Date: 2007-10-15 13:59:45 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Fix string conversion compile warning by converting encoding string to String.
Modified Paths:
--------------
trunk/Src/FileTextEncoding.cpp
trunk/Src/FileTextEncoding.h
trunk/Src/MainFrm.cpp
Modified: trunk/Src/FileTextEncoding.cpp
===================================================================
--- trunk/Src/FileTextEncoding.cpp 2007-10-15 20:43:26 UTC (rev 4626)
+++ trunk/Src/FileTextEncoding.cpp 2007-10-15 20:59:45 UTC (rev 4627)
@@ -3,7 +3,7 @@
*
* @brief Implementation of FileTextEncoding structure
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -55,7 +55,7 @@
/**
* @brief Return string representation of encoding, eg "UCS-2LE", or "1252"
*/
-CString FileTextEncoding::GetName() const
+String FileTextEncoding::GetName() const
{
if (m_unicoding == ucr::UCS2LE)
return _T("UCS-2LE");
@@ -64,12 +64,13 @@
if (m_unicoding == ucr::UTF8)
return _T("UTF-8");
- CString str;
+ String str;
if (m_codepage > -1)
{
- LPTSTR s = str.GetBuffer(32);
- _sntprintf(s, 32, _T("%d"), m_codepage);
- str.ReleaseBuffer();
+ str.resize(32);
+ LPTSTR s = &*str.begin(); //GetBuffer(32);
+ int len = _sntprintf(s, 32, _T("%d"), m_codepage);
+ str.resize(len);
}
return str;
}
Modified: trunk/Src/FileTextEncoding.h
===================================================================
--- trunk/Src/FileTextEncoding.h 2007-10-15 20:43:26 UTC (rev 4626)
+++ trunk/Src/FileTextEncoding.h 2007-10-15 20:59:45 UTC (rev 4627)
@@ -3,7 +3,7 @@
*
* @brief Declaration of FileTextEncoding structure
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef FileTextEncoding_h_included
@@ -23,7 +23,7 @@
void Clear();
void SetCodepage(int codepage);
void SetUnicoding(int unicoding);
- CString GetName() const;
+ String GetName() const;
static int Collate(const FileTextEncoding & fte1, const FileTextEncoding & fte2);
};
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-10-15 20:43:26 UTC (rev 4626)
+++ trunk/Src/MainFrm.cpp 2007-10-15 20:59:45 UTC (rev 4627)
@@ -695,10 +695,10 @@
}
else if (filelocLeft.encoding.m_unicoding != filelocRight.encoding.m_unicoding)
{
- CString leftEncoding = filelocLeft.encoding.GetName();
- CString rightEnicoding = filelocRight.encoding.GetName();
+ String leftEncoding = filelocLeft.encoding.GetName();
+ String rightEncoding = filelocRight.encoding.GetName();
CString msg;
- msg.Format(IDS_DIFFERENT_UNICODINGS, leftEncoding, rightEnicoding);
+ msg.Format(IDS_DIFFERENT_UNICODINGS, leftEncoding.c_str(), rightEncoding.c_str());
int msgflags = MB_OK | MB_ICONWARNING | MB_DONT_ASK_AGAIN;
// Two files with different codepages
// Warn and propose to use the default codepage for both
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-16 09:29:44
|
Revision: 4629
http://winmerge.svn.sourceforge.net/winmerge/?rev=4629&view=rev
Author: kimmov
Date: 2007-10-16 02:29:43 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Add SVN keywords for ConfirmFolderCopyDlg.
Modified Paths:
--------------
trunk/Src/ConfirmFolderCopyDlg.cpp
trunk/Src/ConfirmFolderCopyDlg.h
Property Changed:
----------------
trunk/Src/ConfirmFolderCopyDlg.cpp
trunk/Src/ConfirmFolderCopyDlg.h
Modified: trunk/Src/ConfirmFolderCopyDlg.cpp
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.cpp 2007-10-16 05:59:24 UTC (rev 4628)
+++ trunk/Src/ConfirmFolderCopyDlg.cpp 2007-10-16 09:29:43 UTC (rev 4629)
@@ -1,118 +1,118 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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()
-{
- theApp.TranslateDialog(m_hWnd);
- CDialog::OnInitDialog();
-
- GetDlgItem(IDNO)->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);
-
- // 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
-}
-
-/**
- * @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);
-}
+/////////////////////////////////////////////////////////////////////////////
+// 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()
+{
+ theApp.TranslateDialog(m_hWnd);
+ CDialog::OnInitDialog();
+
+ GetDlgItem(IDNO)->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);
+
+ // 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
+}
+
+/**
+ * @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);
+}
Property changes on: trunk/Src/ConfirmFolderCopyDlg.cpp
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Src/ConfirmFolderCopyDlg.h
===================================================================
--- trunk/Src/ConfirmFolderCopyDlg.h 2007-10-16 05:59:24 UTC (rev 4628)
+++ trunk/Src/ConfirmFolderCopyDlg.h 2007-10-16 09:29:43 UTC (rev 4629)
@@ -1,61 +1,61 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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: $
-
-#ifndef CMoveConstraint_h
-#include "CMoveConstraint.h"
-#endif
-
-
-/**
- * @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();
-
-private:
- prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */
-};
+/////////////////////////////////////////////////////////////////////////////
+// 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$
+
+#ifndef CMoveConstraint_h
+#include "CMoveConstraint.h"
+#endif
+
+
+/**
+ * @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();
+
+private:
+ prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */
+};
Property changes on: trunk/Src/ConfirmFolderCopyDlg.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-16 09:57:36
|
Revision: 4632
http://winmerge.svn.sourceforge.net/winmerge/?rev=4632&view=rev
Author: kimmov
Date: 2007-10-16 02:57:35 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Add SVN id keyword lines.
Modified Paths:
--------------
trunk/Src/FileOrFolderSelect.cpp
trunk/Src/FileOrFolderSelect.h
Modified: trunk/Src/FileOrFolderSelect.cpp
===================================================================
--- trunk/Src/FileOrFolderSelect.cpp 2007-10-16 09:50:16 UTC (rev 4631)
+++ trunk/Src/FileOrFolderSelect.cpp 2007-10-16 09:57:35 UTC (rev 4632)
@@ -23,6 +23,8 @@
*
* @brief Implementation of the file and folder selection routines.
*/
+// ID line follows -- this is updated by SVN
+// $Id$
#include "stdafx.h"
#include <sys/stat.h>
@@ -282,7 +284,7 @@
* - in Mask string to convert
* - out Converted string
*/
-void ConvertFilter(LPTSTR filterStr)
+static void ConvertFilter(LPTSTR filterStr)
{
while (TCHAR *ch = _tcschr(filterStr, '|'))
{
Modified: trunk/Src/FileOrFolderSelect.h
===================================================================
--- trunk/Src/FileOrFolderSelect.h 2007-10-16 09:50:16 UTC (rev 4631)
+++ trunk/Src/FileOrFolderSelect.h 2007-10-16 09:57:35 UTC (rev 4632)
@@ -23,6 +23,8 @@
*
* @brief Declaration of the file and folder selection routines.
*/
+// ID line follows -- this is updated by SVN
+// $Id$
#ifndef _FILE_OR_FOLDER_SELECTION_H_
#define _FILE_OR_FOLDER_SELECTION_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-16 10:07:57
|
Revision: 4633
http://winmerge.svn.sourceforge.net/winmerge/?rev=4633&view=rev
Author: kimmov
Date: 2007-10-16 03:07:56 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Comment additions and fixes.
Modified Paths:
--------------
trunk/Src/files.cpp
trunk/Src/files.h
Modified: trunk/Src/files.cpp
===================================================================
--- trunk/Src/files.cpp 2007-10-16 09:57:35 UTC (rev 4632)
+++ trunk/Src/files.cpp 2007-10-16 10:07:56 UTC (rev 4633)
@@ -19,7 +19,7 @@
*
* @brief Code file routines
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -28,7 +28,9 @@
#include "unicoder.h"
/**
- * @brief Open file as memory-mapped file
+ * @brief Open file as memory-mapped file.
+ * @param [in,out] fileData Memory-mapped file's info.
+ * @return TRUE if opening succeeded, FALSE otherwise.
*/
BOOL files_openFileMapped(MAPPEDFILEDATA *fileData)
{
@@ -117,7 +119,11 @@
}
/**
- * @brief Close memory-mapped file
+ * @brief Close memory-mapped file.
+ * @param [in, out] fileData Memory-mapped file's info.
+ * @param [in] newSize New size for the file.
+ * @param [in] flush Flush buffers before closing the file.
+ * @return TRUE if closing succeeded without errors, FALSE otherwise.
*/
BOOL files_closeFileMapped(MAPPEDFILEDATA *fileData, DWORD newSize, BOOL flush)
{
Modified: trunk/Src/files.h
===================================================================
--- trunk/Src/files.h 2007-10-16 09:57:35 UTC (rev 4632)
+++ trunk/Src/files.h 2007-10-16 10:07:56 UTC (rev 4633)
@@ -19,7 +19,7 @@
*
* @brief Declaration file for file routines
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#ifndef _FILES_H_INCLUDED
@@ -55,6 +55,7 @@
static DWORD Main(DWORD flr) { return flr & FRESULT_MAIN_MASK; }
static bool IsModifier(DWORD flr, DWORD modifier) { return !!(flr & modifier); }
+ /** @brief Return values for functions. */
enum
{
FRESULT_MAIN_MASK = 0xF,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-16 10:56:20
|
Revision: 4634
http://winmerge.svn.sourceforge.net/winmerge/?rev=4634&view=rev
Author: kimmov
Date: 2007-10-16 03:56:17 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Comment additions and fixes.
Modified Paths:
--------------
trunk/Src/TestFilterDlg.cpp
trunk/Src/TestFilterDlg.h
Modified: trunk/Src/TestFilterDlg.cpp
===================================================================
--- trunk/Src/TestFilterDlg.cpp 2007-10-16 10:07:56 UTC (rev 4633)
+++ trunk/Src/TestFilterDlg.cpp 2007-10-16 10:56:17 UTC (rev 4634)
@@ -3,7 +3,7 @@
*
* @brief Dialog for testing file filters
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -17,21 +17,19 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CTestFilterDlg dialog
-
-
+/**
+ * @brief Constructor.
+ * @param [in] pParent Parent window.
+ * @param [in] pFileFilter File filter to test.
+ * @param [in] pFilterMgr File filter manager.
+ */
CTestFilterDlg::CTestFilterDlg(CWnd* pParent, FileFilter * pFileFilter, FileFilterMgr *pFilterMgr)
: CDialog(CTestFilterDlg::IDD, pParent)
, m_pFileFilter(pFileFilter)
, m_pFileFilterMgr(pFilterMgr)
{
- //{{AFX_DATA_INIT(CTestFilterDlg)
- // NOTE: the ClassWizard will add member initialization here
- //}}AFX_DATA_INIT
}
-
void CTestFilterDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -50,7 +48,11 @@
/////////////////////////////////////////////////////////////////////////////
// CTestFilterDlg message handlers
-BOOL CTestFilterDlg::OnInitDialog()
+/**
+ * @brief Initialize the dialog.
+ * @return FALSE always.
+ */
+BOOL CTestFilterDlg::OnInitDialog()
{
CDialog::OnInitDialog();
@@ -63,7 +65,7 @@
// EXCEPTION: OCX Property Pages should return FALSE
}
-/** @brief User pressed Text button */
+/** @brief User pressed Text button. */
void CTestFilterDlg::OnTestBtn()
{
CString text;
@@ -77,7 +79,7 @@
AppendResult(text);
}
-/** @brief user pressed <enter> key */
+/** @brief user pressed <enter> key. */
void CTestFilterDlg::OnOK()
{
CWnd *pWnd = GetFocus();
@@ -92,7 +94,11 @@
}
}
-/** @brief Return true if specified text passes our filter */
+/**
+ * @brief Test text against filter.
+ * @param [in] text Text to test.
+ * @return TRUE if text passes the filter, FALSE otherwise.
+ */
BOOL CTestFilterDlg::CheckText(CString text) const
{
CButton * IsDirButton = (CButton *)GetDlgItem(IDC_IS_DIRECTORY);
@@ -107,10 +113,13 @@
{
return m_pFileFilterMgr->TestFileNameAgainstFilter(m_pFileFilter, text);
}
-
}
-/** @brief Add text to end of edit control */
+/**
+ * @brief Add text to end of edit control.
+ * @param [in] edit Edit contror into which the text is added.
+ * @param [in] text Text to add to edit control.
+ */
void AppendToEditBox(CEdit & edit, LPCTSTR text)
{
int len = edit.GetWindowTextLength();
@@ -118,7 +127,10 @@
edit.ReplaceSel(text);
}
-/** @brief Add new result to end of result edit box */
+/**
+ * @brief Add new result to end of result edit box.
+ * @param [in] result Result text to add.
+ */
void CTestFilterDlg::AppendResult(CString result)
{
CEdit * edit = (CEdit *)GetDlgItem(IDC_RESULTS);
Modified: trunk/Src/TestFilterDlg.h
===================================================================
--- trunk/Src/TestFilterDlg.h 2007-10-16 10:07:56 UTC (rev 4633)
+++ trunk/Src/TestFilterDlg.h 2007-10-16 10:56:17 UTC (rev 4634)
@@ -4,20 +4,20 @@
* @brief Declaration file for CTestFilterDlg class
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_TESTFILTERDLG_H__1261AD7A_512F_47BC_882F_2E2D41C5072F__INCLUDED_)
#define AFX_TESTFILTERDLG_H__1261AD7A_512F_47BC_882F_2E2D41C5072F__INCLUDED_
#pragma once
-/////////////////////////////////////////////////////////////////////////////
-// CTestFilterDlg dialog
-
struct FileFilter;
class FileFilterMgr;
-/** @brief Dialog allowing user to test out file filter strings */
+/**
+ * @brief Dialog allowing user to test out file filter strings.
+ * The user can type a text and test if selected file filter matches to it.
+ */
class CTestFilterDlg : public CDialog
{
// Construction
@@ -26,8 +26,8 @@
// Implementation data
private:
- FileFilter * m_pFileFilter;
- FileFilterMgr * m_pFileFilterMgr;
+ FileFilter * m_pFileFilter; /**< Selected file filter. */
+ FileFilterMgr * m_pFileFilterMgr; /**< File filter manager. */
// Implementation methods
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-10-16 16:48:19
|
Revision: 4635
http://winmerge.svn.sourceforge.net/winmerge/?rev=4635&view=rev
Author: jtuc
Date: 2007-10-16 09:48:12 -0700 (Tue, 16 Oct 2007)
Log Message:
-----------
Patch #1804762 continued
Modified Paths:
--------------
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2007-10-16 10:56:17 UTC (rev 4634)
+++ trunk/Src/StdAfx.cpp 2007-10-16 16:48:12 UTC (rev 4635)
@@ -114,6 +114,17 @@
}
/**
+ * @brief Lang aware version of AfxMessageBox()
+ */
+int NTAPI LangMessageBox(UINT nIDPrompt, UINT nType, UINT nIDHelp)
+{
+ String string = theApp.LoadString(nIDPrompt);
+ if (nIDHelp == (UINT)-1)
+ nIDHelp = nIDPrompt;
+ return AfxMessageBox(string.c_str(), nType, nIDHelp);
+}
+
+/**
* @brief Show messagebox with resource string having parameter.
* @param [in] msgid Resource string ID.
* @param [in] arg Argument string.
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2007-10-16 10:56:17 UTC (rev 4634)
+++ trunk/Src/StdAfx.h 2007-10-16 16:48:12 UTC (rev 4635)
@@ -104,6 +104,9 @@
/** @brief Lang aware version of AfxFormatString2() */
void NTAPI LangFormatString2(CString &, UINT, LPCTSTR, LPCTSTR);
+ /** @brief Lang aware version of AfxMessageBox() */
+int NTAPI LangMessageBox(UINT, UINT nType = MB_OK, UINT nIDHelp = (UINT)-1);
+
/** @brief Format single-argument resource string and display via AfxMessageBox */
int ResMsgBox1(UINT msgid, LPCTSTR arg, UINT nType = MB_OK, UINT nIDHelp = 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
