From 7272851afd9e3a8fcdb531900a8e5c43af417a4b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Aug 2014 21:52:57 +0300 Subject: Add parameter for button name in okdialog. --- src/client.cpp | 19 ++++++++++++++----- src/commands.cpp | 5 ++++- src/gamemodifiers.cpp | 2 ++ src/gui/dialogsmanager.cpp | 5 ++++- src/gui/widgets/tabs/setup_input.cpp | 5 ++++- src/gui/widgets/tabs/setup_theme.cpp | 10 ++++++++-- src/gui/widgets/tabs/setup_video.cpp | 23 +++++++++++++++++++---- src/gui/windows/changeemaildialog.cpp | 5 ++++- src/gui/windows/changepassworddialog.cpp | 5 ++++- src/gui/windows/charcreatedialog.cpp | 5 ++++- src/gui/windows/charselectdialog.cpp | 10 ++++++++-- src/gui/windows/editserverdialog.cpp | 5 ++++- src/gui/windows/okdialog.cpp | 5 ++--- src/gui/windows/okdialog.h | 1 + src/gui/windows/registerdialog.cpp | 3 ++- src/gui/windows/socialwindow.cpp | 5 ++++- src/gui/windows/unregisterdialog.cpp | 5 ++++- src/net/ea/charserverhandler.cpp | 15 ++++++++++++--- src/net/ea/gamehandler.cpp | 9 +++++++-- src/net/ea/playerhandler.cpp | 15 ++++++++++++--- 20 files changed, 123 insertions(+), 34 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 04b8746b2..23595b3f8 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1382,8 +1382,10 @@ int Client::gameExec() BLOCK_START("Client::gameExec STATE_LOGIN_ERROR") logger->log1("State: LOGIN ERROR"); // TRANSLATORS: error dialog header - mCurrentDialog = new OkDialog(_("Error"), - errorMessage, DialogType::ERROR, + mCurrentDialog = new OkDialog(_("Error"), errorMessage, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); mCurrentDialog->addActionListener(&loginListener); mCurrentDialog = nullptr; // OkDialog deletes itself @@ -1394,8 +1396,10 @@ int Client::gameExec() BLOCK_START("Client::gameExec STATE_ACCOUNTCHANGE_ERROR") logger->log1("State: ACCOUNT CHANGE ERROR"); // TRANSLATORS: error dialog header - mCurrentDialog = new OkDialog(_("Error"), - errorMessage, DialogType::ERROR, + mCurrentDialog = new OkDialog(_("Error"), errorMessage, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); mCurrentDialog->addActionListener(&accountListener); mCurrentDialog = nullptr; // OkDialog deletes itself @@ -1451,6 +1455,8 @@ int Client::gameExec() mCurrentDialog = new OkDialog(_("Password Change"), // TRANSLATORS: password change message text _("Password changed successfully!"), + // TRANSLATORS: ok dialog button + _("OK"), DialogType::ERROR, true, true, nullptr, 260); mCurrentDialog->addActionListener(&accountListener); mCurrentDialog = nullptr; // OkDialog deletes itself @@ -1475,7 +1481,10 @@ int Client::gameExec() // TRANSLATORS: email change message header mCurrentDialog = new OkDialog(_("Email Change"), // TRANSLATORS: email change message text - _("Email changed successfully!"), DialogType::ERROR, + _("Email changed successfully!"), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); mCurrentDialog->addActionListener(&accountListener); mCurrentDialog = nullptr; // OkDialog deletes itself diff --git a/src/commands.cpp b/src/commands.cpp index 12207be20..9eb5176d1 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -1342,7 +1342,10 @@ static int uploadUpdate(void *ptr, else { // TRANSLATORS: file uploaded message - new OkDialog(_("File uploaded"), str, DialogType::OK, + new OkDialog(_("File uploaded"), str, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, true, false, nullptr, 260); } } diff --git a/src/gamemodifiers.cpp b/src/gamemodifiers.cpp index 0c2427ac6..b0e4f668e 100644 --- a/src/gamemodifiers.cpp +++ b/src/gamemodifiers.cpp @@ -418,6 +418,8 @@ void GameModifiers::changeAwayMode() // TRANSLATORS: away message box header OkDialog *const dialog = new OkDialog(_("Away"), config.getStringValue("afkMessage"), + // TRANSLATORS: ok dialog button + _("OK"), DialogType::SILENCE, true, false, nullptr, 260); localPlayer->setAwayDialog(dialog); dialog->addActionListener(localPlayer->getAwayListener()); diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp index e456b254f..f11c7d9a1 100644 --- a/src/gui/dialogsmanager.cpp +++ b/src/gui/dialogsmanager.cpp @@ -73,7 +73,10 @@ Window *DialogsManager::openErrorDialog(const std::string &header, { if (settings.supportUrl.empty() || config.getBoolValue("hidesupport")) { - return new OkDialog(header, message, DialogType::ERROR, + return new OkDialog(header, message, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, modal, true, nullptr, 260); } else diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 50bdf96ec..b6e245c2b 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -150,7 +150,10 @@ void Setup_Input::apply() // TRANSLATORS: input settings error strprintf(_("Conflict \"%s\" and \"%s\" keys. " "Resolve them, or gameplay may result in strange behaviour."), - gettext(str1.c_str()), gettext(str2.c_str())), DialogType::ERROR, + gettext(str1.c_str()), gettext(str2.c_str())), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); } keyboard.setEnabled(true); diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index b719537f7..c74a8bade 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -306,7 +306,10 @@ void Setup_Theme::action(const ActionEvent &event) else if (eventId == ACTION_INFO) { // TRANSLATORS: theme info dialog header - new OkDialog(_("Theme info"), mThemeInfo, DialogType::OK, + new OkDialog(_("Theme info"), mThemeInfo, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, false, true, nullptr, 600); } } @@ -334,7 +337,10 @@ void Setup_Theme::apply() { // TRANSLATORS: theme message dialog new OkDialog(_("Theme Changed"), _("Restart your client for " - "the change to take effect."), DialogType::OK, + "the change to take effect."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, true, true, nullptr, 260); } diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 116541d2d..41cf19a7f 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -242,7 +242,11 @@ void Setup_Video::apply() // TRANSLATORS: video settings warning new OkDialog(_("Switching to Full Screen"), // TRANSLATORS: video settings warning - _("Restart needed for changes to take effect.")); + _("Restart needed for changes to take effect."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, + true, true, nullptr, 260); } #endif config.setValue("screen", fullscreen); @@ -263,7 +267,10 @@ void Setup_Video::apply() new OkDialog(_("Changing to OpenGL"), // TRANSLATORS: video settings warning _("Applying change to OpenGL requires restart."), - DialogType::OK, true, true, nullptr, 260); + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, + true, true, nullptr, 260); } mFps = mFpsCheckBox->isSelected() ? @@ -374,7 +381,11 @@ void Setup_Video::action(const ActionEvent &event) // TRANSLATORS: video settings warning _("Restart your client for the change to take effect.") + std::string("\n") + _("Some windows may be moved to " - "fit the lowered resolution.")); + "fit the lowered resolution."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, + true, true, nullptr, 260); } else { @@ -382,7 +393,11 @@ void Setup_Video::action(const ActionEvent &event) new OkDialog(_("Screen Resolution Changed"), // TRANSLATORS: video settings warning _("Restart your client for the change" - " to take effect.")); + " to take effect."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, + true, true, nullptr, 260); } } #else diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index d7dcbacbf..3df98f589 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -166,7 +166,10 @@ void ChangeEmailDialog::action(const ActionEvent &event) // TRANSLATORS: change email error header OkDialog *const dlg = new OkDialog(_("Error"), - errorMsg.str(), DialogType::ERROR, + errorMsg.str(), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); dlg->addActionListener(mWrongDataNoticeListener); } diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index b2ca3ebad..0ec8999dc 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -156,7 +156,10 @@ void ChangePasswordDialog::action(const ActionEvent &event) // TRANSLATORS: change password error header OkDialog *const dlg = new OkDialog(_("Error"), - errorMsg.str(), DialogType::ERROR, + errorMsg.str(), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); dlg->addActionListener(mWrongDataNoticeListener); } diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 75e552f54..765436ffb 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -368,7 +368,10 @@ void CharCreateDialog::action(const ActionEvent &event) new OkDialog(_("Error"), // TRANSLATORS: char creation error _("Your name needs to be at least 4 characters."), - DialogType::ERROR, true, this, nullptr, 260); + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, + true, this, nullptr, 260); } } else if (id == "cancel") diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 678fe09f7..17e2510bb 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -240,7 +240,10 @@ void CharSelectDialog::action(const ActionEvent &event) character->data.mAttributes[Attributes::EXP]), Units::formatCurrency( character->data.mAttributes[Attributes::MONEY]).c_str()); - new OkDialog(data->getName(), msg, DialogType::SILENCE, + new OkDialog(data->getName(), msg, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::SILENCE, true, true, nullptr, 260); } } @@ -274,7 +277,10 @@ void CharSelectDialog::action(const ActionEvent &event) { // TRANSLATORS: error message new OkDialog(_("Error"), _("Incorrect password"), - DialogType::ERROR, true, true, nullptr, 260); + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, + true, true, nullptr, 260); } mDeleteIndex = -1; } diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 1b8127eaf..a89b36562 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -194,7 +194,10 @@ void EditServerDialog::action(const ActionEvent &event) OkDialog *const dlg = new OkDialog(_("Error"), // TRANSLATORS: edit server dialog error message _("Please at least type both the address and the port " - "of the server."), DialogType::ERROR, + "of the server."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); dlg->addActionListener(this); } diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index bdb41e6a1..549723e14 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -30,8 +30,6 @@ #include "gui/fonts/font.h" -#include "utils/gettext.h" - #include "debug.h" OkDialog *weightNotice = nullptr; @@ -39,6 +37,7 @@ OkDialog *deathNotice = nullptr; OkDialog::OkDialog(const std::string &restrict title, const std::string &restrict msg, + const std::string &restrict button, const int soundEvent, const bool modal, const bool showCenter, Window *const parent, const int minWidth) : @@ -51,7 +50,7 @@ OkDialog::OkDialog(const std::string &restrict title, mTextBox->setTextWrapped(msg, minWidth); // TRANSLATORS: ok dialog button - Button *const okButton = new Button(this, _("OK"), "ok", this); + Button *const okButton = new Button(this, button, "ok", this); int width = getFont()->getWidth(title); if (width < mTextBox->getMinWidth()) diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 9db759937..f3fb09030 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -49,6 +49,7 @@ class OkDialog final : public Window, */ OkDialog(const std::string &restrict title, const std::string &restrict msg, + const std::string &restrict button, const int soundEvent, const bool modal, const bool showCenter, diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 9f19cbcf1..aca34dd5d 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -244,7 +244,8 @@ void RegisterDialog::action(const ActionEvent &event) OkDialog *const dlg = new OkDialog( // TRANSLATORS: error message - _("Error"), errorMsg, DialogType::ERROR, + _("Error"), errorMsg, _("OK"), + DialogType::ERROR, true, true, nullptr, 260); dlg->addActionListener(mWrongDataNoticeListener); } diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index aa74ad200..790bad68d 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -496,7 +496,10 @@ void SocialWindow::showPartyCreate() // TRANSLATORS: party creation message new OkDialog(_("Create Party"), _("Cannot create party. You are already in a party"), - DialogType::ERROR, true, true, this, 260); + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, + true, true, this, 260); return; } diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 40ef9d57a..aa7c67148 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -145,7 +145,10 @@ void UnRegisterDialog::action(const ActionEvent &event) // TRANSLATORS: unregister dialog. error message. OkDialog *const dlg = new OkDialog(_("Error"), - errorMsg.str(), DialogType::ERROR, + errorMsg.str(), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); dlg->addActionListener(mWrongDataNoticeListener); } diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index e0bdc0e92..870ed1413 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -201,7 +201,10 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg) break; } // TRANSLATORS: error message header - new OkDialog(_("Error"), errorMessage, DialogType::ERROR, + new OkDialog(_("Error"), errorMessage, + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, true, true, nullptr, 260); if (mCharCreateDialog) mCharCreateDialog->unlock(); @@ -217,7 +220,10 @@ void CharServerHandler::processCharDelete(Net::MessageIn &msg A_UNUSED) updateCharSelectDialog(); unlockCharSelectDialog(); // TRANSLATORS: info message - new OkDialog(_("Info"), _("Character deleted."), DialogType::OK, + new OkDialog(_("Info"), _("Character deleted."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, true, true, nullptr, 260); BLOCK_END("CharServerHandler::processCharDelete") } @@ -228,7 +234,10 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED) unlockCharSelectDialog(); // TRANSLATORS: error message new OkDialog(_("Error"), _("Failed to delete character."), - DialogType::ERROR, true, true, nullptr, 260); + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, + true, true, nullptr, 260); BLOCK_END("CharServerHandler::processCharDeleteFailed") } diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index f81121fd1..f569ef420 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -89,8 +89,13 @@ void GameHandler::processMapQuitResponse(Net::MessageIn &msg) const { if (msg.readUInt8()) { - new OkDialog(_("Game"), _("Request to quit denied!"), - DialogType::ERROR, true, true, nullptr, 260); + new OkDialog(_("Game"), + // TRANSLATORS: error message + _("Request to quit denied!"), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::ERROR, + true, true, nullptr, 260); } } diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index f7da2d321..66324eb6b 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -273,7 +273,10 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) // TRANSLATORS: weight message _("You are carrying more than " "half your weight. You are " - "unable to regain health."), DialogType::OK, + "unable to regain health."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, false, true, nullptr, 260); weightNotice->addActionListener( &weightListener); @@ -286,7 +289,10 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) // TRANSLATORS: weight message _("You are carrying less than " "half your weight. You " - "can regain health."), DialogType::OK, + "can regain health."), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, false, true, nullptr, 260); weightNotice->addActionListener( &weightListener); @@ -368,7 +374,10 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) { // TRANSLATORS: message header deathNotice = new OkDialog(_("Message"), - DeadDB::getRandomString(), DialogType::OK, + DeadDB::getRandomString(), + // TRANSLATORS: ok dialog button + _("OK"), + DialogType::OK, false, true, nullptr, 260); deathNotice->addActionListener(&deathListener); if (localPlayer->getCurrentAction() != BeingAction::DEAD) -- cgit v1.2.3-60-g2f50