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

+ add: option to disable Hyperlink tooltip

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-18 13:28:16 +02:00
parent 6f3a0e6d3f
commit 3a18b1a32f
25 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
1709
1710

1
language/common_res.h
View File

@ -610,6 +610,7 @@
#define IDM_VIEW_CHASING_DOCTAIL 40466
#define IDM_VIEW_TOGGLETB 40467
#define IDM_VIEW_MUTE_MESSAGEBEEP 40468
#define IDM_VIEW_SHOW_HYPLNK_CALLTIP 40469
#define IDM_SET_RENDER_TECH_DEFAULT 40500
#define IDM_SET_RENDER_TECH_D2D 40501

1
language/np3_af_za/menu_af_za.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Gefokusde &Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rol na Einde Van Die &Lêer", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "Nu&tsbalk"
BEGIN

1
language/np3_be_by/menu_be_by.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Ôàêóñàâàíû ïðàãëÿä\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Íàç³ðàííå çà ôà&éëàì", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Ïðàêðó÷âàöü çà ìÿæó àïîøíÿãà ðàäêà", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "Ïàë³öà ïðû&ëàäà¢"
BEGIN

3
language/np3_de_de/menu_de_de.rc
View File

@ -341,7 +341,8 @@ BEGIN
MENUITEM "Code Faltung &Umschalten\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "&Fokussierte Ansicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Logfile &Monitoring", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Erweiterte Dokument Ende Ansicht", IDM_VIEW_SCROLLPASTEOF
MENUITEM "&Erweiterte Dokument Ende Ansicht", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Zeige einen &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "&Werkzeugleiste"
BEGIN

1
language/np3_en_gb/menu_en_gb.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
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
POPUP "&Toolbar"
BEGIN

1
language/np3_en_us/menu_en_us.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
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
POPUP "&Toolbar"
BEGIN

1
language/np3_es_es/menu_es_es.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "&Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Desplazarse después del final de archivo", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "Barra de herram&ientas"
BEGIN

1
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Vue &Focalisée\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Sur&veillance de Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Défiler après la fin de &fichier", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "&Barre à outils"
BEGIN

1
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Fókuszált n&ézet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
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 "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "&Eszköztár"
BEGIN

1
language/np3_it_it/menu_it_it.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Scorri oltre la fine del file (EOF)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "&Toolbar"
BEGIN

1
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "単語一望モード\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "文書の終端以降へスクロール(&F)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "ツールバー(&T)"
BEGIN

7
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -338,10 +338,11 @@ BEGIN
POPUP "전시(&D)"
BEGIN
MENUITEM "코드 접기(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "모든 접기 전환(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "집중\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "모든 접기 전환(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "집중\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "파일 끝 스크롤(&F)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "도구 모음(&T)"
BEGIN

1
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Ge&focust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Log &Monitoren", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Scrollen na einde van bes&tand", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "&Werkbalk"
BEGIN

1
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
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
POPUP "&Pasek narzêdzi"
BEGIN

1
language/np3_pt_br/menu_pt_br.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
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
POPUP "&Toolbar"
BEGIN

1
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -342,6 +342,7 @@ BEGIN
MENUITEM "Фокусировка просмотра\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Слежение за фа&йлом", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Прокрутка за пределы последней строки", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "Панель инстр&ументов"
BEGIN

3
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -340,8 +340,9 @@ BEGIN
MENUITEM "代码折叠(&F)\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING
MENUITEM "切换折叠(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM "切换聚焦(&V)\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "日志监控(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "日志监控(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "允许滚动超过文件尾(&F)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "工具栏(&T)"
BEGIN

2
np3portableapp/_buildname.txt
View File

@ -1 +1 @@
"XpErImEnTaL"
"RC"

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

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.517.1709"
version="5.19.518.1710"
type="win32"
/>
<description>Notepad3 XpErImEnTaL</description>
<description>Notepad3 RC</description>
</assembly>

24
src/Notepad3.c
View File

@ -1621,8 +1621,12 @@ static void _InitializeSciEditCtrl(HWND hwndEditCtrl)
SendMessage(hwndEditCtrl, SCI_SETCARETSTICKY, (WPARAM)SC_CARETSTICKY_OFF, 0);
//SendMessage(hwndEditCtrl,SCI_SETCARETSTICKY,SC_CARETSTICKY_WHITESPACE,0);
//SendMessage(hwndEditCtrl, SCI_SETMOUSEDWELLTIME, (WPARAM)SC_TIME_FOREVER, 0); // default
SendMessage(hwndEditCtrl, SCI_SETMOUSEDWELLTIME, (WPARAM)250, 0);
if (Settings.ShowHypLnkToolTip) {
SendMessage(hwndEditCtrl, SCI_SETMOUSEDWELLTIME, (WPARAM)250, 0);
}
else { // Hyperlink ToolTip is the only purpose for now, so globally disable it
SendMessage(hwndEditCtrl, SCI_SETMOUSEDWELLTIME, (WPARAM)SC_TIME_FOREVER, 0); // default
}
#define _CARET_SYMETRY CARET_EVEN /// CARET_EVEN or 0
@ -3083,6 +3087,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
CheckCmd(hmenu, IDM_VIEW_HYPERLINKHOTSPOTS, Settings.HyperlinkHotspot);
CheckCmd(hmenu, IDM_VIEW_SCROLLPASTEOF, Settings.ScrollPastEOF);
CheckCmd(hmenu, IDM_VIEW_SHOW_HYPLNK_CALLTIP, Settings.ShowHypLnkToolTip);
bool b = Flags.bReuseWindow;
CheckCmd(hmenu,IDM_VIEW_REUSEWINDOW,b);
@ -5117,6 +5122,15 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
SciCall_SetEndAtLastLine(!Settings.ScrollPastEOF);
break;
case IDM_VIEW_SHOW_HYPLNK_CALLTIP:
Settings.ShowHypLnkToolTip = !Settings.ShowHypLnkToolTip;
// HyperlinkTooltip is the only purpose, so
if (Settings.ShowHypLnkToolTip)
SciCall_SetMouseDWellTime(250);
else
Sci_DisableMouseDWellNotification();
break;
case IDM_VIEW_TOOLBAR:
Settings.ShowToolbar = !Settings.ShowToolbar;
ShowWindow(s_hwndReBar, (Settings.ShowToolbar ? SW_SHOW : SW_HIDE));
@ -6196,7 +6210,8 @@ void HandleDWellStartEnd(const DocPos position, const UINT uid)
{
case SCN_DWELLSTART:
{
if (SciCall_CallTipActive() || (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, position) <= 0)) { return; }
if (!Settings.ShowHypLnkToolTip || SciCall_CallTipActive() ||
(SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, position) <= 0)) { return; }
char chURL[LARGE_BUFFER] = { '\0' };
DocPos const firstPos = SciCall_IndicatorStart(INDIC_NP3_HYPERLINK, position);
@ -7230,6 +7245,8 @@ void LoadSettings()
GET_INT_VALUE_FROM_INISECTION(HighlightCurrentLine, 1, 0, 2);
GET_BOOL_VALUE_FROM_INISECTION(HyperlinkHotspot, true);
GET_BOOL_VALUE_FROM_INISECTION(ScrollPastEOF, false);
GET_BOOL_VALUE_FROM_INISECTION(ShowHypLnkToolTip, true);
GET_BOOL_VALUE_FROM_INISECTION(AutoIndent, true);
GET_BOOL_VALUE_FROM_INISECTION(AutoCompleteWords, false);
GET_BOOL_VALUE_FROM_INISECTION(AutoCLexerKeyWords, false);
@ -7600,6 +7617,7 @@ void SaveSettings(bool bSaveSettingsNow)
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, HighlightCurrentLine);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, HyperlinkHotspot);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ScrollPastEOF);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowHypLnkToolTip);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoIndent);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCompleteWords);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCLexerKeyWords);

5
src/SciCall.h
View File

@ -170,7 +170,6 @@ DeclareSciCallR0(GetRectangularSelectionCaretVirtualSpace, GETRECTANGULARSELECTI
DeclareSciCallV1(SetRectangularSelectionCaretVirtualSpace, SETRECTANGULARSELECTIONCARETVIRTUALSPACE, DocPos, position)
DeclareSciCallR0(GetRectangularSelectionAnchorVirtualSpace, GETRECTANGULARSELECTIONANCHORVIRTUALSPACE, DocPos)
DeclareSciCallV1(SetRectangularSelectionAnchorVirtualSpace, SETRECTANGULARSELECTIONANCHORVIRTUALSPACE, DocPos, position)
DeclareSciCallV1(SetVirtualSpaceOptions, SETVIRTUALSPACEOPTIONS, int, options)
// Multiselections (Lines of Rectangular selection)
@ -278,12 +277,14 @@ inline DocPos SciCall_GetLine_Safe(DocLn iLine, char* pTxtBuf) {
//
// CallTip and AutoComplete
//
DeclareSciCallV1(CallTipSetFore, CALLTIPSETFORE, COLORREF, colour)
DeclareSciCallV1(CallTipSetBack, CALLTIPSETBACK, COLORREF, colour)
DeclareSciCallV2(CallTipShow, CALLTIPSHOW, DocPos, position, const char*, text)
DeclareSciCallV2(CallTipSetHlt, CALLTIPSETHLT, int, beg, int, end)
DeclareSciCallR0(CallTipActive, CALLTIPACTIVE, bool)
DeclareSciCallV0(CallTipCancel, CALLTIPCANCEL)
DeclareSciCallV1(SetMouseDWellTime, SETMOUSEDWELLTIME, int, millisec)
DeclareSciCallR0(AutoCActive, AUTOCACTIVE, bool)
DeclareSciCallV0(AutoCComplete, AUTOCCOMPLETE)
@ -546,6 +547,8 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
// if iRangeEnd == -1 : apply style from iRangeStart to document end
#define Sci_ApplyLexerStyle(B, E) SciCall_Colourise((B), (E));
#define Sci_DisableMouseDWellNotification() SciCall_SetMouseDWellTime(SC_TIME_FOREVER)
//=============================================================================

4
src/StyleLexers/styleLexStandard.c
View File

@ -21,7 +21,7 @@ SCLEX_NULL, IDS_LEX_DEF_TXT, L"Default Text", L"txt; text; tmp; log; asc; doc; w
/* 11 */ { {_STYLE_GETSTYLEID(STY_X_LN_SPACE)}, IDS_LEX_STD_X_SPC, L"Extra Line Spacing (Size)", L"size:2", L"" },
/* 12 */ { {_STYLE_GETSTYLEID(STY_BOOK_MARK)}, IDS_LEX_STD_BKMRK, L"Bookmarks and Folding (Colors, Size)", L"size:+2; fore:#000000; back:#00DC00; alpha:100", L"" },
/* 13 */ { {_STYLE_GETSTYLEID(STY_MARK_OCC)}, IDS_LEX_STR_63262, L"Mark Occurrences (Indicator)", L"fore:#FF0000; alpha:100; alpha2:100; indic_roundbox", L"" },
/* 14 */ { {_STYLE_GETSTYLEID(STY_URL_HOTSPOT)}, IDS_LEX_STR_63264, L"Hyperlink Hotspots", L"fore:#0000FF; back:#0000C0; indic_compositionthick", L"" },
/* 14 */ { {_STYLE_GETSTYLEID(STY_URL_HOTSPOT)}, IDS_LEX_STR_63264, L"Hyperlink Hotspots", L"fore:#0000FF; back:#0000C0; indic_plain", L"" },
/* 15 */ { {_STYLE_GETSTYLEID(STY_IME_COLOR)}, IDS_LEX_STR_63352, L"Inline-IME Color", L"fore:#00AA00", L"" },
EDITLEXER_SENTINEL } };
@ -43,7 +43,7 @@ SCLEX_NULL, IDS_LEX_STR_63266, L"2nd Default Text", L"txt; text; tmp; log; asc;
/* 11 */ { {_STYLE_GETSTYLEID(STY_X_LN_SPACE)}, IDS_LEX_2ND_X_SPC, L"2nd Extra Line Spacing (Size)", L"", L"" },
/* 12 */ { {_STYLE_GETSTYLEID(STY_BOOK_MARK)}, IDS_LEX_2ND_BKMRK, L"2nd Bookmarks and Folding (Colors, Size)", L"size:+2; fore:#000000; back:#00DC00; charset:2; case:U; alpha:100", L"" },
/* 13 */ { {_STYLE_GETSTYLEID(STY_MARK_OCC)}, IDS_LEX_STR_63263, L"2nd Mark Occurrences (Indicator)", L"fore:#000000; alpha:100; alpha2:220; indic_box", L"" },
/* 14 */ { {_STYLE_GETSTYLEID(STY_URL_HOTSPOT)}, IDS_LEX_STR_63265, L"2nd Hyperlink Hotspots", L"fore:#FF0000; back:#C00000; indic_gradientcentre", L"" },
/* 14 */ { {_STYLE_GETSTYLEID(STY_URL_HOTSPOT)}, IDS_LEX_STR_63265, L"2nd Hyperlink Hotspots", L"fore:#00FF00; back:#00A000; alpha:180; indic_compositionthin; ", L"" },
/* 15 */ { {_STYLE_GETSTYLEID(STY_IME_COLOR)}, IDS_LEX_STR_63353, L"2nd Inline-IME Color", L"fore:#FF0000", L"" },
EDITLEXER_SENTINEL } };

1
src/TypeDefs.h
View File

@ -344,6 +344,7 @@ typedef struct _settings_t
int HighlightCurrentLine;
bool HyperlinkHotspot;
bool ScrollPastEOF;
bool ShowHypLnkToolTip;
bool AutoIndent;
bool AutoCompleteWords;
bool AutoCLexerKeyWords;

6
src/VersionEx.h
View File

@ -7,8 +7,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 517
#define VERSION_BUILD 1709
#define VERSION_REV 518
#define VERSION_BUILD 1710
#define SCINTILLA_VER 415+
#define ONIGMO_REGEX_VER 6.2.0
#define VERSION_PATCH XpErImEnTaL
#define VERSION_PATCH RC