Add Many Help button at dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 1549658..5d5ba3e 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp
index a02bf1c..a357cad 100644 (file)
--- a/src/TortoiseProc/BrowseRefsDlg.cpp
+++ b/src/TortoiseProc/BrowseRefsDlg.cpp
@@ -86,6 +86,7 @@ BOOL CBrowseRefsDlg::OnInitDialog()
 \r
        AddAnchor(IDC_TREE_REF, TOP_LEFT, BOTTOM_LEFT);\r
        AddAnchor(IDC_LIST_REF_LEAFS, TOP_LEFT, BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        m_ListRefLeafs.SetExtendedStyle(m_ListRefLeafs.GetExtendedStyle()|LVS_EX_FULLROWSELECT);\r
        m_ListRefLeafs.InsertColumn(eCol_Name,  L"Name",0,150);\r

diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp
index f391552..37c2cc5 100644 (file)
--- a/src/TortoiseProc/CloneDlg.cpp
+++ b/src/TortoiseProc/CloneDlg.cpp
@@ -46,6 +46,7 @@ BOOL CCloneDlg::OnInitDialog()
     AddAnchor(IDC_PUTTYKEYFILE_BROWSE,BOTTOM_RIGHT);\r
     AddAnchor(IDC_PUTTYKEY_AUTOLOAD,BOTTOM_LEFT);\r
     AddAnchor(IDC_PUTTYKEYFILE,BOTTOM_LEFT,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        this->AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/CreateBranchTagDlg.cpp b/src/TortoiseProc/CreateBranchTagDlg.cpp
index 54ccdbc..73a914e 100644 (file)
--- a/src/TortoiseProc/CreateBranchTagDlg.cpp
+++ b/src/TortoiseProc/CreateBranchTagDlg.cpp
@@ -58,6 +58,7 @@ BOOL CCreateBranchTagDlg::OnInitDialog()
 \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        this->AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/FormatPatchDlg.cpp b/src/TortoiseProc/FormatPatchDlg.cpp
index e616fa3..856ca80 100644 (file)
--- a/src/TortoiseProc/FormatPatchDlg.cpp
+++ b/src/TortoiseProc/FormatPatchDlg.cpp
@@ -77,6 +77,7 @@ BOOL CFormatPatchDlg::OnInitDialog()
        AddAnchor(IDC_CHECK_SENDMAIL,BOTTOM_LEFT);\r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        this->AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/ImportPatchDlg.cpp b/src/TortoiseProc/ImportPatchDlg.cpp
index c0f4544..f23abbb 100644 (file)
--- a/src/TortoiseProc/ImportPatchDlg.cpp
+++ b/src/TortoiseProc/ImportPatchDlg.cpp
@@ -39,6 +39,7 @@ BOOL CImportPatchDlg::OnInitDialog()
 \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        this->AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp
index 179bb25..5170cc3 100644 (file)
--- a/src/TortoiseProc/MergeDlg.cpp
+++ b/src/TortoiseProc/MergeDlg.cpp
@@ -53,6 +53,7 @@ BOOL CMergeDlg::OnInitDialog()
        \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        this->AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/PullFetchDlg.cpp b/src/TortoiseProc/PullFetchDlg.cpp
index 5e2f3e6..106297e 100644 (file)
--- a/src/TortoiseProc/PullFetchDlg.cpp
+++ b/src/TortoiseProc/PullFetchDlg.cpp
@@ -55,6 +55,7 @@ BOOL CPullFetchDlg::OnInitDialog()
     AddAnchor(IDC_GROUPT_REMOTE,TOP_LEFT,BOTTOM_RIGHT);\r
     AddAnchor(IDC_PUTTYKEY_AUTOLOAD,BOTTOM_LEFT);\r
     AddAnchor(IDC_REMOTE_MANAGE,BOTTOM_LEFT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
     this->AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/PushDlg.cpp b/src/TortoiseProc/PushDlg.cpp
index fc606fe..9272245 100644 (file)
--- a/src/TortoiseProc/PushDlg.cpp
+++ b/src/TortoiseProc/PushDlg.cpp
@@ -80,6 +80,7 @@ BOOL CPushDlg::OnInitDialog()
     AddAnchor(IDC_PUTTYKEY_AUTOLOAD,TOP_LEFT);\r
 \r
     AddAnchor(IDC_REMOTE_MANAGE,TOP_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index c78e7e8..83c3067 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -74,6 +74,7 @@ void CRebaseDlg::AddRebaseAnchor()
        AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);\r
        AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);\r
        AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
        this->AddOthersToAnchor();\r
 }\r
 \r

diff --git a/src/TortoiseProc/RefLogDlg.cpp b/src/TortoiseProc/RefLogDlg.cpp
index d3bb480..12f7b05 100644 (file)
--- a/src/TortoiseProc/RefLogDlg.cpp
+++ b/src/TortoiseProc/RefLogDlg.cpp
@@ -49,6 +49,7 @@ BOOL CRefLogDlg::OnInitDialog()
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
        \r
        AddAnchor(IDC_REFLOG_LIST,TOP_LEFT,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        AddOthersToAnchor();\r
        this->EnableSaveRestore(_T("RefLogDlg"));\r

diff --git a/src/TortoiseProc/SendMailDlg.cpp b/src/TortoiseProc/SendMailDlg.cpp
index 97ff5f0..ca11805 100644 (file)
--- a/src/TortoiseProc/SendMailDlg.cpp
+++ b/src/TortoiseProc/SendMailDlg.cpp
@@ -68,6 +68,7 @@ BOOL CSendMailDlg::OnInitDialog()
        AddAnchor(IDC_SENDMAIL_PATCHS,TOP_LEFT,BOTTOM_RIGHT);\r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        this->AddOthersToAnchor();\r
        EnableSaveRestore(_T("SendMailDlg"));\r

diff --git a/src/TortoiseProc/SubmoduleAddDlg.cpp b/src/TortoiseProc/SubmoduleAddDlg.cpp
index 13aa51b..7f1ea73 100644 (file)
--- a/src/TortoiseProc/SubmoduleAddDlg.cpp
+++ b/src/TortoiseProc/SubmoduleAddDlg.cpp
@@ -55,7 +55,7 @@ BOOL CSubmoduleAddDlg::OnInitDialog()
        AddAnchor(IDC_BUTTON_PATH_BROWSE,TOP_RIGHT);    \r
        AddAnchor(IDC_BRANCH_CHECK,BOTTOM_LEFT);\r
        AddAnchor(IDC_SUBMODULE_BRANCH,BOTTOM_LEFT,BOTTOM_RIGHT);\r
-\r
+       AddAnchor(IDHELP, BOTTOM_RIGHT);\r
 \r
        AddOthersToAnchor();\r
 \r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 6270413..b9bf06e 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -399,14 +399,6 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\BrowseRefsDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\BrowseRefsDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\TGitCache\CacheInterface.cpp"\r
                                >\r
                        </File>\r
@@ -588,11 +580,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -620,11 +612,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -868,11 +860,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -904,11 +896,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -984,11 +976,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1088,11 +1080,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1975,6 +1967,14 @@
                                Name="RefBrowse"\r
                                >\r
                                <File\r
+                                       RelativePath=".\BrowseRefsDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\BrowseRefsDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Commands\RefBrowseCommand.h"\r
                                        >\r
                                </File>\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index a36a24f..005da05 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ