Progress Bar Show Animate

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / ChangedDlg.cpp

diff --git a/src/TortoiseProc/ChangedDlg.cpp b/src/TortoiseProc/ChangedDlg.cpp
index bbb90e2..f63ffe1 100644 (file)
--- a/src/TortoiseProc/ChangedDlg.cpp
+++ b/src/TortoiseProc/ChangedDlg.cpp
@@ -23,6 +23,7 @@
 #include "cursor.h"\r
 #include ".\changeddlg.h"\r
 \r
+#include "GitStatusListCtrl.h"\r
 \r
 IMPLEMENT_DYNAMIC(CChangedDlg, CResizableStandAloneDialog)\r
 CChangedDlg::CChangedDlg(CWnd* pParent /*=NULL*/)\r
@@ -49,8 +50,8 @@ void CChangedDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
        DDX_Check(pDX, IDC_SHOWUNMODIFIED, m_iShowUnmodified);\r
        DDX_Check(pDX, IDC_SHOWIGNORED, m_bShowIgnored);\r
-       DDX_Check(pDX, IDC_SHOWEXTERNALS, m_bShowExternals);\r
-       DDX_Check(pDX, IDC_SHOWUSERPROPS, m_bShowUserProps);\r
+//     DDX_Check(pDX, IDC_SHOWEXTERNALS, m_bShowExternals);\r
+//     DDX_Check(pDX, IDC_SHOWUSERPROPS, m_bShowUserProps);\r
 }\r
 \r
 \r
@@ -58,12 +59,12 @@ BEGIN_MESSAGE_MAP(CChangedDlg, CResizableStandAloneDialog)
        ON_BN_CLICKED(IDC_CHECKREPO, OnBnClickedCheckrepo)\r
        ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)\r
        ON_BN_CLICKED(IDC_SHOWUNMODIFIED, OnBnClickedShowUnmodified)\r
-    ON_BN_CLICKED(IDC_SHOWUSERPROPS, OnBnClickedShowUserProps)\r
-       ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
-       ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnSVNStatusListCtrlItemCountChanged)\r
+//    ON_BN_CLICKED(IDC_SHOWUSERPROPS, OnBnClickedShowUserProps)\r
+       ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
+       ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnSVNStatusListCtrlItemCountChanged)\r
        ON_BN_CLICKED(IDC_SHOWIGNORED, &CChangedDlg::OnBnClickedShowignored)\r
        ON_BN_CLICKED(IDC_REFRESH, &CChangedDlg::OnBnClickedRefresh)\r
-       ON_BN_CLICKED(IDC_SHOWEXTERNALS, &CChangedDlg::OnBnClickedShowexternals)\r
+//     ON_BN_CLICKED(IDC_SHOWEXTERNALS, &CChangedDlg::OnBnClickedShowexternals)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CChangedDlg::OnInitDialog()\r
@@ -74,15 +75,11 @@ BOOL CChangedDlg::OnInitDialog()
 \r
        m_tooltips.Create(this);\r
 \r
-       m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseSVN\\AddBeforeCommit"), TRUE);\r
+       m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);\r
        m_bShowUnversioned = m_regAddBeforeCommit;\r
        UpdateData(FALSE);\r
 \r
-       m_FileListCtrl.Init(SVNSLC_COLTEXTSTATUS | SVNSLC_COLPROPSTATUS | \r
-                                               SVNSLC_COLREMOTETEXT | SVNSLC_COLREMOTEPROP | \r
-                                               SVNSLC_COLLOCK | SVNSLC_COLLOCKCOMMENT |\r
-                                               SVNSLC_COLAUTHOR | SVNSLC_COLAUTHOR |\r
-                                               SVNSLC_COLREVISION | SVNSLC_COLDATE, _T("ChangedDlg"),\r
+       m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS, _T("ChangedDlg"),\r
                                                SVNSLC_POPALL, false);\r
        m_FileListCtrl.SetCancelBool(&m_bCanceled);\r
        m_FileListCtrl.SetBackgroundImage(IDI_CFM_BKG);\r
@@ -91,26 +88,26 @@ BOOL CChangedDlg::OnInitDialog()
        AdjustControlSize(IDC_SHOWUNVERSIONED);\r
        AdjustControlSize(IDC_SHOWUNMODIFIED);\r
        AdjustControlSize(IDC_SHOWIGNORED);\r
-       AdjustControlSize(IDC_SHOWEXTERNALS);\r
-    AdjustControlSize(IDC_SHOWUSERPROPS);\r
+//     AdjustControlSize(IDC_SHOWEXTERNALS);\r
+//    AdjustControlSize(IDC_SHOWUSERPROPS);\r
 \r
        AddAnchor(IDC_CHANGEDLIST, TOP_LEFT, BOTTOM_RIGHT);\r
        AddAnchor(IDC_SUMMARYTEXT, BOTTOM_LEFT, BOTTOM_RIGHT);\r
        AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);\r
        AddAnchor(IDC_SHOWUNMODIFIED, BOTTOM_LEFT);\r
        AddAnchor(IDC_SHOWIGNORED, BOTTOM_LEFT);\r
-       AddAnchor(IDC_SHOWEXTERNALS, BOTTOM_LEFT);\r
-       AddAnchor(IDC_SHOWUSERPROPS, BOTTOM_LEFT);\r
+//     AddAnchor(IDC_SHOWEXTERNALS, BOTTOM_LEFT);\r
+//     AddAnchor(IDC_SHOWUSERPROPS, BOTTOM_LEFT);\r
        AddAnchor(IDC_INFOLABEL, BOTTOM_RIGHT);\r
        AddAnchor(IDC_REFRESH, BOTTOM_RIGHT);\r
        AddAnchor(IDC_CHECKREPO, BOTTOM_RIGHT);\r
        AddAnchor(IDOK, BOTTOM_RIGHT);\r
-       SetPromptParentWindow(m_hWnd);\r
+//     SetPromptParentWindow(m_hWnd);\r
        if (hWndExplorer)\r
                CenterWindow(CWnd::FromHandle(hWndExplorer));\r
        EnableSaveRestore(_T("ChangedDlg"));\r
 \r
-       m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\CheckRepo"), FALSE);\r
+       m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE);\r
        \r
        // first start a thread to obtain the status without\r
        // blocking the dialog\r
@@ -139,7 +136,7 @@ UINT CChangedDlg::ChangedStatusThread()
        DialogEnableWindow(IDC_SHOWIGNORED, FALSE);\r
     DialogEnableWindow(IDC_SHOWUSERPROPS, FALSE);\r
        CString temp;\r
-       if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUserProps != FALSE))\r
+       if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
        {\r
                if (!m_FileListCtrl.GetLastErrorMessage().IsEmpty())\r
                        m_FileListCtrl.SetEmptyString(m_FileListCtrl.GetLastErrorMessage());\r
@@ -152,12 +149,14 @@ UINT CChangedDlg::ChangedStatusThread()
        m_FileListCtrl.Show(dwShow);\r
        UpdateStatistics();\r
 \r
-       CTSVNPath commonDir = m_FileListCtrl.GetCommonDirectory(false);\r
+\r
+       CTGitPath commonDir = m_FileListCtrl.GetCommonDirectory(false);\r
        bool bSingleFile = ((m_pathList.GetCount()==1)&&(!m_pathList[0].IsDirectory()));\r
        if (bSingleFile)\r
                SetWindowText(m_sTitle + _T(" - ") + m_pathList[0].GetWinPathString());\r
        else\r
                SetWindowText(m_sTitle + _T(" - ") + commonDir.GetWinPathString());\r
+\r
        SetDlgItemText(IDOK, CString(MAKEINTRESOURCE(IDS_MSGBOX_OK)));\r
        DialogEnableWindow(IDC_REFRESH, TRUE);\r
        DialogEnableWindow(IDC_CHECKREPO, TRUE);\r
@@ -167,7 +166,7 @@ UINT CChangedDlg::ChangedStatusThread()
     DialogEnableWindow(IDC_SHOWUSERPROPS, TRUE);\r
        InterlockedExchange(&m_bBlock, FALSE);\r
        // revert the remote flag back to the default\r
-       m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\CheckRepo"), FALSE);\r
+       m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE);\r
        RefreshCursor();\r
        return 0;\r
 }\r
@@ -316,8 +315,10 @@ void CChangedDlg::OnBnClickedRefresh()
 \r
 void CChangedDlg::UpdateStatistics()\r
 {\r
-       LONG lMin, lMax;\r
        CString temp;\r
+#if 0\r
+       LONG lMin, lMax;\r
+       \r
        m_FileListCtrl.GetMinMaxRevisions(lMin, lMax, true, false);\r
        if (LONG(m_FileListCtrl.m_HeadRev) >= 0)\r
        {\r
@@ -329,10 +330,12 @@ void CChangedDlg::UpdateStatistics()
                temp.Format(IDS_REPOSTATUS_WCINFO, lMin, lMax);\r
                SetDlgItemText(IDC_SUMMARYTEXT, temp);\r
        }\r
+#endif\r
        temp = m_FileListCtrl.GetStatisticsString();\r
        temp.Replace(_T(" = "), _T("="));\r
        temp.Replace(_T("\n"), _T(", "));\r
        SetDlgItemText(IDC_INFOLABEL, temp);\r
+\r
 }\r
 \r
 \r