Support clear find and replace history.

zufuliu · Aug 14, 2018 · 9708ab1 · 9708ab1
1 parent 6794779
commit 9708ab1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/metapath/src/Dialogs.c b/metapath/src/Dialogs.c
@@ -1581,7 +1581,10 @@ INT_PTR CALLBACK CopyMoveDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
 	case WM_NOTIFY: {
 		LPNMHDR pnmhdr = (LPNMHDR)lParam;
 		if (pnmhdr->idFrom == IDC_EMPTY_MRU && (pnmhdr->code == NM_CLICK || pnmhdr->code == NM_RETURN)) {
+			WCHAR tch[MAX_PATH];
+			GetDlgItemText(hwnd, IDC_DESTINATION, tch, COUNTOF(tch));
 			MRU_ClearCombobox(GetDlgItem(hwnd, IDC_DESTINATION), L"Copy/Move MRU");
+			SetDlgItemText(hwnd, IDC_DESTINATION, tch);
 		}
 	}
 	return TRUE;

diff --git a/src/Edit.c b/src/Edit.c
@@ -4852,6 +4852,19 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd, UINT umsg, WPARAM wParam, LP
 				MsgBox(MBINFO, IDS_WILDCARDHELP);
 			}
 #endif
+			else if (pnmhdr->idFrom == IDC_CLEAR_FIND) {
+				GetDlgItemText(hwnd, IDC_FINDTEXT, tch, COUNTOF(tch));
+				SendDlgItemMessage(hwnd, IDC_FINDTEXT, CB_RESETCONTENT, 0, 0);
+				MRU_Empty(mruFind);
+				MRU_Save(mruFind);
+				SetDlgItemText(hwnd, IDC_FINDTEXT, tch);
+			} else if (pnmhdr->idFrom == IDC_CLEAR_REPLACE) {
+				GetDlgItemText(hwnd, IDC_REPLACETEXT, tch, COUNTOF(tch));
+				SendDlgItemMessage(hwnd, IDC_REPLACETEXT, CB_RESETCONTENT, 0, 0);
+				MRU_Empty(mruReplace);
+				MRU_Save(mruReplace);
+				SetDlgItemText(hwnd, IDC_REPLACETEXT, tch);
+			}
 			break;
 		}
 	}

diff --git a/src/Notepad2.rc b/src/Notepad2.rc
@@ -803,6 +803,7 @@ BEGIN
     CONTROL         "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,61,74,10
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,208,61,14,10
 //#endif
+    CONTROL         "<a>Clear History</a>", IDC_CLEAR_FIND, "SysLink", WS_TABSTOP, 174, 7, 48, 10
 END
 
 IDD_REPLACE DIALOGEX 0, 0, 290, 130
@@ -812,7 +813,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,65,8
     COMBOBOX        IDC_FINDTEXT,7,17,210,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Replace wit&h:",IDC_STATIC,7,35,64,8
+    LTEXT           "Replace Wit&h:",IDC_STATIC,7,35,64,8
     COMBOBOX        IDC_REPLACETEXT,7,46,209,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Match &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10
     CONTROL         "Match &whole word only",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,105,10
@@ -834,6 +835,8 @@ BEGIN
     CONTROL         "W&ildcard Search",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,90,74,10
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,208,90,14,10
 //#endif
+    CONTROL         "<a>Clear History</a>", IDC_CLEAR_FIND, "SysLink", WS_TABSTOP, 174, 6, 48, 10 
+    CONTROL         "<a>Clear History</a>", IDC_CLEAR_REPLACE, "SysLink", WS_TABSTOP, 174, 35, 48, 10 
 END
 
 IDD_RUN DIALOGEX 0, 0, 234, 86
@@ -916,7 +919,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,212,158
     CONTROL         "&Remember recent files on exit.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,169,114,10
-    CONTROL         "<a>Clear History</a>",IDC_EMPTY_MRU,"SysLink",WS_TABSTOP,169,169,54,10
+    CONTROL         "<a>Clear History</a>",IDC_EMPTY_MRU,"SysLink",WS_TABSTOP,169,169,48,10
     DEFPUSHBUTTON   "OK",IDOK,67,183,50,14,WS_DISABLED
     PUSHBUTTON      "Cancel",IDCANCEL,169,183,50,14
     SCROLLBAR       IDC_RESIZEGRIP,7,187,10,10

diff --git a/src/resource.h b/src/resource.h
@@ -119,6 +119,8 @@
 #define IDC_REGEXPHELP					152
 #define IDC_WILDCARDHELP				153
 #define IDC_WILDCARDSEARCH				154
+#define IDC_CLEAR_FIND					155
+#define IDC_CLEAR_REPLACE				156
 #define IDACC_FIND						200
 #define IDACC_REPLACE					201
 #define IDACC_SAVEPOS					202