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

[NEW_FEATURE] Add Marker Jumper feature.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@561 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2009-11-15 13:35:15 +00:00
parent bdbb2711e1
commit f5d7e44e2c
10 changed files with 926 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
PowerEditor/src/Notepad_plus.cpp
View File

@ -3414,7 +3414,6 @@ void Notepad_plus::specialCmd(int id, int param)
void Notepad_plus::command(int id)
{
//NppParameters *pNppParam = NppParameters::getInstance();
switch (id)
{
case IDM_FILE_NEW:
@ -3523,17 +3522,12 @@ void Notepad_plus::command(int id)
case IDM_MACRO_STOPRECORDINGMACRO:
case IDC_EDIT_TOGGLEMACRORECORDING:
{
//static HCURSOR originalCur;
if (_recordingMacro)
{
// STOP !!!
_mainEditView.execute(SCI_STOPRECORD);
//_mainEditView.execute(SCI_ENDUNDOACTION);
_subEditView.execute(SCI_STOPRECORD);
//_subEditView.execute(SCI_ENDUNDOACTION);
//::SetCursor(originalCur);
_mainEditView.execute(SCI_SETCURSOR, (WPARAM)SC_CURSORNORMAL);
_subEditView.execute(SCI_SETCURSOR, (WPARAM)SC_CURSORNORMAL);
@ -3542,18 +3536,13 @@ void Notepad_plus::command(int id)
}
else
{
//originalCur = ::LoadCursor(_hInst, MAKEINTRESOURCE(IDC_MACRO_RECORDING));
//::SetCursor(originalCur);
_mainEditView.execute(SCI_SETCURSOR, 9);
_subEditView.execute(SCI_SETCURSOR, 9);
_macro.clear();
// START !!!
_mainEditView.execute(SCI_STARTRECORD);
//_mainEditView.execute(SCI_BEGINUNDOACTION);
_subEditView.execute(SCI_STARTRECORD);
//_subEditView.execute(SCI_BEGINUNDOACTION);
_recordingMacro = true;
}
checkMacroState();
@ -3752,6 +3741,58 @@ void Notepad_plus::command(int id)
break;
}
case IDM_SEARCH_GONEXTMARKER1 :
case IDM_SEARCH_GONEXTMARKER2 :
case IDM_SEARCH_GONEXTMARKER3 :
case IDM_SEARCH_GONEXTMARKER4 :
case IDM_SEARCH_GONEXTMARKER5 :
case IDM_SEARCH_GONEXTMARKER_DEF :
{
int styleID;
if (id == IDM_SEARCH_GONEXTMARKER1)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT1;
else if (id == IDM_SEARCH_GONEXTMARKER2)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT2;
else if (id == IDM_SEARCH_GONEXTMARKER3)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT3;
else if (id == IDM_SEARCH_GONEXTMARKER4)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT4;
else if (id == IDM_SEARCH_GONEXTMARKER5)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT5;
else // (id == IDM_SEARCH_GONEXTMARKER_DEF)
styleID = SCE_UNIVERSAL_FOUND_STYLE;
goToNextIndicator(styleID);
break;
}
case IDM_SEARCH_GOPREVMARKER1 :
case IDM_SEARCH_GOPREVMARKER2 :
case IDM_SEARCH_GOPREVMARKER3 :
case IDM_SEARCH_GOPREVMARKER4 :
case IDM_SEARCH_GOPREVMARKER5 :
case IDM_SEARCH_GOPREVMARKER_DEF :
{
int styleID;
if (id == IDM_SEARCH_GOPREVMARKER1)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT1;
else if (id == IDM_SEARCH_GOPREVMARKER2)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT2;
else if (id == IDM_SEARCH_GOPREVMARKER3)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT3;
else if (id == IDM_SEARCH_GOPREVMARKER4)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT4;
else if (id == IDM_SEARCH_GOPREVMARKER5)
styleID = SCE_UNIVERSAL_FOUND_STYLE_EXT5;
else // (id == IDM_SEARCH_GOPREVMARKER_DEF)
styleID = SCE_UNIVERSAL_FOUND_STYLE;
goToPreviousIndicator(styleID);
break;
}
case IDM_SEARCH_CLEARALLMARKS :
{
_pEditView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_EXT1);
@ -4847,7 +4888,7 @@ void Notepad_plus::command(int id)
break;
case IDM_POPUP_FILE_NEW:
case IDM_SYSTRAYPOPUP_NEWDOC:
{
NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI());
::ShowWindow(_hSelf, nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW);
@ -4855,14 +4896,14 @@ void Notepad_plus::command(int id)
}
break;
case IDM_POPUP_FILE_ACTIVATE_OR_NEW:
case IDM_SYSTRAYPOPUP_ACTIVATE :
{
NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI());
::ShowWindow(_hSelf, nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW);
}
break;
case IDM_POPUP_FILE_NEW_AND_PASTE:
case IDM_SYSTRAYPOPUP_NEW_AND_PASTE:
{
NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI());
::ShowWindow(_hSelf, nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW);
@ -4876,7 +4917,7 @@ void Notepad_plus::command(int id)
}
break;
case IDM_POPUP_FILE_OPEN:
case IDM_SYSTRAYPOPUP_OPENFILE:
{
NppGUI & nppGUI = (NppGUI &)((NppParameters::getInstance())->getNppGUI());
::ShowWindow(_hSelf, nppGUI._isMaximized?SW_MAXIMIZE:SW_SHOW);
@ -4884,7 +4925,7 @@ void Notepad_plus::command(int id)
}
break;
case IDM_POPUP_CLOSE:
case IDM_SYSTRAYPOPUP_CLOSE:
{
_isPrelaunch = false;
_pTrayIco->doTrayIcon(REMOVE);
@ -9319,7 +9360,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
return TRUE;
case WM_MBUTTONUP:
command(IDM_POPUP_FILE_NEW_AND_PASTE);
command(IDM_SYSTRAYPOPUP_NEW_AND_PASTE);
return TRUE;
case WM_RBUTTONUP:
@ -9329,8 +9370,8 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
HMENU hmenu; // menu template
HMENU hTrayIconMenu; // shortcut menu
hmenu = LoadMenu(_hInst, MAKEINTRESOURCE(IDR_POPUP_MENU));
hTrayIconMenu = GetSubMenu(hmenu, 0);
hmenu = ::LoadMenu(_hInst, MAKEINTRESOURCE(IDR_SYSTRAYPOPUP_MENU));
hTrayIconMenu = ::GetSubMenu(hmenu, 0);
SetForegroundWindow(_hSelf);
TrackPopupMenu(hTrayIconMenu, TPM_LEFTALIGN, p.x, p.y, 0, _hSelf, NULL);
PostMessage(_hSelf, WM_NULL, 0, 0);
@ -9578,7 +9619,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
case NPPM_INTERNAL_CLEARINDICATOR :
{
_pEditView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_2);
_pEditView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_SMART);
return TRUE;
}
case NPPM_INTERNAL_CLEARINDICATORTAGMATCH :
@ -9698,6 +9739,68 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
return result;
}
void Notepad_plus::goToPreviousIndicator(int indicID2Search) const
{
int position = _pEditView->execute(SCI_GETCURRENTPOS);
BOOL isInIndicator = _pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, position);
int posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, position);
int posEnd;
if (isInIndicator)
{
if (posStart <= 0)
return;
posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, posStart - 1);
if (posStart <= 0)
return;
int newPos = posStart - 1;
posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
}
else
{
if (posStart <= 0)
return;
int newPos = posStart - 1;
posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
}
_pEditView->execute(SCI_SETSEL, posEnd, posStart);
_pEditView->execute(SCI_SCROLLCARET);
}
void Notepad_plus::goToNextIndicator(int indicID2Search) const
{
int position = _pEditView->execute(SCI_GETCURRENTPOS);
int docLen = _pEditView->getCurrentDocLen();
BOOL isInIndicator = _pEditView->execute(SCI_INDICATORVALUEAT, indicID2Search, position);
int posStart;
int posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, position);
if (isInIndicator)
{
if (posEnd >= docLen)
return;
posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, posEnd);
if (posEnd >= docLen)
return;
int newPos = posEnd;
posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
}
else
{
if (posEnd >= docLen)
return;
int newPos = posEnd + 1;
posStart = _pEditView->execute(SCI_INDICATORSTART, indicID2Search, newPos);
posEnd = _pEditView->execute(SCI_INDICATOREND, indicID2Search, newPos);
}
_pEditView->execute(SCI_SETSEL, posStart, posEnd);
_pEditView->execute(SCI_SCROLLCARET);
}
LRESULT CALLBACK Notepad_plus::Notepad_plus_Proc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{

2
PowerEditor/src/Notepad_plus.h
View File

@ -573,6 +573,8 @@ private:
void loadCommandlineParams(const TCHAR * commandLine, CmdLineParams * pCmdParams);
bool noOpenedDoc() const;
void goToPreviousIndicator(int indicID2Search) const;
void goToNextIndicator(int indicID2Search) const;
};
#endif //NOTEPAD_PLUS_H

43
PowerEditor/src/Notepad_plus.rc
View File

@ -74,7 +74,6 @@ IDI_VIEW_ALL_CHAR_OFF_ICON ICON "icons\\allChars_off.ico"
IDI_VIEW_INDENT_OFF_ICON ICON "icons\\indentGuide_off.ico"
IDI_VIEW_WRAP_OFF_ICON ICON "icons\\wrap_off.ico"
IDI_PRINT_OFF_ICON ICON "icons\\imprim_off.ico"
IDI_NEW_ON_ICON ICON "icons\\new_on.ico"
IDI_OPEN_ON_ICON ICON "icons\\open_on.ico"
IDI_SAVE_ON_ICON ICON "icons\\save_on.ico"
@ -140,7 +139,6 @@ IDR_COPY BITMAP "icons\\copy.bmp"
IDR_PASTE BITMAP "icons\\paste.bmp"
IDR_UNDO BITMAP "icons\\undo.bmp"
IDR_REDO BITMAP "icons\\redo.bmp"
IDR_SYNCV BITMAP "icons\\syncV.bmp"
IDR_SYNCH BITMAP "icons\\syncH.bmp"
IDR_PRINT BITMAP "icons\\print.bmp"
@ -279,6 +277,24 @@ BEGIN
MENUITEM "Using 4th Style", IDM_SEARCH_MARKALLEXT4
MENUITEM "Using 5th Style", IDM_SEARCH_MARKALLEXT5
END
POPUP "Jump up"
BEGIN
MENUITEM "1st Style", IDM_SEARCH_GOPREVMARKER1
MENUITEM "2nd Style", IDM_SEARCH_GOPREVMARKER2
MENUITEM "3rd Style", IDM_SEARCH_GOPREVMARKER3
MENUITEM "4th Style", IDM_SEARCH_GOPREVMARKER4
MENUITEM "5th Style", IDM_SEARCH_GOPREVMARKER5
MENUITEM "Find Style", IDM_SEARCH_GOPREVMARKER_DEF
END
POPUP "Jump down"
BEGIN
MENUITEM "1st Style", IDM_SEARCH_GONEXTMARKER1
MENUITEM "2nd Style", IDM_SEARCH_GONEXTMARKER2
MENUITEM "3rd Style", IDM_SEARCH_GONEXTMARKER3
MENUITEM "4th Style", IDM_SEARCH_GONEXTMARKER4
MENUITEM "5th Style", IDM_SEARCH_GONEXTMARKER5
MENUITEM "Find Style", IDM_SEARCH_GONEXTMARKER_DEF
END
POPUP "Unmark All"
BEGIN
MENUITEM "Clear 1st Style", IDM_SEARCH_UNMARKALLEXT1
@ -340,22 +356,22 @@ BEGIN
MENUITEM "Uncollapse Current Level", IDM_VIEW_UNFOLD_CURRENT
POPUP "Collapse Level"
BEGIN
MENUITEM "1" , IDM_VIEW_FOLD_1
MENUITEM "1", IDM_VIEW_FOLD_1
MENUITEM "2", IDM_VIEW_FOLD_2
MENUITEM "3", IDM_VIEW_FOLD_3
MENUITEM "4", IDM_VIEW_FOLD_4
MENUITEM "5" , IDM_VIEW_FOLD_5
MENUITEM "5", IDM_VIEW_FOLD_5
MENUITEM "6", IDM_VIEW_FOLD_6
MENUITEM "7", IDM_VIEW_FOLD_7
MENUITEM "8", IDM_VIEW_FOLD_8
END
POPUP "Uncollapse Level"
BEGIN
MENUITEM "1" , IDM_VIEW_UNFOLD_1
MENUITEM "1", IDM_VIEW_UNFOLD_1
MENUITEM "2", IDM_VIEW_UNFOLD_2
MENUITEM "3", IDM_VIEW_UNFOLD_3
MENUITEM "4", IDM_VIEW_UNFOLD_4
MENUITEM "5" , IDM_VIEW_UNFOLD_5
MENUITEM "5", IDM_VIEW_UNFOLD_5
MENUITEM "6", IDM_VIEW_UNFOLD_6
MENUITEM "7", IDM_VIEW_UNFOLD_7
MENUITEM "8", IDM_VIEW_UNFOLD_8
@ -431,7 +447,7 @@ BEGIN
MENUITEM "Properties", IDM_LANG_PROPS
MENUITEM "Python", IDM_LANG_PYTHON
MENUITEM "R", IDM_LANG_R
MENUITEM "rc resource file", IDM_LANG_RC
MENUITEM "Resource file", IDM_LANG_RC
MENUITEM "Ruby", IDM_LANG_RUBY
MENUITEM "Shell", IDM_LANG_SH
MENUITEM "Scheme", IDM_LANG_SCHEME
@ -583,7 +599,6 @@ BEGIN
MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME
MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE
MENUITEM "NpWiki++ (Online Help)", IDM_ONLINEHELP
//MENUITEM "Wiki FAQ", IDM_WIKIFAQ
MENUITEM "Forum", IDM_FORUM
MENUITEM "Get More Plugins", IDM_PLUGINSHOME
MENUITEM SEPARATOR
@ -594,18 +609,18 @@ BEGIN
MENUITEM "X", IDM_FILE_CLOSE, HELP
END
IDR_POPUP_MENU MENU
IDR_SYSTRAYPOPUP_MENU MENU
BEGIN
POPUP "Popup"
BEGIN
MENUITEM "Activate or New", IDM_POPUP_FILE_ACTIVATE_OR_NEW
MENUITEM "Activate", IDM_SYSTRAYPOPUP_ACTIVATE
MENUITEM SEPARATOR
MENUITEM "New", IDM_POPUP_FILE_NEW
MENUITEM "New and Paste", IDM_POPUP_FILE_NEW_AND_PASTE
MENUITEM "Open...", IDM_POPUP_FILE_OPEN
MENUITEM "New", IDM_SYSTRAYPOPUP_NEWDOC
MENUITEM "New and Paste", IDM_SYSTRAYPOPUP_NEW_AND_PASTE
MENUITEM "Open...", IDM_SYSTRAYPOPUP_OPENFILE
MENUITEM "Find in Files...", IDM_SEARCH_FINDINFILES
MENUITEM SEPARATOR
MENUITEM "Close Tray Icon", IDM_POPUP_CLOSE
MENUITEM "Close Tray Icon", IDM_SYSTRAYPOPUP_CLOSE
END
END

20
PowerEditor/src/Parameters.cpp
View File

@ -42,7 +42,11 @@ struct ScintillaKeyDefinition {
int redirFunctionId; //this gets set when a function is being redirected through Notepad++ if Scintilla doesnt do it properly :)
};
WinMenuKeyDefinition winKeyDefs[] = { //array of accelerator keys for all std menu items, values can be 0 for vKey, which means its unused
WinMenuKeyDefinition winKeyDefs[] = {
//array of accelerator keys for all std menu items, values can be 0 for vKey, which means its unused
//================================================================================
// {V_KEY, COMMAND_ID, Ctrl, Alt, Shift, cmdName},
//================================================================================
{VK_N, IDM_FILE_NEW, true, false, false, NULL},
{VK_O, IDM_FILE_OPEN, true, false, false, NULL},
{VK_NULL, IDM_FILE_RELOAD, false, false, false, NULL},
@ -192,6 +196,20 @@ WinMenuKeyDefinition winKeyDefs[] = { //array of accelerator keys for all std me
{VK_TAB, IDC_PREV_DOC, true, false, true, TEXT("Switch to previous document")},
{VK_TAB, IDC_NEXT_DOC, true, false, false, TEXT("Switch to next document")},
{VK_1, IDM_SEARCH_GONEXTMARKER1, true, false, false, NULL},
{VK_2, IDM_SEARCH_GONEXTMARKER2, true, false, false, NULL},
{VK_3, IDM_SEARCH_GONEXTMARKER3, true, false, false, NULL},
{VK_4, IDM_SEARCH_GONEXTMARKER4, true, false, false, NULL},
{VK_5, IDM_SEARCH_GONEXTMARKER5, true, false, false, NULL},
{VK_0, IDM_SEARCH_GONEXTMARKER_DEF, true, false, false, NULL},
{VK_1, IDM_SEARCH_GOPREVMARKER1, true, false, true, NULL},
{VK_2, IDM_SEARCH_GOPREVMARKER2, true, false, true, NULL},
{VK_3, IDM_SEARCH_GOPREVMARKER3, true, false, true, NULL},
{VK_4, IDM_SEARCH_GOPREVMARKER4, true, false, true, NULL},
{VK_5, IDM_SEARCH_GOPREVMARKER5, true, false, true, NULL},
{VK_0, IDM_SEARCH_GOPREVMARKER_DEF, true, false, true, NULL},
};

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -1569,7 +1569,7 @@ int FindReplaceDlg::processRange(ProcessOperation op, const TCHAR *txt2find, con
case ProcessMarkAll_2:
{
(*_ppEditView)->execute(SCI_SETINDICATORCURRENT, SCE_UNIVERSAL_FOUND_STYLE_2);
(*_ppEditView)->execute(SCI_SETINDICATORCURRENT, SCE_UNIVERSAL_FOUND_STYLE_SMART);
(*_ppEditView)->execute(SCI_INDICATORFILLRANGE, targetStart, foundTextLen);
break;
}

10
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -206,7 +206,7 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere)
execute(SCI_SETSCROLLWIDTH, 1); //default empty document: override default width of 2000
// smart hilighting
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_FOUND_STYLE_2, INDIC_ROUNDBOX);
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_FOUND_STYLE_SMART, INDIC_ROUNDBOX);
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_FOUND_STYLE, INDIC_ROUNDBOX);
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_FOUND_STYLE_INC, INDIC_ROUNDBOX);
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_TAGMATCH, INDIC_ROUNDBOX);
@ -217,7 +217,7 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere)
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_FOUND_STYLE_EXT4, INDIC_ROUNDBOX);
execute(SCI_INDICSETSTYLE, SCE_UNIVERSAL_FOUND_STYLE_EXT5, INDIC_ROUNDBOX);
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_FOUND_STYLE_2, 100);
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_FOUND_STYLE_SMART, 100);
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_FOUND_STYLE, 100);
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_FOUND_STYLE_INC, 100);
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_TAGMATCH, 100);
@ -228,7 +228,7 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere)
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_FOUND_STYLE_EXT4, 100);
execute(SCI_INDICSETALPHA, SCE_UNIVERSAL_FOUND_STYLE_EXT5, 100);
execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_FOUND_STYLE_2, true);
execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_FOUND_STYLE_SMART, true);
execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_FOUND_STYLE, true);
execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_FOUND_STYLE_INC, true);
execute(SCI_INDICSETUNDER, SCE_UNIVERSAL_TAGMATCH, true);
@ -993,10 +993,10 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
}
setSpecialIndicator(*pStyle);
defaultIndicatorStyle._styleID = SCE_UNIVERSAL_FOUND_STYLE_2;
defaultIndicatorStyle._styleID = SCE_UNIVERSAL_FOUND_STYLE_SMART;
defaultIndicatorStyle._bgColor = liteGreen;
pStyle = &defaultIndicatorStyle;
iFind = stylers.getStylerIndexByID(SCE_UNIVERSAL_FOUND_STYLE_2);
iFind = stylers.getStylerIndexByID(SCE_UNIVERSAL_FOUND_STYLE_SMART);
if (iFind != -1)
{
pStyle = &(stylers.getStyler(iFind));

2
PowerEditor/src/ScitillaComponent/SmartHighlighter.cpp
View File

@ -34,7 +34,7 @@ void SmartHighlighter::highlightView(ScintillaEditView * pHighlightView)
CharacterRange range = pHighlightView->getSelection();
//Clear marks
pHighlightView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_2);
pHighlightView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_SMART);
//If nothing selected, dont mark anything
if (range.cpMin == range.cpMax)

80
PowerEditor/src/menuCmdID.h
View File

@ -63,25 +63,39 @@
#define IDM_EDIT_UPPERCASE (IDM_EDIT + 16)
#define IDM_EDIT_LOWERCASE (IDM_EDIT + 17)
// 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_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)
// Menu macro
#define IDM_MACRO_SAVECURRENTMACRO (IDM_EDIT + 25)
//-----------
#define IDM_EDIT_CLEARREADONLY (IDM_EDIT+33)
#define IDM_EDIT_COLUMNMODE (IDM_EDIT+34)
#define IDM_EDIT_BLOCK_COMMENT_SET (IDM_EDIT+35)
#define IDM_EDIT_BLOCK_UNCOMMENT (IDM_EDIT+36)
#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_AUTOCOMPLETE (50000+0)
#define IDM_EDIT_AUTOCOMPLETE_CURRENTFILE (50000+1)
#define IDM_EDIT_FUNCCALLTIP (50000+2)
// Menu macro
#define IDM_MACRO_RUNMULTIMACRODLG (IDM_EDIT + 32)
//-----------
#define IDM_EDIT_CLEARREADONLY (IDM_EDIT + 33)
#define IDM_EDIT_COLUMNMODE (IDM_EDIT + 34)
#define IDM_EDIT_BLOCK_COMMENT_SET (IDM_EDIT + 35)
#define IDM_EDIT_BLOCK_UNCOMMENT (IDM_EDIT + 36)
#define IDM_EDIT_AUTOCOMPLETE (50000 + 0)
#define IDM_EDIT_AUTOCOMPLETE_CURRENTFILE (50000 + 1)
#define IDM_EDIT_FUNCCALLTIP (50000 + 2)
//Belong to MENU FILE
#define IDM_OPEN_ALL_RECENT_FILE (IDM_EDIT + 40)
@ -119,6 +133,22 @@
#define IDM_SEARCH_UNMARKALLEXT5 (IDM_SEARCH + 31)
#define IDM_SEARCH_CLEARALLMARKS (IDM_SEARCH + 32)
#define IDM_SEARCH_GOPREVMARKER1 (IDM_SEARCH + 33)
#define IDM_SEARCH_GOPREVMARKER2 (IDM_SEARCH + 34)
#define IDM_SEARCH_GOPREVMARKER3 (IDM_SEARCH + 35)
#define IDM_SEARCH_GOPREVMARKER4 (IDM_SEARCH + 36)
#define IDM_SEARCH_GOPREVMARKER5 (IDM_SEARCH + 37)
#define IDM_SEARCH_GOPREVMARKER_DEF (IDM_SEARCH + 38)
#define IDM_SEARCH_GONEXTMARKER1 (IDM_SEARCH + 39)
#define IDM_SEARCH_GONEXTMARKER2 (IDM_SEARCH + 40)
#define IDM_SEARCH_GONEXTMARKER3 (IDM_SEARCH + 41)
#define IDM_SEARCH_GONEXTMARKER4 (IDM_SEARCH + 42)
#define IDM_SEARCH_GONEXTMARKER5 (IDM_SEARCH + 43)
#define IDM_SEARCH_GONEXTMARKER_DEF (IDM_SEARCH + 44)
#define IDM_VIEW (IDM + 4000)
//#define IDM_VIEW_TOOLBAR_HIDE (IDM_VIEW + 1)
#define IDM_VIEW_TOOLBAR_REDUCE (IDM_VIEW + 2)
@ -166,7 +196,6 @@
#define IDM_VIEW_DRAWTABBAR_MULTILINE (IDM_VIEW + 44)
#define IDM_VIEW_DOCCHANGEMARGIN (IDM_VIEW + 45)
#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)
@ -187,7 +216,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_VIEW_GOTO_NEW_INSTANCE 10003
@ -195,7 +223,6 @@
#define IDM_VIEW_SWITCHTO_OTHER_VIEW (IDM_VIEW + 72)
#define IDM_FORMAT (IDM + 5000)
#define IDM_FORMAT_TODOS (IDM_FORMAT + 1)
#define IDM_FORMAT_TOUNIX (IDM_FORMAT + 2)
@ -292,28 +319,19 @@
#define IDM_SETTING_EDGE_SIZE (IDM_SETTING + 4)
#define IDM_SETTING_IMPORTPLUGIN (IDM_SETTING + 5)
#define IDM_SETTING_IMPORTSTYLETHEMS (IDM_SETTING + 6)
#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_AUTOCNBCHAR (IDM_SETTING + 15)
// 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)
#define IDM_POPUP (IDM + 3050)
#define IDM_POPUP_FILE_ACTIVATE_OR_NEW (IDM_POPUP + 1)
#define IDM_POPUP_FILE_NEW (IDM_POPUP + 2)
#define IDM_POPUP_FILE_NEW_AND_PASTE (IDM_POPUP + 3)
#define IDM_POPUP_FILE_OPEN (IDM_POPUP + 4)
#define IDM_POPUP_CLOSE (IDM_POPUP + 5)
#define IDM_SYSTRAYPOPUP (IDM + 3100)
#define IDM_SYSTRAYPOPUP_ACTIVATE (IDM_SYSTRAYPOPUP + 1)
#define IDM_SYSTRAYPOPUP_NEWDOC (IDM_SYSTRAYPOPUP + 2)
#define IDM_SYSTRAYPOPUP_NEW_AND_PASTE (IDM_SYSTRAYPOPUP + 3)
#define IDM_SYSTRAYPOPUP_OPENFILE (IDM_SYSTRAYPOPUP + 4)
#define IDM_SYSTRAYPOPUP_CLOSE (IDM_SYSTRAYPOPUP + 5)
#endif //MENUCMDID_H

2
PowerEditor/src/resource.h
View File

@ -230,7 +230,7 @@
#define IDR_M30_MENU 1500
#define IDR_POPUP_MENU 1501
#define IDR_SYSTRAYPOPUP_MENU 1501
// #define IDD_FIND_REPLACE_DLG 1600

2
scintilla/include/SciLexer.h
View File

@ -119,7 +119,7 @@
//For All lexer
#define SCE_UNIVERSAL_FOUND_STYLE 31
#define SCE_UNIVERSAL_FOUND_STYLE_2 29
#define SCE_UNIVERSAL_FOUND_STYLE_SMART 29
#define SCE_UNIVERSAL_FOUND_STYLE_INC 28
#define SCE_UNIVERSAL_TAGMATCH 27
#define SCE_UNIVERSAL_TAGATTR 26