tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-31 01:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[NEW_FEATURE] Add search ability into function list.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1130 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-10-12 09:10:03 +00:00
parent 73cfa3785e
commit 0da8942be8
8 changed files with 195 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -628,4 +628,11 @@ COLORREF getCtrlBgColor(HWND hWnd)
}
}
return crRet;
}
}
generic_string stringToUpper(generic_string strToConvert)
{
std::transform(strToConvert.begin(), strToConvert.end(), strToConvert.begin(), ::toupper);
return strToConvert;
}

1
PowerEditor/src/MISC/Common/Common.h
View File

@ -179,5 +179,6 @@ private:
generic_string PathRemoveFileSpec(generic_string & path);
generic_string PathAppend(generic_string &strDest, const generic_string & str2append);
COLORREF getCtrlBgColor(HWND hWnd);
generic_string stringToUpper(generic_string strToConvert);
#endif //M30_IDE_COMMUN_H

119
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -159,25 +159,28 @@ generic_string FunctionListPanel::parseSubLevel(size_t begin, size_t end, std::v
void FunctionListPanel::addInTreeStateArray(TreeStateNode tree2Update)
{
bool found = false;
for (size_t i = 0, len = _treeStates.size(); i < len; ++i)
for (size_t i = 0, len = _treeParams.size(); i < len; ++i)
{
if (_treeStates[i]._extraData == tree2Update._extraData)
if (_treeParams[i]._treeState._extraData == tree2Update._extraData)
{
_treeStates[i] = tree2Update;
_treeParams[i]._treeState = tree2Update;
found = true;
}
}
if (!found)
_treeStates.push_back(tree2Update);
{
TreeParams params;
params._treeState = tree2Update;
_treeParams.push_back(params);
}
}
TreeStateNode* FunctionListPanel::getFromTreeStateArray(generic_string fullFilePath)
{
for (size_t i = 0, len = _treeStates.size(); i < len; ++i)
for (size_t i = 0, len = _treeParams.size(); i < len; ++i)
{
if (_treeStates[i]._extraData == fullFilePath)
return &_treeStates[i];
if (_treeParams[i]._treeState._extraData == fullFilePath)
return &_treeParams[i]._treeState;
}
return NULL;
}
@ -286,12 +289,12 @@ void FunctionListPanel::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **pp
//return isOK;
}
bool FunctionListPanel::openSelection()
bool FunctionListPanel::openSelection(const TreeView & treeView)
{
TVITEM tvItem;
tvItem.mask = TVIF_IMAGE | TVIF_PARAM;
tvItem.hItem = _treeView.getSelection();
::SendMessage(_treeView.getHSelf(), TVM_GETITEM, 0,(LPARAM)&tvItem);
tvItem.hItem = treeView.getSelection();
::SendMessage(treeView.getHSelf(), TVM_GETITEM, 0,(LPARAM)&tvItem);
if (tvItem.iImage == INDEX_ROOT || tvItem.iImage == INDEX_NODE)
{
@ -308,7 +311,6 @@ bool FunctionListPanel::openSelection()
int sci_line = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, pos);
(*_ppEditView)->execute(SCI_ENSUREVISIBLE, sci_line);
//(*_ppEditView)->execute(SCI_GOTOPOS, pos);
(*_ppEditView)->scrollPosToCenter(pos);
return true;
@ -316,33 +318,31 @@ bool FunctionListPanel::openSelection()
void FunctionListPanel::notified(LPNMHDR notification)
{
if((notification->hwndFrom == _treeView.getHSelf()))
if (notification->hwndFrom == _treeView.getHSelf() || notification->hwndFrom == this->_treeViewSearchResult.getHSelf())
{
const TreeView & treeView = notification->hwndFrom == _treeView.getHSelf()?_treeView:_treeViewSearchResult;
switch (notification->code)
{
case NM_DBLCLK:
{
openSelection();
openSelection(treeView);
}
break;
case TVN_KEYDOWN:
{
//tvItem.hItem = _treeView.getSelection();
//::SendMessage(_treeView.getHSelf(), TVM_GETITEM, 0,(LPARAM)&tvItem);
LPNMTVKEYDOWN ptvkd = (LPNMTVKEYDOWN)notification;
if (ptvkd->wVKey == VK_RETURN)
{
if (!openSelection())
if (!openSelection(treeView))
{
HTREEITEM hItem = _treeView.getSelection();
_treeView.toggleExpandCollapse(hItem);
HTREEITEM hItem = treeView.getSelection();
treeView.toggleExpandCollapse(hItem);
}
}
}
break;
}
}
else if (notification->code == DMN_CLOSE)
@ -386,32 +386,74 @@ BOOL FunctionListPanel::setImageList(int root_id, int node_id, int leaf_id)
// Set image list to the tree view
TreeView_SetImageList(_treeView.getHSelf(), _hImaLst, TVSIL_NORMAL);
TreeView_SetImageList(_treeViewSearchResult.getHSelf(), _hImaLst, TVSIL_NORMAL);
return TRUE;
}
void FunctionListPanel::searchFuncAndSwitchView()
{
TCHAR text2search[MAX_PATH] ;
::SendMessage(_hSearchEdit, WM_GETTEXT, MAX_PATH, (LPARAM)text2search);
if (text2search[0] == '\0')
{
_treeViewSearchResult.display(false);
_treeView.display(true);
}
else
{
_treeViewSearchResult.removeAllItems();
const TCHAR *fn = ((*_ppEditView)->getCurrentBuffer())->getFileName();
_treeViewSearchResult.addItem(fn, NULL, INDEX_ROOT, TEXT("-1"));
_treeView.searchLeafAndBuildTree(_treeViewSearchResult, text2search, INDEX_LEAF);
_treeViewSearchResult.display(true);
_treeViewSearchResult.expand(_treeViewSearchResult.getRoot());
_treeView.display(false);
}
}
BOOL CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message)
{
case WM_INITDIALOG :
{
int editWidth = 100;
int editHeight = 20;
// Create toolbar menu
int style = WS_CHILD | WS_VISIBLE | CCS_ADJUSTABLE | TBSTYLE_AUTOSIZE | TBSTYLE_FLAT | TBSTYLE_LIST;
_hToolbarMenu = CreateWindowEx(0,TOOLBARCLASSNAME,NULL, style,
0,0,0,0,_hSelf,(HMENU)0, _hInst, NULL);
TBBUTTON tbButtons[1];
tbButtons[0].idCommand = IDC_RELOADBUTTON_FUNCLIST;
tbButtons[0].iBitmap = I_IMAGENONE;
TBBUTTON tbButtons[2];
tbButtons[0].idCommand = 0;
tbButtons[0].iBitmap = editWidth + 10;
tbButtons[0].fsState = TBSTATE_ENABLED;
tbButtons[0].fsStyle = BTNS_BUTTON | BTNS_AUTOSIZE;
tbButtons[0].iString = (INT_PTR)TEXT("Reload");
tbButtons[0].fsStyle = BTNS_SEP;
tbButtons[0].iString = 0;
tbButtons[1].idCommand = IDC_RELOADBUTTON_FUNCLIST;
tbButtons[1].iBitmap = I_IMAGENONE;
tbButtons[1].fsState = TBSTATE_ENABLED;
tbButtons[1].fsStyle = BTNS_BUTTON | BTNS_AUTOSIZE;
tbButtons[1].iString = (INT_PTR)TEXT("Reload");
SendMessage(_hToolbarMenu, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0);
SendMessage(_hToolbarMenu, TB_ADDBUTTONS, (WPARAM)sizeof(tbButtons) / sizeof(TBBUTTON), (LPARAM)&tbButtons);
SendMessage(_hToolbarMenu, TB_AUTOSIZE, 0, 0);
ShowWindow(_hToolbarMenu, SW_SHOW);
_hSearchEdit = CreateWindowEx(0L, L"Edit", NULL,
WS_CHILD | WS_BORDER | WS_VISIBLE | ES_AUTOVSCROLL,
2, 2, editWidth, editHeight,
_hToolbarMenu, (HMENU) IDC_SEARCHFIELD_FUNCLIST, _hInst, 0 );
HFONT hf = (HFONT)::GetStockObject(DEFAULT_GUI_FONT);
if (hf)
::SendMessage(_hSearchEdit, WM_SETFONT, (WPARAM)hf, MAKELPARAM(TRUE, 0));
_treeViewSearchResult.init(_hInst, _hSelf, IDC_LIST_FUNCLIST_AUX);
_treeView.init(_hInst, _hSelf, IDC_LIST_FUNCLIST);
setImageList(IDI_FUNCLIST_ROOT, IDI_FUNCLIST_NODE, IDI_FUNCLIST_LEAF);
_treeView.display();
@ -420,21 +462,37 @@ BOOL CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
case WM_DESTROY:
_treeView.destroy();
_treeViewSearchResult.destroy();
::DestroyWindow(_hToolbarMenu);
break;
case WM_COMMAND :
{
if (HIWORD(wParam) == EN_CHANGE)
{
switch (LOWORD(wParam))
{
case IDC_SEARCHFIELD_FUNCLIST:
{
searchFuncAndSwitchView();
return TRUE;
}
}
}
switch (LOWORD(wParam))
{
/*
case IDC_LIST_FUNCLIST_AUX:
case IDC_LIST_FUNCLIST:
{
if (HIWORD(wParam) == LBN_DBLCLK)
{
int i = ::SendDlgItemMessage(_hSelf, IDC_LIST_FUNCLIST, LB_GETCURSEL, 0, 0);
int ctrlID = LOWORD(wParam);
int i = ::SendDlgItemMessage(_hSelf, ctrlID, LB_GETCURSEL, 0, 0);
if (i != LB_ERR)
{
int pos = ::SendDlgItemMessage(_hSelf, IDC_LIST_FUNCLIST, LB_GETITEMDATA, i, (LPARAM)0);
int pos = ::SendDlgItemMessage(_hSelf, ctrlID, LB_GETITEMDATA, i, (LPARAM)0);
//printInt(pos);
int sci_line = (*_ppEditView)->execute(SCI_LINEFROMPOSITION, pos);
(*_ppEditView)->execute(SCI_ENSUREVISIBLE, sci_line);
@ -443,7 +501,7 @@ BOOL CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
}
}
return TRUE;
*/
case IDC_RELOADBUTTON_FUNCLIST:
{
reload();
@ -471,6 +529,11 @@ BOOL CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM
HWND hwnd = _treeView.getHSelf();
if (hwnd)
::MoveWindow(hwnd, 0, toolbarMenuRect.bottom + 2, width, height - toolbarMenuRect.bottom - 2, TRUE);
HWND hwnd_aux = _treeViewSearchResult.getHSelf();
if (hwnd_aux)
::MoveWindow(hwnd_aux, 0, toolbarMenuRect.bottom + 2, width, height - toolbarMenuRect.bottom - 2, TRUE);
break;
}

36
PowerEditor/src/WinControls/FunctionList/functionListPanel.h
View File

@ -66,10 +66,26 @@ root
*/
struct SearchParameters {
generic_string _text2Find;
bool _doSort;
SearchParameters(): _text2Find(TEXT("")), _doSort(false){
};
bool hasParams()const{
return (_text2Find != TEXT("") || _doSort);
};
};
struct TreeParams {
TreeStateNode _treeState;
SearchParameters _searchParameters;
};
class FunctionListPanel : public DockingDlgInterface {
public:
FunctionListPanel(): DockingDlgInterface(IDD_FUNCLIST_PANEL), _ppEditView(NULL) {};
FunctionListPanel(): DockingDlgInterface(IDD_FUNCLIST_PANEL), _ppEditView(NULL), _pTreeView(&_treeView) {};
void init(HINSTANCE hInst, HWND hPere, ScintillaEditView **ppEditView);
@ -88,21 +104,27 @@ public:
void removeEntry();
void modifyEntry();
void update();
/*
void parse(std::vector<foundInfo> & foundInfos, size_t begin, size_t end, const TCHAR *regExpr2search, std::vector< generic_string > dataToSearch, std::vector< generic_string > data2ToSearch, generic_string classStructName = TEXT(""));
void parse2(std::vector<foundInfo> & foundInfos, size_t begin, size_t end, const TCHAR *block, std::vector< generic_string > blockNameToSearch, const TCHAR *bodyOpenSymbol, const TCHAR *bodyCloseSymbol, const TCHAR *function, std::vector< generic_string > functionToSearch);
*/
void searchFuncAndSwitchView();
protected:
virtual BOOL CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
private:
HWND _hToolbarMenu;
HWND _hSearchEdit;
TreeView *_pTreeView;
TreeView _treeView;
TreeView _treeViewSearchResult;
//SearchParameters _searchParams;
ScintillaEditView **_ppEditView;
FunctionParsersManager _funcParserMgr;
std::vector<FuncInfo> _funcInfos;
std::vector< std::pair<int, int> > _skipZones;
std::vector<TreeStateNode> _treeStates;
//std::vector<TreeStateNode> _treeStates;
std::vector<TreeParams> _treeParams;
HIMAGELIST _hImaLst;
generic_string parseSubLevel(size_t begin, size_t end, std::vector< generic_string > dataToSearch, int & foundPos);
size_t getBodyClosePos(size_t begin, const TCHAR *bodyOpenSymbol, const TCHAR *bodyCloseSymbol);
@ -110,6 +132,6 @@ private:
void addInTreeStateArray(TreeStateNode tree2Update);
TreeStateNode* getFromTreeStateArray(generic_string fullFilePath);
BOOL setImageList(int root_id, int node_id, int leaf_id);
bool openSelection();
bool openSelection(const TreeView &treeView);
};
#endif // FUNCLISTPANEL_H

7
PowerEditor/src/WinControls/FunctionList/functionListPanel_rc.h
View File

@ -30,9 +30,10 @@
#define IDD_FUNCLISTPANEL_RC_H
#define IDD_FUNCLIST_PANEL 3400
#define IDC_LIST_FUNCLIST (IDD_FUNCLIST_PANEL + 1)
#define IDC_RELOADBUTTON_FUNCLIST (IDD_FUNCLIST_PANEL + 2)
#define IDC_SEARCHFIELD_FUNCLIST (IDD_FUNCLIST_PANEL + 3)
#define IDC_LIST_FUNCLIST (IDD_FUNCLIST_PANEL + 1)
#define IDC_LIST_FUNCLIST_AUX (IDD_FUNCLIST_PANEL + 2)
#define IDC_RELOADBUTTON_FUNCLIST (IDD_FUNCLIST_PANEL + 3)
#define IDC_SEARCHFIELD_FUNCLIST (IDD_FUNCLIST_PANEL + 4)
#endif //IDD_FUNCLISTPANEL_RC_H

56
PowerEditor/src/WinControls/ProjectPanel/TreeView.cpp
View File

@ -487,6 +487,62 @@ bool TreeView::canDragOut(HTREEITEM targetItem)
return true;
}
bool TreeView::searchLeafAndBuildTree(TreeView & tree2Build, const generic_string & text2Search, int index2Search)
{
//tree2Build.removeAllItems();
//HTREEITEM root = getRoot();
return searchLeafRecusivelyAndBuildTree(tree2Build.getRoot(), text2Search, index2Search, getRoot());
}
bool TreeView::searchLeafRecusivelyAndBuildTree(HTREEITEM tree2Build, const generic_string & text2Search, int index2Search, HTREEITEM tree2Search)
{
if (!tree2Search)
return false;
TCHAR textBuffer[MAX_PATH];
TVITEM tvItem;
tvItem.hItem = tree2Search;
tvItem.pszText = textBuffer;
tvItem.cchTextMax = MAX_PATH;
tvItem.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
SendMessage(_hSelf, TVM_GETITEM, 0,(LPARAM)&tvItem);
if (tvItem.iImage == index2Search)
{
generic_string itemNameUpperCase = stringToUpper(tvItem.pszText);
generic_string text2SearchUpperCase = stringToUpper(text2Search);
size_t res = itemNameUpperCase.find(text2SearchUpperCase);
if (res != generic_string::npos)
{
if (tvItem.lParam)
{
tvItem.lParam = (LPARAM)(new generic_string(*((generic_string *)(tvItem.lParam))));
}
TVINSERTSTRUCT tvInsertStruct;
tvInsertStruct.item = tvItem;
tvInsertStruct.hInsertAfter = (HTREEITEM)TVI_LAST;
tvInsertStruct.hParent = tree2Build;
::SendMessage(_hSelf, TVM_INSERTITEM, 0, (LPARAM)(LPTVINSERTSTRUCT)&tvInsertStruct);
}
}
size_t i = 0;
bool isOk = true;
for (HTREEITEM hItem = getChildFrom(tree2Search); hItem != NULL; hItem = getNextSibling(hItem))
{
isOk = searchLeafRecusivelyAndBuildTree(tree2Build, text2Search, index2Search, hItem);
if (!isOk)
break;
++i;
}
return isOk;
}
bool TreeView::retrieveFoldingStateTo(TreeStateNode & treeState2Construct, HTREEITEM treeviewNode)
{
if (!treeviewNode)

2
PowerEditor/src/WinControls/ProjectPanel/TreeView.h
View File

@ -107,6 +107,7 @@ public:
bool swapTreeViewItem(HTREEITEM itemGoDown, HTREEITEM itemGoUp);
bool restoreFoldingStateFrom(const TreeStateNode & treeState2Compare, HTREEITEM treeviewNode);
bool retrieveFoldingStateTo(TreeStateNode & treeState2Construct, HTREEITEM treeviewNode);
bool searchLeafAndBuildTree(TreeView & tree2Build, const generic_string & text2Search, int index2Search);
protected:
WNDPROC _defaultProc;
@ -117,6 +118,7 @@ protected:
};
void cleanSubEntries(HTREEITEM hTreeItem);
void dupTree(HTREEITEM hTree2Dup, HTREEITEM hParentItem);
bool searchLeafRecusivelyAndBuildTree(HTREEITEM tree2Build, const generic_string & text2Search, int index2Search, HTREEITEM tree2Search);
// Drag and Drop operations
HTREEITEM _draggedItem;

4
PowerEditor/src/functionList.xml
View File

@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
For learning making your language parser, please check the following link:
http://notepad-plus-plus.org/features/function-list.html
-->
<NotepadPlus>
<functionList>
<associationMap>