summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/MainWindow.cpp5
-rw-r--r--gui/dialogs/AccountListDialog.cpp91
-rw-r--r--gui/dialogs/AccountListDialog.h12
-rw-r--r--gui/dialogs/AccountListDialog.ui7
-rw-r--r--gui/dialogs/EditAccountDialog.cpp (renamed from gui/dialogs/PasswordDialog.cpp)24
-rw-r--r--gui/dialogs/EditAccountDialog.h (renamed from gui/dialogs/PasswordDialog.h)28
-rw-r--r--gui/dialogs/EditAccountDialog.ui (renamed from gui/dialogs/PasswordDialog.ui)24
7 files changed, 98 insertions, 93 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 72e754ee..65d9f4cc 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -60,7 +60,7 @@
#include "gui/dialogs/CopyInstanceDialog.h"
#include "gui/dialogs/AccountListDialog.h"
#include "gui/dialogs/AccountSelectDialog.h"
-#include "gui/dialogs/PasswordDialog.h"
+#include "gui/dialogs/EditAccountDialog.h"
#include "gui/ConsoleWindow.h"
@@ -599,7 +599,6 @@ void MainWindow::on_actionSettings_triggered()
void MainWindow::on_actionManageAccounts_triggered()
{
AccountListDialog dialog(this);
- connect(&dialog, SIGNAL(activeAccountChanged()), SLOT(activeAccountChanged()));
dialog.exec();
}
@@ -812,7 +811,7 @@ void MainWindow::doLaunchInst(BaseInstance* instance, MojangAccountPtr account)
bool MainWindow::doRefreshToken(MojangAccountPtr account, const QString& errorMsg)
{
- PasswordDialog passDialog(errorMsg, this);
+ EditAccountDialog passDialog(errorMsg, this, EditAccountDialog::PasswordField);
if (passDialog.exec() == QDialog::Accepted)
{
// To refresh the token, we just create an authenticate task with the given account and the user's password.
diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp
index 29f3838d..dfac4989 100644
--- a/gui/dialogs/AccountListDialog.cpp
+++ b/gui/dialogs/AccountListDialog.cpp
@@ -23,7 +23,7 @@
#include <logic/auth/AuthenticateTask.h>
#include <logic/net/NetJob.h>
-#include <gui/dialogs/LoginDialog.h>
+#include <gui/dialogs/EditAccountDialog.h>
#include <gui/dialogs/ProgressDialog.h>
#include <gui/dialogs/AccountSelectDialog.h>
@@ -40,10 +40,12 @@ AccountListDialog::AccountListDialog(QWidget *parent) :
ui->listView->setModel(m_accounts.get());
QItemSelectionModel* selectionModel = ui->listView->selectionModel();
+
connect(selectionModel, &QItemSelectionModel::selectionChanged,
[this] (const QItemSelection& sel, const QItemSelection& dsel) { updateButtonStates(); });
- connect(m_accounts.get(), &MojangAccountList::listChanged,
- [this] () { updateButtonStates(); });
+
+ connect(m_accounts.get(), SIGNAL(listChanged), SLOT(listChanged));
+ connect(m_accounts.get(), SIGNAL(activeAccountChanged), SLOT(listChanged));
updateButtonStates();
}
@@ -53,10 +55,15 @@ AccountListDialog::~AccountListDialog()
delete ui;
}
+void AccountListDialog::listChanged()
+{
+ updateButtonStates();
+}
+
void AccountListDialog::on_addAccountBtn_clicked()
{
- doLogin("Please log in to add your account.");
+ addAccount(tr("Please enter your Mojang or Minecraft account username and password to add your account."));
}
void AccountListDialog::on_rmAccountBtn_clicked()
@@ -66,16 +73,9 @@ void AccountListDialog::on_rmAccountBtn_clicked()
{
QModelIndex selected = selection.first();
m_accounts->removeAccount(selected);
-
- emit activeAccountChanged();
}
}
-void AccountListDialog::on_editAccountBtn_clicked()
-{
- // TODO
-}
-
void AccountListDialog::on_setDefaultBtn_clicked()
{
QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
@@ -84,16 +84,12 @@ void AccountListDialog::on_setDefaultBtn_clicked()
QModelIndex selected = selection.first();
MojangAccountPtr account = selected.data(MojangAccountList::PointerRole).value<MojangAccountPtr>();
m_accounts->setActiveAccount(account->username());
-
- emit activeAccountChanged();
}
}
void AccountListDialog::on_noDefaultBtn_clicked()
{
m_accounts->setActiveAccount("");
-
- emit activeAccountChanged();
}
void AccountListDialog::on_closeBtnBox_rejected()
@@ -107,58 +103,47 @@ void AccountListDialog::updateButtonStates()
QModelIndexList selection = ui->listView->selectionModel()->selectedIndexes();
ui->rmAccountBtn->setEnabled(selection.size() > 0);
- ui->editAccountBtn->setEnabled(selection.size() > 0);
ui->setDefaultBtn->setEnabled(selection.size() > 0);
ui->noDefaultBtn->setDown(m_accounts->activeAccount().get() == nullptr);
}
-void AccountListDialog::doLogin(const QString& errMsg)
+void AccountListDialog::addAccount(const QString& errMsg)
{
// TODO: We can use the login dialog for this for now, but we'll have to make something better for it eventually.
- LoginDialog loginDialog(this);
+ EditAccountDialog loginDialog(errMsg, this, EditAccountDialog::UsernameField | EditAccountDialog::PasswordField);
loginDialog.exec();
if (loginDialog.result() == QDialog::Accepted)
{
- QString username(loginDialog.getUsername());
- QString password(loginDialog.getPassword());
+ QString username(loginDialog.username());
+ QString password(loginDialog.password());
MojangAccountPtr account = MojangAccountPtr(new MojangAccount(username));
- ProgressDialog* progDialog = new ProgressDialog(this);
- m_authTask = new AuthenticateTask(account, password, progDialog);
- connect(m_authTask, SIGNAL(succeeded()), SLOT(onLoginComplete()), Qt::QueuedConnection);
- connect(m_authTask, SIGNAL(failed(QString)), SLOT(doLogin(QString)), Qt::QueuedConnection);
- progDialog->exec(m_authTask);
- //delete m_authTask;
+ ProgressDialog progDialog(this);
+ AuthenticateTask authTask(account, password, &progDialog);
+ if (progDialog.exec(&authTask))
+ {
+ // Add the authenticated account to the accounts list.
+ MojangAccountPtr account = authTask.getMojangAccount();
+ m_accounts->addAccount(account);
+
+ // Grab associated player skins
+ auto job = new NetJob("Player skins: " + account->username());
+
+ for(AccountProfile profile : account->profiles())
+ {
+ auto meta = MMC->metacache()->resolveEntry("skins", profile.name() + ".png");
+ auto action = CacheDownload::make(
+ QUrl("http://skins.minecraft.net/MinecraftSkins/" + profile.name() + ".png"),
+ meta);
+ job->addNetAction(action);
+ meta->stale = true;
+ }
+
+ job->start();
+ }
}
}
-void AccountListDialog::onLoginComplete()
-{
- // Add the authenticated account to the accounts list.
- MojangAccountPtr account = m_authTask->getMojangAccount();
- m_accounts->addAccount(account);
-
- emit activeAccountChanged();
-
- //ui->listView->update();
-
- // Grab associated player skins
- auto job = new NetJob("Player skins: " + account->username());
-
- for(AccountProfile profile : account->profiles())
- {
- auto meta = MMC->metacache()->resolveEntry("skins", profile.name() + ".png");
- auto action = CacheDownload::make(
- QUrl("http://skins.minecraft.net/MinecraftSkins/" + profile.name() + ".png"),
- meta);
- job->addNetAction(action);
- meta->stale = true;
- }
-
- connect(job, SIGNAL(succeeded()), SIGNAL(activeAccountChanged()));
- job->start();
-}
-
diff --git a/gui/dialogs/AccountListDialog.h b/gui/dialogs/AccountListDialog.h
index 63720f58..634d944a 100644
--- a/gui/dialogs/AccountListDialog.h
+++ b/gui/dialogs/AccountListDialog.h
@@ -40,8 +40,6 @@ slots:
void on_rmAccountBtn_clicked();
- void on_editAccountBtn_clicked();
-
void on_setDefaultBtn_clicked();
void on_noDefaultBtn_clicked();
@@ -49,21 +47,17 @@ slots:
// This will be sent when the "close" button is clicked.
void on_closeBtnBox_rejected();
+ void listChanged();
+
//! Updates the states of the dialog's buttons.
void updateButtonStates();
-signals:
- void activeAccountChanged();
-
protected:
std::shared_ptr<MojangAccountList> m_accounts;
- AuthenticateTask* m_authTask;
-
protected
slots:
- void doLogin(const QString& errMsg="");
- void onLoginComplete();
+ void addAccount(const QString& errMsg="");
private:
Ui::AccountListDialog *ui;
diff --git a/gui/dialogs/AccountListDialog.ui b/gui/dialogs/AccountListDialog.ui
index b4baf3f9..571f9be7 100644
--- a/gui/dialogs/AccountListDialog.ui
+++ b/gui/dialogs/AccountListDialog.ui
@@ -39,13 +39,6 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="editAccountBtn">
- <property name="text">
- <string>&amp;Edit</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QPushButton" name="rmAccountBtn">
<property name="text">
<string>&amp;Remove</string>
diff --git a/gui/dialogs/PasswordDialog.cpp b/gui/dialogs/EditAccountDialog.cpp
index c67fc6a2..d28336f7 100644
--- a/gui/dialogs/PasswordDialog.cpp
+++ b/gui/dialogs/EditAccountDialog.cpp
@@ -13,25 +13,33 @@
* limitations under the License.
*/
-#include "PasswordDialog.h"
-#include "ui_PasswordDialog.h"
+#include "EditAccountDialog.h"
+#include "ui_EditAccountDialog.h"
-PasswordDialog::PasswordDialog(const QString& errorMsg, QWidget *parent) :
+EditAccountDialog::EditAccountDialog(const QString& text, QWidget *parent, int flags) :
QDialog(parent),
- ui(new Ui::PasswordDialog)
+ ui(new Ui::EditAccountDialog)
{
ui->setupUi(this);
- ui->errorLabel->setText(errorMsg);
- ui->errorLabel->setVisible(!errorMsg.isEmpty());
+ ui->label->setText(text);
+ ui->label->setVisible(!text.isEmpty());
+
+ ui->userTextBox->setVisible(flags & UsernameField);
+ ui->passTextBox->setVisible(flags & PasswordField);
}
-PasswordDialog::~PasswordDialog()
+EditAccountDialog::~EditAccountDialog()
{
delete ui;
}
-QString PasswordDialog::password() const
+QString EditAccountDialog::username() const
+{
+ return ui->userTextBox->text();
+}
+
+QString EditAccountDialog::password() const
{
return ui->passTextBox->text();
}
diff --git a/gui/dialogs/PasswordDialog.h b/gui/dialogs/EditAccountDialog.h
index 0919e6e4..847c3be5 100644
--- a/gui/dialogs/PasswordDialog.h
+++ b/gui/dialogs/EditAccountDialog.h
@@ -18,23 +18,39 @@
#include <QDialog>
namespace Ui {
-class PasswordDialog;
+class EditAccountDialog;
}
-class PasswordDialog : public QDialog
+class EditAccountDialog : public QDialog
{
- Q_OBJECT
+Q_OBJECT
public:
- explicit PasswordDialog(const QString& errorMsg="", QWidget *parent = 0);
- ~PasswordDialog();
+ explicit EditAccountDialog(const QString& text="", QWidget *parent = 0, int flags=UsernameField | PasswordField);
+ ~EditAccountDialog();
+
+ /*!
+ * Gets the text entered in the dialog's username field.
+ */
+ QString username() const;
/*!
* Gets the text entered in the dialog's password field.
*/
QString password() const;
+ enum Flags
+ {
+ NoFlags=0,
+
+ //! Specifies that the dialog should have a username field.
+ UsernameField,
+
+ //! Specifies that the dialog should have a password field.
+ PasswordField,
+ };
+
private:
- Ui::PasswordDialog *ui;
+ Ui::EditAccountDialog *ui;
};
diff --git a/gui/dialogs/PasswordDialog.ui b/gui/dialogs/EditAccountDialog.ui
index 6c70b033..15d371ee 100644
--- a/gui/dialogs/PasswordDialog.ui
+++ b/gui/dialogs/EditAccountDialog.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>PasswordDialog</class>
- <widget class="QDialog" name="PasswordDialog">
+ <class>EditAccountDialog</class>
+ <widget class="QDialog" name="EditAccountDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>94</height>
+ <height>128</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,9 +15,16 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QLabel" name="errorLabel">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Error message here...</string>
+ <string>Message label placeholder.</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="userTextBox">
+ <property name="placeholderText">
+ <string>Email / Username</string>
</property>
</widget>
</item>
@@ -26,6 +33,9 @@
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
+ <property name="placeholderText">
+ <string>Password</string>
+ </property>
</widget>
</item>
<item>
@@ -45,7 +55,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>PasswordDialog</receiver>
+ <receiver>EditAccountDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -61,7 +71,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>PasswordDialog</receiver>
+ <receiver>EditAccountDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 12:22:11 +0000