Editor Repeat has presets, can be added to batch and run from macro

Author: Cavaler

Common.cpp

@@ -41,7 +41,7 @@ void ReadRegistry()
 	FReadRegistry(Settings);
 	FTReadRegistry(Settings);
 
-	g_pEditorBatchType = new CBatchType(MEditorBatches, ESPresets, ERPresets, EFPresets, ETPresets, NULL);
+	g_pEditorBatchType = new CBatchType(MEditorBatches, ESPresets, ERPresets, EPPresets, EFPresets, ETPresets, NULL);
 	g_pEditorBatches = new CBatchActionCollection(*g_pEditorBatchType, Settings.Open(_T("EditorBatches")));
 
 	g_pPanelBatchType = new CBatchType(MPanelBatches, FSPresets, FRPresets, RnPresets, QRPresets, FGPresets, NULL);

EditFind/EditCommon.cpp

@@ -17,6 +17,10 @@ CParameterSet g_ERParamSet(EditorReplaceExecutor,
 	"RemoveEmpty", &ERRemoveEmpty, "RemoveNoMatch", &ERRemoveNoMatch,
 	"AsScript", &EREvaluate, "FromCurrent", &EFromCurrentPosition, NULL
 					 );
+CParameterSet g_EPParamSet(EditorRepeatExecutor,
+	"Replace", &ReplaceText, "Script", &EREvaluateScript, NULL,
+	"RepeatCount", &ERRepeatCount, "AsScript", &EREvaluate, NULL
+					 );
 CParameterSet g_EFParamSet(EditorFilterExecutor,
 	"Text", &SearchText, "@Text", &EText, NULL, NULL,
 	"LeaveFilter", &EFLeaveFilter, "IsRegExp", &ERegExp, "CaseSensitive", &ECaseSensitive,
@@ -36,6 +40,7 @@ void EReadRegistry(CFarSettingsKey Key)
 
 	ESPresets = new CESPresetCollection(g_ESParamSet);
 	ERPresets = new CERPresetCollection(g_ERParamSet);
+	EPPresets = new CEPPresetCollection(g_EPParamSet);
 	EFPresets = new CEFPresetCollection(g_EFParamSet);
 	ETPresets = new CETPresetCollection(g_ETParamSet);
 }
@@ -572,6 +577,7 @@ void ECleanup(bool PatternOnly)
 	if (!PatternOnly) {
 		delete ESPresets;
 		delete ERPresets;
+		delete EPPresets;
 		delete EFPresets;
 		delete ETPresets;
 	}

EditFind/EditFind.h

@@ -19,6 +19,13 @@ class CERPresetCollection:public CStdPresetCollection {
 	virtual int  ID() { return 0; }
 };
 
+class CEPPresetCollection:public CStdPresetCollection {
+public:
+	CEPPresetCollection(CParameterSet &ParamSet) : CStdPresetCollection(ParamSet, _T("EditRepeat"), MEPPreset) {}
+	virtual bool EditPreset(CPreset *pPreset);
+	virtual int  ID() { return 4; }
+};
+
 class CEFPresetCollection:public CStdPresetCollection {
 public:
 	CEFPresetCollection(CParameterSet &ParamSet) : CStdPresetCollection(ParamSet, _T("EditFilter"), MEFPreset) {}
@@ -40,10 +47,12 @@ enum EPositioning {EP_BEGIN, EP_DIR, EP_END};
 
 extern CParameterSet g_ESParamSet;
 extern CParameterSet g_ERParamSet;
+extern CParameterSet g_EPParamSet;
 extern CParameterSet g_EFParamSet;
 extern CParameterSet g_ETParamSet;
 EXTERN CESPresetCollection *ESPresets;
 EXTERN CERPresetCollection *ERPresets;
+EXTERN CEPPresetCollection *EPPresets;
 EXTERN CEFPresetCollection *EFPresets;
 EXTERN CETPresetCollection *ETPresets;
 
@@ -115,6 +124,7 @@ EXTERN bool EListAllFromPreset;
 EXTERN bool ECountAllFromPreset;
 OperationResult EditorSearchExecutor();
 OperationResult EditorReplaceExecutor();
+OperationResult EditorRepeatExecutor();
 OperationResult EditorFilterExecutor();
 OperationResult EditorTransliterateExecutor();
 void EditorSeekToBeginEnd();

EditFind/EditRepeat.cpp

@@ -79,6 +79,7 @@ bool EditorRepeatText()
 	Dialog.Add(new CFarTextItem(27, 7, 0, MTimes));
 
 	Dialog.AddButtons(MOk, MCancel, MBtnClose);
+	Dialog.Add(new CFarButtonItem(64, 9, 0, FALSE, MBtnPresets));
 
 	ReplaceText = PickupMultilineSelection();
 	if (ReplaceText.empty()) ReplaceText = ERReplace;
@@ -92,6 +93,9 @@ bool EditorRepeatText()
 		case MQuoteReplace:
 			CSO::QuoteReplaceString(ReplaceText);
 			break;
+		case MBtnPresets:
+			EPPresets->ShowMenu(true);
+			break;
 		case MRunEditor:
 			RunExternalEditor(ReplaceText);
 			break;
@@ -115,3 +119,66 @@ bool EditorRepeatText()
 
 	return true;
 }
+
+OperationResult EditorRepeatExecutor()
+{
+	if (!EditorUpdateSelectionPosition())
+		return OR_FAILED;
+
+	if (!CompileLUAString(ReplaceText, ScriptEngine(EREvaluate))) return OR_FAILED;
+
+#ifdef UNICODE
+	ERReplace = ReplaceText;
+#else
+	ERReplace = ERReplace_O2E = ReplaceText;
+	OEMToEditor(ERReplace_O2E);
+#endif
+
+	NoAsking = true;
+	FindNumber = ReplaceNumber = 0;
+	REParam.m_setInitParam.clear();
+	SanitateEngine();
+
+	bool bResult = EditorRepeatAgain();
+	StartupInfo.EditorControl(ECTL_REDRAW, NULL);
+	return bResult ? OR_OK : OR_CANCEL;
+}
+
+bool CEPPresetCollection::EditPreset(CPreset *pPreset)
+{
+	CFarDialog Dialog(80, 17, _T("EPPresetDlg"));
+	Dialog.SetUseID(true);
+
+	Dialog.AddFrame(MEPPreset);
+	Dialog.Add(new CFarTextItem(5, 2, 0, MPresetName));
+	Dialog.Add(new CFarEditItem(5, 3, 74, DIF_HISTORY,_T("RESearch.PresetName"), pPreset->Name()));
+
+	Dialog.Add(new CFarTextItem(5, 4, 0, MTextToRepeat));
+	Dialog.Add(new CFarEditItem(5, 5, 69, DIF_HISTORY|DIF_VAREDIT,_T("ReplaceText"), pPreset->m_mapStrings["Replace"]));
+	Dialog.Add(new CFarButtonItem(71, 5, 0, 0, MQuoteReplace));
+
+	Dialog.Add(new CFarTextItem(5, 6, DIF_BOXCOLOR|DIF_SEPARATOR, _T("")));
+
+	Dialog.Add(new CFarCheckBoxItem(5, 7, 0, MEvaluateAsScript, &pPreset->m_mapInts["AsScript"]));
+	Dialog.Add(new CFarComboBoxItem(35, 7, 60, 0, new CFarListData(m_lstEngines, false), new CFarEngineStorage(pPreset->m_mapStrings["Script"])));
+	Dialog.Add(new CFarButtonItem(64, 7, 0, FALSE, MRunEditor));
+
+	Dialog.Add(new CFarTextItem(5,  9, 0, MRepeatTimes));
+	Dialog.Add(new CFarEditItem(20, 9, 25, 0, NULL, &pPreset->m_mapInts["RepeatCount"], new CFarIntegerRangeValidator(1, 16384)));
+	Dialog.Add(new CFarTextItem(27, 9, 0, MTimes));
+
+	Dialog.Add(new CFarCheckBoxItem(5, 11, 0, MAddToMenu, &pPreset->m_bAddToMenu));
+	Dialog.AddButtons(MOk, MCancel);
+
+	do {
+		switch (Dialog.Display()) {
+		case MOk:
+			return true;
+		case MRunEditor:
+			RunExternalEditor(pPreset->m_mapStrings["Replace"]);
+			break;
+		default:
+			return false;
+		}
+	} while (true);
+}

RESearch.cpp

@@ -154,6 +154,7 @@ int ShowEditorMenu(int &nBreakCode)
 	MenuItems.push_back(CFarMenuItemEx(true));
 	ESPresets->FillMenuItems(MenuItems);
 	ERPresets->FillMenuItems(MenuItems);
+	EPPresets->FillMenuItems(MenuItems);
 	EFPresets->FillMenuItems(MenuItems);
 	ETPresets->FillMenuItems(MenuItems);
 
@@ -366,6 +367,7 @@ OperationResult OpenPluginFromEditorPreset(int nItem, int nBreakCode)
 
 	if (FindRunPreset(ESPresets, nItem, nBreakCode, Result) ||
 		FindRunPreset(ERPresets, nItem, nBreakCode, Result) ||
+		FindRunPreset(EPPresets, nItem, nBreakCode, Result) ||
 		FindRunPreset(EFPresets, nItem, nBreakCode, Result) ||
 		FindRunPreset(ETPresets, nItem, nBreakCode, Result)
 		) return OR_OK;

RESearch.msg

@@ -135,7 +135,7 @@ MLeaveMatching		"&Leave matching lines"		"&Оставить совпадающи
 MRemoveMatching		"R&emove matching lines"	"&Убрать совпадающие строки"			"R&emover líneas coincidentes"
 
 MRepeatText			"Repeat text"				"Повторение текста"
-MTextToRepeat		"&Text to repeat:"			"Повторяемый текст:"
+MTextToRepeat		"Te&xt to repeat:"			"Повторяемый текст:"
 MRepeatTimes		"&Repeat:"					"Повторить:"
 MTimes				"times"						"раз"
 
@@ -293,6 +293,7 @@ MInvalidCmdLine		"Invalid command line"				"Неверная командная
 
 MESPreset			"Editor search preset"				"Пресет поиска в редакторе"				"Preajuste de búsqueda en editor"
 MERPreset			"Editor replace preset"				"Пресет замены в редакторе"				"Preajuste de reemplazo en editor"
+MEPPreset			"Editor repeat preset"				"Пресет повтора в редакторе"
 MEFPreset			"Editor filter preset"				"Пресет фильтра в редакторе"			"Preajuste de filtro en editor"
 METPreset			"Editor transliterate preset"		"Пресет транслитерации в редакторе"		"Preajuste de transliteración de editor"
 MFSPreset			"File search preset"				"Пресет поиска в файлах"				"Preajuste de búsqueda de archivo"

RESearchMacro.cpp

@@ -121,6 +121,7 @@ HANDLE RunEditorPreset(LPCWSTR szPreset)
 
 	FindRunPreset(ESPresets, szPreset, Result) ||
 	FindRunPreset(ERPresets, szPreset, Result) ||
+	FindRunPreset(EPPresets, szPreset, Result) ||
 	FindRunPreset(EFPresets, szPreset, Result) ||
 	FindRunPreset(ETPresets, szPreset, Result);
 
@@ -359,6 +360,9 @@ HANDLE OpenPluginFromEditorParameters(const OpenMacroInfo *MInfo)
 	} else if (_wcsicmp(MInfo->Values[0].String, L"Replace") == 0) {
 		pSet  = &g_ERParamSet;
 		pColl =    ERPresets;
+	} else if (_wcsicmp(MInfo->Values[0].String, L"Repeat") == 0) {
+		pSet  = &g_EPParamSet;
+		pColl =    EPPresets;
 	} else if (_wcsicmp(MInfo->Values[0].String, L"Filter") == 0) {
 		pSet  = &g_EFParamSet;
 		pColl =    EFPresets;

RESearch_msg.h

@@ -293,6 +293,7 @@ enum eStringTable {
 
 	MESPreset,
 	MERPreset,
+	MEPPreset,
 	MEFPreset,
 	METPreset,
 	MFSPreset,