OSDN Git Service

Add find and goto at gitblame
authorunknown <B20596@.fsl.freescale.net>
Thu, 15 Jan 2009 09:33:33 +0000 (17:33 +0800)
committerunknown <B20596@.fsl.freescale.net>
Thu, 15 Jan 2009 09:33:33 +0000 (17:33 +0800)
18 files changed:
src/Resources/TortoiseGitBlame.rc
src/Resources/blameres/Toolbar.bmp [moved from src/TortoiseGitBlame/res/Toolbar.bmp with 100% similarity]
src/Resources/blameres/Toolbar256.bmp [moved from src/TortoiseGitBlame/res/Toolbar256.bmp with 100% similarity]
src/Resources/blameres/TortoiseGitBlame.ico [moved from src/TortoiseGitBlame/res/TortoiseGitBlame.ico with 100% similarity]
src/Resources/blameres/TortoiseGitBlameDoc.ico [moved from src/TortoiseGitBlame/res/TortoiseGitBlameDoc.ico with 100% similarity]
src/Resources/blameres/output_wnd.ico [moved from src/TortoiseGitBlame/res/output_wnd.ico with 100% similarity]
src/Resources/blameres/output_wnd_hc.ico [moved from src/TortoiseGitBlame/res/output_wnd_hc.ico with 100% similarity]
src/Resources/blameres/properties.bmp [moved from src/TortoiseGitBlame/res/properties.bmp with 100% similarity]
src/Resources/blameres/properties_hc.bmp [moved from src/TortoiseGitBlame/res/properties_hc.bmp with 100% similarity]
src/Resources/blameres/properties_wnd.ico [moved from src/TortoiseGitBlame/res/properties_wnd.ico with 100% similarity]
src/Resources/blameres/properties_wnd_hc.ico [moved from src/TortoiseGitBlame/res/properties_wnd_hc.ico with 100% similarity]
src/TortoiseGitBlame/EditGotoDlg.cpp [new file with mode: 0644]
src/TortoiseGitBlame/EditGotoDlg.h [new file with mode: 0644]
src/TortoiseGitBlame/Resource.h
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseGitBlame/TortoiseGitBlameView.cpp
src/TortoiseGitBlame/TortoiseGitBlameView.h
src/TortoiseGitBlame/res/TortoiseGitBlame.rc2 [moved from src/Resources/TortoiseGitBlame.rc2 with 100% similarity]

index 55f26bf..9f1a542 100644 (file)
@@ -1,6 +1,6 @@
-//Microsoft Visual C++ generated resource script.\r
+// Microsoft Visual C++ generated resource script.\r
 //\r
-#include "..\\TortoiseGitBlame\resource.h"\r
+#include "..\TortoiseGitBlame\resource.h"\r
 \r
 #define APSTUDIO_READONLY_SYMBOLS\r
 /////////////////////////////////////////////////////////////////////////////\r
 /////////////////////////////////////////////////////////////////////////////\r
 #undef APSTUDIO_READONLY_SYMBOLS\r
 \r
-#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+// English (U.S.) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
 \r
+#ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // TEXTINCLUDE\r
 //\r
 \r
-1 TEXTINCLUDE\r
+1 TEXTINCLUDE \r
 BEGIN\r
-       "resource.h\0"\r
+    "..\\TortoiseGitBlame\\resource.h\0"\r
 END\r
 \r
-2 TEXTINCLUDE\r
+2 TEXTINCLUDE \r
 BEGIN\r
-       "#ifndef APSTUDIO_INVOKED\r\n"\r
+    "#ifndef APSTUDIO_INVOKED\r\n"\r
     "#include ""targetver.h""\r\n"\r
     "#endif\r\n"\r
-       "#include ""afxres.h""\r\n"\r
-       "\0"\r
+    "#include ""afxres.h""\r\n"\r
+    "\0"\r
 END\r
 \r
-3 TEXTINCLUDE\r
+3 TEXTINCLUDE \r
 BEGIN\r
     "#define _AFX_NO_OLE_RESOURCES\r\n"\r
     "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
     "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
-       "\r\n"\r
-       "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
-       "LANGUAGE 9, 1\r\n"\r
-       "#pragma code_page(1252)\r\n"\r
-       "#include ""res\\TortoiseGitBlame.rc2""  // non-Microsoft Visual C++ edited resources\r\n"\r
-       "#include ""afxres.rc""         // Standard components\r\n"\r
-       "#include ""afxprint.rc""       // printing/print preview resources\r\n"\r
-       "#if !defined(_AFXDLL)\r\n"\r
-       "#include ""afxribbon.rc""              // MFC ribbon and control bar resources\r\n"\r
-       "#endif\r\n"\r
-       "#endif\r\n"\r
-       "\0"\r
+    "\r\n"\r
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
+    "LANGUAGE 9, 1\r\n"\r
+    "#pragma code_page(1252)\r\n"\r
+    "#include ""res\\TortoiseGitBlame.rc2""  // non-Microsoft Visual C++ edited resources\r\n"\r
+    "#include ""afxres.rc""         // Standard components\r\n"\r
+    "#include ""afxprint.rc""       // printing/print preview resources\r\n"\r
+    "#if !defined(_AFXDLL)\r\n"\r
+    "#include ""afxribbon.rc""              // MFC ribbon and control bar resources\r\n"\r
+    "#endif\r\n"\r
+    "#endif\r\n"\r
+    "\0"\r
 END\r
 \r
 #endif    // APSTUDIO_INVOKED\r
@@ -65,151 +73,133 @@ END
 \r
 // Icon with lowest ID value placed first to ensure application icon\r
 // remains consistent on all systems.\r
-\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
-LANGUAGE 9, 1\r
-#pragma code_page(1252)\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
-IDI_OUTPUT_WND_HC       ICON         "res\\output_wnd_hc.ico"\r
-IDI_PROPERTIES_WND      ICON         "res\\properties_wnd.ico"\r
-IDI_PROPERTIES_WND_HC   ICON         "res\\properties_wnd_hc.ico"\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME ICON                    "..\\Resources\\blameres\\TortoiseGitBlame.ico"\r
+IDR_TortoiseGitBlamTYPE ICON                    "..\\Resources\\blameres\\TortoiseGitBlameDoc.ico"\r
+IDI_OUTPUT_WND          ICON                    "..\\Resources\\blameres\\output_wnd.ico"\r
+IDI_OUTPUT_WND_HC       ICON                    "..\\Resources\\blameres\\output_wnd_hc.ico"\r
+IDI_PROPERTIES_WND      ICON                    "..\\Resources\\blameres\\properties_wnd.ico"\r
+IDI_PROPERTIES_WND_HC   ICON                    "..\\Resources\\blameres\\properties_wnd_hc.ico"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Bitmap\r
 //\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
+IDR_TORTOISE_GIT_BLAME_MAINFRAME BITMAP                  "..\\Resources\\blameres\\Toolbar.bmp"\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 BITMAP                  "..\\Resources\\blameres\\Toolbar256.bmp"\r
+IDR_PROPERTIES          BITMAP                  "..\\Resources\\blameres\\properties.bmp"\r
+IDB_PROPERTIES_HC       BITMAP                  "..\\Resources\\blameres\\properties_hc.bmp"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Toolbar\r
 //\r
 \r
-IDR_TORTOISE_GIT_BLAME_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_FILE_SAVE\r
-       SEPARATOR\r
+    SEPARATOR\r
     BUTTON      ID_EDIT_CUT\r
     BUTTON      ID_EDIT_COPY\r
     BUTTON      ID_EDIT_PASTE\r
-       SEPARATOR\r
+    SEPARATOR\r
     BUTTON      ID_FILE_PRINT\r
     BUTTON      ID_APP_ABOUT\r
     BUTTON      ID_CONTEXT_HELP\r
 END\r
 \r
-IDR_TORTOISE_GIT_BLAME_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
     BUTTON      ID_FILE_SAVE\r
-       SEPARATOR\r
+    SEPARATOR\r
     BUTTON      ID_EDIT_CUT\r
     BUTTON      ID_EDIT_COPY\r
     BUTTON      ID_EDIT_PASTE\r
-       SEPARATOR\r
+    SEPARATOR\r
     BUTTON      ID_FILE_PRINT\r
     BUTTON      ID_APP_ABOUT\r
     BUTTON      ID_CONTEXT_HELP\r
 END\r
 \r
-\r
-IDR_PROPERTIES TOOLBAR 16, 16\r
+IDR_PROPERTIES TOOLBAR  16, 16\r
 BEGIN\r
     BUTTON      ID_EXPAND_ALL\r
     BUTTON      ID_SORTPROPERTIES\r
     BUTTON      ID_PROPERTIES1\r
     BUTTON      ID_PROPERTIES2\r
 END\r
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
-LANGUAGE 9, 1\r
-#pragma code_page(1252)\r
+\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Menu\r
 //\r
 \r
-IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU\r
-BEGIN\r
-       POPUP "&File"\r
-       BEGIN\r
-//             MENUITEM "&New\tCtrl+N",                ID_FILE_NEW\r
-               MENUITEM "&Open...\tCtrl+O",            ID_FILE_OPEN\r
-//             MENUITEM "&Save\tCtrl+S",               ID_FILE_SAVE\r
-//             MENUITEM "Save &As...",                 ID_FILE_SAVE_AS\r
-               MENUITEM SEPARATOR\r
-//             MENUITEM "&Print...\tCtrl+P",           ID_FILE_PRINT\r
-//             MENUITEM "Print Pre&view",              ID_FILE_PRINT_PREVIEW\r
-//             MENUITEM "P&rint Setup...",             ID_FILE_PRINT_SETUP\r
-               MENUITEM SEPARATOR\r
-               MENUITEM "Recent File",                 ID_FILE_MRU_FILE1,GRAYED\r
-               MENUITEM SEPARATOR\r
-               MENUITEM "E&xit",                       ID_APP_EXIT\r
-       END\r
-       POPUP "&Edit"\r
-       BEGIN\r
-//             MENUITEM "&Undo\tCtrl+Z",               ID_EDIT_UNDO\r
-               MENUITEM SEPARATOR\r
-               MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT\r
-               MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY\r
-//             MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE\r
-               MENUITEM "Find\tCtrl+F"                                 ID_EIDT_FIND\r
-               MENUITEM "Go to\tCtrl+G"                                ID_EDIT_GOTO\r
-       END\r
-       POPUP "&View"\r
-       BEGIN\r
-               POPUP "&Toolbars and Docking Windows"\r
-               BEGIN\r
-                       MENUITEM "<placeholder>",           ID_VIEW_TOOLBAR\r
-               END\r
-               MENUITEM "&Status Bar",                 ID_VIEW_STATUS_BAR\r
-               POPUP "&Application Look"\r
-               BEGIN\r
-                       MENUITEM "Windows &2000",           ID_VIEW_APPLOOK_WIN_2000\r
-                       MENUITEM "Office &XP",              ID_VIEW_APPLOOK_OFF_XP\r
-                       MENUITEM "&Windows XP",             ID_VIEW_APPLOOK_WIN_XP\r
-                       MENUITEM "Office 200&3",            ID_VIEW_APPLOOK_OFF_2003\r
-                       MENUITEM "Visual Studio.NET 200&5", ID_VIEW_APPLOOK_VS_2005\r
-                       POPUP "Office 200&7"\r
-                       BEGIN\r
-                               MENUITEM "&Blue Style",         ID_VIEW_APPLOOK_OFF_2007_BLUE\r
-                               MENUITEM "B&lack Style",        ID_VIEW_APPLOOK_OFF_2007_BLACK\r
-                               MENUITEM "&Silver Style",       ID_VIEW_APPLOOK_OFF_2007_SILVER\r
-                               MENUITEM "&Aqua Style",         ID_VIEW_APPLOOK_OFF_2007_AQUA\r
-                       END\r
-               END\r
-       END\r
-       POPUP "&Help"\r
-       BEGIN\r
-               MENUITEM "&Help Topics",                ID_HELP_FINDER\r
-               MENUITEM SEPARATOR\r
-               MENUITEM "&About TortoiseGitBlame...",          ID_APP_ABOUT\r
-       END\r
-END\r
-\r
-\r
-\r
-IDR_POPUP_EDIT MENU\r
-BEGIN\r
-       POPUP "Edit"\r
-       BEGIN\r
-               MENUITEM "Cu&t\tCtrl+X",            ID_EDIT_CUT\r
-               MENUITEM "&Copy\tCtrl+C",           ID_EDIT_COPY\r
-               MENUITEM "&Paste\tCtrl+V",          ID_EDIT_PASTE\r
-       END\r
-END\r
-\r
-IDR_OUTPUT_POPUP MENU\r
+IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU \r
+BEGIN\r
+    POPUP "&File"\r
+    BEGIN\r
+        MENUITEM "&Open...\tCtrl+O",            ID_FILE_OPEN\r
+        MENUITEM SEPARATOR\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Recent File",                 ID_FILE_MRU_FILE1, GRAYED\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "E&xit",                       ID_APP_EXIT\r
+    END\r
+    POPUP "&Edit"\r
+    BEGIN\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT\r
+        MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY\r
+        MENUITEM "&Find\tCtrl+F",               ID_EDIT_FIND\r
+        MENUITEM "Go to\tCtrl+G",               ID_EDIT_GOTO\r
+    END\r
+    POPUP "&View"\r
+    BEGIN\r
+        POPUP "&Toolbars and Docking Windows"\r
+        BEGIN\r
+            MENUITEM "<placeholder>",               ID_VIEW_TOOLBAR\r
+        END\r
+        MENUITEM "&Status Bar",                 ID_VIEW_STATUS_BAR\r
+        POPUP "&Application Look"\r
+        BEGIN\r
+            MENUITEM "Windows &2000",               ID_VIEW_APPLOOK_WIN_2000\r
+            MENUITEM "Office &XP",                  ID_VIEW_APPLOOK_OFF_XP\r
+            MENUITEM "&Windows XP",                 ID_VIEW_APPLOOK_WIN_XP\r
+            MENUITEM "Office 200&3",                ID_VIEW_APPLOOK_OFF_2003\r
+            MENUITEM "Visual Studio.NET 200&5",     ID_VIEW_APPLOOK_VS_2005\r
+            POPUP "Office 200&7"\r
+            BEGIN\r
+                MENUITEM "&Blue Style",                 ID_VIEW_APPLOOK_OFF_2007_BLUE\r
+                MENUITEM "B&lack Style",                ID_VIEW_APPLOOK_OFF_2007_BLACK\r
+                MENUITEM "&Silver Style",               ID_VIEW_APPLOOK_OFF_2007_SILVER\r
+                MENUITEM "&Aqua Style",                 ID_VIEW_APPLOOK_OFF_2007_AQUA\r
+            END\r
+        END\r
+    END\r
+    POPUP "&Help"\r
+    BEGIN\r
+        MENUITEM "&Help Topics",                ID_HELP_FINDER\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&About TortoiseGitBlame...",  ID_APP_ABOUT\r
+    END\r
+END\r
+\r
+IDR_POPUP_EDIT MENU \r
+BEGIN\r
+    POPUP "Edit"\r
+    BEGIN\r
+        MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT\r
+        MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY\r
+        MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE\r
+    END\r
+END\r
+\r
+IDR_OUTPUT_POPUP MENU \r
 BEGIN\r
     POPUP "Popup"\r
     BEGIN\r
@@ -220,60 +210,66 @@ BEGIN
     END\r
 END\r
 \r
-IDR_THEME_MENU MENU DISCARDABLE\r
+IDR_THEME_MENU MENU \r
 BEGIN\r
-       MENUITEM "Office 2007 (&Blue Style)",       ID_VIEW_APPLOOK_OFF_2007_BLUE\r
-       MENUITEM "Office 2007 (B&lack Style)",      ID_VIEW_APPLOOK_OFF_2007_BLACK\r
-       MENUITEM "Office 2007 (&Silver Style)",     ID_VIEW_APPLOOK_OFF_2007_SILVER\r
-       MENUITEM "Office 2007 (&Aqua Style)",       ID_VIEW_APPLOOK_OFF_2007_AQUA\r
+    MENUITEM "Office 2007 (&Blue Style)",   ID_VIEW_APPLOOK_OFF_2007_BLUE\r
+    MENUITEM "Office 2007 (B&lack Style)",  ID_VIEW_APPLOOK_OFF_2007_BLACK\r
+    MENUITEM "Office 2007 (&Silver Style)", ID_VIEW_APPLOOK_OFF_2007_SILVER\r
+    MENUITEM "Office 2007 (&Aqua Style)",   ID_VIEW_APPLOOK_OFF_2007_AQUA\r
 END\r
 \r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Accelerator\r
 //\r
 \r
-IDR_TORTOISE_GIT_BLAME_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
-//     "S",            ID_FILE_SAVE,           VIRTKEY,CONTROL\r
-//     "P",            ID_FILE_PRINT,          VIRTKEY,CONTROL\r
-//     "Z",            ID_EDIT_UNDO,           VIRTKEY,CONTROL\r
-       "X",            ID_EDIT_CUT,            VIRTKEY,CONTROL\r
-       "C",            ID_EDIT_COPY,           VIRTKEY,CONTROL\r
-       "V",            ID_EDIT_PASTE,          VIRTKEY,CONTROL\r
-       "F",            ID_EDIT_FIND,           VIRTKEY,CONTROL\r
-       "G",                    ID_EDIT_GOTO,                   VIRTKEY,CONTROL\r
-//     VK_BACK,        ID_EDIT_UNDO,           VIRTKEY,ALT\r
-       VK_DELETE,      ID_EDIT_CUT,            VIRTKEY,SHIFT\r
-       VK_INSERT,      ID_EDIT_COPY,           VIRTKEY,CONTROL\r
-       VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY,SHIFT\r
-       VK_F6,          ID_NEXT_PANE,           VIRTKEY\r
-       VK_F6,          ID_PREV_PANE,           VIRTKEY,SHIFT\r
-       VK_F1,          ID_CONTEXT_HELP,        VIRTKEY,SHIFT\r
-       VK_F1,          ID_HELP,                VIRTKEY\r
+    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL\r
+    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL\r
+    "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL\r
+    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL\r
+    "F",            ID_EDIT_FIND,        VIRTKEY, CONTROL\r
+    "G",            ID_EDIT_GOTO,           VIRTKEY, CONTROL\r
+    VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT\r
+    VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL\r
+    VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT\r
+    VK_F6,          ID_NEXT_PANE,           VIRTKEY \r
+    VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT\r
+    VK_F1,          ID_CONTEXT_HELP,        VIRTKEY, SHIFT\r
+    VK_F1,          ID_HELP,                VIRTKEY \r
 END\r
 \r
 \r
-\r
-\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Dialog\r
 //\r
 \r
-IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62\r
+IDD_ABOUTBOX DIALOGEX 0, 0, 230, 85\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "About TortoiseGitBlame"\r
-FONT 8, "MS Shell Dlg"\r
+FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\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 TortoiseGit",IDC_STATIC,42,26,114,8\r
-    DEFPUSHBUTTON   "OK",IDOK,113,41,50,14,WS_GROUP\r
+    DEFPUSHBUTTON   "OK",IDOK,173,63,50,14,WS_GROUP\r
+    LTEXT           "Author: Frank Li (lznuaa@gmail.com)",IDC_STATIC,42,37,138,8\r
+    LTEXT           "Part of code come from TortoiseSVN Blame",IDC_STATIC,42,48,138,8\r
 END\r
 \r
+IDD_GOTODLG DIALOGEX 0, 0, 127, 52\r
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Go to line"\r
+FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
+BEGIN\r
+    LTEXT           "Line:",IDC_STATIC,7,10,57,8\r
+    EDITTEXT        IDC_LINENUMBER,36,7,84,14,ES_AUTOHSCROLL | ES_NUMBER\r
+    DEFPUSHBUTTON   "OK",IDOK,7,31,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,70,31,50,14\r
+END\r
 \r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -281,9 +277,9 @@ END
 // Version\r
 //\r
 \r
-VS_VERSION_INFO     VERSIONINFO\r
 FILEVERSION       1,0,0,1\r
 PRODUCTVERSION    1,0,0,1\r
+VS_VERSION_INFO VERSIONINFO\r
FILEVERSION 1,0,0,1\r
PRODUCTVERSION 1,0,0,1\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -294,181 +290,214 @@ VS_VERSION_INFO     VERSIONINFO
  FILETYPE 0x1L\r
  FILESUBTYPE 0x0L\r
 BEGIN\r
-       BLOCK "StringFileInfo"\r
-       BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
         BLOCK "040904e4"\r
-               BEGIN\r
-            VALUE "CompanyName",       "TortoiseGit Blame"\r
+        BEGIN\r
+            VALUE "CompanyName", "TortoiseGit Blame"\r
             VALUE "FileDescription", "TortoiseGit Blame Program"\r
-                       VALUE "FileVersion",     "1.0.0.1"\r
-                       VALUE "InternalName",    "TortoiseGitBlame.exe"\r
+            VALUE "FileVersion", "1.0.0.1"\r
+            VALUE "InternalName", "TortoiseGitBlame.exe"\r
             VALUE "LegalCopyright", "TortoiseGit.  All rights reserved."\r
-                       VALUE "OriginalFilename","TortoiseGitBlame.exe"\r
+            VALUE "OriginalFilename", "TortoiseGitBlame.exe"\r
             VALUE "ProductName", "TortoiseGit"\r
-                       VALUE "ProductVersion",  "1.0.0.1"\r
-               END\r
-       END\r
-       BLOCK "VarFileInfo"\r
-       BEGIN\r
-               VALUE "Translation", 0x0409, 1252\r
+            VALUE "ProductVersion", "1.0.0.1"\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x409, 1252\r
     END\r
 END\r
 \r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // DESIGNINFO\r
 //\r
 \r
 #ifdef APSTUDIO_INVOKED\r
-GUIDELINES DESIGNINFO\r
+GUIDELINES DESIGNINFO \r
 BEGIN\r
     IDD_ABOUTBOX, DIALOG\r
     BEGIN\r
         LEFTMARGIN, 7\r
-        RIGHTMARGIN, 163\r
+        RIGHTMARGIN, 223\r
         TOPMARGIN, 7\r
-        BOTTOMMARGIN, 55\r
+        BOTTOMMARGIN, 77\r
     END\r
 END\r
 #endif    // APSTUDIO_INVOKED\r
 \r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // String Table\r
 //\r
 \r
-STRINGTABLE\r
-BEGIN\r
-       IDP_OLE_INIT_FAILED     "OLE initialization failed.  Make sure that the OLE libraries are the correct version."\r
-END\r
-STRINGTABLE\r
-BEGIN\r
-// Non-mac-targeting apps remove the two extra substrings\r
-       IDR_TORTOISE_GIT_BLAME_MAINFRAME           "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document"\r
-\r
-END\r
-STRINGTABLE\r
-BEGIN\r
-       AFX_IDS_APP_TITLE       "TortoiseGitBlame"\r
-       AFX_IDS_IDLEMESSAGE     "For Help, press F1"\r
-       AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
-END\r
-STRINGTABLE\r
-BEGIN\r
-       ID_INDICATOR_EXT        "EXT"\r
-       ID_INDICATOR_CAPS       "CAP"\r
-       ID_INDICATOR_NUM        "NUM"\r
-       ID_INDICATOR_SCRL       "SCRL"\r
-       ID_INDICATOR_OVR        "OVR"\r
-       ID_INDICATOR_REC        "REC"\r
-END\r
-STRINGTABLE\r
-BEGIN\r
-       ID_FILE_NEW             "Create a new document\nNew"\r
-       ID_FILE_OPEN            "Open an existing document\nOpen"\r
-       ID_FILE_CLOSE           "Close the active document\nClose"\r
-       ID_FILE_SAVE            "Save the active document\nSave"\r
-       ID_FILE_SAVE_AS         "Save the active document with a new name\nSave As"\r
-       ID_FILE_PAGE_SETUP      "Change the printing options\nPage Setup"\r
-       ID_FILE_PRINT_SETUP     "Change the printer and printing options\nPrint Setup"\r
-       ID_FILE_PRINT_DIRECT    "Print the active document using current options\nQuick Print"\r
-       ID_FILE_PRINT           "Print the active document\nPrint"\r
-       ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"\r
-       ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"\r
-       ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"\r
-       ID_CONTEXT_HELP         "Display help for clicked on buttons, menus and windows\nHelp"\r
-       ID_HELP_INDEX           "Opens Help\nHelp Topics"\r
-       ID_HELP_FINDER                  "List Help topics\nHelp Topics"\r
-       ID_HELP_USING           "Display instructions about how to use help\nHelp"\r
-       ID_HELP                 "Display help for current task or command\nHelp"\r
-       ID_FILE_MRU_FILE1       "Open this document"\r
-       ID_FILE_MRU_FILE2       "Open this document"\r
-       ID_FILE_MRU_FILE3       "Open this document"\r
-       ID_FILE_MRU_FILE4       "Open this document"\r
-       ID_FILE_MRU_FILE5       "Open this document"\r
-       ID_FILE_MRU_FILE6       "Open this document"\r
-       ID_FILE_MRU_FILE7       "Open this document"\r
-       ID_FILE_MRU_FILE8       "Open this document"\r
-       ID_FILE_MRU_FILE9       "Open this document"\r
-       ID_FILE_MRU_FILE10      "Open this document"\r
-       ID_FILE_MRU_FILE11      "Open this document"\r
-       ID_FILE_MRU_FILE12      "Open this document"\r
-       ID_FILE_MRU_FILE13      "Open this document"\r
-       ID_FILE_MRU_FILE14      "Open this document"\r
-       ID_FILE_MRU_FILE15      "Open this document"\r
-       ID_FILE_MRU_FILE16      "Open this document"\r
-       ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"\r
-       ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"\r
-       ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"\r
-       ID_EDIT_CLEAR           "Erase the selection\nErase"\r
-       ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"\r
-       ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"\r
-       ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"\r
-       ID_EDIT_FIND            "Find the specified text\nFind"\r
-       ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"\r
-       ID_EDIT_REPEAT          "Repeat the last action\nRepeat"\r
-       ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"\r
-       ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"\r
-       ID_EDIT_UNDO            "Undo the last action\nUndo"\r
-       ID_EDIT_REDO            "Redo the previously undone action\nRedo"\r
-       ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle Status Bar"\r
-END\r
-\r
-STRINGTABLE\r
-BEGIN\r
-       AFX_IDS_SCSIZE          "Change the window size"\r
-       AFX_IDS_SCMOVE          "Change the window position"\r
-       AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"\r
-       AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"\r
-       AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"\r
-       AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"\r
-       AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"\r
-       AFX_IDS_SCRESTORE       "Restore the window to normal size"\r
-       AFX_IDS_SCTASKLIST      "Activate Task List"\r
-       AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"\r
-END\r
-\r
-\r
-STRINGTABLE\r
-BEGIN\r
-       IDS_STATUS_PANE1        "Pane 1"\r
-       IDS_STATUS_PANE2        "Pane 2"\r
-       IDS_TOOLBAR_STANDARD    "Standard"\r
-       IDS_TOOLBAR_CUSTOMIZE   "Customize..."\r
-       IDS_OUTPUT_WND          "Git Revision List"\r
-       IDS_BUILD_TAB           "Build"\r
-       IDS_DEBUG_TAB           "Debug"\r
-       IDS_FIND_TAB            "Find"\r
-       IDS_PROPERTIES_WND      "Commit Info"\r
-       IDS_EDIT_MENU           "Edit"\r
-END\r
-\r
-STRINGTABLE\r
-BEGIN\r
-       IDS_GIT_LOG_TAB                 "Git Log"\r
+STRINGTABLE \r
+BEGIN\r
+    IDP_OLE_INIT_FAILED     "OLE initialization failed.  Make sure that the OLE libraries are the correct version."\r
 END\r
 \r
-IDD_GOTODLG DIALOGEX 0, 0, 127, 52\r
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Go to line"\r
-FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
+STRINGTABLE \r
 BEGIN\r
-    LTEXT           "Line:",IDC_STATIC,7,10,57,8\r
-    EDITTEXT        IDC_LINENUMBER,70,7,50,14,ES_AUTOHSCROLL | ES_NUMBER\r
-    DEFPUSHBUTTON   "OK",IDOK,7,31,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,70,31,50,14\r
+    IDR_TORTOISE_GIT_BLAME_MAINFRAME \r
+                            "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document"\r
 END\r
 \r
+STRINGTABLE \r
+BEGIN\r
+    AFX_IDS_APP_TITLE       "TortoiseGitBlame"\r
+    AFX_IDS_IDLEMESSAGE     "For Help, press F1"\r
+    AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_INDICATOR_EXT        "EXT"\r
+    ID_INDICATOR_CAPS       "CAP"\r
+    ID_INDICATOR_NUM        "NUM"\r
+    ID_INDICATOR_SCRL       "SCRL"\r
+    ID_INDICATOR_OVR        "OVR"\r
+    ID_INDICATOR_REC        "REC"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_FILE_NEW             "Create a new document\nNew"\r
+    ID_FILE_OPEN            "Open an existing document\nOpen"\r
+    ID_FILE_CLOSE           "Close the active document\nClose"\r
+    ID_FILE_SAVE            "Save the active document\nSave"\r
+    ID_FILE_SAVE_AS         "Save the active document with a new name\nSave As"\r
+    ID_FILE_PAGE_SETUP      "Change the printing options\nPage Setup"\r
+    ID_FILE_PRINT_SETUP     "Change the printer and printing options\nPrint Setup"\r
+    ID_FILE_PRINT           "Print the active document\nPrint"\r
+    ID_FILE_PRINT_DIRECT    "Print the active document using current options\nQuick Print"\r
+    ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"\r
+    ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"\r
+    ID_HELP_INDEX           "Opens Help\nHelp Topics"\r
+    ID_HELP_FINDER          "List Help topics\nHelp Topics"\r
+    ID_HELP_USING           "Display instructions about how to use help\nHelp"\r
+    ID_CONTEXT_HELP         "Display help for clicked on buttons, menus and windows\nHelp"\r
+    ID_HELP                 "Display help for current task or command\nHelp"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_FILE_MRU_FILE1       "Open this document"\r
+    ID_FILE_MRU_FILE2       "Open this document"\r
+    ID_FILE_MRU_FILE3       "Open this document"\r
+    ID_FILE_MRU_FILE4       "Open this document"\r
+    ID_FILE_MRU_FILE5       "Open this document"\r
+    ID_FILE_MRU_FILE6       "Open this document"\r
+    ID_FILE_MRU_FILE7       "Open this document"\r
+    ID_FILE_MRU_FILE8       "Open this document"\r
+    ID_FILE_MRU_FILE9       "Open this document"\r
+    ID_FILE_MRU_FILE10      "Open this document"\r
+    ID_FILE_MRU_FILE11      "Open this document"\r
+    ID_FILE_MRU_FILE12      "Open this document"\r
+    ID_FILE_MRU_FILE13      "Open this document"\r
+    ID_FILE_MRU_FILE14      "Open this document"\r
+    ID_FILE_MRU_FILE15      "Open this document"\r
+    ID_FILE_MRU_FILE16      "Open this document"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"\r
+    ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_EDIT_CLEAR           "Erase the selection\nErase"\r
+    ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"\r
+    ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"\r
+    ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"\r
+    ID_EDIT_FIND            "Find the specified text\nFind"\r
+    ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"\r
+    ID_EDIT_REPEAT          "Repeat the last action\nRepeat"\r
+    ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"\r
+    ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"\r
+    ID_EDIT_UNDO            "Undo the last action\nUndo"\r
+    ID_EDIT_REDO            "Redo the previously undone action\nRedo"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle Status Bar"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    AFX_IDS_SCSIZE          "Change the window size"\r
+    AFX_IDS_SCMOVE          "Change the window position"\r
+    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"\r
+    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"\r
+    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"\r
+    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"\r
+    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    AFX_IDS_SCRESTORE       "Restore the window to normal size"\r
+    AFX_IDS_SCTASKLIST      "Activate Task List"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_STATUS_PANE1        "Pane 1"\r
+    IDS_STATUS_PANE2        "Pane 2"\r
+    IDS_TOOLBAR_STANDARD    "Standard"\r
+    IDS_TOOLBAR_CUSTOMIZE   "Customize..."\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_OUTPUT_WND          "Git Revision List"\r
+    IDS_PROPERTIES_WND      "Commit Info"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_BUILD_TAB           "Build"\r
+    IDS_DEBUG_TAB           "Debug"\r
+    IDS_FIND_TAB            "Find"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_EDIT_MENU           "Edit"\r
+    IDS_GIT_LOG_TAB         "Git Log"\r
+END\r
+\r
+#endif    // English (U.S.) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
 \r
 \r
-#endif\r
 \r
 #ifndef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Generated from the TEXTINCLUDE 3 resource.\r
 //\r
-\r
 #define _AFX_NO_OLE_RESOURCES\r
 #define _AFX_NO_TRACKER_RESOURCES\r
 #define _AFX_NO_PROPERTY_RESOURCES\r
@@ -476,11 +505,14 @@ END
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
 LANGUAGE 9, 1\r
 #pragma code_page(1252)\r
-#include "..\\Resources\\TortoiseGitBlame.rc2"  // non-Microsoft Visual C++ edited resources\r
-#include "afxres.rc"   // Standard components\r
-#include "afxprint.rc"  // printing/print preview resources\r
+#include "res\TortoiseGitBlame.rc2"  // non-Microsoft Visual C++ edited resources\r
+#include "afxres.rc"         // Standard components\r
+#include "afxprint.rc"       // printing/print preview resources\r
 #if !defined(_AFXDLL)\r
-#include "afxribbon.rc"                // MFC ribbon and control bar resources\r
+#include "afxribbon.rc"              // MFC ribbon and control bar resources\r
 #endif\r
 #endif\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
 #endif    // not APSTUDIO_INVOKED\r
+\r
diff --git a/src/TortoiseGitBlame/EditGotoDlg.cpp b/src/TortoiseGitBlame/EditGotoDlg.cpp
new file mode 100644 (file)
index 0000000..4c4eaea
--- /dev/null
@@ -0,0 +1,47 @@
+// EditGoto.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseGitBlame.h"\r
+#include "EditGotoDlg.h"\r
+\r
+\r
+// CEditGotoDlg dialog\r
+\r
+IMPLEMENT_DYNAMIC(CEditGotoDlg, CDialog)\r
+\r
+CEditGotoDlg::CEditGotoDlg(CWnd* pParent /*=NULL*/)\r
+       : CDialog(CEditGotoDlg::IDD, pParent)\r
+    , m_LineNumber(0)\r
+{\r
+\r
+}\r
+\r
+CEditGotoDlg::~CEditGotoDlg()\r
+{\r
+}\r
+\r
+void CEditGotoDlg::DoDataExchange(CDataExchange* pDX)\r
+{\r
+    CDialog::DoDataExchange(pDX);\r
+    DDX_Text(pDX, IDC_LINENUMBER, m_LineNumber);\r
+       DDV_MinMaxUInt(pDX, m_LineNumber, 0, 40000000);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CEditGotoDlg, CDialog)\r
+    ON_EN_CHANGE(IDC_LINENUMBER, &CEditGotoDlg::OnEnChangeLinenumber)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CEditGotoDlg message handlers\r
+\r
+void CEditGotoDlg::OnEnChangeLinenumber()\r
+{\r
+    // TODO:  If this is a RICHEDIT control, the control will not\r
+    // send this notification unless you override the CDialog::OnInitDialog()\r
+    // function and call CRichEditCtrl().SetEventMask()\r
+    // with the ENM_CHANGE flag ORed into the mask.\r
+\r
+    // TODO:  Add your control notification handler code here\r
+}\r
diff --git a/src/TortoiseGitBlame/EditGotoDlg.h b/src/TortoiseGitBlame/EditGotoDlg.h
new file mode 100644 (file)
index 0000000..c5fb1b4
--- /dev/null
@@ -0,0 +1,24 @@
+#pragma once\r
+\r
+\r
+// CEditGotoDlg dialog\r
+\r
+class CEditGotoDlg : public CDialog\r
+{\r
+       DECLARE_DYNAMIC(CEditGotoDlg)\r
+\r
+public:\r
+       CEditGotoDlg(CWnd* pParent = NULL);   // standard constructor\r
+       virtual ~CEditGotoDlg();\r
+\r
+// Dialog Data\r
+       enum { IDD = IDD_GOTODLG };\r
+\r
+protected:\r
+       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+\r
+       DECLARE_MESSAGE_MAP()\r
+public:\r
+    afx_msg void OnEnChangeLinenumber();\r
+    DWORD m_LineNumber;\r
+};\r
index b834900..746091c 100644 (file)
@@ -1,65 +1,63 @@
 //{{NO_DEPENDENCIES}}\r
 // Microsoft Visual C++ generated include file.\r
-// Used by TortoiseGitBlame.rc\r
+// Used by d:\build\x64\TortoiseGit\src\Resources\TortoiseGitBlame.rc\r
 //\r
-#define IDD_ABOUTBOX                           100\r
-#define IDP_OLE_INIT_FAILED                    100\r
-#define IDR_POPUP_EDIT                         119\r
-#define ID_STATUSBAR_PANE1                     120\r
-#define ID_STATUSBAR_PANE2                     121\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_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                         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 IDI_PROPERTIES_WND_HC          168\r
-#define IDR_OUTPUT_POPUP                       182\r
-#define IDR_PROPERTIES                         183\r
-#define IDB_PROPERTIES_HC                      184\r
-#define IDR_THEME_MENU                         200\r
-#define ID_SET_STYLE                           201\r
-#define ID_VIEW_APPLOOK_WIN_2000       210\r
-#define ID_VIEW_APPLOOK_OFF_XP         211\r
-#define ID_VIEW_APPLOOK_WIN_XP         212\r
-#define ID_VIEW_APPLOOK_OFF_2003       213\r
-#define ID_VIEW_APPLOOK_VS_2005                214\r
-#define ID_VIEW_APPLOOK_OFF_2007_BLUE  215\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 ID_EIDT_FIND                           219\r
-#define ID_EDIT_GOTO                           220\r
-#define IDD_GOTODLG                                    221\r
-#define IDC_LINENUMBER                         222\r
-\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
+#define IDR_TORTOISE_GIT_BLAME_MAINFRAME 1\r
+#define IDR_TORTOISE_GIT_BLAME_MAINFRAME_256 2\r
+#define IDD_ABOUTBOX                    100\r
+#define IDP_OLE_INIT_FAILED             100\r
+#define IDR_POPUP_EDIT                  119\r
+#define ID_STATUSBAR_PANE1              120\r
+#define ID_STATUSBAR_PANE2              121\r
+#define ID_VIEW_CUSTOMIZE               126\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 IDI_OUTPUT_WND                  165\r
+#define IDI_OUTPUT_WND_HC               166\r
+#define IDI_PROPERTIES_WND              167\r
+#define IDI_PROPERTIES_WND_HC           168\r
+#define IDR_OUTPUT_POPUP                182\r
+#define IDR_PROPERTIES                  183\r
+#define IDB_PROPERTIES_HC               184\r
+#define IDR_THEME_MENU                  200\r
+#define ID_SET_STYLE                    201\r
+#define ID_VIEW_APPLOOK_WIN_2000        210\r
+#define ID_VIEW_APPLOOK_OFF_XP          211\r
+#define ID_VIEW_APPLOOK_WIN_XP          212\r
+#define ID_VIEW_APPLOOK_OFF_2003        213\r
+#define ID_VIEW_APPLOOK_VS_2005         214\r
+#define ID_VIEW_APPLOOK_OFF_2007_BLUE   215\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 ID_EDIT_GITFIND                 219\r
+#define ID_EDIT_GOTO                    220\r
+#define IDD_GOTODLG                     221\r
+#define IDC_LINENUMBER                  222\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 IDS_OUTPUT_WND                  20157\r
+#define IDS_PROPERTIES_WND              20158\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
 // Next default values for new objects\r
-//\r
+// \r
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
-#define _APS_NEXT_RESOURCE_VALUE       310\r
-#define _APS_NEXT_CONTROL_VALUE                1000\r
-#define _APS_NEXT_SYMED_VALUE          310\r
-#define _APS_NEXT_COMMAND_VALUE                32771\r
+#define _APS_NEXT_RESOURCE_VALUE        310\r
+#define _APS_NEXT_COMMAND_VALUE         32771\r
+#define _APS_NEXT_CONTROL_VALUE         1000\r
+#define _APS_NEXT_SYMED_VALUE           310\r
 #endif\r
 #endif\r
index 80e2018..075564a 100644 (file)
@@ -61,7 +61,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="$(IntDir)"\r
+                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="$(IntDir)"\r
+                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
+                               RelativePath=".\EditGotoDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\GitBlameLogList.h"\r
                                >\r
                        </File>\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
                        <File\r
+                               RelativePath=".\EditGotoDlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\MainFrm.h"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath=".\Resource.h"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Generating map file for help compiler..."\r
-                                               CommandLine="echo // Generated Help Map file.  Used by TortoiseGitBlame.HHP. &gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Commands (ID_* and IDM_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Prompts (IDP_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h IDP_,HIDP_,0x30000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Resources (IDR_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h IDR_,HIDR_,0x20000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Dialogs (IDD_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h IDD_,HIDD_,0x20000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Frame Controls (IDW_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h /a afxhh.h IDW_,HIDW_,0x50000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;"\r
-                                               Outputs="hlp\HTMLDefines.h"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Generating map file for help compiler..."\r
-                                               CommandLine="echo // Generated Help Map file.  Used by TortoiseGitBlame.HHP. &gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Commands (ID_* and IDM_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h ID_,HID_,0x10000 IDM_,HIDM_,0x10000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Prompts (IDP_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h IDP_,HIDP_,0x30000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Resources (IDR_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h IDR_,HIDR_,0x20000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Dialogs (IDD_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h IDD_,HIDD_,0x20000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo. &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;echo // Frame Controls (IDW_*) &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;makehm /h /a afxhh.h IDW_,HIDW_,0x50000 &quot;$(InputFileName)&quot; &gt;&gt; &quot;hlp\HTMLDefines.h&quot;&#x0D;&#x0A;"\r
-                                               Outputs="hlp\HTMLDefines.h"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\stdafx.h"\r
                                RelativePath=".\TortoiseGitBlameView.h"\r
                                >\r
                        </File>\r
-                       <Filter\r
-                               Name="HTML Help Files"\r
-                               Filter="hhp;hhc;hhk;gif;jpg"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\hlp\TortoiseGitBlame.hhc"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\hlp\TortoiseGitBlame.hhk"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\hlp\TortoiseGitBlame.hhp"\r
-                                       >\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Making help file..."\r
-                                                       CommandLine="start /wait hhc &quot;hlp\TortoiseGitBlame.hhp&quot;&#x0D;&#x0A;if not exist &quot;hlp\TortoiseGitBlame.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;hlp\TortoiseGitBlame.chm&quot; &quot;$(OutDir)\TortoiseGitBlame.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"\r
-                                                       AdditionalDependencies="hlp\HTMLDefines.h"\r
-                                                       Outputs="$(OutDir)\$(ProjectName).chm"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                                       <FileConfiguration\r
-                                               Name="Release|Win32"\r
-                                               >\r
-                                               <Tool\r
-                                                       Name="VCCustomBuildTool"\r
-                                                       Description="Making help file..."\r
-                                                       CommandLine="start /wait hhc &quot;hlp\TortoiseGitBlame.hhp&quot;&#x0D;&#x0A;if not exist &quot;hlp\TortoiseGitBlame.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;hlp\TortoiseGitBlame.chm&quot; &quot;$(OutDir)\TortoiseGitBlame.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"\r
-                                                       AdditionalDependencies="hlp\HTMLDefines.h"\r
-                                                       Outputs="$(OutDir)\$(ProjectName).chm"\r
-                                               />\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\res\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\blameres\properties.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\res\properties.bmp"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\res\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\res\properties_wnd.ico"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\properties_wnd_hc.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\res\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\res\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\blameres\TortoiseGitBlame.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\TortoiseGitBlame.rc"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCResourceCompilerTool"\r
+                                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCResourceCompilerTool"\r
+                                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                </Filter>\r
+               <Filter\r
+                       Name="HTML Help Files"\r
+                       Filter="hhp;hhc;hhk;gif;jpg"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\hlp\TortoiseGitBlame.hhc"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hlp\TortoiseGitBlame.hhk"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hlp\TortoiseGitBlame.hhp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Making help file..."\r
+                                               CommandLine="start /wait hhc &quot;hlp\TortoiseGitBlame.hhp&quot;&#x0D;&#x0A;if not exist &quot;hlp\TortoiseGitBlame.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;hlp\TortoiseGitBlame.chm&quot; &quot;$(OutDir)\TortoiseGitBlame.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="hlp\HTMLDefines.h"\r
+                                               Outputs="$(OutDir)\$(ProjectName).chm"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Making help file..."\r
+                                               CommandLine="start /wait hhc &quot;hlp\TortoiseGitBlame.hhp&quot;&#x0D;&#x0A;if not exist &quot;hlp\TortoiseGitBlame.chm&quot; goto :HelpError&#x0D;&#x0A;copy &quot;hlp\TortoiseGitBlame.chm&quot; &quot;$(OutDir)\TortoiseGitBlame.chm&quot;&#x0D;&#x0A;goto :HelpDone&#x0D;&#x0A;:HelpError&#x0D;&#x0A;echo hlp\TortoiseGitBlame.hhp(1) : error:Problem encountered creating help file&#x0D;&#x0A;echo.&#x0D;&#x0A;:HelpDone&#x0D;&#x0A;echo.&#x0D;&#x0A;"\r
+                                               AdditionalDependencies="hlp\HTMLDefines.h"\r
+                                               Outputs="$(OutDir)\$(ProjectName).chm"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+               </Filter>\r
                <File\r
                        RelativePath=".\ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r
        <Globals>\r
+               <Global\r
+                       Name="RESOURCE_FILE"\r
+                       Value="\build\x64\TortoiseGit\src\Resources\TortoiseGitBlame.rc"\r
+               />\r
        </Globals>\r
 </VisualStudioProject>\r
index e5493fb..98283f2 100644 (file)
 #include "TortoiseGitBlameView.h"\r
 #include "MainFrm.h"\r
 #include "Balloon.h"\r
+#include "EditGotoDlg.h"\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
 #endif\r
 \r
+UINT CTortoiseGitBlameView::m_FindDialogMessage;\r
 \r
 // CTortoiseGitBlameView\r
 \r
@@ -52,8 +54,10 @@ BEGIN_MESSAGE_MAP(CTortoiseGitBlameView, CView)
        ON_WM_RBUTTONDOWN()\r
        ON_NOTIFY(SCN_PAINTED,0,OnSciPainted)\r
        ON_NOTIFY(SCN_GETBKCOLOR,0,OnSciGetBkColor)\r
+    ON_REGISTERED_MESSAGE(m_FindDialogMessage,   OnFindDialogMessage)  \r
 END_MESSAGE_MAP()\r
 \r
+\r
 // CTortoiseGitBlameView construction/destruction\r
 \r
 CTortoiseGitBlameView::CTortoiseGitBlameView()\r
@@ -98,6 +102,8 @@ CTortoiseGitBlameView::CTortoiseGitBlameView()
 \r
        m_bShowAuthor=true;\r
        m_bShowDate=false;\r
+\r
+    m_FindDialogMessage   =   ::RegisterWindowMessage(FINDMSGSTRING);   \r
 }\r
 \r
 CTortoiseGitBlameView::~CTortoiseGitBlameView()\r
@@ -2698,8 +2704,46 @@ BOOL CTortoiseGitBlameView::PreTranslateMessage(MSG* pMsg)
 \r
 void CTortoiseGitBlameView::OnEditFind()\r
 {\r
+    m_pFindDialog=new CFindReplaceDialog();\r
+    m_pFindDialog->Create(TRUE,_T(""),NULL,FR_DOWN,this);  \r
 }\r
 \r
 void CTortoiseGitBlameView::OnEditGoto()\r
 {\r
-}
\ No newline at end of file
+    CEditGotoDlg dlg;\r
+    if(dlg.DoModal()==IDOK)\r
+    {\r
+        this->GotoLine(dlg.m_LineNumber);\r
+    }\r
+}\r
+\r
+LRESULT CTortoiseGitBlameView::OnFindDialogMessage(WPARAM   wParam,   LPARAM   lParam)//Õâ¸öÒ²ÊÇÕÒÄǸö³ÌÐò¸ÄµÄ£¬Ö»²»¹ý»»³ÉÁË×Ô¼ºµÄÀà   \r
+{   \r
+    ASSERT(m_pFindDialog   !=   NULL);   \r
+    \r
+    //   If   the   FR_DIALOGTERM   flag   is   set,   \r
+          //   invalidate   the   handle   identifying   the   dialog   box.   \r
+    if   (m_pFindDialog->IsTerminating())   \r
+    {   \r
+            m_pFindDialog   =   NULL;   \r
+            return   0;   \r
+    }   \r
+\r
+    //   If   the   FR_FINDNEXT   flag   is   set,   \r
+    //   call   the   application-defined   search   routine   \r
+    //   to   search   for   the   requested   string.   \r
+    if(m_pFindDialog->FindNext())   \r
+    {   \r
+            //read   data   from   dialog   \r
+        CString   FindName   =   m_pFindDialog->GetFindString();   \r
+        bool   bMatchCase   =   m_pFindDialog->MatchCase()   ==   TRUE;   \r
+        bool   bMatchWholeWord   =   m_pFindDialog->MatchWholeWord()   ==   TRUE;   \r
+        bool   bSearchDown   =   m_pFindDialog->SearchDown()   ==   TRUE;   \r
+\r
+            //with   given   name   do   search   \r
+    //        *FindWhatYouNeed(FindName,   bMatchCase,   bMatchWholeWord,   bSearchDown);   \r
+    }   \r
+\r
+    return   0;   \r
+}   \r
+\r
index d28e81b..b68be6c 100644 (file)
@@ -85,8 +85,10 @@ protected:
        afx_msg void OnSciGetBkColor(NMHDR*, LRESULT*);\r
        afx_msg void OnMouseHover(UINT nFlags, CPoint point);\r
        afx_msg void OnMouseMove(UINT nFlags, CPoint point);\r
+    afx_msg LRESULT OnFindDialogMessage(WPARAM   wParam,   LPARAM   lParam);\r
        DECLARE_MESSAGE_MAP()\r
 \r
+    static UINT m_FindDialogMessage;\r
 public:\r
 \r
        void UpdateInfo();\r
@@ -211,6 +213,8 @@ protected:
 \r
        CGitBlameLogList * GetLogList();\r
 \r
+    CFindReplaceDialog          *m_pFindDialog;\r
+\r
 };\r
 \r
 #ifndef _DEBUG  // debug version in TortoiseGitBlameView.cpp\r