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

Auto-login a new user from the register screen, without requiering

Browse Source 
to select the user or enter the password again.
This commit is contained in:
hiker
2015-01-12 22:27:45 +11:00
parent 370091e1b9
commit d47981dd43
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/states_screens/register_screen.cpp
View File

@@ -219,7 +219,8 @@ void RegisterScreen::doRegister()
core::stringw online_name =
online ? getWidget<TextBoxWidget>("username")->getText().trim()
: "";
m_parent_screen->setNewAccountData(online, online_name, password);
m_parent_screen->setNewAccountData(online, /*auto login*/true,
online_name, password);
m_existing_player = NULL;
StateManager::get()->popMenu();
return;
@@ -281,6 +282,7 @@ void RegisterScreen::doRegister()
{
core::stringw online_name = getWidget<TextBoxWidget>("username")->getText().trim();
m_parent_screen->setNewAccountData(/*online*/true,
/*auto_login*/false,
username, password);
player->setLastOnlineName(username);

26
src/states_screens/user_screen.cpp
View File

@@ -48,6 +48,7 @@ BaseUserScreen::BaseUserScreen(const std::string &name) : Screen(name.c_str())
{
m_online_cb = NULL;
m_new_registered_data = false;
m_auto_login = false;
} // BaseUserScreen
// ----------------------------------------------------------------------------
@@ -70,18 +71,33 @@ void BaseUserScreen::loadedFromFile()
} // loadedFromFile
// ----------------------------------------------------------------------------
void BaseUserScreen::setNewAccountData(bool online,
/** Stores information from the register screen. It allows this screen to
* use the entered user name and password to prefill fields so that the user
* does not have to enter them again.
* \param online If the user created an online account.
* \param auto-login If the user should be automatically logged in online.
* This can not be done for newly created online accounts, since they
* need to be confirmed first.
* \param online_name The online account name.
* \param password The password for the online account.
*/
void BaseUserScreen::setNewAccountData(bool online, bool auto_login,
const core::stringw &online_name,
const core::stringw &password)
{
// Indicate for init that new user data is available.
m_new_registered_data = true;
m_auto_login = auto_login;
m_online_cb->setState(online);
m_username_tb->setText(online_name);
m_password_tb->setText(password);
} // setOnline
// ----------------------------------------------------------------------------
/** Initialises the user screen. Searches for all players to fill the
* list of users with their icons, and initialises all widgets for the
* current user (e.g. the online flag etc).
*/
void BaseUserScreen::init()
{
m_password_tb->setPasswordBox(true, L'*');
@@ -153,6 +169,13 @@ void BaseUserScreen::init()
getWidget<IconButtonWidget>("delete")->setActivated();
}
m_new_registered_data = false;
if (m_auto_login)
{
login();
m_auto_login = false;
return;
}
m_auto_login = false;
} // init
// ----------------------------------------------------------------------------
@@ -340,6 +363,7 @@ void BaseUserScreen::eventCallback(Widget* widget,
RegisterScreen::getInstance()->setRename(cp);
RegisterScreen::getInstance()->push();
m_new_registered_data = false;
m_auto_login = false;
// Init will automatically be called, which
// refreshes the player list
}

7
src/states_screens/user_screen.hpp
View File

@@ -94,6 +94,10 @@ private:
* all cleared. */
bool m_new_registered_data;
/** Set from the register screen if the newly created account can be
* used directly without waiting to confirm the account. */
bool m_auto_login;
void selectUser(int index);
void makeEntryFieldsVisible();
void login();
@@ -120,7 +124,8 @@ public:
/** \brief implement optional callback from parent class GUIEngine::Screen */
virtual void unloaded();
void setNewAccountData(bool online, const core::stringw &online_name="",
void setNewAccountData(bool online, bool auto_login,
const core::stringw &online_name="",
const core::stringw &password="");
void loginSuccessful();
void loginError(const irr::core::stringw &error_message);