From 381d6b527ba6ed5ab2906c1c8a6c97502f6ba159 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Tue, 19 Dec 2017 08:50:53 +0900
Subject: [PATCH] Set status
---
app/src/websockets/websocketserver.cpp | 12 ++++++++----
app/src/websockets/websocketserver.h | 8 ++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp
index 0380f6f..078a2f1 100644
--- a/app/src/websockets/websocketserver.cpp
+++ b/app/src/websockets/websocketserver.cpp
@@ -199,29 +199,33 @@ void WebSocketServer::itemUninstallFinished(QJsonObject result)
sendMessage("", "ItemHandler::uninstallFinished", data);
}
-void WebSocketServer::updateCheckAllStarted()
+void WebSocketServer::updateCheckAllStarted(bool status)
{
QJsonArray data;
+ data.append(status);
sendMessage("", "UpdateHandler::checkAllStarted", data);
}
-void WebSocketServer::updateCheckAllFinished()
+void WebSocketServer::updateCheckAllFinished(bool status)
{
QJsonArray data;
+ data.append(status);
sendMessage("", "UpdateHandler::checkAllFinished", data);
}
-void WebSocketServer::updateUpdateStarted(QString itemKey)
+void WebSocketServer::updateUpdateStarted(QString itemKey, bool status)
{
QJsonArray data;
data.append(itemKey);
+ data.append(status);
sendMessage("", "UpdateHandler::updateStarted", data);
}
-void WebSocketServer::updateUpdateFinished(QString itemKey)
+void WebSocketServer::updateUpdateFinished(QString itemKey, bool status)
{
QJsonArray data;
data.append(itemKey);
+ data.append(status);
sendMessage("", "UpdateHandler::updateFinished", data);
}
diff --git a/app/src/websockets/websocketserver.h b/app/src/websockets/websocketserver.h
index d017743..7b83f16 100644
--- a/app/src/websockets/websocketserver.h
+++ b/app/src/websockets/websocketserver.h
@@ -51,11 +51,11 @@ private slots:
void itemUninstallStarted(QJsonObject result);
void itemUninstallFinished(QJsonObject result);
- void updateCheckAllStarted();
- void updateCheckAllFinished();
- void updateUpdateStarted(QString itemKey);
- void updateUpdateFinished(QString itemKey);
void updateUpdateProgress(QString itemKey, int progress);
+ void updateCheckAllStarted(bool status);
+ void updateCheckAllFinished(bool status);
+ void updateUpdateStarted(QString itemKey, bool status);
+ void updateUpdateFinished(QString itemKey, bool status);
private:
void receiveMessage(const QString &id, const QString &func, const QJsonArray &data);
--
GitLab