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

Fix #3566

Browse Source
This commit is contained in:
Benau 2018-11-14 15:03:33 +08:00
parent 4a4bc7248c
commit 721270c5a9
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/guiengine/widgets/icon_button_widget.cpp
View File

@ -434,8 +434,3 @@ void IconButtonWidget::setVisible(bool visible)
m_label->setVisible(visible); m_label->setVisible(visible);
} }
// -----------------------------------------------------------------------------
void IconButtonWidget::setText(const wchar_t *s)
{
m_label->setText(s);
}

2
src/guiengine/widgets/icon_button_widget.hpp
View File

@ -170,8 +170,6 @@ namespace GUIEngine
Widget::elementRemoved(); Widget::elementRemoved();
m_label = NULL; m_label = NULL;
} }
// --------------------------------------------------------------------
virtual void setText(const wchar_t *s) OVERRIDE;
}; };
} }

4
src/states_screens/online/networking_lobby.cpp
View File

@ -152,7 +152,7 @@ void NetworkingLobby::init()
//I18N: In the networking lobby //I18N: In the networking lobby
m_header->setText(_("Lobby"), false); m_header->setText(_("Lobby"), false);
m_server_info_height = GUIEngine::getFont()->getDimension(L"X").Height; m_server_info_height = GUIEngine::getFont()->getDimension(L"X").Height;
m_start_button->setText(_("Start race")); m_start_button->setLabel(_("Start race"));
m_start_button->setVisible(false); m_start_button->setVisible(false);
m_state = LS_CONNECTING; m_state = LS_CONNECTING;
getWidget("chat")->setVisible(false); getWidget("chat")->setVisible(false);
@ -578,7 +578,7 @@ void NetworkingLobby::initAutoStartTimer(bool grand_prix_started,
//I18N: In the networking lobby, ready button is to allow player to tell //I18N: In the networking lobby, ready button is to allow player to tell
//server that he is ready for next game for owner less server //server that he is ready for next game for owner less server
m_start_button->setText(_("Ready")); m_start_button->setLabel(_("Ready"));
m_has_auto_start_in_server = true; m_has_auto_start_in_server = true;
m_min_start_game_players = grand_prix_started ? 0 : min_players; m_min_start_game_players = grand_prix_started ? 0 : min_players;
m_start_timeout = start_timeout; m_start_timeout = start_timeout;