From fbcdf051190670141511387dce291988168a01e7 Mon Sep 17 00:00:00 2001 From: OmniTroid Date: Wed, 24 May 2017 01:22:05 +0200 Subject: [PATCH] FASTEN YOUR SEATBELTS, EVIDENCE IS DONE --- aoevidencedisplay.cpp | 2 -- courtroom.cpp | 5 ++++- evidence.cpp | 23 ++++++++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/aoevidencedisplay.cpp b/aoevidencedisplay.cpp index 20be453..4d19865 100644 --- a/aoevidencedisplay.cpp +++ b/aoevidencedisplay.cpp @@ -70,8 +70,6 @@ void AOEvidenceDisplay::show_evidence(QString p_evidence_image, bool is_left_sid void AOEvidenceDisplay::frame_change(int p_frame) { - qDebug() << "total evi frames: " << evidence_movie->frameCount(); - qDebug() << "evi_frame: " << p_frame; if (p_frame == (evidence_movie->frameCount() - 1)) { //we need this or else the last frame wont show diff --git a/courtroom.cpp b/courtroom.cpp index a09520b..8100035 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -928,6 +928,7 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) ui_vp_objection->stop(); ui_vp_player_char->stop(); chat_tick_timer->stop(); + ui_vp_evidence_display->reset(); chatmessage_is_empty = m_chatmessage[MESSAGE] == " " || m_chatmessage[MESSAGE] == ""; @@ -936,12 +937,14 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) ui_ic_chat_message->clear(); objection_state = 0; realization_state = 0; + is_presenting_evidence = false; ui_pre->setChecked(false); ui_hold_it->set_image("holdit.png"); ui_objection->set_image("objection.png"); ui_take_that->set_image("takethat.png"); ui_custom_objection->set_image("custom.png"); ui_realization->set_image("realization.png"); + ui_evidence_present->set_image("present_disabled.png"); } append_ic_text(f_message); @@ -1052,7 +1055,7 @@ void Courtroom::handle_chatmessage_3() //shifted by 1 because 0 is no evidence per legacy standards QString f_image = local_evidence_list.at(f_evi_id - 1).image; //def jud and hlp should display the evidence icon on the RIGHT side - bool is_left_side = !(f_side == "def" || f_side == "hlp" || "jud"); + bool is_left_side = !(f_side == "def" || f_side == "hlp" || f_side == "jud"); ui_vp_evidence_display->show_evidence(f_image, is_left_side, ui_sfx_slider->value()); } diff --git a/evidence.cpp b/evidence.cpp index 43ee56b..7f91c58 100644 --- a/evidence.cpp +++ b/evidence.cpp @@ -210,16 +210,9 @@ void Courtroom::on_evidence_clicked(int p_id) ui_evidence_list.at(p_id)->set_selected(true); - /* - for (AOEvidenceButton *i_button : ui_evidence_list) - { - i_button->set_selected(false); - } - - ui_evidence_list.at(p_id)->set_selected(true); - */ - current_evidence = f_real_id; + + ui_ic_chat_message->setFocus(); } void Courtroom::on_evidence_double_clicked(int p_id) @@ -235,6 +228,8 @@ void Courtroom::on_evidence_double_clicked(int p_id) ui_evidence_image->setText(f_evi.image); ui_evidence_overlay->show(); + + ui_ic_chat_message->setFocus(); } void Courtroom::on_evidence_hover(int p_id, bool p_state) @@ -260,6 +255,8 @@ void Courtroom::on_evidence_left_clicked() --current_evidence_page; set_evidence_page(); + + ui_ic_chat_message->setFocus(); } void Courtroom::on_evidence_right_clicked() @@ -267,6 +264,8 @@ void Courtroom::on_evidence_right_clicked() ++current_evidence_page; set_evidence_page(); + + ui_ic_chat_message->setFocus(); } void Courtroom::on_evidence_present_clicked() @@ -277,6 +276,8 @@ void Courtroom::on_evidence_present_clicked() ui_evidence_present->set_image("present.png"); is_presenting_evidence = !is_presenting_evidence; + + ui_ic_chat_message->setFocus(); } void Courtroom::on_evidence_delete_clicked() @@ -287,6 +288,8 @@ void Courtroom::on_evidence_delete_clicked() ao_app->send_server_packet(new AOPacket("DE#" + QString::number(current_evidence) + "#%")); current_evidence = 0; + + ui_ic_chat_message->setFocus(); } void Courtroom::on_evidence_x_clicked() @@ -307,5 +310,7 @@ void Courtroom::on_evidence_x_clicked() f_contents.append(f_evi.image); ao_app->send_server_packet(new AOPacket("EE", f_contents)); + + ui_ic_chat_message->setFocus(); }