Merge pull request #1 from argoneuscze/modcall_reason

Added support for modcall reasons
This commit is contained in:
wewlad1 2018-08-06 05:53:53 +09:00 committed by GitHub
commit a8344ced3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 4 deletions

View File

@ -56,6 +56,7 @@ public:
bool improved_loading_enabled = false;
bool desk_mod_enabled = false;
bool evidence_enabled = false;
bool modcall_reason_enabled = false;
///////////////loading info///////////////////
@ -224,8 +225,8 @@ public:
private:
const int RELEASE = 2;
const int MAJOR_VERSION = 4;
const int MINOR_VERSION = 10;
const int MAJOR_VERSION = 5;
const int MINOR_VERSION = 0;
QString current_theme = "default";

View File

@ -2018,7 +2018,29 @@ void Courtroom::on_spectator_clicked()
void Courtroom::on_call_mod_clicked()
{
ao_app->send_server_packet(new AOPacket("ZZ#%"));
if (ao_app->modcall_reason_enabled) {
auto box = new QInputDialog();
box->setLabelText("Enter a reason:");
auto code = box->exec();
if (code != QDialog::Accepted) {
delete box;
return;
}
auto text = box->textValue();
if (text.isEmpty())
text = "N/A";
delete box;
QStringList mod_reason;
mod_reason.append(text);
ao_app->send_server_packet(new AOPacket("ZZ", mod_reason));
} else {
ao_app->send_server_packet(new AOPacket("ZZ#%"));
}
ui_ic_chat_message->setFocus();
}

View File

@ -43,6 +43,7 @@
#include <QSignalMapper>
#include <QMap>
#include <QTextBrowser>
#include <QInputDialog>
class AOApplication;

View File

@ -12,7 +12,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
{
ao_app = p_ao_app;
this->setWindowTitle("Attorney Online 2");
this->setWindowTitle("Attorney Online Vidya (AO2)");
ui_background = new AOImage(this, ao_app);
ui_public_servers = new AOButton(this, ao_app);

View File

@ -195,6 +195,8 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
desk_mod_enabled = true;
if (f_packet.contains("evidence",Qt::CaseInsensitive))
evidence_enabled = true;
if (f_packet.contains("modcall_reason",Qt::CaseInsensitive))
modcall_reason_enabled = true;
}
else if (header == "PN")
{