diff --git a/Versions/build.txt b/Versions/build.txt index 44b88aa38..36dd03b4b 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1709 +1710 diff --git a/language/common_res.h b/language/common_res.h index aec8a13bd..82a29bb87 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -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 diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 6b926dc8c..6baa9258b 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -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 &Ler", IDM_VIEW_SCROLLPASTEOF + MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END POPUP "Nu&tsbalk" BEGIN diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index fcd285ef2..64922d720 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -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 diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 69f19e4b2..ae86e4f65 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -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 diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 5eccb60c5..2b3d52739 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -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 diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 56edd847d..f6600d8a6 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -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 diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 6e3e31906..05a798eeb 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -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 despus del final de archivo", IDM_VIEW_SCROLLPASTEOF + MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END POPUP "Barra de herram&ientas" BEGIN diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 0d7cb60e4..0b751e5c1 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -342,6 +342,7 @@ BEGIN MENUITEM "Vue &Focalise\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "Sur&veillance de Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Dfiler aprs la fin de &fichier", IDM_VIEW_SCROLLPASTEOF + MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END POPUP "&Barre outils" BEGIN diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 8f6db762c..2acf5cbc2 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -342,6 +342,7 @@ BEGIN MENUITEM "Fkuszlt n&zet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Naplfjl kvetse", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Grgets a fjl vge &utn is", IDM_VIEW_SCROLLPASTEOF + MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END POPUP "&Eszkztr" BEGIN diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index e6cd8447d..f78c503b2 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -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 diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 7b64557a2..5f3c2a034 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -342,6 +342,7 @@ BEGIN MENUITEM "P][h\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL MENUITEM "̏I[ȍ~փXN[(&F)", IDM_VIEW_SCROLLPASTEOF + MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END POPUP "c[o[(&T)" BEGIN diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 8d2369d4c..fb684aec0 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -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 diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index c21518949..f1fb1798f 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -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 diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index a1ecd64ae..e5ea8ab95 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -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 narzdzi" BEGIN diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 96194bce8..276e3b9a5 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -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 diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 61d7f5583..2b6e592f1 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -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 diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index d4aaf7fea..0ba22f704 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -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 diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt index c32b9ffbb..ee7531390 100644 --- a/np3portableapp/_buildname.txt +++ b/np3portableapp/_buildname.txt @@ -1 +1 @@ -"XpErImEnTaL" +"RC" diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index ef4c78584..c99f606aa 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 XpErImEnTaL + Notepad3 RC diff --git a/src/Notepad3.c b/src/Notepad3.c index 47b1e3204..25ae7eecb 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -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); diff --git a/src/SciCall.h b/src/SciCall.h index 69338a182..05aec1bbd 100644 --- a/src/SciCall.h +++ b/src/SciCall.h @@ -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) + //============================================================================= diff --git a/src/StyleLexers/styleLexStandard.c b/src/StyleLexers/styleLexStandard.c index ecfe223b9..15d91f2cb 100644 --- a/src/StyleLexers/styleLexStandard.c +++ b/src/StyleLexers/styleLexStandard.c @@ -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 } }; diff --git a/src/TypeDefs.h b/src/TypeDefs.h index 3c2ecb600..bde6043eb 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -344,6 +344,7 @@ typedef struct _settings_t int HighlightCurrentLine; bool HyperlinkHotspot; bool ScrollPastEOF; + bool ShowHypLnkToolTip; bool AutoIndent; bool AutoCompleteWords; bool AutoCLexerKeyWords; diff --git a/src/VersionEx.h b/src/VersionEx.h index 3acf62d2c..e00ef1c95 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -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