PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 6959ff4..fb8a904 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -8,6 +8,9 @@ Add new items to top.
   Src/editlib: ccrystaltextview2.cpp
  PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
   Src: MergeDoc.cpp MergeDoc.h
+ PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
+  Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
+  Src/Languages/*: Merge*.rc
 
 2006-07-02 Kimmo
  PATCH: [ 1515669 ] Add selected difference marker for locationview

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 41665d3..58a9873 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1955,6 +1955,8 @@ BEGIN
     IDS_MESSAGE_BOX_ARE_RESET "All message boxes are now displayed again."
     IDS_DIFF_OPEN_NO_SET_PROPS "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
     IDS_FONT_CHANGE         "The selected font change will not be applied to any currently visible difference windows."
+    IDS_OPTIONS_INVALID_TABSIZE 
+                            "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
 END
 
 // BROWSE FILE

diff --git a/Src/PropEditor.cpp b/Src/PropEditor.cpp
index 9d38df1..34ab61b 100644 (file)
--- a/Src/PropEditor.cpp
+++ b/Src/PropEditor.cpp
@@ -11,6 +11,7 @@
 #include "PropEditor.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
+#include ".\propeditor.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -18,6 +19,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+/** @brief Maximum size for tabs in spaces. */
 static const int MAX_TABSIZE = 64;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -44,7 +46,6 @@ void CPropEditor::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_HILITE_CHECK, m_bHiliteSyntax);
        DDX_Radio(pDX, IDC_PROP_INSERT_TABS, m_nTabType);
        DDX_Text(pDX, IDC_TAB_EDIT, m_nTabSize);
-       DDV_MinMaxInt(pDX, m_nTabSize, 1, MAX_TABSIZE);
        DDX_Check(pDX, IDC_AUTOMRESCAN_CHECK, m_bAutomaticRescan);
        DDX_Check(pDX, IDC_MIXED_EOL, m_bAllowMixedEol);
        DDX_Check(pDX, IDC_UNREC_APPLYSYNTAX, m_bApplySyntax);
@@ -62,6 +63,7 @@ BEGIN_MESSAGE_MAP(CPropEditor, CDialog)
        ON_BN_CLICKED(IDC_VIEW_LINE_DIFFERENCES, OnLineDiffControlClicked)
        ON_BN_CLICKED(IDC_EDITOR_CHARLEVEL, OnLineDiffControlClicked)
        ON_BN_CLICKED(IDC_EDITOR_WORDLEVEL, OnLineDiffControlClicked)
+       ON_EN_KILLFOCUS(IDC_TAB_EDIT, OnEnKillfocusTabEdit)
 END_MESSAGE_MAP()
 
 /** 
@@ -85,6 +87,11 @@ void CPropEditor::ReadOptions()
  */
 void CPropEditor::WriteOptions()
 {
+       // Sanity check tabsize
+       if (m_nTabSize < 1)
+               m_nTabSize = 1;
+       if (m_nTabSize > MAX_TABSIZE)
+               m_nTabSize = MAX_TABSIZE;
        m_pOptionsMgr->SaveOption(OPT_TAB_SIZE, (int)m_nTabSize);
        m_pOptionsMgr->SaveOption(OPT_TAB_TYPE, (int)m_nTabType);
        m_pOptionsMgr->SaveOption(OPT_AUTOMATIC_RESCAN, m_bAutomaticRescan == TRUE);
@@ -167,6 +174,8 @@ void CPropEditor::OnLineDiffControlClicked()
 
 /**
  * @brief Shortcut to enable or disable a control
+ * @param [in] item ID of dialog control to enable/disable.
+ * @paran [in] enable if true control is enabled, else disabled.
  */
 void CPropEditor::EnableDlgItem(int item, bool enable)
 {
@@ -175,7 +184,6 @@ void CPropEditor::EnableDlgItem(int item, bool enable)
 
 /** 
  * @brief Update availability of line difference controls
- *
  */
 void CPropEditor::UpdateLineDiffControls()
 {
@@ -187,3 +195,22 @@ void CPropEditor::UpdateLineDiffControls()
        EnableDlgItem(IDC_BREAK_TYPE, !!m_bViewLineDifferences);
 }
 
+/** 
+ * @brief Check tabsize value when control loses focus.
+ */
+void CPropEditor::OnEnKillfocusTabEdit()
+{
+       CEdit * pEdit = (CEdit *)GetDlgItem(IDC_TAB_EDIT);
+       CString valueAsText;
+       pEdit->GetWindowText(valueAsText);
+       int value = _ttoi(valueAsText);
+       
+       if (value < 1 || value > MAX_TABSIZE)
+       {
+               CString msg;
+               CString num;
+               num.Format(_T("%d"), MAX_TABSIZE);
+               AfxFormatString1(msg, IDS_OPTIONS_INVALID_TABSIZE, num);
+               AfxMessageBox(msg, MB_ICONWARNING);
+       }
+}

diff --git a/Src/PropEditor.h b/Src/PropEditor.h
index 89ebb1d..2e5a0fd 100644 (file)
--- a/Src/PropEditor.h
+++ b/Src/PropEditor.h
@@ -72,6 +72,8 @@ protected:
 
 private:
        COptionsMgr * m_pOptionsMgr;
+public:
+       afx_msg void OnEnKillfocusTabEdit();
 };
 
 //{{AFX_INSERT_LOCATION}}

diff --git a/Src/resource.h b/Src/resource.h
index 78c2956..e88eabe 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -428,6 +428,7 @@
 #define IDS_MESSAGE_BOX_ARE_RESET       16401
 #define IDS_DIFF_OPEN_NO_SET_PROPS      16402
 #define IDS_FONT_CHANGE                 16403
+#define IDS_OPTIONS_INVALID_TABSIZE     16404
 #define IDS_OPEN_TITLE                  16416
 #define IDS_PROGRAMFILES                16417
 #define IDS_ALLFILES                    16418