Skip to content

Commit 3aa558b

Browse files
lifenjoinerlifenjoiner
committed
adjust UI interaction logic
* only the 1st search path is validated * existing dir: all options for dir are enabled; otherwise, disabled * nonexistent path, invalid regex of search, excluding dir or including file names: path: mark to red, and disable search and replace * empty search: valid, counts files * empty replace: invalid if search is emtpy * softer red boarder for both light and dark themes
1 parent 373655e commit 3aa558b

26 files changed

+291
-283
lines changed

‎src/Resources/grepWin.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ BEGIN
7474
PUSHBUTTON "/",IDC_EDITMULTILINE2,553,81,13,12
7575
CONTROL "Search case-sensitive",IDC_CASE_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,98,89,10
7676
CONTROL "Dot matches newline",IDC_DOTMATCHNEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,98,125,10
77-
CONTROL "Create backup files",IDC_CREATEBACKUP,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,238,98,91,10
77+
CONTROL "Create backup files",IDC_CREATEBACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,238,98,91,10
7878
CONTROL "Treat files as UTF8",IDC_UTF8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,98,93,10
7979
PUSHBUTTON "Test regex",IDC_TESTREGEX,14,109,77,14
8080
PUSHBUTTON "Add to Presets",IDC_ADDTOBOOKMARKS,108,109,76,14
@@ -91,7 +91,7 @@ BEGIN
9191
CONTROL "Include system items",IDC_INCLUDESYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,166,90,10
9292
CONTROL "Include hidden items",IDC_INCLUDEHIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,166,85,10
9393
CONTROL "Include subfolders",IDC_INCLUDESUBFOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,178,89,10
94-
CONTROL "Include binary files",IDC_INCLUDEBINARY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,108,178,86,10
94+
CONTROL "Include binary files",IDC_INCLUDEBINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,178,86,10
9595
CONTROL "Include symbolic links",IDC_INCLUDESYMLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,190,115,10
9696
CONTROL "All dates",IDC_RADIO_DATE_ALL,"Button",BS_AUTORADIOBUTTON,198,139,106,10
9797
CONTROL "Newer than",IDC_RADIO_DATE_NEWER,"Button",BS_AUTORADIOBUTTON,198,152,58,10
@@ -349,8 +349,8 @@ END
349349

350350
STRINGTABLE
351351
BEGIN
352-
IDS_PATTERN_TT "only files that match this pattern are searched.\r\nUse ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
353-
IDS_EXCLUDEDIR_TT "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
352+
IDS_PATTERN_TT "only files that match this pattern are searched.\r\nText match extended. Use ""|"" as the delimiter.\r\nExample: *.cpp|*.h"
353+
IDS_EXCLUDEDIR_TT "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
354354
IDS_SEARCHPATH_TT "the path(s) which is searched recursively.\r\nSeparate paths with the | symbol.\r\nExample: c:\\temp|d:\\logs"
355355
IDS_DOTMATCHNEWLINE_TT "Newline is matched by '.'"
356356
IDS_SEARCHTEXT_TT "a regular expression used for searching. Press F1 for more info."

‎src/SearchDlg.cpp‎

Lines changed: 230 additions & 227 deletions
Large diffs are not rendered by default.

‎src/SearchDlg.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class CSearchDlg : public CDialog
9393
m_showContent = true;
9494
m_showContentSet = true;
9595
}
96+
bool isSearchPathValid() const;
9697
bool isRegexValid() const;
9798
bool isExcludeDirsRegexValid() const;
9899
bool isFileNameMatchRegexValid() const;
@@ -114,7 +115,7 @@ class CSearchDlg : public CDialog
114115
bool SaveSettings();
115116
void SaveWndPosition();
116117
void formatDate(wchar_t dateNative[], const FILETIME& fileTime, bool forceShortFmt) const;
117-
int CheckRegex();
118+
bool CheckRegex(const std::wstring& patternString);
118119
bool MatchPath(LPCTSTR pathBuf) const;
119120
void AutoSizeAllColumns();
120121
int GetSelectedListIndex(int index);
@@ -199,7 +200,11 @@ class CSearchDlg : public CDialog
199200
std::wstring m_resultString;
200201
std::wstring m_toolTipReplaceString;
201202
std::unique_ptr<CInfoRtfDialog> m_rtfDialog;
202-
bool m_isRegexValid;
203+
204+
bool m_hasSearchDir;
205+
bool m_isSearchPathValid;
206+
int m_SearchValidLength;
207+
int m_ReplaceValidLength;
203208
bool m_isExcludeDirsRegexValid;
204209
bool m_isFileNameMatchingRegexValid;
205210

‎translations/Afrikaans.lang‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr "Aantal NULL-bytes per MB wat toegelaat word dat 'n lêer steeds as teks in plaas van binêre beskou kan word"
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use\"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608608
msgstr "slegs lêers wat by hierdie patroon ooreenstem, word deursoek\nGebruik '|' as die afbakening.\nVoorbeeld: *.cpp|*.h"
609609

610610
#. Resource IDs: (176)
@@ -641,7 +641,7 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr "die pad(e) wat rekursief gesoek word.\nAfsonder paaie met die '|' simbool.\nVoorbeeld: c:\\temp|d:\\logs"
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645645
msgstr "jy kan directories uitsluit, bv. CVS en beelde.\nVoorbeeld: ^(CVS|images)$\nOpmerking: '.svn' gidse is 'versteek' op Windows, dus word dit meestal nie geskandeer nie"
646646

647647
#. Resource IDs: (1064, 1066, 1067)

‎translations/Belarusian.lang‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr ""
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use\"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608608
msgstr ""
609609

610610
#. Resource IDs: (176)
@@ -641,7 +641,7 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr ""
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645645
msgstr ""
646646

647647
#. Resource IDs: (1064, 1066, 1067)

‎translations/Chinese Simplified.lang‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr "允许将文件仍视为文本而不是二进制文件的每 MB 空字节数"
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608-
msgstr "仅匹配此样式的文件被搜索.\r\n 使用 \"|\" 作为分隔符.\r\n 例如: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608+
msgstr "仅匹配此样式的文件被搜索.\r\n文本匹配已扩展. 使用 \"|\" 作为分隔符.\r\n例如: *.cpp|*.h"
609609

610610
#. Resource IDs: (176)
611611
msgid "open list with recent entries"
@@ -641,8 +641,8 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr "将被递归搜索的路径.\r\n 使用 \"|\" 符号来分隔路径.\r\n 比如: c:\\temp|d:\\logs"
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645-
msgstr "你可以排除目录, 比如: CVS 和 images.\r\n 例如: ^(CVS|images)$\r\n 注意, \".svn\" 目录在 Windows 中是隐藏的, 所以通常不扫描它们."
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645+
msgstr "你可以排除目录, 比如: CVS 和 images.\r\n文本匹配已扩展. 例如: ^(CVS|images)$\r\n注意, \".svn\" 目录在 Windows 中是隐藏的, 所以通常不扫描它们."
646646

647647
#. Resource IDs: (1064, 1066, 1067)
648648
msgid "|"

‎translations/Chinese Traditional.lang‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,8 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr "每 MB 允許的 NULL 位元數，以便將檔案仍視為文字而不是二進位檔案"
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608-
msgstr "僅搜尋與此模式匹配的檔案。\r\n使用 \"|\" 作為分隔符。\r\n例如: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use\"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608+
msgstr "僅搜尋與此模式匹配的檔案。\r\n文字匹配已擴充。使用 \"|\" 作為分隔符。\r\n例如: *.cpp|*.h"
609609

610610
#. Resource IDs: (176)
611611
msgid "open list with recent entries"
@@ -641,8 +641,8 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr "遞迴搜尋的路徑。\r\n使用 \"|\" 符號分隔路徑。\r\n例如: c:\\temp|d:\\logs"
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645-
msgstr "您可以排除目錄，例如 CVS 和 images。\r\n例如: ^(CVS|images)$\r\n注意，'.svn' 資料夾在 Windows 上是 '隱藏' 的，因此通常不會被掃描。"
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645+
msgstr "您可以排除目錄，例如 CVS 和 images。\r\n文字匹配已擴充。例如: ^(CVS|images)$\r\n注意，'.svn' 資料夾在 Windows 上是 '隱藏' 的，因此通常不會被掃描。"
646646

647647
#. Resource IDs: (1064, 1066, 1067)
648648
msgid "|"

‎translations/Dutch.lang‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr "Aantal NULL-bytes per MB waarmee een bestand nog steeds wordt beschouwd als tekst in plaats van binair"
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use\"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608608
msgstr "alleen bestanden die overeenkomen met dit patroon, worden doorzocht.\r\nGebruik \"|\" als scheidingsteken.\r\nVoorbeeld: *.cpp|*.h"
609609

610610
#. Resource IDs: (176)
@@ -641,7 +641,7 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr "het pad wordt recursief doorzocht.\r\nScheidt de paden met het | symbool.\r\nVoorbeeld: c:\\temp|d:\\logs"
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645645
msgstr "Je kunt mappen uitsluiten, bijv. CVS en afbeeldingen.\r\nVoorbeeld: ^(CVS|images)$\r\nOpmerking: '.svn' mappen zijn in Windows normaal verborgen en worden daarom normaal niet doorzocht."
646646

647647
#. Resource IDs: (1064, 1066, 1067)

‎translations/English.lang‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr ""
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use\"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608608
msgstr ""
609609

610610
#. Resource IDs: (176)
@@ -641,7 +641,7 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr ""
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645645
msgstr ""
646646

647647
#. Resource IDs: (1064, 1066, 1067)

‎translations/French.lang‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ msgid "number of NULL bytes per MB allowed for a file to still be considered tex
604604
msgstr ""
605605

606606
#. Resource IDs: (112)
607-
msgid "only files that match this pattern are searched.\r\nUse \"|\" as the delimiter.\r\nExample: *.cpp|*.h"
607+
msgid "only files that match this pattern are searched.\r\nText match extended. Use\"|\" as the delimiter.\r\nExample: *.cpp|*.h"
608608
msgstr "La recherche ne sera manée que dans les fichiers qui correspondent à ce motif.\nUtiliser '|' comme séparateur\nExemple : *.cpp|*.h"
609609

610610
#. Resource IDs: (176)
@@ -641,7 +641,7 @@ msgid "the path(s) which is searched recursively.\r\nSeparate paths with the | s
641641
msgstr "Chemin(s) de recherche récursive.\n'|' pour ajouter un chemin.\nExemple : c:\\temp|d:\\logs"
642642

643643
#. Resource IDs: (113)
644-
msgid "you can exclude directories, e.g. CVS and images.\r\nExample: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
644+
msgid "you can exclude directories, e.g. CVS and images.\r\nText match extended. Example: ^(CVS|images)$\r\nNote, '.svn' folders are 'hidden' on Windows, so they usually are not scanned."
645645
msgstr "Il est possible d'exclure des dossiers. Exemple : ^(CVS|images)$ pour exclure CVS\\ et images\\.\nLes dossiers .svn sont 'cachés' sous Windows et ne sont normalment pas parcourus."
646646

647647
#. Resource IDs: (1064, 1066, 1067)

0 commit comments

Comments
 (0)