github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[UPDATE] Replace "Forum" command by "Live Support" one.

pull/178/head^2
Don Ho 2015-06-18 01:34:34 +02:00
parent 4dfd9b63bb
commit c14f87c4b0
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -46,7 +46,7 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
//Here you can find how to use these messages : http://notepad-plus.sourceforge.net/uk/plugins-HOWTO.php
//Here you can find how to use these messages : http://docs.notepad-plus-plus.org/index.php/Messages_And_Notifications
#define NPPMSG (WM_USER + 1000)
#define NPPM_GETCURRENTSCINTILLA (NPPMSG + 4)

12
PowerEditor/src/Notepad_plus.cpp
View File

@ -667,7 +667,7 @@ LRESULT Notepad_plus::init(HWND hwnd)
_toolBar.setCheck(IDM_LANG_USER_DLG, uddShow);
//
// Initialize the default forground & background color
// Initialize the default foreground & background color
//
StyleArray & globalStyles = (NppParameters::getInstance())->getGlobalStylers();
int i = globalStyles.getStylerIndexByID(STYLE_DEFAULT);
@ -814,7 +814,7 @@ void Notepad_plus::saveDockingParams()
nppGUI._dockingData._topHeight = _dockingManager.getDockedContSize(CONT_TOP);
nppGUI._dockingData._bottomHight = _dockingManager.getDockedContSize(CONT_BOTTOM);
// clear the conatainer tab information (active tab)
// clear the container tab information (active tab)
nppGUI._dockingData._containerTabInfo.clear();
// create a vector to save the current information
@ -926,7 +926,7 @@ int Notepad_plus::getHtmlXmlEncoding(const TCHAR *fileName) const
if ((langT != L_XML) && (langT != L_HTML))
return -1;
// Get the begining of file data
// Get the beginning of file data
FILE *f = generic_fopen(fileName, TEXT("rb"));
if (!f)
return -1;
@ -2240,7 +2240,7 @@ void Notepad_plus::addHotSpot()
_pEditView->execute(SCI_STARTSTYLING, start, 0xFF);
_pEditView->execute(SCI_SETSTYLING, foundTextLen, fs);
}
else // generize a new style and add it into a array
else // generalize a new style and add it into a array
{
style_hotspot = idStyle | mask; // set "hotspot bit"
hotspotPairs.push_back(style_hotspot);
@ -2927,7 +2927,7 @@ size_t Notepad_plus::getCurrentDocCharCount(UniMode u)
size_t result = 0;
size_t endpos = _pEditView->execute(SCI_GETLENGTH);
unsigned char* buf = (unsigned char*)_pEditView->execute(SCI_GETCHARACTERPOINTER); // Scintilla doc sais the pointer can be invalidated by any other "execute"
unsigned char* buf = (unsigned char*)_pEditView->execute(SCI_GETCHARACTERPOINTER); // Scintilla doc said the pointer can be invalidated by any other "execute"
#ifdef _OPENMP // parallel counting of characters with OpenMP
if(endpos > 50000) // starting threads takes time; for small files it is better to simply count in one thread
@ -3442,8 +3442,6 @@ void Notepad_plus::docGotoAnotherEditView(FileTransferMode mode)
bool Notepad_plus::activateBuffer(BufferID id, int whichOne)
{
//scnN.nmhdr.code = NPPN_DOCSWITCHINGOFF; //superseeded by NPPN_BUFFERACTIVATED
bool isSnapshotMode = NppParameters::getInstance()->getNppGUI().isSnapshotMode();
if (isSnapshotMode)
{

3
PowerEditor/src/Notepad_plus.rc
View File

@ -846,7 +846,8 @@ BEGIN
MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME
MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE
//MENUITEM "Online Documentation", IDM_ONLINEHELP
MENUITEM "Forum", IDM_FORUM
//MENUITEM "Forum", IDM_FORUM
MENUITEM "Live Support", IDM_ONLINESUPPORT
MENUITEM "Get More Plugins", IDM_PLUGINSHOME
MENUITEM SEPARATOR
MENUITEM "Update Notepad++", IDM_UPDATE_NPP

10
PowerEditor/src/NppCommands.cpp
View File

@ -2296,10 +2296,16 @@ void Notepad_plus::command(int id)
::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);
::ShellExecute(NULL, TEXT("open"), TEXT(""), NULL, NULL, SW_SHOWNORMAL);
break;
}
*/
case IDM_ONLINESUPPORT:
{
::ShellExecute(NULL, TEXT("open"), TEXT("https://gitter.im/notepad-plus-plus/notepad-plus-plus"), NULL, NULL, SW_SHOWNORMAL);
break;
}

1
PowerEditor/src/menuCmdID.h
View File

@ -485,6 +485,7 @@
#define IDM_HELP (IDM_ABOUT + 8)
#define IDM_CONFUPDATERPROXY (IDM_ABOUT + 9)
#define IDM_CMDLINEARGUMENTS (IDM_ABOUT + 10)
#define IDM_ONLINESUPPORT (IDM_ABOUT + 11)
#define IDM_SETTING (IDM + 8000)