summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-18 21:26:04 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-18 21:26:04 +0300
commite21479ccc48ed8383a6ab72f45c43e12e8dffa69 (patch)
tree2882139edd93b0e3ae72fc541b366ed7246e46b2 /src/gui/windows
parent506a064c94e44d4f896fa9b2dc74d30e7f7f8c33 (diff)
downloadmv-e21479ccc48ed8383a6ab72f45c43e12e8dffa69.tar.gz
mv-e21479ccc48ed8383a6ab72f45c43e12e8dffa69.tar.bz2
mv-e21479ccc48ed8383a6ab72f45c43e12e8dffa69.tar.xz
mv-e21479ccc48ed8383a6ab72f45c43e12e8dffa69.zip
Remove default values from okdialog constructor.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/changeemaildialog.cpp3
-rw-r--r--src/gui/windows/changepassworddialog.cpp3
-rw-r--r--src/gui/windows/charcreatedialog.cpp2
-rw-r--r--src/gui/windows/charselectdialog.cpp5
-rw-r--r--src/gui/windows/editserverdialog.cpp3
-rw-r--r--src/gui/windows/okdialog.h10
-rw-r--r--src/gui/windows/registerdialog.cpp3
-rw-r--r--src/gui/windows/socialwindow.cpp2
-rw-r--r--src/gui/windows/unregisterdialog.cpp3
9 files changed, 20 insertions, 14 deletions
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index f67a01584..d7dcbacbf 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -166,7 +166,8 @@ void ChangeEmailDialog::action(const ActionEvent &event)
// TRANSLATORS: change email error header
OkDialog *const dlg = new OkDialog(_("Error"),
- errorMsg.str(), DialogType::ERROR);
+ errorMsg.str(), DialogType::ERROR,
+ true, true, nullptr, 260);
dlg->addActionListener(mWrongDataNoticeListener);
}
else
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index c2bb85c21..b2ca3ebad 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -156,7 +156,8 @@ void ChangePasswordDialog::action(const ActionEvent &event)
// TRANSLATORS: change password error header
OkDialog *const dlg = new OkDialog(_("Error"),
- errorMsg.str(), DialogType::ERROR);
+ errorMsg.str(), DialogType::ERROR,
+ true, true, nullptr, 260);
dlg->addActionListener(mWrongDataNoticeListener);
}
else
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index ddd6ac873..75e552f54 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -368,7 +368,7 @@ 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);
+ 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 70d8cc4e1..678fe09f7 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -240,7 +240,8 @@ 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, DialogType::SILENCE,
+ true, true, nullptr, 260);
}
}
if (eventId == "switch")
@@ -273,7 +274,7 @@ void CharSelectDialog::action(const ActionEvent &event)
{
// TRANSLATORS: error message
new OkDialog(_("Error"), _("Incorrect password"),
- DialogType::ERROR);
+ DialogType::ERROR, true, true, nullptr, 260);
}
mDeleteIndex = -1;
}
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index d72cdf368..1b8127eaf 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -194,7 +194,8 @@ 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."), DialogType::ERROR,
+ true, true, nullptr, 260);
dlg->addActionListener(this);
}
else
diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h
index 5017207cd..9db759937 100644
--- a/src/gui/windows/okdialog.h
+++ b/src/gui/windows/okdialog.h
@@ -49,11 +49,11 @@ class OkDialog final : public Window,
*/
OkDialog(const std::string &restrict title,
const std::string &restrict msg,
- const int soundEvent = DialogType::OK,
- const bool modal = true,
- const bool showCenter = true,
- Window *const parent = nullptr,
- const int minWidth = 260);
+ const int soundEvent,
+ const bool modal,
+ const bool showCenter,
+ Window *const parent,
+ const int minWidth);
A_DELETE_COPY(OkDialog)
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index edcac1bda..9f19cbcf1 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, DialogType::ERROR,
+ true, true, nullptr, 260);
dlg->addActionListener(mWrongDataNoticeListener);
}
else
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index bbfa91a81..aa74ad200 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -496,7 +496,7 @@ 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);
+ DialogType::ERROR, true, true, this, 260);
return;
}
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index ad0b98e0e..40ef9d57a 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -145,7 +145,8 @@ void UnRegisterDialog::action(const ActionEvent &event)
// TRANSLATORS: unregister dialog. error message.
OkDialog *const dlg = new OkDialog(_("Error"),
- errorMsg.str(), DialogType::ERROR);
+ errorMsg.str(), DialogType::ERROR,
+ true, true, nullptr, 260);
dlg->addActionListener(mWrongDataNoticeListener);
}
else