Remember user inputs after failed registration #4982

cockatrice/src/abstractclient.h

@@ -27,6 +27,7 @@ class Event_ConnectionClosed;
 class Event_ServerShutdown;
 class Event_ReplayAdded;
 class FeatureSet;
+class MainWindow;
 
 enum ClientStatus
 {
@@ -45,6 +46,7 @@ enum ClientStatus
 
 class AbstractClient : public QObject
 {
+    friend class MainWindow;
     Q_OBJECT
 signals:
     void statusChanged(ClientStatus _status);

cockatrice/src/dlg_register.cpp

@@ -1,5 +1,6 @@
 #include "dlg_register.h"
 
+#include "abstractclient.h"
 #include "pb/serverinfo_user.pb.h"
 #include "settingscache.h"
 #include "stringsizes.h"
@@ -12,7 +13,14 @@
 #include <QLabel>
 #include <QMessageBox>
 
-DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
+DlgRegister::DlgRegister(QWidget *parent,
+                         QString username,
+                         QString password,
+                         QString email,
+                         QString country,
+                         QString realname)
+    : QDialog(parent)
+
 {
     ServersSettings &servers = SettingsCache::instance().servers();
     infoLabel = new QLabel(tr("Enter your information and the information of the server you'd like to register to.\n"
@@ -30,29 +38,29 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     portLabel->setBuddy(portEdit);
 
     playernameLabel = new QLabel(tr("Player &name:"));
-    playernameEdit = new QLineEdit(servers.getPlayerName());
+    playernameEdit = new QLineEdit(servers.getPlayerName().isEmpty() ? username : servers.getPlayerName());
     playernameEdit->setMaxLength(MAX_NAME_LENGTH);
     playernameLabel->setBuddy(playernameEdit);
 
     passwordLabel = new QLabel(tr("P&assword:"));
-    passwordEdit = new QLineEdit();
+    passwordEdit = new QLineEdit(password);
     passwordEdit->setMaxLength(MAX_NAME_LENGTH);
     passwordLabel->setBuddy(passwordEdit);
     passwordEdit->setEchoMode(QLineEdit::Password);
 
     passwordConfirmationLabel = new QLabel(tr("Password (again):"));
-    passwordConfirmationEdit = new QLineEdit();
+    passwordConfirmationEdit = new QLineEdit(password);
     passwordConfirmationEdit->setMaxLength(MAX_NAME_LENGTH);
     passwordConfirmationLabel->setBuddy(passwordConfirmationEdit);
     passwordConfirmationEdit->setEchoMode(QLineEdit::Password);
 
     emailLabel = new QLabel(tr("Email:"));
-    emailEdit = new QLineEdit();
+    emailEdit = new QLineEdit(email);
     emailEdit->setMaxLength(MAX_NAME_LENGTH);
     emailLabel->setBuddy(emailEdit);
 
     emailConfirmationLabel = new QLabel(tr("Email (again):"));
-    emailConfirmationEdit = new QLineEdit();
+    emailConfirmationEdit = new QLineEdit(email);
     emailConfirmationEdit->setMaxLength(MAX_NAME_LENGTH);
     emailConfirmationLabel->setBuddy(emailConfirmationEdit);
 
@@ -311,13 +319,20 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     countryEdit->addItem(QPixmap("theme:countries/za"), "za");
     countryEdit->addItem(QPixmap("theme:countries/zm"), "zm");
     countryEdit->addItem(QPixmap("theme:countries/zw"), "zw");
-    countryEdit->setCurrentIndex(0);
+
+    int initialCountryIndex = countryEdit->findText(country);
+    if (initialCountryIndex != -1) {
+        countryEdit->setCurrentIndex(initialCountryIndex);
+    } else {
+        countryEdit->setCurrentIndex(0);
+    }
+
     QStringList countries = SettingsCache::instance().getCountries();
     foreach (QString c, countries)
         countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c);
 
     realnameLabel = new QLabel(tr("Real name:"));
-    realnameEdit = new QLineEdit();
+    realnameEdit = new QLineEdit(realname);
     realnameEdit->setMaxLength(MAX_NAME_LENGTH);
     realnameLabel->setBuddy(realnameEdit);
 

cockatrice/src/dlg_register.h

@@ -8,12 +8,18 @@
 class QLabel;
 class QPushButton;
 class QCheckBox;
+class AbstractClient;
 
 class DlgRegister : public QDialog
 {
     Q_OBJECT
 public:
-    DlgRegister(QWidget *parent = nullptr);
+    DlgRegister(QWidget *parent = nullptr,
+                QString username = "",
+                QString password = "",
+                QString email = "",
+                QString country = "",
+                QString realname = "");
     QString getHost() const
     {
         return hostEdit->text();

cockatrice/src/remoteclient.h

@@ -8,6 +8,7 @@
 #include <QWebSocket>
 
 class QTimer;
+class DlgRegister;
 
 class RemoteClient : public AbstractClient
 {

cockatrice/src/window_main.cpp

@@ -200,7 +200,15 @@ void MainWindow::actConnect()
 
 void MainWindow::actRegister()
 {
-    DlgRegister dlg(this);
+    // Note the pre-existing form data so that if the user is bounced back to the dialogue, they
+    // won't have to re-enter all the information again.
+    QString username = client->getUserName();
+    QString password = client->password;
+    QString email = client->email;
+    QString country = client->country;
+    QString realname = client->realName;
+
+    DlgRegister dlg(this, username, password, email, country, realname);
     if (dlg.exec()) {
         client->registerToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
                                  dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName());