//Microsoft Visual C++ generated resource script.\r
//\r
-#include "resource.h"\r
+#include "..\\TortoiseGitBlame\resource.h"\r
\r
#define APSTUDIO_READONLY_SYMBOLS\r
/////////////////////////////////////////////////////////////////////////////\r
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
LANGUAGE 9, 1\r
#pragma code_page(1252)\r
-IDR_MAINFRAME ICON "res\\TortoiseGitBlame.ico"\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME ICON "res\\TortoiseGitBlame.ico"\r
IDR_TortoiseGitBlamTYPE ICON "res\\TortoiseGitBlameDoc.ico"\r
#endif\r
IDI_OUTPUT_WND ICON "res\\output_wnd.ico"\r
//\r
// Bitmap\r
//\r
-\r
-IDR_MAINFRAME BITMAP "res\\Toolbar.bmp"\r
-IDR_MAINFRAME_256 BITMAP "res\\Toolbar256.bmp"\r
+ \r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME BITMAP "res\\Toolbar.bmp"\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 BITMAP "res\\Toolbar256.bmp"\r
IDR_PROPERTIES BITMAP "res\\properties.bmp"\r
IDB_PROPERTIES_HC BITMAP "res\\properties_hc.bmp"\r
\r
// Toolbar\r
//\r
\r
-IDR_MAINFRAME TOOLBAR 16, 16\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME TOOLBAR 16, 16\r
BEGIN\r
BUTTON ID_FILE_NEW\r
BUTTON ID_FILE_OPEN\r
BUTTON ID_CONTEXT_HELP\r
END\r
\r
-IDR_MAINFRAME_256 TOOLBAR 16, 16\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 TOOLBAR 16, 16\r
BEGIN\r
BUTTON ID_FILE_NEW\r
BUTTON ID_FILE_OPEN\r
// Menu\r
//\r
\r
-IDR_MAINFRAME MENU\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU\r
BEGIN\r
POPUP "&File"\r
BEGIN\r
// Accelerator\r
//\r
\r
-IDR_MAINFRAME ACCELERATORS\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME ACCELERATORS\r
BEGIN\r
"N", ID_FILE_NEW, VIRTKEY,CONTROL\r
"O", ID_FILE_OPEN, VIRTKEY,CONTROL\r
CAPTION "About TortoiseGitBlame"\r
FONT 8, "MS Shell Dlg"\r
BEGIN\r
- ICON IDR_MAINFRAME,IDC_STATIC,14,14,21,20\r
+ ICON IDR_TORTOISE_GIT_BLAME_MAINFRAME,IDC_STATIC,14,14,21,20\r
LTEXT "TortoiseGitBlame, Version 1.0",IDC_STATIC,42,14,114,8,SS_NOPREFIX\r
LTEXT "Copyright (C) 2009",IDC_STATIC,42,26,114,8\r
DEFPUSHBUTTON "OK",IDOK,113,41,50,14,WS_GROUP\r
STRINGTABLE\r
BEGIN\r
// Non-mac-targeting apps remove the two extra substrings\r
- IDR_MAINFRAME "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document"\r
+ IDR_TORTOISE_GIT_BLAME_MAINFRAME "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document"\r
\r
END\r
STRINGTABLE\r
IDS_PROPERTIES_WND "Properties"\r
IDS_EDIT_MENU "Edit"\r
END\r
+\r
+STRINGTABLE\r
+BEGIN\r
+ IDS_GIT_LOG_TAB "Git Log"\r
+END\r
#endif\r
\r
#ifndef APSTUDIO_INVOKED\r
\r
/////////////////////////////////////////////////////////////////////////////\r
#include "..\version.h"\r
-//#include "..\\TortoiseShell\\resourceshell.rc"\r
+#include "..\\TortoiseShell\\resourceshell.rc"\r
/////////////////////////////////////////////////////////////////////////////\r
+STRINGTABLE \r
+BEGIN\r
+ IDS_LOG_GRAPH "Graph"\r
+ IDS_LOG_ACTIONS "Actions"\r
+ IDS_LOG_MESSAGE "Message"\r
+ IDS_LOG_REVISION "Revision"\r
+ IDS_LOG_AUTHOR "Author"\r
+ IDS_LOG_DATE "Date"\r
+ IDS_LOG_BUGIDS "Bug-ID"\r
+END\r
+\r
CMFCPopupMenu::SetForceMenuFocus(FALSE);\r
\r
if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) ||\r
- !m_wndToolBar.LoadToolBar(theApp.m_bHiColorIcons ? IDR_MAINFRAME_256 : IDR_MAINFRAME))\r
+ !m_wndToolBar.LoadToolBar(theApp.m_bHiColorIcons ? IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 : IDR_TORTOISE_GIT_BLAME_MAINFRAME))\r
{\r
TRACE0("Failed to create toolbar\n");\r
return -1; // fail to create\r
}\r
\r
// Create output panes:\r
- const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;\r
+ //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;\r
+ const DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;\r
\r
+ if (! m_LogList.Create(dwStyle,rectDummy,&m_wndTabs,2) )\r
+ {\r
+ TRACE0("Failed to create output windows\n");\r
+ return -1; // fail to create\r
+ }\r
+#if 0\r
if (!m_wndOutputBuild.Create(dwStyle, rectDummy, &m_wndTabs, 2) ||\r
!m_wndOutputDebug.Create(dwStyle, rectDummy, &m_wndTabs, 3) ||\r
!m_wndOutputFind.Create(dwStyle, rectDummy, &m_wndTabs, 4))\r
TRACE0("Failed to create output windows\n");\r
return -1; // fail to create\r
}\r
+#endif\r
\r
- m_wndOutputBuild.SetFont(&m_Font);\r
- m_wndOutputDebug.SetFont(&m_Font);\r
- m_wndOutputFind.SetFont(&m_Font);\r
+ m_LogList.SetFont(&m_Font);\r
+ //m_wndOutputBuild.SetFont(&m_Font);\r
+ //m_wndOutputDebug.SetFont(&m_Font);\r
+ //m_wndOutputFind.SetFont(&m_Font);\r
\r
CString strTabName;\r
BOOL bNameValid;\r
\r
// Attach list windows to tab:\r
- bNameValid = strTabName.LoadString(IDS_BUILD_TAB);\r
+ bNameValid = strTabName.LoadString(IDS_GIT_LOG_TAB);\r
ASSERT(bNameValid);\r
- m_wndTabs.AddTab(&m_wndOutputBuild, strTabName, (UINT)0);\r
+\r
+ m_wndTabs.AddTab(&m_LogList, strTabName, (UINT)0);\r
+\r
+ m_LogList.DeleteAllItems();\r
+ m_LogList.InsertGitColumn();\r
+\r
+\r
+#if 0\r
bNameValid = strTabName.LoadString(IDS_DEBUG_TAB);\r
ASSERT(bNameValid);\r
m_wndTabs.AddTab(&m_wndOutputDebug, strTabName, (UINT)1);\r
bNameValid = strTabName.LoadString(IDS_FIND_TAB);\r
ASSERT(bNameValid);\r
m_wndTabs.AddTab(&m_wndOutputFind, strTabName, (UINT)2);\r
+#endif;\r
\r
// Fill output tabs with some dummy text (nothing magic here)\r
FillBuildWindow();\r
- FillDebugWindow();\r
- FillFindWindow();\r
+// FillDebugWindow();\r
+// FillFindWindow();\r
\r
return 0;\r
}\r
\r
void COutputWnd::FillBuildWindow()\r
{\r
- m_wndOutputBuild.AddString(_T("Build output is being displayed here."));\r
- m_wndOutputBuild.AddString(_T("The output is being displayed in rows of a list view"));\r
- m_wndOutputBuild.AddString(_T("but you can change the way it is displayed as you wish..."));\r
+// m_wndOutputBuild.AddString(_T("Build output is being displayed here."));\r
+// m_wndOutputBuild.AddString(_T("The output is being displayed in rows of a list view"));\r
+// m_wndOutputBuild.AddString(_T("but you can change the way it is displayed as you wish..."));\r
}\r
\r
void COutputWnd::FillDebugWindow()\r
{\r
- m_wndOutputDebug.AddString(_T("Debug output is being displayed here."));\r
- m_wndOutputDebug.AddString(_T("The output is being displayed in rows of a list view"));\r
- m_wndOutputDebug.AddString(_T("but you can change the way it is displayed as you wish..."));\r
+// m_wndOutputDebug.AddString(_T("Debug output is being displayed here."));\r
+// m_wndOutputDebug.AddString(_T("The output is being displayed in rows of a list view"));\r
+// m_wndOutputDebug.AddString(_T("but you can change the way it is displayed as you wish..."));\r
}\r
\r
void COutputWnd::FillFindWindow()\r
{\r
- m_wndOutputFind.AddString(_T("Find output is being displayed here."));\r
- m_wndOutputFind.AddString(_T("The output is being displayed in rows of a list view"));\r
- m_wndOutputFind.AddString(_T("but you can change the way it is displayed as you wish..."));\r
+// m_wndOutputFind.AddString(_T("Find output is being displayed here."));\r
+// m_wndOutputFind.AddString(_T("The output is being displayed in rows of a list view"));\r
+// m_wndOutputFind.AddString(_T("but you can change the way it is displayed as you wish..."));\r
}\r
\r
/////////////////////////////////////////////////////////////////////////////\r
\r
#pragma once\r
\r
+#include "GitBlameLogList.h"\r
/////////////////////////////////////////////////////////////////////////////\r
// COutputList window\r
\r
\r
CMFCTabCtrl m_wndTabs;\r
\r
- COutputList m_wndOutputBuild;\r
- COutputList m_wndOutputDebug;\r
- COutputList m_wndOutputFind;\r
+ CGitBlameLogList m_LogList;\r
+// COutputList m_wndOutputBuild;\r
+// COutputList m_wndOutputDebug;\r
+// COutputList m_wndOutputFind;\r
\r
protected:\r
void FillBuildWindow();\r
#define IDR_POPUP_EDIT 119\r
#define ID_STATUSBAR_PANE1 120\r
#define ID_STATUSBAR_PANE2 121\r
-#define IDS_STATUS_PANE1 122\r
-#define IDS_STATUS_PANE2 123\r
-#define IDS_TOOLBAR_STANDARD 124\r
-#define IDS_TOOLBAR_CUSTOMIZE 125\r
+#define IDS_STATUS_PANE1 20122\r
+#define IDS_STATUS_PANE2 20123\r
+#define IDS_TOOLBAR_STANDARD 20124\r
+#define IDS_TOOLBAR_CUSTOMIZE 20125\r
#define ID_VIEW_CUSTOMIZE 126\r
-#define IDR_MAINFRAME 128\r
-#define IDR_MAINFRAME_256 129\r
-#define IDR_TortoiseGitBlamTYPE 130\r
+#define IDR_TORTOISE_GIT_BLAME_MAINFRAME 1\r
+#define IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 2\r
+#define IDR_TortoiseGitBlamTYPE 130\r
#define ID_VIEW_OUTPUTWND 149\r
#define ID_VIEW_PROPERTIESWND 150\r
#define ID_SORTPROPERTIES 151\r
#define ID_PROPERTIES1 152\r
#define ID_PROPERTIES2 153\r
#define ID_EXPAND_ALL 154\r
-#define IDS_OUTPUT_WND 157\r
-#define IDS_PROPERTIES_WND 158\r
+#define IDS_OUTPUT_WND 20157\r
+#define IDS_PROPERTIES_WND 20158\r
#define IDI_OUTPUT_WND 165\r
#define IDI_OUTPUT_WND_HC 166\r
#define IDI_PROPERTIES_WND 167\r
#define ID_VIEW_APPLOOK_OFF_2007_BLACK 216\r
#define ID_VIEW_APPLOOK_OFF_2007_SILVER 217\r
#define ID_VIEW_APPLOOK_OFF_2007_AQUA 218\r
-#define IDS_BUILD_TAB 300\r
-#define IDS_DEBUG_TAB 301\r
-#define IDS_FIND_TAB 302\r
-#define IDS_EDIT_MENU 306\r
+#define IDS_BUILD_TAB 20300\r
+#define IDS_DEBUG_TAB 20301\r
+#define IDS_FIND_TAB 20302\r
+#define IDS_EDIT_MENU 20306\r
+#define IDS_GIT_LOG_TAB 20307\r
\r
+\r
+#define IDS_LOG_GRAPH 1184\r
+#define IDS_LOG_ACTIONS 1870\r
+#define IDS_LOG_MESSAGE 1207\r
+#define IDS_LOG_AUTHOR 1209\r
+#define IDS_LOG_DATE 1210\r
+#define IDS_LOG_REVISION 1208\r
+#define IDS_LOG_BUGIDS 1840\r
// Next default values for new objects\r
//\r
#ifdef APSTUDIO_INVOKED\r
// serve as the connection between documents, frame windows and views\r
CSingleDocTemplate* pDocTemplate;\r
pDocTemplate = new CSingleDocTemplate(\r
- IDR_MAINFRAME,\r
+ IDR_TORTOISE_GIT_BLAME_MAINFRAME,\r
RUNTIME_CLASS(CTortoiseGitBlameDoc),\r
RUNTIME_CLASS(CMainFrame), // main SDI frame window\r
RUNTIME_CLASS(CTortoiseGitBlameView));\r
GetObject(hFont, sizeof(LOGFONT), &lf);\r
lf.lfWeight = FW_BOLD;\r
m_boldFont = CreateFontIndirect(&lf);\r
+ \r
+ m_bShowBugtraqColumn=0;\r
\r
m_wcRev.m_CommitHash=GIT_REV_ZERO;\r
m_wcRev.m_Subject=_T("Working Copy");\r