Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MODIF] Minor change.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@89 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2007-12-26 00:54:24 +00:00
parent 576930dab3
commit 3fb08ce731
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -138,7 +138,7 @@ bool PluginsManager::loadPlugins(const char *dir)
} }
char xmlPath[MAX_PATH]; char xmlPath[MAX_PATH];
strcpy(xmlPath, nppParams->getAppDataNppDir()); strcpy(xmlPath, nppParams->getNppPath());
PathAppend(xmlPath, "plugins\\Config"); PathAppend(xmlPath, "plugins\\Config");
PathAppend(xmlPath, pi->_moduleName); PathAppend(xmlPath, pi->_moduleName);
PathRemoveExtension(xmlPath); PathRemoveExtension(xmlPath);
@ -208,15 +208,12 @@ void PluginsManager::setMenu(HMENU hMenu, const char *menuName)
{ {
_pluginsCommands.push_back(PluginCommand(_pluginInfos[i]->_moduleName, j, _pluginInfos[i]->_funcItems[j]._pFunc)); _pluginsCommands.push_back(PluginCommand(_pluginInfos[i]->_moduleName, j, _pluginInfos[i]->_funcItems[j]._pFunc));
int cmdID = ID_PLUGINS_CMD + (_pluginsCommands.size() - 1); int cmdID = ID_PLUGINS_CMD + (_pluginsCommands.size() - 1);
//printInt(cmdID);
_pluginInfos[i]->_funcItems[j]._cmdID = cmdID; _pluginInfos[i]->_funcItems[j]._cmdID = cmdID;
string itemName = _pluginInfos[i]->_funcItems[j]._itemName; string itemName = _pluginInfos[i]->_funcItems[j]._itemName;
if (_pluginInfos[i]->_funcItems[j]._pShKey) if (_pluginInfos[i]->_funcItems[j]._pShKey)
{ {
ShortcutKey & sKey = *(_pluginInfos[i]->_funcItems[j]._pShKey); ShortcutKey & sKey = *(_pluginInfos[i]->_funcItems[j]._pShKey);
//CommandShortcut cmdShortcut(itemName.c_str(), cmdID, sKey._isCtrl, sKey._isAlt, sKey._isShift, sKey._key);
//printInt(cmdID);
PluginCmdShortcut pcs(Shortcut(itemName.c_str(), sKey._isCtrl, sKey._isAlt, sKey._isShift, sKey._key), cmdID, _pluginInfos[i]->_moduleName, j); PluginCmdShortcut pcs(Shortcut(itemName.c_str(), sKey._isCtrl, sKey._isAlt, sKey._isShift, sKey._key), cmdID, _pluginInfos[i]->_moduleName, j);
pluginCmdSCList.push_back(pcs); pluginCmdSCList.push_back(pcs);
itemName += "\t"; itemName += "\t";

4
PowerEditor/src/Notepad_plus.rc
View File

@ -389,8 +389,8 @@ BEGIN
MENUITEM "Convert to Mac Format", IDM_FORMAT_TOMAC MENUITEM "Convert to Mac Format", IDM_FORMAT_TOMAC
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI MENUITEM "Encode in ANSI", IDM_FORMAT_ANSI
MENUITEM "Encode in UTF-8", IDM_FORMAT_UTF_8
MENUITEM "Encode in UTF-8 without BOM", IDM_FORMAT_AS_UTF_8 MENUITEM "Encode in UTF-8 without BOM", IDM_FORMAT_AS_UTF_8
MENUITEM "Encode in UTF-8", IDM_FORMAT_UTF_8
MENUITEM "Encode in UCS-2 Big Endian", IDM_FORMAT_UCS_2BE MENUITEM "Encode in UCS-2 Big Endian", IDM_FORMAT_UCS_2BE
MENUITEM "Encode in UCS-2 Little Endian", IDM_FORMAT_UCS_2LE MENUITEM "Encode in UCS-2 Little Endian", IDM_FORMAT_UCS_2LE
//MENUITEM SEPARATOR //MENUITEM SEPARATOR
@ -500,7 +500,7 @@ BEGIN
LTEXT "http://notepad-plus.sourceforge.net/",IDC_HOME_ADDR,78,54,126,8 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 EDITTEXT IDC_LICENCE_EDIT,31,99,209,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
//LS: CompileDateInAboutDialog: Automatically insert compile date as additional version info! //LS: CompileDateInAboutDialog: Automatically insert compile date as additional version info!
EDITTEXT IDC_BUILD_DATETIME,50,25,150,10, ES_READONLY | NOT WS_BORDER EDITTEXT IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER
CONTROL "",IDI_M30ICON,"Static",SS_OWNERDRAW,21,10,20,20 CONTROL "",IDI_M30ICON,"Static",SS_OWNERDRAW,21,10,20,20
END END

12
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -742,15 +742,7 @@ protected:
void setAutoItLexer(){ void setAutoItLexer(){
setLexer(SCLEX_AU3, L_AU3, "autoit", LIST_0 | LIST_1 | LIST_2 | LIST_3 | LIST_4 | LIST_5 | LIST_6); setLexer(SCLEX_AU3, L_AU3, "autoit", LIST_0 | LIST_1 | LIST_2 | LIST_3 | LIST_4 | LIST_5 | LIST_6);
}; };
/*
LIST_0 : LANG_INDEX_INSTR
LIST_1 : LANG_INDEX_INSTR2
LIST_2 : LANG_INDEX_TYPE
LIST_3 : LANG_INDEX_TYPE2
LIST_4 : LANG_INDEX_TYPE3
LIST_5 : LANG_INDEX_TYPE4
LIST_6 : LANG_INDEX_TYPE5
*/
void setCamlLexer(){ void setCamlLexer(){
setLexer(SCLEX_CAML, L_CAML, "caml", LIST_0 | LIST_1 | LIST_2); setLexer(SCLEX_CAML, L_CAML, "caml", LIST_0 | LIST_1 | LIST_2);
}; };
@ -780,9 +772,7 @@ LIST_6 : LANG_INDEX_TYPE5
}; };
void setSearchResultLexer() { void setSearchResultLexer() {
//execute(SCI_SETLEXER, SCLEX_SEARCHRESULT);
execute(SCI_STYLESETEOLFILLED, SCE_SEARCHRESULT_HEARDER, true); execute(SCI_STYLESETEOLFILLED, SCE_SEARCHRESULT_HEARDER, true);
//makeStyle("searchResult");
setLexer(SCLEX_SEARCHRESULT, L_SEARCHRESULT, "searchResult", LIST_1 | LIST_2 | LIST_3); setLexer(SCLEX_SEARCHRESULT, L_SEARCHRESULT, "searchResult", LIST_1 | LIST_2 | LIST_3);
}; };