qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-23 08:54:38 +02:00
Code

Modified the key shortcuts for the text display dialog.

Browse Source
This commit is contained in:
Ayla 2011-09-18 03:05:25 +02:00
parent 5dd6d31b25
commit d0cfe7c60d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/linkapp.cpp
View File

@ -326,9 +326,10 @@ void LinkApp::showManual() {
pngman->blit(gmenu2x->s, -page*320, 0); pngman->blit(gmenu2x->s, -page*320, 0);
gmenu2x->drawBottomBar(); 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, "right", gmenu2x->tr["Change page"],
gmenu2x->drawButton(gmenu2x->s, "left", "", 5)-10)); gmenu2x->drawButton(gmenu2x->s, "left", "", 5)-10))-10);
ss.clear(); ss.clear();
ss << page+1; ss << page+1;
@ -341,9 +342,8 @@ void LinkApp::showManual() {
} }
switch(inputMgr.waitForPressedButton()) { switch(inputMgr.waitForPressedButton()) {
case MANUAL:
case CLEAR:
case SETTINGS: case SETTINGS:
case CANCEL:
close = true; close = true;
break; break;
case LEFT: case LEFT:

7
src/textdialog.cpp
View File

@ -106,9 +106,10 @@ void TextDialog::exec() {
writeTitle(title,&bg); writeTitle(title,&bg);
writeSubTitle(description,&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, "down", gmenu2x->tr["Scroll"],
gmenu2x->drawButton(&bg, "up", "", 5)-10)); gmenu2x->drawButton(&bg, "up", "", 5)-10))-10);
bg.convertToDisplayFormat(); bg.convertToDisplayFormat();
@ -134,7 +135,7 @@ void TextDialog::exec() {
else firstRow = max(0, text->size() - rowsPerPage); else firstRow = max(0, text->size() - rowsPerPage);
break; break;
case SETTINGS: case SETTINGS:
case CLEAR: case CANCEL:
close = true; close = true;
break; break;
default: default:

7
src/textmanualdialog.cpp
View File

@ -74,11 +74,12 @@ void TextManualDialog::exec() {
drawTitleIcon(icon,false,&bg); drawTitleIcon(icon,false,&bg);
writeTitle(title+(description.empty() ? "" : ": "+description),&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, "right", gmenu2x->tr["Change page"],
gmenu2x->drawButton(&bg, "left", "", gmenu2x->drawButton(&bg, "left", "",
gmenu2x->drawButton(&bg, "down", gmenu2x->tr["Scroll"], gmenu2x->drawButton(&bg, "down", gmenu2x->tr["Scroll"],
gmenu2x->drawButton(&bg, "up", "", 5)-10))-10)); gmenu2x->drawButton(&bg, "up", "", 5)-10))-10))-10);
bg.convertToDisplayFormat(); bg.convertToDisplayFormat();
@ -129,8 +130,8 @@ void TextManualDialog::exec() {
if (firstRow + rowsPerPage*2 -1 < pages[page].text.size()) firstRow += rowsPerPage-1; if (firstRow + rowsPerPage*2 -1 < pages[page].text.size()) firstRow += rowsPerPage-1;
else firstRow = max(0, pages[page].text.size() - rowsPerPage); else firstRow = max(0, pages[page].text.size() - rowsPerPage);
break; break;
case CANCEL:
case SETTINGS: case SETTINGS:
case CLEAR:
close = true; close = true;
break; break;
default: default: