show status list header bar

diff --git a/Git/GitStatusListCtrl.cpp b/Git/GitStatusListCtrl.cpp
index 9f75074..d73f24d 100644 (file)
--- a/Git/GitStatusListCtrl.cpp
+++ b/Git/GitStatusListCtrl.cpp
@@ -4564,7 +4564,7 @@ BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
                                {\r
                                        // copy all selected paths to the clipboard\r
                                        if (GetAsyncKeyState(VK_SHIFT)&0x8000)\r
                                {\r
                                        // copy all selected paths to the clipboard\r
                                        if (GetAsyncKeyState(VK_SHIFT)&0x8000)\r

-                                               CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS|SVNSLC_COLURL);\r
+                                               CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);\r

                                        else\r
                                                CopySelectedEntriesToClipboard(0);\r
                                        return TRUE;\r
                                        else\r
                                                CopySelectedEntriesToClipboard(0);\r
                                        return TRUE;\r

diff --git a/Git/GitStatusListCtrl.h b/Git/GitStatusListCtrl.h
index 7113000..bbb70d4 100644 (file)
--- a/Git/GitStatusListCtrl.h
+++ b/Git/GitStatusListCtrl.h
@@ -29,22 +29,26 @@
 #define SVNSLC_COLFILENAME                     0x000000002\r
 #define SVNSLC_COLEXT                          0x000000004\r
 #define SVNSLC_COLSTATUS                       0x000000008\r
 #define SVNSLC_COLFILENAME                     0x000000002\r
 #define SVNSLC_COLEXT                          0x000000004\r
 #define SVNSLC_COLSTATUS                       0x000000008\r

-#define SVNSLC_COLREMOTESTATUS         0x000000010\r
-#define SVNSLC_COLTEXTSTATUS           0x000000020\r
-#define SVNSLC_COLPROPSTATUS           0x000000040\r
-#define SVNSLC_COLREMOTETEXT           0x000000080\r
-#define SVNSLC_COLREMOTEPROP           0x000000100\r
-#define SVNSLC_COLURL                          0x000000200\r
-#define SVNSLC_COLLOCK                         0x000000400\r
-#define SVNSLC_COLLOCKCOMMENT          0x000000800\r
-#define SVNSLC_COLAUTHOR                       0x000001000\r
-#define        SVNSLC_COLREVISION                      0x000002000\r
-#define        SVNSLC_COLREMOTEREVISION        0x000004000\r
-#define        SVNSLC_COLDATE                          0x000009000\r
-#define SVNSLC_COLSVNNEEDSLOCK         0x000010000\r
-#define SVNSLC_COLCOPYFROM                     0x000020000\r
-#define        SVNSLC_COLMODIFICATIONDATE      0x000040000\r
-#define SVNSLC_NUMCOLUMNS              19\r
+#define SVNSLC_COLTEXTSTATUS           0x000000010\r
+#define SVNSLC_COLPROPSTATUS           0x000000020\r
+#define SVNSLC_COLAUTHOR                       0x000000040\r
+#define        SVNSLC_COLREVISION                      0x000000080\r
+#define        SVNSLC_COLDATE                          0x000000100\r
+#define        SVNSLC_COLMODIFICATIONDATE      0x000000200\r
+#define SVNSLC_NUMCOLUMNS              10\r
+\r
+//#define SVNSLC_COLREMOTESTATUS               0x000000010\r
+//#define SVNSLC_COLREMOTETEXT         0x000000080\r
+//#define SVNSLC_COLREMOTEPROP         0x000000100\r
+//#define SVNSLC_COLURL                                0x000000200\r
+//#define SVNSLC_COLLOCK                               0x000000400\r
+//#define SVNSLC_COLLOCKCOMMENT                0x000000800\r
+\r
+//#define      SVNSLC_COLREMOTEREVISION        0x000004000\r
+\r
+//#define SVNSLC_COLSVNNEEDSLOCK               0x000010000\r
+//#define SVNSLC_COLCOPYFROM                   0x000020000\r
+\r

 \r
 #define SVNSLC_SHOWUNVERSIONED 0x000000001\r
 #define SVNSLC_SHOWNORMAL              0x000000002\r
 \r
 #define SVNSLC_SHOWUNVERSIONED 0x000000001\r
 #define SVNSLC_SHOWNORMAL              0x000000002\r

diff --git a/TortoiseProc/CommitDlg.cpp b/TortoiseProc/CommitDlg.cpp
index 58ef16f..3068174 100644 (file)
--- a/TortoiseProc/CommitDlg.cpp
+++ b/TortoiseProc/CommitDlg.cpp
@@ -111,13 +111,13 @@ BOOL CCommitDlg::OnInitDialog()
 \r
        UpdateData(FALSE);\r
        \r
 \r
        UpdateData(FALSE);\r
        \r

-//     m_ListCtrl.Init(GitSLC_COLEXT | GitSLC_COLTEXTSTATUS | GitSLC_COLPROPSTATUS | GitSLC_COLLOCK, _T("CommitDlg"));\r
-//     m_ListCtrl.SetSelectButton(&m_SelectAll);\r
-//     m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));\r
-//     m_ListCtrl.SetCancelBool(&m_bCancelled);\r
-//     m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);\r
-//     m_ListCtrl.EnableFileDrop();\r
-//     m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);\r
+       m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLTEXTSTATUS , _T("CommitDlg"));\r
+       m_ListCtrl.SetSelectButton(&m_SelectAll);\r
+       m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));\r
+       m_ListCtrl.SetCancelBool(&m_bCancelled);\r
+       m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);\r
+       m_ListCtrl.EnableFileDrop();\r
+       m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);\r

        \r
 //     m_ProjectProperties.ReadPropsPathList(m_pathList);\r
        m_cLogMessage.Init(m_ProjectProperties);\r
        \r
 //     m_ProjectProperties.ReadPropsPathList(m_pathList);\r
        m_cLogMessage.Init(m_ProjectProperties);\r

diff --git a/TortoiseProc/GitStatusListCtrlHelpers.cpp b/TortoiseProc/GitStatusListCtrlHelpers.cpp
index c8e3e15..0542747 100644 (file)
--- a/TortoiseProc/GitStatusListCtrlHelpers.cpp
+++ b/TortoiseProc/GitStatusListCtrlHelpers.cpp
@@ -262,25 +262,26 @@ CString CGitStatusListCtrl::ColumnManager::GetName (int column) const
           , IDS_STATUSLIST_COLEXT\r
                  , IDS_STATUSLIST_COLSTATUS\r
 \r
           , IDS_STATUSLIST_COLEXT\r
                  , IDS_STATUSLIST_COLSTATUS\r
 \r

-                 , IDS_STATUSLIST_COLREMOTESTATUS\r
+//               , IDS_STATUSLIST_COLREMOTESTATUS\r

                  , IDS_STATUSLIST_COLTEXTSTATUS\r
                  , IDS_STATUSLIST_COLTEXTSTATUS\r

-                 , IDS_STATUSLIST_COLPROPSTATUS\r
+//               , IDS_STATUSLIST_COLPROPSTATUS\r

 \r
 \r

-                 , IDS_STATUSLIST_COLREMOTETEXTSTATUS\r
-                 , IDS_STATUSLIST_COLREMOTEPROPSTATUS\r
-                 , IDS_STATUSLIST_COLURL\r
+//               , IDS_STATUSLIST_COLREMOTETEXTSTATUS\r
+//               , IDS_STATUSLIST_COLREMOTEPROPSTATUS\r
+//               , IDS_STATUSLIST_COLURL\r

 \r
 \r

-                 , IDS_STATUSLIST_COLLOCK\r
-                 , IDS_STATUSLIST_COLLOCKCOMMENT\r
+//               , IDS_STATUSLIST_COLLOCK\r
+//               , IDS_STATUSLIST_COLLOCKCOMMENT\r

                  , IDS_STATUSLIST_COLAUTHOR\r
 \r
                  , IDS_STATUSLIST_COLREVISION\r
                  , IDS_STATUSLIST_COLAUTHOR\r
 \r
                  , IDS_STATUSLIST_COLREVISION\r

-                 , IDS_STATUSLIST_COLREMOTEREVISION\r
+//               , IDS_STATUSLIST_COLREMOTEREVISION\r

                  , IDS_STATUSLIST_COLDATE\r
                  , IDS_STATUSLIST_COLDATE\r

-                 , IDS_STATUSLIST_COLSVNLOCK\r
+//               , IDS_STATUSLIST_COLSVNLOCK\r

 \r
 \r

-                 , IDS_STATUSLIST_COLCOPYFROM\r
-          , IDS_STATUSLIST_COLMODIFICATIONDATE};\r
+//               , IDS_STATUSLIST_COLCOPYFROM\r
+          , IDS_STATUSLIST_COLMODIFICATIONDATE\r
+               };\r

 \r
     // standard columns\r
 \r
 \r
     // standard columns\r
 \r