tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-24 22:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restore empty "Replace with" and "Filters" in the next session

Browse Source 
Closes #3407
This commit is contained in:
Roman Artiukhin 2017-06-17 20:52:07 +03:00 committed by Don HO
parent f162181fba
commit e7a5c72465
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -374,6 +374,14 @@ void FindReplaceDlg::fillComboHistory(int id, const vector<generic_string> & str
{ {
addText2Combo(i->c_str(), hCombo); addText2Combo(i->c_str(), hCombo);
} }
//empty string is not added to CB items, so we need to set it manually
if (!strings.empty() && strings.begin()->empty())
{
SetWindowText(hCombo, _T(""));
return;
}
::SendMessage(hCombo, CB_SETCURSEL, 0, 0); // select first item ::SendMessage(hCombo, CB_SETCURSEL, 0, 0); // select first item
} }
@ -383,13 +391,13 @@ void FindReplaceDlg::saveFindHistory()
if (! isCreated()) return; if (! isCreated()) return;
FindHistory& findHistory = (NppParameters::getInstance())->getFindHistory(); FindHistory& findHistory = (NppParameters::getInstance())->getFindHistory();
saveComboHistory(IDD_FINDINFILES_DIR_COMBO, findHistory._nbMaxFindHistoryPath, findHistory._findHistoryPaths); saveComboHistory(IDD_FINDINFILES_DIR_COMBO, findHistory._nbMaxFindHistoryPath, findHistory._findHistoryPaths, false);
saveComboHistory(IDD_FINDINFILES_FILTERS_COMBO, findHistory._nbMaxFindHistoryFilter, findHistory._findHistoryFilters); saveComboHistory(IDD_FINDINFILES_FILTERS_COMBO, findHistory._nbMaxFindHistoryFilter, findHistory._findHistoryFilters, true);
saveComboHistory(IDFINDWHAT, findHistory._nbMaxFindHistoryFind, findHistory._findHistoryFinds); saveComboHistory(IDFINDWHAT, findHistory._nbMaxFindHistoryFind, findHistory._findHistoryFinds, false);
saveComboHistory(IDREPLACEWITH, findHistory._nbMaxFindHistoryReplace, findHistory._findHistoryReplaces); saveComboHistory(IDREPLACEWITH, findHistory._nbMaxFindHistoryReplace, findHistory._findHistoryReplaces, true);
} }
int FindReplaceDlg::saveComboHistory(int id, int maxcount, vector<generic_string> & strings) int FindReplaceDlg::saveComboHistory(int id, int maxcount, vector<generic_string> & strings, bool saveEmpty)
{ {
TCHAR text[FINDREPLACE_MAXLENGTH]; TCHAR text[FINDREPLACE_MAXLENGTH];
HWND hCombo = ::GetDlgItem(_hSelf, id); HWND hCombo = ::GetDlgItem(_hSelf, id);
@ -401,6 +409,14 @@ int FindReplaceDlg::saveComboHistory(int id, int maxcount, vector<generic_string
if (count) if (count)
strings.clear(); strings.clear();
if (saveEmpty)
{
if (::GetWindowTextLength(hCombo) == 0)
{
strings.push_back(generic_string());
}
}
for (int i = 0 ; i < count ; ++i) for (int i = 0 ; i < count ; ++i)
{ {
::SendMessage(hCombo, CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(text)); ::SendMessage(hCombo, CB_GETLBTEXT, i, reinterpret_cast<LPARAM>(text));

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

@ -401,7 +401,7 @@ private :
void updateCombo(int comboID); void updateCombo(int comboID);
void fillFindHistory(); void fillFindHistory();
void fillComboHistory(int id, const std::vector<generic_string> & strings); void fillComboHistory(int id, const std::vector<generic_string> & strings);
int saveComboHistory(int id, int maxcount, std::vector<generic_string> & strings); int saveComboHistory(int id, int maxcount, std::vector<generic_string> & strings, bool saveEmpty);
static const int FR_OP_FIND = 1; static const int FR_OP_FIND = 1;
static const int FR_OP_REPLACE = 2; static const int FR_OP_REPLACE = 2;
static const int FR_OP_FIF = 4; static const int FR_OP_FIF = 4;