Move regular expression changes

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@755 595ec19a-5cb4-439b-94a8-42fb3063c22c

CP_Main.rc

@@ -336,6 +336,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Contains Text Search",        ID_MENU_CONTAINSTEXTSEARCHONLY
         MENUITEM "Regular Expression Search",   ID_MENU_REGULAREXPRESSIONSEARCH
+        MENUITEM "Wildcard Search",             ID_MENU_WILDCARDSEARCH
     END
 END
 

DittoSetup/BuildDitto.bld

@@ -389,7 +389,7 @@ var sc_security="b3f57099";
 			<value>3</value>
 		</macro>
 		<macro name='verMinor'>
-			<value>21</value>
+			<value>20</value>
 		</macro>
 		<macro name='verRevision'>
 			<value>0</value>

QPasteWnd.cpp

@@ -221,6 +221,7 @@ ON_MESSAGE(NM_SHOW_PROPERTIES, OnShowProperties)
 ON_MESSAGE(NM_NEW_GROUP, OnNewGroup)
 ON_MESSAGE(NM_DELETE_ID, OnDeleteId)
 ON_COMMAND(ID_MENU_REGULAREXPRESSIONSEARCH, &CQPasteWnd::OnMenuRegularexpressionsearch)
+ON_COMMAND(ID_MENU_WILDCARDSEARCH, &CQPasteWnd::OnMenuWildcardsearch)
 END_MESSAGE_MAP()
 
 
@@ -4046,7 +4047,12 @@ void CQPasteWnd::OnSearchDescription()
 
 		if (CGetSetOptions::GetRegExTextSearch())
 			cmSubMenu->CheckMenuItem(ID_MENU_REGULAREXPRESSIONSEARCH, MF_CHECKED);
-				
+
+		if(CGetSetOptions::GetSimpleTextSearch() == FALSE &&
+			CGetSetOptions::GetRegExTextSearch() == FALSE)
+		{
+			cmSubMenu->CheckMenuItem(ID_MENU_WILDCARDSEARCH, MF_CHECKED);
+		}		
 
 		//theApp.m_Language.UpdateRightClickMenu(cmSubMenu);
 
@@ -4095,11 +4101,6 @@ void CQPasteWnd::OnMenuSearchQuickPaste()
 	}
 }
 
-void CQPasteWnd::OnMenuSimpleTextSearch()
-{
-	CGetSetOptions::SetSimpleTextSearch(!CGetSetOptions::GetSimpleTextSearch());
-}
-
 void CQPasteWnd::OnSearchEditChange()
 {
     if(g_Opt.m_bFindAsYouType == FALSE)
@@ -4635,8 +4636,20 @@ LRESULT CQPasteWnd::OnDeleteId(WPARAM wParam, LPARAM lParam)
 	return TRUE;
 }
 
+void CQPasteWnd::OnMenuSimpleTextSearch()
+{
+	CGetSetOptions::SetSimpleTextSearch(!CGetSetOptions::GetSimpleTextSearch());
+	CGetSetOptions::SetRegExTextSearch(FALSE);
+}
+
 void CQPasteWnd::OnMenuRegularexpressionsearch()
 {
 	CGetSetOptions::SetSimpleTextSearch(FALSE);
 	CGetSetOptions::SetRegExTextSearch(!CGetSetOptions::GetRegExTextSearch());
 }
+
+void CQPasteWnd::OnMenuWildcardsearch()
+{
+	CGetSetOptions::SetSimpleTextSearch(FALSE);
+	CGetSetOptions::SetRegExTextSearch(FALSE);
+}

QPasteWnd.h

@@ -400,4 +400,5 @@ public:
 	afx_msg LRESULT OnNewGroup(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnDeleteId(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnMenuRegularexpressionsearch();
+	afx_msg void OnMenuWildcardsearch();
 };

Resource.h

@@ -493,6 +493,7 @@
 #define ID_MENU_DELETEGROUP             32897
 #define ID_MENU_PROPERTIES32898         32898
 #define ID_MENU_REGULAREXPRESSIONSEARCH 32899
+#define ID_MENU_WILDCARDSEARCH          32900
 
 // Next default values for new objects
 // 
@@ -500,7 +501,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        240
-#define _APS_NEXT_COMMAND_VALUE         32900
+#define _APS_NEXT_COMMAND_VALUE         32901
 #define _APS_NEXT_CONTROL_VALUE         2127
 #define _APS_NEXT_SYMED_VALUE           101
 #endif