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 #2933 from RaiKoHoff/Dev_Lexilla

Browse Source 
Open/Save File Explorer issues
This commit is contained in:
Rainer Kottenhoff 2020-10-04 14:26:36 +02:00 committed by GitHub
commit d45bec239d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 155 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Helpers.c
View File

@ -1268,8 +1268,9 @@ void PrepareFilterStr(LPWSTR lpFilter)
LPWSTR psz = StrEnd(lpFilter,0);
while (psz != lpFilter)
{
if (*(psz = CharPrev(lpFilter,psz)) == L'|')
if (*(psz = CharPrev(lpFilter, psz)) == L'|') {
*psz = L'\0';
}
}
}

166
src/Notepad3.c
View File

@ -133,8 +133,6 @@ static LPWSTR s_lpFileList[FILE_LIST_SIZE] = { NULL };
static int s_cFileList = 0;
static int s_cchiFileList = 0;
static WCHAR s_tchLastSaveCopyDir[MAX_PATH] = { L'\0' };
static bool s_bRunningWatch = false;
static bool s_bFileReadOnly = false;
@ -10607,18 +10605,20 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP
// Save As...
if (bSaveAs || bSaveCopy || StrIsEmpty(Globals.CurrentFile))
{
static WCHAR _tchLastSaveCopyDir[MAX_PATH] = { L'\0' }; // session remember copyTo dir
WCHAR tchFile[MAX_PATH] = { L'\0' };
WCHAR tchInitialDir[MAX_PATH] = { L'\0' };
if (bSaveCopy && StrIsNotEmpty(s_tchLastSaveCopyDir)) {
StringCchCopy(tchInitialDir, COUNTOF(tchInitialDir), s_tchLastSaveCopyDir);
StringCchCopy(tchFile, COUNTOF(tchFile), s_tchLastSaveCopyDir);
if (bSaveCopy && StrIsNotEmpty(_tchLastSaveCopyDir)) {
StringCchCopy(tchInitialDir, COUNTOF(tchInitialDir), _tchLastSaveCopyDir);
StringCchCopy(tchFile, COUNTOF(tchFile), _tchLastSaveCopyDir);
PathCchAppend(tchFile, COUNTOF(tchFile), PathFindFileName(Globals.CurrentFile));
}
else {
StringCchCopy(tchFile, COUNTOF(tchFile), Globals.CurrentFile);
}
if (SaveFileDlg(Globals.hwndMain, tchFile, COUNTOF(tchFile), tchInitialDir))
if (SaveFileDlg(Globals.hwndMain, tchFile, COUNTOF(tchFile), StrIsNotEmpty(tchInitialDir) ? tchInitialDir : NULL))
{
fSuccess = FileIO(false, tchFile, true, true, false, true, &fioStatus, bSaveCopy, bPreserveTimeStamp);
if (fSuccess)
@ -10634,8 +10634,8 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP
Style_SetLexerFromFile(Globals.hwndEdit, Globals.CurrentFile);
}
else {
StringCchCopy(s_tchLastSaveCopyDir, COUNTOF(s_tchLastSaveCopyDir), tchFile);
PathCchRemoveFileSpec(s_tchLastSaveCopyDir, COUNTOF(s_tchLastSaveCopyDir));
StringCchCopy(_tchLastSaveCopyDir, COUNTOF(_tchLastSaveCopyDir), tchFile);
PathCchRemoveFileSpec(_tchLastSaveCopyDir, COUNTOF(_tchLastSaveCopyDir));
}
}
}
@ -10732,105 +10732,115 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP
//=============================================================================
//
// OpenFileDlg()
// _CanonicalizeInitialDir()
//
//
static WCHAR s_szFilter[NUMLEXERS * AVG_NUM_OF_STYLES_PER_LEXER * 100];
bool OpenFileDlg(HWND hwnd,LPWSTR lpstrFile,int cchFile,LPCWSTR lpstrInitialDir)
static void _CanonicalizeInitialDir(LPWSTR lpstrInitialDir, int cchInitialDir)
{
OPENFILENAME ofn;
WCHAR szFile[MAX_PATH] = { L'\0' };
WCHAR tchInitialDir[MAX_PATH] = { L'\0' };
Style_GetOpenDlgFilterStr(s_szFilter,COUNTOF(s_szFilter));
if (!lpstrInitialDir) {
if (StrIsEmpty(lpstrInitialDir)) {
if (StrIsNotEmpty(Globals.CurrentFile)) {
StringCchCopy(tchInitialDir,COUNTOF(tchInitialDir),Globals.CurrentFile);
PathCchRemoveFileSpec(tchInitialDir, COUNTOF(tchInitialDir));
StringCchCopy(lpstrInitialDir, cchInitialDir, Globals.CurrentFile);
PathCchRemoveFileSpec(lpstrInitialDir, cchInitialDir);
} else if (StrIsNotEmpty(Settings2.DefaultDirectory)) {
ExpandEnvironmentStrings(Settings2.DefaultDirectory, lpstrInitialDir, cchInitialDir);
} else {
StringCchCopy(lpstrInitialDir, cchInitialDir, Globals.WorkingDirectory);
}
else if (StrIsNotEmpty(Settings2.DefaultDirectory)) {
ExpandEnvironmentStrings(Settings2.DefaultDirectory,tchInitialDir,COUNTOF(tchInitialDir));
if (PathIsRelative(tchInitialDir)) {
WCHAR tchModule[MAX_PATH] = { L'\0' };
PathGetAppDirectory(tchModule, COUNTOF(tchModule));
PathCchAppend(tchModule,COUNTOF(tchModule),tchInitialDir);
}
if (StrIsNotEmpty(lpstrInitialDir)) {
if (PathIsRelative(lpstrInitialDir)) {
WCHAR tchModule[MAX_PATH] = { L'\0' };
PathGetAppDirectory(tchModule, COUNTOF(tchModule));
PathCchAppend(tchModule, COUNTOF(tchModule), lpstrInitialDir);
StringCchCopy(lpstrInitialDir, cchInitialDir, tchModule);
}
}
if (StrIsNotEmpty(lpstrInitialDir)) {
if (PathFileExists(lpstrInitialDir)) {
if (!PathIsDirectory(lpstrInitialDir)) {
PathCchRemoveFileSpec(lpstrInitialDir, cchInitialDir);
}
} else {
StringCchCopy(lpstrInitialDir, cchInitialDir, L""); // clear
}
else
StringCchCopy(tchInitialDir,COUNTOF(tchInitialDir),Globals.WorkingDirectory);
}
}
//=============================================================================
//
// OpenFileDlg()
// lpstrInitialDir == NULL : leave initial dir to Open File Explorer
// lpstrInitialDir == ""[empty] : use a reasonable initial directory path
//
bool OpenFileDlg(HWND hwnd, LPWSTR lpstrFile, int cchFile, LPCWSTR lpstrInitialDir)
{
if (!lpstrFile || (cchFile < 256)) { return false; }
WCHAR szFilter[BUFZIZE_STYLE_EXTENTIONS << 1];
WCHAR szDefExt[64] = { L'\0' };
Style_GetFileFilterStr(szFilter, COUNTOF(szFilter), szDefExt, COUNTOF(szDefExt), false);
WCHAR tchInitialDir[MAX_PATH] = { L'\0' };
if (lpstrInitialDir) {
StringCchCopy(tchInitialDir, COUNTOF(tchInitialDir), lpstrInitialDir);
_CanonicalizeInitialDir(tchInitialDir, COUNTOF(tchInitialDir));
}
ZeroMemory(&ofn,sizeof(OPENFILENAME));
OPENFILENAME ofn;
ZeroMemory(&ofn, sizeof(OPENFILENAME));
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = hwnd;
ofn.lpstrFilter = s_szFilter;
ofn.lpstrFile = szFile;
ofn.lpstrInitialDir = (lpstrInitialDir) ? lpstrInitialDir : tchInitialDir;
ofn.nMaxFile = COUNTOF(szFile);
ofn.hInstance = Globals.hInstance;
ofn.lpstrFilter = szFilter;
ofn.lpstrCustomFilter = NULL; // no preserved (static member) user-defined patten
ofn.lpstrInitialDir = StrIsNotEmpty(tchInitialDir) ? tchInitialDir : NULL;
ofn.lpstrFile = lpstrFile;
ofn.nMaxFile = cchFile;
ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | /* OFN_NOCHANGEDIR |*/
OFN_DONTADDTORECENT | OFN_PATHMUSTEXIST |
OFN_SHAREAWARE /*| OFN_NODEREFERENCELINKS*/;
ofn.lpstrDefExt = StrIsNotEmpty(Settings2.DefaultExtension) ? Settings2.DefaultExtension : NULL;
ofn.lpstrDefExt = StrIsNotEmpty(szDefExt) ? szDefExt : Settings2.DefaultExtension;
if (GetOpenFileName(&ofn)) {
StringCchCopyN(lpstrFile,cchFile,szFile,COUNTOF(szFile));
return true;
}
return false;
return GetOpenFileName(&ofn);
}
//=============================================================================
//
// SaveFileDlg()
// lpstrInitialDir == NULL : leave initial dir to Save File Explorer
// lpstrInitialDir == ""[empty] : use a reasonable initial directory path
//
//
bool SaveFileDlg(HWND hwnd,LPWSTR lpstrFile,int cchFile,LPCWSTR lpstrInitialDir)
bool SaveFileDlg(HWND hwnd, LPWSTR lpstrFile, int cchFile, LPCWSTR lpstrInitialDir)
{
OPENFILENAME ofn;
WCHAR szNewFile[MAX_PATH] = { L'\0' };
if (!lpstrFile || (cchFile < 256)) { return false; }
WCHAR szFilter[BUFZIZE_STYLE_EXTENTIONS << 2];
WCHAR szDefExt[64] = { L'\0' };
Style_GetFileFilterStr(szFilter, COUNTOF(szFilter), szDefExt, COUNTOF(szDefExt), true);
WCHAR tchInitialDir[MAX_PATH] = { L'\0' };
StringCchCopy(szNewFile,COUNTOF(szNewFile),lpstrFile);
Style_GetOpenDlgFilterStr(s_szFilter,COUNTOF(s_szFilter));
if (StrIsNotEmpty(lpstrInitialDir)) {
if (lpstrInitialDir) {
StringCchCopy(tchInitialDir, COUNTOF(tchInitialDir), lpstrInitialDir);
_CanonicalizeInitialDir(tchInitialDir, COUNTOF(tchInitialDir));
}
else if (StrIsNotEmpty(Globals.CurrentFile)) {
StringCchCopy(tchInitialDir,COUNTOF(tchInitialDir),Globals.CurrentFile);
PathCchRemoveFileSpec(tchInitialDir, COUNTOF(tchInitialDir));
}
else if (StrIsNotEmpty(Settings2.DefaultDirectory)) {
ExpandEnvironmentStrings(Settings2.DefaultDirectory,tchInitialDir,COUNTOF(tchInitialDir));
if (PathIsRelative(tchInitialDir)) {
WCHAR tchModule[MAX_PATH] = { L'\0' };
PathGetAppDirectory(tchModule, COUNTOF(tchModule));
PathCchAppend(tchModule,COUNTOF(tchModule),tchInitialDir);
}
}
else {
StringCchCopy(tchInitialDir, COUNTOF(tchInitialDir), Globals.WorkingDirectory);
}
ZeroMemory(&ofn,sizeof(OPENFILENAME));
OPENFILENAME ofn;
ZeroMemory(&ofn, sizeof(OPENFILENAME));
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = hwnd;
ofn.lpstrFilter = s_szFilter;
ofn.lpstrFile = szNewFile;
ofn.lpstrInitialDir = tchInitialDir;
ofn.nMaxFile = MAX_PATH;
ofn.hInstance = Globals.hInstance;
ofn.lpstrFilter = szFilter;
ofn.lpstrCustomFilter = NULL; // no preserved (static member) user-defined patten
ofn.lpstrInitialDir = StrIsNotEmpty(tchInitialDir) ? tchInitialDir : NULL;
ofn.lpstrFile = lpstrFile;
ofn.nMaxFile = cchFile;
ofn.Flags = OFN_HIDEREADONLY /*| OFN_NOCHANGEDIR*/ |
/*OFN_NODEREFERENCELINKS |*/ OFN_OVERWRITEPROMPT |
OFN_DONTADDTORECENT | OFN_PATHMUSTEXIST;
ofn.lpstrDefExt = StrIsNotEmpty(Settings2.DefaultExtension) ? Settings2.DefaultExtension : NULL;
/*OFN_NODEREFERENCELINKS |*/ OFN_OVERWRITEPROMPT |
OFN_DONTADDTORECENT | OFN_PATHMUSTEXIST;
ofn.lpstrDefExt = StrIsNotEmpty(szDefExt) ? szDefExt : Settings2.DefaultExtension;
if (GetSaveFileName(&ofn)) {
StringCchCopyN(lpstrFile,cchFile,szNewFile,COUNTOF(szNewFile));
return true;
}
return false;
return GetSaveFileName(&ofn);
}

72
src/Styles.c
View File

@ -2519,18 +2519,74 @@ void Style_SetExtraLineSpace(HWND hwnd, LPWSTR lpszStyle, int cch)
//=============================================================================
//
// Style_GetFileOpenDlgFilter()
// Style_GetFileFilterStr()
//
bool Style_GetOpenDlgFilterStr(LPWSTR lpszFilter,int cchFilter)
bool Style_GetFileFilterStr(LPWSTR lpszFilter, int cchFilter, LPWSTR lpszDefExt, int cchExt, bool bSaveAs)
{
if (StrIsEmpty(Settings2.FileDlgFilters)) {
GetLngString(IDS_MUI_FILTER_ALL, lpszFilter, cchFilter);
ZeroMemory(lpszFilter, cchFilter * sizeof(WCHAR));
LPCWSTR curExt = PathFindExtension(Globals.CurrentFile);
if (StrIsNotEmpty(curExt)) {
curExt += 1;
}
else {
StringCchCopyN(lpszFilter,cchFilter,Settings2.FileDlgFilters,cchFilter - 2);
StringCchCat(lpszFilter,cchFilter,L"||");
WCHAR filterAll[80] = { L'\0' };
GetLngString(IDS_MUI_FILTER_ALL, filterAll, COUNTOF(filterAll));
WCHAR filterDef[BUFZIZE_STYLE_EXTENTIONS << 1] = { L'\0' };
WCHAR ext[64] = { L'\0' };
WCHAR append[80] = { L'\0' };
bool bCurExtIncl = false;
LPWSTR p = Style_GetCurrentLexerPtr()->szExtensions;
while (p) {
LPWSTR q = StrChrW(p, L';');
if (q) {
StringCchCopyN(ext, COUNTOF(ext), p, (q - p));
p = q + 1;
} else {
StringCchCopy(ext, COUNTOF(ext), p);
p = q;
}
if (StrIsNotEmpty(ext)) {
if (StringCchCompareXI(ext, curExt) == 0) { bCurExtIncl = true; }
if (StrIsNotEmpty(append)) {
StringCchCat(filterDef, COUNTOF(filterDef), L";");
} else {
StringCchCopy(lpszDefExt, cchExt, ext); // first found ext is default
}
StringCchPrintf(append, COUNTOF(append), L"*.%s", ext);
StringCchCat(filterDef, COUNTOF(filterDef), append);
}
}
if (!bCurExtIncl && StrIsNotEmpty(curExt)) {
StringCchPrintf(append, COUNTOF(append), L";*.%s", curExt);
StringCchCat(filterDef, COUNTOF(filterDef), append);
}
if (!bSaveAs) {
StringCchCat(lpszFilter, cchFilter, filterAll); // 1st for open dlg
}
if (StrIsNotEmpty(filterDef)) {
WCHAR lexerNameLng[80];
GetLngString(Style_GetCurrentLexerPtr()->resID, lexerNameLng, COUNTOF(lexerNameLng));
StringCchCat(lpszFilter, cchFilter, lexerNameLng);
StringCchCat(lpszFilter, cchFilter, L" (");
StringCchCat(lpszFilter, cchFilter, filterDef);
StringCchCat(lpszFilter, cchFilter, L")|");
StringCchCat(lpszFilter, cchFilter, filterDef);
StringCchCat(lpszFilter, cchFilter, L"|");
}
if (StrIsNotEmpty(Settings2.FileDlgFilters)) {
StringCchCat(lpszFilter, cchFilter, Settings2.FileDlgFilters);
StringCchCat(lpszFilter, cchFilter, L"|");
}
if (bSaveAs) {
StringCchCat(lpszFilter, cchFilter, filterAll); // last if save as dlg
}
PrepareFilterStr(lpszFilter);
return true;
}

2
src/Styles.h
View File

@ -71,7 +71,7 @@ bool Style_GetUse2ndDefault();
void Style_SetUse2ndDefault(bool);
void Style_SetIndentGuides(HWND hwnd,bool);
void Style_SetExtraLineSpace(HWND hwnd, LPWSTR lpszStyle, int cch);
bool Style_GetOpenDlgFilterStr(LPWSTR lpszFilter,int cchFilter);
bool Style_GetFileFilterStr(LPWSTR lpszFilter, int cchFilter, LPWSTR lpszDefExt, int cchExt, bool bSaveAs);
bool Style_StrGetFontName(LPCWSTR lpszStyle,LPWSTR lpszFont,int cchFont);
bool Style_StrGetFontStyle(LPCWSTR lpszStyle,LPWSTR lpszFontStyle,int cchFontStyle);
bool Style_StrGetFontQuality(LPCWSTR lpszStyle,LPWSTR lpszQuality,int cchQuality);