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 1 Packages Projects Releases Wiki Activity

Merge pull request #2334 from RaiKoHoff/grepWin_Integration

Browse Source 
Don't add recent file list (history) to taskbar's jump-list
This commit is contained in:
Rainer Kottenhoff 2020-05-15 12:36:42 +02:00 committed by GitHub
commit 1e55ac4b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2
1

2
Versions/day.txt
View File

@ -1 +1 @@
514
515

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.514.2"
version="5.20.515.1"
type="win32"
/>
<description>Notepad3 BETA</description>

30
src/Config/Config.cpp
View File

@ -673,13 +673,13 @@ extern "C" bool IniFileIterateSection(LPCWSTR lpFilePath, LPCWSTR lpSectionName,
//
extern "C" void AddFilePathToRecentDocs(LPCWSTR szFilePath)
{
if (StrIsEmpty(szFilePath)) {
return;
}
if (StrIsEmpty(szFilePath)) { return; }
if (Flags.ShellUseSystemMRU)
{
#if TRUE
SHAddToRecentDocs(SHARD_PATHW, szFilePath);
#if 0
#else
(void)CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_SPEED_OVER_MEMORY | COINIT_DISABLE_OLE1DDE);
IShellItem* pShellItem = NULL;
@ -2150,14 +2150,16 @@ bool MRU_AddFile(LPMRULIST pmru, LPWSTR pszFile, bool bRelativePath, bool bUnexp
else {
pmru->pszItems[0] = StrDup(pszFile); // LocalAlloc()
}
if (!bAlreadyInList) {
AddFilePathToRecentDocs(pszFile);
}
pmru->iEncoding[0] = iEnc;
pmru->iCaretPos[0] = (Settings.PreserveCaretPos ? iPos : -1);
pmru->iSelAnchPos[0] = (Settings.PreserveCaretPos ? iSelAnc : -1);
pmru->pszBookMarks[0] = (pszBookMarks ? StrDup(pszBookMarks) : NULL); // LocalAlloc()
return true;
if (!bAlreadyInList) {
AddFilePathToRecentDocs(pszFile);
}
return bAlreadyInList;
}
return false;
}
@ -2288,18 +2290,6 @@ bool MRU_Load(LPMRULIST pmru, bool bFileProps)
}
CloseSettingsFile(false, bOpendByMe);
}
if (bFileProps) {
WCHAR szFilePath[MAX_PATH + 1];
for (int i = n - 1; i >= 0; --i)
{
if (StrIsNotEmpty(pmru->pszItems[i])) {
PathAbsoluteFromApp(pmru->pszItems[i], szFilePath, COUNTOF(szFilePath), true);
AddFilePathToRecentDocs(szFilePath);
}
}
}
return true;
}
return false;

37
src/Notepad3.c
View File

@ -9377,7 +9377,7 @@ bool ConsistentIndentationCheck(EditFileIOStatus* status)
bool FileLoad(bool bDontSave, bool bNew, bool bReload,
bool bSkipUnicodeDetect, bool bSkipANSICPDetection, bool bForceEncDetection, LPCWSTR lpszFile)
{
WCHAR szFileName[MAX_PATH] = { L'\0' };
WCHAR szFilePath[MAX_PATH] = { L'\0' };
bool fSuccess = false;
EditFileIOStatus fioStatus = INIT_FILEIO_STATUS;
@ -9440,35 +9440,35 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
}
if (StrIsEmpty(lpszFile)) {
if (!OpenFileDlg(Globals.hwndMain, szFileName, COUNTOF(szFileName), NULL)) {
if (!OpenFileDlg(Globals.hwndMain, szFilePath, COUNTOF(szFilePath), NULL)) {
return false;
}
}
else {
StringCchCopy(szFileName, COUNTOF(szFileName), lpszFile);
StringCchCopy(szFilePath, COUNTOF(szFilePath), lpszFile);
}
NormalizePathEx(szFileName, COUNTOF(szFileName), true, Flags.bSearchPathIfRelative);
NormalizePathEx(szFilePath, COUNTOF(szFilePath), true, Flags.bSearchPathIfRelative);
// change current directory to prevent directory lock on another path
WCHAR szFolder[MAX_PATH];
if (SUCCEEDED(StringCchCopy(szFolder,COUNTOF(szFolder), szFileName))) {
if (SUCCEEDED(StringCchCopy(szFolder,COUNTOF(szFolder), szFilePath))) {
if (SUCCEEDED(PathCchRemoveFileSpec(szFolder,COUNTOF(szFolder)))) {
SetCurrentDirectory(szFolder);
}
}
// Ask to create a new file...
if (!bReload && !PathFileExists(szFileName))
if (!bReload && !PathFileExists(szFilePath))
{
bool bCreateFile = s_flagQuietCreate;
if (!bCreateFile) {
INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONQUESTION, NULL, IDS_MUI_ASK_CREATE, PathFindFileName(szFileName));
INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONQUESTION, NULL, IDS_MUI_ASK_CREATE, PathFindFileName(szFilePath));
if ((IDOK == answer) || (IDYES == answer)) {
bCreateFile = true;
}
}
if (bCreateFile) {
HANDLE hFile = CreateFile(szFileName,
HANDLE hFile = CreateFile(szFilePath,
GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);
@ -9500,7 +9500,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
}
else {
int idx;
if (!bReload && MRU_FindFile(Globals.pFileMRU,szFileName,&idx)) {
if (!bReload && MRU_FindFile(Globals.pFileMRU,szFilePath,&idx)) {
fioStatus.iEncoding = Globals.pFileMRU->iEncoding[idx];
if (Encoding_IsValid(fioStatus.iEncoding)) {
Encoding_SrcWeak(fioStatus.iEncoding);
@ -9517,11 +9517,11 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
_END_UNDO_ACTION_;
_BEGIN_UNDO_ACTION_;
fSuccess = FileIO(true, szFileName, bSkipUnicodeDetect, bSkipANSICPDetection, bForceEncDetection, !bReload , &fioStatus, false, false);
fSuccess = FileIO(true, szFilePath, bSkipUnicodeDetect, bSkipANSICPDetection, bForceEncDetection, !bReload , &fioStatus, false, false);
_END_UNDO_ACTION_;
}
else {
fSuccess = FileIO(true, szFileName, bSkipUnicodeDetect, bSkipANSICPDetection, bForceEncDetection, !s_IsThisAnElevatedRelaunch, &fioStatus, false, false);
fSuccess = FileIO(true, szFilePath, bSkipUnicodeDetect, bSkipANSICPDetection, bForceEncDetection, !s_IsThisAnElevatedRelaunch, &fioStatus, false, false);
}
}
@ -9537,7 +9537,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
Flags.bPreserveFileModTime = DefaultFlags.bPreserveFileModTime;
}
StringCchCopy(Globals.CurrentFile,COUNTOF(Globals.CurrentFile),szFileName);
StringCchCopy(Globals.CurrentFile,COUNTOF(Globals.CurrentFile),szFilePath);
SetDlgItemText(Globals.hwndMain,IDC_FILENAME,Globals.CurrentFile);
SetDlgItemInt(Globals.hwndMain,IDC_REUSELOCK,GetTickCount(),false);
@ -9556,13 +9556,14 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
DocPos iCaretPos = -1;
DocPos iAnchorPos = -1;
LPCWSTR pszBookMarks = L"";
if (!bReload && MRU_FindFile(Globals.pFileMRU,szFileName,&idx)) {
if (!bReload && MRU_FindFile(Globals.pFileMRU,szFilePath,&idx)) {
iCaretPos = Globals.pFileMRU->iCaretPos[idx];
iAnchorPos = Globals.pFileMRU->iSelAnchPos[idx];
pszBookMarks = Globals.pFileMRU->pszBookMarks[idx];
}
if (!(Flags.bDoRelaunchElevated || s_IsThisAnElevatedRelaunch)) {
MRU_AddFile(Globals.pFileMRU, szFileName, Flags.RelativeFileMRU, Flags.PortableMyDocs, fioStatus.iEncoding, iCaretPos, iAnchorPos, pszBookMarks);
if (!(Flags.bDoRelaunchElevated || s_IsThisAnElevatedRelaunch))
{
MRU_AddFile(Globals.pFileMRU, szFilePath, Flags.RelativeFileMRU, Flags.PortableMyDocs, fioStatus.iEncoding, iCaretPos, iAnchorPos, pszBookMarks);
}
EditSetBookmarkList(Globals.hwndEdit, pszBookMarks);
@ -9625,7 +9626,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
bool const bCheckEOL = bCheckFile && Globals.bDocHasInconsistentEOLs && Settings.WarnInconsistEOLs;
if (bCheckEOL && !Style_MaybeBinaryFile(Globals.hwndEdit, szFileName))
if (bCheckEOL && !Style_MaybeBinaryFile(Globals.hwndEdit, szFilePath))
{
if (WarnLineEndingDlg(Globals.hwndMain, &fioStatus)) {
SciCall_ConvertEOLs(fioStatus.iEOLMode);
@ -9640,7 +9641,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
bool const bCheckIndent = bCheckFile && !Flags.bLargeFileLoaded && Settings.WarnInconsistentIndents;
if (bCheckIndent && !Style_MaybeBinaryFile(Globals.hwndEdit, szFileName))
if (bCheckIndent && !Style_MaybeBinaryFile(Globals.hwndEdit, szFilePath))
{
EditIndentationStatistic(Globals.hwndEdit, &fioStatus);
ConsistentIndentationCheck(&fioStatus);
@ -9659,7 +9660,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
EndWaitCursor();
}
else if (!(Flags.bLargeFileLoaded || fioStatus.bUnknownExt)) {
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, PathFindFileName(szFileName));
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, PathFindFileName(szFilePath));
}
UpdateToolbar();

6
src/VersionEx.h
View File

@ -8,12 +8,12 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 514
#define VERSION_BUILD 2
#define VERSION_REV 515
#define VERSION_BUILD 1
#define SCINTILLA_VER 433
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27
#define TINYEXPR_VER 2018.05.11
#define UTHASH_VER 2.1.0
#define VERSION_PATCH BETA
#define VERSION_COMMIT_ID dkt1-amr
#define VERSION_COMMIT_ID t7820-rk