d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give registration server input its own error label

Browse source
This commit is contained in:
Callum Brown 2021-06-03 13:56:43 +01:00
parent 72a2cfea7b
commit b8b0b5c618
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/RegisterPage.cpp
View file

@ -108,6 +108,10 @@ RegisterPage::RegisterPage(QWidget *parent)
error_password_confirmation_label_->setWordWrap(true); error_password_confirmation_label_->setWordWrap(true);
error_password_confirmation_label_->hide(); error_password_confirmation_label_->hide();
error_server_label_ = new QLabel(this);
error_server_label_->setWordWrap(true);
error_server_label_->hide();
form_layout_->addWidget(username_input_, Qt::AlignHCenter); form_layout_->addWidget(username_input_, Qt::AlignHCenter);
form_layout_->addWidget(error_username_label_, Qt::AlignHCenter); form_layout_->addWidget(error_username_label_, Qt::AlignHCenter);
form_layout_->addWidget(password_input_, Qt::AlignHCenter); form_layout_->addWidget(password_input_, Qt::AlignHCenter);
@ -115,6 +119,7 @@ RegisterPage::RegisterPage(QWidget *parent)
form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter); form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter);
form_layout_->addWidget(error_password_confirmation_label_, Qt::AlignHCenter); form_layout_->addWidget(error_password_confirmation_label_, Qt::AlignHCenter);
form_layout_->addWidget(server_input_, Qt::AlignHCenter); form_layout_->addWidget(server_input_, Qt::AlignHCenter);
form_layout_->addWidget(error_server_label_, Qt::AlignHCenter);
button_layout_ = new QHBoxLayout(); button_layout_ = new QHBoxLayout();
button_layout_->setSpacing(0); button_layout_->setSpacing(0);
@ -351,10 +356,12 @@ RegisterPage::checkFields()
error_username_label_->setText(""); error_username_label_->setText("");
error_password_label_->setText(""); error_password_label_->setText("");
error_password_confirmation_label_->setText(""); error_password_confirmation_label_->setText("");
error_server_label_->setText("");
error_username_label_->hide(); error_username_label_->hide();
error_password_label_->hide(); error_password_label_->hide();
error_password_confirmation_label_->hide(); error_password_confirmation_label_->hide();
error_server_label_->hide();
password_confirmation_->setValid(true); password_confirmation_->setValid(true);
server_input_->setValid(true); server_input_->setValid(true);
@ -379,7 +386,8 @@ RegisterPage::checkFields()
all_fields_good = false; all_fields_good = false;
} else if (server_input_->isModified() && } else if (server_input_->isModified() &&
(!server_input_->hasAcceptableInput() || server_input_->text().isEmpty())) { (!server_input_->hasAcceptableInput() || server_input_->text().isEmpty())) {
showError(tr("Invalid server name")); error_server_label_->show();
showError(error_server_label_, tr("Invalid server name"));
server_input_->setValid(false); server_input_->setValid(false);
all_fields_good = false; all_fields_good = false;
} }

1
src/RegisterPage.h
View file

@ -63,6 +63,7 @@ private:
QLabel *error_username_label_; QLabel *error_username_label_;
QLabel *error_password_label_; QLabel *error_password_label_;
QLabel *error_password_confirmation_label_; QLabel *error_password_confirmation_label_;
QLabel *error_server_label_;
FlatButton *back_button_; FlatButton *back_button_;
RaisedButton *register_button_; RaisedButton *register_button_;