summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-20 12:20:35 -0600
committerAndrew <forkk@forkk.net>2013-11-20 12:20:35 -0600
commit03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a (patch)
tree35284783b05358446f3ade625096d3a86cb045b5
parent928e0d0b151a4690a5849c2ec4a44d97338937c5 (diff)
downloadMultiMC-03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a.tar
MultiMC-03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a.tar.gz
MultiMC-03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a.tar.lz
MultiMC-03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a.tar.xz
MultiMC-03652b01d2ec8a7c54fb39dd8ed660f0bbc2fa2a.zip
Add a button to open the account list.
Also fix the account list dialog's close button.
-rw-r--r--gui/MainWindow.cpp7
-rw-r--r--gui/MainWindow.h2
-rw-r--r--gui/MainWindow.ui9
-rw-r--r--gui/dialogs/AccountListDialog.cpp2
-rw-r--r--gui/dialogs/AccountListDialog.h2
5 files changed, 20 insertions, 2 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 62ae195b..3bf248f9 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -57,6 +57,7 @@
#include "gui/dialogs/IconPickerDialog.h"
#include "gui/dialogs/EditNotesDialog.h"
#include "gui/dialogs/CopyInstanceDialog.h"
+#include "gui/dialogs/AccountListDialog.h"
#include "gui/ConsoleWindow.h"
@@ -427,6 +428,12 @@ void MainWindow::on_actionSettings_triggered()
proxymodel->sort(0);
}
+void MainWindow::on_actionManageAccounts_triggered()
+{
+ AccountListDialog dialog(this);
+ dialog.exec();
+}
+
void MainWindow::on_actionReportBug_triggered()
{
openWebPage(QUrl("http://multimc.myjetbrains.com/youtrack/dashboard#newissue=yes"));
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 97aa0d9f..b89aab7c 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -79,6 +79,8 @@ slots:
void on_actionSettings_triggered();
+ void on_actionManageAccounts_triggered();
+
void on_actionReportBug_triggered();
void on_actionNews_triggered();
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 6f70fc98..f76d4d4e 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -70,6 +70,7 @@
<addaction name="separator"/>
<addaction name="actionCheckUpdate"/>
<addaction name="actionSettings"/>
+ <addaction name="actionManageAccounts"/>
<addaction name="separator"/>
<addaction name="actionReportBug"/>
<addaction name="actionNews"/>
@@ -465,6 +466,14 @@
<string>Add a new instance.</string>
</property>
</action>
+ <action name="actionManageAccounts">
+ <property name="text">
+ <string>Manage Accounts</string>
+ </property>
+ <property name="toolTip">
+ <string>Manage your Mojang or Minecraft accounts.</string>
+ </property>
+ </action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
diff --git a/gui/dialogs/AccountListDialog.cpp b/gui/dialogs/AccountListDialog.cpp
index 5a73cb18..af074514 100644
--- a/gui/dialogs/AccountListDialog.cpp
+++ b/gui/dialogs/AccountListDialog.cpp
@@ -56,7 +56,7 @@ void AccountListDialog::on_editAccountBtn_clicked()
// TODO
}
-void AccountListDialog::on_closedBtnBox_rejected()
+void AccountListDialog::on_closeBtnBox_rejected()
{
close();
}
diff --git a/gui/dialogs/AccountListDialog.h b/gui/dialogs/AccountListDialog.h
index 57c8b460..99dee639 100644
--- a/gui/dialogs/AccountListDialog.h
+++ b/gui/dialogs/AccountListDialog.h
@@ -43,7 +43,7 @@ slots:
void on_editAccountBtn_clicked();
// This will be sent when the "close" button is clicked.
- void on_closedBtnBox_rejected();
+ void on_closeBtnBox_rejected();
protected:
std::shared_ptr<MojangAccountList> m_accounts;