OSDN Git Service

Fix Commit Dialog and Log Dialog default column is wrong
authorFrank Li <lznuaa@gmail.com>
Fri, 6 Mar 2009 14:24:58 +0000 (22:24 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 6 Mar 2009 14:24:58 +0000 (22:24 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/GitStatusListCtrl.cpp
src/TortoiseProc/GitStatusListCtrlHelpers.cpp
src/TortoiseProc/LogDlg.cpp

index a8e4e56..f0dae49 100644 (file)
@@ -1426,7 +1426,7 @@ int CGitStatusListCtrl::GetColumnIndex(int mask)
        int i=0;\r
        for(i=0;i<32;i++)\r
                if(mask&0x1)\r
-                       return i-1;\r
+                       return i;\r
                else\r
                        mask=mask>>1;\r
        return -1;\r
index 0411791..348f28e 100644 (file)
@@ -264,7 +264,7 @@ CString CGitStatusListCtrl::ColumnManager::GetName (int column) const
 \r
 //               , IDS_STATUSLIST_COLREMOTESTATUS\r
                  , IDS_STATUSLIST_COLTEXTSTATUS\r
-//               , IDS_STATUSLIST_COLPROPSTATUS\r
+                 , IDS_STATUSLIST_COLPROPSTATUS\r
 \r
 //               , IDS_STATUSLIST_COLREMOTETEXTSTATUS\r
 //               , IDS_STATUSLIST_COLREMOTEPROPSTATUS\r
index b2ffa36..c2b5dbe 100644 (file)
@@ -210,7 +210,7 @@ BOOL CLogDlg::OnInitDialog()
        m_LogList.DeleteAllItems();\r
        m_LogList.InsertGitColumn();\r
 \r
-       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ (SVNSLC_POPCOMMIT|SVNSLC_POPREVERT)),false);\r
+       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ (SVNSLC_POPCOMMIT|SVNSLC_POPREVERT)),false);\r
 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r