+2005-11-17 Kimmo
+ PATCH: [ 1349645 ] Folder Compare Statistics dialog
+ PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
+ Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
+ Merge.rc resource.h
+ Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
+ DirCompProgressDlg.h
+ Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
+ Src/res new file: sigma.bmp
+ Src/Languages: *.rc resource.h
+
+
2005-11-16
PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// 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 CompareStatisticsDlg.cpp
+ *
+ * @brief Implementation file for CompareStatisticsDlg dialog
+ */
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#include "stdafx.h"
+#include "CompareStatisticsDlg.h"
+#include "CompareStats.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// SaveClosingDlg dialog
+
+IMPLEMENT_DYNAMIC(CompareStatisticsDlg, CDialog)
+
+CompareStatisticsDlg::CompareStatisticsDlg(CWnd* pParent /*=NULL*/)
+ : CDialog(CompareStatisticsDlg::IDD, pParent)
+, m_pCompareStats(NULL)
+{
+ //{{AFX_DATA_INIT(CompareStatisticsDlg)
+ //}}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
+END_MESSAGE_MAP()
+
+
+/////////////////////////////////////////////////////////////////////////////
+// SaveClosingDlg message handlers
+
+BOOL CompareStatisticsDlg::OnInitDialog()
+{
+ CDialog::OnInitDialog();
+ int totalFiles = 0;
+ int totalFolders = 0;
+
+ // Identicals
+ int count = m_pCompareStats->GetCount(CompareStats::RESULT_DIR);
+ totalFolders += count;
+ m_sIdenticalFolders.Format(_T("%d"), count);
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_SAME);
+ totalFiles += count;
+ m_sIdenticalFiles.Format(_T("%d"), count);
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_BINSAME);
+ totalFiles += count;
+ m_sIdenticalBinaries.Format(_T("%d"), count);
+
+ // Different
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_DIFF);
+ totalFiles += count;
+ m_sDifferentFiles.Format(_T("%d"), count);
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_BINDIFF);
+ totalFiles += count;
+ m_sDifferentBinaries.Format(_T("%d"), count);
+
+ // Unique
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_LDIRUNIQUE);
+ totalFolders += count;
+ m_sLUniqueFolders.Format(_T("%d"), count);
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_LUNIQUE);
+ totalFiles += count;
+ m_sLUniqueFiles.Format(_T("%d"), count);
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_RDIRUNIQUE);
+ totalFolders += count;
+ m_sRUniqueFolders.Format(_T("%d"), count);
+ count = m_pCompareStats->GetCount(CompareStats::RESULT_RUNIQUE);
+ totalFiles += count;
+ m_sRUniqueFiles.Format(_T("%d"), count);
+
+ // Total
+ m_sTotalFolders.Format(_T("%d"), totalFolders);
+ m_sTotalFiles.Format(_T("%d"), totalFiles);
+
+ 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);
+}
\ No newline at end of file
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// 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 CompareStatisticsDlg.h
+ *
+ * @brief Declaration file for CompareStatisticsDlg dialog
+ */
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#ifndef _COMPARESTATISTICSDLG_H_
+#define _COMPARESTATISTICSDLG_H_
+
+class CompareStats;
+
+class CompareStatisticsDlg : public CDialog
+{
+ DECLARE_DYNAMIC(CompareStatisticsDlg)
+
+public:
+ CompareStatisticsDlg(CWnd* pParent = NULL); // standard constructor
+ void SetCompareStats(const CompareStats * pStats);
+
+// 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();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+// Implementation data
+private:
+ CompareStats * m_pCompareStats;
+};
+
+#endif // _COMPARESTATISTICSDLG_H_
--- /dev/null
+/**
+ * @file DirCompProgressDlg.cpp
+ *
+ * @brief Implementation file for Directory compare state dialog
+ */
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#include "stdafx.h"
+#include "merge.h"
+#include "DirCompProgressDlg.h"
+#include "DiffContext.h"
+#include "DirDoc.h"
+#include "DirFrame.h"
+#include "CompareStats.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/**
+ * @brief ID for timer updating UI.
+ */
+static const UINT IDT_UPDATE = 1;
+
+/**
+ * @brief Interval (in milliseconds) for UI updates.
+ */
+static const UINT UPDATE_INTERVAL = 400;
+
+/**
+ * @brief Reset all UI fields to zero.
+ */
+void DirCompProgressDlg::ClearStat()
+{
+ CProgressCtrl *pProg = (CProgressCtrl*) GetDlgItem(IDC_PROGRESSCOMPARE);
+ pProg->SetPos(0);
+
+ CStatic *pCompared = (CStatic *) GetDlgItem(IDC_ITEMSCOMPARED);
+ CStatic *pTotal = (CStatic *) GetDlgItem(IDC_ITEMSTOTAL);
+ pCompared->SetWindowText(_T("0"));
+ pTotal->SetWindowText(_T("0"));
+
+ m_prevState = CompareStats::STATE_IDLE;
+}
+
+IMPLEMENT_DYNAMIC(DirCompProgressDlg, CDialog)
+
+/**
+ * @brief Constructor.
+ */
+DirCompProgressDlg::DirCompProgressDlg(CWnd* pParent /*=NULL*/)
+: m_bCompareReady(FALSE)
+, m_prevState(CompareStats::STATE_IDLE)
+, m_pDirDoc(NULL)
+{
+}
+
+/**
+ * @brief Loads strings from resource.
+ */
+BOOL DirCompProgressDlg::Create(UINT nIDTemplate, CWnd* pParentWnd)
+{
+ return CDialog::Create(nIDTemplate, pParentWnd);
+};
+
+void DirCompProgressDlg::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(DirCompProgressDlg)
+ //}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(DirCompProgressDlg, CDialog)
+ //{{AFX_MSG_MAP(DirCompProgressDlg)
+ ON_WM_WINDOWPOSCHANGING()
+ ON_WM_TIMER()
+ ON_BN_CLICKED(IDC_COMPARISON_STOP, OnBnClickedComparisonStop)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+
+BOOL DirCompProgressDlg::OnInitDialog()
+{
+ CDialog::OnInitDialog();
+ CenterToParent();
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
+/**
+ * @brief Update button text (Stop/Close).
+ *
+ * Changes button text after compare is ready.
+ */
+void DirCompProgressDlg::OnUpdateStop(CCmdUI* pCmdUI)
+{
+ // Change button text if scan is finished and it hasn't been yet changed.
+// m_lElapsed += ::GetTickCount();
+// CString text;
+// text.Format(IDS_ELAPSED_TIME, m_lElapsed);
+// pFrameWnd->SetMessageText(text);
+// }
+// pCmdUI->Enable(TRUE);
+}
+
+/**
+ * @brief Handle WM_KEYDOWN messages before normal processing
+ * to allow any key close stateDlg.
+ */
+BOOL DirCompProgressDlg::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->message == WM_KEYDOWN)
+ {
+ // Allow ESC to stop compare
+ if (pMsg->wParam == VK_ESCAPE)
+ {
+ OnBnClickedComparisonStop();
+ return TRUE;
+ }
+ }
+
+ return CDialog::PreTranslateMessage(pMsg);
+}
+
+/**
+ * @brief Set pointer to compare stats.
+ */
+void DirCompProgressDlg::SetCompareStat(CompareStats * pCompareStats)
+{
+ m_pCompareStats = pCompareStats;
+}
+
+/**
+ * @brief Timer message received.
+ */
+void DirCompProgressDlg::OnTimer(UINT nIDEvent)
+{
+ if (nIDEvent == IDT_UPDATE)
+ {
+ CProgressCtrl *pProg = (CProgressCtrl*) GetDlgItem(IDC_PROGRESSCOMPARE);
+ CStatic *pCompared = (CStatic *) GetDlgItem(IDC_ITEMSCOMPARED);
+ CStatic *pTotal = (CStatic *) GetDlgItem(IDC_ITEMSTOTAL);
+ const CompareStats::CMP_STATE state = m_pCompareStats->GetCompareState();
+
+ // New compare started
+ if (m_prevState == CompareStats::STATE_IDLE &&
+ state == CompareStats::STATE_COLLECT)
+ {
+ m_prevState = CompareStats::STATE_COLLECT;
+ }
+ // Collecting items to compare
+ else if (m_prevState == CompareStats::STATE_COLLECT &&
+ state == CompareStats::STATE_COLLECT)
+ {
+ TCHAR num[15] = {0};
+ _itot(m_pCompareStats->GetTotalItems(), num, 10);
+ pTotal->SetWindowText(num);
+ }
+ // Started comparing items
+ else if ((m_prevState == CompareStats::STATE_COLLECT ||
+ m_prevState == CompareStats::STATE_IDLE) &&
+ state == CompareStats::STATE_COMPARE)
+ {
+ TCHAR num[15] = {0};
+
+ // Start comparing, init progressDlg
+ int totalItems = m_pCompareStats->GetTotalItems();
+ _itot(totalItems, num, 10);
+ pTotal->SetWindowText(num);
+
+ pProg->SetRange32(0, totalItems);
+ int comparedItems = m_pCompareStats->GetComparedItems();
+ _itot(comparedItems, num, 10);
+ pCompared->SetWindowText(num);
+ pProg->SetPos(comparedItems);
+ m_prevState = CompareStats::STATE_COMPARE;
+ }
+ // Comparing items
+ else if (m_prevState == CompareStats::STATE_COMPARE &&
+ state == CompareStats::STATE_COMPARE)
+ {
+ TCHAR num[15] = {0};
+ int comparedItems = m_pCompareStats->GetComparedItems();
+ _itot(comparedItems, num, 10);
+ pCompared->SetWindowText(num);
+ pProg->SetPos(comparedItems);
+ }
+ // Compare is ready
+ // Update total items too since we might get only this one state
+ // when compare is fast.
+ else if (state == CompareStats::STATE_IDLE &&
+ m_bCompareReady == FALSE && m_pCompareStats->IsCompareDone() )
+ {
+ TCHAR num[15] = {0};
+ const int totalItems = m_pCompareStats->GetTotalItems();
+ const int comparedItems = m_pCompareStats->GetComparedItems();
+ _itot(comparedItems, num, 10);
+ pCompared->SetWindowText(num);
+ _itot(totalItems, num, 10);
+ pTotal->SetWindowText(num);
+ pProg->SetRange32(0, totalItems);
+ pProg->SetPos(comparedItems);
+ EndUpdating();
+ m_prevState = CompareStats::STATE_COMPARE;
+ m_bCompareReady = TRUE;
+ }
+ }
+ else
+ CDialog::OnTimer(nIDEvent);
+
+}
+
+/**
+ * @brief Start timer for UI updating.
+ */
+void DirCompProgressDlg::StartUpdating()
+{
+ ClearStat();
+ CenterToParent();
+ SetTimer(IDT_UPDATE, UPDATE_INTERVAL, NULL);
+}
+
+/**
+ * @brief Stop timer updating UI.
+ */
+void DirCompProgressDlg::EndUpdating()
+{
+ KillTimer(IDT_UPDATE);
+}
+
+/**
+ * @brief User selects to stop compare.
+ *
+ * Aborts compare and hides status panel.
+ * @note We don't call EndDialog() or similar to close this dialog.
+ * When compare is aborted thread sends UI (DirView) message to update
+ * itself. Messagehandler code (in DirView) closes this dialog.
+ */
+void DirCompProgressDlg::OnBnClickedComparisonStop()
+{
+ ASSERT(m_pDirDoc); // Must be set using SetDirDoc()
+ EndUpdating();
+ m_pDirDoc->AbortCurrentScan();
+}
+
+/**
+ * @brief Move dialog to center of dirview
+ */
+void DirCompProgressDlg::CenterToParent()
+{
+ CRect rectFrame;
+ CRect rectBar;
+ CWnd * pWnd = GetParent();
+ pWnd->GetWindowRect(&rectFrame);
+ GetClientRect(&rectBar);
+ // Middlepoint of dirview
+ int x = rectFrame.left + (rectFrame.right - rectFrame.left) / 2;
+ int y = rectFrame.top + (rectFrame.bottom - rectFrame.top) / 2;
+ // Reduce by half of dialog's size
+ x -= rectBar.right / 2;
+ y -= rectBar.bottom / 2;
+
+ SetWindowPos(&CWnd::wndTop, x, y, rectBar.right,
+ rectBar.bottom, SWP_NOOWNERZORDER | SWP_NOSIZE );
+}
+
+/**
+ * @brief Closes the dialog.
+ */
+void DirCompProgressDlg::CloseDialog()
+{
+ EndUpdating();
+ EndDialog(IDOK);
+}
+
+/**
+ * @brief Set pointer to DirDoc.
+ *
+ * We need pointer to DirDoc for aborting the scan when Stop
+ * button is clicked.
+ */
+void DirCompProgressDlg::SetDirDoc(CDirDoc *pDirDoc)
+{
+ m_pDirDoc = pDirDoc;
+}
--- /dev/null
+/**
+ * @file DirCompProgressDlg.h
+ *
+ * @brief Declaration file for Directory compare statusdialog class
+ */
+// RCS ID line follows -- this is updated by CVS
+// $Id$
+
+#if !defined(AFX_DIRCOMPPROGRESSDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
+#define AFX_DIRCOMPPROGRESSDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_
+
+#ifndef _COMPARESTATS_H_
+#include "CompareStats.h"
+#endif
+
+class CDirFrame;
+class CDirDoc;
+
+/////////////////////////////////////////////////////////////////////////////
+// DirCompProgressDlg dialog
+
+/**
+ * @brief Class for directory compare statusdialog
+ *
+ * Implements non-modal dialog directory compares.
+ * Shows compare progress and allows stopping compare.
+ */
+class DirCompProgressDlg : public CDialog
+{
+ DECLARE_DYNAMIC(DirCompProgressDlg)
+
+// Construction
+public:
+ DirCompProgressDlg(CWnd* pParent = NULL); // standard constructor
+ BOOL Create(UINT nIDTemplate, CWnd* pParentWnd);
+ void SetCompareStat(CompareStats * pCompareStats);
+ void StartUpdating();
+ void EndUpdating();
+ void CenterToParent();
+ void CloseDialog();
+ void SetDirDoc(CDirDoc *pDirDoc);
+
+// Dialog Data
+ //{{AFX_DATA(DirCompProgressDlg)
+ enum { IDD = IDD_DIRCOMP_PROGRESS };
+ //}}AFX_DATA
+
+// Overrides
+ // ClassWizard generated virtual function overrides
+ //{{AFX_VIRTUAL(DirCompProgressDlg)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+ virtual BOOL PreTranslateMessage(MSG* pMsg);
+ void ClearStat();
+
+ // Generated message map functions
+ //{{AFX_MSG(DirCompProgressDlg)
+ afx_msg BOOL OnInitDialog();
+ afx_msg void OnUpdateStop(CCmdUI* pCmdUI);
+ afx_msg void OnTimer(UINT nIDEvent);
+ afx_msg void OnBnClickedComparisonStop();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+
+private:
+ long m_lElapsed; /**< Elapsed time for compare */
+ CompareStats *m_pCompareStats; /**< Pointer to comparestats */
+ CompareStats::CMP_STATE m_prevState; /**< Previous state for compare (to track changes) */
+ BOOL m_bCompareReady; /**< Compare ready, waiting for closing? */
+ CDirDoc * m_pDirDoc;
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_DIRCOMPPROGRESSDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
+
+++ /dev/null
-/**
- * @file DirCompStateBar.cpp
- *
- * @brief Implementation file for Directory compare statuspanel class
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "merge.h"
-#include "DirCompStateBar.h"
-#include "DiffContext.h"
-#include "DirDoc.h"
-#include "DirFrame.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/**
- * @brief ID for timer updating UI.
- */
-static const UINT IDT_UPDATE = 1;
-
-/**
- * @brief Interval (in milliseconds) for UI updates.
- */
-static const UINT UPDATE_INTERVAL = 500;
-
-/**
- * @brief Reset all UI fields to zero.
- */
-void CDirCompStateBar::ClearStat()
-{
- SetDlgItemInt(IDC_COUNT_LFILE, 0);
- SetDlgItemInt(IDC_COUNT_RFILE, 0);
- SetDlgItemInt(IDC_COUNT_NOTEQUAL, 0);
- SetDlgItemInt(IDC_COUNT_EQUAL, 0);
- SetDlgItemInt(IDC_COUNT_BINARYSAME, 0);
- SetDlgItemInt(IDC_COUNT_BINARYDIFF, 0);
- SetDlgItemInt(IDC_COUNT_LFOLDER, 0);
- SetDlgItemInt(IDC_COUNT_RFOLDER, 0);
- SetDlgItemInt(IDC_COUNT_FILESKIP, 0);
- SetDlgItemInt(IDC_COUNT_FOLDERSKIP, 0);
- SetDlgItemInt(IDC_COUNT_FOLDER, 0);
- SetDlgItemInt(IDC_COUNT_ERROR, 0);
-
- CProgressCtrl *pProg = (CProgressCtrl*) GetDlgItem(IDC_PROGRESSCOMPARE);
- pProg->SetPos(0);
-
- CStatic *pCompared = (CStatic *) GetDlgItem(IDC_ITEMSCOMPARED);
- CStatic *pTotal = (CStatic *) GetDlgItem(IDC_ITEMSTOTAL);
- pCompared->SetWindowText(_T("0"));
- pTotal->SetWindowText(_T("0"));
-
- m_prevState = CompareStats::STATE_IDLE;
-}
-
-/**
- * @brief Constructor.
- */
-CDirCompStateBar::CDirCompStateBar(CWnd* pParent /*=NULL*/)
-: m_bStopText(TRUE)
-, m_bCompareReady(FALSE)
-, m_prevState(CompareStats::STATE_IDLE)
-{
-}
-
-/**
- * @brief Loads strings from resource.
- */
-BOOL CDirCompStateBar::Create(CWnd* pParentWnd)
-{
- VERIFY(strAbort.LoadString(IDC_COMPARISON_STOP));
- VERIFY(strClose.LoadString(IDC_COMPARISON_CLOSE));
-
- if (! CDialogBar::Create(pParentWnd, CDirCompStateBar::IDD,
- WS_VISIBLE|CBRS_SIZE_FIXED|CBRS_FLYBY,
- CDirCompStateBar::IDD))
- return FALSE;
-
- ClearStat();
- return TRUE;
-};
-
-void CDirCompStateBar::DoDataExchange(CDataExchange* pDX)
-{
- CDialogBar::DoDataExchange(pDX);
- //{{AFX_DATA_MAP(CDirCompStateBar)
- DDX_Control(pDX, IDC_COMPARISON_STOP, m_ctlStop);
- //}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CDirCompStateBar, CDialogBar)
- //{{AFX_MSG_MAP(CDirCompStateBar)
- ON_COMMAND(IDC_COMPARISON_STOP, OnStop)
- ON_UPDATE_COMMAND_UI(IDC_COMPARISON_STOP, OnUpdateStop)
- ON_WM_WINDOWPOSCHANGING()
- ON_WM_TIMER()
- //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CDirCompStateBar size
-// m_sizeDefault is the size of the dialog
-
-CSize CDirCompStateBar::CalcFixedLayout(BOOL bStretch, BOOL bHorz)
-{
- if (IsFloating())
- return m_sizeDefault;
- else
- return CDialogBar::CalcFixedLayout(bStretch, bHorz);
-}
-
-BOOL CDirCompStateBar::GetDefaultRect( LPRECT lpRect ) const
-{
- lpRect->top = 0;
- lpRect->bottom = m_sizeDefault.cy;
- lpRect->left = 0;
- lpRect->right = m_sizeDefault.cx;
- return TRUE;
-}
-
-/**
- * @brief User selects to stop compare.
- *
- * Aborts compare and hides status panel.
- * @todo Couldn't we close this bar without using frame code?
- */
-void CDirCompStateBar::OnStop()
-{
- CDirFrame * pFrameWnd = GetMyDirFrame();
- CDirDoc * pDirDoc = GetMyDirDoc();
-
- if (pDirDoc->IsCurrentScanAbortable())
- pDirDoc->AbortCurrentScan();
-
- GetMyDirFrame()->ShowProcessingBar(FALSE);
-}
-
-/**
- * @brief Update button text (Stop/Close).
- *
- * Changes button text after compare is ready.
- */
-void CDirCompStateBar::OnUpdateStop(CCmdUI* pCmdUI)
-{
- CFrameWnd * pFrameWnd = GetMyDirFrame();
- CDirDoc * pDirDoc = GetMyDirDoc();
-
- // Change button text if scan is finished and it hasn't been yet changed.
- if (m_ctlStop.GetSafeHwnd())
- {
- if (!pDirDoc->IsCurrentScanAbortable())
- {
- if (m_bStopText)
- {
- m_ctlStop.SetWindowText(strClose);
- m_bStopText = FALSE;
- m_lElapsed += ::GetTickCount();
- CString text;
- text.Format(IDS_ELAPSED_TIME, m_lElapsed);
- pFrameWnd->SetMessageText(text);
- }
- }
- }
- pCmdUI->Enable(TRUE);
-}
-
-/**
- * @brief Return control ID for result code.
- */
-UINT CDirCompStateBar::GetIDFromResult(CompareStats::RESULT res)
-{
- UINT resID = 0;
-
- switch ((int)res)
- {
- case CompareStats::RESULT_LUNIQUE:
- resID = IDC_COUNT_LFILE;
- break;
- case CompareStats::RESULT_RUNIQUE:
- resID = IDC_COUNT_RFILE;
- break;
- case CompareStats::RESULT_DIFF:
- resID = IDC_COUNT_NOTEQUAL;
- break;
- case CompareStats::RESULT_SAME:
- resID = IDC_COUNT_EQUAL;
- break;
- case CompareStats::RESULT_BINSAME:
- resID = IDC_COUNT_BINARYSAME;
- break;
- case CompareStats::RESULT_BINDIFF:
- resID = IDC_COUNT_BINARYDIFF;
- break;
- case CompareStats::RESULT_LDIRUNIQUE:
- resID = IDC_COUNT_LFOLDER;
- break;
- case CompareStats::RESULT_RDIRUNIQUE:
- resID = IDC_COUNT_RFOLDER;
- break;
- case CompareStats::RESULT_SKIP:
- resID = IDC_COUNT_FILESKIP;
- break;
- case CompareStats::RESULT_DIRSKIP:
- resID = IDC_COUNT_FOLDERSKIP;
- break;
- case CompareStats::RESULT_DIR:
- resID = IDC_COUNT_FOLDER;
- break;
- case CompareStats::RESULT_ERROR:
- resID = IDC_COUNT_ERROR;
- break;
- }
- return resID;
-}
-
-/**
- * @brief Update all status counts at current values.
- */
-void CDirCompStateBar::UpdateElements()
-{
- for (int i = 0; i < CompareStats::RESULT_COUNT; i++)
- {
- CompareStats::RESULT resnum = static_cast<CompareStats::RESULT>(i);
- UINT resID = GetIDFromResult(resnum);
- int count = m_pCompareStats->GetCount(resnum);
- SetDlgItemInt(resID, count);
- }
-}
-
-/**
- * @brief Handle WM_KEYDOWN messages before normal processing
- * to allow any key close statebar.
- */
-BOOL CDirCompStateBar::PreTranslateMessage(MSG* pMsg)
-{
- if (pMsg->message == WM_KEYDOWN)
- {
- // Allow ESC to stop compare
- if (pMsg->wParam == VK_ESCAPE)
- {
- OnStop();
- return TRUE;
- }
-
- // When the scan is finished, any key will hide the bar
- if (m_bCompareReady)
- {
- OnStop();
- return TRUE;
- }
- }
-
- return CDialogBar::PreTranslateMessage(pMsg);
-}
-
-/**
- * @brief Return pointer to DirFrame by casting (use GetOwner)
- */
-CDirFrame * CDirCompStateBar::GetMyDirFrame()
-{
- // use GetOwner and not GetParentFrame
- // because FloatControlBar assigns the bar to a new parent frame
- CDirFrame * pDirFrame = static_cast<CDirFrame*>(GetOwner());
- ASSERT(pDirFrame != NULL);
- return pDirFrame;
-}
-
-/**
- * @brief Return pointer to our DirDoc object (get from frame)
- */
-CDirDoc * CDirCompStateBar::GetMyDirDoc()
-{
- CDirFrame * pFrameWnd = GetMyDirFrame();
- CDirDoc * pDirDoc = dynamic_cast<CDirDoc*>(pFrameWnd->GetActiveDocument());
- ASSERT(pDirDoc);
- return pDirDoc;
-}
-
-
-/**
- * @brief Hook : this message is received when the window gets hidden.
- * It is the only message we get when the user clicks on the upper right x.
- * (the message WM_CLOSE is processed in the parent CMiniFrameWnd)
- */
-void CDirCompStateBar::OnWindowPosChanging( WINDOWPOS* lpwndpos )
-{
- CDialogBar::OnWindowPosChanging(lpwndpos);
- if (lpwndpos->flags & SWP_HIDEWINDOW)
- {
- // need to notify CDirFrame
- GetMyDirFrame()->NotifyHideStateBar();
- }
-}
-
-/**
- * @brief Resets itemcounts
- */
-void CDirCompStateBar::Reset()
-{
- ClearStat();
- m_lElapsed = 0;
- m_lElapsed -= ::GetTickCount();
- UpdateData(FALSE);
- m_bCompareReady = FALSE;
- m_ctlStop.SetWindowText(strAbort);
- m_bStopText = TRUE;
- // also give the focus to the button (PreTranslateMessage needs it)
- m_ctlStop.SetFocus();
-}
-
-/**
- * @brief Set pointer to compare stats.
- */
-void CDirCompStateBar::SetCompareStat(CompareStats * pCompareStats)
-{
- m_pCompareStats = pCompareStats;
-}
-
-/**
- * @brief Timer message received.
- */
-void CDirCompStateBar::OnTimer(UINT nIDEvent)
-{
- if (nIDEvent == IDT_UPDATE)
- {
- CProgressCtrl *pProg = (CProgressCtrl*) GetDlgItem(IDC_PROGRESSCOMPARE);
- CStatic *pCompared = (CStatic *) GetDlgItem(IDC_ITEMSCOMPARED);
- CStatic *pTotal = (CStatic *) GetDlgItem(IDC_ITEMSTOTAL);
- const CompareStats::CMP_STATE state = m_pCompareStats->GetCompareState();
-
- // New compare started
- if (m_prevState == CompareStats::STATE_IDLE &&
- state == CompareStats::STATE_COLLECT)
- {
- m_prevState = CompareStats::STATE_COLLECT;
- }
- // Collecting items to compare
- else if (m_prevState == CompareStats::STATE_COLLECT &&
- state == CompareStats::STATE_COLLECT)
- {
- TCHAR num[15] = {0};
- _itot(m_pCompareStats->GetTotalItems(), num, 10);
- pTotal->SetWindowText(num);
- }
- // Started comparing items
- else if ((m_prevState == CompareStats::STATE_COLLECT ||
- m_prevState == CompareStats::STATE_IDLE) &&
- state == CompareStats::STATE_COMPARE)
- {
- TCHAR num[15] = {0};
-
- // Start comparing, init progressbar
- int totalItems = m_pCompareStats->GetTotalItems();
- _itot(totalItems, num, 10);
- pTotal->SetWindowText(num);
-
- pProg->SetRange32(0, totalItems);
- int comparedItems = m_pCompareStats->GetComparedItems();
- _itot(comparedItems, num, 10);
- pCompared->SetWindowText(num);
- pProg->SetPos(comparedItems);
- UpdateElements();
- m_prevState = CompareStats::STATE_COMPARE;
- }
- // Comparing items
- else if (m_prevState == CompareStats::STATE_COMPARE &&
- state == CompareStats::STATE_COMPARE)
- {
- TCHAR num[15] = {0};
- int comparedItems = m_pCompareStats->GetComparedItems();
- _itot(comparedItems, num, 10);
- pCompared->SetWindowText(num);
- pProg->SetPos(comparedItems);
- UpdateElements();
- }
- // Compare is ready
- // Update total items too since we might get only this one state
- // when compare is fast.
- else if (state == CompareStats::STATE_IDLE &&
- m_bCompareReady == FALSE && m_pCompareStats->IsCompareDone() )
- {
- TCHAR num[15] = {0};
- const int totalItems = m_pCompareStats->GetTotalItems();
- const int comparedItems = m_pCompareStats->GetComparedItems();
- _itot(comparedItems, num, 10);
- pCompared->SetWindowText(num);
- _itot(totalItems, num, 10);
- pTotal->SetWindowText(num);
- pProg->SetRange32(0, totalItems);
- pProg->SetPos(comparedItems);
- UpdateElements();
- EndUpdating();
- m_prevState = CompareStats::STATE_COMPARE;
- m_bCompareReady = TRUE;
- }
- }
- else
- CDialogBar::OnTimer(nIDEvent);
-
-}
-
-/**
- * @brief Start timer for UI updating.
- */
-void CDirCompStateBar::StartUpdating()
-{
- UpdateElements();
- SetTimer(IDT_UPDATE, UPDATE_INTERVAL, NULL);
-}
-
-/**
- * @brief Stop timer updating UI.
- */
-void CDirCompStateBar::EndUpdating()
-{
- KillTimer(IDT_UPDATE);
-}
+++ /dev/null
-/**
- * @file DirCompStateBar.h
- *
- * @brief Declaration file for Directory compare statuspanel class
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#if !defined(AFX_DIRCOMPSTATEDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
-#define AFX_DIRCOMPSTATEDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_
-
-#ifndef _COMPARESTATS_H_
-#include "CompareStats.h"
-#endif
-
-class CDirFrame;
-class CDirDoc;
-
-/////////////////////////////////////////////////////////////////////////////
-// CDirCompStateBar dialog
-
-/**
- * @brief Class for directory compare statuspanel
- *
- * Implements floating statuspanel during directory compares.
- * Shows statistics from compare and allows stopping compare.
- */
-class CDirCompStateBar : public CDialogBar
-{
-// Construction
-public:
- CDirCompStateBar(CWnd* pParent = NULL); // standard constructor
- BOOL Create(CWnd* pParentWnd);
- BOOL GetDefaultRect( LPRECT lpRect ) const;
- void UpdateText(CStatic * ctrl, int num) const;
- void Reset();
- void UpdateElements();
- void SetCompareStat(CompareStats * pCompareStats);
- void StartUpdating();
- void EndUpdating();
- UINT GetIDFromResult(CompareStats::RESULT res);
-
-// Dialog Data
- //{{AFX_DATA(CDirCompStateBar)
- enum { IDD = IDD_DIRCOMPSTATE };
- CButton m_ctlStop;
- //}}AFX_DATA
-
-// Overrides
- virtual CSize CalcFixedLayout(BOOL bStretch, BOOL bHorz);
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CDirCompStateBar)
- protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
- //}}AFX_VIRTUAL
-
-// Implementation
-protected:
- virtual BOOL PreTranslateMessage(MSG* pMsg);
- void ClearStat();
- CDirFrame * GetMyDirFrame();
- CDirDoc * GetMyDirDoc();
-
- // Generated message map functions
- //{{AFX_MSG(CDirCompStateBar)
- afx_msg void OnStop();
- afx_msg void OnUpdateStop(CCmdUI* pCmdUI);
- afx_msg void OnWindowPosChanging( WINDOWPOS* lpwndpos );
- afx_msg void OnTimer(UINT nIDEvent);
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CString strAbort; /**< 'Stop' text for button */
- CString strClose; /**< 'Close' text for button */
- long m_lElapsed; /**< Elapsed time for compare */
- CompareStats *m_pCompareStats; /**< Pointer to comparestats */
- BOOL m_bStopText; /**< Button has 'Stop' text? */
- CompareStats::CMP_STATE m_prevState; /**< Previous state for compare (to track changes) */
- BOOL m_bCompareReady; /**< Compare ready, waiting for closing? */
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DIRCOMPSTATEDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
-
gLog.Write(LOGLEVEL::LNOTICE, _T("Starting directory scan:\n\tLeft: %s\n\tRight: %s\n"),
m_pCtxt->GetLeftPath(), m_pCtxt->GetRightPath());
m_pCompareStats->Reset();
- pf->SetCompareStats(m_pCompareStats);
- pf->clearStatus();
- pf->ShowProcessingBar(TRUE);
+ m_pDirView->StartCompare(m_pCompareStats);
// Don't clear if only scanning selected items
if (!m_bMarkedRescan)
ASSERT(m_pDirView);
m_pDirView->DeleteAllDisplayItems();
- // hide the floating state bar
- CDirFrame *pf = m_pDirView->GetParentFrame();
- pf->ShowProcessingBar(FALSE);
-
// delete comparison parameters and results
delete m_pCtxt;
m_pCtxt = NULL;
/**
* @brief Returns true if there is an active scan that hasn't been aborted.
- *
- * @todo: This is for Update command handler of menu item or toolbar button to cancel scan
*/
bool CDirDoc::IsCurrentScanAbortable() const
{
AllowUpwardDirectory::ReturnCode AllowUpwardDirectory(CString &leftParent, CString &rightParent);
void SetItemViewFlag(POSITION key, UINT flag, UINT mask);
void SetItemViewFlag(UINT flag, UINT mask);
+ const CompareStats * GetCompareStats() const { return m_pCompareStats; };
protected:
CDiffWrapper m_diffWrapper;
return -1; // fail to create
}
- // Dir frame has a floating bar displayed during comparison
- if (!CreateStateBar())
- {
- TRACE0("Failed to create floating dialog bar\n");
- return -1; // fail to create
- }
-
// Directory frame has a status bar
if (!m_wndStatusBar.Create(this) ||
!m_wndStatusBar.SetIndicators(indicators,
}
/**
- * @brief Create, or recreate, the floating state bar
- *
- * This is the bar with the file counts updated during a directory comparison
- */
-bool CDirFrame::CreateStateBar()
-{
- if (IsWindow(m_wndCompStateBar.m_hWnd))
- {
- m_wndCompStateBar.DestroyWindow();
- }
- // Dir frame has a floating bar displayed during comparison
- if (!m_wndCompStateBar.Create(this))
- return false;
- m_wndCompStateBar.EnableDocking(0);
- return true;
-}
-
-/**
* @brief Set statusbar text
*/
void CDirFrame::SetStatus(LPCTSTR szStatus)
nCmdShow = SW_SHOWNORMAL;
CMDIChildWnd::ActivateFrame(nCmdShow);
- m_bFrameIsActive = TRUE;
-
- // hide the floating bar
- ShowProcessingBar(FALSE);
-
- // and set its initial position (centered at 1/3 of screen)
- SetStateBarLoc();
// prepare file path bar to look as a status bar
if (m_wndFilePathBar.LookLikeThisWnd(&m_wndStatusBar) == TRUE)
*/
void CDirFrame::UpdateResources()
{
- // Ensure show state is correct
- BOOL StateBarVisible = m_bStateBarIsActive;
-
- CreateStateBar();
- if (!StateBarVisible)
- m_wndCompStateBar.ShowWindow(SW_HIDE);
- SetStateBarLoc();
-
- if (StateBarVisible)
- {
- m_wndCompStateBar.UpdateElements();
- ShowProcessingBar(StateBarVisible);
- }
-}
-
-/**
- * @brief Set the location of the state control bar
- */
-void CDirFrame::SetStateBarLoc()
-{
- CRect rc;
- GetWindowRect(&rc);
- CPoint origin;
- origin.x = (rc.left+rc.right)/2;
- origin.y = (rc.top+rc.bottom)/3;
- CRect rcBar;
- m_wndCompStateBar.GetDefaultRect(&rcBar);
- origin -= rcBar.CenterPoint();
- // always call once FloatControlBar for a floating bar
- FloatControlBar(&m_wndCompStateBar, origin);
}
/**
m_wndFilePathBar.Resize();
}
-
-/// clear counters used to track diff progress
-void CDirFrame::clearStatus()
-{
- m_wndCompStateBar.Reset();
-}
-
-/**
- * @brief Interface to show/hide the floating state bar
- */
-void CDirFrame::ShowProcessingBar(BOOL bShow)
-{
- if (bShow)
- {
- ShowControlBar(&m_wndCompStateBar, TRUE, FALSE);
- // disable the list view as long as the state bar is shown
- GetActiveView()->EnableWindow(FALSE);
- m_wndCompStateBar.StartUpdating();
- }
- else if (!bShow)
- {
- m_wndCompStateBar.EndUpdating();
- ShowControlBar(&m_wndCompStateBar, FALSE, FALSE);
- }
-
- m_bStateBarIsActive = bShow;
-}
-
-
-/**
- * @brief Enable the list view when the state bar becomes inactive
- */
-void CDirFrame::NotifyHideStateBar()
-{
- if (GetParentFrame()->GetActiveDocument() != NULL)
- return;
- if (!m_bFrameIsActive)
- // bar hidden because the frame get unactived
- return;
-
- m_bStateBarIsActive = FALSE;
-
- if (!GetActiveView()->IsWindowEnabled())
- {
- // enable the list view and set the focus
- GetActiveView()->EnableWindow();
- GetActiveView()->SetFocus();
- }
-}
-
-/**
- * @brief Override of the MFC functions (see windows help)
- *
- * @note Hides the state bar when the document is inactive
- * (it is a topmost bar, and we don't want to display it above the new active document)
- */
-void CDirFrame::OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd)
-{
-
- if (bActivate == TRUE)
- if (m_bStateBarIsActive)
- ShowControlBar(&m_wndCompStateBar, TRUE, FALSE);
-
- CMDIChildWnd::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd);
- m_bFrameIsActive = bActivate;
-
- if (bActivate == FALSE)
- if (m_bStateBarIsActive)
- ShowControlBar(&m_wndCompStateBar, FALSE, FALSE);
-}
-
-/**
- * @brief Override of the MFC functions (see windows help)
- *
- * @note: this line 'pParentFrame->ShowWindow' is bad with MDI
- * It disturbs the coloring of the document caption if there are two docs
- * (light blue for inactive / blue for active)
- */
-void CDirFrame::ShowControlBar( CControlBar* pBar, BOOL bShow, BOOL bDelay )
-{
- ASSERT(pBar != NULL);
- CFrameWnd* pParentFrame = pBar->GetDockingFrame();
- ASSERT(pParentFrame->GetTopLevelParent() == GetTopLevelParent());
- // parent frame of bar must be related
-
- if (bDelay)
- {
- pBar->DelayShow(bShow);
- pParentFrame->DelayRecalcLayout();
- }
- else
- {
- pBar->SetWindowPos(NULL, 0, 0, 0, 0,
- SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|
- (bShow ? SWP_SHOWWINDOW : SWP_HIDEWINDOW));
- // call DelayShow to clear any contradictory DelayShow
- pBar->DelayShow(bShow);
- if (bShow || !pBar->IsFloating())
- pParentFrame->RecalcLayout(FALSE);
- }
-
- // show or hide the floating frame as appropriate
- if (pBar->IsFloating())
- {
- int nVisCount = pBar->m_pDockBar != NULL ?
- pBar->m_pDockBar->GetDockedVisibleCount() : bShow ? 1 : 0;
- if (nVisCount == 1 && bShow)
- {
- pParentFrame->m_nShowDelay = -1;
- if (bDelay)
- {
- pParentFrame->m_nShowDelay = SW_SHOWNA;
- pParentFrame->RecalcLayout(FALSE);
- }
- else
- pParentFrame->ShowWindow(SW_SHOWNA);
- }
- else if (nVisCount == 0)
- {
- ASSERT(!bShow);
- pParentFrame->m_nShowDelay = -1;
- if (bDelay)
- pParentFrame->m_nShowDelay = SW_HIDE;
- else
- pParentFrame->SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
- // bug : this hides the window and give focus to the parent
- // (also parent may be disabled too)
- // pParentFrame->ShowWindow(SW_HIDE);
- }
- else if (!bDelay)
- {
- pParentFrame->RecalcLayout(FALSE);
- }
- }
-}
-
-void CDirFrame::SetCompareStats(CompareStats *pCompareStats)
-{
- m_wndCompStateBar.SetCompareStat(pCompareStats);
-}
-
-void CDirFrame::UpdateStats()
-{
- m_wndCompStateBar.UpdateElements();
-}
#define AFX_DIRFRAME_H__95565903_35C4_11D1_BAA7_00A024706EDC__INCLUDED_
#include "EditorFilepathBar.h"
-#include "DirCompStateBar.h"
-
-class CompareStats;
/////////////////////////////////////////////////////////////////////////////
// CDirFrame frame
CStatusBar m_wndStatusBar;
void SetClosableCallback(bool (*canclose)(void *), void * param);
IHeaderBar * GetHeaderInterface();
- void clearStatus();
- void ShowProcessingBar(BOOL bShow);
- void NotifyHideStateBar();
void UpdateResources();
void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; };
- void SetCompareStats(CompareStats *pCompareStats);
- void UpdateStats();
// Overrides
// ClassWizard generated virtual function overrides
protected:
CEditorFilePathBar m_wndFilePathBar;
- CDirCompStateBar m_wndCompStateBar;
- /* @brief The state bar is active when
- * <ul>
- * <li> visible
- * <li> the frame is unactive, and the state bar was visible when the frame was active
- * </ul>
- */
- BOOL m_bStateBarIsActive;
- /* @brief Track the activity of this frame, without delay.
- * This flag must be updated when CMDIChildWnd::OnMDIActivate is called.
- * GetParentFrame()->GetActiveFrame() introduces some delay.
- */
- BOOL m_bFrameIsActive;
-
virtual ~CDirFrame();
- void ShowControlBar( CControlBar* pBar, BOOL bShow, BOOL bDelay );
- bool CreateStateBar();
- void SetStateBarLoc();
// Generated message map functions
//{{AFX_MSG(CDirFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnClose();
afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
#include "OptionsDef.h"
#include "BCMenu.h"
#include "DirCmpReport.h"
+#include "DirCompProgressDlg.h"
+#include "CompareStatisticsDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
enum { COLUMN_REORDER=99 };
-/**
- * @brief ID for timer closing Compare Pane after delay
- */
-const UINT IDT_CMPPANE_CLOSING = 1;
-
-/**
- * @brief Delay (in milliseconds) for closing Compare Pane
- * after compare is ready. This delay is only applied if
- * automatic closing is enabled.
- */
-const UINT CMPPANE_DELAY = 500;
-
IMPLEMENT_DYNCREATE(CDirView, CListView)
CDirView::CDirView()
, m_dispcols(-1)
, m_pList(NULL)
, m_nHiddenItems(0)
+, m_pCmpProgressDlg(NULL)
{
m_dwDefaultStyle &= ~LVS_TYPEMASK;
// Show selection all the time, so user can see current item even when
CDirView::~CDirView()
{
+ delete m_pCmpProgressDlg;
}
BEGIN_MESSAGE_MAP(CDirView, CListView)
ON_COMMAND(ID_DIR_ZIP_RIGHT, OnCtxtDirZipRight)
ON_COMMAND(ID_DIR_ZIP_BOTH, OnCtxtDirZipBoth)
ON_COMMAND(ID_DIR_ZIP_BOTH_DIFFS_ONLY, OnCtxtDirZipBothDiffsOnly)
- ON_COMMAND(ID_VIEW_DIR_STATEPANE, OnDirStatePane)
- ON_UPDATE_COMMAND_UI(ID_VIEW_DIR_STATEPANE, OnUpdateDirStatePane)
ON_COMMAND(ID_EDIT_SELECT_ALL, OnSelectAll)
ON_UPDATE_COMMAND_UI(ID_EDIT_SELECT_ALL, OnUpdateSelectAll)
ON_COMMAND_RANGE(ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO, OnPluginPredifferMode)
ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWHIDDENITEMS, OnUpdateViewShowHiddenItems)
ON_COMMAND(ID_MERGE_COMPARE, OnMergeCompare)
ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE, OnUpdateMergeCompare)
+ ON_COMMAND(ID_VIEW_DIR_STATISTICS, OnViewCompareStatistics)
//}}AFX_MSG_MAP
ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
return DIFFIMG_ERROR;
}
+void CDirView::StartCompare(CompareStats *pCompareStats)
+{
+ if (m_pCmpProgressDlg == NULL)
+ m_pCmpProgressDlg = new DirCompProgressDlg();
+
+ if (!::IsWindow(m_pCmpProgressDlg->GetSafeHwnd()))
+ m_pCmpProgressDlg->Create(IDD_DIRCOMP_PROGRESS, this);
+
+ m_pCmpProgressDlg->ShowWindow(SW_SHOW);
+ m_pCmpProgressDlg->SetCompareStat(pCompareStats);
+ m_pCmpProgressDlg->SetDirDoc(GetDocument());
+ m_pCmpProgressDlg->StartUpdating();
+}
void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
{
*/
LRESULT CDirView::OnUpdateUIMessage(WPARAM wParam, LPARAM lParam)
{
- // Close compare pane when compare is ready
- if (mf->m_options.GetBool(OPT_AUTOCLOSE_CMPPANE))
- {
- SetTimer(IDT_CMPPANE_CLOSING, CMPPANE_DELAY, NULL);
- }
+ UNREFERENCED_PARAMETER(wParam);
+ UNREFERENCED_PARAMETER(lParam);
CDirDoc * pDoc = GetDocument();
ASSERT(pDoc);
// Currently UI (update) message is sent after compare is ready
+ m_pCmpProgressDlg->CloseDialog();
pDoc->CompareReady();
Redisplay();
SetColumnWidths();
Redisplay();
}
- else if (nIDEvent == IDT_CMPPANE_CLOSING)
- {
- KillTimer(IDT_CMPPANE_CLOSING);
- CDirFrame *pf = GetParentFrame();
- pf->ShowProcessingBar(FALSE);
- }
-
+
CListView::OnTimer(nIDEvent);
}
}
/**
- * @brief Show directory compare statepane
- */
-void CDirView::OnDirStatePane()
-{
- CDirFrame *pf = GetParentFrame();
- if (!GetDocument()->HasDiffs())
- return;
-
- // Clear and recount item numbers
- pf->clearStatus();
- pf->UpdateStats();
- pf->ShowProcessingBar(TRUE);
-}
-
-/**
- * @brief Enable menuitem for compare statepane
- */
-void CDirView::OnUpdateDirStatePane(CCmdUI* pCmdUI)
-{
- pCmdUI->Enable(GetDocument()->HasDiffs());
-}
-
-
-/**
* @brief Add special items for non-recursive compare
* to directory view.
*
{
DoUpdateOpen(pCmdUI);
}
+
+void CDirView::OnViewCompareStatistics()
+{
+ CompareStatisticsDlg dlg;
+ dlg.SetCompareStats(GetDocument()->GetCompareStats());
+ dlg.DoModal();
+}
class PackingInfo;
class PathContext;
+class DirCompProgressDlg;
+class CompareStats;
struct ViewCustomFlags
{
public:
CDirFrame * GetParentFrame();
+ void StartCompare(CompareStats *pCompareStats);
void Redisplay();
void UpdateResources();
void LoadColumnHeaderItems();
BOOL m_bEscCloses; /**< Cached value for option for ESC closing window */
CFont m_font; /**< User-selected font */
UINT m_nHiddenItems; /**< Count of items we have hidden */
+ DirCompProgressDlg * m_pCmpProgressDlg;
// Generated message map functions
afx_msg void OnColumnClick(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnCtxtDirZipBoth();
afx_msg void OnCtxtDirZipBothDiffsOnly();
afx_msg void OnUpdateCtxtDir(CCmdUI* pCmdUI);
- afx_msg void OnDirStatePane();
- afx_msg void OnUpdateDirStatePane(CCmdUI* pCmdUI);
afx_msg void OnSelectAll();
afx_msg void OnUpdateSelectAll(CCmdUI* pCmdUI);
afx_msg void OnPluginPredifferMode(UINT nID);
afx_msg void OnUpdateViewShowHiddenItems(CCmdUI* pCmdUI);
afx_msg void OnMergeCompare();
afx_msg void OnUpdateMergeCompare(CCmdUI *pCmdUI);
+ afx_msg void OnViewCompareStatistics();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
MENUITEM SEPARATOR
MENUITEM "Barra de &Ferramentas", ID_VIEW_TOOLBAR
MENUITEM "Barra de &Status", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Idioma...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Exibir caracteres de espaço em branco"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
- ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Seleciona o Idioma usado na interface\nLíngua"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Èíñòðóìåíòè", ID_VIEW_TOOLBAR
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Åçèê...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
- ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Èçáåðåòå åçèêà íà êîèòî äà å ïðîãðàìàòà\nÅçèê"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Barra d'ei&nes", ID_VIEW_TOOLBAR
MENUITEM "Barra d'est&at", ID_VIEW_STATUS_BAR
- MENUITEM "Subfinestra d'estat de &comparació", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "Idio&ma...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "&Atura",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Mostra els caràcters d'espais"
ID_VIEW_DETAIL_BAR "Mostra la subfinestra de diferències"
ID_VIEW_LOCATION_BAR "Mostra la subfinestra d'ubicació amb una image general dels fitxers"
- ID_VIEW_DIR_STATEPANE "Mostra la subfinestra d'estat de comparació de directoris"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Selecciona l'idioma de la interfície d'usuari\nIdioma"
ID_VIEW_LINEDIFFS "Mostra les diferències dins les línies en un color diferent\nMostra les diferències de línia"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOLBAR
MENUITEM "״̬À¸(&S)", ID_VIEW_STATUS_BAR
- MENUITEM "¶Ô±È½á¹û´°(&R)", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "ÓïÑÔ(&L)...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "ֹͣ",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "ÏÔʾ¿Õ°×ºÍÖƱí·û×Ö·û"
ID_VIEW_DETAIL_BAR "ÏÔʾ/Òþ²Ø¶Ô±È´°¸ñ"
ID_VIEW_LOCATION_BAR "λÖô°¸ñÏÔʾÎļþµÄ×ÜÌåÇé¿ö"
- ID_VIEW_DIR_STATEPANE "ÏÔʾÎļþ¼Ð¶Ô±È½á¹û´°"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Ñ¡Ôñµ±Ç°Óû§½Ó¿ÚÓïÑÔ\nÓïÑÔ"
ID_VIEW_LINEDIFFS "ÒÔ²»Í¬µÄÑÕÉ«ÏÔʾÐÐÖеIJ»Í¬\nÏÔʾÐÐÖв»Í¬"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "¤u¨ã¦C(&T)", ID_VIEW_TOOLBAR
MENUITEM "ª¬ºA¦C(&S)", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "»y¨¥(&L)...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Åã¥ÜªÅ¥Õ©M¸õ®æ¦r¤¸"
ID_VIEW_DETAIL_BAR "¤Á´«¤£¦Pµ¡®Ø"
ID_VIEW_LOCATION_BAR "¦ì¸mµ¡®ØÅã¥ÜºîÄý¹Ï¤ù±qÀÉ®×"
- ID_VIEW_DIR_STATEPANE "Åã¥Ü¸ê®Æ§¨¤ñ¸ûª¬ºAµ¡®Ø"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "¿ï¨ú¥Ø«e¥Î¤á¤¶±»y¨¥\n»y¨¥"
ID_VIEW_LINEDIFFS "¥H¤£¦P¦â±mÅã¥Ü¦C¤ºªº¤£¦P\nÅã¥Ü¦C¤£¦P"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Panel nástroju", ID_VIEW_TOOLBAR
MENUITEM "&Stavový rádek", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
- ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Zvolit jazyk pro u\9eivatelské rozhraní\nLanguage"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "V&ærktøjslinje", ID_VIEW_TOOLBAR
MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR
- MENUITEM "St&atus panel", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "S&prog...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Viser et tegn for mellemrum"
ID_VIEW_DETAIL_BAR "Vis eller gem horisontalt panel"
ID_VIEW_LOCATION_BAR "Vis eller gem vertikalt panel"
- ID_VIEW_DIR_STATEPANE "Vis eller gem status på sammeligning af mapper"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Vælg sprog til brugerfladen\nSprog"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Werkbalk", ID_VIEW_TOOLBAR
MENUITEM "&Status Balk", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Taal...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stoppen",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Toont tekens witruimte"
ID_VIEW_DETAIL_BAR "Omschakelen verschilvenster"
ID_VIEW_LOCATION_BAR "Locatievenster toont overzichtsweergave van bestanden"
- ID_VIEW_DIR_STATEPANE "Statusvenster van mapvergelijking tonen"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "De gewenste taal selecteren.\nTaal"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR
MENUITEM "Barre d'&état", ID_VIEW_STATUS_BAR
- MENUITEM "&Fenêtre récapitulative", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Langage...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Arrêter",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Afficher ou masquer les espaces"
ID_VIEW_DETAIL_BAR "Afficher ou masquer le détail des différences courantes"
ID_VIEW_LOCATION_BAR "Afficher ou masquer la barre de localisation (vue d'ensemble des fichiers)"
- ID_VIEW_DIR_STATEPANE "Afficher la fenêtre récapitulative"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Sélectionner le langage de l'interface\nLangage"
ID_VIEW_LINEDIFFS "Afficher les différences des lignes avec différentes couleurs\nAfficher différences des lignes"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Symbolleiste", ID_VIEW_TOOLBAR
MENUITEM "S&tatusleiste", ID_VIEW_STATUS_BAR
- MENUITEM "V&ergleichszustand", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "Spra&che...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Zeigt Leerzeichen an."
ID_VIEW_DETAIL_BAR "Blendet die Unterschiedsleiste ein oder aus."
ID_VIEW_LOCATION_BAR "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien."
- ID_VIEW_DIR_STATEPANE "Blendet den Vergleichszustand ein oder aus."
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Wählt die Sprache der Benutzeroberfläche.\nSprache"
ID_VIEW_LINEDIFFS "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe.\nZeilenunterschied anzeigen"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Eszköztár", ID_VIEW_TOOLBAR
MENUITEM "&Álapotsor", ID_VIEW_STATUS_BAR
- MENUITEM "&Összehasonlító állapotpanel", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Nyelv...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Megállítás",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Szóköz karakterek mutatása"
ID_VIEW_DETAIL_BAR "Eltérés panel mutatása/rejtése"
ID_VIEW_LOCATION_BAR "A Pozíció panel vizuális képet ad az összehasonlított fájlokról"
- ID_VIEW_DIR_STATEPANE "Könyvtár összehasonlítási állapot panel mutatása"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Add meg a használni kívánt nyelvet\nNyelv"
ID_VIEW_LINEDIFFS "A sorok közötti különbségek kijelzés más-más színnel\nSorok eltérésének mutatása"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Barra degli &strumenti", ID_VIEW_TOOLBAR
MENUITEM "&Barra di stato", ID_VIEW_STATUS_BAR
- MENUITEM "Pann&ello confronto rapido cartelle", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Lingua...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Mostra gli spazi bianchi"
ID_VIEW_DETAIL_BAR "Mostra il pannello delle differenze"
ID_VIEW_LOCATION_BAR "Il pannello della locazione mostra un'immagine complessiva dei file"
- ID_VIEW_DIR_STATEPANE "Mostra pannello di riepilogo rapido del confronto tra cartelle"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Seleziona la lingua dell'interfaccia utente\nLingua"
ID_VIEW_LINEDIFFS "Mostra le differenze all'interno delle linee con colori diversi\nMostra differenze nelle linee"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "\83c\81[\83\8b\83o\81[(&T)", ID_VIEW_TOOLBAR
MENUITEM "\83X\83e\81[\83^\83X\83o\81[(&S)", ID_VIEW_STATUS_BAR
- MENUITEM "\94ä\8ar\8fó\91Ô\83y\83C\83\93(&R)", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "\8c¾\8cê(&L)...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "\8bó\94\92\95¶\8e\9a\82ð\95\\8e¦\82µ\82Ü\82·"
ID_VIEW_DETAIL_BAR "Diff\83y\83C\83\93\82Ì\95\\8e¦/\94ñ\95\\8e¦\82ð\90Ø\82è\91Ö\82¦\82Ü\82·"
ID_VIEW_LOCATION_BAR "\83\8d\83P\81[\83V\83\87\83\93\83y\83C\83\93\82Í\83t\83@\83C\83\8b\82Ì\93à\97e\91S\91Ì\82ð\83s\83N\83`\83\83\82Æ\82µ\82Ä\95\\8e¦\82µ\82Ü\82·"
- ID_VIEW_DIR_STATEPANE "\83f\83B\83\8c\83N\83g\83\8a\94ä\8ar\8fó\91Ô\83y\83C\83\93\82ð\95\\8e¦\82µ\82Ü\82·"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "\8c»\8dÝ\82Ì\83\86\81[\83U\81[\83C\83\93\83^\81[\83t\83F\81[\83X\8c¾\8cê\82ð\91I\91ð\82µ\82Ü\82·\n\8c¾\8cê"
ID_VIEW_LINEDIFFS "\8ds\93à\82Ì\8d·\88Ù\82ð\90F\82ð\95Ï\82¦\82Ä\95\\8e¦\82µ\82Ü\82·\n\8ds\93à\82Ì\8d·\88Ù\82ð\95\\8e¦"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Åø¹Ù(&T)", ID_VIEW_TOOLBAR
MENUITEM "»óÅ ǥ½ÃÁÙ(&S)", ID_VIEW_STATUS_BAR
- MENUITEM "µð·ºÅ丮 ºñ±³ °á°ú ¿ä¾à(&R)", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "¾ð¾î(&L)...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "ÁßÁö",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "°ø¹é¹®ÀÚ¸¦ Ç¥½ÃÇÕ´Ï´Ù."
ID_VIEW_DETAIL_BAR "¼±Åà ºñ±³Ã¢À» º¸°Å³ª ¼û±é´Ï´Ù."
ID_VIEW_LOCATION_BAR "À§Ä¡ Ç¥½ÃâÀº Àüü ºñ±³ »óȲÀ» À̹ÌÁö·Î º¸¿©ÁÝ´Ï´Ù."
- ID_VIEW_DIR_STATEPANE "µð·ºÅ丮 ºñ±³ »óȲÀ» ¿ä¾àÇؼ º¾´Ï´Ù."
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "¾ð¾î¸¦ ¼±ÅÃÇÕ´Ï´Ù.\n¾ð¾î"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Verktøylinje", ID_VIEW_TOOLBAR
MENUITEM "S&tatuslinje", ID_VIEW_STATUS_BAR
- MENUITEM "&Sammenligningsvindu", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "S&pråk...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
ID_VIEW_WHITESPACE "Viser et tegn for mellomrom"
ID_VIEW_DETAIL_BAR "Veksle forskjellsvindu"
ID_VIEW_LOCATION_BAR "Plasseringsvindu viser oversiktbilde av filene"
- ID_VIEW_DIR_STATEPANE "Vis mappesammenligningsvindu"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Velg språk til brukergrensesnittet\nSpråk"
ID_VIEW_LINEDIFFS "Vis forskjeller på en linje med forskjellig farge\nVis linjeforskjell"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Pasek &narzêdzi", ID_VIEW_TOOLBAR
MENUITEM "Pasek s&tanu", ID_VIEW_STATUS_BAR
- MENUITEM "Panel porównania &stanu", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Jêzyk...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Pokazuje bia³e znaki"
ID_VIEW_DETAIL_BAR "Prze³¹cz panel ró¿nic"
ID_VIEW_LOCATION_BAR "Panel pokazuje ogólny obraz z plików"
- ID_VIEW_DIR_STATEPANE "Poka¿ panel stanu porównania katalogów"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Wybierz jêzyk interfejsu u¿ytkownika\nJêzyk"
ID_VIEW_LINEDIFFS "Poka¿ ró¿nice w liniach o ró¿nym kolorze\nPoka¿ ró¿ne linie"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Ïà&íåëü èíñòðóìåíòîâ", ID_VIEW_TOOLBAR
MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_VIEW_STATUS_BAR
- MENUITEM "Ñòàòóñíàÿ ïàíåëü", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&ßçûê...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Ñòîï",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Ïîêàçûâàòü íåâèäèìûå çíàêè ðàçìåòêè"
ID_VIEW_DETAIL_BAR "Ïåðåêëþ÷èòü ïàíåëü îòëè÷èé"
ID_VIEW_LOCATION_BAR "Ïàíåëü ëîêàöèé ïîêàçûâàåò ïîëíóþ êàðòèíó îòëè÷èé ìåæäó ôàéëàìè"
- ID_VIEW_DIR_STATEPANE "Ïîêàçàòü ñòàòóñíóþ ïàíåëü ñðàâíåíèÿ êàòàëîãîâ"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Âûáîð ÿçûêà ïîëüçîâàòåëÿ\nLanguage"
ID_VIEW_LINEDIFFS "Âûäåëèòü îòëè÷èÿ â ñòðîêàõ ðàçíûìè öâåòàìè\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "&Panel nástrojov", ID_VIEW_TOOLBAR
MENUITEM "&Stavový riadok", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Jazyk...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Zobrazuje prázdne znaky"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
- ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Zvoli\9d jazyk u\9eivate¾ského rozhrania\nJazyk"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Barra de &herramientas", ID_VIEW_TOOLBAR
MENUITEM "Barra de &estado", ID_VIEW_STATUS_BAR
- MENUITEM "Panel de comparación de dire&ctorios", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "Idi&oma...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Detener",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Muestra los espacios en blanco"
ID_VIEW_DETAIL_BAR "Muestra el panel de diferencias"
ID_VIEW_LOCATION_BAR "Muestra el panel de situación con una imagen global de los ficheros"
- ID_VIEW_DIR_STATEPANE "Muestra el panel de resumen de diferencias entre directorios"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Permite seleccionar el idioma del interface de usuario\nIdioma"
ID_VIEW_LINEDIFFS "Muestra las diferencias en las líneas en un color diferente\nMostrar diferencias de línea"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "V&erktygsfält", ID_VIEW_TOOLBAR
MENUITEM "S&tatusfält", ID_VIEW_STATUS_BAR
- MENUITEM "Jämfö&r Statuspanel", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "S&pråk...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Avbryt",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
ID_VIEW_WHITESPACE "Visar ett tecken för mellanslag"
ID_VIEW_DETAIL_BAR "Visar eller gömmer skillnadsfältet\nVäxla skillnadsfältet"
ID_VIEW_LOCATION_BAR "Skillnadsbilden visar en övergripande bild av filerna"
- ID_VIEW_DIR_STATEPANE "Visar jämför katalogs Statuspanel"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Väljer språk för användargränssnittet\nSpråk"
ID_VIEW_LINEDIFFS "Visar skillnader inom rader med olika färg\nVisa radskillnad"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
MENUITEM SEPARATOR
MENUITEM "Araç Çubuðu", ID_VIEW_TOOLBAR
MENUITEM "Durum Çubuðu", ID_VIEW_STATUS_BAR
- MENUITEM "&Karþýlaþtýrma Sonuç Penceresi", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Dil", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
- ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
{
CDirView * pDirView = DirViews.RemoveHead();
CDirFrame *pf = pDirView->GetParentFrame();
- pf->ShowProcessingBar(FALSE);
}
pMainFrame->PostMessage(WM_CLOSE, 0, 0);
}
# End Source File
# Begin Source File
+SOURCE=.\CompareStatisticsDlg.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\CompareStats.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\DirCompStateBar.cpp
+SOURCE=.\DirCompProgressDlg.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\CompareStatisticsDlg.h
+# End Source File
+# Begin Source File
+
SOURCE=.\CompareStats.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\DirCompStateBar.h
+SOURCE=.\DirCompProgressDlg.h
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\res\sigma.bmp
+# End Source File
+# Begin Source File
+
SOURCE=.\res\splash1.bmp
# End Source File
# Begin Source File
MENUITEM SEPARATOR
MENUITEM "&Toolbar", ID_VIEW_TOOLBAR
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statepane", ID_VIEW_DIR_STATEPANE
+ MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Language...", ID_VIEW_LANGUAGE
END
ES_READONLY
END
-IDD_DIRCOMPSTATE DIALOGEX 0, 0, 415, 59
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 329, 47
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
+ WS_CAPTION
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION " Folder Compare Progress"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "",IDC_STATIC,3,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,3,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,56,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,109,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,162,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,215,24,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,4,51,17,SS_SUNKEN | NOT WS_GROUP
- LTEXT "",IDC_STATIC,268,24,51,17,SS_SUNKEN | NOT WS_GROUP
- CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP,7,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_ERROR,IDC_STATIC,"Static",SS_BITMAP,7,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP,60,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP,113,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP,113,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP,165,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP,165,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP,218,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP,218,27,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FOLDERSKIP,IDC_STATIC,"Static",SS_BITMAP,271,8,12,11,
- WS_EX_STATICEDGE
- CONTROL IDB_FILESKIP,IDC_STATIC,"Static",SS_BITMAP,271,27,12,11,
- WS_EX_STATICEDGE
- RTEXT "",IDC_COUNT_FOLDER,24,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_ERROR,24,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_LFOLDER,76,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_RFOLDER,76,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_EQUAL,129,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_NOTEQUAL,129,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYSAME,182,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_BINARYDIFF,182,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_LFILE,235,10,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_RFILE,235,29,26,8,SS_REALSIZEIMAGE | 0x2000
- RTEXT "",IDC_COUNT_FOLDERSKIP,288,10,26,8,SS_REALSIZEIMAGE |
- 0x2000
- RTEXT "",IDC_COUNT_FILESKIP,288,29,26,8,SS_REALSIZEIMAGE |
- 0x2000
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,327,17,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,4,
- 47,314,9
- RTEXT "0",IDC_ITEMSCOMPARED,326,47,30,8
- LTEXT "0",IDC_ITEMSTOTAL,370,47,30,8
- LTEXT "/",IDC_STATIC,361,47,8,8
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,239,7,83,14
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ 32,314,9
+ RTEXT "0",IDC_ITEMSCOMPARED,150,18,30,8
+ LTEXT "0",IDC_ITEMSTOTAL,194,18,30,8
+ LTEXT "/",IDC_STATIC,186,18,8,8
+ LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
+ LTEXT "Items compared / Items total:",IDC_STATIC,7,18,129,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
WS_TABSTOP,7,70,221,10
END
+IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Compare Statistics"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Folders:",IDC_STATIC,72,7,38,8
+ LTEXT "Files:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Different",IDC_STATIC,7,15,186,40
+ RTEXT "Text:",IDC_STATIC,11,26,56,8
+ CONTROL IDB_NOTEQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,24,12,11
+ RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ CONTROL IDB_BINARYDIFF,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,37,12,11
+ RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
+ GROUPBOX "Unique",IDC_STATIC,7,55,186,40
+ RTEXT "Left:",IDC_STATIC,11,66,56,8
+ CONTROL IDB_LFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
+ CONTROL IDB_LFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,64,12,11
+ RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
+ RTEXT "Right:",IDC_STATIC,11,79,56,8
+ CONTROL IDB_RFOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
+ CONTROL IDB_RFILE,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,77,12,11
+ RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
+ GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ CONTROL IDB_FOLDER,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
+ CONTROL IDB_EQUAL,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,102,12,11
+ RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
+ RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ CONTROL IDB_BINARYSAME,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,115,12,11
+ RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
+ CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
+ RTEXT "Total:",IDC_STATIC,13,142,56,8
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 72,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
+ CONTROL IDB_SIGMA,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN,
+ 131,140,12,11
+ RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
+ DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
IDB_TOOLS_COLUMNS BITMAP "res\\customize_columns.bmp"
IDB_MERGE_DELETE BITMAP "res\\delete.bmp"
IDB_FILE_PRINT BITMAP "res\\print.bmp"
+IDB_SIGMA BITMAP "res\\sigma.bmp"
/////////////////////////////////////////////////////////////////////////////
ID_VIEW_WHITESPACE "Shows whitespace characters"
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
- ID_VIEW_DIR_STATEPANE "Show directory compare statepane"
+ ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage"
ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
END
#define IDD_GENERATE_PATCH 211
#define IDD_DIRCOLS 212
#define IDD_SELECTUNPACKER 213
-#define IDD_DIRCOMPSTATE 214
+#define IDD_DIRCOMP_PROGRESS 214
#define IDD_WMGOTO 215
#define IDD_PROPPAGE_COMPARE 216
#define IDD_PROPPAGE_EDITOR 217
#define IDD_DIRCMP_REPORT 226
#define IDD_SHARED_FILTER 227
#define IDD_PROP_ARCHIVE 228
+#define IDD_COMPARE_STATISTICS 229
#define IDB_ERROR 300
#define IDB_EQUAL 301
#define IDB_NOTEQUAL 302
#define IDB_TOOLS_COLUMNS 335
#define IDB_MERGE_DELETE 336
#define IDB_FILE_PRINT 337
+#define IDB_SIGMA 338
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
#define IDC_ARCHIVE_ENABLE 1202
#define IDC_ARCHIVE_INSTALSTANDALONE 1203
#define IDC_ARCHIVE_INSTALLOCAL 1204
+#define IDC_STAT_IDENTICFOLDER 1205
+#define IDC_STAT_IDENTICFILE 1206
+#define IDC_STAT_IDENTICBINARY 1207
+#define IDC_STAT_DIFFFILE 1208
+#define IDC_STAT_DIFFBINARY 1209
+#define IDC_STAT_LUNIQFOLDER 1210
+#define IDC_STAT_LUNIQFILE 1211
+#define IDC_STAT_RUNIQFOLDER 1212
+#define IDC_STAT_RUNIQFILE 1213
+#define IDC_STAT_TOTALFOLDER 1214
+#define IDC_STAT_TOTALFILE 1215
#define IDC_EDIT_WHOLE_WORD 8603
#define IDC_EDIT_MATCH_CASE 8604
#define IDC_EDIT_FINDTEXT 8605
#define ID_VIEW_WHITESPACE 32818
#define ID_VIEW_DETAIL_BAR 32819
#define ID_VIEW_LOCATION_BAR 32820
-#define ID_VIEW_DIR_STATEPANE 32821
+#define ID_VIEW_DIR_STATISTICS 32821
#define ID_VIEW_LANGUAGE 32822
#define ID_VIEW_LINEDIFFS 32823
#define ID_PREVDIFF 32832
OSDN Git Service
