Fixed issue #188: Add Git Properties tab into Windows File Properties

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / resourceshell.rc

diff --git a/src/TortoiseShell/resourceshell.rc b/src/TortoiseShell/resourceshell.rc
index 72dedc3..99c3494 100644 (file)
--- a/src/TortoiseShell/resourceshell.rc
+++ b/src/TortoiseShell/resourceshell.rc
@@ -111,42 +111,30 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION
 CAPTION "Property Page"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    LTEXT           "URL:",IDC_STATIC,4,5,26,8\r
-    EDITTEXT        IDC_REPOURL,30,5,213,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    LTEXT           "URL:",IDC_ESCAPEDURLLABEL,4,17,26,8\r
-    EDITTEXT        IDC_REPOURLUNESCAPED,29,17,214,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "Revision / Author:",IDC_STATIC,4,31,76,8\r
-    EDITTEXT        IDC_REVISION,80,31,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    EDITTEXT        IDC_AUTHOR,120,31,94,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    LTEXT           "Last commit revision:",IDC_STATIC,4,43,76,8\r
-    EDITTEXT        IDC_CREVISION,80,43,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    EDITTEXT        IDC_CDATE,120,43,123,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    LTEXT           "Text Status:",IDC_STATIC,4,55,76,8\r
-    EDITTEXT        IDC_TEXTSTATUS,80,55,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    EDITTEXT        IDC_TEXTDATE,120,55,123,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    LTEXT           "Property Status:",IDC_STATIC,4,67,76,8\r
-    EDITTEXT        IDC_PROPSTATUS,80,67,40,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    EDITTEXT        IDC_PROPDATE,120,67,123,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
-    LTEXT           "Lock owner:",IDC_STATIC,4,79,76,8\r
-    EDITTEXT        IDC_LOCKOWNER,80,79,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "Lock creation date:",IDC_STATIC,4,91,76,8\r
-    EDITTEXT        IDC_LOCKDATE,80,90,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "Repository UUID:",IDC_STATIC,4,103,76,8\r
-    EDITTEXT        IDC_REPOUUID,80,102,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "Changelist:",IDC_STATIC,4,115,76,8\r
-    EDITTEXT        IDC_CHANGELIST,80,114,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "Depth:",IDC_STATIC,4,127,76,8\r
-    EDITTEXT        IDC_DEPTHEDIT,80,126,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "Checksum:",IDC_STATIC,4,139,76,8\r
-    EDITTEXT        IDC_CHECKSUM,80,138,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
-    LTEXT           "locked:",IDC_STATIC,4,151,76,8\r
-    LTEXT           "yes",IDC_LOCKED,80,150,163,8\r
-    LTEXT           "switched:",IDC_STATIC,4,163,76,8\r
-    LTEXT           "yes",IDC_SWITCHED,80,162,163,8\r
-    LTEXT           "copied:",IDC_STATIC,4,175,76,8\r
-    LTEXT           "yes",IDC_COPIED,80,174,163,8\r
-    PUSHBUTTON      "&Properties...",IDC_EDITPROPERTIES,4,191,107,14\r
-    PUSHBUTTON      "Show &log",IDC_SHOWLOG,120,191,123,14\r
+    LTEXT           "Current Branch:",IDC_STATIC,4,9,59,8\r
+    EDITTEXT        IDC_CURRENT_BRANCH,91,9,142,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    LTEXT           "Tracked Remote Branch:",IDC_ESCAPEDURLLABEL,4,21,85,8\r
+    EDITTEXT        IDC_REMOTE_BRANCH,91,21,139,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+    LTEXT           "HEAD:",IDC_STATIC,4,35,76,8\r
+    EDITTEXT        IDC_HEAD_HASH,80,35,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    EDITTEXT        IDC_HEAD_SUBJECT,80,47,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    EDITTEXT        IDC_HEAD_AUTHOR,80,59,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    EDITTEXT        IDC_HEAD_DATE,79,71,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    LTEXT           "Auto Crlf:",IDC_STATIC,13,171,76,8\r
+    EDITTEXT        IDC_CONFIG_AUTOCRLF,71,171,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+    LTEXT           "Safe Crlf:",IDC_STATIC,13,183,76,8\r
+    EDITTEXT        IDC_CONFIG_SAFECRLF,71,183,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+    LTEXT           "User Name:",IDC_STATIC,13,195,76,8\r
+    EDITTEXT        IDC_CONFIG_USERNAME,71,195,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+    LTEXT           "User Email:",IDC_STATIC,13,207,76,8\r
+    EDITTEXT        IDC_CONFIG_USEREMAIL,71,207,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER\r
+    PUSHBUTTON      "Show &log",IDC_SHOWLOG,120,238,123,14\r
+    GROUPBOX        "Config",IDC_STATIC,4,159,239,66\r
+    LTEXT           "Last Modified:",IDC_STATIC,4,97,76,8\r
+    EDITTEXT        IDC_LAST_HASH,80,97,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    EDITTEXT        IDC_LAST_SUBJECT,80,108,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    EDITTEXT        IDC_LAST_AUTHOR,80,121,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
+    EDITTEXT        IDC_LAST_DATE,80,132,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_TRANSPARENT\r
 END\r
 \r
 \r
@@ -435,6 +423,9 @@ BEGIN
     IDS_MENUSVNDCOMMIT_DESC "Git SVN DCommit"\r
     IDS_MENUSYNC            "Sync..."\r
     IDS_MENUDESCSYNC        "Sync remote Remote Repostory, include pull, push,email patch and so on"\r
+    IDS_MENUSTASHPOP        "Stash Pop"\r
+    IDS_MENUSVNIGNORE       "Import SVN Ignore ..."\r
+    IDS_MENUSVNIGNORE_DESC  "Import SVN Ignore"\r
 END\r
 \r
 #endif    // English (U.S.) resources\r