OSDN Git Service

Merge remove x86 build
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / CommitDlg.cpp
index da34bf9..8b06ab6 100644 (file)
@@ -51,7 +51,7 @@ CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
        , m_bThreadRunning(FALSE)\r
        , m_bRunThread(FALSE)\r
        , m_pThread(NULL)\r
-       , m_bKeepLocks(FALSE)\r
+       , m_bWholeProject(FALSE)\r
        , m_bKeepChangeList(TRUE)\r
        , m_itemsCount(0)\r
        , m_bSelectFilesForCommit(TRUE)\r
@@ -74,7 +74,7 @@ void CCommitDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
        DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);\r
        DDX_Text(pDX, IDC_BUGID, m_sBugID);\r
-       DDX_Check(pDX, IDC_KEEPLOCK, m_bKeepLocks);\r
+       DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);\r
        DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
        DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
        DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);\r
@@ -113,7 +113,7 @@ BOOL CCommitDlg::OnInitDialog()
        m_bKeepChangeList = m_regKeepChangelists;\r
 \r
 //     GitConfig config;\r
-//     m_bKeepLocks = config.KeepLocks();\r
+//     m_bWholeProject = config.KeepLocks();\r
 \r
        UpdateData(FALSE);\r
        \r
@@ -199,7 +199,7 @@ BOOL CCommitDlg::OnInitDialog()
        \r
        AdjustControlSize(IDC_SHOWUNVERSIONED);\r
        AdjustControlSize(IDC_SELECTALL);\r
-       AdjustControlSize(IDC_KEEPLOCK);\r
+       AdjustControlSize(IDC_WHOLE_PROJECT);\r
 \r
        GetClientRect(m_DlgOrigRect);\r
        m_cLogMessage.GetClientRect(m_LogMsgOrigRect);\r
@@ -220,7 +220,7 @@ BOOL CCommitDlg::OnInitDialog()
        AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);\r
        AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);\r
        AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
-       AddAnchor(IDC_KEEPLOCK, BOTTOM_LEFT);\r
+       AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);\r
        AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);\r
        AddAnchor(IDOK, BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
@@ -601,8 +601,8 @@ void CCommitDlg::OnOK()
 #endif\r
        UpdateData();\r
        m_regAddBeforeCommit = m_bShowUnversioned;\r
-       if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())\r
-               m_bKeepLocks = FALSE;\r
+       if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())\r
+               m_bWholeProject = FALSE;\r
        m_regKeepChangelists = m_bKeepChangeList;\r
        if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())\r
                m_bKeepChangeList = FALSE;\r
@@ -677,7 +677,7 @@ UINT CCommitDlg::StatusThread()
 #endif\r
     // Initialise the list control with the status of the files/folders below us\r
        m_ListCtrl.Clear();\r
-       BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
+       BOOL success = m_ListCtrl.GetStatus(&m_pathList);\r
 \r
        //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
        if(this->m_bShowUnversioned)\r
@@ -750,7 +750,7 @@ UINT CCommitDlg::StatusThread()
                if (m_ListCtrl.HasChangeLists())\r
                        DialogEnableWindow(IDC_KEEPLISTS, true);\r
                if (m_ListCtrl.HasLocks())\r
-                       DialogEnableWindow(IDC_KEEPLOCK, true);\r
+                       DialogEnableWindow(IDC_WHOLE_PROJECT, true);\r
                // we have the list, now signal the main thread about it\r
                SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!\r
        }\r
@@ -894,7 +894,7 @@ void CCommitDlg::OnBnClickedShowunversioned()
                        dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
                if(dwShow & SVNSLC_SHOWUNVERSIONED)\r
                {\r
-                       m_ListCtrl.GetStatus(this->m_pathList,false,false,true);\r
+                       m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);\r
                }\r
                m_ListCtrl.Show(dwShow);\r
        }\r