PATCH: [ 1875853 ] Save modified linefilter when editbox loses focus

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index a71a7af..5a6cdf3 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -4,6 +4,7 @@ to Subversion revision numbers (rXXXXX).
 
 WinMerge 2.7.7.3
   Resolve conflict files (cvs, svn...) (#1875129)
+  Save line filter when edit box loses focus (#1875853)
   BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
   Bugfix: Clipped text in file saving error message (#1874854)
 

diff --git a/Src/PropLineFilter.cpp b/Src/PropLineFilter.cpp
index 74a65ae..2f4740c 100644 (file)
--- a/Src/PropLineFilter.cpp
+++ b/Src/PropLineFilter.cpp
@@ -66,6 +66,7 @@ BEGIN_MESSAGE_MAP(CPropLineFilter, CPropertyPage)
        ON_BN_CLICKED(IDC_LFILTER_REMOVEBTN, OnBnClickedLfilterRemovebtn)
        ON_BN_CLICKED(IDC_LFILTER_EDITSAVE, OnBnClickedLfilterEditsave)
        ON_NOTIFY(LVN_ITEMACTIVATE, IDC_LFILTER_LIST, OnLvnItemActivateLfilterList)
+       ON_EN_KILLFOCUS(IDC_LFILTER_EDITBOX, OnEnKillfocusLfilterEditbox)
 END_MESSAGE_MAP()
 
 
@@ -247,19 +248,7 @@ void CPropLineFilter::OnBnClickedLfilterRemovebtn()
  */
 void CPropLineFilter::OnBnClickedLfilterEditsave()
 {
-       ASSERT(m_bEditing);
-
-       int sel =- 1;
-       sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
-       if (sel != -1)
-       {
-               CString text;
-               m_editRegexp.GetWindowText(text);
-               m_filtersList.SetItemText(sel, 0, text);
-       }
-       m_bEditing = FALSE;
-       m_editRegexp.SetReadOnly(TRUE);
-       m_saveRegexp.EnableWindow(FALSE);
+       SaveItem();
 }
 
 /**
@@ -299,3 +288,32 @@ void CPropLineFilter::OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResu
        m_editRegexp.SetWindowText(text);
        *pResult = 0;
 }
+
+/**
+ * @brief Save the current filter in edit box.
+ */
+void CPropLineFilter::SaveItem()
+{
+       if (m_bEditing)
+       {
+               int sel =- 1;
+               sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
+               if (sel != -1)
+               {
+                       CString text;
+                       m_editRegexp.GetWindowText(text);
+                       m_filtersList.SetItemText(sel, 0, text);
+               }
+               m_bEditing = FALSE;
+               m_editRegexp.SetReadOnly(TRUE);
+               m_saveRegexp.EnableWindow(FALSE);
+       }
+}
+
+/**
+ * @brief Called when filter edit box loses its focus.
+ */
+void CPropLineFilter::OnEnKillfocusLfilterEditbox()
+{
+       SaveItem();
+}

diff --git a/Src/PropLineFilter.h b/Src/PropLineFilter.h
index c7afb56..f16bb31 100644 (file)
--- a/Src/PropLineFilter.h
+++ b/Src/PropLineFilter.h
@@ -1,11 +1,3 @@
-// PropLineFilter.h : header file
-//
-
-#include "afxcmn.h"
-#include "afxwin.h"
-#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
-#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
-
 /** 
  * @file  PropLineFilter.h
  *
@@ -15,6 +7,11 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
+#include "afxcmn.h"
+#include "afxwin.h"
+#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
+#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
+
 class LineFiltersList;
 
 /// Class for Line filter propertypage
@@ -59,12 +56,14 @@ protected:
        virtual BOOL PreTranslateMessage(MSG* pMsg);
        afx_msg void OnBnClickedLfilterEditsave();
        afx_msg void OnLvnItemActivateLfilterList(NMHDR *pNMHDR, LRESULT *pResult);
+       afx_msg void OnEnKillfocusLfilterEditbox();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 
        void InitList();
        int AddRow(LPCTSTR filter = NULL, BOOL enabled = FALSE);
        void EditSelectedFilter();
+       void SaveItem();
 
 private:
        CListCtrl m_filtersList; /**< List control having filter strings */