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 pull request #3242 from RaiKoHoff/Dev_Lexilla

Browse Source 
Turning "Line Comment Block Edit" from option into command
This commit is contained in:
Rainer Kottenhoff 2021-03-29 20:07:49 +02:00 committed by GitHub
commit 1934795c59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 111 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
language/common_res.h
View File

@ -584,37 +584,38 @@
#define IDM_EDIT_INSERT_DIRNAME 40353
#define IDM_EDIT_INSERT_PATHNAME 40354
#define IDM_EDIT_LINECOMMENT 40355
#define IDM_EDIT_STREAMCOMMENT 40356
#define IDM_EDIT_URLENCODE 40357
#define IDM_EDIT_URLDECODE 40358
#define IDM_EDIT_URL2PATH 40359
#define IDM_EDIT_PATH2URL 40360
#define IDM_EDIT_INVERTSLASH 40361
#define IDM_EDIT_INVERTBACKSLASH 40362
#define IDM_EDIT_ESCAPECCHARS 40363
#define IDM_EDIT_UNESCAPECCHARS 40364
#define IDM_EDIT_CHAR2HEX 40365
#define IDM_EDIT_HEX2CHAR 40366
#define IDM_EDIT_FINDMATCHINGBRACE 40367
#define IDM_EDIT_SELTOMATCHINGBRACE 40368
#define IDM_EDIT_FIND 40369
#define IDM_EDIT_SAVEFIND 40370
#define IDM_EDIT_FINDNEXT 40371
#define IDM_EDIT_FINDPREV 40372
#define IDM_EDIT_REPLACE 40373
#define IDM_EDIT_REPLACENEXT 40374
#define IDM_EDIT_GOTOLINE 40375
#define IDM_EDIT_SELTONEXT 40376
#define IDM_EDIT_SELTOPREV 40377
#define IDM_EDIT_COMPLETEWORD 40378
#define IDM_EDIT_JOINLN_NOSP 40379
#define IDM_EDIT_REMOVEDUPLICATELINES 40380
#define IDM_EDIT_REMOVEEMPTYLINES 40381
#define IDM_EDIT_MERGEEMPTYLINES 40382
#define IDM_EDIT_CLEAR_MARKER 40383
#define IDM_EDIT_CUT_MARKED 40384
#define IDM_EDIT_COPY_MARKED 40385
#define IDM_EDIT_DELETE_MARKED 40386
#define IDM_EDIT_LINECOMMENT_BLOCKEDIT 40356
#define IDM_EDIT_STREAMCOMMENT 40357
#define IDM_EDIT_URLENCODE 40358
#define IDM_EDIT_URLDECODE 40359
#define IDM_EDIT_URL2PATH 40360
#define IDM_EDIT_PATH2URL 40361
#define IDM_EDIT_INVERTSLASH 40362
#define IDM_EDIT_INVERTBACKSLASH 40363
#define IDM_EDIT_ESCAPECCHARS 40364
#define IDM_EDIT_UNESCAPECCHARS 40365
#define IDM_EDIT_CHAR2HEX 40366
#define IDM_EDIT_HEX2CHAR 40367
#define IDM_EDIT_FINDMATCHINGBRACE 40368
#define IDM_EDIT_SELTOMATCHINGBRACE 40369
#define IDM_EDIT_FIND 40370
#define IDM_EDIT_SAVEFIND 40371
#define IDM_EDIT_FINDNEXT 40372
#define IDM_EDIT_FINDPREV 40373
#define IDM_EDIT_REPLACE 40374
#define IDM_EDIT_REPLACENEXT 40375
#define IDM_EDIT_GOTOLINE 40376
#define IDM_EDIT_SELTONEXT 40377
#define IDM_EDIT_SELTOPREV 40378
#define IDM_EDIT_COMPLETEWORD 40379
#define IDM_EDIT_JOINLN_NOSP 40380
#define IDM_EDIT_REMOVEDUPLICATELINES 40381
#define IDM_EDIT_REMOVEEMPTYLINES 40382
#define IDM_EDIT_MERGEEMPTYLINES 40383
#define IDM_EDIT_CLEAR_MARKER 40384
#define IDM_EDIT_CUT_MARKED 40385
#define IDM_EDIT_COPY_MARKED 40386
#define IDM_EDIT_DELETE_MARKED 40387
#define IDM_VIEW_SCHEME 40400
#define IDM_VIEW_USE2NDDEFAULT 40401
@ -699,10 +700,9 @@
#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
#define IDM_VIEW_WIN_DARK_MODE 40486
#define IDM_VIEW_EVALTINYEXPRONSEL 40483
#define IDM_VIEW_UNICODE_POINTS 40484
#define IDM_VIEW_WIN_DARK_MODE 40485
// keep Scintilla(SC) order
#define IDM_SET_RENDER_TECH_GDI 40500 // SC_TECHNOLOGY_DEFAULT(0)

2
language/np3_af_za/menu_af_za.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Ontkeep", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "L&yn Kommentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "A&ktiveer Wysiging van reël en Kommentaarblok", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM "A&ktiveer Wysiging van reël en Kommentaarblok", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Stroom Kommentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_be_by/menu_be_by.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Выдаліць водступ", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Каментарыі (пераключыць)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Блокавае рэдагаванне каментарыяў", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Блокавае рэдагаванне каментарыяў", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Блокавы каментарый\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

10
language/np3_de_de/menu_de_de.rc
View File

@ -206,13 +206,13 @@ BEGIN
END
POPUP "&Selektion"
BEGIN
MENUITEM "&Text Einrückung", IDM_EDIT_INDENT
MENUITEM "&Text Rückzug", IDM_EDIT_UNINDENT
MENUITEM "&Text Einrückung", IDM_EDIT_INDENT
MENUITEM "Text &Rückzug", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Einzeilenkommentar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Editierbarer &Zeilen Block Kommentar", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM "&Zeilenkommentar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "&Erweiterter Zeilenkommentar\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Mehrzeilenkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM "&Mehrzeilenkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Umschließe Selektion"
BEGIN

10
language/np3_el_gr/menu_el_gr.rc
View File

@ -206,13 +206,13 @@ BEGIN
END
POPUP "Selectio&n"
BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN

10
language/np3_en_gb/menu_en_gb.rc
View File

@ -206,13 +206,13 @@ BEGIN
END
POPUP "Selectio&n"
BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN

12
language/np3_en_us/menu_en_us.rc
View File

@ -201,18 +201,18 @@ BEGIN
MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES
MENUITEM "Merge Blan&k Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES
MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES
MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES
MENUITEM "Remove &Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES
MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES
END
POPUP "Selectio&n"
BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Line Comment Bl&ock Edit\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN

2
language/np3_es_419/menu_es_419.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_es_es/menu_es_es.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Reducir la sangría", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Comentario de línea (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Habilitar edición de bloque de &comentario de línea", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Comentario &multilíneas\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Réduire le Retrait", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Commentaire de Ligne (Alterner)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Activer Édition de bloc de Lignes de &Commentaires", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Activer Édition de bloc de Lignes de &Commentaires", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Commentaire &Multiligne\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_hi_in/menu_hi_in.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "इंडेंट हटाएं (&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "रेखा टिप्पणी (टॉगल)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "रेखा ब्लॉक-टिप्पणी परिमार्जन समर्थ करें (&O)", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "रेखा ब्लॉक-टिप्पणी परिमार्जन समर्थ करें (&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "Behúzás törlése", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Sor megjegyzés (váltás)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Sor-megjegyzés függőleges szerkesztésének engedélyezése", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Sor-megjegyzés függőleges szerkesztésének engedélyezése", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Blokk megjegyzés\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_id_id/menu_id_id.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Enable Line Comment Bl&ock Edit", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_it_it/menu_it_it.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Rimuovi indentazione", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Commenta riga (attiva/disattiva)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Abilita modifica blocco commenti di linea", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Abilita modifica blocco commenti di linea", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Commento multi-riga\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "逆インデント(&U)\tShift+Tab", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "行コメント(切替)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "矩形/複数選択時もコメント切替(&O)", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "矩形/複数選択時もコメント切替(&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "ブロックコメント(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "내어쓰기(&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "줄 주석 (전환)(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "줄 주석 블록 편집 활성화(&O)", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "줄 주석 블록 편집 활성화(&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "스트림 주석(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "Teru&gspringen", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Lijn commentaar (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Schakel bewerken van lijn &commentaarblok in", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Schakel bewerken van lijn &commentaarblok in", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Multilijnen commentaar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Bez wcięcia", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Komentarz liniowy (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Włącz edycję wierszy bloku komentarzy", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Włącz edycję wierszy bloku komentarzy", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Komentarz strumieniowy\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_pt_br/menu_pt_br.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Remover Indentar", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Comentário de &Linha (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Habilitar Edição de Bloco de Linha &Comentário", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Habilitar Edição de Bloco de Linha &Comentário", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Comentário de &Bloco\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_pt_pt/menu_pt_pt.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Desindentar", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Linha de comentário (Alternar)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Activar edição de bloco de &comentário de linha", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Activar edição de bloco de &comentário de linha", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Vária&s linhas de comentário\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Удалить отступ", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Комментарий (вкл./выкл.)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Блочное редактирование &комментариев", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Блочное редактирование &комментариев", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "&Блочный комментарий\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "Z&rušiť odsadenie", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "&Riadkový komentár (zap./vyp.)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Povoliť úpravu bloku &komentárov riadka", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Povoliť úpravu bloku &komentárov riadka", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Pr&enos komentára\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_sv_se/menu_sv_se.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "Ta bort indrag", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Linjekommentar (växla)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Redigering av radkommentar", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Redigering av radkommentar", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "Strömkommentar\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Enable Line Comment Bl&ock Edit", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_vi_vn/menu_vi_vn.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Line &Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "Enable Line Comment Bl&ock Edit", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "Enable Line Comment Bl&ock Edit", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "St&ream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "减少缩进(&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "切换行注释(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "使用矩形编辑模式修改行注释(&O)", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "使用矩形编辑模式修改行注释(&O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "添加块注释(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
language/np3_zh_tw/menu_zh_tw.rc
View File

@ -210,7 +210,7 @@ BEGIN
MENUITEM "減少縮排(&U)", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "切換行註釋(&C)\tCtrl+Q", IDM_EDIT_LINECOMMENT
MENUITEM "使用矩形編輯模式修改行註釋(O)", IDM_VIEW_EDIT_LINECOMMENT
//MENUITEM "使用矩形編輯模式修改行註釋(O)", IDM_EDIT_LINECOMMENT_BLOCKEDIT
MENUITEM SEPARATOR
MENUITEM "新增塊註釋(&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT
MENUITEM SEPARATOR

2
src/Config/Config.cpp
View File

@ -1448,7 +1448,6 @@ void LoadSettings()
GET_BOOL_VALUE_FROM_INISECTION(AutoCompleteWords, false);
GET_BOOL_VALUE_FROM_INISECTION(AutoCLexerKeyWords, false);
GET_BOOL_VALUE_FROM_INISECTION(AccelWordNavigation, false);
GET_BOOL_VALUE_FROM_INISECTION(EditLineCommentBlock, false);
GET_BOOL_VALUE_FROM_INISECTION(ShowIndentGuides, false);
GET_BOOL_VALUE_FROM_INISECTION(BackspaceUnindents, false);
GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, false);
@ -1880,7 +1879,6 @@ static bool _SaveSettings(bool bForceSaveSettings)
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCompleteWords);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoCLexerKeyWords);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AccelWordNavigation);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, EditLineCommentBlock);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowIndentGuides);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, WarnInconsistentIndents);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, AutoDetectIndentSettings);

53
src/Edit.c
View File

@ -3386,21 +3386,14 @@ void EditEncloseSelection(LPCWSTR pwszOpen, LPCWSTR pwszClose)
//
// EditToggleLineCommentsSimple()
//
void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAtStart)
void EditToggleLineCommentsSimple(LPCWSTR pwszComment, bool bInsertAtStart)
{
UNREFERENCED_PARAMETER(hwnd);
if (Sci_IsMultiOrRectangleSelection()) {
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_SELRECTORMULTI);
return;
}
_SAVE_TARGET_RANGE_;
bool const bStraightSel = SciCall_GetAnchor() <= SciCall_GetCurrentPos();
DocPos const iSelStart = SciCall_GetSelectionStart();
DocPos const iSelEnd = SciCall_GetSelectionEnd();
DocPos const iSelStart = Sci_GetSelectionStartEx();
DocPos const iSelEnd = Sci_GetSelectionEndEx();
//const DocPos iSelBegCol = SciCall_GetColumn(iSelStart);
@ -3423,13 +3416,15 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
return;
}
const DocLn iStartLine = SciCall_LineFromPosition(iSelStart);
DocLn iEndLine = SciCall_LineFromPosition(iSelEnd);
const DocLn iLineStart = SciCall_LineFromPosition(iSelStart);
DocLn iLineEnd = SciCall_LineFromPosition(iSelEnd);
// don't consider (last) line where caret is before 1st column
if (iSelEnd <= SciCall_PositionFromLine(iEndLine)) {
if ((iEndLine - iStartLine) >= 1) { // except it is the only one
--iEndLine;
if (!Sci_IsMultiOrRectangleSelection()) {
// don't consider (last) line where caret is before 1st column
if (iSelEnd <= SciCall_PositionFromLine(iLineEnd)) {
if ((iLineEnd - iLineStart) >= 1) { // except it is the only one
--iLineEnd;
}
}
}
@ -3437,7 +3432,7 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
if (!bInsertAtStart) {
iCommentCol = (DocPos)INT_MAX;
for (DocLn iLine = iStartLine; iLine <= iEndLine; iLine++) {
for (DocLn iLine = iLineStart; iLine <= iLineEnd; iLine++) {
const DocPos iLineEndPos = SciCall_GetLineEndPosition(iLine);
const DocPos iLineIndentPos = SciCall_GetLineIndentPosition(iLine);
if (iLineIndentPos != iLineEndPos) {
@ -3455,7 +3450,7 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
int iAction = 0;
bool const bKeepActionOf1stLine = false;
for (DocLn iLine = iStartLine; iLine <= iEndLine; ++iLine) {
for (DocLn iLine = iLineStart; iLine <= iLineEnd; ++iLine) {
if (!bKeepActionOf1stLine) {
iAction = 0;
@ -3479,7 +3474,7 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
case 2:
SciCall_SetTargetRange(iIndentPos, iSelPos);
SciCall_ReplaceTarget(-1, "");
if (iLine == iStartLine) {
if (iLine == iLineStart) {
iSelStartOffset -= (iSelStart <= iIndentPos) ? 0 : (iSelStart < iSelPos) ? (iSelStart - iIndentPos) : cchComment;
}
DocPos const movedSelEnd = iSelEnd + iSelEndOffset;
@ -3497,7 +3492,7 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
case 2:
SciCall_SetTargetRange(iIndentPos, iSelPos);
SciCall_ReplaceTarget(-1, "");
if (iLine == iStartLine) {
if (iLine == iLineStart) {
iSelStartOffset -= (iSelStart <= iIndentPos) ? 0 : (iSelStart < iSelPos) ? (iSelStart - iIndentPos) : cchPrefix;
}
DocPos const movedSelEnd = iSelEnd + iSelEndOffset;
@ -3514,7 +3509,7 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
case 1: {
DocPos const iPos = SciCall_FindColumn(iLine, iCommentCol);
SciCall_InsertText(iPos, mszComment);
if (iLine == iStartLine) {
if (iLine == iLineStart) {
iSelStartOffset += (iSelStart <= iPos) ? 0 : cchComment;
}
DocPos const movedSelEnd = iSelEnd + iSelEndOffset;
@ -3544,9 +3539,8 @@ void EditToggleLineCommentsSimple(HWND hwnd, LPCWSTR pwszComment, bool bInsertAt
//
// EditToggleLineCommentsExtended()
//
void EditToggleLineCommentsExtended(HWND hwnd, LPCWSTR pwszComment, bool bInsertAtStart)
void EditToggleLineCommentsExtended(LPCWSTR pwszComment, bool bInsertAtStart)
{
UNREFERENCED_PARAMETER(hwnd);
_SAVE_TARGET_RANGE_;
DocPos const iSelStart = Sci_GetSelectionStartEx();
@ -3670,19 +3664,6 @@ void EditToggleLineCommentsExtended(HWND hwnd, LPCWSTR pwszComment, bool bInsert
}
//=============================================================================
//
// EditToggleLineComments()
//
void EditToggleLineComments(HWND hwnd, LPCWSTR pwszComment, bool bInsertAtStart)
{
if (Settings.EditLineCommentBlock) {
EditToggleLineCommentsExtended(hwnd, pwszComment, bInsertAtStart);
} else {
EditToggleLineCommentsSimple(hwnd, pwszComment, bInsertAtStart);
}
}
//=============================================================================
//
// _AppendSpaces()

4
src/Edit.h
View File

@ -69,7 +69,9 @@ void EditModifyLines(LPCWSTR pwszPrefix,LPCWSTR pwszAppend);
void EditIndentBlock(HWND hwnd,int cmd, bool bFormatIndentation, bool bForceAll);
void EditAlignText(int nMode);
void EditEncloseSelection(LPCWSTR pwszOpen,LPCWSTR pwszClose);
void EditToggleLineComments(HWND hwnd, LPCWSTR pwszComment, bool bInsertAtStart);
//void EditToggleLineComments(HWND hwnd, LPCWSTR pwszComment, bool bInsertAtStart);
void EditToggleLineCommentsSimple(LPCWSTR pwszComment, bool bInsertAtStart);
void EditToggleLineCommentsExtended(LPCWSTR pwszComment, bool bInsertAtStart);
void EditPadWithSpaces(HWND hwnd, bool bSkipEmpty, bool bNoUndoGroup);
void EditStripFirstCharacter(HWND hwnd);
void EditStripLastCharacter(HWND hwnd, bool bIgnoreSelection, bool bTrailingBlanksOnly);

17
src/Notepad3.c
View File

@ -3844,7 +3844,6 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
CheckCmd(hmenu, IDM_VIEW_AUTOCLEXKEYWORDS, Settings.AutoCLexerKeyWords && !ro);
CheckCmd(hmenu, IDM_VIEW_ACCELWORDNAV, Settings.AccelWordNavigation);
CheckCmd(hmenu, IDM_VIEW_EDIT_LINECOMMENT, Settings.EditLineCommentBlock);
CheckCmd(hmenu, IDM_VIEW_MARKOCCUR_ONOFF, IsMarkOccurrencesEnabled());
CheckCmd(hmenu, IDM_VIEW_MARKOCCUR_BOOKMARKS, Settings.MarkOccurrencesBookmark);
@ -4970,7 +4969,17 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
WCHAR comment[8] = { L'\0' };
bool const bAtStart = _GetLineCommentStrg(comment, COUNTOF(comment));
if (StrIsNotEmpty(comment)) {
EditToggleLineComments(Globals.hwndEdit, comment, bAtStart);
EditToggleLineCommentsSimple(comment, bAtStart);
}
}
break;
case IDM_EDIT_LINECOMMENT_BLOCKEDIT: {
WCHAR comment[8] = { L'\0' };
bool const bAtStart = _GetLineCommentStrg(comment, COUNTOF(comment));
if (StrIsNotEmpty(comment)) {
EditToggleLineCommentsExtended(comment, bAtStart);
}
}
break;
@ -5414,10 +5423,6 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
MarkAllOccurrences(Settings2.UpdateDelayMarkAllOccurrences, true);
break;
case IDM_VIEW_EDIT_LINECOMMENT:
Settings.EditLineCommentBlock = !Settings.EditLineCommentBlock;
break;
case IDM_VIEW_MARKOCCUR_ONOFF:
Settings.MarkOccurrences = !Settings.MarkOccurrences;
if (!Settings.MarkOccurrences && FocusedView.HideNonMatchedLines) {

1
src/Notepad3.rc
View File

@ -284,6 +284,7 @@ BEGIN
"Q", IDM_EDIT_LINECOMMENT, VIRTKEY, CONTROL, NOINVERT
"Q", IDM_EDIT_ENCLOSESELECTION, VIRTKEY, ALT, NOINVERT /// NO Menu
"Q", IDM_EDIT_STREAMCOMMENT, VIRTKEY, SHIFT, CONTROL, NOINVERT
"Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT, VIRTKEY, CONTROL, ALT, NOINVERT
"R", IDM_FILE_RUN, VIRTKEY, CONTROL, NOINVERT
"R", IDM_EDIT_REMOVEEMPTYLINES, VIRTKEY, ALT, NOINVERT /// NO Menu
"R", IDM_EDIT_UNESCAPECCHARS, VIRTKEY, CONTROL, ALT, NOINVERT

1
src/TypeDefs.h
View File

@ -446,7 +446,6 @@ typedef struct _settings_t
bool AutoCompleteWords;
bool AutoCLexerKeyWords;
bool AccelWordNavigation;
bool EditLineCommentBlock;
bool ShowIndentGuides;
bool TabsAsSpaces;
bool TabIndents;

2
src/resource.h
View File

@ -21,8 +21,8 @@
// for Base-Lng in MUI env
#define MUI_BASE_LNG_EN_US 1
#else
#define MUI_BASE_LNG_EN_US 1
// 2. Uncomment one of the following lines according to the desired Language
#define MUI_BASE_LNG_EN_US 1
//#define MUI_BASE_LNG_AF_ZA 1
//#define MUI_BASE_LNG_BE_BY 1
//#define MUI_BASE_LNG_DE_DE 1