From af321cfe8fd3965bc01a2ca0eebfe908674b10be Mon Sep 17 00:00:00 2001 From: Logan McNaughton Date: Fri, 9 Oct 2020 19:55:57 -0700 Subject: [PATCH] update gui --- mupen64plus-gui/netplay/waitroom.cpp | 22 +++++++++++----------- mupen64plus-gui/netplay/waitroom.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mupen64plus-gui/netplay/waitroom.cpp b/mupen64plus-gui/netplay/waitroom.cpp index 3618b4f..9767b4e 100644 --- a/mupen64plus-gui/netplay/waitroom.cpp +++ b/mupen64plus-gui/netplay/waitroom.cpp @@ -70,12 +70,12 @@ WaitRoom::WaitRoom(QString filename, QJsonObject room, QWebSocket *socket, QWidg connect(startGameButton, &QPushButton::released, this, &WaitRoom::startGame); layout->addWidget(startGameButton, 11, 0, 1, 2); - discordLink = new QLabel(this); - discordLink->setTextFormat(Qt::RichText); - discordLink->setTextInteractionFlags(Qt::TextBrowserInteraction); - discordLink->setOpenExternalLinks(true); - discordLink->setAlignment(Qt::AlignCenter); - layout->addWidget(discordLink, 12, 0, 1, 2); + motd = new QLabel(this); + motd->setTextFormat(Qt::RichText); + motd->setTextInteractionFlags(Qt::TextBrowserInteraction); + motd->setOpenExternalLinks(true); + motd->setAlignment(Qt::AlignCenter); + layout->addWidget(motd, 12, 0, 1, 2); setLayout(layout); @@ -94,10 +94,10 @@ WaitRoom::WaitRoom(QString filename, QJsonObject room, QWebSocket *socket, QWidg void WaitRoom::sendPing() { - if (discordLink->text().isEmpty()) + if (motd->text().isEmpty()) { QJsonObject json; - json.insert("type", "get_discord"); + json.insert("type", "get_motd"); json.insert("room_name", room_name); QJsonDocument json_doc = QJsonDocument(json); webSocket->sendBinaryMessage(json_doc.toJson()); @@ -179,9 +179,9 @@ void WaitRoom::processBinaryMessage(QByteArray message) w->openROM(file_name, webSocket->peerAddress().toString(), room_port, player_number); accept(); } - else if (json.value("type").toString() == "discord_link") + else if (json.value("type").toString() == "send_motd") { - QString link = json.value("link").toString(); - discordLink->setText("Discord Voice Chat App Link - Web Link"); + QString message = json.value("message").toString(); + motd->setText(message); } } diff --git a/mupen64plus-gui/netplay/waitroom.h b/mupen64plus-gui/netplay/waitroom.h index f5b9730..5f38d65 100644 --- a/mupen64plus-gui/netplay/waitroom.h +++ b/mupen64plus-gui/netplay/waitroom.h @@ -35,7 +35,7 @@ private: QString room_name; QPushButton *startGameButton; QLabel *pingValue; - QLabel *discordLink; + QLabel *motd; QTimer *timer; };