OSDN Git Service

Add Show All branch and Whole Project button at log dialog
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitLogListBase.h
index ad4a3ac..d668f14 100644 (file)
@@ -2,7 +2,7 @@
 \r
 #include "HintListCtrl.h"\r
 #include "XPTheme.h"\r
-#include "resource.h"\r
+#include "CommonResource.h"\r
 #include "Git.h"\r
 #include "ProjectProperties.h"\r
 #include "TGitPath.h"\r
@@ -63,6 +63,7 @@ public:
        CGitLogListBase();\r
        virtual ~CGitLogListBase();\r
        volatile LONG           m_bNoDispUpdates;\r
+       BOOL m_IsIDReplaceAction;\r
        BOOL m_bStrictStopped;\r
        BOOL m_bShowBugtraqColumn;\r
        BOOL m_bSearchIndex;\r
@@ -130,11 +131,14 @@ public:
        void DiffSelectedRevWithPrevious();\r
        bool IsSelectionContinuous();\r
        int  FillGitShortLog();\r
+       int  FillGitLog(CTGitPath *path,int infomask=CGit::     LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE);\r
+\r
        inline int ShownCountWithStopped() const { return (int)m_arShownList.GetCount() + (m_bStrictStopped ? 1 : 0); }\r
        int FetchLogAsync(CALLBACK_PROCESS *proc=NULL, void * data=NULL);\r
        CPtrArray                       m_arShownList;\r
        void Refresh();\r
        void RecalculateShownList(CPtrArray * pShownlist);\r
+       void Clear();\r
 \r
        int                                     m_nSelectedFilter;\r
        CLogDataVector          m_logEntries;\r
@@ -144,8 +148,25 @@ public:
        CString                         m_sFilterText;\r
        CTime                   m_From;\r
        CTime                   m_To;\r
+    \r
+    CTGitPath           m_Path;\r
+    BOOL           m_bAllBranch;\r
+\r
        void                            GetTimeRange(CTime &oldest,CTime &latest);\r
        virtual void ContextMenuAction(int cmd,int FirstSelect, int LastSelect)=0;\r
+       void ReloadHashMap()\r
+       {       \r
+               m_HashMap.clear();\r
+               g_Git.GetMapHashToFriendName(m_HashMap);\r
+       }\r
+       void TerminateThread()\r
+       {\r
+               if(this->m_LoadingThread)\r
+                       AfxTermThread((HINSTANCE)m_LoadingThread->m_hThread);\r
+       };\r
+       \r
+       volatile bool           m_bExitThread;\r
+       CWinThread*                     m_LoadingThread;\r
 protected:\r
        DECLARE_MESSAGE_MAP()\r
        afx_msg void OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult);\r
@@ -192,6 +213,10 @@ protected:
        void                            *m_ProcData;\r
        CStoreSelection*        m_pStoreSelection;\r
        MAP_HASH_NAME           m_HashMap;\r
+\r
+\r
+\r
+       \r
 };\r
 \r
 \r