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

Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_Master

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2022-11-25 21:37:13 +01:00
commit bcfb603eb6
30 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
language/common_res.h
View File

@ -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

1
language/np3_af_za/menu_af_za.rc
View File

@ -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

1
language/np3_be_by/menu_be_by.rc
View File

@ -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

1
language/np3_de_de/menu_de_de.rc
View File

@ -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

1
language/np3_el_gr/menu_el_gr.rc
View File

@ -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

1
language/np3_en_gb/menu_en_gb.rc
View File

@ -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

1
language/np3_en_us/menu_en_us.rc
View File

@ -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

1
language/np3_es_es/menu_es_es.rc
View File

@ -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

1
language/np3_es_mx/menu_es_mx.rc
View File

@ -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

1
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -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

1
language/np3_hi_in/menu_hi_in.rc
View File

@ -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

1
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -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

1
language/np3_id_id/menu_id_id.rc
View File

@ -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

1
language/np3_it_it/menu_it_it.rc
View File

@ -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

1
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -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

1
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -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

1
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -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

1
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -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

1
language/np3_pt_br/menu_pt_br.rc
View File

@ -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

1
language/np3_pt_pt/menu_pt_pt.rc
View File

@ -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

1
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -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

1
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -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

1
language/np3_sv_se/menu_sv_se.rc
View File

@ -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

1
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -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

1
language/np3_vi_vn/menu_vi_vn.rc
View File

@ -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

1
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -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

1
language/np3_zh_tw/menu_zh_tw.rc
View File

@ -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

2
src/Config/Config.cpp
View File

@ -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);

37
src/Notepad3.c
View File

@ -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();
UndoTransActionBegin();
switch(x){
case '[':
SciCall_AddText(1,"]");
break;
case '{':
SciCall_AddText(1,"}");
break;
case '(':
SciCall_AddText(1,")");
break;
}
SciCall_SetSel(iCurPos, iCurPos);
EndUndoTransAction();
}
#if 0
//=============================================================================
//
@ -8475,6 +8505,13 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const SCNotification* const scn)
_HandleAutoCloseTags();
}
break;
case '[':
case '{':
case '(':
if (Settings.AutoCloseBrackets) {
_HandleAutoCloseBrackets(ich);
}
break;
case '?':
_EvalTinyExpr(true);
break;

1
src/TypeDefs.h
View File

@ -581,6 +581,7 @@ typedef struct SETTINGS_T {
bool DocReadOnlyMode;
bool MatchBraces;
bool AutoCloseTags;
bool AutoCloseBrackets;
int HighlightCurrentLine;
int ChangeHistoryMode;
bool ChangeHistoryMargin;