summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-21 22:00:30 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-21 22:00:30 +0300
commit76dc498cd50fb5bc83b3d0a165df17781af35979 (patch)
tree6513853d484fa36e282afc2865e8e98f69100aeb /src/gui/widgets/tabs
parentba307a72cb8bcfe068e362fab4a5e572d9ac65e9 (diff)
downloadmv-76dc498cd50fb5bc83b3d0a165df17781af35979.tar.gz
mv-76dc498cd50fb5bc83b3d0a165df17781af35979.tar.bz2
mv-76dc498cd50fb5bc83b3d0a165df17781af35979.tar.xz
mv-76dc498cd50fb5bc83b3d0a165df17781af35979.zip
Call postInit after each window creation.
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp8
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp16
3 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 4eb81bc4a..f1752d781 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -155,7 +155,7 @@ void Setup_Input::apply()
const std::string str2 = keyToString(key2);
// TRANSLATORS: input settings error header
- new OkDialog(_("Key Conflict(s) Detected."),
+ (new OkDialog(_("Key Conflict(s) Detected."),
// TRANSLATORS: input settings error
strprintf(_("Conflict \"%s\" and \"%s\" keys. "
"Resolve them, or gameplay may result in strange behaviour."),
@@ -166,7 +166,7 @@ void Setup_Input::apply()
Modal_true,
ShowCenter_true,
nullptr,
- 260);
+ 260))->postInit();
}
keyboard.setEnabled(true);
inputManager.store();
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 9efba0897..54015d788 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -307,14 +307,14 @@ void Setup_Theme::action(const ActionEvent &event)
else if (eventId == ACTION_INFO)
{
// TRANSLATORS: theme info dialog header
- new OkDialog(_("Theme info"), mThemeInfo,
+ (new OkDialog(_("Theme info"), mThemeInfo,
// TRANSLATORS: ok dialog button
_("OK"),
DialogType::OK,
Modal_false,
ShowCenter_true,
nullptr,
- 600);
+ 600))->postInit();
}
}
@@ -340,7 +340,7 @@ void Setup_Theme::apply()
if (config.getStringValue("theme") != mTheme)
{
// TRANSLATORS: theme message dialog
- new OkDialog(_("Theme Changed"),
+ (new OkDialog(_("Theme Changed"),
// TRANSLATORS: ok dialog message
_("Restart your client for the change to take effect."),
// TRANSLATORS: ok dialog button
@@ -349,7 +349,7 @@ void Setup_Theme::apply()
Modal_true,
ShowCenter_true,
nullptr,
- 260);
+ 260))->postInit();
}
config.setValue("selectedSkin", "");
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index c2ee237e5..9acd36f86 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -243,7 +243,7 @@ void Setup_Video::apply()
else
{
// TRANSLATORS: video settings warning
- new OkDialog(_("Switching to Full Screen"),
+ (new OkDialog(_("Switching to Full Screen"),
// TRANSLATORS: video settings warning
_("Restart needed for changes to take effect."),
// TRANSLATORS: ok dialog button
@@ -252,7 +252,7 @@ void Setup_Video::apply()
Modal_true,
ShowCenter_true,
nullptr,
- 260);
+ 260))->postInit();
}
#endif
config.setValue("screen", fullscreen);
@@ -270,7 +270,7 @@ void Setup_Video::apply()
// OpenGL can currently only be changed by restarting, notify user.
// TRANSLATORS: video settings warning
- new OkDialog(_("Changing to OpenGL"),
+ (new OkDialog(_("Changing to OpenGL"),
// TRANSLATORS: video settings warning
_("Applying change to OpenGL requires restart."),
// TRANSLATORS: ok dialog button
@@ -279,7 +279,7 @@ void Setup_Video::apply()
Modal_true,
ShowCenter_true,
nullptr,
- 260);
+ 260))->postInit();
}
mFps = mFpsCheckBox->isSelected() ?
@@ -386,7 +386,7 @@ void Setup_Video::action(const ActionEvent &event)
|| height < mainGraphics->mActualHeight)
{
// TRANSLATORS: video settings warning
- new OkDialog(_("Screen Resolution Changed"),
+ (new OkDialog(_("Screen Resolution Changed"),
// TRANSLATORS: video settings warning
_("Restart your client for the change to take effect.")
+ std::string("\n") + _("Some windows may be moved to "
@@ -397,12 +397,12 @@ void Setup_Video::action(const ActionEvent &event)
Modal_true,
ShowCenter_true,
nullptr,
- 260);
+ 260))->postInit();
}
else
{
// TRANSLATORS: video settings warning
- new OkDialog(_("Screen Resolution Changed"),
+ (new OkDialog(_("Screen Resolution Changed"),
// TRANSLATORS: video settings warning
_("Restart your client for the change"
" to take effect."),
@@ -412,7 +412,7 @@ void Setup_Video::action(const ActionEvent &event)
Modal_true,
ShowCenter_true,
nullptr,
- 260);
+ 260))->postInit();
}
}
#else