Merge https://github.com/Forkk/MultiMC5

Conflicts:
	gui/mainwindow.ui

1 files changed, 16 insertions, 1 deletions

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 77245531..28ca341a 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -18,7 +18,8 @@
 
 #include <QMainWindow>
 
-#include "../data/instancemodel.h"
+#include "data/instancemodel.h"
+#include "data/loginresponse.h"
 
 namespace Ui
 {
@@ -33,6 +34,8 @@ public:
 	explicit MainWindow(QWidget *parent = 0);
 	~MainWindow();
 	
+	void closeEvent(QCloseEvent *event);
+	
 private slots:
 	void on_actionAbout_triggered();
 	
@@ -52,6 +55,18 @@ private slots:
 	
 	void on_actionNews_triggered();
 	
+	void on_mainToolBar_visibilityChanged(bool);
+	
+	void on_instanceView_customContextMenuRequested(const QPoint &pos);
+	
+	void on_actionLaunchInstance_triggered();
+	
+	
+	void doLogin(const QString& errorMsg = "");
+	
+	
+	void onLoginComplete(LoginResponse response);
+	
 private:
 	Ui::MainWindow *ui;