ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix RegisterScreen

Browse Source
This commit is contained in:
Flakebi 2014-06-04 16:45:54 +02:00
parent af6c121a22
commit d7b3e0f46a
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/states_screens/register_screen.cpp
View File

@ -18,6 +18,7 @@
#include "states_screens/register_screen.hpp" #include "states_screens/register_screen.hpp"
#include "config/player_manager.hpp" #include "config/player_manager.hpp"
#include "config/user_config.hpp"
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
#include "guiengine/widgets/check_box_widget.hpp" #include "guiengine/widgets/check_box_widget.hpp"
#include "guiengine/widgets/label_widget.hpp" #include "guiengine/widgets/label_widget.hpp"
@ -78,12 +79,27 @@ void RegisterScreen::init()
m_info_widget = getWidget<LabelWidget>("info"); m_info_widget = getWidget<LabelWidget>("info");
assert(m_info_widget); assert(m_info_widget);
m_info_widget->setDefaultColor();
m_info_widget->setText("", false);
m_options_widget = getWidget<RibbonWidget>("options"); m_options_widget = getWidget<RibbonWidget>("options");
assert(m_options_widget); assert(m_options_widget);
m_signup_request = NULL; m_signup_request = NULL;
m_info_message_shown = false; m_info_message_shown = false;
getWidget<CheckBoxWidget>("online")->setVisible(true);
getWidget<LabelWidget>("label_online")->setVisible(true);
// Check if online is allowed
if (UserConfigParams::m_internet_status != Online::RequestManager::IPERM_NOT_ALLOWED)
{
getWidget<CheckBoxWidget>("online")->setState(true);
makeEntryFieldsVisible(true); makeEntryFieldsVisible(true);
}
else
{
getWidget<CheckBoxWidget>("online")->setState(false);
makeEntryFieldsVisible(false);
}
} // init } // init
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -303,6 +319,13 @@ void RegisterScreen::eventCallback(Widget* widget, const std::string& name,
{ {
if (name == "online") if (name == "online")
{ {
if (UserConfigParams::m_internet_status == Online::RequestManager::IPERM_NOT_ALLOWED)
{
m_info_widget->setErrorColor();
m_info_widget->setText(_("Internet access is disabled, please enable it in the options"), false);
getWidget<CheckBoxWidget>("online")->setState(false);
}
else
makeEntryFieldsVisible(getWidget<CheckBoxWidget>("online")->getState()); makeEntryFieldsVisible(getWidget<CheckBoxWidget>("online")->getState());
} }
else if (name=="options") else if (name=="options")

2
src/states_screens/user_screen.cpp
View File

@ -247,7 +247,7 @@ void BaseUserScreen::eventCallback(Widget* widget,
Online::RequestManager::IPERM_NOT_ALLOWED) Online::RequestManager::IPERM_NOT_ALLOWED)
{ {
m_info_widget->setText( m_info_widget->setText(
"Internet access is disabled, please enable it in the options", _("Internet access is disabled, please enable it in the options"),
true); true);
sfx_manager->quickSound( "anvil" ); sfx_manager->quickSound( "anvil" );
m_online_cb->setState(false); m_online_cb->setState(false);