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

Conflicts:
	gui/mainwindow.ui

1 files changed, 56 insertions, 0 deletions

diff --git a/tasks/task.cpp b/tasks/task.cpp
new file mode 100644
index 00000000..d581a1dd
--- /dev/null
+++ b/tasks/task.cpp
@@ -0,0 +1,56 @@
+/* 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.
+ */
+
+#include "task.h"
+
+Task::Task(QObject *parent) :
+	QThread(parent)
+{
+	
+}
+
+QString Task::getStatus() const
+{
+	return status;
+}
+
+void Task::setStatus(const QString &status)
+{
+	this->status = status;
+	emit statusChanged(status);
+}
+
+int Task::getProgress() const
+{
+	return progress;
+}
+
+void Task::setProgress(int progress)
+{
+	this->progress = progress;
+	emit progressChanged(progress);
+}
+
+void Task::startTask()
+{
+	start();
+}
+
+void Task::run()
+{
+	emit taskStarted(this);
+	executeTask();
+	emit taskEnded(this);
+}