jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-27 17:13:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pass reset Small fixes (#4310)

Browse source
This commit is contained in:
tooomm 2021-04-12 19:28:47 +02:00 • committed by GitHub
parent 7d1f082b27
commit 88a8ee09bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 34 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/dlg_connect.cpp
View file

@ -88,7 +88,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
btnForgotPassword = new QPushButton(this);
btnForgotPassword->setIcon(QPixmap("theme:icons/forgot_password"));
btnForgotPassword->setToolTip(tr("Forgot Password"));
btnForgotPassword->setToolTip(tr("Reset Password"));
btnForgotPassword->setFixedWidth(30);
connect(btnForgotPassword, SIGNAL(released()), this, SLOT(actForgotPassword()));

9
cockatrice/src/dlg_forgotpasswordchallenge.cpp
View file

@ -27,9 +27,8 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo
}
if (servers.getFPHostname().isEmpty() && servers.getFPPort().isEmpty() && servers.getFPPlayerName().isEmpty()) {
QMessageBox::warning(this, tr("Forgot Password Challenge Warning"),
tr("Oops, looks like something has gone wrong. Please restart the forgot password "
"process by using the forgot password button on the connection screen."));
QMessageBox::warning(this, tr("Reset Password Challenge Warning"),
tr("A problem has occurred. Please try to request a new password again."));
reject();
}
@ -82,7 +81,7 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo
mainLayout->addWidget(buttonBox);
setLayout(mainLayout);
setWindowTitle(tr("Forgot Password Challenge"));
setWindowTitle(tr("Reset Password Challenge"));
setFixedHeight(sizeHint().height());
setMinimumWidth(300);
}
@ -90,7 +89,7 @@ DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialo
void DlgForgotPasswordChallenge::actOk()
{
if (emailEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Forgot Password Challenge Warning"), tr("The email address can't be empty."));
QMessageBox::critical(this, tr("Reset Password Challenge Error"), tr("The email address can't be empty."));
return;
}

4
cockatrice/src/dlg_forgotpasswordrequest.cpp
View file

@ -59,7 +59,7 @@ DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(pa
mainLayout->addWidget(buttonBox);
setLayout(mainLayout);
setWindowTitle(tr("Forgot Password Request"));
setWindowTitle(tr("Reset Password Request"));
setFixedHeight(sizeHint().height());
setMinimumWidth(300);
}
@ -67,7 +67,7 @@ DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(pa
void DlgForgotPasswordRequest::actOk()
{
if (playernameEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Forgot Password Request Warning"), tr("The player name can't be empty."));
QMessageBox::critical(this, tr("Reset Password Error"), tr("The player name can't be empty."));
return;
}

15
cockatrice/src/dlg_forgotpasswordreset.cpp
View file

@ -27,9 +27,8 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent
}
if (servers.getFPHostname().isEmpty() && servers.getFPPort().isEmpty() && servers.getFPPlayerName().isEmpty()) {
QMessageBox::warning(this, tr("Forgot Password Reset Warning"),
tr("Oops, looks like something has gone wrong. Please re-start the forgot password "
"process by using the forgot password button on the connection screen."));
QMessageBox::warning(this, tr("Reset Password Warning"),
tr("A problem has occurred. Please try to request a new password again."));
reject();
}
@ -95,7 +94,7 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent
mainLayout->addWidget(buttonBox);
setLayout(mainLayout);
setWindowTitle(tr("Forgot Password Reset"));
setWindowTitle(tr("Reset Password"));
setFixedHeight(sizeHint().height());
setMinimumWidth(300);
}
@ -103,22 +102,22 @@ DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent
void DlgForgotPasswordReset::actOk()
{
if (playernameEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Forgot Password Reset Warning"), tr("The player name can't be empty."));
QMessageBox::critical(this, tr("Reset Password Error"), tr("The player name can't be empty."));
return;
}
if (tokenEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Forgot Password Reset Warning"), tr("The token can't be empty."));
QMessageBox::critical(this, tr("Reset Password Error"), tr("The token can't be empty."));
return;
}
if (newpasswordEdit->text().isEmpty()) {
QMessageBox::critical(this, tr("Forgot Password Reset Warning"), tr("The new password can't be empty."));
QMessageBox::critical(this, tr("Reset Password Error"), tr("The new password can't be empty."));
return;
}
if (newpasswordEdit->text() != newpasswordverifyEdit->text()) {
QMessageBox::critical(this, tr("Forgot Password Reset Warning"), tr("The passwords do not match."));
QMessageBox::critical(this, tr("Reset Password Error"), tr("The passwords do not match."));
return;
}

2
cockatrice/src/dlg_manage_sets.cpp
View file

@ -129,7 +129,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
labNotes->setWordWrap(true);
labNotes->setTextInteractionFlags(Qt::TextBrowserInteraction);
labNotes->setOpenExternalLinks(true);
labNotes->setText(tr("Use ctrl+a to select all sets in the view.") + "<br><b>" + tr("Deck Editor") + ":</b> " +
labNotes->setText(tr("Use CTRL+A to select all sets in the view.") + "<br><b>" + tr("Deck Editor") + ":</b> " +
tr("Only cards in enabled sets will appear in the card list of the deck editor.") + "<br><b>" +
tr("Card Art") + ":</b> " + tr("Image priority is decided in the following order:") + "<br>" +
tr("first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)",

6
cockatrice/src/window_main.cpp
View file

@ -1321,7 +1321,7 @@ void MainWindow::actForgotPasswordRequest()
void MainWindow::forgotPasswordSuccess()
{
QMessageBox::information(
this, tr("Forgot Password"),
this, tr("Reset Password"),
tr("Your password has been reset successfully, you can now log in using the new credentials."));
SettingsCache::instance().servers().setFPHostName("");
SettingsCache::instance().servers().setFPPort("");
@ -1331,7 +1331,7 @@ void MainWindow::forgotPasswordSuccess()
void MainWindow::forgotPasswordError()
{
QMessageBox::warning(
this, tr("Forgot Password"),
this, tr("Reset Password"),
tr("Failed to reset user account password, please contact the server operator to reset your password."));
SettingsCache::instance().servers().setFPHostName("");
SettingsCache::instance().servers().setFPPort("");
@ -1340,7 +1340,7 @@ void MainWindow::forgotPasswordError()
void MainWindow::promptForgotPasswordReset()
{
QMessageBox::information(this, tr("Forgot Password"),
QMessageBox::information(this, tr("Reset Password"),
tr("Activation request received, please check your email for an activation token."));
DlgForgotPasswordReset dlg(this);
if (dlg.exec()) {