diff --git a/client/src/ui/mainwindow.ui b/client/src/ui/mainwindow.ui index 67aca47..4273f83 100644 --- a/client/src/ui/mainwindow.ui +++ b/client/src/ui/mainwindow.ui @@ -24,19 +24,52 @@ + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + Qt::Orientation::Vertical + + false + 0 - 0 + 1 + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + @@ -59,21 +92,130 @@ 0 + + + 0 + 30 + + + + + 0 + 0 + + + + 0 + + + 0 + + + 6 + + + 0 + + + 0 + - + + + + 0 + 30 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents + + + + + - - - - 0 - 0 - - - - Send Message + + + + 0 + 30 + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 0 + 0 + + + + + 0 + 30 + + + + false + + + Send Message + + + + @@ -90,8 +232,8 @@ 0 0 - 800 - 30 + 777 + 22 diff --git a/server/inc/logic/service.h b/server/inc/logic/service.h index 6aae342..b75d825 100644 --- a/server/inc/logic/service.h +++ b/server/inc/logic/service.h @@ -12,7 +12,7 @@ public: ~Service(); grpc::ServerBidiReactor * sendMsg(grpc::CallbackServerContext *context) override; - void sendToAll(const chat::chatMsg &msg); + void sendToAll(chat::chatMsg &msg); private: std::map m_clients; diff --git a/server/src/logic/service.cpp b/server/src/logic/service.cpp index be21766..1b7e529 100644 --- a/server/src/logic/service.cpp +++ b/server/src/logic/service.cpp @@ -19,7 +19,7 @@ Service::sendMsg(grpc::CallbackServerContext *context) { return newClient; } -void Service::sendToAll(const chat::chatMsg &msg) { +void Service::sendToAll(chat::chatMsg &msg) { std::cout << "Relay message to: "; for (auto client : m_clients) { std::cout << client.first << " ";