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: Bookmark margin context menu

Browse Source
This commit is contained in:
RaiKoHoff 2020-08-20 19:59:27 +02:00
parent bb05b5cbba
commit bb808bb7b8
36 changed files with 449 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Build/Notepad3.ini
View File

@ -57,6 +57,7 @@ SettingsVersion=4
;ExitOnESCSkipLevel=2
;ZoomTooltipTimeout=3200
;LargeIconScalePrecent=150
;FocusViewMarkerMode=1 ; 0=OFF, 1=STD, 2=NO_MARGIN (line background)
[Statusbar Settings]
;VisibleSections=0 1 12 14 2 4 5 6 7 8 9 10 11
;SectionPrefixes=Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,

5
language/common_res.h
View File

@ -583,6 +583,9 @@
#define IDM_EDIT_REMOVEDUPLICATELINES 40376
#define IDM_EDIT_REMOVEEMPTYLINES 40377
#define IDM_EDIT_MERGEEMPTYLINES 40378
#define IDM_EDIT_CUT_MARKED 40379
#define IDM_EDIT_COPY_MARKED 40380
#define IDM_EDIT_DELETE_MARKED 40381
#define IDM_VIEW_SCHEME 40400
#define IDM_VIEW_USE2NDDEFAULT 40401
@ -600,7 +603,7 @@
#define IDM_VIEW_HILITCURLN_BACK 40413
#define IDM_VIEW_HILITCURLN_FRAME 40414
#define IDM_VIEW_LINENUMBERS 40415
#define IDM_VIEW_MARGIN 40416
#define IDM_VIEW_BOOKMARK_MARGIN 40416
#define IDM_VIEW_ZOOMIN 40417
#define IDM_VIEW_ZOOMOUT 40418
#define IDM_VIEW_RESETZOOM 40419

12
language/np3_af_za/menu_af_za.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Lyn &Nommers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Seleksie &Kantlyne\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Seleksie &Kantlyne\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Vou"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Web Sjabloon 1", CMD_WEBACTION1
MENUITEM "Web Sjabloon 2", CMD_WEBACTION2
MENUITEM "Maak File Explorer Oop", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Kode Vou", IDM_VIEW_FOLDING
MENUITEM "Lyn Nommer", IDM_VIEW_LINENUMBERS
MENUITEM "Seleksie Kantlyne", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Skaal Balk", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Kode Vou", IDM_VIEW_FOLDING
MENUITEM "Lyn Nommer", IDM_VIEW_LINENUMBERS
MENUITEM "Seleksie Kantlyne", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Maak Notepad3 Oop", IDM_TRAY_RESTORE
MENUITEM "Maak Notepad3 Toe", IDM_TRAY_EXIT

12
language/np3_be_by/menu_be_by.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Нумары радкоў\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Водступ для в&ылучэння\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Водступ для в&ылучэння\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Блокі коду"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Адкрыць вэб-дзеянне 1", CMD_WEBACTION1
MENUITEM "Адкрыць вэб-дзеянне 2", CMD_WEBACTION2
MENUITEM "Адкрыць Праваднік", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Згортванне блокаў коду", IDM_VIEW_FOLDING
MENUITEM "Нумары радкоў", IDM_VIEW_LINENUMBERS
MENUITEM "Водступ для вылучэння", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI-маштабаванне паліцы", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Згортванне блокаў коду", IDM_VIEW_FOLDING
MENUITEM "Нумары радкоў", IDM_VIEW_LINENUMBERS
MENUITEM "Водступ для вылучэння", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Адкрыць Notepad3", IDM_TRAY_RESTORE
MENUITEM "Закрыць Notepad3", IDM_TRAY_EXIT

16
language/np3_de_de/menu_de_de.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Zeilen &Nummern\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Selektionsrand\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "&Lesezeichen Rand\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "Code &Faltung"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Öffne Web-Aktion 1", CMD_WEBACTION1
MENUITEM "Öffne Web Aktion 2", CMD_WEBACTION2
MENUITEM "Öffne Datei-Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Code Faltung", IDM_VIEW_FOLDING
MENUITEM "Zeilen Nummern", IDM_VIEW_LINENUMBERS
MENUITEM "Selektionsrand", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,16 @@ BEGIN
MENUITEM "DPI Skalierung der Werkzeugleiste", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Ausschneiden aller markierter Zeilen", IDM_EDIT_CUT_MARKED
MENUITEM "Kopieren aller markierter Zeilens", IDM_EDIT_COPY_MARKED
MENUITEM "Löschen aller markierter Zeilen", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Code Faltung", IDM_VIEW_FOLDING
MENUITEM "Zeilen Nummern", IDM_VIEW_LINENUMBERS
MENUITEM "Lesezeichen Rand", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Öffne Notepad3", IDM_TRAY_RESTORE
MENUITEM "Verlasse Notepad3", IDM_TRAY_EXIT

12
language/np3_en_gb/menu_en_gb.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Open Web Action 1", CMD_WEBACTION1
MENUITEM "Open Web Action 2", CMD_WEBACTION2
MENUITEM "Open File Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT

16
language/np3_en_us/menu_en_us.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Bookmark &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Open Web Action 1", CMD_WEBACTION1
MENUITEM "Open Web Action 2", CMD_WEBACTION2
MENUITEM "Open File Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,16 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Cut All Marked Lines", IDM_EDIT_CUT_MARKED
MENUITEM "Copy All Marked Lines", IDM_EDIT_COPY_MARKED
MENUITEM "Delete All Marked Lines", IDM_EDIT_DELETE_MARKED
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT

12
language/np3_es_es/menu_es_es.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Plegable"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Abrir Web Action 1", CMD_WEBACTION1
MENUITEM "Abrir Web Action 2", CMD_WEBACTION2
MENUITEM "Abrir Explorador de archivos", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Código plegable", IDM_VIEW_FOLDING
MENUITEM "Números de línea", IDM_VIEW_LINENUMBERS
MENUITEM "Selección del margen", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI escala la barra de herramientas", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Código plegable", IDM_VIEW_FOLDING
MENUITEM "Números de línea", IDM_VIEW_LINENUMBERS
MENUITEM "Selección del margen", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT

12
language/np3_es_mx/menu_es_mx.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Plegable"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Abrir Web Action 1", CMD_WEBACTION1
MENUITEM "Abrir Web Action 2", CMD_WEBACTION2
MENUITEM "Abrir Explorador de archivos", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Código plegable", IDM_VIEW_FOLDING
MENUITEM "Números de línea", IDM_VIEW_LINENUMBERS
MENUITEM "Selección del margen", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI escala la barra de herramientas", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Código plegable", IDM_VIEW_FOLDING
MENUITEM "Números de línea", IDM_VIEW_LINENUMBERS
MENUITEM "Selección del margen", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Cerrar Notepad3", IDM_TRAY_EXIT

12
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Numéros de Ligne\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Marge de Sélection\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "&Marge de Sélection\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Pliage"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Ouvrir Action Web &1", CMD_WEBACTION1
MENUITEM "Ouvrir Action Web &2", CMD_WEBACTION2
MENUITEM "Ouvrir &Explorateur de fichiers", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "&Pliage de code", IDM_VIEW_FOLDING
MENUITEM "&Numéros de ligne", IDM_VIEW_LINENUMBERS
MENUITEM "&Marge de Sélection", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "Échelle de Barre d'Outils en &DPI", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "&Pliage de code", IDM_VIEW_FOLDING
MENUITEM "&Numéros de ligne", IDM_VIEW_LINENUMBERS
MENUITEM "&Marge de Sélection", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Ouvrir Notepad3", IDM_TRAY_RESTORE
MENUITEM "Quitter Notepad3", IDM_TRAY_EXIT

12
language/np3_hi_in/menu_hi_in.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Open Web Action 1", CMD_WEBACTION1
MENUITEM "Open Web Action 2", CMD_WEBACTION2
MENUITEM "Open File Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT

12
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Sorok s&záma\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Kijelölési mar&gó\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Kijelölési mar&gó\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Behajtások"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Webes művelet 1", CMD_WEBACTION1
MENUITEM "Webes művelet 2", CMD_WEBACTION2
MENUITEM "Fájlböngésző megnyitása", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Kódblokk behajtások", IDM_VIEW_FOLDING
MENUITEM "Sorok száma", IDM_VIEW_LINENUMBERS
MENUITEM "Kijelölési margó", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI skálázás eszköztár", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Kódblokk behajtások", IDM_VIEW_FOLDING
MENUITEM "Sorok száma", IDM_VIEW_LINENUMBERS
MENUITEM "Kijelölési margó", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Notepad3 megnyitása", IDM_TRAY_RESTORE
MENUITEM "Kilépés a Notepad3-ból", IDM_TRAY_EXIT

12
language/np3_id_id/menu_id_id.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Open Web Action 1", CMD_WEBACTION1
MENUITEM "Open Web Action 2", CMD_WEBACTION2
MENUITEM "Open File Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT

32
language/np3_it_it/menu_it_it.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Numeri di riga\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margine di selezione\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "&Margine di selezione\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,26 +519,28 @@ BEGIN
MENUITEM "Apri Web Action 1", CMD_WEBACTION1
MENUITEM "Apri Web Action 2", CMD_WEBACTION2
MENUITEM "Apri Esplora File", IDM_FILE_EXPLORE_DIR
END
POPUP "+"
BEGIN
MENUITEM "Mostra barra dei Menu", IDM_VIEW_MENUBAR
MENUITEM "Mostra Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "Mostra Barra di Stato", IDM_VIEW_STATUSBAR
MENUITEM SEPARATOR
MENUITEM "Carica Tema Toolbar...", IDM_VIEW_LOADTHEMETB
MENUITEM "Personalizza Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "Cambia Toolbars", IDM_VIEW_TOGGLETB
MENUITEM "Scala DPI Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Code Folding", IDM_VIEW_FOLDING
MENUITEM "Numeri di riga", IDM_VIEW_LINENUMBERS
MENUITEM "Margine di selezione", IDM_VIEW_MARGIN
MENUITEM "Margine di selezione", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Mostra barra dei Menu", IDM_VIEW_MENUBAR
MENUITEM "Mostra Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "Mostra Barra di Stato", IDM_VIEW_STATUSBAR
MENUITEM SEPARATOR
MENUITEM "Carica Tema Toolbar...", IDM_VIEW_LOADTHEMETB
MENUITEM "Personalizza Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "Cambia Toolbars", IDM_VIEW_TOGGLETB
MENUITEM "Scala DPI Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Apri Notepad3", IDM_TRAY_RESTORE
MENUITEM "Esci da Notepad3", IDM_TRAY_EXIT
MENUITEM "Apri Notepad3", IDM_TRAY_RESTORE
MENUITEM "Esci da Notepad3", IDM_TRAY_EXIT
END
END

16
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "行番号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "行番号の余白(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "行番号の余白(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "折りたたみ(&F)"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "ウェブ1で開く", CMD_WEBACTION1
MENUITEM "ウェブ2で開く", CMD_WEBACTION2
MENUITEM "エクスプローラーを開く", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "コード折りたたみを表示", IDM_VIEW_FOLDING
MENUITEM "行番号", IDM_VIEW_LINENUMBERS
MENUITEM "行番号の余白", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -537,8 +533,14 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "Notepad3 を開く(&O)", IDM_TRAY_RESTORE
MENUITEM "終了(&X)", IDM_TRAY_EXIT
MENUITEM "コード折りたたみを表示", IDM_VIEW_FOLDING
MENUITEM "行番号", IDM_VIEW_LINENUMBERS
MENUITEM "行番号の余白", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Notepad3 を開く(&O)", IDM_TRAY_RESTORE
MENUITEM "終了(&X)", IDM_TRAY_EXIT
END
END

54
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "줄 번호(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "선택 영역 여백(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "선택 영역 여백(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "접기"
BEGIN
@ -502,43 +502,45 @@ IDR_MUI_POPUPMENU MENU
BEGIN
POPUP "+"
BEGIN
MENUITEM "하이퍼 링크 열기", CMD_OPEN_HYPERLINK
MENUITEM "하이퍼 링크 열기", CMD_OPEN_HYPERLINK
MENUITEM SEPARATOR
MENUITEM "실행 취소", IDM_EDIT_UNDO
MENUITEM "다시 실행", IDM_EDIT_REDO
MENUITEM "실행 취소", IDM_EDIT_UNDO
MENUITEM "다시 실행", IDM_EDIT_REDO
MENUITEM SEPARATOR
MENUITEM "잘라내기", IDM_EDIT_CUT
MENUITEM "복사", IDM_EDIT_COPY
MENUITEM "붙여 넣기", IDM_EDIT_PASTE
MENUITEM "삭제", IDM_EDIT_CLEAR
MENUITEM "잘라내기", IDM_EDIT_CUT
MENUITEM "복사", IDM_EDIT_COPY
MENUITEM "붙여 넣기", IDM_EDIT_PASTE
MENUITEM "삭제", IDM_EDIT_CLEAR
MENUITEM SEPARATOR
MENUITEM "모두 선택", IDM_EDIT_SELECTALL
MENUITEM "모두 선택", IDM_EDIT_SELECTALL
MENUITEM SEPARATOR
MENUITEM "현재 접기 전환", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM "현재 접기 전환", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
MENUITEM "웹 작업 열기 &", CMD_WEBACTION1
MENUITEM "웹 작업 열기 &", CMD_WEBACTION2
MENUITEM "탐색기 열기", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "코드 접기", IDM_VIEW_FOLDING
MENUITEM "줄 번호", IDM_VIEW_LINENUMBERS
MENUITEM "선택 영역 여백", IDM_VIEW_MARGIN
MENUITEM "웹 작업 열기 &", CMD_WEBACTION1
MENUITEM "웹 작업 열기 &", CMD_WEBACTION2
MENUITEM "탐색기 열기", IDM_FILE_EXPLORE_DIR
END
POPUP "+"
BEGIN
MENUITEM "메뉴바 보이기", IDM_VIEW_MENUBAR
MENUITEM "도구 모음 보이기", IDM_VIEW_TOOLBAR
MENUITEM "상태 표시 줄 보이기", IDM_VIEW_STATUSBAR
MENUITEM "메뉴바 보이기", IDM_VIEW_MENUBAR
MENUITEM "도구 모음 보이기", IDM_VIEW_TOOLBAR
MENUITEM "상태 표시 줄 보이기", IDM_VIEW_STATUSBAR
MENUITEM SEPARATOR
MENUITEM "도구 모음 테마 변경...", IDM_VIEW_LOADTHEMETB
MENUITEM "도구 모음 사용자 지정...", IDM_VIEW_CUSTOMIZETB
MENUITEM "도구 모음 전환", IDM_VIEW_TOGGLETB
MENUITEM "&DPI 비율 툴바", IDM_VIEW_DPISCALETB
MENUITEM "도구 모음 테마 변경...", IDM_VIEW_LOADTHEMETB
MENUITEM "도구 모음 사용자 지정...", IDM_VIEW_CUSTOMIZETB
MENUITEM "도구 모음 전환", IDM_VIEW_TOGGLETB
MENUITEM "&DPI 비율 툴바", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Notepad3 열기", IDM_TRAY_RESTORE
MENUITEM "Notepad3 종료", IDM_TRAY_EXIT
MENUITEM "코드 접기", IDM_VIEW_FOLDING
MENUITEM "줄 번호", IDM_VIEW_LINENUMBERS
MENUITEM "선택 영역 여백", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Notepad3 열기", IDM_TRAY_RESTORE
MENUITEM "Notepad3 종료", IDM_TRAY_EXIT
END
END

12
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Lijn &nummers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selectie &marge\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selectie &marge\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Vouwen"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Openen Web Action 1", CMD_WEBACTION1
MENUITEM "Openen Web Action 2", CMD_WEBACTION2
MENUITEM "Open bestand Verkenne", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Vouwcode", IDM_VIEW_FOLDING
MENUITEM "Lijn nummers", IDM_VIEW_LINENUMBERS
MENUITEM "Selectie marge", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI schaal de werkbalk", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Vouwcode", IDM_VIEW_FOLDING
MENUITEM "Lijn nummers", IDM_VIEW_LINENUMBERS
MENUITEM "Selectie marge", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Openen Notepad3", IDM_TRAY_RESTORE
MENUITEM "Afsluiten Notepad3", IDM_TRAY_EXIT

12
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Numery wierszy\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Margines\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Margines\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Składanie"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Otwórz Web Action 1", CMD_WEBACTION1
MENUITEM "Otwórz Web Action 2", CMD_WEBACTION2
MENUITEM "Otwórz Eksplorator pliku", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Składanie kodu", IDM_VIEW_FOLDING
MENUITEM "Numery wierszy", IDM_VIEW_LINENUMBERS
MENUITEM "Margines", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "Pasek narzędzi w skali DPI", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Składanie kodu", IDM_VIEW_FOLDING
MENUITEM "Numery wierszy", IDM_VIEW_LINENUMBERS
MENUITEM "Margines", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Otwórz Notepad3", IDM_TRAY_RESTORE
MENUITEM "Zamknij Notepad3", IDM_TRAY_EXIT

12
language/np3_pt_br/menu_pt_br.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números das Linhas\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margem de Seleção\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "&Margem de Seleção\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Abrir Ação Web 1", CMD_WEBACTION1
MENUITEM "Abrir Ação Web 2", CMD_WEBACTION2
MENUITEM "Abri Gerenciador de Arquivos", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Agrupador de Código", IDM_VIEW_FOLDING
MENUITEM "Números das Linhas", IDM_VIEW_LINENUMBERS
MENUITEM "Margem de Seleção", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Agrupador de Código", IDM_VIEW_FOLDING
MENUITEM "Números das Linhas", IDM_VIEW_LINENUMBERS
MENUITEM "Margem de Seleção", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir o Notepad3", IDM_TRAY_RESTORE
MENUITEM "Sair do Notepad3", IDM_TRAY_EXIT

12
language/np3_pt_pt/menu_pt_pt.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Números de linha\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selecção da &margem\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selecção da &margem\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Dobragem"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Abrir acção Web 1", CMD_WEBACTION1
MENUITEM "Abrir acção Web 2", CMD_WEBACTION2
MENUITEM "Abrir Explorador de ficheiros", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Dobragem de código", IDM_VIEW_FOLDING
MENUITEM "Números de linha", IDM_VIEW_LINENUMBERS
MENUITEM "Selecção da margem", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "Escala DPI da barra de ferramentas", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Dobragem de código", IDM_VIEW_FOLDING
MENUITEM "Números de linha", IDM_VIEW_LINENUMBERS
MENUITEM "Selecção da margem", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Abrir o Notepad3", IDM_TRAY_RESTORE
MENUITEM "Sair do Notepad3", IDM_TRAY_EXIT

12
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "&Номера строк\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Отступ в&ыделения\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Отступ в&ыделения\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "Блоки &кода"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Открыть веб-действие 1", CMD_WEBACTION1
MENUITEM "Открыть веб-действие 2", CMD_WEBACTION2
MENUITEM "Открыть Проводник", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Сворачивание блоков кода", IDM_VIEW_FOLDING
MENUITEM "Номера строк", IDM_VIEW_LINENUMBERS
MENUITEM "Отступ выделения", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI-масштабирование панели", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Сворачивание блоков кода", IDM_VIEW_FOLDING
MENUITEM "Номера строк", IDM_VIEW_LINENUMBERS
MENUITEM "Отступ выделения", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Открыть Notepad3", IDM_TRAY_RESTORE
MENUITEM "Закрыть Notepad3", IDM_TRAY_EXIT

12
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Číslovanie r&iadkov\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Označiť okra&j\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Označiť okra&j\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Skladanie"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Webová šablóna 1", CMD_WEBACTION1
MENUITEM "Webová šablóna 2", CMD_WEBACTION2
MENUITEM "Otvoriť Prieskumníka", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Skladacia väzba", IDM_VIEW_FOLDING
MENUITEM "Číslovanie riadkov", IDM_VIEW_LINENUMBERS
MENUITEM "Označiť okraj", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "Mierka DPI panela nástrojov", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Skladacia väzba", IDM_VIEW_FOLDING
MENUITEM "Číslovanie riadkov", IDM_VIEW_LINENUMBERS
MENUITEM "Označiť okraj", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Otvoriť Notepad3", IDM_TRAY_RESTORE
MENUITEM "Ukončiť Notepad3", IDM_TRAY_EXIT

12
language/np3_sv_se/menu_sv_se.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Radnummer\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Markeringsmarginal\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Markeringsmarginal\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "Vikning"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Öppna webb 1", CMD_WEBACTION1
MENUITEM "Öppna webb 2", CMD_WEBACTION2
MENUITEM "Öppna filutforskaren", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Ihopvikning av kodsegment", IDM_VIEW_FOLDING
MENUITEM "Radnummer", IDM_VIEW_LINENUMBERS
MENUITEM "Markeringsmarginal", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "Skala verktygsfält enligt DPI", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Ihopvikning av kodsegment", IDM_VIEW_FOLDING
MENUITEM "Radnummer", IDM_VIEW_LINENUMBERS
MENUITEM "Markeringsmarginal", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Öppna Notepad3", IDM_TRAY_RESTORE
MENUITEM "Avsluta Notepad3", IDM_TRAY_EXIT

12
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Open Web Action 1", CMD_WEBACTION1
MENUITEM "Open Web Action 2", CMD_WEBACTION2
MENUITEM "Open File Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT

12
language/np3_vi_vn/menu_vi_vn.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "&Folding"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "Open Web Action 1", CMD_WEBACTION1
MENUITEM "Open Web Action 2", CMD_WEBACTION2
MENUITEM "Open File Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -536,6 +532,12 @@ BEGIN
MENUITEM "DPI Scale Toolbar", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "Folding", IDM_VIEW_FOLDING
MENUITEM "Line Numbers", IDM_VIEW_LINENUMBERS
MENUITEM "Selection Margin", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "Open Notepad3", IDM_TRAY_RESTORE
MENUITEM "Exit Notepad3", IDM_TRAY_EXIT

16
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "行号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "显示边界(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "显示边界(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "折叠(&F)"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "用超链接模板 1 打开", CMD_WEBACTION1
MENUITEM "用超链接模板 2 打开", CMD_WEBACTION2
MENUITEM "打开资源管理器", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "启用折叠", IDM_VIEW_FOLDING
MENUITEM "行号", IDM_VIEW_LINENUMBERS
MENUITEM "S显示边界", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -537,8 +533,14 @@ BEGIN
END
POPUP "+"
BEGIN
MENUITEM "打开 Notepad3", IDM_TRAY_RESTORE
MENUITEM "退出 Notepad3", IDM_TRAY_EXIT
MENUITEM "启用折叠", IDM_VIEW_FOLDING
MENUITEM "行号", IDM_VIEW_LINENUMBERS
MENUITEM "S显示边界", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "打开 Notepad3", IDM_TRAY_RESTORE
MENUITEM "退出 Notepad3", IDM_TRAY_EXIT
END
END

18
language/np3_zh_tw/menu_zh_tw.rc
View File

@ -355,7 +355,7 @@ BEGIN
END
MENUITEM SEPARATOR
MENUITEM "行號(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "顯示邊界(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM "顯示邊界(&M)\tCtrl+Shift+M", IDM_VIEW_BOOKMARK_MARGIN
MENUITEM SEPARATOR
POPUP "摺疊(&F)"
BEGIN
@ -519,10 +519,6 @@ BEGIN
MENUITEM "用超鏈接模板 1 打開", CMD_WEBACTION1
MENUITEM "用超鏈接模板 2 打開", CMD_WEBACTION2
MENUITEM "打開檔案總管", IDM_FILE_EXPLORE_DIR
MENUITEM SEPARATOR
MENUITEM "啟用摺疊", IDM_VIEW_FOLDING
MENUITEM "行號", IDM_VIEW_LINENUMBERS
MENUITEM "顯示邊界", IDM_VIEW_MARGIN
END
POPUP "+"
BEGIN
@ -530,15 +526,21 @@ BEGIN
MENUITEM "顯示工具欄", IDM_VIEW_TOOLBAR
MENUITEM "顯示狀態列", IDM_VIEW_STATUSBAR
MENUITEM SEPARATOR
MENUITEM "載入工具欄主題...", IDM_VIEW_LOADTHEMETB
MENUITEM "載入工具欄主題...", IDM_VIEW_LOADTHEMETB
MENUITEM "自訂工具欄...", IDM_VIEW_CUSTOMIZETB
MENUITEM "切換工具欄", IDM_VIEW_TOGGLETB
MENUITEM "DPI 自動調整", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN
MENUITEM "還原 Notepad3", IDM_TRAY_RESTORE
MENUITEM "離開 Notepad3", IDM_TRAY_EXIT
MENUITEM "啟用摺疊", IDM_VIEW_FOLDING
MENUITEM "行號", IDM_VIEW_LINENUMBERS
MENUITEM "顯示邊界", IDM_VIEW_BOOKMARK_MARGIN
END
POPUP "+"
BEGIN
MENUITEM "還原 Notepad3", IDM_TRAY_RESTORE
MENUITEM "離開 Notepad3", IDM_TRAY_EXIT
END
END

10
src/Config/Config.cpp
View File

@ -1299,6 +1299,9 @@ void LoadSettings()
Defaults2.LargeIconScalePrecent = 150;
Settings2.LargeIconScalePrecent = clampi(IniSectionGetInt(IniSecSettings2, L"LargeIconScalePrecent", Defaults2.LargeIconScalePrecent), 100, 1000);
Defaults2.FocusViewMarkerMode = FVMM_STD;
Settings2.FocusViewMarkerMode = clampi(IniSectionGetInt(IniSecSettings2, L"FocusViewMarkerMode", Defaults2.FocusViewMarkerMode), FVMM_OFF, FVMM_NO_MARGIN);
// --------------------------------------------------------------------------
// Settings: IniSecSettings
// --------------------------------------------------------------------------
@ -1398,7 +1401,8 @@ void LoadSettings()
GET_BOOL_VALUE_FROM_INISECTION(BackspaceUnindents, false);
GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistentIndents, false);
GET_BOOL_VALUE_FROM_INISECTION(AutoDetectIndentSettings, false);
GET_BOOL_VALUE_FROM_INISECTION(ShowSelectionMargin, true);
GET_BOOL_VALUE_FROM_INISECTION(ShowBookmarkMargin, IniSectionGetBool(IniSecSettings, L"ShowSelectionMargin", true));
GET_BOOL_VALUE_FROM_INISECTION(ShowLineNumbers, true);
GET_BOOL_VALUE_FROM_INISECTION(ShowCodeFolding, true); FocusedView.ShowCodeFolding = Settings.ShowCodeFolding;
@ -1836,7 +1840,9 @@ static bool _SaveSettings(bool bForceSaveSettings)
else {
IniSectionDelete(IniSecSettings, L"MultiEdgeLines", false);
}
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowSelectionMargin);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowBookmarkMargin);
IniSectionDelete(IniSecSettings, L"ShowSelectionMargin", false); // old
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowLineNumbers);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, ShowCodeFolding);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, MarkOccurrences);

116
src/Edit.c
View File

@ -698,13 +698,7 @@ bool EditSetClipboardText(HWND hwnd, const char* pszText, size_t cchText)
//
bool EditClearClipboard(HWND hwnd)
{
if (!IsClipboardFormatAvailable(CF_UNICODETEXT)) {
SciCall_CopyText(0, "");
return true;
}
if (!OpenClipboard(GetParent(hwnd))) {
return false;
}
if (!OpenClipboard(GetParent(hwnd))) { return false; }
EmptyClipboard();
CloseClipboard();
return true;
@ -768,25 +762,22 @@ bool EditSwapClipboard(HWND hwnd, bool bSkipUnicodeCheck)
//=============================================================================
//
// EditCopyAppend()
// EditCopySelectionAppend()
//
bool EditCopyAppend(HWND hwnd, bool bAppend)
bool EditCopyRangeAppend(HWND hwnd, const DocPos posBegin, const DocPos posEnd, bool bAppend)
{
bool res = false;
DocPos const iSelStart = SciCall_GetSelectionStart();
DocPos const iSelEnd = SciCall_GetSelectionEnd();
char* pszText = NULL;
const char* pszText = NULL;
DocPos length = 0;
if (iSelStart != iSelEnd) {
if (posBegin != posEnd) {
if (Sci_IsMultiOrRectangleSelection()) {
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_SELRECTORMULTI);
return res;
}
length = (iSelEnd - iSelStart);
pszText = SciCall_GetRangePointer(iSelStart, length);
length = (posEnd - posBegin);
pszText = SciCall_GetRangePointer(posBegin, length);
}
else {
length = SciCall_GetTextLength();
@ -3614,6 +3605,7 @@ static DocPos _AppendSpaces(HWND hwnd, DocLn iLineStart, DocLn iLineEnd, DocPos
DocPos spcCount = 0;
_IGNORE_NOTIFY_CHANGE_;
DocPos const saveTargetBeg = SciCall_GetTargetStart();
DocPos const saveTargetEnd = SciCall_GetTargetEnd();
@ -3638,6 +3630,7 @@ static DocPos _AppendSpaces(HWND hwnd, DocLn iLineStart, DocLn iLineEnd, DocPos
}
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
_OBSERVE_NOTIFY_CHANGE_;
FreeMem(pmszPadStr);
@ -3754,8 +3747,8 @@ void EditPadWithSpaces(HWND hwnd, bool bSkipEmpty, bool bNoUndoGroup)
}
}
__finally {
if (token >= 0) { EndUndoAction(token); }
}
if (token >= 0) { EndUndoAction(token); }
}
_OBSERVE_NOTIFY_CHANGE_;
}
@ -3832,6 +3825,7 @@ void EditStripFirstCharacter(HWND hwnd)
}
}
}
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
_END_UNDO_ACTION_;
@ -4034,6 +4028,7 @@ void EditCompressBlanks()
}
_END_UNDO_ACTION_;
}
else if (Sci_IsMultiSelection()) {
// @@@ not implemented
@ -4205,9 +4200,11 @@ void EditRemoveBlankLines(HWND hwnd, bool bMerge, bool bRemoveWhiteSpace)
iEndLine -= nBlanks;
}
}
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
_END_UNDO_ACTION_;
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
}
@ -4279,13 +4276,67 @@ void EditRemoveDuplicateLines(HWND hwnd, bool bRemoveEmptyLines)
}
} // empty
}
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
_END_UNDO_ACTION_;
}
//=============================================================================
//
// EditFocusMarkedLines()
//
void EditFocusMarkedLines(HWND hwnd, bool bCopy, bool bDelete)
{
if (!(bCopy || bDelete)) { return; } // nothing todo
DocLn const curLn = Sci_GetCurrentLineNumber();
int const bitmask = SciCall_MarkerGet(curLn) & bitmask32_n(MARKER_NP3_BOOKMARK + 1);
if (!bitmask) {
return;
}
if (bCopy) {
EditClearClipboard(hwnd);
}
_IGNORE_NOTIFY_CHANGE_;
SciCall_BeginUndoAction();
DocLn line = SciCall_MarkerNext(0, bitmask); // begin
while (line >= 0) {
if (bCopy) {
DocPos const lnBeg = SciCall_PositionFromLine(line);
//DocPos const lnEnd = lnBeg + SciCall_LineLength(line); // incl line-breaks
DocPos const lnEnd = SciCall_GetLineEndPosition(line); // w/o line-breaks
EditCopyRangeAppend(hwnd, lnBeg, lnEnd, true);
}
if (bDelete) {
SciCall_GotoLine(line);
SciCall_MarkerDelete(line, -1);
SciCall_LineDelete();
}
line = SciCall_MarkerNext(bDelete ? line : (line + 1), bitmask); // proceed
}
SciCall_EndUndoAction();
_OBSERVE_NOTIFY_CHANGE_;
if (bDelete) {
for (int m = MARKER_NP3_BOOKMARK - 1; m >= 0; --m) {
if (bitmask & (1 << m)) {
WordBookMarks[m].in_use = false;
}
}
}
SciCall_GotoLine(min_ln(curLn, Sci_GetLastDocLineNumber()));
}
//=============================================================================
//
// EditWrapToColumn()
@ -7718,19 +7769,20 @@ void EditHideNotMarkedLineRange(HWND hwnd, bool bHideLines)
else // ===== fold lines without marker =====
{
// get next free bookmark
int marker;
for (marker = 0; marker < MARKER_NP3_BOOKMARK; ++marker) {
if (!WordBookMarks[marker].in_use) {
int marker = 0;
if (Settings2.FocusViewMarkerMode) {
for (marker = 0; marker < MARKER_NP3_BOOKMARK; ++marker) {
if (!WordBookMarks[marker].in_use) {
WordBookMarks[marker].in_use = true;
break;
}
}
if (marker >= MARKER_NP3_BOOKMARK) {
marker = 0; // wrap around usage
SciCall_MarkerDeleteAll(marker);
WordBookMarks[marker].in_use = true;
break;
}
}
if (marker >= MARKER_NP3_BOOKMARK) {
marker = 0; // wrap around usage
SciCall_MarkerDeleteAll(marker);
WordBookMarks[marker].in_use = true;
}
// prepare hidden (folding) settings
FocusedView.CodeFoldingAvailable = true;
FocusedView.ShowCodeFolding = true;
@ -7754,7 +7806,9 @@ void EditHideNotMarkedLineRange(HWND hwnd, bool bHideLines)
{
level = baseLevel;
SciCall_SetFoldLevel(iLine, SC_FOLDLEVELHEADERFLAG | level++);
SciCall_MarkerAdd(iLine, marker);
if (Settings2.FocusViewMarkerMode) {
SciCall_MarkerAdd(iLine, marker);
}
}
else // hide line
{

3
src/Edit.h
View File

@ -34,7 +34,7 @@ void EditGetClipboardW(LPWSTR pwchBuffer, size_t wchLength);
bool EditSetClipboardText(HWND hwnd, const char* pszText, size_t cchText);
bool EditClearClipboard(HWND hwnd);
bool EditSwapClipboard(HWND hwnd,bool);
bool EditCopyAppend(HWND hwnd,bool);
bool EditCopyRangeAppend(HWND hwnd, const DocPos posBegin, const DocPos posEnd, bool bAppend);
void EditDetectEOLMode(LPCSTR lpData, size_t cbData, EditFileIOStatus* const status);
void EditIndentationStatistic(HWND hwnd, EditFileIOStatus* const status);
bool EditLoadFile(HWND hwnd, LPWSTR pszFile, bool bSkipUTFDetection, bool bSkipANSICPDetection,
@ -75,6 +75,7 @@ void EditStripLastCharacter(HWND hwnd, bool bIgnoreSelection, bool bTrailingBla
void EditCompressBlanks();
void EditRemoveBlankLines(HWND hwnd, bool bMerge, bool bRemoveWhiteSpace);
void EditRemoveDuplicateLines(HWND hwnd, bool bRemoveEmptyLines);
void EditFocusMarkedLines(HWND hwnd, bool bCopy, bool bDelete);
void EditWrapToColumn(DocPosU nColumn);
//void EditWrapToColumnForce(HWND hwnd, DocPosU nColumn);

132
src/Notepad3.c
View File

@ -45,25 +45,25 @@
#include "SciLexer.h"
#include "SciXLexer.h"
/******************************************************************************
*
* Local and global Variables for Notepad3.c
*
*/
#define RELAUNCH_ELEVATED_BUF_ARG L"tmpfbuf="
// ============================================================================
//
// Local and global Variables for Notepad3.c
//
// ============================================================================
WORDBOOKMARK_T WordBookMarks[MARKER_NP3_BOOKMARK] = {
/*0*/ {false, SC_MARK_BOOKMARK, L"back:#FF0000"},
/*1*/ {false, SC_MARK_BOOKMARK, L"back:#0000FF"},
/*2*/ {false, SC_MARK_BOOKMARK, L"back:#00FF00"},
/*3*/ {false, SC_MARK_BOOKMARK, L"back:#FFFF00"},
/*4*/ {false, SC_MARK_BOOKMARK, L"back:#00E8E8"},
/*5*/ {false, SC_MARK_BOOKMARK, L"back:#FF00FF"},
/*6*/ {false, SC_MARK_BOOKMARK, L"back:#FF8F20"},
/*7*/ {false, SC_MARK_BOOKMARK, L"back:#950095"}};
/*0*/ {false, L"back:#FF0000"},
/*1*/ {false, L"back:#0000FF"},
/*2*/ {false, L"back:#00FF00"},
/*3*/ {false, L"back:#FFFF00"},
/*4*/ {false, L"back:#00E8E8"},
/*5*/ {false, L"back:#FF00FF"},
/*6*/ {false, L"back:#FF8F20"},
/*7*/ {false, L"back:#950095"}};
#define RELAUNCH_ELEVATED_BUF_ARG L"tmpfbuf="
CONSTANTS_T const Constants = {
2 // StdDefaultLexerID
, L"minipath.exe" // FileBrowserMiniPath
@ -1650,7 +1650,8 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
return MsgCopyData(hwnd, wParam, lParam);
case WM_CONTEXTMENU:
return MsgContextMenu(hwnd, umsg, wParam, lParam);
MsgContextMenu(hwnd, umsg, wParam, lParam);
break;
case WM_ENTERMENULOOP:
return MsgEnterMenuLoop(hwnd, wParam);
@ -2993,17 +2994,18 @@ LRESULT MsgCopyData(HWND hwnd, WPARAM wParam, LPARAM lParam)
//
LRESULT MsgContextMenu(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
{
bool const bMargin = (SCN_MARGINRIGHTCLICK == umsg);
int const nID = bMargin ? IDC_MARGIN : GetDlgCtrlID((HWND)wParam);
if ((nID != IDC_MARGIN) && (nID != IDC_EDIT) && (nID != IDC_STATUSBAR) && (nID != IDC_REBAR) && (nID != IDC_TOOLBAR)) {
return DefWindowProc(hwnd, umsg, wParam, lParam);
}
// no context menu after undo/redo history scrolling
if (s_bUndoRedoScroll) {
s_bUndoRedoScroll = false;
return FALSE;
return 0;
}
int nID = GetDlgCtrlID((HWND)wParam);
if ((nID != IDC_EDIT) && (nID != IDC_STATUSBAR) &&
(nID != IDC_REBAR) && (nID != IDC_TOOLBAR))
return DefWindowProc(hwnd, umsg, wParam, lParam);
HMENU hMenuCtx = LoadMenu(Globals.hLngResContainer, MAKEINTRESOURCE(IDR_MUI_POPUPMENU));
//SetMenuDefaultItem(GetSubMenu(hmenu,1),0,false);
@ -3035,8 +3037,41 @@ LRESULT MsgContextMenu(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDC_TOOLBAR:
case IDC_STATUSBAR:
case IDC_REBAR:
if (pt.x == -1 && pt.y == -1) { GetCursorPos(&pt); }
imenu = 1;
{
if ((pt.x == -1) && (pt.y == -1)) {
GetCursorPos(&pt);
}
imenu = 1;
}
break;
case IDC_MARGIN:
{
if ((pt.x == -1) && (pt.y == -1)) {
GetCursorPos(&pt);
}
DocLn const curLn = Sci_GetCurrentLineNumber();
int const bitmask = SciCall_MarkerGet(curLn) & bitmask32_n(MARKER_NP3_BOOKMARK + 1);
EnableCmd(hMenuCtx, IDM_EDIT_CUT_MARKED, bitmask);
EnableCmd(hMenuCtx, IDM_EDIT_COPY_MARKED, bitmask);
EnableCmd(hMenuCtx, IDM_EDIT_DELETE_MARKED, bitmask);
//DocLn const curLn = Sci_GetCurrentLineNumber();
const SCNotification* const scn = (SCNotification*)wParam;
switch (scn->margin) {
case MARGIN_SCI_FOLDING:
//[[fallthrough]];
case MARGIN_SCI_LINENUM:
//[[fallthrough]];
case MARGIN_SCI_BOOKMRK:
imenu = 2;
break;
default:
imenu = 0;
break;
}
}
break;
}
@ -3045,7 +3080,7 @@ LRESULT MsgContextMenu(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
DestroyMenu(hMenuCtx);
return FALSE;
return (bMargin ? !0 : 0);
}
//=============================================================================
@ -3114,7 +3149,7 @@ LRESULT MsgTrayMessage(HWND hwnd, WPARAM wParam, LPARAM lParam)
case WM_RBUTTONUP:
{
HMENU hTrayMenu = LoadMenu(Globals.hLngResContainer, MAKEINTRESOURCE(IDR_MUI_POPUPMENU));
HMENU hMenuPopup = GetSubMenu(hTrayMenu, 2);
HMENU hMenuPopup = GetSubMenu(hTrayMenu, 3);
POINT pt;
int iCmd;
@ -3448,7 +3483,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
CheckCmd(hmenu, IDM_VIEW_SHOWINDENTGUIDES, Settings.ShowIndentGuides);
CheckCmd(hmenu, IDM_VIEW_AUTOINDENTTEXT, Settings.AutoIndent);
CheckCmd(hmenu, IDM_VIEW_LINENUMBERS, Settings.ShowLineNumbers);
CheckCmd(hmenu, IDM_VIEW_MARGIN, Settings.ShowSelectionMargin);
CheckCmd(hmenu, IDM_VIEW_BOOKMARK_MARGIN, Settings.ShowBookmarkMargin);
CheckCmd(hmenu, IDM_VIEW_CHASING_DOCTAIL, FileWatching.MonitoringLog);
EnableCmd(hmenu, IDM_EDIT_COMPLETEWORD, !te && !ro);
@ -4201,7 +4236,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if (s_flagPasteBoard) {
s_bLastCopyFromMe = true;
}
EditCopyAppend(Globals.hwndEdit, true);
DocPos const posSelStart = SciCall_GetSelectionStart();
DocPos const posSelEnd = SciCall_GetSelectionEnd();
EditCopyRangeAppend(Globals.hwndEdit, posSelStart, posSelEnd, true);
}
break;
@ -4431,6 +4468,21 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case IDM_EDIT_CUT_MARKED:
EditFocusMarkedLines(Globals.hwndEdit, true, true);
break;
case IDM_EDIT_COPY_MARKED:
EditFocusMarkedLines(Globals.hwndEdit, true, false);
break;
case IDM_EDIT_DELETE_MARKED:
EditFocusMarkedLines(Globals.hwndEdit, false, true);
break;
case IDM_EDIT_MODIFYLINES:
if (EditModifyLinesDlg(hwnd,s_wchPrefixLines,s_wchAppendLines)) {
EditModifyLines(s_wchPrefixLines,s_wchAppendLines);
@ -5197,8 +5249,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case IDM_VIEW_MARGIN:
Settings.ShowSelectionMargin = !Settings.ShowSelectionMargin;
case IDM_VIEW_BOOKMARK_MARGIN:
Settings.ShowBookmarkMargin = !Settings.ShowBookmarkMargin;
UpdateMarginWidth();
break;
@ -7489,13 +7541,21 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
EditBookmarkToggle(SciCall_LineFromPosition(scn->position), scn->modifiers);
break;
case MARGIN_SCI_LINENUM:
//~SciCall_GotoLine(SciCall_LineFromPosition(scn->position));
break;
default:
break;
}
break;
//case SCN_MARGINRIGHTCLICK:
// break;
case SCN_MARGINRIGHTCLICK:
{
POINT pt = {-1,-1};
MsgContextMenu(hwnd, SCN_MARGINRIGHTCLICK, (WPARAM)scn, MAKELPARAM(pt.x,pt.y));
}
break;
// ~~~ Not used in Windows ~~~
// see: CMD_ALTUP / CMD_ALTDOWN
@ -8306,14 +8366,14 @@ void UpdateToolbar()
static void _UpdateToolbarDelayed()
{
bool const bDocModified = GetDocModified();
SetWindowTitle(Globals.hwndMain, s_uidsAppTitle, s_bIsProcessElevated, IDS_MUI_UNTITLED, Globals.CurrentFile,
Settings.PathNameFormat, GetDocModified(),
IDS_MUI_READONLY, s_bFileReadOnly, s_wchTitleExcerpt);
Settings.PathNameFormat, bDocModified, IDS_MUI_READONLY, s_bFileReadOnly, s_wchTitleExcerpt);
if (!Settings.ShowToolbar) { return; }
EnableTool(Globals.hwndToolbar, IDT_FILE_ADDTOFAV, StrIsNotEmpty(Globals.CurrentFile));
EnableTool(Globals.hwndToolbar, IDT_FILE_SAVE, GetDocModified() /*&& !bReadOnly*/);
EnableTool(Globals.hwndToolbar, IDT_FILE_SAVE, bDocModified /*&& !bReadOnly*/);
EnableTool(Globals.hwndToolbar, IDT_FILE_RECENT, (MRU_Count(Globals.pFileMRU) > 0));
CheckTool(Globals.hwndToolbar, IDT_VIEW_WORDWRAP, Globals.fvCurFile.bWordWrap);
@ -9091,7 +9151,7 @@ void UpdateMarginWidth()
SciCall_SetMarginWidthN(MARGIN_SCI_LINENUM, 0);
}
Style_SetBookmark(Globals.hwndEdit, Settings.ShowSelectionMargin);
Style_SetBookmark(Globals.hwndEdit, Settings.ShowBookmarkMargin);
Style_SetFolding(Globals.hwndEdit, (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
}

1
src/Notepad3.h
View File

@ -94,6 +94,7 @@ typedef enum {
#define IDC_EDITFRAME (0xFB04)
#define IDC_FILENAME (0xFB05)
#define IDC_REUSELOCK (0xFB06)
#define IDC_MARGIN (0xFB07)

2
src/Notepad3.rc
View File

@ -218,7 +218,7 @@ BEGIN
"L", IDM_VIEW_LONGLINEMARKER, VIRTKEY, CONTROL, ALT, NOINVERT
"M", IDM_FILE_BROWSE, VIRTKEY, CONTROL, NOINVERT
"M", IDM_EDIT_MODIFYLINES, VIRTKEY, ALT, NOINVERT /// NO Menu
"M", IDM_VIEW_MARGIN, VIRTKEY, SHIFT, CONTROL, NOINVERT
"M", IDM_VIEW_BOOKMARK_MARGIN, VIRTKEY, SHIFT, CONTROL, NOINVERT
"N", IDM_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"N", IDM_FILE_NEWWINDOW, VIRTKEY, ALT, NOINVERT /// NO Menu
"N", IDM_FILE_NEWWINDOW2, VIRTKEY, SHIFT, ALT, NOINVERT

49
src/Styles.c
View File

@ -1333,7 +1333,7 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
Style_HighlightCurrentLine(hwnd, Settings.HighlightCurrentLine);
// bookmark line or marker
Style_SetBookmark(hwnd, Settings.ShowSelectionMargin);
Style_SetBookmark(hwnd, Settings.ShowBookmarkMargin);
// Hyperlink (URL) indicators
Style_SetUrlHotSpot(hwnd);
@ -1774,18 +1774,18 @@ static int _GetMarkerMarginWidth(HWND hwnd)
//
// Style_SetFolding()
//
void Style_SetFolding(HWND hwnd, bool bShowCodeFolding)
void Style_SetFolding(HWND hwnd, bool bShowMargin)
{
SciCall_SetMarginWidthN(MARGIN_SCI_FOLDING, (bShowCodeFolding ? _GetMarkerMarginWidth(hwnd) : 0));
SciCall_SetMarginWidthN(MARGIN_SCI_FOLDING, (bShowMargin ? _GetMarkerMarginWidth(hwnd) : 0));
}
//=============================================================================
//
// Style_SetBookmark()
//
void Style_SetBookmark(HWND hwnd, bool bShowSelMargin)
void Style_SetBookmark(HWND hwnd, bool bShowMargin)
{
SciCall_SetMarginWidthN(MARGIN_SCI_BOOKMRK, (bShowSelMargin ? _GetMarkerMarginWidth(hwnd) + 4 : 0));
SciCall_SetMarginWidthN(MARGIN_SCI_BOOKMRK, (bShowMargin ? _GetMarkerMarginWidth(hwnd) + 4 : 0));
}
@ -1797,7 +1797,7 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
{
if (iStyle == STYLE_LINENUMBER) {
Style_SetStyles(hwnd, iStyle, lpszStyle, false); // line numbers
//~SciCall_SetMarginSensitiveN(MARGIN_SCI_LINENUM, true);
SciCall_SetMarginSensitiveN(MARGIN_SCI_LINENUM, false); // allow selection drag
}
COLORREF clrFore = SciCall_StyleGetFore(STYLE_LINENUMBER);
@ -1805,10 +1805,9 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
COLORREF clrBack = SciCall_StyleGetBack(STYLE_LINENUMBER);
Style_StrGetColor(lpszStyle, BACKGROUND_LAYER, &clrBack);
//SciCall_SetMarginBackN(MARGIN_SCI_LINENUM, clrBack);
//~SciCall_SetMarginBackN(MARGIN_SCI_LINENUM, clrBack);
// CallTips
// CallTips
SciCall_CallTipSetFore(clrFore);
SciCall_CallTipSetBack(clrBack);
@ -1832,22 +1831,24 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
SciCall_MarkerDefine(MARKER_NP3_BOOKMARK, SC_MARK_VERTICALBOOKMARK); // SC_MARK_BOOKMARK/SC_MARK_SHORTARROW
SciCall_MarkerSetFore(MARKER_NP3_BOOKMARK, bmkFore);
SciCall_MarkerSetBack(MARKER_NP3_BOOKMARK, bmkBack);
SciCall_MarkerSetAlpha(MARKER_NP3_BOOKMARK, alpha);
SciCall_SetMarginBackN(MARGIN_SCI_BOOKMRK, clrBack);
SciCall_SetMarginSensitiveN(MARGIN_SCI_BOOKMRK, true);
SciCall_SetMarginCursorN(MARGIN_SCI_BOOKMRK, SC_NP3_CURSORHAND);
SciCall_MarkerSetAlpha(MARKER_NP3_BOOKMARK, alpha); // no margin or SC_MARK_BACKGROUND or SC_MARK_UNDERLINE
// --- WordBookMarks ---
for (int m = MARKER_NP3_BOOKMARK - 1; m >= 0; --m)
{
COLORREF color;
SciCall_MarkerDefine(m, (Settings2.FocusViewMarkerMode == FVMM_NO_MARGIN) ? SC_MARK_BACKGROUND : SC_MARK_BOOKMARK);
Style_StrGetColor(WordBookMarks[m].color, BACKGROUND_LAYER, &color);
SciCall_MarkerDefine(m, WordBookMarks[m].sci_symbol);
SciCall_MarkerSetFore(m, color);
SciCall_MarkerSetBack(m, color);
SciCall_MarkerSetAlpha(m, alpha);
SciCall_MarkerSetAlpha(m, alpha); // no margin or SC_MARK_BACKGROUND or SC_MARK_UNDERLINE
}
SciCall_SetMarginBackN(MARGIN_SCI_BOOKMRK, clrBack);
SciCall_SetMarginSensitiveN(MARGIN_SCI_BOOKMRK, true);
SciCall_SetMarginCursorN(MARGIN_SCI_BOOKMRK, SC_NP3_CURSORHAND);
// --- Code folding ---
COLORREF fldHiLight = clrFore;
@ -1856,8 +1857,8 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
SciCall_SetMarginTypeN(MARGIN_SCI_FOLDING, SC_MARGIN_COLOUR);
SciCall_SetMarginMaskN(MARGIN_SCI_FOLDING, SC_MASK_FOLDERS);
SciCall_SetMarginSensitiveN(MARGIN_SCI_FOLDING, true);
SciCall_SetMarginBackN(MARGIN_SCI_FOLDING, clrBack);
SciCall_SetMarginSensitiveN(MARGIN_SCI_FOLDING, true);
int fldStyleMrk = SC_CASE_LOWER;
Style_StrGetCase(wchBookMarkStyleStrg, &fldStyleMrk);
@ -1882,7 +1883,7 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
SciCall_MarkerDefine(SC_MARKNUM_FOLDERMIDTAIL, SC_MARK_TCORNER);
}
static const int iMarkerIDs[7] =
static const int FoldMarkerID[] =
{
SC_MARKNUM_FOLDEROPEN,
SC_MARKNUM_FOLDER,
@ -1893,12 +1894,12 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
SC_MARKNUM_FOLDERMIDTAIL
};
for (int i = 0; i < COUNTOF(iMarkerIDs); ++i) {
SciCall_MarkerSetFore(iMarkerIDs[i], bmkBack); // (!)
SciCall_MarkerSetBack(iMarkerIDs[i], bmkFore); // (!)
SciCall_MarkerSetBackSelected(iMarkerIDs[i], fldHiLight);
for (int i = 0; i < COUNTOF(FoldMarkerID); ++i) {
SciCall_MarkerSetFore(FoldMarkerID[i], bmkBack); // (!)
SciCall_MarkerSetBack(FoldMarkerID[i], bmkFore); // (!)
SciCall_MarkerSetBackSelected(FoldMarkerID[i], fldHiLight);
}
SciCall_MarkerEnableHighlight(true);
SciCall_MarkerEnableHighlight(true); // highlight folding block
SciCall_SetFoldMarginColour(true, clrBack); // background
SciCall_SetFoldMarginHiColour(true, clrBack); // (!)
@ -1924,7 +1925,7 @@ void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
}
// set width
Style_SetBookmark(hwnd, Settings.ShowSelectionMargin);
Style_SetBookmark(hwnd, Settings.ShowBookmarkMargin);
Style_SetFolding(hwnd, (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
}
@ -2921,7 +2922,7 @@ bool Style_StrGetCase(LPCWSTR lpszStyle, int* i)
// Style_GetIndicatorType()
//
static WCHAR* IndicatorTypes[22] = {
static WCHAR* IndicatorTypes[] = {
L"indic_plain",
L"indic_squiggle",
L"indic_tt",

4
src/Styles.h
View File

@ -51,8 +51,8 @@ void Style_SetUrlHotSpot(HWND hwnd);
void Style_SetInvisible(HWND hwnd, bool);
void Style_SetReadonly(HWND hwnd, bool);
void Style_HighlightCurrentLine(HWND hwnd, int);
void Style_SetFolding(HWND hwnd, bool);
void Style_SetBookmark(HWND hwnd, bool);
void Style_SetFolding(HWND hwnd, bool bShowMargin);
void Style_SetBookmark(HWND hwnd, bool bShowMargin);
void Style_SetMargin(HWND hwnd, int iStyle, LPCWSTR lpszStyle);
bool Style_SetLexerFromFile(HWND hwnd,LPCWSTR lpszFile);
bool Style_MaybeBinaryFile(HWND hwnd, LPCWSTR lpszFile);

5
src/TypeDefs.h
View File

@ -94,6 +94,7 @@ inline RECT RectFromWinInfo(const WININFO* const pWinInfo) {
typedef enum { BACKGROUND_LAYER = 0, FOREGROUND_LAYER = 1 } COLOR_LAYER; // Style_GetColor()
typedef enum { OPEN_WITH_BROWSER = 1, OPEN_WITH_NOTEPAD3 = 2, COPY_HYPERLINK = 4, SELECT_HYPERLINK = 8 } HYPERLINK_OPS; // Hyperlink Operations
typedef enum { FWM_DONT_CARE = 0, FWM_MSGBOX = 1, FWM_AUTORELOAD = 2 } FILE_WATCHING_MODE;
typedef enum { FVMM_OFF = 0, FVMM_STD = 1, FVMM_NO_MARGIN = 2 } FOCUSVIEW_MARKER_MODE;
// ----------------------------------------------------------------------------
@ -270,7 +271,6 @@ typedef enum
typedef struct _wordbookmark_t
{
bool in_use;
int sci_symbol;
LPCWSTR color;
} WORDBOOKMARK_T, *PWORDBOOKMARK_T;
@ -438,7 +438,7 @@ typedef struct _settings_t
bool MarkLongLines;
int LongLinesLimit;
int LongLineMode;
bool ShowSelectionMargin;
bool ShowBookmarkMargin;
bool ShowLineNumbers;
bool ShowCodeFolding;
bool MarkOccurrences;
@ -574,6 +574,7 @@ typedef struct _settings2_t
int ExitOnESCSkipLevel;
int ZoomTooltipTimeout;
int LargeIconScalePrecent;
int FocusViewMarkerMode;
float AnalyzeReliableConfidenceLevel;
float LocaleAnsiCodePageAnalysisBonus;