From fd000fb545f91276f6ac8034d05a37807f743c75 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 30 Jul 2012 00:59:31 +0200
Subject: [PATCH] Added force option to Submodule Update dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/Resources/TortoiseProcENG.rc               | 13 +++++++------
 src/TortoiseProc/Commands/SubmoduleCommand.cpp |  2 ++
 src/TortoiseProc/SubmoduleUpdateDlg.cpp        |  2 ++
 src/TortoiseProc/SubmoduleUpdateDlg.h          |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index be8231d80..14be434d9 100644
--- a/src/Resources/TortoiseProcENG.rc
+++ b/src/Resources/TortoiseProcENG.rc
@@ -1607,18 +1607,19 @@ BEGIN
     PUSHBUTTON      "Help",IDHELP,204,130,50,14,WS_DISABLED
 END
 
-IDD_SUBMODULE_UPDATE DIALOGEX 0, 0, 242, 77
+IDD_SUBMODULE_UPDATE DIALOGEX 0, 0, 242, 87
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Submodule Update"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    GROUPBOX        "Submodule Update Options",IDC_GROUP_INFO,7,7,225,41
+    GROUPBOX        "Submodule Update Options",IDC_GROUP_INFO,7,7,225,54
     CONTROL         "&Initialize submodules (--init)",IDC_CHECK_SUBMODULE_INIT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,17,210,13
     CONTROL         "&Recursive",IDC_CHECK_SUBMODULE_RECURSIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,31,210,13
-    DEFPUSHBUTTON   "OK",IDOK,69,55,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,125,55,50,14
-    PUSHBUTTON      "Help",IDHELP,182,55,50,14,WS_DISABLED
+    CONTROL         "&Force",IDC_FORCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,210,13
+    DEFPUSHBUTTON   "OK",IDOK,69,65,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,125,65,50,14
+    PUSHBUTTON      "Help",IDHELP,182,65,50,14,WS_DISABLED
 END
 
 IDD_DIALOG_BROWSE_REFS DIALOGEX 0, 0, 465, 255
@@ -2405,7 +2406,7 @@ BEGIN
         RIGHTMARGIN, 232
         VERTGUIDE, 15
         TOPMARGIN, 7
-        BOTTOMMARGIN, 69
+        BOTTOMMARGIN, 79
     END
 
     IDD_DIALOG_BROWSE_REFS, DIALOG
diff --git a/src/TortoiseProc/Commands/SubmoduleCommand.cpp b/src/TortoiseProc/Commands/SubmoduleCommand.cpp
index c407f0550..26bafff99 100644
--- a/src/TortoiseProc/Commands/SubmoduleCommand.cpp
+++ b/src/TortoiseProc/Commands/SubmoduleCommand.cpp
@@ -95,6 +95,8 @@ bool SubmoduleUpdateCommand::Execute()
 		params = _T(" --init");
 	if (submoduleUpdateDlg.m_bRecursive)
 		params += _T(" --recursive");
+	if (submoduleUpdateDlg.m_bForce)
+		params += _T(" --force");
 
 	for (int i = 0; i < this->orgPathList.GetCount(); i++)
 	{
diff --git a/src/TortoiseProc/SubmoduleUpdateDlg.cpp b/src/TortoiseProc/SubmoduleUpdateDlg.cpp
index c8ca1e008..68477783b 100644
--- a/src/TortoiseProc/SubmoduleUpdateDlg.cpp
+++ b/src/TortoiseProc/SubmoduleUpdateDlg.cpp
@@ -28,6 +28,7 @@ CSubmoduleUpdateDlg::CSubmoduleUpdateDlg(CWnd* pParent /*=NULL*/)
 	: CStandAloneDialog(CSubmoduleUpdateDlg::IDD, pParent)
 	, m_bInit(true)
 	, m_bRecursive(FALSE)
+	, m_bForce(FALSE)
 {
 }
 
@@ -40,6 +41,7 @@ void CSubmoduleUpdateDlg::DoDataExchange(CDataExchange* pDX)
 	CStandAloneDialog::DoDataExchange(pDX);
 	DDX_Check(pDX, IDC_CHECK_SUBMODULE_INIT, m_bInit);
 	DDX_Check(pDX, IDC_CHECK_SUBMODULE_RECURSIVE, m_bRecursive);
+	DDX_Check(pDX, IDC_FORCE, m_bForce);
 }
 
 
diff --git a/src/TortoiseProc/SubmoduleUpdateDlg.h b/src/TortoiseProc/SubmoduleUpdateDlg.h
index 58e56a840..a04cd2480 100644
--- a/src/TortoiseProc/SubmoduleUpdateDlg.h
+++ b/src/TortoiseProc/SubmoduleUpdateDlg.h
@@ -44,4 +44,5 @@ protected:
 public:
 	BOOL m_bInit;
 	BOOL m_bRecursive;
+	BOOL m_bForce;
 };
-- 
2.11.4.GIT