From: Frank Li Date: Thu, 13 Nov 2008 06:37:37 +0000 (+0800) Subject: show status list header bar X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=9a6b2311bab4fbc22a30cbbc8ed3223a89faaa3a;hp=7eebb5de3999bcc7ba15ba598d0cf54179c2e47c show status list header bar --- diff --git a/Git/GitStatusListCtrl.cpp b/Git/GitStatusListCtrl.cpp index 9f75074..d73f24d 100644 --- a/Git/GitStatusListCtrl.cpp +++ b/Git/GitStatusListCtrl.cpp @@ -4564,7 +4564,7 @@ BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg) { // copy all selected paths to the clipboard if (GetAsyncKeyState(VK_SHIFT)&0x8000) - CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS|SVNSLC_COLURL); + CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS); else CopySelectedEntriesToClipboard(0); return TRUE; diff --git a/Git/GitStatusListCtrl.h b/Git/GitStatusListCtrl.h index 7113000..bbb70d4 100644 --- a/Git/GitStatusListCtrl.h +++ b/Git/GitStatusListCtrl.h @@ -29,22 +29,26 @@ #define SVNSLC_COLFILENAME 0x000000002 #define SVNSLC_COLEXT 0x000000004 #define SVNSLC_COLSTATUS 0x000000008 -#define SVNSLC_COLREMOTESTATUS 0x000000010 -#define SVNSLC_COLTEXTSTATUS 0x000000020 -#define SVNSLC_COLPROPSTATUS 0x000000040 -#define SVNSLC_COLREMOTETEXT 0x000000080 -#define SVNSLC_COLREMOTEPROP 0x000000100 -#define SVNSLC_COLURL 0x000000200 -#define SVNSLC_COLLOCK 0x000000400 -#define SVNSLC_COLLOCKCOMMENT 0x000000800 -#define SVNSLC_COLAUTHOR 0x000001000 -#define SVNSLC_COLREVISION 0x000002000 -#define SVNSLC_COLREMOTEREVISION 0x000004000 -#define SVNSLC_COLDATE 0x000009000 -#define SVNSLC_COLSVNNEEDSLOCK 0x000010000 -#define SVNSLC_COLCOPYFROM 0x000020000 -#define SVNSLC_COLMODIFICATIONDATE 0x000040000 -#define SVNSLC_NUMCOLUMNS 19 +#define SVNSLC_COLTEXTSTATUS 0x000000010 +#define SVNSLC_COLPROPSTATUS 0x000000020 +#define SVNSLC_COLAUTHOR 0x000000040 +#define SVNSLC_COLREVISION 0x000000080 +#define SVNSLC_COLDATE 0x000000100 +#define SVNSLC_COLMODIFICATIONDATE 0x000000200 +#define SVNSLC_NUMCOLUMNS 10 + +//#define SVNSLC_COLREMOTESTATUS 0x000000010 +//#define SVNSLC_COLREMOTETEXT 0x000000080 +//#define SVNSLC_COLREMOTEPROP 0x000000100 +//#define SVNSLC_COLURL 0x000000200 +//#define SVNSLC_COLLOCK 0x000000400 +//#define SVNSLC_COLLOCKCOMMENT 0x000000800 + +//#define SVNSLC_COLREMOTEREVISION 0x000004000 + +//#define SVNSLC_COLSVNNEEDSLOCK 0x000010000 +//#define SVNSLC_COLCOPYFROM 0x000020000 + #define SVNSLC_SHOWUNVERSIONED 0x000000001 #define SVNSLC_SHOWNORMAL 0x000000002 diff --git a/TortoiseProc/CommitDlg.cpp b/TortoiseProc/CommitDlg.cpp index 58ef16f..3068174 100644 --- a/TortoiseProc/CommitDlg.cpp +++ b/TortoiseProc/CommitDlg.cpp @@ -111,13 +111,13 @@ BOOL CCommitDlg::OnInitDialog() UpdateData(FALSE); -// m_ListCtrl.Init(GitSLC_COLEXT | GitSLC_COLTEXTSTATUS | GitSLC_COLPROPSTATUS | GitSLC_COLLOCK, _T("CommitDlg")); -// m_ListCtrl.SetSelectButton(&m_SelectAll); -// m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS)); -// m_ListCtrl.SetCancelBool(&m_bCancelled); -// m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT); -// m_ListCtrl.EnableFileDrop(); -// m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG); + m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLTEXTSTATUS , _T("CommitDlg")); + m_ListCtrl.SetSelectButton(&m_SelectAll); + m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS)); + m_ListCtrl.SetCancelBool(&m_bCancelled); + m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT); + m_ListCtrl.EnableFileDrop(); + m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG); // m_ProjectProperties.ReadPropsPathList(m_pathList); m_cLogMessage.Init(m_ProjectProperties); diff --git a/TortoiseProc/GitStatusListCtrlHelpers.cpp b/TortoiseProc/GitStatusListCtrlHelpers.cpp index c8e3e15..0542747 100644 --- a/TortoiseProc/GitStatusListCtrlHelpers.cpp +++ b/TortoiseProc/GitStatusListCtrlHelpers.cpp @@ -262,25 +262,26 @@ CString CGitStatusListCtrl::ColumnManager::GetName (int column) const , IDS_STATUSLIST_COLEXT , IDS_STATUSLIST_COLSTATUS - , IDS_STATUSLIST_COLREMOTESTATUS +// , IDS_STATUSLIST_COLREMOTESTATUS , IDS_STATUSLIST_COLTEXTSTATUS - , IDS_STATUSLIST_COLPROPSTATUS +// , IDS_STATUSLIST_COLPROPSTATUS - , IDS_STATUSLIST_COLREMOTETEXTSTATUS - , IDS_STATUSLIST_COLREMOTEPROPSTATUS - , IDS_STATUSLIST_COLURL +// , IDS_STATUSLIST_COLREMOTETEXTSTATUS +// , IDS_STATUSLIST_COLREMOTEPROPSTATUS +// , IDS_STATUSLIST_COLURL - , IDS_STATUSLIST_COLLOCK - , IDS_STATUSLIST_COLLOCKCOMMENT +// , IDS_STATUSLIST_COLLOCK +// , IDS_STATUSLIST_COLLOCKCOMMENT , IDS_STATUSLIST_COLAUTHOR , IDS_STATUSLIST_COLREVISION - , IDS_STATUSLIST_COLREMOTEREVISION +// , IDS_STATUSLIST_COLREMOTEREVISION , IDS_STATUSLIST_COLDATE - , IDS_STATUSLIST_COLSVNLOCK +// , IDS_STATUSLIST_COLSVNLOCK - , IDS_STATUSLIST_COLCOPYFROM - , IDS_STATUSLIST_COLMODIFICATIONDATE}; +// , IDS_STATUSLIST_COLCOPYFROM + , IDS_STATUSLIST_COLMODIFICATIONDATE + }; // standard columns