diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/register.cpp | 21 | ||||
| -rw-r--r-- | src/gui/register.h | 16 |
2 files changed, 8 insertions, 29 deletions
diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 78c79eeb..5d9469ca 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -54,11 +54,11 @@ void WrongDataNoticeListener::action(const gcn::ActionEvent &event) mTarget->requestFocus(); } -Gender *RegisterDialog::useGender = NULL; - RegisterDialog::RegisterDialog(LoginData *loginData): Window(_("Register")), mEmailField(0), + mMaleButton(0), + mFemaleButton(0), mWrongDataNoticeListener(new WrongDataNoticeListener), mLoginData(loginData) { @@ -70,8 +70,6 @@ RegisterDialog::RegisterDialog(LoginData *loginData): mUserField = new TextField(loginData->username); mPasswordField = new PasswordField(loginData->password); mConfirmField = new PasswordField; - mMaleButton = new RadioButton(_("Male"), "sex", true); - mFemaleButton = new RadioButton(_("Female"), "sex", false); mRegisterButton = new Button(_("Register"), "register", this); mCancelButton = new Button(_("Cancel"), "cancel", this); @@ -81,8 +79,10 @@ RegisterDialog::RegisterDialog(LoginData *loginData): place(0, 1, passwordLabel); place(0, 2, confirmLabel); - if (useGender) + if (optionalActions & Net::LoginHandler::SetGenderOnRegister) { + mMaleButton = new RadioButton(_("Male"), "sex", true); + mFemaleButton = new RadioButton(_("Female"), "sex", false); place(1, 3, mMaleButton); place(2, 3, mFemaleButton); } @@ -213,9 +213,9 @@ void RegisterDialog::action(const gcn::ActionEvent &event) mLoginData->username = mUserField->getText(); mLoginData->password = mPasswordField->getText(); - if (useGender) - *useGender = mFemaleButton->isSelected() ? GENDER_FEMALE : - GENDER_MALE; + if (mFemaleButton) + mLoginData->gender = mFemaleButton->isSelected() ? + GENDER_FEMALE : GENDER_MALE; if (mEmailField) mLoginData->email = mEmailField->getText(); mLoginData->registerLogin = true; @@ -230,11 +230,6 @@ void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent) mRegisterButton->setEnabled(canSubmit()); } -void RegisterDialog::setGender(Gender *gender) -{ - useGender = gender; -} - bool RegisterDialog::canSubmit() const { return !mUserField->getText().empty() && diff --git a/src/gui/register.h b/src/gui/register.h index 9f22a5bb..418d6dcd 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -80,20 +80,6 @@ class RegisterDialog : public Window, public gcn::ActionListener, */ void keyPressed(gcn::KeyEvent &keyEvent); - /** - * Tell the dialog to show an email field. Value stored in the passed - * string pointer. Default email from pointer. Passing NULL disables - * the feature. - */ - static void setEmail(std::string *email); - - /** - * Tell the dialog to show a gender selection. Value stored in the - * passed Gender pointer. Default Gender from pointer. Passing NULL - * disables the feature. - */ - static void setGender(Gender *gender); - private: /** * Returns whether submit can be enabled. This is true in the register @@ -114,8 +100,6 @@ class RegisterDialog : public Window, public gcn::ActionListener, WrongDataNoticeListener *mWrongDataNoticeListener; LoginData *mLoginData; - - static Gender *useGender; }; #endif |