Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[NEW_FEATURE] Find dialog has 'Extended' option: search for tabs, newlines,

Browse Source 
[ENHANCEMENT] Find dialog shows text that was searched when its not found,
some code cleanup (replace now only replaces given word on first hit, instead of selection, if it contained the token).

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@176 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
harrybharry 2008-04-22 22:47:49 +00:00
parent 9a38619187
commit 936d040e40
5 changed files with 473 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PowerEditor/src/Notepad_plus.cpp
View File

@ -1147,7 +1147,7 @@ bool Notepad_plus::replaceAllFiles() {
if (!_pEditView->getCurrentBuffer().isReadOnly()) if (!_pEditView->getCurrentBuffer().isReadOnly())
{ {
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
nbTotal += _findReplaceDlg.processAll(REPLACE_ALL, isEntireDoc); nbTotal += _findReplaceDlg.processAll(ProcessReplaceAll, NULL, NULL, isEntireDoc, NULL);
_pEditView->execute(SCI_ENDUNDOACTION); _pEditView->execute(SCI_ENDUNDOACTION);
} }
} }
@ -1161,7 +1161,7 @@ bool Notepad_plus::replaceAllFiles() {
if (!_pEditView->getCurrentBuffer().isReadOnly()) if (!_pEditView->getCurrentBuffer().isReadOnly())
{ {
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
nbTotal += _findReplaceDlg.processAll(REPLACE_ALL, isEntireDoc); nbTotal += _findReplaceDlg.processAll(ProcessReplaceAll, NULL, NULL, isEntireDoc, NULL);
_pEditView->execute(SCI_ENDUNDOACTION); _pEditView->execute(SCI_ENDUNDOACTION);
} }
} }
@ -1336,7 +1336,7 @@ bool Notepad_plus::findInFiles(bool isRecursive)
{ {
const char *fn = fileNames[i].c_str(); const char *fn = fileNames[i].c_str();
if (doSimpleOpen(fn)) if (doSimpleOpen(fn))
nbTotal += _findReplaceDlg.processAll(FIND_ALL, true, fn); nbTotal += _findReplaceDlg.processAll(ProcessFindAll, NULL, NULL, true, fn);
} }
_findReplaceDlg.setFinderReadOnly(); _findReplaceDlg.setFinderReadOnly();
_findReplaceDlg.putFindResult(nbTotal); _findReplaceDlg.putFindResult(nbTotal);
@ -1371,7 +1371,7 @@ bool Notepad_plus::findInOpenedFiles() {
_pDocTab->activate(i); _pDocTab->activate(i);
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
nbTotal += _findReplaceDlg.processAll(FIND_ALL, isEntireDoc, _pEditView->getCurrentTitle()); nbTotal += _findReplaceDlg.processAll(ProcessFindAll, NULL, NULL, isEntireDoc, _pEditView->getCurrentTitle());
_pEditView->execute(SCI_ENDUNDOACTION); _pEditView->execute(SCI_ENDUNDOACTION);
} }
@ -1384,7 +1384,7 @@ bool Notepad_plus::findInOpenedFiles() {
_pDocTab->activate(i); _pDocTab->activate(i);
_pEditView->execute(SCI_BEGINUNDOACTION); _pEditView->execute(SCI_BEGINUNDOACTION);
nbTotal += _findReplaceDlg.processAll(FIND_ALL, isEntireDoc, _pEditView->getCurrentTitle()); nbTotal += _findReplaceDlg.processAll(ProcessFindAll, NULL, NULL, isEntireDoc, _pEditView->getCurrentTitle());
_pEditView->execute(SCI_ENDUNDOACTION); _pEditView->execute(SCI_ENDUNDOACTION);
} }

636
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -22,7 +22,54 @@
#include "common_func.h" #include "common_func.h"
#include "UniConversion.h" #include "UniConversion.h"
int Searching::convertExtendedToString(const char * query, char * result, int length) { //query may equal to result, since it always gets smaller
int i = 0, j = 0;
bool isGood = true;
char token;
while(i < length) { //because the backslash escape quences always reduce the size of the string, no overflow checks have to be made for target, assuming parameters are correct
if (query[i] == '\\') { //possible escape sequence
i++;
token = query[i];
switch(token) {
case 'r':
result[j] = '\r';
break;
case 'n':
result[j] = '\n';
break;
case '0':
result[j] = '\0';
break;
case 't':
result[j] = '\t';
break;
case '\\':
result[j] = '\\';
break;
default: { //unknown sequence, treat as regular text
result[j] = '\\';
j++;
result[j] = token;
isGood = false;
break;
}
}
} else {
result[j] = query[i];
}
i++;
j++;
}
result[j] = 0;
return j;
}
int Searching::buildSearchFlags(FindOption * option) {
int flags = (option->_isWholeWord ? SCFIND_WHOLEWORD : 0) |
(option->_isMatchCase ? SCFIND_MATCHCASE : 0) |
(option->_searchType == FindRegex ? SCFIND_REGEXP|SCFIND_POSIX : 0);
return flags;
}
void FindReplaceDlg::addText2Combo(const char * txt2add, HWND hCombo, bool isUTF8) void FindReplaceDlg::addText2Combo(const char * txt2add, HWND hCombo, bool isUTF8)
{ {
@ -281,6 +328,9 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
{ {
// Wrap arround active by default // Wrap arround active by default
::SendDlgItemMessage(_hSelf, IDWRAP, BM_SETCHECK, BST_CHECKED, 0); ::SendDlgItemMessage(_hSelf, IDWRAP, BM_SETCHECK, BST_CHECKED, 0);
// Normal search active by default
::SendDlgItemMessage(_hSelf, IDNORMAL, BM_SETCHECK, BST_CHECKED, 0);
if (_isRecursive) if (_isRecursive)
::SendDlgItemMessage(_hSelf, IDD_FINDINFILES_RECURSIVE_CHECK, BM_SETCHECK, BST_CHECKED, 0); ::SendDlgItemMessage(_hSelf, IDD_FINDINFILES_RECURSIVE_CHECK, BM_SETCHECK, BST_CHECKED, 0);
@ -388,7 +438,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
case IDCANCEL : // Close case IDCANCEL : // Close
display(false); display(false);
return TRUE; return TRUE;
//Single actions
case IDOK : // Find Next case IDOK : // Find Next
{ {
if ((_currentStatus == FIND_DLG) || (_currentStatus == REPLACE_DLG)) if ((_currentStatus == FIND_DLG) || (_currentStatus == REPLACE_DLG))
@ -396,7 +446,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
bool isUnicode = (*_ppEditView)->getCurrentBuffer().getUnicodeMode() != uni8Bit; bool isUnicode = (*_ppEditView)->getCurrentBuffer().getUnicodeMode() != uni8Bit;
HWND hFindCombo = ::GetDlgItem(_hSelf, IDFINDWHAT); HWND hFindCombo = ::GetDlgItem(_hSelf, IDFINDWHAT);
string str2Search = getTextFromCombo(hFindCombo, isUnicode); string str2Search = getTextFromCombo(hFindCombo, isUnicode);
addText2Combo(str2Search.c_str(), hFindCombo, isUnicode); updateCombo(IDFINDWHAT);
processFindNext(str2Search.c_str()); processFindNext(str2Search.c_str());
} }
else if (_currentStatus == FINDINFILES_DLG) else if (_currentStatus == FINDINFILES_DLG)
@ -410,11 +460,60 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
{ {
if (_currentStatus == REPLACE_DLG) if (_currentStatus == REPLACE_DLG)
{ {
bool isUnicode = (*_ppEditView)->getCurrentBuffer().getUnicodeMode() != uni8Bit;
HWND hFindCombo = ::GetDlgItem(_hSelf, IDFINDWHAT);
HWND hReplaceCombo = ::GetDlgItem(_hSelf, IDREPLACEWITH);
string str2Search = getTextFromCombo(hFindCombo, isUnicode);
string str2Replace = getTextFromCombo(hReplaceCombo, isUnicode);
updateCombos(); updateCombos();
processReplace(); processReplace(str2Search.c_str(), str2Replace.c_str());
} }
} }
return TRUE; return TRUE;
//Process actions
case IDC_FINDALL_OPENEDFILES :
{
if (_currentStatus == FIND_DLG)
{
updateCombo(IDFINDWHAT);
findAllIn(ALL_OPEN_DOCS);
}
}
return TRUE;
case IDD_FINDINFILES_FIND_BUTTON :
{
if (_currentStatus == FINDINFILES_DLG)
{
char filters[256];
char directory[MAX_PATH];
::GetDlgItemText(_hSelf, IDD_FINDINFILES_FILTERS_COMBO, filters, sizeof(filters));
addText2Combo(filters, ::GetDlgItem(_hSelf, IDD_FINDINFILES_FILTERS_COMBO));
_filters = filters;
::GetDlgItemText(_hSelf, IDD_FINDINFILES_DIR_COMBO, directory, sizeof(directory));
addText2Combo(directory, ::GetDlgItem(_hSelf, IDD_FINDINFILES_DIR_COMBO));
_directory = directory;
if ((strlen(directory) > 0) && (directory[strlen(directory)-1] != '\\'))
_directory += "\\";
updateCombo(IDFINDWHAT);
findAllIn(FILES_IN_DIR);
}
}
return TRUE;
case IDC_REPLACE_OPENEDFILES :
{
if (_currentStatus == REPLACE_DLG)
{
updateCombos();
replaceAllInOpenedDocs();
}
}
return TRUE;
case IDREPLACEALL : case IDREPLACEALL :
{ {
@ -423,7 +522,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
updateCombos(); updateCombos();
(*_ppEditView)->execute(SCI_BEGINUNDOACTION); (*_ppEditView)->execute(SCI_BEGINUNDOACTION);
int nbReplaced = processAll(REPLACE_ALL); int nbReplaced = processAll(ProcessReplaceAll, NULL, NULL);
(*_ppEditView)->execute(SCI_ENDUNDOACTION); (*_ppEditView)->execute(SCI_ENDUNDOACTION);
char result[64]; char result[64];
@ -439,22 +538,20 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
} }
return TRUE; return TRUE;
case IDC_REPLACE_OPENEDFILES : case IDCCOUNTALL :
{
if (_currentStatus == REPLACE_DLG)
{
updateCombos();
replaceAllInOpenedDocs();
}
}
return TRUE;
case IDC_FINDALL_OPENEDFILES :
{ {
if (_currentStatus == FIND_DLG) if (_currentStatus == FIND_DLG)
{ {
updateCombo(IDFINDWHAT); int nbCounted = processAll(ProcessCountAll, NULL, NULL);
findAllIn(ALL_OPEN_DOCS); char result[128];
if (nbCounted < 0)
strcpy(result, "The regular expression to search is formed badly.\r\nIs it resulting in nothing?");
else
{
itoa(nbCounted, result, 10);
strcat(result, " tokens are found.");
}
::MessageBox(_hSelf, result, "", MB_OK);
} }
} }
return TRUE; return TRUE;
@ -464,16 +561,16 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
if (_currentStatus == FIND_DLG) if (_currentStatus == FIND_DLG)
{ {
updateCombo(IDFINDWHAT); updateCombo(IDFINDWHAT);
int nbMarked = processAll(MARK_ALL);
char result[64]; int nbMarked = processAll(ProcessMarkAll, NULL, NULL);
char result[128];
if (nbMarked < 0) if (nbMarked < 0)
strcpy(result, "The regular expression to search is formed badly"); strcpy(result, "The regular expression to search is formed badly.\r\nIs it resulting in nothing?");
else else
{ {
itoa(nbMarked, result, 10); itoa(nbMarked, result, 10);
strcat(result, " tokens are found and marked"); strcat(result, " tokens are found.");
} }
::MessageBox(_hSelf, result, "", MB_OK); ::MessageBox(_hSelf, result, "", MB_OK);
} }
} }
@ -491,25 +588,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
} }
} }
return TRUE; return TRUE;
//Option actions
case IDCCOUNTALL :
{
if (_currentStatus == FIND_DLG)
{
int nbCounted = processAll(COUNT_ALL);
char result[64];
if (nbCounted < 0)
strcpy(result, "The regular expression to search is formed badly");
else
{
itoa(nbCounted, result, 10);
strcat(result, " tokens are found.");
}
::MessageBox(_hSelf, result, "", MB_OK);
}
}
return TRUE;
case IDWHOLEWORD : case IDWHOLEWORD :
_options._isWholeWord = isCheckedOrNot(IDWHOLEWORD); _options._isWholeWord = isCheckedOrNot(IDWHOLEWORD);
return TRUE; return TRUE;
@ -518,19 +597,25 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
_options._isMatchCase = isCheckedOrNot(IDMATCHCASE); _options._isMatchCase = isCheckedOrNot(IDMATCHCASE);
return TRUE; return TRUE;
case IDREGEXP : case IDNORMAL:
_options._isRegExp = isCheckedOrNot(IDREGEXP); case IDEXTENDED:
case IDREGEXP : {
_options._searchType = isCheckedOrNot(IDREGEXP)?FindRegex:isCheckedOrNot(IDEXTENDED)?FindExtended:FindNormal;
if (_options._isRegExp) bool isRegex = (_options._searchType == FindRegex);
if (isRegex) { //regex doesnt allow wholeword
_options._isWholeWord = false; _options._isWholeWord = false;
::SendDlgItemMessage(_hSelf, IDWHOLEWORD, BM_SETCHECK, _options._isWholeWord?BST_CHECKED:BST_UNCHECKED, 0); ::SendDlgItemMessage(_hSelf, IDWHOLEWORD, BM_SETCHECK, _options._isWholeWord?BST_CHECKED:BST_UNCHECKED, 0);
::EnableWindow(::GetDlgItem(_hSelf, IDWHOLEWORD), (BOOL)!_options._isRegExp); }
::EnableWindow(::GetDlgItem(_hSelf, IDWHOLEWORD), (BOOL)!isRegex);
::SendDlgItemMessage(_hSelf, IDDIRECTIONUP, BM_SETCHECK, BST_UNCHECKED, 0); if (isRegex) { //regex doesnt allow upward search
::EnableWindow(::GetDlgItem(_hSelf, IDDIRECTIONUP), (BOOL)!_options._isRegExp); ::SendDlgItemMessage(_hSelf, IDDIRECTIONDOWN, BM_SETCHECK, BST_CHECKED, 0);
::SendDlgItemMessage(_hSelf, IDDIRECTIONDOWN, BM_SETCHECK, BST_CHECKED, 0); ::SendDlgItemMessage(_hSelf, IDDIRECTIONUP, BM_SETCHECK, BST_UNCHECKED, 0);
_options._whichDirection = DIR_DOWN; _options._whichDirection = DIR_DOWN;
return TRUE; }
::EnableWindow(::GetDlgItem(_hSelf, IDDIRECTIONUP), (BOOL)!isRegex);
return TRUE; }
case IDWRAP : case IDWRAP :
_options._isWrapAround = isCheckedOrNot(IDWRAP); _options._isWrapAround = isCheckedOrNot(IDWRAP);
@ -614,31 +699,6 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
// //
// Find in Files // Find in Files
// //
case IDD_FINDINFILES_FIND_BUTTON :
{
if (_currentStatus == FINDINFILES_DLG)
{
char filters[256];
char directory[MAX_PATH];
::GetDlgItemText(_hSelf, IDD_FINDINFILES_FILTERS_COMBO, filters, sizeof(filters));
addText2Combo(filters, ::GetDlgItem(_hSelf, IDD_FINDINFILES_FILTERS_COMBO));
_filters = filters;
::GetDlgItemText(_hSelf, IDD_FINDINFILES_DIR_COMBO, directory, sizeof(directory));
addText2Combo(directory, ::GetDlgItem(_hSelf, IDD_FINDINFILES_DIR_COMBO));
_directory = directory;
if ((strlen(directory) > 0) && (directory[strlen(directory)-1] != '\\'))
_directory += "\\";
updateCombo(IDFINDWHAT);
findAllIn(FILES_IN_DIR);
}
}
return TRUE;
case IDD_FINDINFILES_RECURSIVE_CHECK : case IDD_FINDINFILES_RECURSIVE_CHECK :
{ {
if (_currentStatus == FINDINFILES_DLG) if (_currentStatus == FINDINFILES_DLG)
@ -670,9 +730,16 @@ bool FindReplaceDlg::processFindNext(const char *txt2find, FindOption *options)
if (!txt2find || !txt2find[0]) if (!txt2find || !txt2find[0])
return false; return false;
const char *pText = txt2find;
FindOption *pOptions = options?options:&_options; FindOption *pOptions = options?options:&_options;
int stringSizeFind = strlen(txt2find);
char *pText = new char[stringSizeFind + 1];
strcpy(pText, txt2find);
if (pOptions->_searchType == FindExtended) {
stringSizeFind = Searching::convertExtendedToString(txt2find, pText, stringSizeFind);
}
int docLength = int((*_ppEditView)->execute(SCI_GETLENGTH)); int docLength = int((*_ppEditView)->execute(SCI_GETLENGTH));
CharacterRange cr = (*_ppEditView)->getSelection(); CharacterRange cr = (*_ppEditView)->getSelection();
@ -693,15 +760,13 @@ bool FindReplaceDlg::processFindNext(const char *txt2find, FindOption *options)
endPosition = docLength; endPosition = docLength;
} }
int flags = (pOptions->_isWholeWord ? SCFIND_WHOLEWORD : 0) | bool isRegExp = pOptions->_searchType == FindRegex;
(pOptions->_isMatchCase ? SCFIND_MATCHCASE : 0) | int flags = Searching::buildSearchFlags(pOptions);
(pOptions->_isRegExp ? SCFIND_REGEXP|SCFIND_POSIX : 0);
(*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition); (*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition);
(*_ppEditView)->execute(SCI_SETTARGETEND, endPosition); (*_ppEditView)->execute(SCI_SETTARGETEND, endPosition);
(*_ppEditView)->execute(SCI_SETSEARCHFLAGS, flags); (*_ppEditView)->execute(SCI_SETSEARCHFLAGS, flags);
int posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, strlen(pText), (LPARAM)pText)); int posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, stringSizeFind, (LPARAM)pText));
if (posFind == -1) //no match found in target, check if a new target should be used if (posFind == -1) //no match found in target, check if a new target should be used
{ {
if (pOptions->_isWrapAround) if (pOptions->_isWrapAround)
@ -721,26 +786,26 @@ bool FindReplaceDlg::processFindNext(const char *txt2find, FindOption *options)
//new target, search again //new target, search again
(*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition); (*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition);
(*_ppEditView)->execute(SCI_SETTARGETEND, endPosition); (*_ppEditView)->execute(SCI_SETTARGETEND, endPosition);
posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, strlen(pText), (LPARAM)pText)); posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, stringSizeFind, (LPARAM)pText));
} }
if (posFind == -1) if (posFind == -1)
{ {
//failed, or failed twice with wrap //failed, or failed twice with wrap
if (pOptions->_isIncremental) //incremental search doesnt trigger messages
return false;
const char stringSize = 12; if (!pOptions->_isIncremental) { //incremental search doesnt trigger messages
char message[30 + stringSize + 5]; //message, string, dots const char stringMaxSize = 64;
strcpy(message, "Can't find the text:\r\n"); char message[30 + stringMaxSize + 5]; //message, string, dots
strncat(message, txt2find, stringSize); strcpy(message, "Can't find the text:\r\n");
if (strlen(txt2find) > stringSize) { strncat(message, pText, stringMaxSize);
strcat(message, "..."); if (strlen(pText) > stringMaxSize) {
strcat(message, "...");
}
::MessageBox(_hSelf, message, "Find", MB_OK);
// if the dialog is not shown, pass the focus to his parent(ie. Notepad++)
if (!::IsWindowVisible(_hSelf))
::SetFocus((*_ppEditView)->getHSelf());
} }
::MessageBox(_hSelf, message, "Find", MB_OK); delete [] pText;
// if the dialog is not shown, pass the focus to his parent(ie. Notepad++)
if (!::IsWindowVisible(_hSelf))
::SetFocus((*_ppEditView)->getHSelf());
return false; return false;
} }
} }
@ -782,6 +847,8 @@ bool FindReplaceDlg::processFindNext(const char *txt2find, FindOption *options)
//(*_ppEditView)->execute(SCI_SETSEL, start, end); //(*_ppEditView)->execute(SCI_SETSEL, start, end);
//(*_ppEditView)->execute(SCI_SETCURRENTPOS, end); //(*_ppEditView)->execute(SCI_SETCURRENTPOS, end);
(*_ppEditView)->execute(SCI_SETANCHOR, start); (*_ppEditView)->execute(SCI_SETANCHOR, start);
delete [] pText;
return true; return true;
} }
@ -789,150 +856,195 @@ bool FindReplaceDlg::processFindNext(const char *txt2find, FindOption *options)
// true : the text is replaced, and find the next occurrence // true : the text is replaced, and find the next occurrence
// false : the text2find is not found, so the text is NOT replace // false : the text2find is not found, so the text is NOT replace
// || the text is replaced, and do NOT find the next occurrence // || the text is replaced, and do NOT find the next occurrence
bool FindReplaceDlg::processReplace() bool FindReplaceDlg::processReplace(const char *txt2find, const char *txt2replace, FindOption *options)
{ {
if ((*_ppEditView)->getCurrentBuffer().isReadOnly()) return false; if (!txt2find || !txt2find[0] || !txt2replace || !txt2replace[0])
//getSearchTexts();
//getReplaceTexts();
bool isUnicode = (*_ppEditView)->getCurrentBuffer().getUnicodeMode() != uni8Bit;
string str2Search = getTextFromCombo(::GetDlgItem(_hSelf, IDFINDWHAT), isUnicode);
if (str2Search == "")
return false; return false;
string str2Relace = getTextFromCombo(::GetDlgItem(_hSelf, IDREPLACEWITH), isUnicode); FindOption *pOptions = options?options:&_options;
if ((*_ppEditView)->getCurrentBuffer().isReadOnly()) return false;
int flags = (_options._isWholeWord ? SCFIND_WHOLEWORD : 0) |
(_options._isMatchCase ? SCFIND_MATCHCASE : 0) |
(_options._isRegExp ? SCFIND_REGEXP|SCFIND_POSIX : 0);
int stringSizeFind = strlen(txt2find);
int stringSizeReplace = strlen(txt2replace);
char *pTextFind = new char[stringSizeFind + 1];
char *pTextReplace = new char[stringSizeReplace + 1];
strcpy(pTextFind, txt2find);
strcpy(pTextReplace, txt2replace);
if (pOptions->_searchType == FindExtended) {
stringSizeFind = Searching::convertExtendedToString(txt2find, pTextFind, stringSizeFind);
stringSizeReplace = Searching::convertExtendedToString(txt2replace, pTextReplace, stringSizeReplace);
}
bool isRegExp = pOptions->_searchType == FindRegex;
int flags = Searching::buildSearchFlags(pOptions);
CharacterRange cr = (*_ppEditView)->getSelection(); CharacterRange cr = (*_ppEditView)->getSelection();
(*_ppEditView)->execute(SCI_SETTARGETSTART, cr.cpMin); (*_ppEditView)->execute(SCI_SETTARGETSTART, cr.cpMin);
(*_ppEditView)->execute(SCI_SETTARGETEND, cr.cpMax); (*_ppEditView)->execute(SCI_SETTARGETEND, cr.cpMax);
(*_ppEditView)->execute(SCI_SETSEARCHFLAGS, flags); (*_ppEditView)->execute(SCI_SETSEARCHFLAGS, flags);
int posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, (WPARAM)str2Search.length(), (LPARAM)str2Search.c_str())); int posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, (WPARAM)stringSizeFind, (LPARAM)pTextFind));
if (posFind != -1) if (posFind != -1)
{ {
if (_options._isRegExp) if (isRegExp)
{ {
//For the rare re exp case. ex: replace ^ by AAA //For the rare re exp case. ex: replace ^ by AAA
int start = int((*_ppEditView)->execute(SCI_GETTARGETSTART)); int start = int((*_ppEditView)->execute(SCI_GETTARGETSTART));
int end = int((*_ppEditView)->execute(SCI_GETTARGETEND)); int end = int((*_ppEditView)->execute(SCI_GETTARGETEND));
int foundTextLen = (end >= start)?end - start:start - end; int foundTextLen = (end >= start)?end - start:start - end;
int replacedLen = (*_ppEditView)->execute(SCI_REPLACETARGETRE, str2Relace.length(), (LPARAM)str2Relace.c_str()); int replacedLen = (*_ppEditView)->execute(SCI_REPLACETARGETRE, stringSizeReplace, (LPARAM)pTextReplace);
if (!foundTextLen) if (!foundTextLen)
(*_ppEditView)->execute(SCI_SETSEL, start, start + replacedLen); (*_ppEditView)->execute(SCI_SETSEL, start, start + replacedLen);
} }
else else
{ {
(*_ppEditView)->execute(SCI_REPLACESEL, str2Relace.length(), (LPARAM)str2Relace.c_str()); (*_ppEditView)->execute(SCI_REPLACETARGET, stringSizeReplace, (LPARAM)pTextReplace);
} }
} }
return processFindNext(str2Search.c_str());
delete [] pTextFind;
delete [] pTextReplace;
return processFindNext(txt2find); //after replacing, find the next section for selection
} }
int FindReplaceDlg::markAll(const char *str2find) int FindReplaceDlg::markAll(const char *txt2find)
{ {
_doStyleFoundToken = true; _doStyleFoundToken = true;
int nbFound = processAll(MARK_ALL, true, NULL, str2find); int nbFound = processAll(ProcessMarkAll, txt2find, NULL, true, NULL);
return nbFound; return nbFound;
} }
int FindReplaceDlg::markAll2(const char *str2find) int FindReplaceDlg::markAll2(const char *txt2find)
{ {
int nbFound = processAll(MARK_ALL_2, true, NULL, str2find); int nbFound = processAll(ProcessMarkAll_2, txt2find, NULL, true, NULL);
return nbFound; return nbFound;
} }
int FindReplaceDlg::processAll(int op, bool isEntire, const char *fileName, const char *str2find) int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const char *txt2replace, bool isEntire, const char *fileName)
{ {
int nbReplaced = 0; int nbReplaced = 0;
if (!isCreated() && !str2find) return nbReplaced; if (!isCreated())
return nbReplaced;
if ((op == REPLACE_ALL) && (*_ppEditView)->getCurrentBuffer().isReadOnly()) if ((op == ProcessReplaceAll) && (*_ppEditView)->getCurrentBuffer().isReadOnly())
return nbReplaced; return nbReplaced;
FindOption *pOptions = &_options; if (!fileName)
fileName = "";
FindOption *pOptions = &_options;
bool isUnicode = (*_ppEditView)->getCurrentBuffer().getUnicodeMode() != uni8Bit; bool isUnicode = (*_ppEditView)->getCurrentBuffer().getUnicodeMode() != uni8Bit;
string str2Search;
if (str2find) int stringSizeFind = 0;
str2Search = str2find; int stringSizeReplace = 0;
else
str2Search = getTextFromCombo(::GetDlgItem(_hSelf, IDFINDWHAT), isUnicode); char *pTextFind = NULL;//new char[stringSizeFind + 1];
string str2Relace = getTextFromCombo(::GetDlgItem(_hSelf, IDREPLACEWITH), isUnicode); if (!txt2find) {
HWND hFindCombo = ::GetDlgItem(_hSelf, IDFINDWHAT);
string str2Search = getTextFromCombo(hFindCombo, isUnicode);
stringSizeFind = str2Search.length();
pTextFind = new char[stringSizeFind + 1];
strcpy(pTextFind, str2Search.c_str());
} else {
stringSizeFind = strlen(txt2find);
pTextFind = new char[stringSizeFind + 1];
strcpy(pTextFind, txt2find);
}
char *pTextReplace = NULL;//new char[stringSizeReplace + 1];
if (op == ProcessReplaceAll) {
if (!txt2replace) {
HWND hReplaceCombo = ::GetDlgItem(_hSelf, IDREPLACEWITH);
string str2Replace = getTextFromCombo(hReplaceCombo, isUnicode);
stringSizeReplace = str2Replace.length();
pTextReplace = new char[stringSizeReplace + 1];
strcpy(pTextReplace, str2Replace.c_str());
} else {
stringSizeReplace = strlen(txt2replace);
pTextReplace = new char[stringSizeReplace + 1];
strcpy(pTextReplace, txt2replace);
}
}
if (pOptions->_searchType == FindExtended) {
stringSizeFind = Searching::convertExtendedToString(pTextFind, pTextFind, stringSizeFind);
if (op == ProcessReplaceAll)
stringSizeReplace = Searching::convertExtendedToString(pTextReplace, pTextReplace, stringSizeReplace);
}
bool isRegExp = pOptions->_searchType == FindRegex;
int flags = Searching::buildSearchFlags(pOptions);
CharacterRange cr = (*_ppEditView)->getSelection();
int docLength = int((*_ppEditView)->execute(SCI_GETLENGTH)); int docLength = int((*_ppEditView)->execute(SCI_GETLENGTH));
CharacterRange cr = (*_ppEditView)->getSelection(); // Default :
// direction : down
// Par default : // begin at : 0
// direction : bas // end at : end of doc
// commence par : cursor pos int startPosition = 0;
// fini par : fin doc
int startPosition = cr.cpMin;
int endPosition = docLength; int endPosition = docLength;
bool direction = pOptions->_whichDirection;
if (pOptions->_whichDirection == DIR_UP) //first try limiting scope by direction
if (direction == DIR_UP)
{ {
startPosition = cr.cpMax; startPosition = cr.cpMax;
endPosition = 0; endPosition = 0;
} }
else
{
startPosition = cr.cpMin;
endPosition = docLength;
}
bool direction = pOptions->_whichDirection; //then adjust scope if the full document needs to be changed
if (pOptions->_isWrapAround || isEntire || (op == ProcessCountAll)) //entire document needs to be scanned
if ((pOptions->_isWrapAround || isEntire) || (op == COUNT_ALL))
{ {
startPosition = 0; startPosition = 0;
endPosition = docLength; endPosition = docLength;
direction = DIR_DOWN; direction = DIR_DOWN;
} }
if ((_isInSelection) && ((op == MARK_ALL) || ((op == REPLACE_ALL) && (!isEntire)))) //then readjust scope if the selection override is active and allowed
if ((_isInSelection) && ((op == ProcessMarkAll) || ((op == ProcessReplaceAll) && (!isEntire)))) //if selection limiter and either mark all or replace all w/o entire document override
{ {
CharacterRange cr = (*_ppEditView)->getSelection();
startPosition = cr.cpMin; startPosition = cr.cpMin;
endPosition = cr.cpMax; endPosition = cr.cpMax;
} }
int flags = (pOptions->_isWholeWord ? SCFIND_WHOLEWORD : 0) |
(pOptions->_isMatchCase ? SCFIND_MATCHCASE : 0) |
(pOptions->_isRegExp ? SCFIND_REGEXP|SCFIND_POSIX : 0);
(*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition); (*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition);
(*_ppEditView)->execute(SCI_SETTARGETEND, endPosition); (*_ppEditView)->execute(SCI_SETTARGETEND, endPosition);
(*_ppEditView)->execute(SCI_SETSEARCHFLAGS, flags); (*_ppEditView)->execute(SCI_SETSEARCHFLAGS, flags);
if (op == MARK_ALL) if (op == ProcessMarkAll) //if marking, check if purging is needed
{ {
if (_doStyleFoundToken) if (_doPurge) {
{ if (_doMarkLine)
if (_doPurge) (*_ppEditView)->execute(SCI_MARKERDELETEALL, MARK_BOOKMARK);
if (_doStyleFoundToken)
{ {
LangType lt = (*_ppEditView)->getCurrentDocType(); LangType lt = (*_ppEditView)->getCurrentDocType();
if (lt == L_TXT) if (lt == L_TXT)
(*_ppEditView)->defineDocType(L_CPP); (*_ppEditView)->defineDocType(L_CPP);
(*_ppEditView)->defineDocType(lt); (*_ppEditView)->defineDocType(lt);
} }
(*_ppEditView)->execute(SCI_SETLEXER, SCLEX_NULL);
} }
if ((_doMarkLine) && (_doPurge)) if (_doStyleFoundToken)
{ {
(*_ppEditView)->execute(SCI_MARKERDELETEALL, MARK_BOOKMARK); (*_ppEditView)->execute(SCI_SETLEXER, SCLEX_NULL);
} }
} }
int posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, (WPARAM)str2Search.length(), (LPARAM)str2Search.c_str())); int posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, (WPARAM)stringSizeFind, (LPARAM)pTextFind));
if ((posFind != -1) && (op == FIND_ALL)) if ((posFind != -1) && (op == ProcessFindAll)) //add new filetitle if this file results in hits
{ {
const int fileNameLen = strlen(fileName); const int fileNameLen = strlen(fileName);
@ -953,124 +1065,115 @@ int FindReplaceDlg::processAll(int op, bool isEntire, const char *fileName, cons
int end = int((*_ppEditView)->execute(SCI_GETTARGETEND)); int end = int((*_ppEditView)->execute(SCI_GETTARGETEND));
int foundTextLen = (end >= start)?end - start:start - end; int foundTextLen = (end >= start)?end - start:start - end;
// Si on a trouvé une occurence vide, y'a un pb!!! // Search resulted in empty token, problematic (can this happen?)!!!
if (!foundTextLen) if (!foundTextLen) {
delete [] pTextFind;
delete [] pTextReplace;
return -1; return -1;
}
if (op == REPLACE_ALL) switch (op) {
{ case ProcessFindAll: {
(*_ppEditView)->execute(SCI_SETTARGETSTART, start);
(*_ppEditView)->execute(SCI_SETTARGETEND, end);
int replacedLength = (*_ppEditView)->execute(pOptions->_isRegExp?SCI_REPLACETARGETRE:SCI_REPLACETARGET, (WPARAM)-1, (LPARAM)str2Relace.c_str());
startPosition = (direction == DIR_UP)?posFind - replacedLength:posFind + replacedLength;
if ((_isInSelection) && (!isEntire))
{
endPosition = endPosition - foundTextLen + replacedLength;
}
else
{
if (direction == DIR_DOWN)
endPosition = docLength = docLength - foundTextLen + replacedLength;
}
}
else if (op == MARK_ALL)
{
if (_doStyleFoundToken)
{
(*_ppEditView)->execute(SCI_STARTSTYLING, start, STYLING_MASK);
(*_ppEditView)->execute(SCI_SETSTYLING, end - start, SCE_UNIVERSAL_FOUND_STYLE);
(*_ppEditView)->execute(SCI_COLOURISE, start, end+1);
}
if (_doMarkLine)
{
int lineNumber = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, posFind); int lineNumber = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, posFind);
int state = (*_ppEditView)->execute(SCI_MARKERGET, lineNumber); int lend = (*_ppEditView)->execute(SCI_GETLINEENDPOSITION, lineNumber);
int lstart = (*_ppEditView)->execute(SCI_POSITIONFROMLINE, lineNumber);
int nbChar = lend - lstart;
bool isRealloc = false;
if (!(state & (1 << MARK_BOOKMARK))) if (_maxNbCharAllocated < nbChar) //line longer than buffer, resize buffer
(*_ppEditView)->execute(SCI_MARKERADD, lineNumber, MARK_BOOKMARK); {
} isRealloc = true;
startPosition = (direction == DIR_UP)?posFind - foundTextLen:posFind + foundTextLen; _maxNbCharAllocated = nbChar;
} delete [] _line;
else if (op == MARK_ALL_2) _line = new char[_maxNbCharAllocated + 3];
{ if (isUnicode) //if unicode, also resize unicode buffer
(*_ppEditView)->execute(SCI_SETINDICATORCURRENT, SCE_UNIVERSAL_FOUND_STYLE_2); {
(*_ppEditView)->execute(SCI_INDICATORFILLRANGE, start, end - start); const int uniCharLen = (_maxNbCharAllocated + 3) * 2 + 1;
delete [] _uniCharLine;
_uniCharLine = new char[uniCharLen];
}
}
(*_ppEditView)->execute(SCI_GETLINE, lineNumber, (LPARAM)_line);
_line[nbChar] = 0x0D;
_line[nbChar+1] = 0x0A;
_line[nbChar+2] = '\0';
const char *pLine;
if (isUnicode)
{
ascii_to_utf8(_line, (nbChar + 3), _uniCharLine);
pLine = _uniCharLine;
}
else
{
pLine = _line;
}
_pFinder->add(FoundInfo(start, end, pLine, fileName, _pFinder->_lineCounter), lineNumber + 1);
startPosition = posFind + foundTextLen;
break; }
case ProcessReplaceAll: {
(*_ppEditView)->execute(SCI_SETTARGETSTART, start);
(*_ppEditView)->execute(SCI_SETTARGETEND, end);
int replacedLength = (*_ppEditView)->execute(isRegExp?SCI_REPLACETARGETRE:SCI_REPLACETARGET, (WPARAM)stringSizeReplace, (LPARAM)pTextReplace);
startPosition = (direction == DIR_UP)?posFind - replacedLength:posFind + replacedLength;
if ((_isInSelection) && (!isEntire))
{
endPosition = endPosition - foundTextLen + replacedLength;
}
else
{
if (direction == DIR_DOWN)
endPosition = docLength = docLength - foundTextLen + replacedLength;
}
break; }
case ProcessMarkAll: {
if (_doStyleFoundToken)
{
(*_ppEditView)->execute(SCI_STARTSTYLING, start, STYLING_MASK);
(*_ppEditView)->execute(SCI_SETSTYLING, end - start, SCE_UNIVERSAL_FOUND_STYLE);
(*_ppEditView)->execute(SCI_COLOURISE, start, end+1);
}
if (_doMarkLine)
{
int lineNumber = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, posFind);
int state = (*_ppEditView)->execute(SCI_MARKERGET, lineNumber);
if (!(state & (1 << MARK_BOOKMARK)))
(*_ppEditView)->execute(SCI_MARKERADD, lineNumber, MARK_BOOKMARK);
}
startPosition = (direction == DIR_UP)?posFind - foundTextLen:posFind + foundTextLen;
break; }
case ProcessMarkAll_2: {
(*_ppEditView)->execute(SCI_SETINDICATORCURRENT, SCE_UNIVERSAL_FOUND_STYLE_2);
(*_ppEditView)->execute(SCI_INDICATORFILLRANGE, start, end - start);
startPosition = (direction == DIR_UP)?posFind - foundTextLen:posFind + foundTextLen;
break; }
case ProcessCountAll: {
startPosition = posFind + foundTextLen;
break; }
default: {
delete [] pTextFind;
delete [] pTextReplace;
return nbReplaced;
break; }
startPosition = (direction == DIR_UP)?posFind - foundTextLen:posFind + foundTextLen; }
}
else if (op == COUNT_ALL)
{
startPosition = posFind + foundTextLen;
}
else if (op == FIND_ALL)
{
int lineNumber = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, posFind);
int lend = (*_ppEditView)->execute(SCI_GETLINEENDPOSITION, lineNumber);
int lstart = (*_ppEditView)->execute(SCI_POSITIONFROMLINE, lineNumber);
int nbChar = lend - lstart;
bool isRealloc = false;
if (_maxNbCharAllocated < nbChar)
{
isRealloc = true;
_maxNbCharAllocated = nbChar;
//if (_line)
delete [] _line;
_line = new char[_maxNbCharAllocated + 3];
}
//char *line = new char[nbChar + 3];
(*_ppEditView)->execute(SCI_GETLINE, lineNumber, (LPARAM)_line);
_line[nbChar] = 0x0D;
_line[nbChar+1] = 0x0A;
_line[nbChar+2] = '\0';
const char *pLine;
if ((*_ppEditView)->getCurrentBuffer().getUnicodeMode() == uni8Bit)
{
//char *uniChars = new char[uniCharLen];
if (isRealloc)
{
const int uniCharLen = (_maxNbCharAllocated + 3) * 2 + 1;
//if (_uniCharLine)
delete [] _uniCharLine;
_uniCharLine = new char[uniCharLen];
}
ascii_to_utf8(_line, (nbChar + 3), _uniCharLine);
/*
const int fileNameLen = strlen(fileName);
if (fileNameLen > _fileNameLenMax)
{
_fileNameLenMax = fileNameLen;
delete [] _uniFileName;
_uniFileName = new char[(fileNameLen + 3) * 2 + 1];
}
ascii_to_utf8(fileName, fileNameLen, _uniFileName);
*/
pLine = _uniCharLine;
}
else
{
pLine = _line;
}
_pFinder->add(FoundInfo(start, end, pLine, fileName, _pFinder->_lineCounter), lineNumber + 1);
startPosition = posFind + foundTextLen;
}
else
return nbReplaced;
(*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition); (*_ppEditView)->execute(SCI_SETTARGETSTART, startPosition);
(*_ppEditView)->execute(SCI_SETTARGETEND, endPosition); (*_ppEditView)->execute(SCI_SETTARGETEND, endPosition);
posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, (WPARAM)str2Search.length(), (LPARAM)str2Search.c_str())); posFind = int((*_ppEditView)->execute(SCI_SEARCHINTARGET, (WPARAM)stringSizeFind, (LPARAM)pTextFind));
nbReplaced++; nbReplaced++;
} }
delete [] pTextFind;
delete [] pTextReplace;
return nbReplaced; return nbReplaced;
} }
@ -1306,8 +1409,6 @@ BOOL CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
return FALSE; return FALSE;
} }
void FindIncrementDlg::destroy() { void FindIncrementDlg::destroy() {
if (_pRebar) { if (_pRebar) {
_pRebar->removeBand(_rbBand.wID); _pRebar->removeBand(_rbBand.wID);
@ -1324,9 +1425,6 @@ void FindIncrementDlg::display(bool toShow) const {
::SetFocus(::GetDlgItem(_hSelf, IDC_INCFINDTEXT)); ::SetFocus(::GetDlgItem(_hSelf, IDC_INCFINDTEXT));
_pRebar->setIDVisible(_rbBand.wID, toShow); _pRebar->setIDVisible(_rbBand.wID, toShow);
} }
HWND hRebar= 0;
WNDPROC staticProcOrig = 0;
LRESULT StaticProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK FindIncrementDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) BOOL CALLBACK FindIncrementDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)
@ -1404,7 +1502,7 @@ BOOL CALLBACK FindIncrementDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM
void FindIncrementDlg::addToRebar(ReBar * rebar) { void FindIncrementDlg::addToRebar(ReBar * rebar) {
if(_pRebar) if(_pRebar)
return; return;
hRebar = rebar->getHSelf(); HWND hRebar = rebar->getHSelf();
_pRebar = rebar; _pRebar = rebar;
RECT client; RECT client;
getClientRect(client); getClientRect(client);

60
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
View File

@ -41,17 +41,6 @@ typedef bool InWhat;
#define ALL_OPEN_DOCS true #define ALL_OPEN_DOCS true
#define FILES_IN_DIR false #define FILES_IN_DIR false
const int REPLACE_ALL = 0;
const int MARK_ALL = 1;
const int COUNT_ALL = 2;
const int FIND_ALL = 3;
const int MARK_ALL_2 = 4;
const int DISPLAY_POS_TOP = 2;
const int DISPLAY_POS_MIDDLE = 1;
const int DISPLAY_POS_BOTTOM = 0;
struct FoundInfo { struct FoundInfo {
FoundInfo(int start, int end, const char *foundLine, const char *fullPath, size_t lineNum) FoundInfo(int start, int end, const char *foundLine, const char *fullPath, size_t lineNum)
: _start(start), _end(end), _foundLine(foundLine), _fullPath(fullPath), _scintLineNumber(lineNum){}; : _start(start), _end(end), _foundLine(foundLine), _fullPath(fullPath), _scintLineNumber(lineNum){};
@ -62,6 +51,35 @@ struct FoundInfo {
size_t _scintLineNumber; size_t _scintLineNumber;
}; };
struct TargetRange {
int targetStart;
int targetEnd;
};
enum SearchType { FindNormal, FindExtended, FindRegex };
enum ProcessOperation { ProcessFindAll, ProcessReplaceAll, ProcessCountAll, ProcessMarkAll, ProcessMarkAll_2 };
struct FindOption {
bool _isWholeWord;
bool _isMatchCase;
bool _isWrapAround;
bool _whichDirection;
bool _isIncremental;
SearchType _searchType;
FindOption() :_isWholeWord(true), _isMatchCase(true), _searchType(FindNormal),\
_isWrapAround(true), _whichDirection(DIR_DOWN), _isIncremental(false){};
};
//This class contains generic search functions as static functions for easy access
class Searching {
public:
static int convertExtendedToString(const char * query, char * result, int length);
static TargetRange t;
static int buildSearchFlags(FindOption * option);
};
//Finder: Dockable window that contains search results
class Finder : public DockingDlgInterface { class Finder : public DockingDlgInterface {
friend class FindReplaceDlg; friend class FindReplaceDlg;
public: public:
@ -144,18 +162,7 @@ private:
size_t _lineCounter; size_t _lineCounter;
}; };
struct FindOption { //FindReplaceDialog: standard find/replace window
bool _isWholeWord;
bool _isMatchCase;
bool _isRegExp;
bool _isWrapAround;
bool _whichDirection;
bool _isIncremental;
FindOption() :_isWholeWord(true), _isMatchCase(true), _isRegExp(false),\
_isWrapAround(true), _whichDirection(DIR_DOWN), _isIncremental(false){};
};
class FindReplaceDlg : public StaticDialog class FindReplaceDlg : public StaticDialog
{ {
friend class FindIncrementDlg; friend class FindIncrementDlg;
@ -189,7 +196,7 @@ public :
void initOptionsFromDlg() { void initOptionsFromDlg() {
_options._isWholeWord = isCheckedOrNot(IDWHOLEWORD); _options._isWholeWord = isCheckedOrNot(IDWHOLEWORD);
_options._isMatchCase = isCheckedOrNot(IDMATCHCASE); _options._isMatchCase = isCheckedOrNot(IDMATCHCASE);
_options._isRegExp = isCheckedOrNot(IDREGEXP); _options._searchType = isCheckedOrNot(IDREGEXP)?FindRegex:isCheckedOrNot(IDEXTENDED)?FindExtended:FindNormal;
_options._isWrapAround = isCheckedOrNot(IDWRAP); _options._isWrapAround = isCheckedOrNot(IDWRAP);
_isInSelection = isCheckedOrNot(IDC_IN_SELECTION_CHECK); _isInSelection = isCheckedOrNot(IDC_IN_SELECTION_CHECK);
@ -220,12 +227,12 @@ public :
display(); display();
}; };
bool processFindNext(const char *txt2find, FindOption *options = NULL); bool processFindNext(const char *txt2find, FindOption *options = NULL);
bool processReplace(); bool processReplace(const char *txt2find, const char *txt2replace, FindOption *options = NULL);
int markAll(const char *str2find); int markAll(const char *str2find);
int markAll2(const char *str2find); int markAll2(const char *str2find);
int processAll(int op, bool isEntire = false, const char *dir2search = NULL, const char *str2find = NULL); int processAll(ProcessOperation op, const char *txt2find, const char *txt2replace, bool isEntire = false, const char *fileName = NULL);
void replaceAllInOpenedDocs(); void replaceAllInOpenedDocs();
void findAllIn(InWhat op); void findAllIn(InWhat op);
void setSearchText(const char * txt2find, bool isUTF8 = false) { void setSearchText(const char * txt2find, bool isUTF8 = false) {
@ -359,6 +366,7 @@ private :
}; };
}; };
//FindIncrementDlg: incremental search dialog, docked in rebar
class FindIncrementDlg : public StaticDialog class FindIncrementDlg : public StaticDialog
{ {
public : public :

17
PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
View File

@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <windows.h> #include <windows.h>
#include "FindReplaceDlg_rc.h" #include "FindReplaceDlg_rc.h"
IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 321, 179 IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 321, 182
//STYLE DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU //STYLE DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW EXSTYLE WS_EX_TOOLWINDOW
@ -49,15 +49,20 @@ BEGIN
COMBOBOX IDD_FINDINFILES_DIR_COMBO,49,57,141,150, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP COMBOBOX IDD_FINDINFILES_DIR_COMBO,49,57,141,150, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP
PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,193,56,16,14 PUSHBUTTON "...",IDD_FINDINFILES_BROWSE_BUTTON,193,56,16,14
CONTROL "In all sub-folders",IDD_FINDINFILES_RECURSIVE_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,70,110,15 CONTROL "In all sub-folders",IDD_FINDINFILES_RECURSIVE_CHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,49,70,110,15
CONTROL "Match &whole word only",IDWHOLEWORD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,6,88,110,15
CONTROL "Match &case",IDMATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,103,110,12 CONTROL "Match &whole word only",IDWHOLEWORD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,6,88,110,15
CONTROL "Regular &expression",IDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,116,110,12 CONTROL "Match &case",IDMATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,100,110,15
CONTROL "Wra&p around",IDWRAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,129,102,16 CONTROL "Wra&p around",IDWRAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,112,110,15
GROUPBOX "Search mode",IDC_MODE_STATIC,6,126,138,48
CONTROL "&Normal",IDNORMAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,138,126,10
CONTROL "&Extended",IDEXTENDED,"Button",BS_AUTORADIOBUTTON,12, 150,126,10
CONTROL "Regular e&xpression",IDREGEXP,"Button", BS_AUTORADIOBUTTON,12,162,126,10
CONTROL "&Up",IDDIRECTIONUP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,94,45,12 CONTROL "&Up",IDDIRECTIONUP,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,94,45,12
CONTROL "&Down",IDDIRECTIONDOWN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,155,106,45,12 CONTROL "&Down",IDDIRECTIONDOWN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,155,106,45,12
GROUPBOX "Direction",IDC_DIR_STATIC,150,86,60,34,WS_GROUP GROUPBOX "Direction",IDC_DIR_STATIC,150,86,60,34,WS_GROUP
PUSHBUTTON "Find Next",IDOK,217,20,90,14,WS_GROUP | WS_TABSTOP PUSHBUTTON "Find Next",IDOK,217,20,90,14,WS_GROUP | WS_TABSTOP
PUSHBUTTON "Count",IDCCOUNTALL,217,38,90,14, WS_TABSTOP PUSHBUTTON "Count",IDCCOUNTALL,217,38,90,14, WS_TABSTOP
PUSHBUTTON "Find all in all opened documents",IDC_FINDALL_OPENEDFILES,217,56,90,21,BS_MULTILINE | WS_TABSTOP PUSHBUTTON "Find all in all opened documents",IDC_FINDALL_OPENEDFILES,217,56,90,21,BS_MULTILINE | WS_TABSTOP

107
PowerEditor/src/ScitillaComponent/FindReplaceDlg_rc.h
View File

@ -1,63 +1,68 @@
#define IDD_FIND_REPLACE_DLG 1600 #define IDD_FIND_REPLACE_DLG 1600
#define IDFINDWHAT 1601 #define IDFINDWHAT 1601
#define IDREPLACEWITH 1602 #define IDREPLACEWITH 1602
#define IDWHOLEWORD 1603 #define IDWHOLEWORD 1603
#define IDMATCHCASE 1604 #define IDMATCHCASE 1604
#define IDREGEXP 1605
#define IDWRAP 1606
#define IDUNSLASH 1607
#define IDREPLACE 1608
#define IDREPLACEALL 1609
#define IDREPLACEINSEL 1610
#define ID_STATICTEXT_REPLACE 1611
#define IDDIRECTIONUP 1612
#define IDDIRECTIONDOWN 1613
#define IDCCOUNTALL 1614
#define IDCMARKALL 1615
#define IDC_MARKLINE_CHECK 1616
#define IDC_STYLEFOUND_CHECK 1617
#define IDC_PURGE_CHECK 1618
#define IDC_FINDALL_STATIC 1619
#define IDFINDWHAT_STATIC 1620
#define IDC_DIR_STATIC 1621
#define IDC_PERCENTAGE_SLIDER 1622 #define IDC_MODE_STATIC 1624
#define IDC_TRANSPARENT_GRPBOX 1623 #define IDNORMAL 1625
#define IDEXTENDED 1626
#define IDREGEXP 1605
#define IDC_FIND_IN_STATIC 1628 #define IDWRAP 1606
//#define IDC_CURRENT_FILE_RADIO 1629 #define IDUNSLASH 1607
//#define IDC_OPENED_FILES_RADIO 1630 #define IDREPLACE 1608
//#define IDC_FILES_RADIO 1631 #define IDREPLACEALL 1609
#define IDC_IN_SELECTION_CHECK 1632 #define IDREPLACEINSEL 1610
#define IDC_CLEAR_ALL 1633 #define ID_STATICTEXT_REPLACE 1611
#define IDC_REPLACEINSELECTION 1634 #define IDDIRECTIONUP 1612
#define IDC_REPLACE_OPENEDFILES 1635 #define IDDIRECTIONDOWN 1613
#define IDC_FINDALL_OPENEDFILES 1636 #define IDCCOUNTALL 1614
#define IDCMARKALL 1615
#define IDC_MARKLINE_CHECK 1616
#define IDC_STYLEFOUND_CHECK 1617
#define IDC_PURGE_CHECK 1618
#define IDC_FINDALL_STATIC 1619
#define IDFINDWHAT_STATIC 1620
#define IDC_DIR_STATIC 1621
#define IDC_PERCENTAGE_SLIDER 1622
#define IDC_TRANSPARENT_GRPBOX 1623
#define IDC_FIND_IN_STATIC 1628
//#define IDC_CURRENT_FILE_RADIO 1629
//#define IDC_OPENED_FILES_RADIO 1630
//#define IDC_FILES_RADIO 1631
#define IDC_IN_SELECTION_CHECK 1632
#define IDC_CLEAR_ALL 1633
#define IDC_REPLACEINSELECTION 1634
#define IDC_REPLACE_OPENEDFILES 1635
#define IDC_FINDALL_OPENEDFILES 1636
//#define IDC_FINDINFILES 1637 //#define IDC_FINDINFILES 1637
#define IDC_FINDINFILES_LAUNCH 1638 #define IDC_FINDINFILES_LAUNCH 1638
#define IDC_GETCURRENTDOCTYPE 1639 #define IDC_GETCURRENTDOCTYPE 1639
//#define IDSWITCH 1640 //#define IDSWITCH 1640
#define IDD_FINDINFILES_DLG 1650 #define IDD_FINDINFILES_DLG 1650
#define IDD_FINDINFILES_BROWSE_BUTTON 1651 #define IDD_FINDINFILES_BROWSE_BUTTON 1651
#define IDD_FINDINFILES_FILTERS_COMBO 1652 #define IDD_FINDINFILES_FILTERS_COMBO 1652
#define IDD_FINDINFILES_DIR_COMBO 1653 #define IDD_FINDINFILES_DIR_COMBO 1653
#define IDD_FINDINFILES_FILTERS_STATIC 1654 #define IDD_FINDINFILES_FILTERS_STATIC 1654
#define IDD_FINDINFILES_DIR_STATIC 1655 #define IDD_FINDINFILES_DIR_STATIC 1655
#define IDD_FINDINFILES_FIND_BUTTON 1656 #define IDD_FINDINFILES_FIND_BUTTON 1656
#define IDD_FINDINFILES_GOBACK_BUTTON 1657 #define IDD_FINDINFILES_GOBACK_BUTTON 1657
#define IDD_FINDINFILES_RECURSIVE_CHECK 1658 #define IDD_FINDINFILES_RECURSIVE_CHECK 1658
#define IDD_FINDRESULT 1670 #define IDD_FINDRESULT 1670
#define IDD_INCREMENT_FIND 1680 #define IDD_INCREMENT_FIND 1680
#define IDC_INCSTATIC 1681 #define IDC_INCSTATIC 1681
#define IDC_INCFINDTEXT 1682 #define IDC_INCFINDTEXT 1682
#define IDC_INCFINDPREVOK 1683 #define IDC_INCFINDPREVOK 1683
#define IDC_INCFINDNXTOK 1684 #define IDC_INCFINDNXTOK 1684
#define IDC_INCFINDMATCHCASE 1685 #define IDC_INCFINDMATCHCASE 1685
#define IDC_TRANSPARENT_CHECK 1686 #define IDC_TRANSPARENT_CHECK 1686
#define IDC_TRANSPARENT_LOSSFOCUS_RADIO 1687 #define IDC_TRANSPARENT_LOSSFOCUS_RADIO 1687