qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-12-29 13:38:58 +02:00
Code

Drop enum constants of unsupported button actions

Browse Source
This commit is contained in:
Paul Cercueil 2013-07-29 01:33:48 -04:00
parent e0109dfe55
commit 152ed5cb29
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/inputmanager.cpp
View File

@ -81,10 +81,6 @@ void InputManager::readConfFile(const string &conffile) {
else if (name == "altright") button = ALTRIGHT; else if (name == "altright") button = ALTRIGHT;
else if (name == "menu") button = MENU; else if (name == "menu") button = MENU;
else if (name == "settings") button = SETTINGS; else if (name == "settings") button = SETTINGS;
else if (name == "volup") button = VOLUP;
else if (name == "voldown") button = VOLDOWN;
else if (name == "power") button = POWER;
else if (name == "lock") button = LOCK;
else { else {
WARNING("InputManager: Ignoring unknown button name \"%s\"\n", WARNING("InputManager: Ignoring unknown button name \"%s\"\n",
name.c_str()); name.c_str());

4
src/inputmanager.h
View File

@ -40,11 +40,9 @@ public:
ACCEPT, CANCEL, ACCEPT, CANCEL,
ALTLEFT, ALTRIGHT, ALTLEFT, ALTRIGHT,
MENU, SETTINGS, MENU, SETTINGS,
VOLUP, VOLDOWN,
POWER, LOCK,
REPAINT, REPAINT,
}; };
#define BUTTON_TYPE_SIZE 14 #define BUTTON_TYPE_SIZE 10
enum ButtonState { PRESSED, RELEASED }; enum ButtonState { PRESSED, RELEASED };
struct ButtonEvent { struct ButtonEvent {

2
src/messagebox.cpp
View File

@ -52,8 +52,6 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon)
buttonLabels[InputManager::ALTRIGHT] = "r"; buttonLabels[InputManager::ALTRIGHT] = "r";
buttonLabels[InputManager::SETTINGS] = "start"; buttonLabels[InputManager::SETTINGS] = "start";
buttonLabels[InputManager::MENU] = "select"; buttonLabels[InputManager::MENU] = "select";
buttonLabels[InputManager::VOLUP] = "vol+";
buttonLabels[InputManager::VOLDOWN] = "vol-";
} }
void MessageBox::setButton(InputManager::Button button, const string &label) { void MessageBox::setButton(InputManager::Button button, const string &label) {