Add a "Defaults" button to the "Options (Archive Support)" dialog. (#2362)

Author: tjmprm77

Src/Merge.rc

@@ -2035,6 +2035,7 @@ BEGIN
     CONTROL         "&Enable archive file support",IDC_ARCHIVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,6,271,10
     CONTROL         "&Detect archive type from file signature",IDC_ARCHIVE_DETECTTYPE,
                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP,7,18,271,10
+    PUSHBUTTON      "Defaults", IDC_COMPARE_DEFAULTS, 191, 228, 88, 14
 END
 
 IDD_PROPPAGE_PROJECT DIALOGEX 0, 0, 285, 242
@@ -2829,7 +2830,8 @@ IDD_PROPPAGE_ARCHIVE AFX_DIALOG_LAYOUT
 BEGIN
     0,
     0, 0, 100, 0,
-    0, 0, 100, 0
+    0, 0, 100, 0,
+    100, 0, 0, 0
 END
 
 IDD_PROPPAGE_BACKUPS AFX_DIALOG_LAYOUT

Src/PropArchive.cpp

@@ -36,6 +36,7 @@ void PropArchive::DoDataExchange(CDataExchange* pDX)
 
 
 BEGIN_MESSAGE_MAP(PropArchive, OptionsPanel)
+	ON_BN_CLICKED(IDC_COMPARE_DEFAULTS, OnDefaults)
 	ON_BN_CLICKED(IDC_ARCHIVE_ENABLE, OnEnableClicked)
 END_MESSAGE_MAP()
 
@@ -57,6 +58,16 @@ void PropArchive::WriteOptions()
 	GetOptionsMgr()->SaveOption(OPT_ARCHIVE_PROBETYPE, m_bProbeType);
 }
 
+/**
+ * @brief Sets options to defaults
+ */
+void PropArchive::OnDefaults()
+{
+	m_bEnableSupport = GetOptionsMgr()->GetDefault<bool>(OPT_ARCHIVE_ENABLE);
+	m_bProbeType = GetOptionsMgr()->GetDefault<bool>(OPT_ARCHIVE_PROBETYPE);
+	UpdateData(FALSE);
+}
+
 /** 
  * @brief Called when archive support is enabled or disabled.
  */

Src/PropArchive.h

@@ -29,6 +29,7 @@ class PropArchive : public OptionsPanel
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	void UpdateControls();
 
+	afx_msg void OnDefaults();
 	afx_msg void OnEnableClicked();
 
 	DECLARE_MESSAGE_MAP()