Fixed issue #113: (11) Push and push times out on WebDAV passwords

11. Settings: Git -> Remote: When creating the first remote, the "Remote"
should have "origin" as default.

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

diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp
index 227d83e..5bf3bb4 100644 (file)
--- a/src/TortoiseProc/Settings/SettingGitRemote.cpp
+++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp
@@ -104,7 +104,14 @@ void CSettingGitRemote::OnBnClickedButtonBrowse()
 void CSettingGitRemote::OnBnClickedButtonAdd()\r
 {\r
     // TODO: Add your control notification handler code here\r
-       this->m_strRemote.Empty();\r
+       if( this->m_ctrlRemoteList.GetCount() == 0)\r
+       {\r
+               this->m_strRemote = _T("origin");\r
+       }\r
+       else\r
+       { \r
+               this->m_strRemote.Empty();\r
+       }\r
        this->m_strUrl.Empty();\r
        this->m_strPuttyKeyfile.Empty();\r
        this->UpdateData(FALSE);\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 6dbe9fe..bf72a6f 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -580,11 +580,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -612,11 +612,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -860,11 +860,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -896,11 +896,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -976,11 +976,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1080,11 +1080,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r