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

fixed issue 292, but removed wordWrap from error_label_, because hint looks bad with it

Browse source
This commit is contained in:
kirillpt 2020-11-23 03:18:11 +03:00
parent 40a487109d
commit 89d28d3b69
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/LoginPage.cpp
View file

@ -95,8 +95,6 @@ LoginPage::LoginPage(QWidget *parent)
"address there, if your server doesn't support .well-known lookup.\nExample: " "address there, if your server doesn't support .well-known lookup.\nExample: "
"@user:server.my\nIf Nheko fails to discover your homeserver, it will show you a " "@user:server.my\nIf Nheko fails to discover your homeserver, it will show you a "
"field to enter the server manually.")); "field to enter the server manually."));
matrixid_input_->setValidator(
new QRegularExpressionValidator(QRegularExpression("@.+?:.{3,}"), this));
spinner_ = new LoadingIndicator(this); spinner_ = new LoadingIndicator(this);
spinner_->setFixedHeight(40); spinner_->setFixedHeight(40);
@ -153,7 +151,6 @@ LoginPage::LoginPage(QWidget *parent)
error_label_ = new QLabel(this); error_label_ = new QLabel(this);
error_label_->setFont(font); error_label_->setFont(font);
error_label_->setWordWrap(true);
top_layout_->addLayout(top_bar_layout_); top_layout_->addLayout(top_bar_layout_);
top_layout_->addStretch(1); top_layout_->addStretch(1);
@ -186,6 +183,15 @@ LoginPage::loginError(const QString &msg)
error_label_->setText(msg); error_label_->setText(msg);
} }
bool
LoginPage::isMatrixIdValid()
{
QRegularExpressionValidator v(QRegularExpression("@.+?:.{3,}"), this);
QString s = matrixid_input_->text();
int pos = 0;
return v.validate(s, pos);
}
void void
LoginPage::onMatrixIdEntered() LoginPage::onMatrixIdEntered()
{ {
@ -193,6 +199,10 @@ LoginPage::onMatrixIdEntered()
User user; User user;
if (isMatrixIdValid() == 0) {
return loginError("You have entered an invalid Matrix ID e.g @joe:matrix.org");
}
try { try {
user = parse<User>(matrixid_input_->text().toStdString()); user = parse<User>(matrixid_input_->text().toStdString());
} catch (const std::exception &e) { } catch (const std::exception &e) {
@ -344,6 +354,9 @@ LoginPage::onLoginButtonClicked()
error_label_->setText(""); error_label_->setText("");
User user; User user;
if (isMatrixIdValid() == 0) {
return loginError("You have entered an invalid Matrix ID e.g @joe:matrix.org");
}
try { try {
user = parse<User>(matrixid_input_->text().toStdString()); user = parse<User>(matrixid_input_->text().toStdString());