github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix Find dialog status bar wrong messaging 

Fix #15662
pull/15711/head
Don Ho 1 month ago
parent
1890ea65f9
commit
901014746c
7 changed files with 30 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      PowerEditor/installer/nativeLang/english.xml
  2. 8
      PowerEditor/installer/nativeLang/english_customizable.xml
  3. 8
      PowerEditor/installer/nativeLang/french.xml
  4. 8
      PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
  5. 12
      PowerEditor/src/NppCommands.cpp
  6. 8
      PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
  7. 5
      PowerEditor/src/ScintillaComponent/FindReplaceDlg.h

8
PowerEditor/installer/nativeLang/english.xml
Unescape View File

@ -1685,8 +1685,8 @@ Find in all files but exclude folders tests, bin && bin64:
Find in all files but exclude all folders log or logs recursively:
*.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
<find-in-files-select-folder value="Select a folder to search from"/><!-- HowToReproduce: Search > Find in Files > [...] -->
<find-status-top-reached value="Find: Found the last occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the last occurrence from the top. The end of the document has been reached."/>
<find-status-top-reached value="Find: Beginning of the document reached, first occurrence from the bottom found."/>
<find-status-end-reached value="Find: End of document reached, first occurrence from the top found."/>
<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>
<find-status-replaceinfiles-nb-replaced value="Replace in Files: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceinopenedfiles-1-replaced value="Replace in Opened Files: 1 occurrence was replaced"/>
@ -1700,8 +1700,8 @@ Find in all files but exclude all folders log or logs recursively:
<find-status-replaceall-1-replaced value="Replace All: 1 occurrence was replaced"/>
<find-status-replaceall-nb-replaced value="Replace All: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceall-readonly value="Replace All: Cannot replace text. The current document is read only"/>
<find-status-replace-end-reached value="Replace: Replaced the last occurrence from the top. The end of document has been reached"/>
<find-status-replace-top-reached value="Replace: Replaced the last occurrence from the bottom. The begin of document has been reached"/>
<find-status-replace-end-reached value="Replace: End of document reached, first occurrence from the top replaced."/>
<find-status-replace-top-reached value="Replace: Beginning of document reached, first occurrence from the bottom replaced."/>
<find-status-replaced-next-found value="Replace: 1 occurrence was replaced. The next occurrence found."/>
<find-status-replaced-without-continuing value="Replace: 1 occurrence was replaced."/>
<find-status-replaced-next-not-found value="Replace: 1 occurrence was replaced. No more occurrences were found."/>

8
PowerEditor/installer/nativeLang/english_customizable.xml
Unescape View File

@ -1684,8 +1684,8 @@ Find in all files but exclude folders tests, bin &amp;&amp; bin64:
Find in all files but exclude all folders log or logs recursively:
*.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
<find-in-files-select-folder value="Select a folder to search from"/><!-- HowToReproduce: Search > Find in Files > [...] -->
<find-status-top-reached value="Find: Found the last occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the last occurrence from the top. The end of the document has been reached."/>
<find-status-top-reached value="Find: Beginning of the document reached, first occurrence from the bottom found."/>
<find-status-end-reached value="Find: End of document reached, first occurrence from the top found."/>
<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>
<find-status-replaceinfiles-nb-replaced value="Replace in Files: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceinopenedfiles-1-replaced value="Replace in Opened Files: 1 occurrence was replaced"/>
@ -1699,8 +1699,8 @@ Find in all files but exclude all folders log or logs recursively:
<find-status-replaceall-1-replaced value="Replace All: 1 occurrence was replaced"/>
<find-status-replaceall-nb-replaced value="Replace All: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceall-readonly value="Replace All: Cannot replace text. The current document is read only"/>
<find-status-replace-end-reached value="Replace: Replaced the last occurrence from the top. The end of document has been reached"/>
<find-status-replace-top-reached value="Replace: Replaced the last occurrence from the bottom. The begin of document has been reached"/>
<find-status-replace-end-reached value="Replace: End of document reached, first occurrence from the top replaced."/>
<find-status-replace-top-reached value="Replace: Beginning of document reached, first occurrence from the bottom replaced."/>
<find-status-replaced-next-found value="Replace: 1 occurrence was replaced. The next occurrence found."/>
<find-status-replaced-without-continuing value="Replace: 1 occurrence was replaced."/>
<find-status-replaced-next-not-found value="Replace: 1 occurrence was replaced. No more occurrences were found."/>

8
PowerEditor/installer/nativeLang/french.xml
Unescape View File

@ -1680,8 +1680,8 @@ Rechercher dans tous les fichiers mais pas dans les dossiers tests, bin &amp;&am
Rechercher dans tous les fichiers mais pas dans les dossiers log ou logs récursivement:
*.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
<find-in-files-select-folder value="Sélectionner un dossier pour rechercher à l’intérieur"/><!-- HowToReproduce: Search > Find in Files > [...] -->
<find-status-top-reached value="Rechercher : La 1ère occurrence a été trouvée depuis le haut. Le début du document a été atteint"/>
<find-status-end-reached value="Rechercher : La dernière occurrence a été trouvée avant le bas. La fin du document a été atteinte"/>
<find-status-top-reached value="Rechercher : Début du document atteint, 1ère occurrence trouvée depuis le bas."/>
<find-status-end-reached value="Rechercher : Fin du document atteinte, 1ère occurrence trouvée depuis le haut."/>
<find-status-replaceinfiles-1-replaced value="Remplacer dans les fichiers : 1 occurrence a été remplacée"/>
<find-status-replaceinfiles-nb-replaced value="Remplacer dans les fichiers : $INT_REPLACE$ occurrences ont été remplacées"/>
<find-status-replaceinopenedfiles-1-replaced value="Remplacer dans les fichiers ouverts : 1 occurrence a été remplacée"/>
@ -1695,8 +1695,8 @@ Rechercher dans tous les fichiers mais pas dans les dossiers log ou logs récurs
<find-status-replaceall-1-replaced value="Remplacer tout : 1 occurrence a été remplacée"/>
<find-status-replaceall-nb-replaced value="Remplacer tout : $INT_REPLACE$ occurrences ont été remplacées"/>
<find-status-replaceall-readonly value="Remplacer tout : l’opération a échoué. Le fichier est en lecture seule"/>
<find-status-replace-end-reached value="Remplacer : La 1ère occurrence a été remplacée depuis le haut. La fin du document a été atteinte"/>
<find-status-replace-top-reached value="Remplacer : La 1ère occurrence a été remplacée depuis le bas. Le début du document a été atteint"/>
<find-status-replace-end-reached value="Remplacer : Fin du document atteinte, 1ère occurrence remplacée depuis le haut."/>
<find-status-replace-top-reached value="Remplacer : Début du document atteint, 1ère occurrence remplacée depuis le bas."/>
<find-status-replaced-next-found value="Remplacer : 1 occurrence a été remplacée. L’occurrence suivante a été trouvée"/>
<find-status-replaced-without-continuing value="Remplacer : 1 occurrence a été remplacée."/>
<find-status-replaced-next-not-found value="Remplacer : 1 occurrence a été remplacée. L’occurrence suivante n’a pas été trouvée"/>

8
PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
Unescape View File

@ -1546,8 +1546,8 @@
所有檔案但在所有的層級（遞歸地）不搜尋檔案夾 log 或 logs:
*.* !+\log*"/>
<find-in-files-select-folder value="選擇一個你要從中搜尋的資料夾"/>
<find-status-top-reached value="搜尋：從下面找到相符的字串。搜尋已抵達文件開首。"/>
<find-status-end-reached value="搜尋：從上面找到相符的字串。搜尋已抵達文件結尾。"/>
<find-status-top-reached value="搜尋：搜尋已抵達文件開首，從下面找到第一個相符的字串。"/>
<find-status-end-reached value="搜尋：搜尋已抵達文件結尾，從上面找到第一個相符的字串。"/>
<find-status-replaceinfiles-1-replaced value="在檔案中取代：取代了 1 個字串。"/>
<find-status-replaceinfiles-nb-replaced value="在檔案中取代：取代了 $INT_REPLACE$ 個字串。"/>
<find-status-replaceinopenedfiles-1-replaced value="在所有開啟文件中取代：取代了 1 個字串。"/>
@ -1560,8 +1560,8 @@
<find-status-replaceall-1-replaced value="全部取代：取代了 1 個字串。"/>
<find-status-replaceall-nb-replaced value="全部取代：取代了 $INT_REPLACE$ 個字串。"/>
<find-status-replaceall-readonly value="全部取代：檔案為唯讀，無法取代字串。"/>
<find-status-replace-end-reached value="取代：從上面取代了 1 個相符的字串。搜尋已抵達文件結尾。"/>
<find-status-replace-top-reached value="取代：從下面取代了 1 個相符的字串。搜尋已抵達文件開首。"/>
<find-status-replace-end-reached value="取代：搜尋已抵達文件結尾，從上面搜尋並取代了第一個相符的字串。"/>
<find-status-replace-top-reached value="取代：搜尋已抵達文件開首，從下面搜尋並取代了第一個相符的字串。"/>
<find-status-replaced-next-found value="取代：取代了 1 個字串。找到下一個字串。"/>
<find-status-replaced-next-not-found value="取代：取代了 1 個字串。找不到下一個字串。"/>
<find-status-replace-not-found value="取代：找不到搜尋字串"/>

12
PowerEditor/src/NppCommands.cpp
Unescape View File

@ -1400,12 +1400,12 @@ void Notepad_plus::command(int id)
_findReplaceDlg.processFindNext(s.c_str(), &op, &status);
if (status == FSEndReached)
{
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-end-reached", L"Find: Found the 1st occurrence from the top. The end of the document has been reached.");
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-end-reached", FIND_STATUS_END_REACHED_TEXT);
_findReplaceDlg.setStatusbarMessage(msg, FSEndReached);
}
else if (status == FSTopReached)
{
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-top-reached", L"Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached.");
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-top-reached", FIND_STATUS_TOP_REACHED_TEXT);
_findReplaceDlg.setStatusbarMessage(msg, FSTopReached);
}
}
@ -1437,12 +1437,12 @@ void Notepad_plus::command(int id)
_findReplaceDlg.processFindNext(str, &op, &status);
if (status == FSEndReached)
{
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-end-reached", L"Find: Found the 1st occurrence from the top. The end of the document has been reached.");
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-end-reached", FIND_STATUS_END_REACHED_TEXT);
_findReplaceDlg.setStatusbarMessage(msg, FSEndReached);
}
else if (status == FSTopReached)
{
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-top-reached", L"Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached.");
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-top-reached", FIND_STATUS_TOP_REACHED_TEXT);
_findReplaceDlg.setStatusbarMessage(msg, FSTopReached);
}
}
@ -1488,12 +1488,12 @@ void Notepad_plus::command(int id)
_findReplaceDlg.processFindNext(str, &op, &status);
if (status == FSEndReached)
{
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-end-reached", L"Find: Found the 1st occurrence from the top. The end of the document has been reached.");
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-end-reached", FIND_STATUS_END_REACHED_TEXT);
_findReplaceDlg.setStatusbarMessage(msg, FSEndReached);
}
else if (status == FSTopReached)
{
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-top-reached", L"Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached.");
wstring msg = _nativeLangSpeaker.getLocalizedStrFromID("find-status-top-reached", FIND_STATUS_TOP_REACHED_TEXT);
_findReplaceDlg.setStatusbarMessage(msg, FSTopReached);
}
}

8
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
Unescape View File

@ -1911,12 +1911,12 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
if (findStatus == FSEndReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-end-reached", L"Find: Found the last occurrence from the top. The end of the document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-end-reached", FIND_STATUS_END_REACHED_TEXT);
setStatusbarMessage(msg, FSEndReached);
}
else if (findStatus == FSTopReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-top-reached", L"Find: Found the last occurrence from the bottom. The beginning of the document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-top-reached", FIND_STATUS_TOP_REACHED_TEXT);
setStatusbarMessage(msg, FSTopReached);
}
}
@ -2972,12 +2972,12 @@ bool FindReplaceDlg::processReplace(const wchar_t *txt2find, const wchar_t *txt2
if (status == FSEndReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-end-reached", L"Replace: Replaced the last occurrence from the top. The end of document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-end-reached", FIND_STATUS_REPLACE_END_REACHED_TEXT);
setStatusbarMessage(msg, FSEndReached);
}
else if (status == FSTopReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-top-reached", L"Replace: Replaced the last occurrence from the bottom. The begin of document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-top-reached", FIND_STATUS_REPLACE_TOP_REACHED_TEXT);
setStatusbarMessage(msg, FSTopReached);
}
else

5
PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
Unescape View File

@ -38,7 +38,10 @@ enum DIALOG_TYPE {FIND_DLG, REPLACE_DLG, FINDINFILES_DLG, FINDINPROJECTS_DLG, MA
#define DIR_DOWN true
#define DIR_UP false
//#define FIND_REPLACE_STR_MAX 256
#define FIND_STATUS_END_REACHED_TEXT L"Find: End of document reached, first occurrence from the top found."
#define FIND_STATUS_TOP_REACHED_TEXT L"Find: Beginning of the document reached, first occurrence from the bottom found."
#define FIND_STATUS_REPLACE_END_REACHED_TEXT L"Replace: End of document reached, first occurrence from the top replaced."
#define FIND_STATUS_REPLACE_TOP_REACHED_TEXT L"Replace: Beginning of document reached, first occurrence from the bottom replaced."
enum InWhat{ALL_OPEN_DOCS, FILES_IN_DIR, CURRENT_DOC, CURR_DOC_SELECTION, FILES_IN_PROJECTS};

Write Preview
Loading…
Cancel
Save