From d0cfe7c60d2650429739ce6574d5e8444f5b38e3 Mon Sep 17 00:00:00 2001
From: Ayla <paul@crapouillou.net>
Date: Sun, 18 Sep 2011 03:05:25 +0200
Subject: [PATCH] Modified the key shortcuts for the text display dialog.

---
 src/linkapp.cpp          | 8 ++++----
 src/textdialog.cpp       | 7 ++++---
 src/textmanualdialog.cpp | 7 ++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index 315d6e1..2c10aae 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -326,9 +326,10 @@ void LinkApp::showManual() {
 				pngman->blit(gmenu2x->s, -page*320, 0);
 
 				gmenu2x->drawBottomBar();
-				gmenu2x->drawButton(gmenu2x->s, "x", gmenu2x->tr["Exit"],
+				gmenu2x->drawButton(gmenu2x->s, "start", gmenu2x->tr["Exit"],
+				gmenu2x->drawButton(gmenu2x->s, "a", "",
 				gmenu2x->drawButton(gmenu2x->s, "right", gmenu2x->tr["Change page"],
-				gmenu2x->drawButton(gmenu2x->s, "left", "", 5)-10));
+				gmenu2x->drawButton(gmenu2x->s, "left", "", 5)-10))-10);
 
 				ss.clear();
 				ss << page+1;
@@ -341,9 +342,8 @@ void LinkApp::showManual() {
 			}
 
             switch(inputMgr.waitForPressedButton()) {
-                case MANUAL:
-                case CLEAR:
                 case SETTINGS:
+                case CANCEL:
                     close = true;
                     break;
                 case LEFT:
diff --git a/src/textdialog.cpp b/src/textdialog.cpp
index ef809c1..3ff576d 100644
--- a/src/textdialog.cpp
+++ b/src/textdialog.cpp
@@ -106,9 +106,10 @@ void TextDialog::exec() {
 	writeTitle(title,&bg);
 	writeSubTitle(description,&bg);
 
-	gmenu2x->drawButton(&bg, "x", gmenu2x->tr["Exit"],
+	gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
+	gmenu2x->drawButton(&bg, "a", "",
 	gmenu2x->drawButton(&bg, "down", gmenu2x->tr["Scroll"],
-	gmenu2x->drawButton(&bg, "up", "", 5)-10));
+	gmenu2x->drawButton(&bg, "up", "", 5)-10))-10);
 
 	bg.convertToDisplayFormat();
 
@@ -134,7 +135,7 @@ void TextDialog::exec() {
                 else firstRow = max(0, text->size() - rowsPerPage);
                 break;
             case SETTINGS:
-            case CLEAR:
+            case CANCEL:
                 close = true;
                 break;
             default:
diff --git a/src/textmanualdialog.cpp b/src/textmanualdialog.cpp
index 6c2207f..97adea6 100644
--- a/src/textmanualdialog.cpp
+++ b/src/textmanualdialog.cpp
@@ -74,11 +74,12 @@ void TextManualDialog::exec() {
 		drawTitleIcon(icon,false,&bg);
 	writeTitle(title+(description.empty() ? "" : ": "+description),&bg);
 
-	gmenu2x->drawButton(&bg, "x", gmenu2x->tr["Exit"],
+	gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
+	gmenu2x->drawButton(&bg, "a", "",
 	gmenu2x->drawButton(&bg, "right", gmenu2x->tr["Change page"],
 	gmenu2x->drawButton(&bg, "left", "",
 	gmenu2x->drawButton(&bg, "down", gmenu2x->tr["Scroll"],
-	gmenu2x->drawButton(&bg, "up", "", 5)-10))-10));
+	gmenu2x->drawButton(&bg, "up", "", 5)-10))-10))-10);
 
 	bg.convertToDisplayFormat();
 
@@ -129,8 +130,8 @@ void TextManualDialog::exec() {
                 if (firstRow + rowsPerPage*2 -1 < pages[page].text.size()) firstRow += rowsPerPage-1;
                 else firstRow = max(0, pages[page].text.size() - rowsPerPage);
                 break;
+            case CANCEL:
             case SETTINGS:
-            case CLEAR:
                 close = true;
                 break;
             default: