Enable Submodule Add dialog resizable

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

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 568bd96..7b743fd 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/Commands/SubmoduleCommand.cpp b/src/TortoiseProc/Commands/SubmoduleCommand.cpp
index 739e119..d129be3 100644 (file)
--- a/src/TortoiseProc/Commands/SubmoduleCommand.cpp
+++ b/src/TortoiseProc/Commands/SubmoduleCommand.cpp
@@ -25,12 +25,15 @@
 #include "Git.h"\r
 #include "DirFileEnum.h"\r
 #include "ShellUpdater.h"\r
-#include "ChangedDlg.h"\r
+#include "SubmoduleAddDlg.h"\r
 \r
 bool SubmoduleAddCommand::Execute()\r
 {\r
        bool bRet = false;\r
+       CSubmoduleAddDlg dlg;\r
 \r
+       if( dlg.DoModal() == IDOK )\r
+               bRet = TRUE;\r
 \r
        return bRet;\r
 }\r

diff --git a/src/TortoiseProc/SubmoduleAddDlg.cpp b/src/TortoiseProc/SubmoduleAddDlg.cpp
index e1c5752..aae3774 100644 (file)
--- a/src/TortoiseProc/SubmoduleAddDlg.cpp
+++ b/src/TortoiseProc/SubmoduleAddDlg.cpp
@@ -8,10 +8,10 @@
 \r
 // CSubmoduleAddDlg dialog\r
 \r
-IMPLEMENT_DYNAMIC(CSubmoduleAddDlg, CDialog)\r
+IMPLEMENT_DYNAMIC(CSubmoduleAddDlg, CResizableStandAloneDialog)\r
 \r
 CSubmoduleAddDlg::CSubmoduleAddDlg(CWnd* pParent /*=NULL*/)\r
-       : CDialog(CSubmoduleAddDlg::IDD, pParent)\r
+       : CResizableStandAloneDialog(CSubmoduleAddDlg::IDD, pParent)\r
        , m_bBranch(FALSE)\r
        , m_strBranch(_T(""))\r
 {\r
@@ -32,8 +32,54 @@ void CSubmoduleAddDlg::DoDataExchange(CDataExchange* pDX)
 }\r
 \r
 \r
-BEGIN_MESSAGE_MAP(CSubmoduleAddDlg, CDialog)\r
+BEGIN_MESSAGE_MAP(CSubmoduleAddDlg, CResizableStandAloneDialog)\r
+       ON_COMMAND(IDC_REP_BROWSE,                      OnRepBrowse)\r
+       ON_COMMAND(IDC_BUTTON_PATH_BROWSE,      OnPathBrowse)\r
+       ON_COMMAND(IDC_BRANCH_CHECK,            OnBranchCheck)\r
 END_MESSAGE_MAP()\r
 \r
 \r
 // CSubmoduleAddDlg message handlers\r
+\r
+BOOL CSubmoduleAddDlg::OnInitDialog()\r
+{\r
+       CResizableStandAloneDialog::OnInitDialog();\r
+\r
+       AddAnchor(IDOK,BOTTOM_RIGHT);\r
+       AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+       AddAnchor(IDC_GROUP_SUBMODULE,TOP_LEFT,BOTTOM_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_REPOSITORY,TOP_LEFT,TOP_RIGHT);\r
+       AddAnchor(IDC_COMBOBOXEX_PATH,TOP_LEFT,TOP_RIGHT);\r
+       AddAnchor(IDC_REP_BROWSE,TOP_RIGHT);\r
+       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
+\r
+       AddOthersToAnchor();\r
+\r
+       EnableSaveRestore(_T("SubmoduleAddDlg"));\r
+\r
+       m_Repository.SetURLHistory(true);\r
+       m_PathCtrl.SetPathHistory(true);\r
+\r
+       return TRUE;\r
+}\r
+\r
+void CSubmoduleAddDlg::OnRepBrowse()\r
+{\r
+}\r
+void CSubmoduleAddDlg::OnPathBrowse()\r
+{\r
+}\r
+void CSubmoduleAddDlg::OnBranchCheck()\r
+{\r
+       this->UpdateData();\r
+       if(this->m_bBranch)\r
+       {\r
+               this->GetDlgItem(IDC_SUBMODULE_BRANCH)->ShowWindow(TRUE);               \r
+       }else\r
+       {\r
+               this->GetDlgItem(IDC_SUBMODULE_BRANCH)->ShowWindow(FALSE);              \r
+       }\r
+}
\ No newline at end of file

diff --git a/src/TortoiseProc/SubmoduleAddDlg.h b/src/TortoiseProc/SubmoduleAddDlg.h
index 6e46d20..09aed47 100644 (file)
--- a/src/TortoiseProc/SubmoduleAddDlg.h
+++ b/src/TortoiseProc/SubmoduleAddDlg.h
@@ -1,28 +1,31 @@
 #pragma once\r
 #include "afxcmn.h"\r
-\r
-\r
+#include "StandAloneDlg.h"\r
+#include "HistoryCombo.h"\r
 // CSubmoduleAddDlg dialog\r
 \r
-class CSubmoduleAddDlg : public CDialog\r
+class CSubmoduleAddDlg : public CResizableStandAloneDialog\r
 {\r
        DECLARE_DYNAMIC(CSubmoduleAddDlg)\r
 \r
 public:\r
        CSubmoduleAddDlg(CWnd* pParent = NULL);   // standard constructor\r
        virtual ~CSubmoduleAddDlg();\r
-\r
+       BOOL OnInitDialog();\r
 // Dialog Data\r
        enum { IDD = IDD_SUBMODULE_ADD };\r
 \r
 protected:\r
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
-\r
+       void OnRepBrowse();\r
+       void OnPathBrowse();\r
+       void OnBranchCheck();\r
+       \r
        DECLARE_MESSAGE_MAP()\r
 public:\r
-       CComboBoxEx m_Repository;\r
+       CHistoryCombo m_Repository;\r
 public:\r
-       CComboBoxEx m_PathCtrl;\r
+       CHistoryCombo m_PathCtrl;\r
 public:\r
        BOOL m_bBranch;\r
 public:\r