From 759eefd6766b46e0f1700233844dc22ba8a16beb Mon Sep 17 00:00:00 2001 From: Ayla Date: Sun, 18 Sep 2011 03:40:33 +0200 Subject: [PATCH] The files "a.png" and "b.png" have been renamed to "cancel.png" and "accept.png". --- .../Default/imgs/buttons/{b.png => accept.png} | Bin .../Default/imgs/buttons/{a.png => cancel.png} | Bin .../Default/imgs/buttons/{b.png => accept.png} | Bin .../Default/imgs/buttons/{a.png => cancel.png} | Bin src/browsedialog.cpp | 4 ++-- src/gmenu2x.cpp | 4 ++-- src/inputdialog.cpp | 4 ++-- src/linkapp.cpp | 2 +- src/menusettingbool.cpp | 2 +- src/menusettingdir.cpp | 4 ++-- src/menusettingfile.cpp | 4 ++-- src/menusettingrgba.cpp | 4 ++-- src/menusettingstring.cpp | 4 ++-- src/messagebox.cpp | 4 ++-- src/selector.cpp | 6 +++--- src/textdialog.cpp | 2 +- src/textmanualdialog.cpp | 2 +- src/wallpaperdialog.cpp | 4 ++-- 18 files changed, 25 insertions(+), 25 deletions(-) rename data/skins/320x240/Default/imgs/buttons/{b.png => accept.png} (100%) rename data/skins/320x240/Default/imgs/buttons/{a.png => cancel.png} (100%) rename data/skins/800x480/Default/imgs/buttons/{b.png => accept.png} (100%) rename data/skins/800x480/Default/imgs/buttons/{a.png => cancel.png} (100%) diff --git a/data/skins/320x240/Default/imgs/buttons/b.png b/data/skins/320x240/Default/imgs/buttons/accept.png similarity index 100% rename from data/skins/320x240/Default/imgs/buttons/b.png rename to data/skins/320x240/Default/imgs/buttons/accept.png diff --git a/data/skins/320x240/Default/imgs/buttons/a.png b/data/skins/320x240/Default/imgs/buttons/cancel.png similarity index 100% rename from data/skins/320x240/Default/imgs/buttons/a.png rename to data/skins/320x240/Default/imgs/buttons/cancel.png diff --git a/data/skins/800x480/Default/imgs/buttons/b.png b/data/skins/800x480/Default/imgs/buttons/accept.png similarity index 100% rename from data/skins/800x480/Default/imgs/buttons/b.png rename to data/skins/800x480/Default/imgs/buttons/accept.png diff --git a/data/skins/800x480/Default/imgs/buttons/a.png b/data/skins/800x480/Default/imgs/buttons/cancel.png similarity index 100% rename from data/skins/800x480/Default/imgs/buttons/a.png rename to data/skins/800x480/Default/imgs/buttons/cancel.png diff --git a/src/browsedialog.cpp b/src/browsedialog.cpp index 2e9d5ad..5e564eb 100644 --- a/src/browsedialog.cpp +++ b/src/browsedialog.cpp @@ -19,11 +19,11 @@ BrowseDialog::BrowseDialog(GMenu2X *gmenu2x, const string &title, IconButton *btn; 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)); 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)); buttonBox.add(btn); diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index f1ee019..3992478 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -1806,8 +1806,8 @@ void GMenu2X::deleteSection() { void GMenu2X::scanner() { Surface scanbg(bg); - drawButton(&scanbg, "a", tr["Exit"], - drawButton(&scanbg, "b", "", 5)-10); + drawButton(&scanbg, "cancel", tr["Exit"], + drawButton(&scanbg, "accept", "", 5)-10); scanbg.write(font,tr["Link Scanner"],halfX,7,ASFont::HAlignCenter,ASFont::VAlignMiddle); scanbg.convertToDisplayFormat(); diff --git a/src/inputdialog.cpp b/src/inputdialog.cpp index 34e79bb..5ecd2ff 100644 --- a/src/inputdialog.cpp +++ b/src/inputdialog.cpp @@ -93,11 +93,11 @@ InputDialog::InputDialog(GMenu2X *gmenu2x, InputManager &inputMgr_, btnSpace->setAction(MakeDelegate(this, &InputDialog::space)); 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)); 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)); buttonbox->add(btnChangeKeys); } diff --git a/src/linkapp.cpp b/src/linkapp.cpp index 2c10aae..108d259 100644 --- a/src/linkapp.cpp +++ b/src/linkapp.cpp @@ -327,7 +327,7 @@ void LinkApp::showManual() { gmenu2x->drawBottomBar(); 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, "left", "", 5)-10))-10); diff --git a/src/menusettingbool.cpp b/src/menusettingbool.cpp index ba5f9a9..d45e858 100644 --- a/src/menusettingbool.cpp +++ b/src/menusettingbool.cpp @@ -52,7 +52,7 @@ MenuSettingBool::MenuSettingBool( 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"]); btn->setAction(MakeDelegate(this, &MenuSettingBool::toggle)); buttonBox.add(btn); diff --git a/src/menusettingdir.cpp b/src/menusettingdir.cpp index e3d7164..457a101 100644 --- a/src/menusettingdir.cpp +++ b/src/menusettingdir.cpp @@ -31,11 +31,11 @@ MenuSettingDir::MenuSettingDir( { 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)); 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)); buttonBox.add(btn); } diff --git a/src/menusettingfile.cpp b/src/menusettingfile.cpp index 16b8462..7aa43ff 100644 --- a/src/menusettingfile.cpp +++ b/src/menusettingfile.cpp @@ -32,11 +32,11 @@ MenuSettingFile::MenuSettingFile( { 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)); 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)); buttonBox.add(btn); } diff --git a/src/menusettingrgba.cpp b/src/menusettingrgba.cpp index 2eab953..0b416a3 100644 --- a/src/menusettingrgba.cpp +++ b/src/menusettingrgba.cpp @@ -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/r.png")); 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 { 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/b.png", gmenu2x->tr["Edit"])); + buttonBox.add(new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Edit"])); } } diff --git a/src/menusettingstring.cpp b/src/menusettingstring.cpp index 3215c2a..0d8107b 100644 --- a/src/menusettingstring.cpp +++ b/src/menusettingstring.cpp @@ -34,11 +34,11 @@ MenuSettingString::MenuSettingString( { 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)); 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)); buttonBox.add(btn); } diff --git a/src/messagebox.cpp b/src/messagebox.cpp index 93c08e6..344d186 100644 --- a/src/messagebox.cpp +++ b/src/messagebox.cpp @@ -47,8 +47,8 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon) buttonLabels[DOWN] = "down"; buttonLabels[LEFT] = "left"; buttonLabels[RIGHT] = "right"; - buttonLabels[CANCEL] = "a"; - buttonLabels[ACCEPT] = "b"; + buttonLabels[CANCEL] = "cancel"; + buttonLabels[ACCEPT] = "accept"; buttonLabels[CLEAR] = "x"; buttonLabels[MANUAL] = "y"; buttonLabels[ALTLEFT] = "l"; diff --git a/src/selector.cpp b/src/selector.cpp index 94588e0..6cc03f5 100644 --- a/src/selector.cpp +++ b/src/selector.cpp @@ -64,12 +64,12 @@ int Selector::exec(int startSelection) { if (link->getSelectorBrowser()) { gmenu2x->drawButton(&bg, "start", gmenu2x->tr["Exit"], - gmenu2x->drawButton(&bg, "b", gmenu2x->tr["Select a file"], - gmenu2x->drawButton(&bg, "a", gmenu2x->tr["Up one folder"], + gmenu2x->drawButton(&bg, "accept", gmenu2x->tr["Select a file"], + gmenu2x->drawButton(&bg, "cancel", gmenu2x->tr["Up one folder"], gmenu2x->drawButton(&bg, "left", "", 5)-10))); } else { 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(); diff --git a/src/textdialog.cpp b/src/textdialog.cpp index 3ff576d..ce8415f 100644 --- a/src/textdialog.cpp +++ b/src/textdialog.cpp @@ -107,7 +107,7 @@ void TextDialog::exec() { writeSubTitle(description,&bg); 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, "up", "", 5)-10))-10); diff --git a/src/textmanualdialog.cpp b/src/textmanualdialog.cpp index 97adea6..d6388dc 100644 --- a/src/textmanualdialog.cpp +++ b/src/textmanualdialog.cpp @@ -75,7 +75,7 @@ void TextManualDialog::exec() { writeTitle(title+(description.empty() ? "" : ": "+description),&bg); 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, "left", "", gmenu2x->drawButton(&bg, "down", gmenu2x->tr["Scroll"], diff --git a/src/wallpaperdialog.cpp b/src/wallpaperdialog.cpp index 53c7691..57f0f57 100644 --- a/src/wallpaperdialog.cpp +++ b/src/wallpaperdialog.cpp @@ -72,8 +72,8 @@ bool WallpaperDialog::exec() uint i, selected = 0, firstElement = 0, iY; 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/a.png", gmenu2x->tr["Exit"])); + buttonbox.add(new IconButton(gmenu2x, "skin:imgs/buttons/accept.png", gmenu2x->tr["Select wallpaper"])); + buttonbox.add(new IconButton(gmenu2x, "skin:imgs/buttons/cancel.png", gmenu2x->tr["Exit"])); while (!close) { if (selected>firstElement+9) firstElement=selected-9;