Add Goto Dialog

diff --git a/src/Resources/TortoiseGitBlame.rc b/src/Resources/TortoiseGitBlame.rc
index 7f43f89..55f26bf 100644 (file)
--- a/src/Resources/TortoiseGitBlame.rc
+++ b/src/Resources/TortoiseGitBlame.rc
@@ -143,14 +143,14 @@ IDR_TORTOISE_GIT_BLAME_MAINFRAME MENU
 BEGIN\r
        POPUP "&File"\r
        BEGIN\r
-               MENUITEM "&New\tCtrl+N",                ID_FILE_NEW\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 "&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 "&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
@@ -158,11 +158,13 @@ BEGIN
        END\r
        POPUP "&Edit"\r
        BEGIN\r
-               MENUITEM "&Undo\tCtrl+Z",               ID_EDIT_UNDO\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 "&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
@@ -233,15 +235,17 @@ END
 \r
 IDR_TORTOISE_GIT_BLAME_MAINFRAME ACCELERATORS\r
 BEGIN\r
-       "N",            ID_FILE_NEW,            VIRTKEY,CONTROL\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
+//     "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
-       VK_BACK,        ID_EDIT_UNDO,           VIRTKEY,ALT\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
@@ -266,7 +270,7 @@ FONT 8, "MS Shell Dlg"
 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",IDC_STATIC,42,26,114,8\r
+    LTEXT           "Copyright (C) 2009 TortoiseGit",IDC_STATIC,42,26,114,8\r
     DEFPUSHBUTTON   "OK",IDOK,113,41,50,14,WS_GROUP\r
 END\r
 \r
@@ -294,13 +298,13 @@ BEGIN
        BEGIN\r
         BLOCK "040904e4"\r
                BEGIN\r
-            VALUE "CompanyName", "TODO: <Company name>"\r
-            VALUE "FileDescription", "TODO: <File description>"\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 "LegalCopyright", "TODO: (c) <Company name>.  All rights reserved."\r
+            VALUE "LegalCopyright", "TortoiseGit.  All rights reserved."\r
                        VALUE "OriginalFilename","TortoiseGitBlame.exe"\r
-            VALUE "ProductName", "TODO: <Product name>"\r
+            VALUE "ProductName", "TortoiseGit"\r
                        VALUE "ProductVersion",  "1.0.0.1"\r
                END\r
        END\r
@@ -443,6 +447,20 @@ STRINGTABLE
 BEGIN\r
        IDS_GIT_LOG_TAB                 "Git Log"\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,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
+END\r
+\r
+\r
+\r
 #endif\r
 \r
 #ifndef APSTUDIO_INVOKED\r

diff --git a/src/TortoiseGitBlame/Resource.h b/src/TortoiseGitBlame/Resource.h
index e3fa2f8..b834900 100644 (file)
--- a/src/TortoiseGitBlame/Resource.h
+++ b/src/TortoiseGitBlame/Resource.h
@@ -41,6 +41,11 @@
 #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

diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
index 632d912..e5493fb 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
@@ -41,6 +41,8 @@ BEGIN_MESSAGE_MAP(CTortoiseGitBlameView, CView)
        ON_COMMAND(ID_FILE_PRINT, &CView::OnFilePrint)\r
        ON_COMMAND(ID_FILE_PRINT_DIRECT, &CView::OnFilePrint)\r
        ON_COMMAND(ID_FILE_PRINT_PREVIEW, &CTortoiseGitBlameView::OnFilePrintPreview)\r
+       ON_COMMAND(ID_EDIT_FIND,OnEditFind)\r
+       ON_COMMAND(ID_EDIT_GOTO,OnEditGoto)\r
        ON_WM_CREATE()\r
        ON_WM_SIZE()\r
        ON_WM_MOUSEMOVE()\r
@@ -702,13 +704,12 @@ bool CTortoiseGitBlameView::DoSearch(LPSTR what, DWORD flags)
 \r
 bool CTortoiseGitBlameView::GotoLine(long line)\r
 {\r
-#if 0\r
        --line;\r
        if (line < 0)\r
                return false;\r
-       if ((unsigned long)line >= authors.size())\r
+       if ((unsigned long)line >= m_CommitHash.size())\r
        {\r
-               line = authors.size()-1;\r
+               line = m_CommitHash.size()-1;\r
        }\r
 \r
        int nCurrentPos = SendEditor(SCI_GETCURRENTPOS);\r
@@ -738,7 +739,7 @@ bool CTortoiseGitBlameView::GotoLine(long line)
        int nPosStart = SendEditor(SCI_POSITIONFROMLINE,line);\r
        int nPosEnd = SendEditor(SCI_GETLINEENDPOSITION,line);\r
        SendEditor(SCI_SETSEL,nPosEnd,nPosStart);\r
-#endif\r
+\r
        return true;\r
 }\r
 \r
@@ -2693,4 +2694,12 @@ BOOL CTortoiseGitBlameView::PreTranslateMessage(MSG* pMsg)
 {\r
        m_ToolTip.RelayEvent(pMsg);\r
        return CView::PreTranslateMessage(pMsg);\r
+}\r
+\r
+void CTortoiseGitBlameView::OnEditFind()\r
+{\r
+}\r
+\r
+void CTortoiseGitBlameView::OnEditGoto()\r
+{\r
 }
\ No newline at end of file

diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.h b/src/TortoiseGitBlame/TortoiseGitBlameView.h
index b0f2a09..d28e81b 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.h
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.h
@@ -72,6 +72,8 @@ protected:
 // Generated message map functions\r
 protected:\r
        BOOL PreTranslateMessage(MSG* pMsg);\r
+       afx_msg void OnEditFind();\r
+       afx_msg void OnEditGoto();\r
        afx_msg void OnFilePrintPreview();\r
        afx_msg void OnRButtonUp(UINT nFlags, CPoint point);\r
        afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);\r