qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-29 13:54:05 +02:00
Code

The files "a.png" and "b.png" have been renamed to "cancel.png" and "accept.png".

Browse Source
This commit is contained in:
Ayla 2011-09-18 03:40:33 +02:00
parent 16b050be05
commit 759eefd676
18 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/skins/320x240/Default/imgs/buttons/b.png → data/skins/320x240/Default/imgs/buttons/accept.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
data/skins/320x240/Default/imgs/buttons/a.png → data/skins/320x240/Default/imgs/buttons/cancel.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
data/skins/800x480/Default/imgs/buttons/b.png → data/skins/800x480/Default/imgs/buttons/accept.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
data/skins/800x480/Default/imgs/buttons/a.png → data/skins/800x480/Default/imgs/buttons/cancel.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

4
src/browsedialog.cpp
View File

@ -19,11 +19,11 @@ BrowseDialog::BrowseDialog(GMenu2X *gmenu2x, const string &title,
IconButton *btn; IconButton *btn;
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/left.png")); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/left.png"));
btn = new IconButton(gmenu2x, "skin:imgs/buttons/a.png", gmenu2x->tr["Up one folder"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Up one folder"]);
btn->setAction(MakeDelegate(this, &BrowseDialog::directoryUp)); btn->setAction(MakeDelegate(this, &BrowseDialog::directoryUp));
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Enter folder"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Enter folder"]);
btn->setAction(MakeDelegate(this, &BrowseDialog::directoryEnter)); btn->setAction(MakeDelegate(this, &BrowseDialog::directoryEnter));
buttonBox.add(btn); buttonBox.add(btn);

4
src/gmenu2x.cpp
View File

@ -1806,8 +1806,8 @@ void GMenu2X::deleteSection() {
void GMenu2X::scanner() { void GMenu2X::scanner() {
Surface scanbg(bg); Surface scanbg(bg);
drawButton(&scanbg, "a", tr["Exit"], drawButton(&scanbg, "cancel", tr["Exit"],
drawButton(&scanbg, "b", "", 5)-10); drawButton(&scanbg, "accept", "", 5)-10);
scanbg.write(font,tr["Link Scanner"],halfX,7,ASFont::HAlignCenter,ASFont::VAlignMiddle); scanbg.write(font,tr["Link Scanner"],halfX,7,ASFont::HAlignCenter,ASFont::VAlignMiddle);
scanbg.convertToDisplayFormat(); scanbg.convertToDisplayFormat();

4
src/inputdialog.cpp
View File

@ -93,11 +93,11 @@ InputDialog::InputDialog(GMenu2X *gmenu2x, InputManager &inputMgr_,
btnSpace->setAction(MakeDelegate(this, &InputDialog::space)); btnSpace->setAction(MakeDelegate(this, &InputDialog::space));
buttonbox->add(btnSpace); buttonbox->add(btnSpace);
IconButton *btnConfirm = new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Confirm"]); IconButton *btnConfirm = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Confirm"]);
btnConfirm->setAction(MakeDelegate(this, &InputDialog::confirm)); btnConfirm->setAction(MakeDelegate(this, &InputDialog::confirm));
buttonbox->add(btnConfirm); buttonbox->add(btnConfirm);
IconButton *btnChangeKeys = new IconButton(gmenu2x, "skin:imgs/buttons/a.png", gmenu2x->tr["Change keys"]); IconButton *btnChangeKeys = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Change keys"]);
btnChangeKeys->setAction(MakeDelegate(this, &InputDialog::changeKeys)); btnChangeKeys->setAction(MakeDelegate(this, &InputDialog::changeKeys));
buttonbox->add(btnChangeKeys); buttonbox->add(btnChangeKeys);
} }

2
src/linkapp.cpp
View File

@ -327,7 +327,7 @@ void LinkApp::showManual() {
gmenu2x->drawBottomBar(); gmenu2x->drawBottomBar();
gmenu2x->drawButton(gmenu2x->s, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(gmenu2x->s, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(gmenu2x->s, "a", "", gmenu2x->drawButton(gmenu2x->s, "cancel", "",
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))-10); gmenu2x->drawButton(gmenu2x->s, "left", "", 5)-10))-10);

2
src/menusettingbool.cpp
View File

@ -52,7 +52,7 @@ MenuSettingBool::MenuSettingBool(
void MenuSettingBool::initButton() void MenuSettingBool::initButton()
{ {
IconButton *btn = new IconButton(gmenu2x, "skin:imgs/buttons/b.png", IconButton *btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png",
gmenu2x->tr["Switch"]); gmenu2x->tr["Switch"]);
btn->setAction(MakeDelegate(this, &MenuSettingBool::toggle)); btn->setAction(MakeDelegate(this, &MenuSettingBool::toggle));
buttonBox.add(btn); buttonBox.add(btn);

4
src/menusettingdir.cpp
View File

@ -31,11 +31,11 @@ MenuSettingDir::MenuSettingDir(
{ {
IconButton *btn; IconButton *btn;
btn = new IconButton(gmenu2x, "skin:imgs/buttons/a.png", gmenu2x->tr["Clear"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Clear"]);
btn->setAction(MakeDelegate(this, &MenuSettingDir::clear)); btn->setAction(MakeDelegate(this, &MenuSettingDir::clear));
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Select a directory"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select a directory"]);
btn->setAction(MakeDelegate(this, &MenuSettingDir::edit)); btn->setAction(MakeDelegate(this, &MenuSettingDir::edit));
buttonBox.add(btn); buttonBox.add(btn);
} }

4
src/menusettingfile.cpp
View File

@ -32,11 +32,11 @@ MenuSettingFile::MenuSettingFile(
{ {
IconButton *btn; IconButton *btn;
btn = new IconButton(gmenu2x, "skin:imgs/buttons/a.png", gmenu2x->tr["Clear"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Clear"]);
btn->setAction(MakeDelegate(this, &MenuSettingFile::clear)); btn->setAction(MakeDelegate(this, &MenuSettingFile::clear));
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Select a file"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select a file"]);
btn->setAction(MakeDelegate(this, &MenuSettingFile::edit)); btn->setAction(MakeDelegate(this, &MenuSettingFile::edit));
buttonBox.add(btn); buttonBox.add(btn);
} }

4
src/menusettingrgba.cpp
View File

@ -225,10 +225,10 @@ void MenuSettingRGBA::updateButtonBox()
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/left.png", gmenu2x->tr["Decrease"])); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/left.png", gmenu2x->tr["Decrease"]));
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/r.png")); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/r.png"));
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/right.png", gmenu2x->tr["Increase"])); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/right.png", gmenu2x->tr["Increase"]));
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Confirm"])); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Confirm"]));
} else { } else {
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/left.png")); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/left.png"));
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/right.png", gmenu2x->tr["Change color component"])); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/right.png", gmenu2x->tr["Change color component"]));
buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Edit"])); buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Edit"]));
} }
} }

4
src/menusettingstring.cpp
View File

@ -34,11 +34,11 @@ MenuSettingString::MenuSettingString(
{ {
IconButton *btn; IconButton *btn;
btn = new IconButton(gmenu2x, "skin:imgs/buttons/a.png", gmenu2x->tr["Clear"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Clear"]);
btn->setAction(MakeDelegate(this, &MenuSettingString::clear)); btn->setAction(MakeDelegate(this, &MenuSettingString::clear));
buttonBox.add(btn); buttonBox.add(btn);
btn = new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Edit"]); btn = new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Edit"]);
btn->setAction(MakeDelegate(this, &MenuSettingString::edit)); btn->setAction(MakeDelegate(this, &MenuSettingString::edit));
buttonBox.add(btn); buttonBox.add(btn);
} }

4
src/messagebox.cpp
View File

@ -47,8 +47,8 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon)
buttonLabels[DOWN] = "down"; buttonLabels[DOWN] = "down";
buttonLabels[LEFT] = "left"; buttonLabels[LEFT] = "left";
buttonLabels[RIGHT] = "right"; buttonLabels[RIGHT] = "right";
buttonLabels[CANCEL] = "a"; buttonLabels[CANCEL] = "cancel";
buttonLabels[ACCEPT] = "b"; buttonLabels[ACCEPT] = "accept";
buttonLabels[CLEAR] = "x"; buttonLabels[CLEAR] = "x";
buttonLabels[MANUAL] = "y"; buttonLabels[MANUAL] = "y";
buttonLabels[ALTLEFT] = "l"; buttonLabels[ALTLEFT] = "l";

6
src/selector.cpp
View File

@ -64,12 +64,12 @@ int Selector::exec(int startSelection) {
if (link->getSelectorBrowser()) { if (link->getSelectorBrowser()) {
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(&bg, "b", gmenu2x->tr["Select a file"], gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select a file"],
gmenu2x->drawButton(&bg, "a", gmenu2x->tr["Up one folder"], gmenu2x->drawButton(&bg, "cancel", gmenu2x->tr["Up one folder"],
gmenu2x->drawButton(&bg, "left", "", 5)-10))); gmenu2x->drawButton(&bg, "left", "", 5)-10)));
} else { } else {
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(&bg, "b", gmenu2x->tr["Select a file"], 5)); gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select a file"], 5));
} }
bg.convertToDisplayFormat(); bg.convertToDisplayFormat();

2
src/textdialog.cpp
View File

@ -107,7 +107,7 @@ void TextDialog::exec() {
writeSubTitle(description,&bg); writeSubTitle(description,&bg);
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(&bg, "a", "", gmenu2x->drawButton(&bg, "cancel", "",
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);

2
src/textmanualdialog.cpp
View File

@ -75,7 +75,7 @@ void TextManualDialog::exec() {
writeTitle(title+(description.empty() ? "" : ": "+description),&bg); writeTitle(title+(description.empty() ? "" : ": "+description),&bg);
gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"],
gmenu2x->drawButton(&bg, "a", "", gmenu2x->drawButton(&bg, "cancel", "",
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"],

4
src/wallpaperdialog.cpp
View File

@ -72,8 +72,8 @@ bool WallpaperDialog::exec()
uint i, selected = 0, firstElement = 0, iY; uint i, selected = 0, firstElement = 0, iY;
ButtonBox buttonbox(gmenu2x); ButtonBox buttonbox(gmenu2x);
buttonbox.add(new IconButton(gmenu2x, "skin:imgs/buttons/b.png", gmenu2x->tr["Select wallpaper"])); buttonbox.add(new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select wallpaper"]));
buttonbox.add(new IconButton(gmenu2x, "skin:imgs/buttons/a.png", gmenu2x->tr["Exit"])); buttonbox.add(new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Exit"]));
while (!close) { while (!close) {
if (selected>firstElement+9) firstElement=selected-9; if (selected>firstElement+9) firstElement=selected-9;