diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-09-30 19:54:06 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-09-30 19:54:06 -0600 |
commit | d4f32a38fd498c180d562ced38a9129e0abf2252 (patch) | |
tree | e655b59ff686ad5fe2bdd11d6e072f5c3a4493b7 /src/gui/login.cpp | |
parent | 6707d108790ab1fe1d4a3ef52d717966990fdf0a (diff) | |
download | mana-client-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.gz mana-client-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.bz2 mana-client-d4f32a38fd498c180d562ced38a9129e0abf2252.tar.xz mana-client-d4f32a38fd498c180d562ced38a9129e0abf2252.zip |
Merge login state machines for both clients
Also do some cleanup and refactoring of related code.
Diffstat (limited to 'src/gui/login.cpp')
-rw-r--r-- | src/gui/login.cpp | 213 |
1 files changed, 1 insertions, 212 deletions
diff --git a/src/gui/login.cpp b/src/gui/login.cpp index f6272936..84a6a22c 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -50,73 +50,27 @@ LoginDialog::LoginDialog(LoginData *loginData): { gcn::Label *userLabel = new Label(_("Name:")); gcn::Label *passLabel = new Label(_("Password:")); -#ifdef EATHENA_SUPPORT - gcn::Label *serverLabel = new Label(_("Server:")); - gcn::Label *portLabel = new Label(_("Port:")); - gcn::Label *dropdownLabel = new Label(_("Recent:")); - std::vector<std::string> dfltServer; - dfltServer.push_back("server.themanaworld.org"); - std::vector<std::string> dfltPort; - dfltPort.push_back("6901"); - mServerList = new DropDownList("MostRecent00", dfltServer, dfltPort, - MAX_SERVER_LIST_SIZE); -#endif mUserField = new TextField(mLoginData->username); mPassField = new PasswordField(mLoginData->password); -#ifdef EATHENA_SUPPORT - mServerField = new TextField(mServerList->getServerAt(0)); - mPortField = new TextField(mServerList->getPortAt(0)); - mServerDropDown = new DropDown(mServerList); -#endif mKeepCheck = new CheckBox(_("Remember username"), mLoginData->remember); mOkButton = new Button(_("OK"), "ok", this); -#ifdef TMWSERV_SUPPORT mCancelButton = new Button(_("Cancel"), "cancel", this); -#else - mCancelButton = new Button(_("Quit"), "cancel", this); -#endif mRegisterButton = new Button(_("Register"), "register", this); mUserField->setActionEventId("ok"); mPassField->setActionEventId("ok"); -#ifdef EATHENA_SUPPORT - mServerField->setActionEventId("ok"); - mPortField->setActionEventId("ok"); - mServerDropDown->setActionEventId("changeSelection"); -#endif mUserField->addKeyListener(this); mPassField->addKeyListener(this); -#ifdef EATHENA_SUPPORT - mServerField->addKeyListener(this); - mPortField->addKeyListener(this); - mServerDropDown->addKeyListener(this); -#endif mUserField->addActionListener(this); mPassField->addActionListener(this); -#ifdef EATHENA_SUPPORT - mServerField->addActionListener(this); - mPortField->addActionListener(this); - mServerDropDown->addActionListener(this); - mKeepCheck->addActionListener(this); -#endif place(0, 0, userLabel); place(0, 1, passLabel); -#ifdef EATHENA_SUPPORT - place(0, 2, serverLabel); - place(0, 3, portLabel); - place(0, 4, dropdownLabel); -#endif place(1, 0, mUserField, 3).setPadding(1); place(1, 1, mPassField, 3).setPadding(1); -#ifdef EATHENA_SUPPORT - place(1, 2, mServerField, 3).setPadding(1); - place(1, 3, mPortField, 3).setPadding(1); - place(1, 4, mServerDropDown, 3).setPadding(1); -#endif place(0, 5, mKeepCheck, 4); place(0, 6, mRegisterButton).setHAlign(LayoutCell::LEFT); place(2, 6, mCancelButton); @@ -136,19 +90,12 @@ LoginDialog::LoginDialog(LoginData *loginData): LoginDialog::~LoginDialog() { -#ifdef EATHENA_SUPPORT - delete mServerList; -#endif } void LoginDialog::action(const gcn::ActionEvent &event) { if (event.getId() == "ok" && canSubmit()) { -#ifdef EATHENA_SUPPORT - mLoginData->hostname = mServerField->getText(); - mLoginData->port = getUShort(mPortField->getText()); -#endif mLoginData->username = mUserField->getText(); mLoginData->password = mPassField->getText(); mLoginData->remember = mKeepCheck->isSelected(); @@ -156,41 +103,14 @@ void LoginDialog::action(const gcn::ActionEvent &event) mOkButton->setEnabled(false); mRegisterButton->setEnabled(false); -#ifdef EATHENA_SUPPORT - mServerList->save(mServerField->getText(), mPortField->getText()); - state = STATE_ACCOUNT; -#else state = STATE_LOGIN_ATTEMPT; -#endif } -#ifdef EATHENA_SUPPORT - else if (event.getId() == "changeSelection") - { - int selected = mServerDropDown->getSelected(); - mServerField->setText(mServerList->getServerAt(selected)); - mPortField->setText(mServerList->getPortAt(selected)); - } -#endif else if (event.getId() == "cancel") { -#ifdef TMWSERV_SUPPORT - state = STATE_SWITCH_ACCOUNTSERVER; -#else - state = STATE_EXIT; -#endif + state = STATE_SWITCH_SERVER; } else if (event.getId() == "register") { -#ifdef EATHENA_SUPPORT - // Transfer these fields on to the register dialog - mLoginData->hostname = mServerField->getText(); - - if (isUShort(mPortField->getText())) - mLoginData->port = getUShort(mPortField->getText()); - else - mLoginData->port = 6901; -#endif - mLoginData->username = mUserField->getText(); mLoginData->password = mPassField->getText(); @@ -207,136 +127,5 @@ bool LoginDialog::canSubmit() { return !mUserField->getText().empty() && !mPassField->getText().empty() && -#ifdef EATHENA_SUPPORT - !mServerField->getText().empty() && - isUShort(mPortField->getText()) && -#endif state == STATE_LOGIN; } - -#ifdef EATHENA_SUPPORT -bool LoginDialog::isUShort(const std::string &str) -{ - if (str.empty()) - { - return false; - } - unsigned long l = 0; - for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); - strPtr != strEnd; ++strPtr) - { - if (*strPtr < '0' || *strPtr > '9') - return false; - - l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative - - if (l > 65535) - return false; - } - return true; -} - -unsigned short LoginDialog::getUShort(const std::string &str) -{ - unsigned long l = 0; - for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); - strPtr != strEnd; ++strPtr) - { - l = l * 10 + (*strPtr - '0'); - } - return static_cast<unsigned short>(l); -} - -/** - * LoginDialog::DropDownList - */ - -void LoginDialog::DropDownList::saveEntry(const std::string &server, - const std::string &port, int &saved) -{ - if (saved < MAX_SERVER_LIST_SIZE && !server.empty()) - { - config.setValue(mConfigPrefix + "Server" + toString(saved), server); - config.setValue(mConfigPrefix + "Port" + toString(saved), port); - ++saved; - } -} - -LoginDialog::DropDownList::DropDownList(std::string prefix, - std::vector<std::string> dflt, - std::vector<std::string> dfltPort, - int maxEntries) : - mConfigPrefix(prefix), - mMaxEntries(maxEntries) -{ - for (int i = 0; i < maxEntries; ++i) - { - std::string server = config.getValue(mConfigPrefix + "Server" + - toString(i), ""); - if (server.empty()) // Just in case had original config entries - { - server = config.getValue(mConfigPrefix + "ServerList" + - toString(i), ""); - } - std::string port = config.getValue(mConfigPrefix + "Port" + - toString(i), dfltPort.front()); - - if (!server.empty()) - { - mServers.push_back(server); - mPorts.push_back(port); - } - } - if (mServers.empty()) - { - mServers.assign(dflt.begin(), dflt.end()); - mPorts.assign(dfltPort.begin(), dfltPort.end()); - } -} - -void LoginDialog::DropDownList::save(const std::string &server, - const std::string &port) -{ - int position = 0; - saveEntry(server, port, position); - for (std::vector<std::string>::const_iterator sPtr = mServers.begin(), - sEnd = mServers.end(), - pPtr = mPorts.begin(), - pEnd = mPorts.end(); - sPtr != sEnd && pPtr != pEnd; - ++sPtr, ++pPtr) - { - if (*sPtr != server || *pPtr != port) - saveEntry(*sPtr, *pPtr, position); - } -} - -int LoginDialog::DropDownList::getNumberOfElements() -{ - return mServers.size(); -} - -std::string LoginDialog::DropDownList::getElementAt(int i) -{ - if (i < 0 || i >= getNumberOfElements()) - return ""; - - return getServerAt(i) + ":" + getPortAt(i); -} - -std::string LoginDialog::DropDownList::getServerAt(int i) -{ - if (i < 0 || i >= getNumberOfElements()) - return ""; - - return mServers.at(i); -} - -std::string LoginDialog::DropDownList::getPortAt(int i) -{ - if (i < 0 || i >= getNumberOfElements()) - return ""; - - return mPorts.at(i); -} -#endif |