From 28f6cd212207fa8b6a2e6cd8898aae19b677f363 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Sun, 23 Oct 2011 11:12:34 +0200
Subject: [PATCH] InputManager: removed "clear" and "manual" logical buttons.

These are not used in the GUI anymore.
---
 data/platform/dingux/input.conf   | 2 --
 data/platform/nanonote/input.conf | 2 --
 data/platform/pandora/input.conf  | 2 --
 src/inputmanager.cpp              | 2 --
 src/inputmanager.h                | 3 +--
 src/messagebox.cpp                | 2 --
 6 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/data/platform/dingux/input.conf b/data/platform/dingux/input.conf
index 4951bf8..db4d9bc 100644
--- a/data/platform/dingux/input.conf
+++ b/data/platform/dingux/input.conf
@@ -1,7 +1,5 @@
 accept=keyboard,306
 cancel=keyboard,308
-clear=keyboard,32
-manual=keyboard,304
 altleft=keyboard,9
 altright=keyboard,8
 menu=keyboard,27
diff --git a/data/platform/nanonote/input.conf b/data/platform/nanonote/input.conf
index eb64b87..44ee771 100644
--- a/data/platform/nanonote/input.conf
+++ b/data/platform/nanonote/input.conf
@@ -1,7 +1,5 @@
 cancel=keyboard,104		#NanoNote H
 accept=keyboard,13		#NanoNote Enter
-clear=keyboard,120		#NanoNote X
-manual=keyboard,121		#NanoNote Y
 altleft=keyboard,108		#NanoNote L
 altright=keyboard,9		#NanoNote Tab
 menu=keyboard,283	#Nanonote F2
diff --git a/data/platform/pandora/input.conf b/data/platform/pandora/input.conf
index 4c1d4a2..67e5ef8 100644
--- a/data/platform/pandora/input.conf
+++ b/data/platform/pandora/input.conf
@@ -1,7 +1,5 @@
 cancel=keyboard,122
 accept=keyboard,120
-clear=keyboard,115
-manual=keyboard,121
 altleft=keyboard,113
 altright=keyboard,112
 menu=keyboard,27
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index ca98acf..c9b4b7c 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -74,8 +74,6 @@ void InputManager::readConfFile(const string &conffile) {
 		else if (name == "right")    button = RIGHT;
 		else if (name == "accept")   button = ACCEPT;
 		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 == "altright") button = ALTRIGHT;
 		else if (name == "menu")     button = MENU;
diff --git a/src/inputmanager.h b/src/inputmanager.h
index e52c112..2b90c94 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -29,13 +29,12 @@ public:
 	enum Button {
 		UP, DOWN, LEFT, RIGHT,
 		ACCEPT, CANCEL,
-		CLEAR, MANUAL,
 		ALTLEFT, ALTRIGHT,
 		MENU, SETTINGS,
 		VOLUP, VOLDOWN,
 		POWER, LOCK
 	};
-	#define BUTTON_TYPE_SIZE 16
+	#define BUTTON_TYPE_SIZE 14
 
 	enum ButtonState { PRESSED, RELEASED };
 	struct ButtonEvent {
diff --git a/src/messagebox.cpp b/src/messagebox.cpp
index b09f52b..baf00c6 100644
--- a/src/messagebox.cpp
+++ b/src/messagebox.cpp
@@ -49,8 +49,6 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon)
 	buttonLabels[InputManager::RIGHT] = "right";
 	buttonLabels[InputManager::CANCEL] = "cancel";
 	buttonLabels[InputManager::ACCEPT] = "accept";
-	buttonLabels[InputManager::CLEAR] = "x";
-	buttonLabels[InputManager::MANUAL] = "y";
 	buttonLabels[InputManager::ALTLEFT] = "l";
 	buttonLabels[InputManager::ALTRIGHT] = "r";
 	buttonLabels[InputManager::SETTINGS] = "start";