From b96da24ec7af986e9b7caca661a43543ec5e7309 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Tue, 23 Jun 2009 23:57:15 +0000 Subject: [PATCH] [NEW] Make NpWiki++ available as on line help. [NEW] Add number of lines on status bar. Signed-off-by: Don HO git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@498 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Notepad_plus.cpp | 10 +++++----- PowerEditor/src/Notepad_plus.rc | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 746efa89..17fe24c4 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -4329,16 +4329,16 @@ void Notepad_plus::command(int id) case IDM_ONLINEHELP: { - ::ShellExecute(NULL, TEXT("open"), TEXT("http://notepad-plus.sourceforge.net/uk/generalFAQ.php"), NULL, NULL, SW_SHOWNORMAL); + ::ShellExecute(NULL, TEXT("open"), TEXT("http://sourceforge.net/apps/mediawiki/notepad-plus/index.php?title=Main_Page"), NULL, NULL, SW_SHOWNORMAL); break; } - +/* case IDM_WIKIFAQ: { ::ShellExecute(NULL, TEXT("open"), TEXT("http://notepad-plus.wiki.sourceforge.net/FAQ"), NULL, NULL, SW_SHOWNORMAL); break; } - +*/ case IDM_FORUM: { ::ShellExecute(NULL, TEXT("open"), TEXT("http://sourceforge.net/forum/?group_id=95717"), NULL, NULL, SW_SHOWNORMAL); @@ -4858,7 +4858,7 @@ void Notepad_plus::updateStatusBar() _statusBar.setText(strLnCol, STATUSBAR_CUR_POS); TCHAR strDonLen[64]; - wsprintf(strDonLen, TEXT("nb char : %d"), _pEditView->getCurrentDocLen()); + wsprintf(strDonLen, TEXT("nb char : %d nb line : %d"), _pEditView->getCurrentDocLen(), _pEditView->execute(SCI_GETLINECOUNT)); _statusBar.setText(strDonLen, STATUSBAR_DOC_SIZE); _statusBar.setText(_pEditView->execute(SCI_GETOVERTYPE) ? TEXT("OVR") : TEXT("INS"), STATUSBAR_TYPING_MODE); } @@ -7141,7 +7141,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa //--Status Bar Section--// bool willBeShown = nppGUI._statusBarShow; _statusBar.init(_hInst, hwnd, 6); - _statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 180); + _statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 250); _statusBar.setPartWidth(STATUSBAR_CUR_POS, 250); _statusBar.setPartWidth(STATUSBAR_EOF_FORMAT, 80); _statusBar.setPartWidth(STATUSBAR_UNICODE_TYPE, 100); diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 06e491d9..58c5f676 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -562,8 +562,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE - MENUITEM "Online help", IDM_ONLINEHELP - MENUITEM "Wiki FAQ", IDM_WIKIFAQ + MENUITEM "NpWiki++ (Online help)", IDM_ONLINEHELP + //MENUITEM "Wiki FAQ", IDM_WIKIFAQ MENUITEM "Forum", IDM_FORUM MENUITEM "Get more plugins", IDM_PLUGINSHOME MENUITEM SEPARATOR