From a416c58a93dd9d108f4c4fa968b9431e30834c5c Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 5 Feb 2013 16:34:20 -0600 Subject: Started working on task system and login system. --- tasks/logintask.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++ tasks/logintask.h | 40 ++++++++++++++++++++++++++++++++++++++++ tasks/task.cpp | 8 ++++---- tasks/task.h | 7 ++++--- 4 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 tasks/logintask.cpp create mode 100644 tasks/logintask.h (limited to 'tasks') diff --git a/tasks/logintask.cpp b/tasks/logintask.cpp new file mode 100644 index 00000000..211e1c17 --- /dev/null +++ b/tasks/logintask.cpp @@ -0,0 +1,44 @@ +/* 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 "logintask.h" + +LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) : + Task(parent), uInfo(uInfo) +{ + +} + +void LoginTask::executeTask() +{ + setStatus("Logging in..."); + + // TODO: PLACEHOLDER + for (int p = 0; p < 100; p++) + { + msleep(25); + setProgress(p); + } + + if (uInfo.getUsername() == "test") + { + LoginResponse response("test", "Fake Session ID"); + emit loginComplete(response); + } + else + { + emit loginFailed("Testing"); + } +} diff --git a/tasks/logintask.h b/tasks/logintask.h new file mode 100644 index 00000000..93aab9b3 --- /dev/null +++ b/tasks/logintask.h @@ -0,0 +1,40 @@ +/* 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 LOGINTASK_H +#define LOGINTASK_H + +#include "task.h" + +#include "data/userinfo.h" +#include "data/loginresponse.h" + +class LoginTask : public Task +{ + Q_OBJECT +public: + explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0); + +signals: + void loginComplete(const LoginResponse& loginResponse); + void loginFailed(const QString& errorMsg); + +protected: + void executeTask(); + + UserInfo uInfo; +}; + +#endif // LOGINTASK_H diff --git a/tasks/task.cpp b/tasks/task.cpp index 8d65b415..d581a1dd 100644 --- a/tasks/task.cpp +++ b/tasks/task.cpp @@ -29,7 +29,7 @@ QString Task::getStatus() const void Task::setStatus(const QString &status) { this->status = status; - statusChanged(status); + emit statusChanged(status); } int Task::getProgress() const @@ -40,7 +40,7 @@ int Task::getProgress() const void Task::setProgress(int progress) { this->progress = progress; - progressChanged(progress); + emit progressChanged(progress); } void Task::startTask() @@ -50,7 +50,7 @@ void Task::startTask() void Task::run() { - taskStarted(this); + emit taskStarted(this); executeTask(); - taskEnded(this); + emit taskEnded(this); } diff --git a/tasks/task.h b/tasks/task.h index 714889c8..0124d8cf 100644 --- a/tasks/task.h +++ b/tasks/task.h @@ -32,6 +32,10 @@ public: QString getStatus() const; int getProgress() const; +public slots: + void setStatus(const QString& status); + void setProgress(int progress); + signals: void taskStarted(Task* task); void taskEnded(Task* task); @@ -40,9 +44,6 @@ signals: void progressChanged(int progress); protected: - void setStatus(const QString& status); - void setProgress(int progress); - virtual void run(); virtual void executeTask() = 0; -- cgit v1.2.3