From c7aeaf79755d3ddbdf4e86e1aebfdf1f45f2fad4 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sun, 11 Jan 2009 15:21:37 +0800 Subject: [PATCH] Show Column at Log List Signed-off-by: Frank Li --- src/Resources/TortoiseGitBlame.rc | 27 +++++++++------- src/Resources/TortoiseGitBlame.rc2 | 13 +++++++- src/TortoiseGitBlame/MainFrm.cpp | 2 +- src/TortoiseGitBlame/OutputWnd.cpp | 51 ++++++++++++++++++++----------- src/TortoiseGitBlame/OutputWnd.h | 8 +++-- src/TortoiseGitBlame/Resource.h | 35 +++++++++++++-------- src/TortoiseGitBlame/TortoiseGitBlame.cpp | 2 +- src/TortoiseProc/GitLogListBase.cpp | 2 ++ 8 files changed, 93 insertions(+), 47 deletions(-) diff --git a/src/Resources/TortoiseGitBlame.rc b/src/Resources/TortoiseGitBlame.rc index 9bc44d5..1c5fdb3 100644 --- a/src/Resources/TortoiseGitBlame.rc +++ b/src/Resources/TortoiseGitBlame.rc @@ -1,6 +1,6 @@ //Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "..\\TortoiseGitBlame\resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -69,7 +69,7 @@ END #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE 9, 1 #pragma code_page(1252) -IDR_MAINFRAME ICON "res\\TortoiseGitBlame.ico" +IDR_TORTOISE_GIT_BLAME_MAINFRAME ICON "res\\TortoiseGitBlame.ico" IDR_TortoiseGitBlamTYPE ICON "res\\TortoiseGitBlameDoc.ico" #endif IDI_OUTPUT_WND ICON "res\\output_wnd.ico" @@ -81,9 +81,9 @@ IDI_PROPERTIES_WND_HC ICON "res\\properties_wnd_hc.ico" // // Bitmap // - -IDR_MAINFRAME BITMAP "res\\Toolbar.bmp" -IDR_MAINFRAME_256 BITMAP "res\\Toolbar256.bmp" + +IDR_TORTOISE_GIT_BLAME_MAINFRAME BITMAP "res\\Toolbar.bmp" +IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 BITMAP "res\\Toolbar256.bmp" IDR_PROPERTIES BITMAP "res\\properties.bmp" IDB_PROPERTIES_HC BITMAP "res\\properties_hc.bmp" @@ -92,7 +92,7 @@ IDB_PROPERTIES_HC BITMAP "res\\properties_hc.bmp" // Toolbar // -IDR_MAINFRAME TOOLBAR 16, 16 +IDR_TORTOISE_GIT_BLAME_MAINFRAME TOOLBAR 16, 16 BEGIN BUTTON ID_FILE_NEW BUTTON ID_FILE_OPEN @@ -107,7 +107,7 @@ BEGIN BUTTON ID_CONTEXT_HELP END -IDR_MAINFRAME_256 TOOLBAR 16, 16 +IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 TOOLBAR 16, 16 BEGIN BUTTON ID_FILE_NEW BUTTON ID_FILE_OPEN @@ -139,7 +139,7 @@ LANGUAGE 9, 1 // Menu // -IDR_MAINFRAME MENU +IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU BEGIN POPUP "&File" BEGIN @@ -231,7 +231,7 @@ END // Accelerator // -IDR_MAINFRAME ACCELERATORS +IDR_TORTOISE_GIT_BLAME_MAINFRAME ACCELERATORS BEGIN "N", ID_FILE_NEW, VIRTKEY,CONTROL "O", ID_FILE_OPEN, VIRTKEY,CONTROL @@ -264,7 +264,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "About TortoiseGitBlame" FONT 8, "MS Shell Dlg" BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,14,14,21,20 + ICON IDR_TORTOISE_GIT_BLAME_MAINFRAME,IDC_STATIC,14,14,21,20 LTEXT "TortoiseGitBlame, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,42,26,114,8 DEFPUSHBUTTON "OK",IDOK,113,41,50,14,WS_GROUP @@ -340,7 +340,7 @@ END STRINGTABLE BEGIN // Non-mac-targeting apps remove the two extra substrings - IDR_MAINFRAME "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" + IDR_TORTOISE_GIT_BLAME_MAINFRAME "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" END STRINGTABLE @@ -438,6 +438,11 @@ BEGIN IDS_PROPERTIES_WND "Properties" IDS_EDIT_MENU "Edit" END + +STRINGTABLE +BEGIN + IDS_GIT_LOG_TAB "Git Log" +END #endif #ifndef APSTUDIO_INVOKED diff --git a/src/Resources/TortoiseGitBlame.rc2 b/src/Resources/TortoiseGitBlame.rc2 index ad97f6e..b0a80df 100644 --- a/src/Resources/TortoiseGitBlame.rc2 +++ b/src/Resources/TortoiseGitBlame.rc2 @@ -12,5 +12,16 @@ ///////////////////////////////////////////////////////////////////////////// #include "..\version.h" -//#include "..\\TortoiseShell\\resourceshell.rc" +#include "..\\TortoiseShell\\resourceshell.rc" ///////////////////////////////////////////////////////////////////////////// +STRINGTABLE +BEGIN + IDS_LOG_GRAPH "Graph" + IDS_LOG_ACTIONS "Actions" + IDS_LOG_MESSAGE "Message" + IDS_LOG_REVISION "Revision" + IDS_LOG_AUTHOR "Author" + IDS_LOG_DATE "Date" + IDS_LOG_BUGIDS "Bug-ID" +END + diff --git a/src/TortoiseGitBlame/MainFrm.cpp b/src/TortoiseGitBlame/MainFrm.cpp index 236010d..0133460 100644 --- a/src/TortoiseGitBlame/MainFrm.cpp +++ b/src/TortoiseGitBlame/MainFrm.cpp @@ -73,7 +73,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) CMFCPopupMenu::SetForceMenuFocus(FALSE); if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || - !m_wndToolBar.LoadToolBar(theApp.m_bHiColorIcons ? IDR_MAINFRAME_256 : IDR_MAINFRAME)) + !m_wndToolBar.LoadToolBar(theApp.m_bHiColorIcons ? IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 : IDR_TORTOISE_GIT_BLAME_MAINFRAME)) { TRACE0("Failed to create toolbar\n"); return -1; // fail to create diff --git a/src/TortoiseGitBlame/OutputWnd.cpp b/src/TortoiseGitBlame/OutputWnd.cpp index fa17a70..ba5b681 100644 --- a/src/TortoiseGitBlame/OutputWnd.cpp +++ b/src/TortoiseGitBlame/OutputWnd.cpp @@ -45,8 +45,15 @@ int COutputWnd::OnCreate(LPCREATESTRUCT lpCreateStruct) } // Create output panes: - const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL; + //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL; + const DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP; + if (! m_LogList.Create(dwStyle,rectDummy,&m_wndTabs,2) ) + { + TRACE0("Failed to create output windows\n"); + return -1; // fail to create + } +#if 0 if (!m_wndOutputBuild.Create(dwStyle, rectDummy, &m_wndTabs, 2) || !m_wndOutputDebug.Create(dwStyle, rectDummy, &m_wndTabs, 3) || !m_wndOutputFind.Create(dwStyle, rectDummy, &m_wndTabs, 4)) @@ -54,29 +61,39 @@ int COutputWnd::OnCreate(LPCREATESTRUCT lpCreateStruct) TRACE0("Failed to create output windows\n"); return -1; // fail to create } +#endif - m_wndOutputBuild.SetFont(&m_Font); - m_wndOutputDebug.SetFont(&m_Font); - m_wndOutputFind.SetFont(&m_Font); + m_LogList.SetFont(&m_Font); + //m_wndOutputBuild.SetFont(&m_Font); + //m_wndOutputDebug.SetFont(&m_Font); + //m_wndOutputFind.SetFont(&m_Font); CString strTabName; BOOL bNameValid; // Attach list windows to tab: - bNameValid = strTabName.LoadString(IDS_BUILD_TAB); + bNameValid = strTabName.LoadString(IDS_GIT_LOG_TAB); ASSERT(bNameValid); - m_wndTabs.AddTab(&m_wndOutputBuild, strTabName, (UINT)0); + + m_wndTabs.AddTab(&m_LogList, strTabName, (UINT)0); + + m_LogList.DeleteAllItems(); + m_LogList.InsertGitColumn(); + + +#if 0 bNameValid = strTabName.LoadString(IDS_DEBUG_TAB); ASSERT(bNameValid); m_wndTabs.AddTab(&m_wndOutputDebug, strTabName, (UINT)1); bNameValid = strTabName.LoadString(IDS_FIND_TAB); ASSERT(bNameValid); m_wndTabs.AddTab(&m_wndOutputFind, strTabName, (UINT)2); +#endif; // Fill output tabs with some dummy text (nothing magic here) FillBuildWindow(); - FillDebugWindow(); - FillFindWindow(); +// FillDebugWindow(); +// FillFindWindow(); return 0; } @@ -110,23 +127,23 @@ void COutputWnd::AdjustHorzScroll(CListBox& wndListBox) void COutputWnd::FillBuildWindow() { - m_wndOutputBuild.AddString(_T("Build output is being displayed here.")); - m_wndOutputBuild.AddString(_T("The output is being displayed in rows of a list view")); - m_wndOutputBuild.AddString(_T("but you can change the way it is displayed as you wish...")); +// m_wndOutputBuild.AddString(_T("Build output is being displayed here.")); +// m_wndOutputBuild.AddString(_T("The output is being displayed in rows of a list view")); +// m_wndOutputBuild.AddString(_T("but you can change the way it is displayed as you wish...")); } void COutputWnd::FillDebugWindow() { - m_wndOutputDebug.AddString(_T("Debug output is being displayed here.")); - m_wndOutputDebug.AddString(_T("The output is being displayed in rows of a list view")); - m_wndOutputDebug.AddString(_T("but you can change the way it is displayed as you wish...")); +// m_wndOutputDebug.AddString(_T("Debug output is being displayed here.")); +// m_wndOutputDebug.AddString(_T("The output is being displayed in rows of a list view")); +// m_wndOutputDebug.AddString(_T("but you can change the way it is displayed as you wish...")); } void COutputWnd::FillFindWindow() { - m_wndOutputFind.AddString(_T("Find output is being displayed here.")); - m_wndOutputFind.AddString(_T("The output is being displayed in rows of a list view")); - m_wndOutputFind.AddString(_T("but you can change the way it is displayed as you wish...")); +// m_wndOutputFind.AddString(_T("Find output is being displayed here.")); +// m_wndOutputFind.AddString(_T("The output is being displayed in rows of a list view")); +// m_wndOutputFind.AddString(_T("but you can change the way it is displayed as you wish...")); } ///////////////////////////////////////////////////////////////////////////// diff --git a/src/TortoiseGitBlame/OutputWnd.h b/src/TortoiseGitBlame/OutputWnd.h index 868bcbb..33983cb 100644 --- a/src/TortoiseGitBlame/OutputWnd.h +++ b/src/TortoiseGitBlame/OutputWnd.h @@ -1,6 +1,7 @@ #pragma once +#include "GitBlameLogList.h" ///////////////////////////////////////////////////////////////////////////// // COutputList window @@ -35,9 +36,10 @@ protected: CMFCTabCtrl m_wndTabs; - COutputList m_wndOutputBuild; - COutputList m_wndOutputDebug; - COutputList m_wndOutputFind; + CGitBlameLogList m_LogList; +// COutputList m_wndOutputBuild; +// COutputList m_wndOutputDebug; +// COutputList m_wndOutputFind; protected: void FillBuildWindow(); diff --git a/src/TortoiseGitBlame/Resource.h b/src/TortoiseGitBlame/Resource.h index 2454b26..b35d269 100644 --- a/src/TortoiseGitBlame/Resource.h +++ b/src/TortoiseGitBlame/Resource.h @@ -7,22 +7,22 @@ #define IDR_POPUP_EDIT 119 #define ID_STATUSBAR_PANE1 120 #define ID_STATUSBAR_PANE2 121 -#define IDS_STATUS_PANE1 122 -#define IDS_STATUS_PANE2 123 -#define IDS_TOOLBAR_STANDARD 124 -#define IDS_TOOLBAR_CUSTOMIZE 125 +#define IDS_STATUS_PANE1 20122 +#define IDS_STATUS_PANE2 20123 +#define IDS_TOOLBAR_STANDARD 20124 +#define IDS_TOOLBAR_CUSTOMIZE 20125 #define ID_VIEW_CUSTOMIZE 126 -#define IDR_MAINFRAME 128 -#define IDR_MAINFRAME_256 129 -#define IDR_TortoiseGitBlamTYPE 130 +#define IDR_TORTOISE_GIT_BLAME_MAINFRAME 1 +#define IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 2 +#define IDR_TortoiseGitBlamTYPE 130 #define ID_VIEW_OUTPUTWND 149 #define ID_VIEW_PROPERTIESWND 150 #define ID_SORTPROPERTIES 151 #define ID_PROPERTIES1 152 #define ID_PROPERTIES2 153 #define ID_EXPAND_ALL 154 -#define IDS_OUTPUT_WND 157 -#define IDS_PROPERTIES_WND 158 +#define IDS_OUTPUT_WND 20157 +#define IDS_PROPERTIES_WND 20158 #define IDI_OUTPUT_WND 165 #define IDI_OUTPUT_WND_HC 166 #define IDI_PROPERTIES_WND 167 @@ -41,11 +41,20 @@ #define ID_VIEW_APPLOOK_OFF_2007_BLACK 216 #define ID_VIEW_APPLOOK_OFF_2007_SILVER 217 #define ID_VIEW_APPLOOK_OFF_2007_AQUA 218 -#define IDS_BUILD_TAB 300 -#define IDS_DEBUG_TAB 301 -#define IDS_FIND_TAB 302 -#define IDS_EDIT_MENU 306 +#define IDS_BUILD_TAB 20300 +#define IDS_DEBUG_TAB 20301 +#define IDS_FIND_TAB 20302 +#define IDS_EDIT_MENU 20306 +#define IDS_GIT_LOG_TAB 20307 + +#define IDS_LOG_GRAPH 1184 +#define IDS_LOG_ACTIONS 1870 +#define IDS_LOG_MESSAGE 1207 +#define IDS_LOG_AUTHOR 1209 +#define IDS_LOG_DATE 1210 +#define IDS_LOG_REVISION 1208 +#define IDS_LOG_BUGIDS 1840 // Next default values for new objects // #ifdef APSTUDIO_INVOKED diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.cpp b/src/TortoiseGitBlame/TortoiseGitBlame.cpp index 59c9d19..e26dbd9 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.cpp +++ b/src/TortoiseGitBlame/TortoiseGitBlame.cpp @@ -92,7 +92,7 @@ BOOL CTortoiseGitBlameApp::InitInstance() // serve as the connection between documents, frame windows and views CSingleDocTemplate* pDocTemplate; pDocTemplate = new CSingleDocTemplate( - IDR_MAINFRAME, + IDR_TORTOISE_GIT_BLAME_MAINFRAME, RUNTIME_CLASS(CTortoiseGitBlameDoc), RUNTIME_CLASS(CMainFrame), // main SDI frame window RUNTIME_CLASS(CTortoiseGitBlameView)); diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index d6ee45a..62250c0 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -67,6 +67,8 @@ CGitLogListBase::CGitLogListBase():CHintListCtrl() GetObject(hFont, sizeof(LOGFONT), &lf); lf.lfWeight = FW_BOLD; m_boldFont = CreateFontIndirect(&lf); + + m_bShowBugtraqColumn=0; m_wcRev.m_CommitHash=GIT_REV_ZERO; m_wcRev.m_Subject=_T("Working Copy"); -- 2.11.0