tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-28 00:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[NEW_FEATURE] (Author: Loreia) Enhance TAB2SPACE and SPACE2TAB features.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@944 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-08-25 19:23:16 +00:00
parent e08e566e19
commit e86940390f
6 changed files with 483 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

545
PowerEditor/src/Notepad_plus.cpp
View File

File diff suppressed because it is too large Load Diff

8
PowerEditor/src/Notepad_plus.h
View File

@ -151,6 +151,12 @@ enum trimOp {
lineEol = 2 lineEol = 2
}; };
enum spaceTab {
tab2Space = 0,
space2TabLeading = 1,
space2TabAll = 2
};
struct TaskListInfo; struct TaskListInfo;
struct VisibleGUIConf { struct VisibleGUIConf {
@ -599,7 +605,7 @@ private:
bool goToNextIndicator(int indicID2Search, bool isWrap = true) const; bool goToNextIndicator(int indicID2Search, bool isWrap = true) const;
int wordCount(); int wordCount();
void wsTabConvert(bool whichWay); void wsTabConvert(spaceTab whichWay);
void doTrim(trimOp whichPart); void doTrim(trimOp whichPart);
void launchAnsiCharPanel(); void launchAnsiCharPanel();
void launchClipboardHistoryPanel(); void launchClipboardHistoryPanel();

241
PowerEditor/src/Notepad_plus.rc
View File

@ -7,10 +7,10 @@
// version 2 of the License, or (at your option) any later version. // version 2 of the License, or (at your option) any later version.
// //
// Note that the GPL places important restrictions on "derived works", yet // Note that the GPL places important restrictions on "derived works", yet
// it does not provide a detailed definition of that term. To avoid // it does not provide a detailed definition of that term. To avoid
// misunderstandings, we consider an application to constitute a // misunderstandings, we consider an application to constitute a
// "derivative work" for the purpose of this license if it does any of the // "derivative work" for the purpose of this license if it does any of the
// following: // following:
// 1. Integrates source code from Notepad++. // 1. Integrates source code from Notepad++.
// 2. Integrates/includes/aggregates Notepad++ into a proprietary executable // 2. Integrates/includes/aggregates Notepad++ into a proprietary executable
// installer, such as those produced by InstallShield. // installer, such as those produced by InstallShield.
@ -238,14 +238,14 @@ BEGIN
BEGIN BEGIN
MENUITEM "Increase Line Indent", IDM_EDIT_INS_TAB MENUITEM "Increase Line Indent", IDM_EDIT_INS_TAB
MENUITEM "Decrease Line Indent", IDM_EDIT_RMV_TAB MENUITEM "Decrease Line Indent", IDM_EDIT_RMV_TAB
END END
POPUP "Convert Case to" POPUP "Convert Case to"
BEGIN BEGIN
MENUITEM "&UPPERCASE", IDM_EDIT_UPPERCASE MENUITEM "&UPPERCASE", IDM_EDIT_UPPERCASE
MENUITEM "&lowercase", IDM_EDIT_LOWERCASE MENUITEM "&lowercase", IDM_EDIT_LOWERCASE
END END
POPUP "Line Operations" POPUP "Line Operations"
BEGIN BEGIN
MENUITEM "Duplicate Current Line", IDM_EDIT_DUP_LINE MENUITEM "Duplicate Current Line", IDM_EDIT_DUP_LINE
MENUITEM "Split Lines", IDM_EDIT_SPLIT_LINES MENUITEM "Split Lines", IDM_EDIT_SPLIT_LINES
MENUITEM "Join Lines", IDM_EDIT_JOIN_LINES MENUITEM "Join Lines", IDM_EDIT_JOIN_LINES
@ -271,31 +271,32 @@ BEGIN
MENUITEM "UNIX Format", IDM_FORMAT_TOUNIX MENUITEM "UNIX Format", IDM_FORMAT_TOUNIX
MENUITEM "Mac Format", IDM_FORMAT_TOMAC MENUITEM "Mac Format", IDM_FORMAT_TOMAC
END END
POPUP "Blank Operations" POPUP "Blank Operations"
BEGIN BEGIN
MENUITEM "Trim Trailing Space", IDM_EDIT_TRIMTRAILING MENUITEM "Trim Trailing Space", IDM_EDIT_TRIMTRAILING
MENUITEM "Trim Leading Space", IDM_EDIT_TRIMLINEHEAD MENUITEM "Trim Leading Space", IDM_EDIT_TRIMLINEHEAD
MENUITEM "Trim Leading and Trailing Space", IDM_EDIT_TRIM_BOTH MENUITEM "Trim Leading and Trailing Space", IDM_EDIT_TRIM_BOTH
MENUITEM "EOL to Space", IDM_EDIT_EOL2WS MENUITEM "EOL to Space", IDM_EDIT_EOL2WS
MENUITEM "Remove Unnecessary Blank and EOL", IDM_EDIT_TRIMALL MENUITEM "Remove Unnecessary Blank and EOL", IDM_EDIT_TRIMALL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "TAB to Space", IDM_EDIT_TAB2SW MENUITEM "TAB to Space", IDM_EDIT_TAB2SW
MENUITEM "Space to TAB", IDM_EDIT_SW2TAB MENUITEM "Space to TAB (All)", IDM_EDIT_SW2TAB_ALL
END MENUITEM "Space to TAB (Leading)", IDM_EDIT_SW2TAB_LEADING
POPUP "Paste Special" END
BEGIN POPUP "Paste Special"
MENUITEM "Paste HTML Content", IDM_EDIT_PASTE_AS_HTML BEGIN
MENUITEM "Paste RTF Content", IDM_EDIT_PASTE_AS_RTF MENUITEM "Paste HTML Content", IDM_EDIT_PASTE_AS_HTML
MENUITEM SEPARATOR MENUITEM "Paste RTF Content", IDM_EDIT_PASTE_AS_RTF
MENUITEM "Copy Binary Content", IDM_EDIT_COPY_BINARY MENUITEM SEPARATOR
MENUITEM "Cut Binary Content", IDM_EDIT_CUT_BINARY MENUITEM "Copy Binary Content", IDM_EDIT_COPY_BINARY
MENUITEM "Paste Binary Content", IDM_EDIT_PASTE_BINARY MENUITEM "Cut Binary Content", IDM_EDIT_CUT_BINARY
END MENUITEM "Paste Binary Content", IDM_EDIT_PASTE_BINARY
END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Column Mode...", IDM_EDIT_COLUMNMODETIP MENUITEM "Column Mode...", IDM_EDIT_COLUMNMODETIP
MENUITEM "Column Editor...", IDM_EDIT_COLUMNMODE MENUITEM "Column Editor...", IDM_EDIT_COLUMNMODE
MENUITEM "Character Panel", IDM_EDIT_CHAR_PANEL MENUITEM "Character Panel", IDM_EDIT_CHAR_PANEL
MENUITEM "Clipboard History", IDM_EDIT_CLIPBOARDHISTORY_PANEL MENUITEM "Clipboard History", IDM_EDIT_CLIPBOARDHISTORY_PANEL
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Set Read-Only", IDM_EDIT_SETREADONLY MENUITEM "Set Read-Only", IDM_EDIT_SETREADONLY
MENUITEM "Clear Read-Only Flag", IDM_EDIT_CLEARREADONLY MENUITEM "Clear Read-Only Flag", IDM_EDIT_CLEARREADONLY
@ -356,22 +357,22 @@ BEGIN
MENUITEM "5th Style", IDM_SEARCH_GONEXTMARKER5 MENUITEM "5th Style", IDM_SEARCH_GONEXTMARKER5
MENUITEM "Find Style", IDM_SEARCH_GONEXTMARKER_DEF MENUITEM "Find Style", IDM_SEARCH_GONEXTMARKER_DEF
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "Bookmark" POPUP "Bookmark"
BEGIN BEGIN
MENUITEM "Toggle Bookmark" , IDM_SEARCH_TOGGLE_BOOKMARK MENUITEM "Toggle Bookmark" , IDM_SEARCH_TOGGLE_BOOKMARK
MENUITEM "Next Bookmark", IDM_SEARCH_NEXT_BOOKMARK MENUITEM "Next Bookmark", IDM_SEARCH_NEXT_BOOKMARK
MENUITEM "Previous Bookmark", IDM_SEARCH_PREV_BOOKMARK MENUITEM "Previous Bookmark", IDM_SEARCH_PREV_BOOKMARK
MENUITEM "Clear All Bookmarks", IDM_SEARCH_CLEAR_BOOKMARKS MENUITEM "Clear All Bookmarks", IDM_SEARCH_CLEAR_BOOKMARKS
MENUITEM "Cut Bookmarked Lines", IDM_SEARCH_CUTMARKEDLINES MENUITEM "Cut Bookmarked Lines", IDM_SEARCH_CUTMARKEDLINES
MENUITEM "Copy Bookmarked Lines", IDM_SEARCH_COPYMARKEDLINES MENUITEM "Copy Bookmarked Lines", IDM_SEARCH_COPYMARKEDLINES
MENUITEM "Paste to (Replace) Bookmarked Lines", IDM_SEARCH_PASTEMARKEDLINES MENUITEM "Paste to (Replace) Bookmarked Lines", IDM_SEARCH_PASTEMARKEDLINES
MENUITEM "Remove Bookmarked Lines", IDM_SEARCH_DELETEMARKEDLINES MENUITEM "Remove Bookmarked Lines", IDM_SEARCH_DELETEMARKEDLINES
MENUITEM "Remove Unmarked Lines", IDM_SEARCH_DELETEUNMARKEDLINES MENUITEM "Remove Unmarked Lines", IDM_SEARCH_DELETEUNMARKEDLINES
MENUITEM "Inverse Bookmark", IDM_SEARCH_INVERSEMARKS MENUITEM "Inverse Bookmark", IDM_SEARCH_INVERSEMARKS
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Find characters in range...", IDM_SEARCH_FINDCHARINRANGE MENUITEM "Find characters in range...", IDM_SEARCH_FINDCHARINRANGE
END END
POPUP "&View" POPUP "&View"
@ -436,18 +437,18 @@ BEGIN
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Summary...", IDM_VIEW_SUMMARY MENUITEM "Summary...", IDM_VIEW_SUMMARY
MENUITEM SEPARATOR MENUITEM SEPARATOR
POPUP "Project" POPUP "Project"
BEGIN BEGIN
MENUITEM "Project Panel 1", IDM_VIEW_PROJECT_PANEL_1 MENUITEM "Project Panel 1", IDM_VIEW_PROJECT_PANEL_1
MENUITEM "Project Panel 2", IDM_VIEW_PROJECT_PANEL_2 MENUITEM "Project Panel 2", IDM_VIEW_PROJECT_PANEL_2
MENUITEM "Project Panel 3", IDM_VIEW_PROJECT_PANEL_3 MENUITEM "Project Panel 3", IDM_VIEW_PROJECT_PANEL_3
END END
#ifdef UNICODE #ifdef UNICODE
MENUITEM "Document Map", IDM_VIEW_DOC_MAP MENUITEM "Document Map", IDM_VIEW_DOC_MAP
#endif #endif
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Synchronize Vertical Scrolling", IDM_VIEW_SYNSCROLLV MENUITEM "Synchronize Vertical Scrolling", IDM_VIEW_SYNSCROLLV
MENUITEM "Synchronize Horizontal Scrolling", IDM_VIEW_SYNSCROLLH MENUITEM "Synchronize Horizontal Scrolling", IDM_VIEW_SYNSCROLLH
MENUITEM SEPARATOR MENUITEM SEPARATOR
@ -470,7 +471,7 @@ BEGIN
MENUITEM "OEM 720", IDM_FORMAT_DOS_720 MENUITEM "OEM 720", IDM_FORMAT_DOS_720
MENUITEM "Windows-1256", IDM_FORMAT_WIN_1256 MENUITEM "Windows-1256", IDM_FORMAT_WIN_1256
END END
POPUP "Baltic" POPUP "Baltic"
BEGIN BEGIN
MENUITEM "ISO 8859-4", IDM_FORMAT_ISO_8859_4 MENUITEM "ISO 8859-4", IDM_FORMAT_ISO_8859_4
@ -492,25 +493,25 @@ BEGIN
MENUITEM "OEM 866", IDM_FORMAT_DOS_866 MENUITEM "OEM 866", IDM_FORMAT_DOS_866
MENUITEM "Windows-1251", IDM_FORMAT_WIN_1251 MENUITEM "Windows-1251", IDM_FORMAT_WIN_1251
END END
POPUP "Central European" POPUP "Central European"
BEGIN BEGIN
//MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16 //MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16
MENUITEM "OEM 852", IDM_FORMAT_DOS_852 MENUITEM "OEM 852", IDM_FORMAT_DOS_852
MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250 MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250
END END
POPUP "Chinese" POPUP "Chinese"
BEGIN BEGIN
MENUITEM "Big5 (Traditional)", IDM_FORMAT_BIG5 MENUITEM "Big5 (Traditional)", IDM_FORMAT_BIG5
MENUITEM "GB2312 (Simplified)", IDM_FORMAT_GB2312 MENUITEM "GB2312 (Simplified)", IDM_FORMAT_GB2312
END END
POPUP "Eastern European" POPUP "Eastern European"
BEGIN BEGIN
MENUITEM "ISO 8859-2", IDM_FORMAT_ISO_8859_2 MENUITEM "ISO 8859-2", IDM_FORMAT_ISO_8859_2
END END
POPUP "Greek" POPUP "Greek"
BEGIN BEGIN
MENUITEM "ISO 8859-7", IDM_FORMAT_ISO_8859_7 MENUITEM "ISO 8859-7", IDM_FORMAT_ISO_8859_7
@ -518,37 +519,37 @@ BEGIN
MENUITEM "OEM 869", IDM_FORMAT_DOS_869 MENUITEM "OEM 869", IDM_FORMAT_DOS_869
MENUITEM "Windows-1253", IDM_FORMAT_WIN_1253 MENUITEM "Windows-1253", IDM_FORMAT_WIN_1253
END END
POPUP "Hebrew" POPUP "Hebrew"
BEGIN BEGIN
MENUITEM "ISO 8859-8", IDM_FORMAT_ISO_8859_8 MENUITEM "ISO 8859-8", IDM_FORMAT_ISO_8859_8
MENUITEM "OEM 862", IDM_FORMAT_DOS_862 MENUITEM "OEM 862", IDM_FORMAT_DOS_862
MENUITEM "Windows-1255", IDM_FORMAT_WIN_1255 MENUITEM "Windows-1255", IDM_FORMAT_WIN_1255
END END
POPUP "Japanese" POPUP "Japanese"
BEGIN BEGIN
MENUITEM "Shift-JIS", IDM_FORMAT_SHIFT_JIS MENUITEM "Shift-JIS", IDM_FORMAT_SHIFT_JIS
END END
POPUP "Korean" POPUP "Korean"
BEGIN BEGIN
MENUITEM "Windows 949", IDM_FORMAT_KOREAN_WIN MENUITEM "Windows 949", IDM_FORMAT_KOREAN_WIN
MENUITEM "EUC-KR", IDM_FORMAT_EUC_KR MENUITEM "EUC-KR", IDM_FORMAT_EUC_KR
END END
POPUP "North European" POPUP "North European"
BEGIN BEGIN
MENUITEM "OEM 861 : Icelandic", IDM_FORMAT_DOS_861 MENUITEM "OEM 861 : Icelandic", IDM_FORMAT_DOS_861
MENUITEM "OEM 865 : Nordic", IDM_FORMAT_DOS_865 MENUITEM "OEM 865 : Nordic", IDM_FORMAT_DOS_865
END END
POPUP "Thai" POPUP "Thai"
BEGIN BEGIN
//MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11 //MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11
MENUITEM "TIS-620", IDM_FORMAT_TIS_620 MENUITEM "TIS-620", IDM_FORMAT_TIS_620
END END
POPUP "Turkish" POPUP "Turkish"
BEGIN BEGIN
MENUITEM "ISO 8859-3", IDM_FORMAT_ISO_8859_3 MENUITEM "ISO 8859-3", IDM_FORMAT_ISO_8859_3
@ -556,7 +557,7 @@ BEGIN
MENUITEM "OEM 857", IDM_FORMAT_DOS_857 MENUITEM "OEM 857", IDM_FORMAT_DOS_857
MENUITEM "Windows-1254", IDM_FORMAT_WIN_1254 MENUITEM "Windows-1254", IDM_FORMAT_WIN_1254
END END
POPUP "Western European" POPUP "Western European"
BEGIN BEGIN
MENUITEM "ISO 8859-1", IDM_FORMAT_ISO_8859_1 MENUITEM "ISO 8859-1", IDM_FORMAT_ISO_8859_1
@ -569,7 +570,7 @@ BEGIN
MENUITEM "OEM-US", IDM_FORMAT_DOS_437 MENUITEM "OEM-US", IDM_FORMAT_DOS_437
MENUITEM "Windows-1252", IDM_FORMAT_WIN_1252 MENUITEM "Windows-1252", IDM_FORMAT_WIN_1252
END END
POPUP "Vietnamese" POPUP "Vietnamese"
BEGIN BEGIN
MENUITEM "Windows-1258", IDM_FORMAT_WIN_1258 MENUITEM "Windows-1258", IDM_FORMAT_WIN_1258
@ -585,64 +586,64 @@ BEGIN
POPUP "&Language" POPUP "&Language"
BEGIN BEGIN
MENUITEM "Ada", IDM_LANG_ADA MENUITEM "Ada", IDM_LANG_ADA
MENUITEM "ASP", IDM_LANG_ASP MENUITEM "ASP", IDM_LANG_ASP
MENUITEM "Assembly", IDM_LANG_ASM MENUITEM "Assembly", IDM_LANG_ASM
MENUITEM "AutoIt", IDM_LANG_AU3 MENUITEM "AutoIt", IDM_LANG_AU3
MENUITEM "Batch", IDM_LANG_BATCH MENUITEM "Batch", IDM_LANG_BATCH
MENUITEM "C", IDM_LANG_C MENUITEM "C", IDM_LANG_C
MENUITEM "C#", IDM_LANG_CS MENUITEM "C#", IDM_LANG_CS
MENUITEM "C++", IDM_LANG_CPP MENUITEM "C++", IDM_LANG_CPP
MENUITEM "Caml", IDM_LANG_CAML MENUITEM "Caml", IDM_LANG_CAML
MENUITEM "Cmake", IDM_LANG_CMAKE MENUITEM "Cmake", IDM_LANG_CMAKE
MENUITEM "COBOL", IDM_LANG_COBOL MENUITEM "COBOL", IDM_LANG_COBOL
MENUITEM "CSS", IDM_LANG_CSS MENUITEM "CSS", IDM_LANG_CSS
MENUITEM "D", IDM_LANG_D MENUITEM "D", IDM_LANG_D
MENUITEM "Diff", IDM_LANG_DIFF MENUITEM "Diff", IDM_LANG_DIFF
MENUITEM "Flash actionscript", IDM_LANG_FLASH MENUITEM "Flash actionscript", IDM_LANG_FLASH
MENUITEM "Fortran", IDM_LANG_FORTRAN MENUITEM "Fortran", IDM_LANG_FORTRAN
MENUITEM "Gui4Cli", IDM_LANG_GUI4CLI MENUITEM "Gui4Cli", IDM_LANG_GUI4CLI
MENUITEM "Haskell", IDM_LANG_HASKELL MENUITEM "Haskell", IDM_LANG_HASKELL
MENUITEM "HTML", IDM_LANG_HTML MENUITEM "HTML", IDM_LANG_HTML
MENUITEM "INNO", IDM_LANG_INNO MENUITEM "INNO", IDM_LANG_INNO
MENUITEM "Java", IDM_LANG_JAVA MENUITEM "Java", IDM_LANG_JAVA
MENUITEM "Javascript", IDM_LANG_JS MENUITEM "Javascript", IDM_LANG_JS
MENUITEM "JSP", IDM_LANG_JSP MENUITEM "JSP", IDM_LANG_JSP
MENUITEM "KIXtart", IDM_LANG_KIX MENUITEM "KIXtart", IDM_LANG_KIX
MENUITEM "LISP", IDM_LANG_LISP MENUITEM "LISP", IDM_LANG_LISP
MENUITEM "Lua", IDM_LANG_LUA MENUITEM "Lua", IDM_LANG_LUA
MENUITEM "Makefile", IDM_LANG_MAKEFILE MENUITEM "Makefile", IDM_LANG_MAKEFILE
MENUITEM "Matlab", IDM_LANG_MATLAB MENUITEM "Matlab", IDM_LANG_MATLAB
MENUITEM "MS INI file", IDM_LANG_INI MENUITEM "MS INI file", IDM_LANG_INI
MENUITEM "MS-DOS Style", IDM_LANG_ASCII MENUITEM "MS-DOS Style", IDM_LANG_ASCII
MENUITEM "Normal Text", IDM_LANG_TEXT MENUITEM "Normal Text", IDM_LANG_TEXT
MENUITEM "NSIS", IDM_LANG_NSIS MENUITEM "NSIS", IDM_LANG_NSIS
MENUITEM "Objective-C", IDM_LANG_OBJC MENUITEM "Objective-C", IDM_LANG_OBJC
MENUITEM "Pascal", IDM_LANG_PASCAL MENUITEM "Pascal", IDM_LANG_PASCAL
MENUITEM "Perl", IDM_LANG_PERL MENUITEM "Perl", IDM_LANG_PERL
MENUITEM "PHP", IDM_LANG_PHP MENUITEM "PHP", IDM_LANG_PHP
MENUITEM "Postscript", IDM_LANG_PS MENUITEM "Postscript", IDM_LANG_PS
MENUITEM "PowerShell", IDM_LANG_POWERSHELL MENUITEM "PowerShell", IDM_LANG_POWERSHELL
MENUITEM "Properties", IDM_LANG_PROPS MENUITEM "Properties", IDM_LANG_PROPS
MENUITEM "Python", IDM_LANG_PYTHON MENUITEM "Python", IDM_LANG_PYTHON
MENUITEM "R", IDM_LANG_R MENUITEM "R", IDM_LANG_R
MENUITEM "Resource file", IDM_LANG_RC MENUITEM "Resource file", IDM_LANG_RC
MENUITEM "Ruby", IDM_LANG_RUBY MENUITEM "Ruby", IDM_LANG_RUBY
MENUITEM "Shell", IDM_LANG_BASH MENUITEM "Shell", IDM_LANG_BASH
MENUITEM "Scheme", IDM_LANG_SCHEME MENUITEM "Scheme", IDM_LANG_SCHEME
MENUITEM "Smalltalk", IDM_LANG_SMALLTALK MENUITEM "Smalltalk", IDM_LANG_SMALLTALK
MENUITEM "SQL", IDM_LANG_SQL MENUITEM "SQL", IDM_LANG_SQL
MENUITEM "TCL", IDM_LANG_TCL MENUITEM "TCL", IDM_LANG_TCL
MENUITEM "TeX", IDM_LANG_TEX MENUITEM "TeX", IDM_LANG_TEX
MENUITEM "VB", IDM_LANG_VB MENUITEM "VB", IDM_LANG_VB
MENUITEM "VHDL", IDM_LANG_VHDL MENUITEM "VHDL", IDM_LANG_VHDL
MENUITEM "Verilog", IDM_LANG_VERILOG MENUITEM "Verilog", IDM_LANG_VERILOG
MENUITEM "XML", IDM_LANG_XML MENUITEM "XML", IDM_LANG_XML
MENUITEM "YAML", IDM_LANG_YAML MENUITEM "YAML", IDM_LANG_YAML
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "User-Defined", IDM_LANG_USER MENUITEM "User-Defined", IDM_LANG_USER
END END
POPUP "&Language" POPUP "&Language"
BEGIN BEGIN
POPUP "A" POPUP "A"
@ -743,8 +744,8 @@ BEGIN
MENUITEM "YAML", IDM_LANG_YAML MENUITEM "YAML", IDM_LANG_YAML
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "User-Defined", IDM_LANG_USER MENUITEM "User-Defined", IDM_LANG_USER
END END
POPUP "Se&ttings" POPUP "Se&ttings"
BEGIN BEGIN
MENUITEM "Preferences...", IDM_SETTING_PREFERECE MENUITEM "Preferences...", IDM_SETTING_PREFERECE
@ -757,7 +758,7 @@ BEGIN
MENUITEM "Import style theme(s)...", IDM_SETTING_IMPORTSTYLETHEMS MENUITEM "Import style theme(s)...", IDM_SETTING_IMPORTSTYLETHEMS
END END
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Edit Popup ContextMenu", IDM_SETTING_EDITCONTEXTMENU MENUITEM "Edit Popup ContextMenu", IDM_SETTING_EDITCONTEXTMENU
END END
POPUP "Macro" POPUP "Macro"

13
PowerEditor/src/NppCommands.cpp
View File

@ -879,11 +879,15 @@ void Notepad_plus::command(int id)
break; break;
case IDM_EDIT_TAB2SW: case IDM_EDIT_TAB2SW:
wsTabConvert(true); wsTabConvert(tab2Space);
break; break;
case IDM_EDIT_SW2TAB: case IDM_EDIT_SW2TAB_LEADING:
wsTabConvert(false); wsTabConvert(space2TabLeading);
break;
case IDM_EDIT_SW2TAB_ALL:
wsTabConvert(space2TabAll);
break; break;
case IDM_EDIT_SETREADONLY: case IDM_EDIT_SETREADONLY:
@ -2376,7 +2380,8 @@ void Notepad_plus::command(int id)
case IDM_EDIT_EOL2WS: case IDM_EDIT_EOL2WS:
case IDM_EDIT_TRIMALL: case IDM_EDIT_TRIMALL:
case IDM_EDIT_TAB2SW: case IDM_EDIT_TAB2SW:
case IDM_EDIT_SW2TAB: case IDM_EDIT_SW2TAB_ALL:
case IDM_EDIT_SW2TAB_LEADING:
case IDM_EDIT_SETREADONLY : case IDM_EDIT_SETREADONLY :
case IDM_EDIT_FULLPATHTOCLIP : case IDM_EDIT_FULLPATHTOCLIP :
case IDM_EDIT_FILENAMETOCLIP : case IDM_EDIT_FILENAMETOCLIP :

3
PowerEditor/src/Parameters.cpp
View File

@ -103,7 +103,8 @@ WinMenuKeyDefinition winKeyDefs[] = {
{VK_NULL, IDM_EDIT_EOL2WS, false, false, false, NULL}, {VK_NULL, IDM_EDIT_EOL2WS, false, false, false, NULL},
{VK_NULL, IDM_EDIT_TRIMALL, false, false, false, NULL}, {VK_NULL, IDM_EDIT_TRIMALL, false, false, false, NULL},
{VK_NULL, IDM_EDIT_TAB2SW, false, false, false, NULL}, {VK_NULL, IDM_EDIT_TAB2SW, false, false, false, NULL},
{VK_NULL, IDM_EDIT_SW2TAB, false, false, false, NULL}, {VK_NULL, IDM_EDIT_SW2TAB_ALL, false, false, false, NULL},
{VK_NULL, IDM_EDIT_SW2TAB_LEADING, false, false, false, NULL},
{VK_C, IDM_EDIT_COLUMNMODE, false, true, false, NULL}, {VK_C, IDM_EDIT_COLUMNMODE, false, true, false, NULL},
{VK_U, IDM_EDIT_UPPERCASE, true, false, true, NULL}, {VK_U, IDM_EDIT_UPPERCASE, true, false, true, NULL},

4
PowerEditor/src/menuCmdID.h
View File

@ -88,7 +88,9 @@
#define IDM_EDIT_EOL2WS (IDM_EDIT + 44) #define IDM_EDIT_EOL2WS (IDM_EDIT + 44)
#define IDM_EDIT_TRIMALL (IDM_EDIT + 45) #define IDM_EDIT_TRIMALL (IDM_EDIT + 45)
#define IDM_EDIT_TAB2SW (IDM_EDIT + 46) #define IDM_EDIT_TAB2SW (IDM_EDIT + 46)
#define IDM_EDIT_SW2TAB (IDM_EDIT + 47) #define IDM_EDIT_SW2TAB_LEADING (IDM_EDIT + 53)
#define IDM_EDIT_SW2TAB_ALL (IDM_EDIT + 54)
//#define IDM_EDIT_SW2TAB (IDM_EDIT + 47)
// Menu macro // Menu macro
#define IDM_MACRO_SAVECURRENTMACRO (IDM_EDIT + 25) #define IDM_MACRO_SAVECURRENTMACRO (IDM_EDIT + 25)