diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index f4076b73..970b4dc0 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -831,6 +831,7 @@ BEGIN POPUP "&?" BEGIN MENUITEM "Help Contents", IDM_HELP + MENUITEM "Command Line Arguments", IDM_CMDLINEARGUMENTS MENUITEM SEPARATOR MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE diff --git a/PowerEditor/src/Notepad_plus_Window.h b/PowerEditor/src/Notepad_plus_Window.h index 3ac10deb..39317f3b 100644 --- a/PowerEditor/src/Notepad_plus_Window.h +++ b/PowerEditor/src/Notepad_plus_Window.h @@ -31,6 +31,33 @@ #include "Notepad_plus.h" +const TCHAR COMMAND_ARG_HELP[] = TEXT("Usage :\r\ +\r\ +notepad++ [--help] [-multiInst] [-noPlugin] [-lLanguage] [-LlangCode] [-nLineNumber] [-cColumnNumber] [-xPos] [-yPos] [-nosession] [-notabbar] [-ro] [-systemtray] [-loadingTime] [-alwaysOnTop] [-openSession] [-r] [fullFilePathName]\r\ +\r\ + --help : This help message\r\ + -multiInst : Launch another Notepad++ instance\r\ + -noPlugin : Launch Notepad++ without loading any plugin\r\ + -l : Launch Notepad++ by applying indicated programming language\r\ + to the file to open\r\ + -L : Launch Notepad++ by applying indicated localization\r\ + langCode is browser language code\r\ + -n : Launch Notepad++ by scrolling indicated line on the file to open\r\ + -c : Launch Notepad++ on scrolling indicated column on the file to open\r\ + -x : Launch Notepad++ by indicating its left side position on the screen\r\ + -y : Launch Notepad++ by indicating its top position on the screen\r\ + -nosession : Launch Notepad++ without any session\r\ + -notabbar : Launch Notepad++ without tabbar\r\ + -ro : Launch Notepad++ and make the file to open read only\r\ + -systemtray : Launch Notepad++ directly in system tray\r\ + -loadingTime : Display Notepad++ loading time\r\ + -alwaysOnTop : Make Notepad++ always on top\r\ + -openSession : Open a specific session. fullFilePathName must be a session file\r\ + -r : Open files recursively. This argument will be ignored\r\ + if fullFilePathName contain no wildcard character\r\ + fullFilePathName : file or folder name to open (absolute or relative path name)\r\ +"); + class Notepad_plus_Window : public Window { public: Notepad_plus_Window() {}; diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 59be307a..8e23ab3a 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -2195,7 +2195,13 @@ void Notepad_plus::command(int id) ::ShellExecute(NULL, TEXT("open"), TEXT("http://npp-community.tuxfamily.org/"), NULL, NULL, SW_SHOWNORMAL); break; } - + + case IDM_CMDLINEARGUMENTS: + { + ::MessageBox(NULL, COMMAND_ARG_HELP, TEXT("Notepad++ Command Argument Help"), MB_OK); + break; + } + case IDM_FORUM: { ::ShellExecute(NULL, TEXT("open"), TEXT("http://sourceforge.net/forum/?group_id=95717"), NULL, NULL, SW_SHOWNORMAL); diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h index 269b2627..a7b2d3ce 100644 --- a/PowerEditor/src/menuCmdID.h +++ b/PowerEditor/src/menuCmdID.h @@ -474,6 +474,7 @@ #define IDM_WIKIFAQ (IDM_ABOUT + 7) #define IDM_HELP (IDM_ABOUT + 8) #define IDM_CONFUPDATERPROXY (IDM_ABOUT + 9) + #define IDM_CMDLINEARGUMENTS (IDM_ABOUT + 10) #define IDM_SETTING (IDM + 8000) diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index 2740635f..7cf4b568 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -190,33 +190,6 @@ const TCHAR FLAG_ALWAYS_ON_TOP[] = TEXT("-alwaysOnTop"); const TCHAR FLAG_OPENSESSIONFILE[] = TEXT("-openSession"); const TCHAR FLAG_RECURSIVE[] = TEXT("-r"); -const TCHAR COMMAND_ARG_HELP[] = TEXT("Usage :\r\ -\r\ -notepad++ [--help] [-multiInst] [-noPlugin] [-lLanguage] [-LlangCode] [-nLineNumber] [-cColumnNumber] [-xPos] [-yPos] [-nosession] [-notabbar] [-ro] [-systemtray] [-loadingTime] [-alwaysOnTop] [-openSession] [-r] [fullFilePathName]\r\ -\r\ - --help : This help message\r\ - -multiInst : Launch another Notepad++ instance\r\ - -noPlugin : Launch Notepad++ without loading any plugin\r\ - -l : Launch Notepad++ by applying indicated programming language\r\ - to the file to open\r\ - -L : Launch Notepad++ by applying indicated localization\r\ - langCode is browser language code\r\ - -n : Launch Notepad++ by scrolling indicated line on the file to open\r\ - -c : Launch Notepad++ on scrolling indicated column on the file to open\r\ - -x : Launch Notepad++ by indicating its left side position on the screen\r\ - -y : Launch Notepad++ by indicating its top position on the screen\r\ - -nosession : Launch Notepad++ without any session\r\ - -notabbar : Launch Notepad++ without tabbar\r\ - -ro : Launch Notepad++ and make the file to open read only\r\ - -systemtray : Launch Notepad++ directly in system tray\r\ - -loadingTime : Display Notepad++ loading time\r\ - -alwaysOnTop : Make Notepad++ always on top\r\ - -openSession : Open a specific session. fullFilePathName must be a session file\r\ - -r : Open files recursively. This argument will be ignored\r\ - if fullFilePathName contain no wildcard character\r\ - fullFilePathName : file or folder name to open (absolute or relative path name)\r\ -"); - void doException(Notepad_plus_Window & notepad_plus_plus); int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int)