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

Conflicts:
	gui/mainwindow.ui

1 files changed, 63 insertions, 0 deletions

diff --git a/gui/taskdialog.h b/gui/taskdialog.h
new file mode 100644
index 00000000..faf3ed90
--- /dev/null
+++ b/gui/taskdialog.h
@@ -0,0 +1,63 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef TASKDIALOG_H
+#define TASKDIALOG_H
+
+#include <QDialog>
+
+class Task;
+
+namespace Ui {
+class TaskDialog;
+}
+
+class TaskDialog : public QDialog
+{
+	Q_OBJECT
+	
+public:
+	explicit TaskDialog(QWidget *parent = 0);
+	~TaskDialog();
+	
+	void updateSize();
+	
+	void exec(Task* task);
+	
+	Task* getTask();
+	
+public slots:
+	void onTaskStarted(Task*);
+	void onTaskEnded(Task*);
+	
+	void changeStatus(const QString& status);
+	void changeProgress(int progress);
+	
+	void test() { qDebug("Lol"); }
+	
+signals:
+	
+	
+protected:
+	virtual void keyPressEvent(QKeyEvent* e);
+	virtual void closeEvent(QCloseEvent* e);
+	
+private:
+	Ui::TaskDialog *ui;
+	
+	Task* task;
+};
+
+#endif // TASKDIALOG_H