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

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2016-03-07 12:14:05 +11:00
commit 1dc5c0b4af
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/states_screens/main_menu_screen.cpp
View File

@ -74,6 +74,8 @@ bool MainMenuScreen::m_enable_online = false;
MainMenuScreen::MainMenuScreen() : Screen("main_menu.stkgui")
{
m_online_string = _("Online");
m_login_string = _("Login");
} // MainMenuScreen
// ----------------------------------------------------------------------------
@ -167,12 +169,12 @@ void MainMenuScreen::onUpdate(float delta)
{
m_user_id->setText(player->getLastOnlineName() + "@stk");
m_online->setActive(true);
m_online->setLabel( _("Online"));
m_online->setLabel(m_online_string);
}
else if (PlayerManager::getCurrentOnlineState() == PlayerProfile::OS_SIGNED_OUT)
{
m_online->setActive(true);
m_online->setLabel( _("Login" ));
m_online->setLabel(m_login_string);
m_user_id->setText(player->getName());
}
else
@ -182,8 +184,8 @@ void MainMenuScreen::onUpdate(float delta)
m_user_id->setText(player->getName());
}
m_online->setLabel(PlayerManager::getCurrentOnlineId() ? _("Online")
: _("Login" ) );
m_online->setLabel(PlayerManager::getCurrentOnlineId() ? m_online_string
: m_login_string);
IconButtonWidget* addons_icon = getWidget<IconButtonWidget>("addons");
if (addons_icon != NULL)
{

4
src/states_screens/main_menu_screen.hpp
View File

@ -32,6 +32,10 @@ class MainMenuScreen : public GUIEngine::Screen, public GUIEngine::ScreenSinglet
private:
friend class GUIEngine::ScreenSingleton<MainMenuScreen>;
core::stringw m_online_string;
core::stringw m_login_string;
/** Keep the widget to avoid looking it up every frame. */
GUIEngine::IconButtonWidget* m_online;