Complete Send mail coding and mail send have some problem.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitSwitchDlg.cpp

diff --git a/src/TortoiseProc/GitSwitchDlg.cpp b/src/TortoiseProc/GitSwitchDlg.cpp
index 981897f..a5db02e 100644 (file)
--- a/src/TortoiseProc/GitSwitchDlg.cpp
+++ b/src/TortoiseProc/GitSwitchDlg.cpp
@@ -18,6 +18,8 @@ CGitSwitchDlg::CGitSwitchDlg(CWnd* pParent /*=NULL*/)
        ,CChooseVersion(this)\r
 {\r
        m_bBranch=FALSE;\r
+       m_bTrack=FALSE;\r
+       m_bForce=FALSE;\r
 }\r
 \r
 CGitSwitchDlg::~CGitSwitchDlg()\r
@@ -55,9 +57,12 @@ BOOL CGitSwitchDlg::OnInitDialog()
 \r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       \r
+       CHOOSE_VERSION_ADDANCHOR;\r
+       this->AddOthersToAnchor();\r
 \r
+       EnableSaveRestore(_T("SwitchDlg"));\r
 \r
-       CHOOSE_VERSION_ADDANCHOR;\r
        Init();\r
 \r
        if(m_Base.IsEmpty())\r
@@ -86,15 +91,27 @@ void CGitSwitchDlg::OnBnClickedChooseRadioHost()
        \r
 }\r
 \r
+void CGitSwitchDlg::OnBnClickedShow()\r
+{\r
+       OnBnClickedChooseVersion();\r
+}\r
+\r
 void CGitSwitchDlg::OnBnClickedOk()\r
 {\r
-       // TODO: Add your control notification handler code here\r
        this->UpdateData(TRUE);\r
        \r
-       \r
-       //this->m_Version.SaveHistory();\r
-\r
-       OnOK();\r
+       // make sure a valid branch has been entered if a new branch is required\r
+       if ( m_bBranch  &&  ( m_NewBranch.Trim().IsEmpty() ||  m_NewBranch.Find(' ') >= 0 ) )\r
+       {\r
+               // new branch requested but name is empty or contains spaces\r
+               CMessageBox::Show(NULL, IDS_B_T_NOTEMPTY, IDS_TORTOISEGIT, MB_OK);\r
+       }\r
+       else\r
+       {\r
+               UpdateRevsionName();\r
+               //this->m_Version.SaveHistory();\r
+               OnOK();\r
+       }\r
 }\r
 void CGitSwitchDlg::OnBnClickedCheckBranch()\r
 {\r