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/net/ea/charserverhandler.cpp | 15 ++++++++++++--- src/net/ea/gamehandler.cpp | 9 +++++++-- src/net/ea/playerhandler.cpp | 15 ++++++++++++--- 3 files changed, 31 insertions(+), 8 deletions(-) (limited to 'src/net') 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-70-g09d2