CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2647 from RaiKoHoff/Dev_NewFeatures

Browse Source 
grepWinNP3: fix invalid searchPath Ballon-Tip handling
This commit is contained in:
Rainer Kottenhoff 2020-08-12 12:40:58 +02:00 committed by GitHub
commit 58e4e21037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grepWinNP3/grepWinNP3.vcxproj.filters
View File

@ -22,6 +22,9 @@
<Filter Include="translationsNP3">
<UniqueIdentifier>{5fd907ec-eafb-47ec-aa1a-6c84ea9ec37e}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\last">
<UniqueIdentifier>{d46256b6-071e-4799-ac23-8cd4ad83b774}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\AboutDlg.cpp">
@ -287,9 +290,6 @@
<ClInclude Include="sktoolslib_mod\ThreadPool.h">
<Filter>sktoolslib_mod</Filter>
</ClInclude>
<ClInclude Include="src\last\version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="sktoolslib_mod\PreserveChdir.h">
<Filter>sktoolslib_mod</Filter>
</ClInclude>
@ -299,6 +299,9 @@
<ClInclude Include="sktoolslib_mod\OnOutOfScope.h">
<Filter>sktoolslib_mod</Filter>
</ClInclude>
<ClInclude Include="src\last\version.h">
<Filter>Header Files\last</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="default.build">

26
grepWinNP3/src/SearchDlg.cpp
View File

@ -938,16 +938,7 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_RELATIVEPATH).c_str());
break;
}
std::vector<std::wstring> searchpaths;
stringtok(searchpaths, m_searchpath, true);
for (const auto& sp : searchpaths)
{
if (!PathFileExists(sp.c_str()))
{
ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_PATHNOTEXIST).c_str());
break;
}
}
if ((id == IDC_SEARCHINFOUNDFILES) && (!m_items.empty()))
{
m_searchpath.clear();
@ -959,6 +950,21 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
}
}
std::vector<std::wstring> searchpaths;
stringtok(searchpaths, m_searchpath, true);
bool ok = true;
for (const auto& sp : searchpaths)
{
if (!PathFileExists(sp.c_str()))
{
ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_PATHNOTEXIST).c_str());
ok = false;
break;
}
}
if (!ok)
break;
m_searchedItems = 0;
m_totalitems = 0;

12
grepWinNP3/src/last/version.h
View File

@ -6,13 +6,13 @@
//#pragma message(__LOC__"Run the NAnt script to get proper version info")
#define FILEVER 2, 1, 3, 22
#define PRODUCTVER 2, 1, 3, 22
#define STRFILEVER "2.1.3.22\0"
#define STRPRODUCTVER "2.1.3.22\0"
#define FILEVER 2, 1, 3, 23
#define PRODUCTVER 2, 1, 3, 23
#define STRFILEVER "2.1.3.23\0"
#define STRPRODUCTVER "2.1.3.23\0"
#define GREPWIN_VERMAJOR 2
#define GREPWIN_VERMINOR 1
#define GREPWIN_VERMICRO 3
#define GREPWIN_VERBUILD 22
#define GREPWIN_VERDATE "2020-08-05"
#define GREPWIN_VERBUILD 23
#define GREPWIN_VERDATE "2020-08-12"