Add auto load putty key option at clone, pull and push dialog.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / AppUtils.h

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index 955da17..7b6a645 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -158,7 +158,8 @@ public:
        static bool CreateBranchTag(bool IsTag=TRUE,CString *CommitHash=NULL);\r
        static bool Switch(CString *CommitHash);\r
 \r
-       static bool IgnoreFile(CTGitPath &file, bool IsMask);\r
+//     static bool IgnoreFile(CTGitPath &file, bool IsMask);\r
+       static bool IgnoreFile(CTGitPathList &filelist,bool IsMask);\r
        static bool GitReset(CString *CommitHash,int type=1);\r
        static bool ConflictEdit(CTGitPath &file,bool bAlternativeTool=false);\r
        /**\r
@@ -181,7 +182,13 @@ public:
         */\r
        static CString ToRelativeTimeString(CTime time);\r
 \r
-       \r
+       static CString GetMergeTempFile(CString str,CTGitPath &merge);\r
+       static int         StashApply(CString ref);\r
+\r
+    static bool IsSSHPutty();\r
+\r
+    static bool LaunchRemoteSetting();\r
+\r
 private:\r
        static CString PickDiffTool(const CTGitPath& file1, const CTGitPath& file2);\r
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r
@@ -190,4 +197,6 @@ private:
         */\r
        static CString ToRelativeTimeString(COleDateTime time,COleDateTime RelativeTo);\r
        static CString ExpandRelativeTime( int count, UINT format_1, UINT format_n );\r
+\r
+       static void DescribeFile(bool mode, bool base,CString &descript);\r
 };\r