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 branch 'Dev_NewFeatures' into Dev_DarkMode

Browse Source
This commit is contained in:
RaiKoHoff 2020-08-25 07:54:15 +02:00
commit f7ffa72278
43 changed files with 513 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Build/Changes.txt
View File

@ -33,13 +33,14 @@ SUP - (S)et(UP) / Installer Package
=====================================================
Current BETA Version 5.20.823.(build_#) (2020-08-23)
Current BETA Version 5.20.824.(build_#) (2020-08-24)
=====================================================
-----------------------------------------------------
NEW:
-----------------------------------------------------
[.###.#]-
[.824.1]- Focused-View: mode Fold-Only.
[.823.1]- Mark Occurrences: show additional Bookmark (Arrows).
[.823.1]- Bookmark context menu: clear marker type.
[.822.2]- FocusedView Options: Bookmarks/Line-Highlight & Folding.
@ -62,6 +63,7 @@ NEW:
CHANGES:
-----------------------------------------------------
[.###.#]-
[.824.2]- grepWinNP3: Export search result list (NP3 enhancements).
[.823.1]- Delete Bookmarks (Alt+F2): 1st delete occurrence markers then std. bookmarks.
[.822.1]- Remove max count limitation for "Mark Occurrences" feature.
[.821.1]- Bookmark context menu on alpha-blend FocusedView marker line.
@ -78,7 +80,7 @@ CHANGES:
[.729.1]- DPI-Aware About & Custom.Scheme dialog.
[.729.1]- Swap Shortcuts: "Search in Files" -> "Ctrl+Shift+F" and Toggle Folds -> "Ctrl+Alt+F".
[.723.1]- Review document modified handler (dirty-flag).
[.817.2]- Update grepWinNP3 (GRE) version 2.1.3.26 (2020-08-17).
[.824.2]- Update grepWinNP3 (GRE) version 2.1.3.27 (2020-08-24).
[.813.1]- Update Oniguruma Regex (ONI) engine version 6.9.6 (2020-07-31).
[.818.1]- Update Scintilla Library (SCI) version 4.4.4 (2020-08-18).
@ -92,6 +94,7 @@ ENHANCEMENT:
FIXES:
-----------------------------------------------------
[.###.#]-
[.824.1]- Not intended bookmarker on F/R dialog mark findings.
[.823.1]- Bookmark Occurrences too menu checked.
[.823.1]- Scroll to cursor for selection start/end jumps.
[.823.1]- Not intended "violet" bookmark.

2
Versions/build.txt
View File

@ -1 +1 @@
1
2

2
Versions/day.txt
View File

@ -1 +1 @@
823
824

65
grepWinNP3/src/SearchDlg.cpp
View File

@ -1459,6 +1459,15 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
if (FailedShowMessage(hr))
break;
COMDLG_FILTERSPEC const aFileTypes[] = { {L"Text files", L"*.txt; *.lst"}, {L"All types", L"*.*"} };
hr = pfd->SetFileTypes(_countof(aFileTypes), aFileTypes);
if (FailedShowMessage(hr))
break;
hr = pfd->SetFileName(L"gw_search_results.txt");
if (FailedShowMessage(hr))
break;
IFileDialogCustomizePtr pfdCustomize;
hr = pfd.QueryInterface(IID_PPV_ARGS(&pfdCustomize));
if (SUCCEEDED(hr))
@ -1538,14 +1547,17 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
bool needSeparator = false;
if (includePaths)
{
file << CUnicodeUtils::StdGetUTF8(item.filepath);
std::string fpath = CUnicodeUtils::StdGetUTF8(item.filepath);
std::transform(fpath.begin(), fpath.end(), fpath.begin(), [](char c) { return (c == '\\' ? '/' : c); });
file << std::string("file://");
file << fpath;
needSeparator = true;
}
if (includeMatchLineNumbers)
{
if (needSeparator)
file << separator;
file << CStringUtils::Format("%lld", item.matchlinesnumbers[i]);
file << CStringUtils::Format("(%lld)", item.matchlinesnumbers[i]);
needSeparator = true;
}
if (includeMatchLineTexts)
@ -1571,19 +1583,41 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
}
else
{
auto exportpaths = CRegStdDWORD(L"Software\\grepWin\\export_paths");
auto exportlinenumbers = CRegStdDWORD(L"Software\\grepWin\\export_linenumbers");
auto exportlinecontent = CRegStdDWORD(L"Software\\grepWin\\export_linecontent");
auto exportpaths = CRegStdDWORD(L"Software\\grepWinNP3\\export_paths");
auto exportlinenumbers = CRegStdDWORD(L"Software\\grepWinNP3\\export_linenumbers");
auto exportlinecontent = CRegStdDWORD(L"Software\\grepWinNP3\\export_linecontent");
exportpaths = includePaths ? 1 : 0;
exportlinenumbers = includeMatchLineNumbers ? 1 : 0;
exportlinecontent = includeMatchLineTexts ? 1 : 0;
}
SHELLEXECUTEINFO sei = {0};
sei.cbSize = sizeof(SHELLEXECUTEINFO);
sei.lpVerb = TEXT("open");
sei.lpFile = path.c_str();
sei.nShow = SW_SHOWNORMAL;
ShellExecuteEx(&sei);
// open file
std::wstring cmd = bPortable ? g_iniFile.GetValue(L"global", L"editorcmd", L"") :
(std::wstring)CRegStdString(L"Software\\grepWinNP3\\editorcmd", L"");
if (!cmd.empty())
{
SearchReplace(cmd, L"%mode%", L"mb");
SearchReplace(cmd, L"%pattern%", L"");
SearchReplace(cmd, L"%line%", L"0");
SearchReplace(cmd, L"%path%", path.c_str());
STARTUPINFO startupInfo;
PROCESS_INFORMATION processInfo;
SecureZeroMemory(&startupInfo, sizeof(startupInfo));
startupInfo.cb = sizeof(STARTUPINFO);
SecureZeroMemory(&processInfo, sizeof(processInfo));
CreateProcess(NULL, const_cast<wchar_t*>(cmd.c_str()), NULL, NULL, FALSE, 0, 0, NULL, &startupInfo, &processInfo);
CloseHandle(processInfo.hThread);
CloseHandle(processInfo.hProcess);
}
else
{
SHELLEXECUTEINFO sei = {0};
sei.cbSize = sizeof(SHELLEXECUTEINFO);
sei.lpVerb = TEXT("open");
sei.lpFile = path.c_str();
sei.nShow = SW_SHOWNORMAL;
ShellExecuteEx(&sei);
}
}
}
}
@ -2328,10 +2362,8 @@ void CSearchDlg::OpenFileAtListIndex(int listIndex)
if (dotPos != std::wstring::npos)
ext = inf.filepath.substr(dotPos);
CRegStdString regEditorCmd(L"Software\\grepWinNP3\\editorcmd");
std::wstring cmd = regEditorCmd;
if (bPortable)
cmd = g_iniFile.GetValue(L"global", L"editorcmd", L"");
std::wstring cmd = bPortable ? g_iniFile.GetValue(L"global", L"editorcmd", L"") :
(std::wstring)CRegStdString(L"Software\\grepWinNP3\\editorcmd", L"");
if (!cmd.empty())
{
bool filelist = (IsDlgButtonChecked(*this, IDC_RESULTFILES) == BST_CHECKED);
@ -3333,7 +3365,8 @@ int CSearchDlg::SearchFile(std::shared_ptr<CSearchInfo> sinfoPtr, const std::wst
else
{
ProfileTimer profile((L"file load and parse: " + sinfoPtr->filepath).c_str());
auto nNullCount = bPortable ? _wtoi(g_iniFile.GetValue(L"settings", L"nullbytes", L"0")) : int(DWORD(CRegStdDWORD(L"Software\\grepWin\\nullbytes", 0)));
auto nNullCount = bPortable ? int(g_iniFile.GetLongValue(L"settings", L"nullbytes", 0)) :
int(DWORD(CRegStdDWORD(L"Software\\grepWinNP3\\nullbytes", 0)));
if (nNullCount > 0)
{
constexpr __int64 oneMB = 1024 * 1024;

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, 26
#define PRODUCTVER 2, 1, 3, 26
#define STRFILEVER "2.1.3.26\0"
#define STRPRODUCTVER "2.1.3.26\0"
#define FILEVER 2, 1, 3, 27
#define PRODUCTVER 2, 1, 3, 27
#define STRFILEVER "2.1.3.27\0"
#define STRPRODUCTVER "2.1.3.27\0"
#define GREPWIN_VERMAJOR 2
#define GREPWIN_VERMINOR 1
#define GREPWIN_VERMICRO 3
#define GREPWIN_VERBUILD 26
#define GREPWIN_VERDATE "2020-08-17"
#define GREPWIN_VERBUILD 27
#define GREPWIN_VERDATE "2020-08-24"

25
language/common_res.h
View File

@ -661,18 +661,19 @@
#define IDM_VIEW_CURRENTSCHEME 40470
#define IDM_VIEW_SCROLLPASTEOF 40471
#define IDM_VIEW_TOGGLE_VIEW 40472
#define IDM_VIEW_FV_BOOKMARK 40473
#define IDM_VIEW_FV_HIGHLIGHT 40474
#define IDM_VIEW_FV_BKMRKFOLD 40475
#define IDM_VIEW_FV_HIGHLGFOLD 40476
#define IDM_VIEW_CHASING_DOCTAIL 40477
#define IDM_VIEW_TOGGLETB 40478
#define IDM_VIEW_MUTE_MESSAGEBEEP 40479
#define IDM_VIEW_SHOW_HYPLNK_CALLTIP 40480
#define IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK 40481
#define IDM_VIEW_EDIT_LINECOMMENT 40482
#define IDM_VIEW_EVALTINYEXPRONSEL 40483
#define IDM_VIEW_UNICODE_POINTS 40484
#define IDM_VIEW_FV_FOLD 40473
#define IDM_VIEW_FV_BOOKMARK 40474
#define IDM_VIEW_FV_HIGHLIGHT 40475
#define IDM_VIEW_FV_BKMRKFOLD 40476
#define IDM_VIEW_FV_HIGHLGFOLD 40477
#define IDM_VIEW_CHASING_DOCTAIL 40478
#define IDM_VIEW_TOGGLETB 40479
#define IDM_VIEW_MUTE_MESSAGEBEEP 40480
#define IDM_VIEW_SHOW_HYPLNK_CALLTIP 40481
#define IDM_VIEW_SPLIT_UNDOTYPSEQ_LNBRK 40482
#define IDM_VIEW_EDIT_LINECOMMENT 40483
#define IDM_VIEW_EVALTINYEXPRONSEL 40484
#define IDM_VIEW_UNICODE_POINTS 40485
// keep Scintilla(SC) order
#define IDM_SET_RENDER_TECH_GDI 40500 // SC_TECHNOLOGY_DEFAULT(0)

21
language/np3_af_za/menu_af_za.rc
View File

@ -326,10 +326,10 @@ BEGIN
MENUITEM "Skakel &Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
POPUP "&Kleur Definisie Hotspots",
BEGIN
MENUITEM "&AF", IDM_VIEW_COLORDEFHOTSPOTS
MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
MENUITEM "&AF", IDM_VIEW_COLORDEFHOTSPOTS
MENUITEM "&RGB+A" IDM_VIEW_COLOR_RGBA
MENUITEM "&A+RGB" IDM_VIEW_COLOR_ARGB
MENUITEM "&BGRA" IDM_VIEW_COLOR_BGRA
END
MENUITEM "Highlight &Unicode-Points", IDM_VIEW_UNICODE_POINTS
MENUITEM "&Visuele Hakie Passing\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
@ -372,15 +372,20 @@ BEGIN
POPUP "Ver&toning"
BEGIN
MENUITEM "Ge&fokusde Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitering Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rol na Einde Van Die &Lêer", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Wys &Hiperskakel Nutsmiddelwenk", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anele"
BEGIN
MENUITEM "Wys &Menubalk", IDM_VIEW_MENUBAR

17
language/np3_be_by/menu_be_by.rc
View File

@ -366,21 +366,26 @@ BEGIN
MENUITEM "Перайсці да &наступнага блоку\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Перайсці да &папярэдняга блоку\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
MENUITEM "Згарнуць &блок\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Разгарнуць блок\tAlt+ →", CMD_FOLDEXPAND
MENUITEM "Згарнуць &блок\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Разгарнуць блок\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "Пра&цоўная прастора"
BEGIN
MENUITEM "Факусаваны прагляд\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Назіранне за фа&йлам", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Пракручваць за мяжу апошняга радка", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Паказваць &падказку для гіперспасылак", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "П&аліцы"
BEGIN
MENUITEM "Паказаць паліцу &меню", IDM_VIEW_MENUBAR

13
language/np3_de_de/menu_de_de.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Anzeigen"
BEGIN
MENUITEM "Fokussierte Ansicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Modus: Lesezeichen", IDM_VIEW_FV_BOOKMARK
MENUITEM "Modus: Hervorheben", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Modus: Lesezeichen && Faltung", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Modus: Hervorheben && Faltung", IDM_VIEW_FV_HIGHLGFOLD
POPUP "Ansicht Modus"
BEGIN
MENUITEM "Faltung", IDM_VIEW_FV_FOLD
MENUITEM "Lesezeichen", IDM_VIEW_FV_BOOKMARK
MENUITEM "Hervorheben", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Lesezeichen && Faltung", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Hervorheben && Faltung", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Logfile &Monitoring", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Erweiterte Dokument Ende Ansicht", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Zeige einen &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "&Leisten"
BEGIN
MENUITEM "Zeige &Menüleiste", IDM_VIEW_MENUBAR

13
language/np3_en_gb/menu_en_gb.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Display"
BEGIN
MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anels"
BEGIN
MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR

13
language/np3_en_us/menu_en_us.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Display"
BEGIN
MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anels"
BEGIN
MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR

13
language/np3_es_es/menu_es_es.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "Mos&trar"
BEGIN
MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Modo: Marcador", IDM_VIEW_FV_BOOKMARK
MENUITEM "Modo: Resaltar", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Modo: Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Modo: Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD
POPUP "Modo de vista"
BEGIN
MENUITEM "Pliegue", IDM_VIEW_FV_FOLD
MENUITEM "Marcador", IDM_VIEW_FV_BOOKMARK
MENUITEM "Resaltar", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Desplazarse después del final de archivo", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Mostrar información de &hipervínculos", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&aneles"
BEGIN
MENUITEM "Mostrar la barra de &menú", IDM_VIEW_MENUBAR

15
language/np3_es_mx/menu_es_mx.rc
View File

@ -356,7 +356,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margen de marcador,\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM "&Margen de marcador\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Plegable"
BEGIN
@ -372,15 +372,20 @@ BEGIN
POPUP "Mos&trar"
BEGIN
MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Modo: Marcador", IDM_VIEW_FV_BOOKMARK
MENUITEM "Modo: Resaltar", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Modo: Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Modo: Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD
POPUP "Modo de vista"
BEGIN
MENUITEM "Pliegue", IDM_VIEW_FV_FOLD
MENUITEM "Marcador", IDM_VIEW_FV_BOOKMARK
MENUITEM "Resaltar", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Marcador && Pliegue", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Resaltar && Pliegue", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Desplazarse después del final de archivo", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Mostrar información de &hipervínculos", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&aneles"
BEGIN
MENUITEM "Mostrar la barra de &menú", IDM_VIEW_MENUBAR

13
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Afficher"
BEGIN
MENUITEM "Vue Focalisée\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Signet", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Surbrillance", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Signet && Pliage", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Surbrillance && Pliage", IDM_VIEW_FV_HIGHLGFOLD
POPUP "Mode d'affichage"
BEGIN
MENUITEM "Pliage", IDM_VIEW_FV_FOLD
MENUITEM "Signet", IDM_VIEW_FV_BOOKMARK
MENUITEM "Surbrillance", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Signet && Pliage", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Surbrillance && Pliage", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Log de &Contrôle", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Défiler Après la Fin du Fichier", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Afficher &Infobulles sur Liens", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anneaux"
BEGIN
MENUITEM "Afficher la Barre de &Menus", IDM_VIEW_MENUBAR

13
language/np3_hi_in/menu_hi_in.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Display"
BEGIN
MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anels"
BEGIN
MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR

13
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Megjelenítés"
BEGIN
MENUITEM "Fókuszált nézet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Naplófájl követése", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Görgetés a fájl vége után is", IDM_VIEW_SCROLLPASTEOF
MENUITEM "&Hivatkozások címke megjelenítése", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anelek"
BEGIN
MENUITEM "Menü&sor megjelenítése", IDM_VIEW_MENUBAR

13
language/np3_id_id/menu_id_id.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Display"
BEGIN
MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anels"
BEGIN
MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR

17
language/np3_it_it/menu_it_it.rc
View File

@ -366,21 +366,26 @@ BEGIN
MENUITEM "Salta al Prossimo Fold\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Salta al Precedente Fold\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "&Display"
BEGIN
MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scorri oltre la fine del file (EOF)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Mostra Tooltip &Hyperlink", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&annelli"
BEGIN
MENUITEM "Mostra barra dei &Menu", IDM_VIEW_MENUBAR

21
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -363,24 +363,29 @@ BEGIN
MENUITEM "コード折りたたみを表示(&F)", IDM_VIEW_FOLDING
MENUITEM "すべて折りたたみ(&T)\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM SEPARATOR
MENUITEM "次の折りたたみへ移動(&N)\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "前の折りたたみへ移動(&P)\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM "次の折りたたみへ移動(&N)\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "前の折りたたみへ移動(&P)\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
MENUITEM "折りたたむ(&C)\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "折りたたみを展開(&E)\tAlt+ →", CMD_FOLDEXPAND
MENUITEM "折りたたむ(&C)\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "折りたたみを展開(&E)\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "表示(&D)"
BEGIN
MENUITEM "単語一望モード(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "編集制限モード(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "文書の終端以降へスクロール(&S)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "ハイパーリンクのツールチップを表示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "ウィンドウ構成(&A)"
BEGIN
MENUITEM "メニューバーを表示(&M)", IDM_VIEW_MENUBAR

13
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "전시(&D)"
BEGIN
MENUITEM "집중(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "열람(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "파일 끝 스크롤(&S)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "하이퍼 링크 툴팁 보이기(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "표시(&A)"
BEGIN
MENUITEM "메뉴바 보이기", IDM_VIEW_MENUBAR

13
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Tonen"
BEGIN
MENUITEM "Gefocust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Modus: Bladwijzer", IDM_VIEW_FV_BOOKMARK
MENUITEM "Modus: Markeer", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Modus: Bladwijzer && Vouw", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Modus: Markeer && Vouw", IDM_VIEW_FV_HIGHLGFOLD
POPUP "Weergavemodus"
BEGIN
MENUITEM "Vouw", IDM_VIEW_FV_FOLD
MENUITEM "Bladwijzer", IDM_VIEW_FV_BOOKMARK
MENUITEM "Markeer", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bladwijzer && Vouw", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Markeer && Vouw", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Log &Monitoren", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Scrollen na einde van bes&tand", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Toon &hyperlink tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anelen"
BEGIN
MENUITEM "&Menubalk tonen", IDM_VIEW_MENUBAR

21
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -363,24 +363,29 @@ BEGIN
MENUITEM "Składanie kodu", IDM_VIEW_FOLDING
MENUITEM "&Przełącz składanie kodu\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM SEPARATOR
MENUITEM "Przeskocz do nast.\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Przeskocz do poprzed.\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM "Przeskocz do nast.\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Przeskocz do poprzed.\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
MENUITEM "&Zwiń zagięcie\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Rozwiń zagięcie\tAlt+ →", CMD_FOLDEXPAND
MENUITEM "&Zwiń zagięcie\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Rozwiń zagięcie\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "&Pokaż"
BEGIN
MENUITEM "Widok skupiony\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Dziennik &monitorowania", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rozszerzony widok końca dokumentu", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Pokaż podpowiedź hiperłącza", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anele"
BEGIN
MENUITEM "Pokaż pasek menu", IDM_VIEW_MENUBAR

21
language/np3_pt_br/menu_pt_br.rc
View File

@ -363,24 +363,29 @@ BEGIN
MENUITEM "Agrupador de &Código", IDM_VIEW_FOLDING
MENUITEM "&Alternar Códigos Agrupados\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM SEPARATOR
MENUITEM "&Pular para Próxima Dobra\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Pular para &Dobra Anterior\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM "&Pular para Próxima Dobra\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Pular para &Dobra Anterior\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
MENUITEM "C&olapsar Dobra\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Expandir Dobra\tAlt+ →", CMD_FOLDEXPAND
MENUITEM "C&olapsar Dobra\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Expandir Dobra\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "&Exibir"
BEGIN
MENUITEM "Visão Focada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Log de &Monitoramento", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Rolagem Passa do Fim do Arquivo", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Mostrar Dica de &Hyperlink", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&ainéis"
BEGIN
MENUITEM "Mostrar &Menu", IDM_VIEW_MENUBAR

13
language/np3_pt_pt/menu_pt_pt.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Exibir"
BEGIN
MENUITEM "Vista focada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Registo de &monitorização", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Rolagem para além do fim do ficheiro", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Mostrar dica da &hiperligação", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&ainéis"
BEGIN
MENUITEM "Mostrar barra de &menu", IDM_VIEW_MENUBAR

17
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -366,21 +366,26 @@ BEGIN
MENUITEM "Перейти к следующему &блоку\tAlt+ +", CMD_FOLDJUMPDOWN
MENUITEM "Перейти к &предыдущему блоку\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
MENUITEM "&Свернуть блок\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Развернуть блок\tAlt+ →", CMD_FOLDEXPAND
MENUITEM "&Свернуть блок\tAlt+ ←", CMD_FOLDCOLLAPSE
MENUITEM "&Развернуть блок\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "&Рабо&чая область"
BEGIN
MENUITEM "Фокусировка просмотра\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Слежение за фа&йлом", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Прокрутка за пределы последней строки", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Показывать &подсказку для гиперссылок", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "Панел&и"
BEGIN
MENUITEM "Показать панель &меню", IDM_VIEW_MENUBAR

13
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "Zo&brazenie"
BEGIN
MENUITEM "Zamerať zobrazenie\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitorovať logovanie", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Rolovanie na koniec súboru", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Nápovedný &tip na prepojení", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anely"
BEGIN
MENUITEM "Zobraziť &textové menu", IDM_VIEW_MENUBAR

13
language/np3_sv_se/menu_sv_se.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "Visa"
BEGIN
MENUITEM "Fokuserad vy\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "Logg", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rulla förbi slutet av filen", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Visa verktygstips för hyperlänk", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "Fält"
BEGIN
MENUITEM "Visa menyfält", IDM_VIEW_MENUBAR

13
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Display"
BEGIN
MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anels"
BEGIN
MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR

13
language/np3_vi_vn/menu_vi_vn.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "&Display"
BEGIN
MENUITEM "&Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scroll Past End of File", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "P&anels"
BEGIN
MENUITEM "Show &Menubar", IDM_VIEW_MENUBAR

15
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "显示(&D)"
BEGIN
MENUITEM "切换聚焦(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "日志监控(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "允许滚动超过文件尾(&S)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "显示超链接提示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "面板(&A)"
BEGIN
MENUITEM "显示菜单栏(&M)", IDM_VIEW_MENUBAR
@ -390,7 +395,7 @@ BEGIN
MENUITEM "加载工具栏主题(&L)...", IDM_VIEW_LOADTHEMETB
MENUITEM "自定义工具栏(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "切换工具栏(&G)", IDM_VIEW_TOGGLETB
MENUITEM "DPI 自适应(&D)", IDM_VIEW_DPISCALETB
MENUITEM "DPI 自适应(&D)", IDM_VIEW_DPISCALETB
END
POPUP "缩放(&Z)"
BEGIN

13
language/np3_zh_tw/menu_zh_tw.rc
View File

@ -372,15 +372,20 @@ BEGIN
POPUP "顯示(&D)"
BEGIN
MENUITEM "切換聚焦(&F)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Mode: Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Mode: Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Mode: Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Mode: Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
POPUP "View Mode"
BEGIN
MENUITEM "Fold", IDM_VIEW_FV_FOLD
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
END
MENUITEM SEPARATOR
MENUITEM "日誌監控(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "允許滾動超過檔案尾(&S)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "顯示超鏈接提示(&H)", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
MENUITEM SEPARATOR
POPUP "面板(&A)"
BEGIN
MENUITEM "顯示選單欄(&M)", IDM_VIEW_MENUBAR

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.823.1"
version="5.20.824.2"
type="win32"
/>
<description>Notepad3 beta</description>

4
scintilla/src/Document.cxx
View File

@ -2366,10 +2366,12 @@ void Document::AnnotationSetText(Sci::Line line, const char *text) {
}
void Document::AnnotationSetStyle(Sci::Line line, int style) {
if (line >= 0 && line < LinesTotal()) {
Annotations()->SetStyle(line, style);
const DocModification mh(SC_MOD_CHANGEANNOTATION, LineStart(line),
0, 0, nullptr, line);
NotifyModified(mh);
}
}
void Document::AnnotationSetStyles(Sci::Line line, const unsigned char *styles) {
@ -2406,10 +2408,12 @@ void Document::EOLAnnotationSetText(Sci::Line line, const char *text) {
}
void Document::EOLAnnotationSetStyle(Sci::Line line, int style) {
if (line >= 0 && line < LinesTotal()) {
EOLAnnotations()->SetStyle(line, style);
const DocModification mh(SC_MOD_CHANGEEOLANNOTATION, LineStart(line),
0, 0, nullptr, line);
NotifyModified(mh);
}
}
void Document::EOLAnnotationClearAll() {

10
scintilla/src/EditView.cxx
View File

@ -397,21 +397,19 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa
// See if chars, styles, indicators, are all the same
bool allSame = true;
// Check base line layout
int styleByte = 0;
int numCharsInLine = 0;
char chPrevious = 0;
while (numCharsInLine < lineLength) {
for (Sci::Position numCharsInLine = 0; numCharsInLine < lineLength; numCharsInLine++) {
const Sci::Position charInDoc = numCharsInLine + posLineStart;
const char chDoc = model.pdoc->CharAt(charInDoc);
styleByte = model.pdoc->StyleIndexAt(charInDoc);
const int styleByte = model.pdoc->StyleIndexAt(charInDoc);
allSame = allSame &&
(ll->styles[numCharsInLine] == styleByte);
allSame = allSame &&
(ll->chars[numCharsInLine] == CaseForce(vstyle.styles[styleByte].caseForce, chDoc, chPrevious));
chPrevious = chDoc;
numCharsInLine++;
}
allSame = allSame && (ll->styles[numCharsInLine] == styleByte); // For eolFilled
const int styleByteLast = (posLineEnd > posLineStart) ? model.pdoc->StyleIndexAt(posLineEnd - 1) : 0;
allSame = allSame && (ll->styles[lineLength] == styleByteLast); // For eolFilled
if (allSame) {
ll->validity = LineLayout::ValidLevel::positions;
} else {

3
src/Config/Config.cpp
View File

@ -1498,7 +1498,8 @@ void LoadSettings()
GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgPosX, CW_USEDEFAULT, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgPosY, CW_USEDEFAULT, INT_MIN, INT_MAX);
GET_INT_VALUE_FROM_INISECTION(FocusViewMarkerMode, (FVMM_MARGIN | FVMM_FOLD), FVMM_MARGIN, (FVMM_LN_BACKGR | FVMM_FOLD));
GET_INT_VALUE_FROM_INISECTION(FocusViewMarkerMode, FVMM_FOLD, FVMM_MARGIN, (FVMM_LN_BACKGR | FVMM_FOLD));
Settings.FocusViewMarkerMode = (Settings.FocusViewMarkerMode == (FVMM_MARGIN | FVMM_LN_BACKGR) ? FVMM_FOLD : Settings.FocusViewMarkerMode);
// --------------------------------------------------------------------------
const WCHAR* const StatusBar_Section = L"Statusbar Settings";

28
src/Dialogs.c
View File

@ -3755,12 +3755,12 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
}
if (lngIdx >= 0) {
IniSectionGetString(L"global", L"languagefile", grepWinLangResName[lngIdx].filename, tchTemp, COUNTOF(tchTemp));
IniSectionSetString(L"global", L"languagefile", tchTemp);
IniSectionGetString(globalSection, L"languagefile", grepWinLangResName[lngIdx].filename, tchTemp, COUNTOF(tchTemp));
IniSectionSetString(globalSection, L"languagefile", tchTemp);
} else {
IniSectionGetString(L"global", L"languagefile", L"", tchTemp, COUNTOF(tchTemp));
IniSectionGetString(globalSection, L"languagefile", L"", tchTemp, COUNTOF(tchTemp));
if (StrIsEmpty(tchTemp)) {
IniSectionDelete(L"global", L"languagefile", false);
IniSectionDelete(globalSection, L"languagefile", false);
}
}
@ -3768,10 +3768,22 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
IniSectionSetString(globalSection, L"editorcmd", tchTemp);
// [settings]
bool const bEscClose = IniSectionGetBool(L"settings", L"escclose", (Settings.EscFunction == 2));
IniSectionSetBool(L"settings", L"escclose", bEscClose);
bool const bBackupInFolder = IniSectionGetBool(L"settings", L"backupinfolder", true);
IniSectionSetBool(L"settings", L"backupinfolder", bBackupInFolder);
const WCHAR *const settingsSection = L"settings";
bool const bEscClose = IniSectionGetBool(settingsSection, L"escclose", (Settings.EscFunction == 2));
IniSectionSetBool(settingsSection, L"escclose", bEscClose);
bool const bBackupInFolder = IniSectionGetBool(settingsSection, L"backupinfolder", true);
IniSectionSetBool(settingsSection, L"backupinfolder", bBackupInFolder);
// [export]
const WCHAR *const exportSection = L"export";
bool const bExpPaths = IniSectionGetBool(exportSection, L"paths", true);
IniSectionSetBool(exportSection, L"paths", bExpPaths);
bool const bExpLnNums = IniSectionGetBool(exportSection, L"linenumbers", true);
IniSectionSetBool(exportSection, L"linenumbers", bExpLnNums);
bool const bExpContent = IniSectionGetBool(exportSection, L"linecontent", true);
IniSectionSetBool(exportSection, L"linecontent", bExpContent);
// search directory
WCHAR tchSearchDir[MAX_PATH] = { L'\0' };

148
src/Edit.c
View File

@ -340,8 +340,7 @@ void EditSetNewText(HWND hwnd, const char* lpstrText, DocPosU lenText, bool bCle
EditSetDocumentBuffer(lpstrText, lenText);
_OBSERVE_NOTIFY_CHANGE_;
SciCall_GotoPos(0);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(0);
if (bClearUndoHistory) {
UndoRedoRecordingStart();
@ -2077,8 +2076,7 @@ void EditFindMatchingBrace()
}
if (iMatchingBracePos != (DocPos)-1) {
iMatchingBracePos = bIsAfter ? iMatchingBracePos : SciCall_PositionAfter(iMatchingBracePos);
SciCall_GotoPos(iMatchingBracePos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(iMatchingBracePos);
}
}
@ -2994,8 +2992,7 @@ void EditIndentBlock(HWND hwnd, int cmd, bool bFormatIndentation, bool bForceAll
}
}
else {
SciCall_GotoPos(iInitialPos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(iInitialPos);
}
_END_UNDO_ACTION_;
@ -5025,8 +5022,7 @@ void EditJumpTo(DocLn iNewLine, DocPos iNewCol)
iNewCol = clampp((iNewCol - colOffset), 0, iLineEndPos);
const DocPos iNewPos = SciCall_FindColumn(iNewLine, iNewCol);
SciCall_GotoPos(iNewPos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(iNewPos);
}
@ -5522,7 +5518,6 @@ static RegExResult_t _FindHasMatch(HWND hwnd, LPCEDITFINDREPLACE lpefr, DocPos i
if (FocusedView.HideNonMatchedLines) {
EditFoldMarkedLineRange(lpefr->hwnd, true);
}
EditBookMarkLineRange(lpefr->hwnd);
}
else {
if (FocusedView.HideNonMatchedLines) {
@ -7177,28 +7172,29 @@ void EditClearAllBookMarks(HWND hwnd)
//
void EditToggleView(HWND hwnd)
{
if (Settings.FocusViewMarkerMode & FVMM_FOLD)
{
BeginWaitCursor(true, L"Toggle View...");
if (Settings.FocusViewMarkerMode & FVMM_FOLD) {
BeginWaitCursor(true, L"Toggle View...");
FocusedView.HideNonMatchedLines = !FocusedView.HideNonMatchedLines; // toggle
FocusedView.HideNonMatchedLines = !FocusedView.HideNonMatchedLines; // toggle
if (FocusedView.HideNonMatchedLines) {
EditFoldMarkedLineRange(hwnd, true);
EditBookMarkLineRange(hwnd);
}
else {
EditFoldMarkedLineRange(hwnd, false);
}
SciCall_SetReadOnly(FocusedView.HideNonMatchedLines);
SciCall_ScrollCaret();
EndWaitCursor();
}
else {
if (FocusedView.HideNonMatchedLines) {
EditFoldMarkedLineRange(hwnd, true);
if (Settings.FocusViewMarkerMode & (FVMM_MARGIN | FVMM_LN_BACKGR)) {
EditBookMarkLineRange(hwnd);
}
} else {
EditFoldMarkedLineRange(hwnd, false);
}
SciCall_SetReadOnly(FocusedView.HideNonMatchedLines);
SciCall_ScrollCaret();
EndWaitCursor();
}
else if (Settings.FocusViewMarkerMode & (FVMM_MARGIN | FVMM_LN_BACKGR))
{
EditBookMarkLineRange(hwnd);
}
}
@ -8851,33 +8847,87 @@ void EditSetBookmarkList(HWND hwnd, LPCWSTR pszBookMarks)
}
//=============================================================================
//
// EditBookmarkNext()
//
void EditBookmarkNext(HWND hwnd, const DocLn iLine)
{
UNUSED(hwnd);
int bitmask = SciCall_MarkerGet(iLine) & OCCURRENCE_MARKER_BITMASK();
if (!bitmask) {
bitmask = (1 << MARKER_NP3_BOOKMARK);
}
DocLn iNextLine = SciCall_MarkerNext(iLine + 1, bitmask);
if (iNextLine == (DocLn)-1) {
iNextLine = SciCall_MarkerNext(0, bitmask); // wrap around
}
if (iNextLine == (DocLn)-1) {
bitmask = OCCURRENCE_MARKER_BITMASK();
iNextLine = SciCall_MarkerNext(iLine + 1, bitmask); // find any bookmark
}
if (iNextLine == (DocLn)-1) {
iNextLine = SciCall_MarkerNext(0, bitmask); // wrap around
}
if (iNextLine != (DocLn)-1) {
SciCall_GotoLine(iNextLine);
}
}
//=============================================================================
//
// EditBookmarkPrevious()
//
void EditBookmarkPrevious(HWND hwnd, const DocLn iLine)
{
UNUSED(hwnd);
int bitmask = SciCall_MarkerGet(iLine) & OCCURRENCE_MARKER_BITMASK();
if (!bitmask) {
bitmask = (1 << MARKER_NP3_BOOKMARK);
}
DocLn iPrevLine = SciCall_MarkerPrevious(max_ln(0, iLine - 1), bitmask);
if (iPrevLine == (DocLn)-1) {
iPrevLine = SciCall_MarkerPrevious(SciCall_GetLineCount(), bitmask); // wrap around
}
if (iPrevLine == (DocLn)-1) {
bitmask = OCCURRENCE_MARKER_BITMASK();
iPrevLine = SciCall_MarkerPrevious(max_ln(0, iLine - 1), bitmask); //find any bookmark
}
if (iPrevLine == (DocLn)-1) {
iPrevLine = SciCall_MarkerPrevious(SciCall_GetLineCount(), bitmask); // wrap around
}
if (iPrevLine != (DocLn)-1) {
SciCall_GotoLine(iPrevLine);
}
}
//=============================================================================
//
// EditBookmarkToggle()
//
void EditBookmarkToggle(const DocLn ln, const int modifiers)
{
int const bitmask = SciCall_MarkerGet(ln) & OCCURRENCE_MARKER_BITMASK();
void EditBookmarkToggle(HWND hwnd, const DocLn ln, const int modifiers) {
UNUSED(hwnd);
int const bitmask = SciCall_MarkerGet(ln) & OCCURRENCE_MARKER_BITMASK();
if (!bitmask) {
SciCall_MarkerAdd(ln, MARKER_NP3_BOOKMARK); // set
} else if (bitmask & (1 << MARKER_NP3_BOOKMARK)) {
SciCall_MarkerDelete(ln, MARKER_NP3_BOOKMARK); // unset
} else {
for (int m = MARKER_NP3_1; m < MARKER_NP3_BOOKMARK; ++m) {
if (bitmask & (1 << m)) {
SciCall_MarkerDeleteAll(m);
WordBookMarks[m].in_use = false;
}
}
}
if (!bitmask) {
SciCall_MarkerAdd(ln, MARKER_NP3_BOOKMARK); // set
}
else if (bitmask & (1 << MARKER_NP3_BOOKMARK))
{
SciCall_MarkerDelete(ln, MARKER_NP3_BOOKMARK); // unset
}
else {
for (int m = MARKER_NP3_1; m < MARKER_NP3_BOOKMARK; ++m) {
if (bitmask & (1 << m)) {
SciCall_MarkerDeleteAll(m);
WordBookMarks[m].in_use = false;
}
}
}
if (modifiers & SCMOD_ALT) {
SciCall_GotoLine(ln);
}
if (modifiers & SCMOD_ALT) {
SciCall_GotoLine(ln);
}
}

4
src/Edit.h
View File

@ -124,7 +124,9 @@ bool EditCheckNewLineInACFillUps();
void EditShowZeroLengthCallTip(HWND hwnd, DocPos iPosition);
void EditGetBookmarkList(HWND hwnd,LPWSTR pszBookMarks,int cchLength);
void EditSetBookmarkList(HWND hwnd,LPCWSTR pszBookMarks);
void EditBookmarkToggle(const DocLn ln, const int modifiers);
void EditBookmarkNext(HWND hwnd, const DocLn iLine);
void EditBookmarkPrevious(HWND hwnd, const DocLn iLine);
void EditBookmarkToggle(HWND hwnd, const DocLn ln, const int modifiers);
void EditMarkAllOccurrences(HWND hwnd, bool bForceClear);
void EditFoldMarkedLineRange(HWND hwnd, bool bHideLines);
void EditBookMarkLineRange(HWND hwnd);

110
src/Notepad3.c
View File

@ -1852,10 +1852,10 @@ static void _InitializeSciEditCtrl(HWND hwndEditCtrl)
SendMessage(hwndEditCtrl, SCI_SETBUFFEREDDRAW, (WPARAM)(Settings.RenderingTechnology == SC_TECHNOLOGY_DEFAULT), 0);
//~SendMessage(hwndEditCtrl, SCI_SETPHASESDRAW, SC_PHASES_TWO, 0); // (= default)
SendMessage(hwndEditCtrl, SCI_SETPHASESDRAW, SC_PHASES_MULTIPLE, 0);
//~SendMessage(hwndEditCtrl, SCI_SETLAYOUTCACHE, SC_CACHE_PAGE, 0);
SendMessage(hwndEditCtrl, SCI_SETLAYOUTCACHE, SC_CACHE_DOCUMENT, 0);
//~SendMessage(hwndEditCtrl, SCI_SETLAYOUTCACHE, SC_CACHE_DOCUMENT, 0); // memory consumption !
SendMessage(hwndEditCtrl, SCI_SETLAYOUTCACHE, SC_CACHE_PAGE, 0);
//~SendMessage(hwndEditCtrl, SCI_SETPOSITIONCACHE, 1024, 0); // default = 1024
SendMessage(hwndEditCtrl, SCI_SETPOSITIONCACHE, 4096, 0);
SendMessage(hwndEditCtrl, SCI_SETPOSITIONCACHE, 2048, 0); // default = 1024
SetWindowLayoutRTL(hwndEditCtrl, Settings.EditLayoutRTL);
@ -2620,8 +2620,7 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
MsgThemeChanged(hwnd, wParam, lParam);
SciCall_GotoPos(pos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(pos);
return !0;
}
@ -3118,8 +3117,7 @@ LRESULT MsgChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
EditEnsureSelectionVisible();
}
else {
SciCall_GotoPos(iCurPos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(iCurPos);
}
}
}
@ -3502,8 +3500,21 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu, IDM_VIEW_TOGGLE_VIEW, IsFocusedViewAllowed());
CheckCmd(hmenu, IDM_VIEW_TOGGLE_VIEW, FocusedView.HideNonMatchedLines);
i = IDM_VIEW_FV_BOOKMARK + Settings.FocusViewMarkerMode;
CheckMenuRadioItem(hmenu, IDM_VIEW_FV_BOOKMARK, IDM_VIEW_FV_HIGHLGFOLD, i, MF_BYCOMMAND);
i = IDM_VIEW_FV_FOLD;
int const fvm_mode = Settings.FocusViewMarkerMode;
if (fvm_mode == FVMM_MARGIN) {
i = IDM_VIEW_FV_BOOKMARK;
} else if (fvm_mode == FVMM_LN_BACKGR) {
i = IDM_VIEW_FV_HIGHLIGHT;
} else if (fvm_mode == (FVMM_MARGIN | FVMM_FOLD)) {
i = IDM_VIEW_FV_BKMRKFOLD;
} else if (fvm_mode == (FVMM_LN_BACKGR | FVMM_FOLD)) {
i = IDM_VIEW_FV_HIGHLIGHT;
} else {
i = IDM_VIEW_FV_FOLD;
}
CheckMenuRadioItem(hmenu, IDM_VIEW_FV_FOLD, IDM_VIEW_FV_HIGHLGFOLD, i, MF_BYCOMMAND);
CheckCmd(hmenu, IDM_VIEW_HYPERLINKHOTSPOTS, Settings.HyperlinkHotspot);
@ -4487,7 +4498,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_CLEAR_MARKER:
EditBookmarkToggle(Sci_GetCurrentLineNumber(), 0);
EditBookmarkToggle(Globals.hwndEdit, Sci_GetCurrentLineNumber(), 0);
break;
@ -4873,58 +4884,17 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
// Main Bookmark Functions
case BME_EDIT_BOOKMARKNEXT:
{
DocLn const iLine = Sci_GetCurrentLineNumber();
int bitmask = SciCall_MarkerGet(iLine) & OCCURRENCE_MARKER_BITMASK();
if (!bitmask) {
bitmask = (1 << MARKER_NP3_BOOKMARK);
}
DocLn iNextLine = SciCall_MarkerNext(iLine + 1, bitmask);
if (iNextLine == (DocLn)-1) {
iNextLine = SciCall_MarkerNext(0, bitmask); // wrap around
}
if (iNextLine == (DocLn)-1) {
bitmask = OCCURRENCE_MARKER_BITMASK();
iNextLine = SciCall_MarkerNext(iLine + 1, bitmask); // find any bookmark
}
if (iNextLine == (DocLn)-1) {
iNextLine = SciCall_MarkerNext(0, bitmask); // wrap around
}
if (iNextLine != (DocLn)-1) {
SciCall_GotoLine(iNextLine);
EditEnsureSelectionVisible();
}
}
break;
EditBookmarkNext(Globals.hwndEdit, Sci_GetCurrentLineNumber());
break;
case BME_EDIT_BOOKMARKPREV:
{
DocLn const iLine = Sci_GetCurrentLineNumber();
int bitmask = SciCall_MarkerGet(iLine) & OCCURRENCE_MARKER_BITMASK();
if (!bitmask) {
bitmask = (1 << MARKER_NP3_BOOKMARK);
}
DocLn iNextLine = SciCall_MarkerPrevious(max_ln(0, iLine - 1), bitmask);
if (iNextLine == (DocLn)-1) {
iNextLine = SciCall_MarkerPrevious(SciCall_GetLineCount(), bitmask); // wrap around
}
if (iNextLine == (DocLn)-1) {
bitmask = bitmask32_n(MARKER_NP3_BOOKMARK + 1) & ~(1 << MARKER_NP3_OCCURRENCE);
iNextLine = SciCall_MarkerPrevious(max_ln(0, iLine - 1), bitmask); //find any bookmark
}
if (iNextLine == (DocLn)-1) {
iNextLine = SciCall_MarkerPrevious(SciCall_GetLineCount(), bitmask); // wrap around
}
if (iNextLine != (DocLn)-1) {
SciCall_GotoLine(iNextLine);
EditEnsureSelectionVisible();
}
}
break;
EditBookmarkPrevious(Globals.hwndEdit, Sci_GetCurrentLineNumber());
break;
case BME_EDIT_BOOKMARKTOGGLE:
EditBookmarkToggle(Sci_GetCurrentLineNumber(), 0);
EditBookmarkToggle(Globals.hwndEdit, Sci_GetCurrentLineNumber(), 0);
break;
@ -5300,7 +5270,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if (!Settings.MarkOccurrences && FocusedView.HideNonMatchedLines) {
EditToggleView(Globals.hwndEdit);
}
EnableCmd(GetMenu(hwnd), IDM_VIEW_TOGGLE_VIEW, IsMarkOccurrencesEnabled());
EnableCmd(GetMenu(hwnd), IDM_VIEW_TOGGLE_VIEW, IsFocusedViewAllowed());
if (IsMarkOccurrencesEnabled()) {
MarkAllOccurrences(0, true);
}
@ -5331,6 +5301,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
CheckCmd(GetMenu(hwnd), IDM_VIEW_TOGGLE_VIEW, FocusedView.HideNonMatchedLines);
break;
case IDM_VIEW_FV_FOLD:
case IDM_VIEW_FV_BOOKMARK:
case IDM_VIEW_FV_HIGHLIGHT:
case IDM_VIEW_FV_BKMRKFOLD:
@ -5338,6 +5309,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
{
int newSetting = Settings.FocusViewMarkerMode;
switch (iLoWParam) {
case IDM_VIEW_FV_FOLD:
newSetting = (FVMM_FOLD);
break;
case IDM_VIEW_FV_BOOKMARK:
newSetting = (FVMM_MARGIN);
break;
@ -5831,8 +5805,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if ((!SciCall_IsSelectionEmpty() || Sci_IsMultiOrRectangleSelection()) && (skipLevel == Settings2.ExitOnESCSkipLevel)) {
//~_BEGIN_UNDO_ACTION_;
SciCall_GotoPos(iCurPos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(iCurPos);
//~_END_UNDO_ACTION_;
skipLevel -= Defaults2.ExitOnESCSkipLevel;
}
@ -5849,8 +5822,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
default:
SciCall_GotoPos(iCurPos);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(iCurPos);
break;
}
}
@ -6265,8 +6237,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
SciCall_AddSelection(pos, pos);
}
}
SciCall_ScrollCaret();
SciCall_ChooseCaretX();
Sci_ScrollChooseCaret();
break;
case CMD_JUMP2SELEND:
@ -6281,8 +6252,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
SciCall_AddSelection(pos, pos);
}
}
SciCall_ScrollCaret();
SciCall_ChooseCaretX();
Sci_ScrollChooseCaret();
break;
@ -7592,7 +7562,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
EditFoldClick(SciCall_LineFromPosition(scn->position), scn->modifiers);
break;
case MARGIN_SCI_BOOKMRK:
EditBookmarkToggle(SciCall_LineFromPosition(scn->position), scn->modifiers);
EditBookmarkToggle(Globals.hwndEdit, SciCall_LineFromPosition(scn->position), scn->modifiers);
break;
case MARGIN_SCI_LINENUM:
//~SciCall_GotoLine(SciCall_LineFromPosition(scn->position));
@ -9892,8 +9862,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
}
if (bReload && !FileWatching.MonitoringLog)
{
SciCall_GotoPos(0);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(0);
_BEGIN_UNDO_ACTION_;
fSuccess = FileIO(true, szFilePath, bSkipUnicodeDetect, bSkipANSICPDetection, bForceEncDetection, !bReload , &fioStatus, false, false);
@ -9910,8 +9879,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload,
{
BeginWaitCursor(true, L"Styling...");
SciCall_GotoPos(0);
SciCall_ChooseCaretX();
Sci_GotoPosChooseCaret(0);
if (!s_IsThisAnElevatedRelaunch) {
Flags.bPreserveFileModTime = DefaultFlags.bPreserveFileModTime;

13
src/SciCall.h
View File

@ -122,6 +122,11 @@ __forceinline LRESULT SciCall_##fn(type1 var1, type2 var2) { \
//=============================================================================
// Initialize
DeclareSciCallR0(GetLayoutCache, GETLAYOUTCACHE, int)
DeclareSciCallV1(SetLayoutCache, SETLAYOUTCACHE, int, cache)
DeclareSciCallR0(GetPositionCache, GETPOSITIONCACHE, int)
DeclareSciCallV1(SetPositionCache, SETPOSITIONCACHE, int, cache)
// Document Pointer Handling
DeclareSciCallR0(GetDocPointer, GETDOCPOINTER, sptr_t)
@ -627,15 +632,17 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
}
// respect VSlop settings
inline void Sci_ScrollChooseCaret() { SciCall_ScrollCaret(); SciCall_ChooseCaretX(); }
inline void Sci_ScrollToLine(DocLn line) { SciCall_EnsureVisible(line); SciCall_ScrollRange(SciCall_PositionFromLine(line), SciCall_GetLineEndPosition(line)); }
inline void Sci_ScrollToCurrentLine() { Sci_ScrollToLine(Sci_GetCurrentLineNumber()); }
inline void Sci_GotoPosChooseCaret(const DocPos pos) { SciCall_GotoPos(pos); SciCall_ChooseCaretX(); }
inline void Sci_ScrollChooseCaret() { SciCall_ScrollCaret(); SciCall_ChooseCaretX(); }
inline void Sci_ScrollToLine(const DocLn line) { SciCall_EnsureVisible(line); SciCall_ScrollRange(SciCall_PositionFromLine(line), SciCall_GetLineEndPosition(line)); }
inline void Sci_ScrollToCurrentLine() { Sci_ScrollToLine(Sci_GetCurrentLineNumber()); }
#define Sci_ReplaceTarget(M,L,T) (((M) == SCI_REPLACETARGET) ? SciCall_ReplaceTarget((L),(T)) : SciCall_ReplaceTargetRe((L),(T)))
// if iRangeEnd == -1 : apply style from iRangeStart to document end
#define Sci_ApplyLexerStyle(B, E) SciCall_Colourise((DocPos)(B), (DocPos)(E));
#define Sci_LexerStyleAll() SciCall_Colourise(0, -1)
#define Sci_DisableMouseDWellNotification() SciCall_SetMouseDWellTime(SC_TIME_FOREVER)

4
src/Styles.c
View File

@ -1563,6 +1563,10 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
_OBSERVE_NOTIFY_CHANGE_;
SciCall_SetLayoutCache(SC_CACHE_PAGE); //~SC_CACHE_DOCUMENT ~ memory consumption !
SciCall_SetPositionCache(SciCall_GetPositionCache()); // clear - default=1024
//~Sci_LexerStyleAll();
SciCall_StartStyling(0);
// apply lexer styles

2
src/TypeDefs.h
View File

@ -94,7 +94,7 @@ inline RECT RectFromWinInfo(const WININFO* const pWinInfo) {
typedef enum { BACKGROUND_LAYER = 0, FOREGROUND_LAYER = 1 } COLOR_LAYER; // Style_GetColor()
typedef enum { OPEN_WITH_BROWSER = 1, OPEN_WITH_NOTEPAD3 = 2, COPY_HYPERLINK = 4, SELECT_HYPERLINK = 8 } HYPERLINK_OPS; // Hyperlink Operations
typedef enum { FWM_DONT_CARE = 0, FWM_MSGBOX = 1, FWM_AUTORELOAD = 2 } FILE_WATCHING_MODE;
typedef enum { FVMM_MARGIN = 0, FVMM_LN_BACKGR = 1, FVMM_FOLD = 2 } FOCUSVIEW_MARKER_MODE;
typedef enum { FVMM_MARGIN = 1, FVMM_LN_BACKGR = 2, FVMM_FOLD = 4 } FOCUSVIEW_MARKER_MODE;
// ----------------------------------------------------------------------------

4
src/VersionEx.h
View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 823
#define VERSION_BUILD 1
#define VERSION_REV 824
#define VERSION_BUILD 2
#define SCINTILLA_VER 444
#define ONIGURUMA_REGEX_VER 6.9.5
#define UCHARDET_VER 2018.09.27