qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 09:10:17 +02:00
Code

InputManager: removed "clear" and "manual" logical buttons.

Browse Source 
These are not used in the GUI anymore.
This commit is contained in:
Maarten ter Huurne 2011-10-23 11:12:34 +02:00
parent a685b436ec
commit 28f6cd2122
6 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/platform/dingux/input.conf
View File

@ -1,7 +1,5 @@
accept=keyboard,306 accept=keyboard,306
cancel=keyboard,308 cancel=keyboard,308
clear=keyboard,32
manual=keyboard,304
altleft=keyboard,9 altleft=keyboard,9
altright=keyboard,8 altright=keyboard,8
menu=keyboard,27 menu=keyboard,27

2
data/platform/nanonote/input.conf
View File

@ -1,7 +1,5 @@
cancel=keyboard,104 #NanoNote H cancel=keyboard,104 #NanoNote H
accept=keyboard,13 #NanoNote Enter accept=keyboard,13 #NanoNote Enter
clear=keyboard,120 #NanoNote X
manual=keyboard,121 #NanoNote Y
altleft=keyboard,108 #NanoNote L altleft=keyboard,108 #NanoNote L
altright=keyboard,9 #NanoNote Tab altright=keyboard,9 #NanoNote Tab
menu=keyboard,283 #Nanonote F2 menu=keyboard,283 #Nanonote F2

2
data/platform/pandora/input.conf
View File

@ -1,7 +1,5 @@
cancel=keyboard,122 cancel=keyboard,122
accept=keyboard,120 accept=keyboard,120
clear=keyboard,115
manual=keyboard,121
altleft=keyboard,113 altleft=keyboard,113
altright=keyboard,112 altright=keyboard,112
menu=keyboard,27 menu=keyboard,27

2
src/inputmanager.cpp
View File

@ -74,8 +74,6 @@ void InputManager::readConfFile(const string &conffile) {
else if (name == "right") button = RIGHT; else if (name == "right") button = RIGHT;
else if (name == "accept") button = ACCEPT; else if (name == "accept") button = ACCEPT;
else if (name == "cancel") button = CANCEL; else if (name == "cancel") button = CANCEL;
else if (name == "clear") button = CLEAR;
else if (name == "manual") button = MANUAL;
else if (name == "altleft") button = ALTLEFT; else if (name == "altleft") button = ALTLEFT;
else if (name == "altright") button = ALTRIGHT; else if (name == "altright") button = ALTRIGHT;
else if (name == "menu") button = MENU; else if (name == "menu") button = MENU;

3
src/inputmanager.h
View File

@ -29,13 +29,12 @@ public:
enum Button { enum Button {
UP, DOWN, LEFT, RIGHT, UP, DOWN, LEFT, RIGHT,
ACCEPT, CANCEL, ACCEPT, CANCEL,
CLEAR, MANUAL,
ALTLEFT, ALTRIGHT, ALTLEFT, ALTRIGHT,
MENU, SETTINGS, MENU, SETTINGS,
VOLUP, VOLDOWN, VOLUP, VOLDOWN,
POWER, LOCK POWER, LOCK
}; };
#define BUTTON_TYPE_SIZE 16 #define BUTTON_TYPE_SIZE 14
enum ButtonState { PRESSED, RELEASED }; enum ButtonState { PRESSED, RELEASED };
struct ButtonEvent { struct ButtonEvent {

2
src/messagebox.cpp
View File

@ -49,8 +49,6 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon)
buttonLabels[InputManager::RIGHT] = "right"; buttonLabels[InputManager::RIGHT] = "right";
buttonLabels[InputManager::CANCEL] = "cancel"; buttonLabels[InputManager::CANCEL] = "cancel";
buttonLabels[InputManager::ACCEPT] = "accept"; buttonLabels[InputManager::ACCEPT] = "accept";
buttonLabels[InputManager::CLEAR] = "x";
buttonLabels[InputManager::MANUAL] = "y";
buttonLabels[InputManager::ALTLEFT] = "l"; buttonLabels[InputManager::ALTLEFT] = "l";
buttonLabels[InputManager::ALTRIGHT] = "r"; buttonLabels[InputManager::ALTRIGHT] = "r";
buttonLabels[InputManager::SETTINGS] = "start"; buttonLabels[InputManager::SETTINGS] = "start";