diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h index fe1ad4de4..57838cd3a 100644 --- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h +++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h @@ -18,6 +18,8 @@ #ifndef NOTEPAD_PLUS_MSGS_H #define NOTEPAD_PLUS_MSGS_H +//#include "menuCmdID.h" + enum LangType {L_TXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\ L_HTML, L_XML, L_MAKEFILE, L_PASCAL, L_BATCH, L_INI, L_NFO, L_USER,\ L_ASP, L_SQL, L_VB, L_JS, L_CSS, L_PERL, L_PYTHON, L_LUA,\ @@ -162,6 +164,12 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV void * info; // defined by plugin }; + #define NPPM_MENUCOMMAND (NPPMSG + 48) + //void NPPM_MENUCOMMAND(0, int cmdID) + // uncomment //#include "menuCmdID.h" + // in the beginning of this file then use the command symbols defined in "menuCmdID.h" file + // to access all the Notepad++ menu command items + #define RUNCOMMAND_USER (WM_USER + 3000) #define NPPM_GETFULLCURRENTPATH (RUNCOMMAND_USER + FULL_CURRENT_PATH) #define NPPM_GETCURRENTDIRECTORY (RUNCOMMAND_USER + CURRENT_DIRECTORY) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 5872ba936..b610cb994 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -1141,12 +1141,12 @@ void Notepad_plus::checkUndoState() void Notepad_plus::checkMacroState() { - enableCommand(IDM_EDIT_STARTRECORDINGMACRO, !_recordingMacro, MENU | TOOLBAR); - enableCommand(IDM_EDIT_STOPRECORDINGMACRO, _recordingMacro, MENU | TOOLBAR); - enableCommand(IDM_EDIT_PLAYBACKRECORDEDMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR); - enableCommand(IDM_EDIT_SAVECURRENTMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR); + enableCommand(IDM_MACRO_STARTRECORDINGMACRO, !_recordingMacro, MENU | TOOLBAR); + enableCommand(IDM_MACRO_STOPRECORDINGMACRO, _recordingMacro, MENU | TOOLBAR); + enableCommand(IDM_MACRO_PLAYBACKRECORDEDMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR); + enableCommand(IDM_MACRO_SAVECURRENTMACRO, !_macro.empty() && !_recordingMacro, MENU | TOOLBAR); - enableCommand(IDM_EDIT_RUNMULTIMACRODLG, (!_macro.empty() && !_recordingMacro) || !((NppParameters::getInstance())->getMacroList()).empty(), MENU | TOOLBAR); + enableCommand(IDM_MACRO_RUNMULTIMACRODLG, (!_macro.empty() && !_recordingMacro) || !((NppParameters::getInstance())->getMacroList()).empty(), MENU | TOOLBAR); } void Notepad_plus::checkSyncState() @@ -1588,8 +1588,8 @@ BOOL Notepad_plus::notify(SCNotification *notification) pCloneToView = cloneToView; } vector itemUnitArray; - itemUnitArray.push_back(MenuItemUnit(IDC_DOC_GOTO_ANOTHER_VIEW, pGoToView)); - itemUnitArray.push_back(MenuItemUnit(IDC_DOC_CLONE_TO_ANOTHER_VIEW, pCloneToView)); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_ANOTHER_VIEW, pGoToView)); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_CLONE_TO_ANOTHER_VIEW, pCloneToView)); _tabPopupDropMenu.create(_hSelf, itemUnitArray); } _tabPopupDropMenu.display(p); @@ -1783,8 +1783,8 @@ BOOL Notepad_plus::notify(SCNotification *notification) itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_FILENAMETOCLIP, pCilpFileName)); itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_CURRENTDIRTOCLIP, pCilpCurrentDir)); itemUnitArray.push_back(MenuItemUnit(0, NULL)); - itemUnitArray.push_back(MenuItemUnit(IDC_DOC_GOTO_ANOTHER_VIEW, pGoToView)); - itemUnitArray.push_back(MenuItemUnit(IDC_DOC_CLONE_TO_ANOTHER_VIEW, pCloneToView)); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_ANOTHER_VIEW, pGoToView)); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_CLONE_TO_ANOTHER_VIEW, pCloneToView)); _tabPopupMenu.create(_hSelf, itemUnitArray); @@ -2281,7 +2281,7 @@ void Notepad_plus::command(int id) fileSaveSession(); break; - case IDC_BUTTON_PRINT : + case IDM_FILE_PRINTNOW : filePrint(false); break; @@ -2326,8 +2326,8 @@ void Notepad_plus::command(int id) _pEditView->execute(WM_CLEAR); break; - case IDM_EDIT_STARTRECORDINGMACRO: - case IDM_EDIT_STOPRECORDINGMACRO: + case IDM_MACRO_STARTRECORDINGMACRO: + case IDM_MACRO_STOPRECORDINGMACRO: case IDC_EDIT_TOGGLEMACRORECORDING: { //static HCURSOR originalCur; @@ -2367,7 +2367,7 @@ void Notepad_plus::command(int id) break; } - case IDM_EDIT_PLAYBACKRECORDEDMACRO: + case IDM_MACRO_PLAYBACKRECORDEDMACRO: if (!_recordingMacro) // if we're not currently recording, then playback the recorded keystrokes { _pEditView->execute(SCI_BEGINUNDOACTION); @@ -2379,7 +2379,7 @@ void Notepad_plus::command(int id) } break; - case IDM_EDIT_RUNMULTIMACRODLG : + case IDM_MACRO_RUNMULTIMACRODLG : { if (!_recordingMacro) // if we're not currently recording, then playback the recorded keystrokes { @@ -2396,7 +2396,7 @@ void Notepad_plus::command(int id) } break; - case IDM_EDIT_SAVECURRENTMACRO : + case IDM_MACRO_SAVECURRENTMACRO : { if (addCurrentMacro()) _runMacroDlg.initMacroList(); @@ -3270,12 +3270,12 @@ void Notepad_plus::command(int id) break; } - case IDC_DOC_GOTO_ANOTHER_VIEW: + case IDM_VIEW_GOTO_ANOTHER_VIEW: docGotoAnotherEditView(MODE_TRANSFER); checkSyncState(); break; - case IDC_DOC_CLONE_TO_ANOTHER_VIEW: + case IDM_VIEW_CLONE_TO_ANOTHER_VIEW: docGotoAnotherEditView(MODE_CLONE); checkSyncState(); break; @@ -3326,12 +3326,12 @@ void Notepad_plus::command(int id) break; } - case IDC_AUTOCOMPLETE : + case IDM_EDIT_AUTOCOMPLETE : showAutoComp(); break; - case IDC_AUTOCOMPLETE_CURRENTFILE : - //MessageBox(NULL, "IDC_AUTOCOMPLETE_CURRENTFILE", "", MB_OK); + case IDM_EDIT_AUTOCOMPLETE_CURRENTFILE : + //MessageBox(NULL, "IDM_EDIT_AUTOCOMPLETE_CURRENTFILE", "", MB_OK); autoCompFromCurrentFile(); break; @@ -3738,7 +3738,7 @@ void Notepad_plus::command(int id) case IDM_VIEW_UNFOLD_6: case IDM_VIEW_UNFOLD_7: case IDM_VIEW_UNFOLD_8: - case IDC_DOC_GOTO_ANOTHER_VIEW: + case IDM_VIEW_GOTO_ANOTHER_VIEW: case IDM_VIEW_SYNSCROLLV: case IDM_VIEW_SYNSCROLLH: case IDC_PREV_DOC : @@ -5332,17 +5332,17 @@ ToolBarButtonUnit toolBarIcons[] = { {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, //-------------------------------------------------------------------------------------// - {IDM_EDIT_STARTRECORDINGMACRO, IDI_STARTRECORD_OFF_ICON, IDI_STARTRECORD_ON_ICON, IDI_STARTRECORD_DISABLE_ICON, -1}, - {IDM_EDIT_STOPRECORDINGMACRO, IDI_STOPRECORD_OFF_ICON, IDI_STOPRECORD_ON_ICON, IDI_STOPRECORD_DISABLE_ICON, -1}, - {IDM_EDIT_PLAYBACKRECORDEDMACRO, IDI_PLAYRECORD_OFF_ICON, IDI_PLAYRECORD_ON_ICON, IDI_PLAYRECORD_DISABLE_ICON, -1}, - {IDM_EDIT_RUNMULTIMACRODLG, IDI_MMPLAY_OFF_ICON, IDI_MMPLAY_ON_ICON, IDI_MMPLAY_DIS_ICON, -1}, - {IDM_EDIT_SAVECURRENTMACRO, IDI_SAVERECORD_OFF_ICON, IDI_SAVERECORD_ON_ICON, IDI_SAVERECORD_DISABLE_ICON, -1}, + {IDM_MACRO_STARTRECORDINGMACRO, IDI_STARTRECORD_OFF_ICON, IDI_STARTRECORD_ON_ICON, IDI_STARTRECORD_DISABLE_ICON, -1}, + {IDM_MACRO_STOPRECORDINGMACRO, IDI_STOPRECORD_OFF_ICON, IDI_STOPRECORD_ON_ICON, IDI_STOPRECORD_DISABLE_ICON, -1}, + {IDM_MACRO_PLAYBACKRECORDEDMACRO, IDI_PLAYRECORD_OFF_ICON, IDI_PLAYRECORD_ON_ICON, IDI_PLAYRECORD_DISABLE_ICON, -1}, + {IDM_MACRO_RUNMULTIMACRODLG, IDI_MMPLAY_OFF_ICON, IDI_MMPLAY_ON_ICON, IDI_MMPLAY_DIS_ICON, -1}, + {IDM_MACRO_SAVECURRENTMACRO, IDI_SAVERECORD_OFF_ICON, IDI_SAVERECORD_ON_ICON, IDI_SAVERECORD_DISABLE_ICON, -1}, //-------------------------------------------------------------------------------------// {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, //-------------------------------------------------------------------------------------// - //{IDC_BUTTON_PRINT, IDI_PRINT_OFF_ICON, IDI_PRINT_ON_ICON, IDI_PRINT_OFF_ICON, STD_PRINT} - {IDC_BUTTON_PRINT, IDI_PRINT_OFF_ICON, IDI_PRINT_ON_ICON, IDI_PRINT_OFF_ICON, -1} + //{IDM_FILE_PRINTNOW, IDI_PRINT_OFF_ICON, IDI_PRINT_ON_ICON, IDI_PRINT_OFF_ICON, STD_PRINT} + {IDM_FILE_PRINTNOW, IDI_PRINT_OFF_ICON, IDI_PRINT_ON_ICON, IDI_PRINT_OFF_ICON, -1} }; int stdIcons[] = {IDR_FILENEW, IDR_FILEOPEN, IDR_FILESAVE, IDR_SAVEALL, IDR_CLOSEFILE, IDR_CLOSEALL, IDR_CUT, IDR_COPY, IDR_PASTE,\ @@ -6014,6 +6014,10 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa } return TRUE; + case NPPM_MENUCOMMAND : + command(lParam); + return TRUE; + case NPPM_GETFULLCURRENTPATH : case NPPM_GETCURRENTDIRECTORY : case NPPM_GETFILENAME : diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 51b4eec94..2adbbfaea 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -19,12 +19,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include #include "resource.h" +#include "menuCmdID.h" -#define NOTEPAD_PLUS_VERSION "Notepad++ v4.2.2" +#define NOTEPAD_PLUS_VERSION "Notepad++ v4.3" +#define VERSION_VALUE "4.3\0" +#define VERSION_DIGITALVALUE 4, 3, 0, 0 VS_VERSION_INFO VERSIONINFO -FILEVERSION 4, 2, 2, 0 -PRODUCTVERSION 4, 2, 2, 0 +FILEVERSION VERSION_DIGITALVALUE +PRODUCTVERSION VERSION_DIGITALVALUE FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -41,12 +44,12 @@ BEGIN BEGIN VALUE "CompanyName", "Don HO don.h@free.fr\0" VALUE "FileDescription", "Notepad++ : a free (GNU) source code editor\0" - VALUE "FileVersion", "4.2.2\0" + VALUE "FileVersion", VERSION_VALUE VALUE "InternalName", "npp.exe\0" VALUE "LegalCopyright", "Copyleft 1998-2006 by Don HO\0" VALUE "OriginalFilename", "Notepad++.exe\0" VALUE "ProductName", "Notepad++\0" - VALUE "ProductVersion", "4.2.2\0" + VALUE "ProductVersion", VERSION_VALUE END END END @@ -258,7 +261,7 @@ BEGIN MENUITEM "Save Session...", IDM_FILE_SAVESESSION MENUITEM SEPARATOR MENUITEM "Print...\tCtrl+P", IDM_FILE_PRINT - MENUITEM "Print Now!", IDC_BUTTON_PRINT + MENUITEM "Print Now!", IDM_FILE_PRINTNOW MENUITEM SEPARATOR MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT END @@ -295,8 +298,8 @@ BEGIN MENUITEM "Block comment/uncomment\tCtrl+Q", IDM_EDIT_BLOCK_COMMENT MENUITEM "Stream comment\tCtrl+Shift+Q", IDM_EDIT_STREAM_COMMENT MENUITEM SEPARATOR - MENUITEM "Function completion\tCtrl+SPACE", IDC_AUTOCOMPLETE - MENUITEM "Word completion\tCtrl+Shift+SPACE", IDC_AUTOCOMPLETE_CURRENTFILE + MENUITEM "Function completion\tCtrl+SPACE", IDM_EDIT_AUTOCOMPLETE + MENUITEM "Word completion\tCtrl+Shift+SPACE", IDM_EDIT_AUTOCOMPLETE_CURRENTFILE MENUITEM SEPARATOR MENUITEM "Set Read Only", IDM_EDIT_SETREADONLY MENUITEM "Clear Read Only Flag", IDM_EDIT_CLEARREADONLY @@ -373,8 +376,8 @@ BEGIN END MENUITEM "Unfold all\tAlt+Shift+0", IDM_VIEW_TOGGLE_UNFOLDALL MENUITEM SEPARATOR - MENUITEM "Go to another view", IDC_DOC_GOTO_ANOTHER_VIEW - MENUITEM "Clone to another view", IDC_DOC_CLONE_TO_ANOTHER_VIEW + MENUITEM "Go to another view", IDM_VIEW_GOTO_ANOTHER_VIEW + MENUITEM "Clone to another view", IDM_VIEW_CLONE_TO_ANOTHER_VIEW MENUITEM "Synchronize Vertical Scrolling", IDM_VIEW_SYNSCROLLV MENUITEM "Synchronize Horizontal Scrolling", IDM_VIEW_SYNSCROLLH END @@ -455,11 +458,11 @@ BEGIN POPUP "Macro" BEGIN - MENUITEM "&Start Recording\tCtrl+Shift+R", IDM_EDIT_STARTRECORDINGMACRO - MENUITEM "&Stop Recording\tCtrl+Shift+R", IDM_EDIT_STOPRECORDINGMACRO - MENUITEM "&Playback\tCtrl+Shift+P", IDM_EDIT_PLAYBACKRECORDEDMACRO - MENUITEM "&Save current recorded macro", IDM_EDIT_SAVECURRENTMACRO - MENUITEM "&Run a macro multiple times...", IDM_EDIT_RUNMULTIMACRODLG + MENUITEM "&Start Recording\tCtrl+Shift+R", IDM_MACRO_STARTRECORDINGMACRO + MENUITEM "&Stop Recording\tCtrl+Shift+R", IDM_MACRO_STOPRECORDINGMACRO + MENUITEM "&Playback\tCtrl+Shift+P", IDM_MACRO_PLAYBACKRECORDEDMACRO + MENUITEM "&Save current recorded macro", IDM_MACRO_SAVECURRENTMACRO + MENUITEM "&Run a macro multiple times...", IDM_MACRO_RUNMULTIMACRODLG END POPUP "Run" @@ -494,9 +497,6 @@ BEGIN LTEXT "http://notepad-plus.sourceforge.net/",IDC_HOME_ADDR,78,54,126,8 EDITTEXT IDC_LICENCE_EDIT,31,99,209,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL CONTROL "",IDI_M30ICON,"Static",SS_OWNERDRAW,21,10,20,20 - //LTEXT "Documents",IDC_ONLINEHELP_ADDR,78,67,40,8 - //LTEXT "Forums",IDC_EMAIL_ADDR,120,67,35,8 - //LTEXT "Online Help :",IDC_STATIC,21,67,47,8 END IDD_GOLINE DIALOGEX 26, 41, 223, 67 @@ -533,7 +533,6 @@ BEGIN "N", IDM_FILE_NEW, VIRTKEY, CONTROL "O", IDM_FILE_OPEN, VIRTKEY, CONTROL - //VK_F4, IDM_FILE_CLOSE, VIRTKEY, CONTROL "W", IDM_FILE_CLOSE, VIRTKEY, CONTROL "S", IDM_FILE_SAVE, VIRTKEY, CONTROL "S", IDM_FILE_SAVEALL, VIRTKEY, CONTROL, SHIFT @@ -546,7 +545,6 @@ BEGIN "H", IDM_SEARCH_REPLACE, VIRTKEY, CONTROL "G", IDM_SEARCH_GOTOLINE, VIRTKEY, CONTROL "B", IDM_SEARCH_GOTOMATCHINGBRACE, VIRTKEY, CONTROL - //"R", IDM_EXECUTE, VIRTKEY, CONTROL "I", IDM_EDIT_SPLIT_LINES, VIRTKEY, CONTROL "J", IDM_EDIT_JOIN_LINES, VIRTKEY, CONTROL VK_F1, IDM_ABOUT, VIRTKEY @@ -562,21 +560,19 @@ BEGIN "M", IDM_SEARCH_MARKALL, VIRTKEY, CONTROL "M", IDM_SEARCH_UNMARKALL, VIRTKEY, CONTROL, SHIFT - //VK_F3, IDC_SEARCH_FINDNEXTSELECTED, VIRTKEY, CONTROL - //VK_F3, IDC_SEARCH_FINDPREVSELECTED, VIRTKEY, CONTROL, SHIFT VK_F5, IDM_EXECUTE, VIRTKEY VK_F11, IDM_VIEW_FULLSCREENTOGGLE, VIRTKEY VK_TAB, IDC_PREV_DOC, VIRTKEY, CONTROL, SHIFT VK_TAB, IDC_NEXT_DOC, VIRTKEY, CONTROL - VK_SPACE, IDC_AUTOCOMPLETE, VIRTKEY, CONTROL - VK_SPACE, IDC_AUTOCOMPLETE_CURRENTFILE, VIRTKEY, CONTROL, SHIFT + VK_SPACE, IDM_EDIT_AUTOCOMPLETE, VIRTKEY, CONTROL + VK_SPACE, IDM_EDIT_AUTOCOMPLETE_CURRENTFILE, VIRTKEY, CONTROL, SHIFT VK_UP, IDM_EDIT_LINE_UP, VIRTKEY, CONTROL, SHIFT VK_DOWN, IDM_EDIT_LINE_DOWN, VIRTKEY, CONTROL, SHIFT "U", IDM_EDIT_UPPERCASE, VIRTKEY, CONTROL, SHIFT "U", IDM_EDIT_LOWERCASE, VIRTKEY, CONTROL "R", IDC_EDIT_TOGGLEMACRORECORDING, VIRTKEY, CONTROL, SHIFT - "P", IDM_EDIT_PLAYBACKRECORDEDMACRO, VIRTKEY, CONTROL, SHIFT + "P", IDM_MACRO_PLAYBACKRECORDEDMACRO, VIRTKEY, CONTROL, SHIFT "Q", IDM_EDIT_BLOCK_COMMENT, VIRTKEY, CONTROL "Q", IDM_EDIT_STREAM_COMMENT, VIRTKEY, CONTROL, SHIFT "V", IDM_EDIT_PASTE, VIRTKEY, CONTROL @@ -611,10 +607,5 @@ BEGIN VK_END, IDC_KEY_END, VIRTKEY VK_HOME, IDC_KEY_SELECT_2_HOME, VIRTKEY, SHIFT VK_END, IDC_KEY_SELECT_2_END, VIRTKEY, SHIFT - /* - VK_HOME, IDC_KEY_HOME_WRAP, VIRTKEY, ALT - VK_END, IDC_KEY_END_WRAP, VIRTKEY, ALT - "D", IDC_KEY_LINE_DUP, VIRTKEY, CONTROL - */ END diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.h b/PowerEditor/src/WinControls/TabBar/TabBar.h index dc481c153..c175a162c 100644 --- a/PowerEditor/src/WinControls/TabBar/TabBar.h +++ b/PowerEditor/src/WinControls/TabBar/TabBar.h @@ -33,6 +33,7 @@ const int marge = 8; const int nbCtrlMax = 10; #include +#include "menuCmdID.h" #include "resource.h" class TabBar : public Window diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h new file mode 100644 index 000000000..7b629b772 --- /dev/null +++ b/PowerEditor/src/menuCmdID.h @@ -0,0 +1,267 @@ +//this file is part of notepad++ +//Copyright (C)2003 Don HO +// +//This program is free software; you can redistribute it and/or +//modify it under the terms of the GNU General Public License +//as published by the Free Software Foundation; either +//version 2 of the License, or (at your option) any later version. +// +//This program is distributed in the hope that it will be useful, +//but WITHOUT ANY WARRANTY; without even the implied warranty of +//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//GNU General Public License for more details. +// +//You should have received a copy of the GNU General Public License +//along with this program; if not, write to the Free Software +//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +#ifndef MENUCMDID_H +#define MENUCMDID_H + +#define IDM 40000 + +#define IDM_FILE (IDM + 1000) + #define IDM_FILE_NEW (IDM_FILE + 1) + #define IDM_FILE_OPEN (IDM_FILE + 2) + #define IDM_FILE_CLOSE (IDM_FILE + 3) + #define IDM_FILE_CLOSEALL (IDM_FILE + 4) + #define IDM_FILE_CLOSEALL_BUT_CURRENT (IDM_FILE + 5) + #define IDM_FILE_SAVE (IDM_FILE + 6) + #define IDM_FILE_SAVEALL (IDM_FILE + 7) + #define IDM_FILE_SAVEAS (IDM_FILE + 8) + #define IDM_FILE_ASIAN_LANG (IDM_FILE + 9) + #define IDM_FILE_PRINT (IDM_FILE + 10) + #define IDM_FILE_PRINTNOW 1001 + #define IDM_FILE_EXIT (IDM_FILE + 11) + #define IDM_FILE_LOADSESSION (IDM_FILE + 12) + #define IDM_FILE_SAVESESSION (IDM_FILE + 13) + #define IDM_FILE_RELOAD (IDM_FILE + 14) + + // A mettre à jour si on ajoute nouveau menu item dans le menu "File" + #define IDM_FILEMENU_LASTONE IDM_FILE_RELOAD + +#define IDM_EDIT (IDM + 2000) + #define IDM_EDIT_CUT (IDM_EDIT + 1) + #define IDM_EDIT_COPY (IDM_EDIT + 2) + #define IDM_EDIT_UNDO (IDM_EDIT + 3) + #define IDM_EDIT_REDO (IDM_EDIT + 4) + #define IDM_EDIT_PASTE (IDM_EDIT + 5) + #define IDM_EDIT_DELETE (IDM_EDIT + 6) + #define IDM_EDIT_SELECTALL (IDM_EDIT + 7) + + #define IDM_EDIT_INS_TAB (IDM_EDIT + 8) + #define IDM_EDIT_RMV_TAB (IDM_EDIT + 9) + #define IDM_EDIT_DUP_LINE (IDM_EDIT + 10) + #define IDM_EDIT_TRANSPOSE_LINE (IDM_EDIT + 11) + #define IDM_EDIT_SPLIT_LINES (IDM_EDIT + 12) + #define IDM_EDIT_JOIN_LINES (IDM_EDIT + 13) + #define IDM_EDIT_LINE_UP (IDM_EDIT + 14) + #define IDM_EDIT_LINE_DOWN (IDM_EDIT + 15) + #define IDM_EDIT_UPPERCASE (IDM_EDIT + 16) + #define IDM_EDIT_LOWERCASE (IDM_EDIT + 17) + + #define IDM_EDIT_BLOCK_COMMENT (IDM_EDIT + 22) + #define IDM_EDIT_STREAM_COMMENT (IDM_EDIT + 23) + #define IDM_EDIT_TRIMTRAILING (IDM_EDIT + 24) + + #define IDM_EDIT_RTL (IDM_EDIT+26) + #define IDM_EDIT_LTR (IDM_EDIT+27) + #define IDM_EDIT_SETREADONLY (IDM_EDIT+28) + #define IDM_EDIT_FULLPATHTOCLIP (IDM_EDIT+29) + #define IDM_EDIT_FILENAMETOCLIP (IDM_EDIT+30) + #define IDM_EDIT_CURRENTDIRTOCLIP (IDM_EDIT+31) + + #define IDM_EDIT_CLEARREADONLY (IDM_EDIT+33) + #define IDM_EDIT_COLUMNMODE (IDM_EDIT+34) + #define IDM_EDIT_AUTOCOMPLETE (50000+0) + #define IDM_EDIT_AUTOCOMPLETE_CURRENTFILE (50000+1) + + //Belong to MENU FILE + #define IDM_OPEN_ALL_RECENT_FILE (IDM_EDIT + 40) + +#define IDM_SEARCH (IDM + 3000) + + #define IDM_SEARCH_FIND (IDM_SEARCH + 1) + #define IDM_SEARCH_FINDNEXT (IDM_SEARCH + 2) + #define IDM_SEARCH_REPLACE (IDM_SEARCH + 3) + #define IDM_SEARCH_GOTOLINE (IDM_SEARCH + 4) + #define IDM_SEARCH_TOGGLE_BOOKMARK (IDM_SEARCH + 5) + #define IDM_SEARCH_NEXT_BOOKMARK (IDM_SEARCH + 6) + #define IDM_SEARCH_PREV_BOOKMARK (IDM_SEARCH + 7) + #define IDM_SEARCH_CLEAR_BOOKMARKS (IDM_SEARCH + 8) + #define IDM_SEARCH_GOTOMATCHINGBRACE (IDM_SEARCH + 9) + #define IDM_SEARCH_FINDPREV (IDM_SEARCH + 10) + #define IDM_SEARCH_FINDINCREMENT (IDM_SEARCH + 11) + #define IDM_SEARCH_FINDINFILES (IDM_SEARCH + 13) + #define IDM_SEARCH_VOLATILE_FINDNEXT (IDM_SEARCH + 14) + #define IDM_SEARCH_VOLATILE_FINDPREV (IDM_SEARCH + 15) + #define IDM_SEARCH_MARKALL (IDM_SEARCH + 16) + #define IDM_SEARCH_UNMARKALL (IDM_SEARCH + 17) + +#define IDM_VIEW (IDM + 4000) + #define IDM_VIEW_TOOLBAR_HIDE (IDM_VIEW + 1) + #define IDM_VIEW_TOOLBAR_REDUCE (IDM_VIEW + 2) + #define IDM_VIEW_TOOLBAR_ENLARGE (IDM_VIEW + 3) + #define IDM_VIEW_TOOLBAR_STANDARD (IDM_VIEW + 4) + #define IDM_VIEW_REDUCETABBAR (IDM_VIEW + 5) + #define IDM_VIEW_LOCKTABBAR (IDM_VIEW + 6) + #define IDM_VIEW_DRAWTABBAR_TOPBAR (IDM_VIEW + 7) + #define IDM_VIEW_DRAWTABBAR_INACIVETAB (IDM_VIEW + 8) + #define IDM_VIEW_STATUSBAR (IDM_VIEW + 9) + #define IDM_VIEW_TOGGLE_FOLDALL (IDM_VIEW + 10) + #define IDM_VIEW_USER_DLG (IDM_VIEW + 11) + #define IDM_VIEW_LINENUMBER (IDM_VIEW + 12) + #define IDM_VIEW_SYMBOLMARGIN (IDM_VIEW + 13) + #define IDM_VIEW_FOLDERMAGIN (IDM_VIEW + 14) + #define IDM_VIEW_FOLDERMAGIN_SIMPLE (IDM_VIEW + 15) + #define IDM_VIEW_FOLDERMAGIN_ARROW (IDM_VIEW + 16) + #define IDM_VIEW_FOLDERMAGIN_CIRCLE (IDM_VIEW + 17) + #define IDM_VIEW_FOLDERMAGIN_BOX (IDM_VIEW + 18) + #define IDM_VIEW_ALL_CHARACTERS (IDM_VIEW + 19) + #define IDM_VIEW_INDENT_GUIDE (IDM_VIEW + 20) + #define IDM_VIEW_CURLINE_HILITING (IDM_VIEW + 21) + #define IDM_VIEW_WRAP (IDM_VIEW + 22) + #define IDM_VIEW_ZOOMIN (IDM_VIEW + 23) + #define IDM_VIEW_ZOOMOUT (IDM_VIEW + 24) + #define IDM_VIEW_TAB_SPACE (IDM_VIEW + 25) + #define IDM_VIEW_EOL (IDM_VIEW + 26) + #define IDM_VIEW_EDGELINE (IDM_VIEW + 27) + #define IDM_VIEW_EDGEBACKGROUND (IDM_VIEW + 28) + #define IDM_VIEW_TOGGLE_UNFOLDALL (IDM_VIEW + 29) + #define IDM_VIEW_FOLD_CURRENT (IDM_VIEW + 30) + #define IDM_VIEW_UNFOLD_CURRENT (IDM_VIEW + 31) + #define IDM_VIEW_FULLSCREENTOGGLE (IDM_VIEW + 32) + #define IDM_VIEW_ZOOMRESTORE (IDM_VIEW + 33) + #define IDM_VIEW_ALWAYSONTOP (IDM_VIEW + 34) + #define IDM_VIEW_SYNSCROLLV (IDM_VIEW + 35) + #define IDM_VIEW_SYNSCROLLH (IDM_VIEW + 36) + #define IDM_VIEW_EDGENONE (IDM_VIEW + 37) + #define IDM_VIEW_DRAWTABBAR_CLOSEBOTTUN (IDM_VIEW + 38) + #define IDM_VIEW_DRAWTABBAR_DBCLK2CLOSE (IDM_VIEW + 39) + #define IDM_VIEW_REFRESHTABAR (IDM_VIEW + 40) + #define IDM_VIEW_WRAP_SYMBOL (IDM_VIEW + 41) + + #define IDM_VIEW_FOLD (IDM_VIEW + 50) + #define IDM_VIEW_FOLD_1 (IDM_VIEW_FOLD + 1) + #define IDM_VIEW_FOLD_2 (IDM_VIEW_FOLD + 2) + #define IDM_VIEW_FOLD_3 (IDM_VIEW_FOLD + 3) + #define IDM_VIEW_FOLD_4 (IDM_VIEW_FOLD + 4) + #define IDM_VIEW_FOLD_5 (IDM_VIEW_FOLD + 5) + #define IDM_VIEW_FOLD_6 (IDM_VIEW_FOLD + 6) + #define IDM_VIEW_FOLD_7 (IDM_VIEW_FOLD + 7) + #define IDM_VIEW_FOLD_8 (IDM_VIEW_FOLD + 8) + + #define IDM_VIEW_UNFOLD (IDM_VIEW + 60) + #define IDM_VIEW_UNFOLD_1 (IDM_VIEW_UNFOLD + 1) + #define IDM_VIEW_UNFOLD_2 (IDM_VIEW_UNFOLD + 2) + #define IDM_VIEW_UNFOLD_3 (IDM_VIEW_UNFOLD + 3) + #define IDM_VIEW_UNFOLD_4 (IDM_VIEW_UNFOLD + 4) + #define IDM_VIEW_UNFOLD_5 (IDM_VIEW_UNFOLD + 5) + #define IDM_VIEW_UNFOLD_6 (IDM_VIEW_UNFOLD + 6) + #define IDM_VIEW_UNFOLD_7 (IDM_VIEW_UNFOLD + 7) + #define IDM_VIEW_UNFOLD_8 (IDM_VIEW_UNFOLD + 8) + + #define IDM_VIEW_GOTO_ANOTHER_VIEW 10001 + #define IDM_VIEW_CLONE_TO_ANOTHER_VIEW 10002 + + +#define IDM_FORMAT (IDM + 5000) + #define IDM_FORMAT_TODOS (IDM_FORMAT + 1) + #define IDM_FORMAT_TOUNIX (IDM_FORMAT + 2) + #define IDM_FORMAT_TOMAC (IDM_FORMAT + 3) + #define IDM_FORMAT_ANSI (IDM_FORMAT + 4) + #define IDM_FORMAT_UTF_8 (IDM_FORMAT + 5) + #define IDM_FORMAT_UCS_2BE (IDM_FORMAT + 6) + #define IDM_FORMAT_UCS_2LE (IDM_FORMAT + 7) + #define IDM_FORMAT_AS_UTF_8 (IDM_FORMAT + 8) + +#define IDM_LANG (IDM + 6000) + #define IDM_LANGSTYLE_CONFIG_DLG (IDM_LANG + 1) + #define IDM_LANG_C (IDM_LANG + 2) + #define IDM_LANG_CPP (IDM_LANG + 3) + #define IDM_LANG_JAVA (IDM_LANG + 4) + #define IDM_LANG_HTML (IDM_LANG + 5) + #define IDM_LANG_XML (IDM_LANG + 6) + #define IDM_LANG_JS (IDM_LANG + 7) + #define IDM_LANG_PHP (IDM_LANG + 8) + #define IDM_LANG_ASP (IDM_LANG + 9) + #define IDM_LANG_CSS (IDM_LANG + 10) + #define IDM_LANG_PASCAL (IDM_LANG + 11) + #define IDM_LANG_PYTHON (IDM_LANG + 12) + #define IDM_LANG_PERL (IDM_LANG + 13) + #define IDM_LANG_OBJC (IDM_LANG + 14) + #define IDM_LANG_ASCII (IDM_LANG + 15) + #define IDM_LANG_TEXT (IDM_LANG + 16) + #define IDM_LANG_RC (IDM_LANG + 17) + #define IDM_LANG_MAKEFILE (IDM_LANG + 18) + #define IDM_LANG_INI (IDM_LANG + 19) + #define IDM_LANG_SQL (IDM_LANG + 20) + #define IDM_LANG_VB (IDM_LANG + 21) + #define IDM_LANG_BATCH (IDM_LANG + 22) + #define IDM_LANG_CS (IDM_LANG + 23) + #define IDM_LANG_LUA (IDM_LANG + 24) + #define IDM_LANG_TEX (IDM_LANG + 25) + #define IDM_LANG_FORTRAN (IDM_LANG + 26) + #define IDM_LANG_SH (IDM_LANG + 27) + #define IDM_LANG_FLASH (IDM_LANG + 28) + #define IDM_LANG_NSIS (IDM_LANG + 29) + #define IDM_LANG_TCL (IDM_LANG + 30) + #define IDM_LANG_LISP (IDM_LANG + 31) + #define IDM_LANG_SCHEME (IDM_LANG + 32) + #define IDM_LANG_ASM (IDM_LANG + 33) + #define IDM_LANG_DIFF (IDM_LANG + 34) + #define IDM_LANG_PROPS (IDM_LANG + 35) + #define IDM_LANG_PS (IDM_LANG + 36) + #define IDM_LANG_RUBY (IDM_LANG + 37) + #define IDM_LANG_SMALLTALK (IDM_LANG + 38) + #define IDM_LANG_VHDL (IDM_LANG + 39) + #define IDM_LANG_CAML (IDM_LANG + 40) + #define IDM_LANG_KIX (IDM_LANG + 41) + #define IDM_LANG_ADA (IDM_LANG + 42) + #define IDM_LANG_VERILOG (IDM_LANG + 43) + #define IDM_LANG_AU3 (IDM_LANG + 44) + #define IDM_LANG_MATLAB (IDM_LANG + 45) + #define IDM_LANG_HASKELL (IDM_LANG + 46) + #define IDM_LANG_INNO (IDM_LANG + 47) + #define IDM_LANG_CMAKE (IDM_LANG + 48) + + #define IDM_LANG_USER (IDM_LANG + 50) //46050 + #define IDM_LANG_USER_LIMIT (IDM_LANG + 80) //46080 + + +#define IDM_ABOUT (IDM + 7000) + #define IDM_HOMESWEETHOME (IDM_ABOUT + 1) + #define IDM_PROJECTPAGE (IDM_ABOUT + 2) + #define IDM_ONLINEHELP (IDM_ABOUT + 3) + #define IDM_FORUM (IDM_ABOUT + 4) + #define IDM_PLUGINSHOME (IDM_ABOUT + 5) + + + +#define IDM_SETTING (IDM + 8000) + #define IDM_SETTING_TAB_SIZE (IDM_SETTING + 1) + #define IDM_SETTING_TAB_REPLCESPACE (IDM_SETTING + 2) + #define IDM_SETTING_HISTORY_SIZE (IDM_SETTING + 3) + #define IDM_SETTING_EDGE_SIZE (IDM_SETTING + 4) + #define IDM_SETTING_FILEASSOCIATION_DLG (IDM_SETTING + 5) + //#define IDM_SETTING_FILE_AUTODETECTION (IDM_SETTING + 6) + #define IDM_SETTING_HISTORY_DONT_CHECK (IDM_SETTING + 7) + #define IDM_SETTING_TRAYICON (IDM_SETTING + 8) + #define IDM_SETTING_SHORTCUT_MAPPER (IDM_SETTING + 9) + #define IDM_SETTING_REMEMBER_LAST_SESSION (IDM_SETTING + 10) + #define IDM_SETTING_PREFERECE (IDM_SETTING + 11) + + #define IDM_SETTING_FILE_AUTODETECTION_ENABLE (IDM_SETTING + 12) + #define IDM_SETTING_FILE_AUTODETECTION_DISABLE (IDM_SETTING + 13) + #define IDM_SETTING_FILE_AUTODETECTION_ENABLESILENTLY (IDM_SETTING + 14) + +// Menu macro + #define IDM_MACRO_STARTRECORDINGMACRO (IDM_EDIT + 18) + #define IDM_MACRO_STOPRECORDINGMACRO (IDM_EDIT + 19) + #define IDM_MACRO_PLAYBACKRECORDEDMACRO (IDM_EDIT + 21) + #define IDM_MACRO_SAVECURRENTMACRO (IDM_EDIT + 25) + #define IDM_MACRO_RUNMULTIMACRODLG (IDM_EDIT+32) + +#define IDM_EXECUTE (IDM + 9000) + +#endif //MENUCMDID_H diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 3667c7876..45b37bf1a 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -162,255 +162,14 @@ #define ID_PLUGINS_CMD 22000 #define ID_PLUGINS_CMD_LIMIT 22500 -#define IDM 40000 - -#define IDM_FILE (IDM + 1000) - #define IDM_FILE_NEW (IDM_FILE + 1) - #define IDM_FILE_OPEN (IDM_FILE + 2) - #define IDM_FILE_CLOSE (IDM_FILE + 3) - #define IDM_FILE_CLOSEALL (IDM_FILE + 4) - #define IDM_FILE_CLOSEALL_BUT_CURRENT (IDM_FILE + 5) - #define IDM_FILE_SAVE (IDM_FILE + 6) - #define IDM_FILE_SAVEALL (IDM_FILE + 7) - #define IDM_FILE_SAVEAS (IDM_FILE + 8) - #define IDM_FILE_ASIAN_LANG (IDM_FILE + 9) - #define IDM_FILE_PRINT (IDM_FILE + 10) - #define IDM_FILE_EXIT (IDM_FILE + 11) - #define IDM_FILE_LOADSESSION (IDM_FILE + 12) - #define IDM_FILE_SAVESESSION (IDM_FILE + 13) - #define IDM_FILE_RELOAD (IDM_FILE + 14) - - // A mettre à jour si on ajoute nouveau menu item dans le menu "File" - #define IDM_FILEMENU_LASTONE IDM_FILE_RELOAD - -#define IDM_EDIT (IDM + 2000) - #define IDM_EDIT_CUT (IDM_EDIT + 1) - #define IDM_EDIT_COPY (IDM_EDIT + 2) - #define IDM_EDIT_UNDO (IDM_EDIT + 3) - #define IDM_EDIT_REDO (IDM_EDIT + 4) - #define IDM_EDIT_PASTE (IDM_EDIT + 5) - #define IDM_EDIT_DELETE (IDM_EDIT + 6) - #define IDM_EDIT_SELECTALL (IDM_EDIT + 7) - - #define IDM_EDIT_INS_TAB (IDM_EDIT + 8) - #define IDM_EDIT_RMV_TAB (IDM_EDIT + 9) - #define IDM_EDIT_DUP_LINE (IDM_EDIT + 10) - #define IDM_EDIT_TRANSPOSE_LINE (IDM_EDIT + 11) - #define IDM_EDIT_SPLIT_LINES (IDM_EDIT + 12) - #define IDM_EDIT_JOIN_LINES (IDM_EDIT + 13) - #define IDM_EDIT_LINE_UP (IDM_EDIT + 14) - #define IDM_EDIT_LINE_DOWN (IDM_EDIT + 15) - #define IDM_EDIT_UPPERCASE (IDM_EDIT + 16) - #define IDM_EDIT_LOWERCASE (IDM_EDIT + 17) - #define IDM_EDIT_STARTRECORDINGMACRO (IDM_EDIT + 18) - #define IDM_EDIT_STOPRECORDINGMACRO (IDM_EDIT + 19) - #define IDM_EDIT_TOGGLEMACRORECORDING (IDM_EDIT + 20) - #define IDM_EDIT_PLAYBACKRECORDEDMACRO (IDM_EDIT + 21) - #define IDM_EDIT_BLOCK_COMMENT (IDM_EDIT + 22) - #define IDM_EDIT_STREAM_COMMENT (IDM_EDIT + 23) - #define IDM_EDIT_TRIMTRAILING (IDM_EDIT + 24) - #define IDM_EDIT_SAVECURRENTMACRO (IDM_EDIT + 25) - #define IDM_EDIT_RTL (IDM_EDIT+26) - #define IDM_EDIT_LTR (IDM_EDIT+27) - #define IDM_EDIT_SETREADONLY (IDM_EDIT+28) - #define IDM_EDIT_FULLPATHTOCLIP (IDM_EDIT+29) - #define IDM_EDIT_FILENAMETOCLIP (IDM_EDIT+30) - #define IDM_EDIT_CURRENTDIRTOCLIP (IDM_EDIT+31) - #define IDM_EDIT_RUNMULTIMACRODLG (IDM_EDIT+32) - #define IDM_EDIT_CLEARREADONLY (IDM_EDIT+33) - #define IDM_EDIT_COLUMNMODE (IDM_EDIT+34) - //Belong to MENU FILE - #define IDM_OPEN_ALL_RECENT_FILE (IDM_EDIT + 40) - -#define IDM_SEARCH (IDM + 3000) - - #define IDM_SEARCH_FIND (IDM_SEARCH + 1) - #define IDM_SEARCH_FINDNEXT (IDM_SEARCH + 2) - #define IDM_SEARCH_REPLACE (IDM_SEARCH + 3) - #define IDM_SEARCH_GOTOLINE (IDM_SEARCH + 4) - #define IDM_SEARCH_TOGGLE_BOOKMARK (IDM_SEARCH + 5) - #define IDM_SEARCH_NEXT_BOOKMARK (IDM_SEARCH + 6) - #define IDM_SEARCH_PREV_BOOKMARK (IDM_SEARCH + 7) - #define IDM_SEARCH_CLEAR_BOOKMARKS (IDM_SEARCH + 8) - #define IDM_SEARCH_GOTOMATCHINGBRACE (IDM_SEARCH + 9) - #define IDM_SEARCH_FINDPREV (IDM_SEARCH + 10) - #define IDM_SEARCH_FINDINCREMENT (IDM_SEARCH + 11) - #define IDM_SEARCH_FINDINFILES (IDM_SEARCH + 13) - #define IDM_SEARCH_VOLATILE_FINDNEXT (IDM_SEARCH + 14) - #define IDM_SEARCH_VOLATILE_FINDPREV (IDM_SEARCH + 15) - #define IDM_SEARCH_MARKALL (IDM_SEARCH + 16) - #define IDM_SEARCH_UNMARKALL (IDM_SEARCH + 17) - -#define IDM_VIEW (IDM + 4000) - #define IDM_VIEW_TOOLBAR_HIDE (IDM_VIEW + 1) - #define IDM_VIEW_TOOLBAR_REDUCE (IDM_VIEW + 2) - #define IDM_VIEW_TOOLBAR_ENLARGE (IDM_VIEW + 3) - #define IDM_VIEW_TOOLBAR_STANDARD (IDM_VIEW + 4) - #define IDM_VIEW_REDUCETABBAR (IDM_VIEW + 5) - #define IDM_VIEW_LOCKTABBAR (IDM_VIEW + 6) - #define IDM_VIEW_DRAWTABBAR_TOPBAR (IDM_VIEW + 7) - #define IDM_VIEW_DRAWTABBAR_INACIVETAB (IDM_VIEW + 8) - #define IDM_VIEW_STATUSBAR (IDM_VIEW + 9) - #define IDM_VIEW_TOGGLE_FOLDALL (IDM_VIEW + 10) - #define IDM_VIEW_USER_DLG (IDM_VIEW + 11) - #define IDM_VIEW_LINENUMBER (IDM_VIEW + 12) - #define IDM_VIEW_SYMBOLMARGIN (IDM_VIEW + 13) - #define IDM_VIEW_FOLDERMAGIN (IDM_VIEW + 14) - #define IDM_VIEW_FOLDERMAGIN_SIMPLE (IDM_VIEW + 15) - #define IDM_VIEW_FOLDERMAGIN_ARROW (IDM_VIEW + 16) - #define IDM_VIEW_FOLDERMAGIN_CIRCLE (IDM_VIEW + 17) - #define IDM_VIEW_FOLDERMAGIN_BOX (IDM_VIEW + 18) - #define IDM_VIEW_ALL_CHARACTERS (IDM_VIEW + 19) - #define IDM_VIEW_INDENT_GUIDE (IDM_VIEW + 20) - #define IDM_VIEW_CURLINE_HILITING (IDM_VIEW + 21) - #define IDM_VIEW_WRAP (IDM_VIEW + 22) - #define IDM_VIEW_ZOOMIN (IDM_VIEW + 23) - #define IDM_VIEW_ZOOMOUT (IDM_VIEW + 24) - #define IDM_VIEW_TAB_SPACE (IDM_VIEW + 25) - #define IDM_VIEW_EOL (IDM_VIEW + 26) - #define IDM_VIEW_EDGELINE (IDM_VIEW + 27) - #define IDM_VIEW_EDGEBACKGROUND (IDM_VIEW + 28) - #define IDM_VIEW_TOGGLE_UNFOLDALL (IDM_VIEW + 29) - #define IDM_VIEW_FOLD_CURRENT (IDM_VIEW + 30) - #define IDM_VIEW_UNFOLD_CURRENT (IDM_VIEW + 31) - #define IDM_VIEW_FULLSCREENTOGGLE (IDM_VIEW + 32) - #define IDM_VIEW_ZOOMRESTORE (IDM_VIEW + 33) - #define IDM_VIEW_ALWAYSONTOP (IDM_VIEW + 34) - #define IDM_VIEW_SYNSCROLLV (IDM_VIEW + 35) - #define IDM_VIEW_SYNSCROLLH (IDM_VIEW + 36) - #define IDM_VIEW_EDGENONE (IDM_VIEW + 37) - #define IDM_VIEW_DRAWTABBAR_CLOSEBOTTUN (IDM_VIEW + 38) - #define IDM_VIEW_DRAWTABBAR_DBCLK2CLOSE (IDM_VIEW + 39) - #define IDM_VIEW_REFRESHTABAR (IDM_VIEW + 40) - #define IDM_VIEW_WRAP_SYMBOL (IDM_VIEW + 41) - - #define IDM_VIEW_FOLD (IDM_VIEW + 50) - #define IDM_VIEW_FOLD_1 (IDM_VIEW_FOLD + 1) - #define IDM_VIEW_FOLD_2 (IDM_VIEW_FOLD + 2) - #define IDM_VIEW_FOLD_3 (IDM_VIEW_FOLD + 3) - #define IDM_VIEW_FOLD_4 (IDM_VIEW_FOLD + 4) - #define IDM_VIEW_FOLD_5 (IDM_VIEW_FOLD + 5) - #define IDM_VIEW_FOLD_6 (IDM_VIEW_FOLD + 6) - #define IDM_VIEW_FOLD_7 (IDM_VIEW_FOLD + 7) - #define IDM_VIEW_FOLD_8 (IDM_VIEW_FOLD + 8) - - #define IDM_VIEW_UNFOLD (IDM_VIEW + 60) - #define IDM_VIEW_UNFOLD_1 (IDM_VIEW_UNFOLD + 1) - #define IDM_VIEW_UNFOLD_2 (IDM_VIEW_UNFOLD + 2) - #define IDM_VIEW_UNFOLD_3 (IDM_VIEW_UNFOLD + 3) - #define IDM_VIEW_UNFOLD_4 (IDM_VIEW_UNFOLD + 4) - #define IDM_VIEW_UNFOLD_5 (IDM_VIEW_UNFOLD + 5) - #define IDM_VIEW_UNFOLD_6 (IDM_VIEW_UNFOLD + 6) - #define IDM_VIEW_UNFOLD_7 (IDM_VIEW_UNFOLD + 7) - #define IDM_VIEW_UNFOLD_8 (IDM_VIEW_UNFOLD + 8) +//#define IDM 40000 - - -#define IDM_FORMAT (IDM + 5000) - #define IDM_FORMAT_TODOS (IDM_FORMAT + 1) - #define IDM_FORMAT_TOUNIX (IDM_FORMAT + 2) - #define IDM_FORMAT_TOMAC (IDM_FORMAT + 3) - //NEW - #define IDM_FORMAT_ANSI (IDM_FORMAT + 4) - #define IDM_FORMAT_UTF_8 (IDM_FORMAT + 5) - #define IDM_FORMAT_UCS_2BE (IDM_FORMAT + 6) - #define IDM_FORMAT_UCS_2LE (IDM_FORMAT + 7) - #define IDM_FORMAT_AS_UTF_8 (IDM_FORMAT + 8) - //WEN - -#define IDM_LANG (IDM + 6000) - #define IDM_LANGSTYLE_CONFIG_DLG (IDM_LANG + 1) - #define IDM_LANG_C (IDM_LANG + 2) - #define IDM_LANG_CPP (IDM_LANG + 3) - #define IDM_LANG_JAVA (IDM_LANG + 4) - #define IDM_LANG_HTML (IDM_LANG + 5) - #define IDM_LANG_XML (IDM_LANG + 6) - #define IDM_LANG_JS (IDM_LANG + 7) - #define IDM_LANG_PHP (IDM_LANG + 8) - #define IDM_LANG_ASP (IDM_LANG + 9) - #define IDM_LANG_CSS (IDM_LANG + 10) - #define IDM_LANG_PASCAL (IDM_LANG + 11) - #define IDM_LANG_PYTHON (IDM_LANG + 12) - #define IDM_LANG_PERL (IDM_LANG + 13) - #define IDM_LANG_OBJC (IDM_LANG + 14) - #define IDM_LANG_ASCII (IDM_LANG + 15) - #define IDM_LANG_TEXT (IDM_LANG + 16) - #define IDM_LANG_RC (IDM_LANG + 17) - #define IDM_LANG_MAKEFILE (IDM_LANG + 18) - #define IDM_LANG_INI (IDM_LANG + 19) - #define IDM_LANG_SQL (IDM_LANG + 20) - #define IDM_LANG_VB (IDM_LANG + 21) - #define IDM_LANG_BATCH (IDM_LANG + 22) - #define IDM_LANG_CS (IDM_LANG + 23) - #define IDM_LANG_LUA (IDM_LANG + 24) - #define IDM_LANG_TEX (IDM_LANG + 25) - #define IDM_LANG_FORTRAN (IDM_LANG + 26) - #define IDM_LANG_SH (IDM_LANG + 27) - #define IDM_LANG_FLASH (IDM_LANG + 28) - #define IDM_LANG_NSIS (IDM_LANG + 29) - #define IDM_LANG_TCL (IDM_LANG + 30) - #define IDM_LANG_LISP (IDM_LANG + 31) - #define IDM_LANG_SCHEME (IDM_LANG + 32) - #define IDM_LANG_ASM (IDM_LANG + 33) - #define IDM_LANG_DIFF (IDM_LANG + 34) - #define IDM_LANG_PROPS (IDM_LANG + 35) - #define IDM_LANG_PS (IDM_LANG + 36) - #define IDM_LANG_RUBY (IDM_LANG + 37) - #define IDM_LANG_SMALLTALK (IDM_LANG + 38) - #define IDM_LANG_VHDL (IDM_LANG + 39) - #define IDM_LANG_CAML (IDM_LANG + 40) - #define IDM_LANG_KIX (IDM_LANG + 41) - #define IDM_LANG_ADA (IDM_LANG + 42) - #define IDM_LANG_VERILOG (IDM_LANG + 43) - #define IDM_LANG_AU3 (IDM_LANG + 44) - #define IDM_LANG_MATLAB (IDM_LANG + 45) - #define IDM_LANG_HASKELL (IDM_LANG + 46) - #define IDM_LANG_INNO (IDM_LANG + 47) - #define IDM_LANG_CMAKE (IDM_LANG + 48) - - #define IDM_LANG_USER (IDM_LANG + 50) //46050 - #define IDM_LANG_USER_LIMIT (IDM_LANG + 80) //46080 - - -#define IDM_ABOUT (IDM + 7000) - #define IDM_HOMESWEETHOME (IDM_ABOUT + 1) - #define IDM_PROJECTPAGE (IDM_ABOUT + 2) - #define IDM_ONLINEHELP (IDM_ABOUT + 3) - #define IDM_FORUM (IDM_ABOUT + 4) - #define IDM_PLUGINSHOME (IDM_ABOUT + 5) - -#define IDC_MINIMIZED_TRAY (IDM + 7001) - -#define IDM_SETTING (IDM + 8000) - #define IDM_SETTING_TAB_SIZE (IDM_SETTING + 1) - #define IDM_SETTING_TAB_REPLCESPACE (IDM_SETTING + 2) - #define IDM_SETTING_HISTORY_SIZE (IDM_SETTING + 3) - #define IDM_SETTING_EDGE_SIZE (IDM_SETTING + 4) - #define IDM_SETTING_FILEASSOCIATION_DLG (IDM_SETTING + 5) - //#define IDM_SETTING_FILE_AUTODETECTION (IDM_SETTING + 6) - #define IDM_SETTING_HISTORY_DONT_CHECK (IDM_SETTING + 7) - #define IDM_SETTING_TRAYICON (IDM_SETTING + 8) - #define IDM_SETTING_SHORTCUT_MAPPER (IDM_SETTING + 9) - #define IDM_SETTING_REMEMBER_LAST_SESSION (IDM_SETTING + 10) - #define IDM_SETTING_PREFERECE (IDM_SETTING + 11) - - #define IDM_SETTING_FILE_AUTODETECTION_ENABLE (IDM_SETTING + 12) - #define IDM_SETTING_FILE_AUTODETECTION_DISABLE (IDM_SETTING + 13) - #define IDM_SETTING_FILE_AUTODETECTION_ENABLESILENTLY (IDM_SETTING + 14) -/* - #define IDM_SETTING_SETUTF8SANSBOM (IDM_SETTING + 15) - #define IDM_SETTING_SETANSI (IDM_SETTING + 16) -*/ - -#define IDM_EXECUTE (IDM + 9000) -#define IDC_DOC_GOTO_ANOTHER_VIEW 10001 -#define IDC_DOC_CLONE_TO_ANOTHER_VIEW 10002 #define IDCMD 50000 - #define IDC_AUTOCOMPLETE (IDCMD+0) - #define IDC_AUTOCOMPLETE_CURRENTFILE (IDCMD+1) - //#define IDC_SEARCH_FINDPREVSELECTED (IDCMD+2) + //#define IDM_EDIT_AUTOCOMPLETE (IDCMD+0) + //#define IDM_EDIT_AUTOCOMPLETE_CURRENTFILE (IDCMD+1) + #define IDC_PREV_DOC (IDCMD+3) #define IDC_NEXT_DOC (IDCMD+4) #define IDC_EDIT_TOGGLEMACRORECORDING (IDCMD+5) @@ -442,7 +201,8 @@ #define IDSCINTILLA_LIMIT (IDSCINTILLA+30) #define IDD_FILEVIEW_DIALOG 1000 -#define IDC_BUTTON_PRINT 1001 + +#define IDC_MINIMIZED_TRAY 67001 #define IDD_CREATE_DIRECTORY 1100 #define IDC_STATIC_CURRENT_FOLDER 1101 diff --git a/PowerEditor/visual.net/notepadPlus.vcproj b/PowerEditor/visual.net/notepadPlus.vcproj index bb34ed2af..b8f9f2baa 100644 --- a/PowerEditor/visual.net/notepadPlus.vcproj +++ b/PowerEditor/visual.net/notepadPlus.vcproj @@ -528,6 +528,10 @@ RelativePath="..\src\lesDlgs.h" > + + @@ -569,11 +573,11 @@ >