CMenuWidget: add action keys

Conflicts:
	src/gui/widget/menue.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d187e56da
Author: martii <m4rtii@gmx.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-04-07 15:05:43 +02:00
committed by [CST] Focus
parent 2d41d8a39b
commit 3f20773129
2 changed files with 32 additions and 4 deletions

View File

@@ -435,6 +435,8 @@ class CMenuWidget : public CMenuTarget
CFrameBuffer *frameBuffer;
std::vector<CMenuItem*> items;
std::vector<int> page_start;
struct keyAction { std::string action; CMenuTarget *menue; };
std::map<neutrino_msg_t, keyAction> keyActionMap;
std::string iconfile;
int min_width;
@@ -514,6 +516,7 @@ class CMenuWidget : public CMenuTarget
MENU_POS_BOTTOM_LEFT ,
MENU_POS_BOTTOM_RIGHT
};
void addKey(neutrino_msg_t key, CMenuTarget *menue, const std::string &action);
};
class CPINProtection