From 8bd083877d19e9ad63a67148a0b354eaa58b3029 Mon Sep 17 00:00:00 2001 From: Matteo Nigro <111676425+Matteo-Nigro@users.noreply.github.com> Date: Wed, 23 Nov 2022 11:24:00 +0100 Subject: [PATCH 1/5] Implementation of automatic parenthesis closure Inserted an item in the menu allowing this to be done. At the moment I have only modified the English and Italian .rc files. If the functionality is implemented I can edit all other rc files with the English string. --- language/common_res.h | 1 + language/np3_en_gb/menu_en_gb.rc | 1 + language/np3_en_us/menu_en_us.rc | 1 + language/np3_it_it/menu_it_it.rc | 1 + src/Config/Config.cpp | 2 ++ src/Notepad3.c | 35 ++++++++++++++++++++++++++++++++ src/TypeDefs.h | 1 + 7 files changed, 42 insertions(+) diff --git a/language/common_res.h b/language/common_res.h index 13576a254..2f1d33073 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -824,6 +824,7 @@ #define IDM_SET_NOPRESERVECARET 42039 #define IDM_SET_MUTE_MESSAGEBEEP 42040 #define IDM_SET_EVALTINYEXPRONSEL 42041 +#define IDM_SET_AUTOCLOSEBRACKETS 42042 #define IDM_HELP_ABOUT 43000 #define IDM_HELP_CMD 43001 diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 9efd476d2..00bc804ae 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Word Wrap Settings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ong Line Settings...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto In&dent Text", IDM_SET_AUTOINDENTTEXT + MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 256840411..e034b47b6 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Word Wrap Settings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ong Line Settings...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto In&dent Text", IDM_SET_AUTOINDENTTEXT + MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index ee2cf3ecf..5a0886407 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Impostazioni &A capo automatico...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Impostazioni &Righe lunghe...", IDM_SET_LONGLINESETTINGS MENUITEM "In&dentazione automatica", IDM_SET_AUTOINDENTTEXT + MENUITEM "Chiusura automatica Parentesi", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Chiusura automatica &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "&Autocompletamento delle parole", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Autocompletamento &keywords lexer", IDM_SET_AUTOCLEXKEYWORDS diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp index 3273f4a53..456fe6dcf 100644 --- a/src/Config/Config.cpp +++ b/src/Config/Config.cpp @@ -1518,6 +1518,7 @@ void LoadSettings() GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, true); GET_BOOL_VALUE_FROM_INISECTION(MatchBraces, true); GET_BOOL_VALUE_FROM_INISECTION(AutoCloseTags, false); + GET_BOOL_VALUE_FROM_INISECTION(AutoCloseBrackets, false); GET_INT_VALUE_FROM_INISECTION(HighlightCurrentLine, 1, 0, 2); GET_INT_VALUE_FROM_INISECTION(ChangeHistoryMode, ChgHist_ON | ChgHist_MARGIN, ChgHist_NONE, ChgHist_ALL); GET_BOOL_VALUE_FROM_INISECTION(ChangeHistoryMargin, true); @@ -1975,6 +1976,7 @@ static bool _SaveSettings(bool bForceSaveSettings) SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowWordWrapSymbols); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, MatchBraces); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCloseTags); + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCloseBrackets); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, HighlightCurrentLine); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, ChangeHistoryMode); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, HyperlinkHotspot); diff --git a/src/Notepad3.c b/src/Notepad3.c index 5db8ccdb0..4c2777200 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -4313,6 +4313,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) //i = SciCall_GetLexer(); //EnableCmd(hmenu,IDM_SET_AUTOCLOSETAGS,(i == SCLEX_HTML || i == SCLEX_XML)); CheckCmd(hmenu, IDM_SET_AUTOCLOSETAGS, Settings.AutoCloseTags /*&& (i == SCLEX_HTML || i == SCLEX_XML)*/); + CheckCmd(hmenu, IDM_SET_AUTOCLOSEBRACKETS, Settings.AutoCloseBrackets); CheckCmd(hmenu, IDM_SET_REUSEWINDOW, Flags.bReuseWindow); CheckCmd(hmenu, IDM_SET_SINGLEFILEINSTANCE, Flags.bSingleFileInstance); @@ -6014,6 +6015,10 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) Settings.AutoCloseTags = !Settings.AutoCloseTags; break; + case IDM_SET_AUTOCLOSEBRACKETS: + Settings.AutoCloseBrackets = !Settings.AutoCloseBrackets; + break; + case IDM_VIEW_TOGGLE_HILITCURLN: case IDM_VIEW_HILITCURLN_NONE: case IDM_VIEW_HILITCURLN_BACK: @@ -8145,6 +8150,31 @@ static void _HandleAutoCloseTags() } } + +//============================================================================= +// +// _HandleAutoCloseBrackets() +// +static void _HandleAutoCloseBrackets(int const x) +{ + DocPos const iCurPos = SciCall_GetCurrentPos(); + DocPos const iStartPos = max_p(0, iCurPos - 1); + SciCall_SetSel(iStartPos, iCurPos); + switch(x){ + case '[': + EditReplaceSelection("[]", false); + break; + case '{': + EditReplaceSelection("{}", false); + break; + case '(': + EditReplaceSelection("()", false); + break; + } + SciCall_SetSel(iCurPos, iCurPos); +} + + #if 0 //============================================================================= // @@ -8475,6 +8505,11 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const SCNotification* const scn) _HandleAutoCloseTags(); } break; + case '[': + case '{': + case '(': + _HandleAutoCloseBrackets(ich); + break; case '?': _EvalTinyExpr(true); break; diff --git a/src/TypeDefs.h b/src/TypeDefs.h index c616b02e5..a637810e6 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -581,6 +581,7 @@ typedef struct SETTINGS_T { bool DocReadOnlyMode; bool MatchBraces; bool AutoCloseTags; + bool AutoCloseBrackets; int HighlightCurrentLine; int ChangeHistoryMode; bool ChangeHistoryMargin; From 03e8063047626b3253214a3e1487ac45463310d7 Mon Sep 17 00:00:00 2001 From: Matteo Nigro <111676425+Matteo-Nigro@users.noreply.github.com> Date: Wed, 23 Nov 2022 11:30:02 +0100 Subject: [PATCH 2/5] Update Notepad3.c --- src/Notepad3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Notepad3.c b/src/Notepad3.c index 4c2777200..c8cbc3bac 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -8508,7 +8508,9 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const SCNotification* const scn) case '[': case '{': case '(': - _HandleAutoCloseBrackets(ich); + if (Settings.AutoCloseBrackets) { + _HandleAutoCloseBrackets(ich); + } break; case '?': _EvalTinyExpr(true); From 2a0b777cc19137515e0e4359b9af1e26379df9cf Mon Sep 17 00:00:00 2001 From: Matteo Nigro <111676425+Matteo-Nigro@users.noreply.github.com> Date: Thu, 24 Nov 2022 12:14:25 +0100 Subject: [PATCH 3/5] Code simplification --- src/Notepad3.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Notepad3.c b/src/Notepad3.c index c8cbc3bac..a908b2883 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -8158,17 +8158,15 @@ static void _HandleAutoCloseTags() static void _HandleAutoCloseBrackets(int const x) { DocPos const iCurPos = SciCall_GetCurrentPos(); - DocPos const iStartPos = max_p(0, iCurPos - 1); - SciCall_SetSel(iStartPos, iCurPos); switch(x){ case '[': - EditReplaceSelection("[]", false); + SciCall_AddText(1,"]"); break; case '{': - EditReplaceSelection("{}", false); + SciCall_AddText(1,"}"); break; case '(': - EditReplaceSelection("()", false); + SciCall_AddText(1,")"); break; } SciCall_SetSel(iCurPos, iCurPos); From e495f85d5f36bd1e474633fadc173ab04c83c21e Mon Sep 17 00:00:00 2001 From: Matteo Nigro <111676425+Matteo-Nigro@users.noreply.github.com> Date: Thu, 24 Nov 2022 12:38:27 +0100 Subject: [PATCH 4/5] Small correction --- src/Notepad3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Notepad3.c b/src/Notepad3.c index a908b2883..91b199eda 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -8158,6 +8158,7 @@ static void _HandleAutoCloseTags() static void _HandleAutoCloseBrackets(int const x) { DocPos const iCurPos = SciCall_GetCurrentPos(); + UndoTransActionBegin(); switch(x){ case '[': SciCall_AddText(1,"]"); @@ -8170,6 +8171,7 @@ static void _HandleAutoCloseBrackets(int const x) break; } SciCall_SetSel(iCurPos, iCurPos); + EndUndoTransAction(); } From 1d2283057dafc9199561612a238c50a35b324f28 Mon Sep 17 00:00:00 2001 From: Matteo Nigro <111676425+Matteo-Nigro@users.noreply.github.com> Date: Thu, 24 Nov 2022 19:33:03 +0100 Subject: [PATCH 5/5] Added entry in all localisations As requested by @hpwamr the string for the new functionality has been preset in all localisations. --- language/np3_af_za/menu_af_za.rc | 1 + language/np3_be_by/menu_be_by.rc | 1 + language/np3_de_de/menu_de_de.rc | 1 + language/np3_el_gr/menu_el_gr.rc | 1 + language/np3_en_gb/menu_en_gb.rc | 2 +- language/np3_en_us/menu_en_us.rc | 2 +- language/np3_es_es/menu_es_es.rc | 1 + language/np3_es_mx/menu_es_mx.rc | 1 + language/np3_fr_fr/menu_fr_fr.rc | 1 + language/np3_hi_in/menu_hi_in.rc | 1 + language/np3_hu_hu/menu_hu_hu.rc | 1 + language/np3_id_id/menu_id_id.rc | 1 + language/np3_it_it/menu_it_it.rc | 2 +- language/np3_ja_jp/menu_ja_jp.rc | 1 + language/np3_ko_kr/menu_ko_kr.rc | 1 + language/np3_nl_nl/menu_nl_nl.rc | 1 + language/np3_pl_pl/menu_pl_pl.rc | 1 + language/np3_pt_br/menu_pt_br.rc | 1 + language/np3_pt_pt/menu_pt_pt.rc | 1 + language/np3_ru_ru/menu_ru_ru.rc | 1 + language/np3_sk_sk/menu_sk_sk.rc | 1 + language/np3_sv_se/menu_sv_se.rc | 1 + language/np3_tr_tr/menu_tr_tr.rc | 1 + language/np3_vi_vn/menu_vi_vn.rc | 1 + language/np3_zh_cn/menu_zh_cn.rc | 1 + language/np3_zh_tw/menu_zh_tw.rc | 1 + 26 files changed, 26 insertions(+), 3 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 600b11c22..21c538d95 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Woord Omslag Instellings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ang Lyn Instellings...", IDM_SET_LONGLINESETTINGS MENUITEM "Outo-In&dent Teks", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Outo-Sluit &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "O&uto-Voltooi Woorde", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Outo-Voltooi Le&xer-Sleutel-Woorde", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index ef85e52d2..73e467b42 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Налады перано&са радкоў...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Налады до&ўгіх радкоў...", IDM_SET_LONGLINESETTINGS MENUITEM "Аўта&матычны водступ тэксту", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Аўтазакрыццё тэгаў &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Cамадавяр&шэнне слоў", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Cамадавяршэнне на аснове &лексемаў", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index b421a2652..c7beaa9ce 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Wort Umbruch Einstellungen...", IDM_SET_WORDWRAPSETTINGS MENUITEM "&Lang Zeilen Einstellungen...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto Text &Einrückung", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Tagabschluss &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Auto Wort &Vorschläge", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto &Lexer KeyWord Vorschläge", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_el_gr/menu_el_gr.rc b/language/np3_el_gr/menu_el_gr.rc index 58857b14e..201aac995 100644 --- a/language/np3_el_gr/menu_el_gr.rc +++ b/language/np3_el_gr/menu_el_gr.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Ρυθμίσεις αναδίπλωσης &λέξεων...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Ρυθμίσεις &μεγάλης γραμμής...", IDM_SET_LONGLINESETTINGS MENUITEM "Αυτόματη εσ&οχή κειμένου", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Αυτόματο κλείσιμο Η&ΤΜL/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Αυτόματη συμπλήρωση λέ&ξεων", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Α&υτόμ. συμπλήρωση λέ&ξεων-κλειδιών του Lexer", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 00bc804ae..0ab48303f 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -469,7 +469,7 @@ BEGIN MENUITEM "&Word Wrap Settings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ong Line Settings...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto In&dent Text", IDM_SET_AUTOINDENTTEXT - MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index e034b47b6..4ebc6e2e8 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -469,7 +469,7 @@ BEGIN MENUITEM "&Word Wrap Settings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ong Line Settings...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto In&dent Text", IDM_SET_AUTOINDENTTEXT - MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 195f14d8c..613212222 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Configuración &ajuste de línea...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Configuración de &larga línea...", IDM_SET_LONGLINESETTINGS MENUITEM "&Sangría texto automático", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Cierre &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto completar palabras", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto completar palabras clave 'Le&xer'", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc index d0ea5d808..3eac96963 100644 --- a/language/np3_es_mx/menu_es_mx.rc +++ b/language/np3_es_mx/menu_es_mx.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Configuración &ajuste de línea...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Configuración de &larga línea...", IDM_SET_LONGLINESETTINGS MENUITEM "&Sangría texto automático", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Cierre &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto completar palabras", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto completar palabras clave 'Le&xer'", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 204dc303c..95385013f 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Paramètres de saut de ligne automatique...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Paramètres de ligne l&ongue...", IDM_SET_LONGLINESETTINGS MENUITEM "Retrait automatique &du texte", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto-fermeture des balises &HTML/XML\tCtrl+Maj+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto-complétion des mots", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto-complétion des &mots-clés Lexer", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index c9f9bb8c5..8d23e3160 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "शब्द लपेटने की सेटिंग (&W)...", IDM_SET_WORDWRAPSETTINGS MENUITEM "लंबी रेखा की सेटिंग (&O)...", IDM_SET_LONGLINESETTINGS MENUITEM "स्वत: टेक्स्ट को इंडेंट करें (&D)", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "HTML/XML स्वत: बंद करें (&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "शब्द स्वतः पूर्ण करें (&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Lexer-Key-Words स्वतः पूर्ण करें (&K)", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 6b42f8ebf..5ada894c0 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Sortörés beállítások...", IDM_SET_WORDWRAPSETTINGS MENUITEM "&Hosszú sorok beállításai...", IDM_SET_LONGLINESETTINGS MENUITEM "A&utomatikus behúzás", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "HTML/&XML aut. lezárás\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Szó kie&gészítés", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Lexer kul&csszavak kiegészítése", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index 3ef3fa087..3bf1a8479 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Word Wrap Settings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ong Line Settings...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto In&dent Text", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 5a0886407..c99a1da97 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -469,7 +469,7 @@ BEGIN MENUITEM "Impostazioni &A capo automatico...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Impostazioni &Righe lunghe...", IDM_SET_LONGLINESETTINGS MENUITEM "In&dentazione automatica", IDM_SET_AUTOINDENTTEXT - MENUITEM "Chiusura automatica Parentesi", IDM_SET_AUTOCLOSEBRACKETS + ///MENUITEM "Chiusura automatica Parentesi", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Chiusura automatica &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "&Autocompletamento delle parole", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Autocompletamento &keywords lexer", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 9a0b9deb7..c54f1b1d0 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "折り返し方の設定(&W)...", IDM_SET_WORDWRAPSETTINGS MENUITEM "行の長さガイドの設定(&O)...", IDM_SET_LONGLINESETTINGS MENUITEM "自動インデント(&D)", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "自動閉じHTML/XMLタグ(&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "単語補完(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "予約語を自動補完(&K)", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 741c4bdc5..e97989bb8 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "줄 바꿈 설정(&W)...", IDM_SET_WORDWRAPSETTINGS MENUITEM "긴 줄 설정(&O)...", IDM_SET_LONGLINESETTINGS MENUITEM "텍스트 자동 들여쓰기(&D)", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "HTML/XML 자동 닫기(&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "단어 자동 완성(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "어휘 자동 완성(&K)", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index bff9ee4d0..b0fad9933 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Instellingen voor regelterugloop...", IDM_SET_WORDWRAPSETTINGS MENUITEM "&Lange regelinstellingen...", IDM_SET_LONGLINESETTINGS MENUITEM "Te&kst automatisch inspringen", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "&HTML/XML tags automatisch sluiten\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Sleutelwoorden &automatisch aanvullen", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "'Lexer' sleutelwoorden auto&matisch aanvullen", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index e26e42131..cbd71a833 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Ustawienia zawijania wierszy...", IDM_SET_WORDWRAPSETTINGS MENUITEM "&Ustawienia długości wierszy...", IDM_SET_LONGLINESETTINGS MENUITEM "Automatyczne wcięcie", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Automatyczne zamykanie &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&utouzupełnianie wyrazów", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Autouzupełnianie Lekserem", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index f13bf5b29..dcdd22bee 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Configurações de Quebra de &Palavra...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Configurações de Linha &Longa...", IDM_SET_LONGLINESETTINGS MENUITEM "In&dentar Texto Automaticamente", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Fechar Automaticamente &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Completa Palavras A&utomaticamente", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Completa Automaticamente Palavras-&Chaves-Léxicas", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 140a99350..a17dd762a 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Definições de moldagem de texto...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Definições de linhas &longas...", IDM_SET_LONGLINESETTINGS MENUITEM "In&dentação automática do texto", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Fechar automaticamente &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Conclusão a&utomática das palavras", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Conclusão automática palavras chave Lexer", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index c1b416273..5be8f9802 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Настройка переноса &строк...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Настро&йка длинных строк...", IDM_SET_LONGLINESETTINGS MENUITEM "Авто&матический отступ текста", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Автозакрытие тегов &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Авто&завершение слов", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Автозавершение на основе &лексем", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 9cfdc6239..6fe3d9c14 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Na&stavenie zalomenia slov...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Nastavenie &dĺžky riadkov...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto&matická identifikácia textu", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto-zakončovanie &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&utomatické dokončovanie slov", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto-kompletizácia kľúčových slov &Lexer", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 4f7236681..c593a264d 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Automatiskt radbyte...", IDM_SET_WORDWRAPSETTINGS MENUITEM "Långa rader...", IDM_SET_LONGLINESETTINGS MENUITEM "Automatiskt indrag", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Stäng HTML/XML automatiskt\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Kompletera ord automatiskt", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Komplettera Lexer-&Key-Words automatiskt", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 37fca8e37..2488b2f0d 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "Sözcük &kaydırma ayarları...", IDM_SET_WORDWRAPSETTINGS MENUITEM "&Uzun satır ayarları...", IDM_SET_LONGLINESETTINGS MENUITEM "Otomatik girinti kullanılsın", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "HTML/&XML kod imleri otomatik kapatılsın\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "Sözcükler &otomatik tamamlansın", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "&Lexer-&anahtar sözcükleri otomatik tamamlansın", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index ba91256af..256b81a8a 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "&Word Wrap Settings...", IDM_SET_WORDWRAPSETTINGS MENUITEM "L&ong Line Settings...", IDM_SET_LONGLINESETTINGS MENUITEM "Auto In&dent Text", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "A&uto Complete Words", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "Auto Complete Lexer-&Key-Words", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 25cf2422c..f49843a07 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "自动换行设置(&W)...", IDM_SET_WORDWRAPSETTINGS MENUITEM "长行标记设置(&O)...", IDM_SET_LONGLINESETTINGS MENUITEM "自动缩进(&D)", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "自动关闭 &HTML/XML 标记\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "自动补全单词(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "自动补全语法关键字(&K)", IDM_SET_AUTOCLEXKEYWORDS diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index c515f30b6..cf2dfb9ca 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -469,6 +469,7 @@ BEGIN MENUITEM "自動換行設定(&W)...", IDM_SET_WORDWRAPSETTINGS MENUITEM "長行標記設定(&O)...", IDM_SET_LONGLINESETTINGS MENUITEM "自動縮排(&D)", IDM_SET_AUTOINDENTTEXT + ///MENUITEM "Auto Close Brackets", IDM_SET_AUTOCLOSEBRACKETS MENUITEM "自動關閉 HTML/XML 標記(&H)\tCtrl+Shift+H", IDM_SET_AUTOCLOSETAGS MENUITEM "自動完成單詞(&U)", IDM_SET_AUTOCOMPLETEWORDS MENUITEM "自動完成語法關鍵字(&K)", IDM_SET_AUTOCLEXKEYWORDS