894b2b2a0e
* Rewrite AOScene and remove the need for AOMovie and AOCharMovie by consolidation * Rename AOScene to AOLayer, apply suggestions to improve functionality * Implement suggested change to allocation * Switch from pointer to field, fix ui_vp_player_char not resetting play_once * Use the variable gif_name instead of the string "gif_name" Oops. * Total rewrite of AOLayer (again) * Add support for (c) animations, do some housekeeping * allow themes to override misc chatboxes * add support for pulling InterfaceLayer elements from theme/misc * mistakes were made * move all frame fx functionality to CharLayer subclass * virtual functions are cool mkay * remove evidence of my incompetence * allow themes to override font design inis under theme/misc * Proper support for theme/misc chatbox, fixes * Fix chatbox dimensions not updating and inline color causing missingnos * rename chat markdown to chat markup * add missing misc overrides * quick hotfix for chatblank and misc overrides * Fix oversight with backgrounds causing them to be culled * Same as last commit but for FG layer * amend comment to explain impossible shenanigans * Adjust ForegroundLayer to take charname rather than miscname, allow for checking in char folder * fix an incredibly embarrassing pathing bug * add scaling overrides for all layer types, parent orphaned viewport elements to the viewport * stupid fix because themes use "custom.png" as a button * switch to .append() * Revert "Merge branch 'aoscene_rewrite' of https://github.com/AttorneyOnline/AO2-Client into aoscene_rewrite" This reverts commit bdeb1bff7639d522031aab3c133a83b0e2a291df, reversing changes made to 125ee63b97a6f6c156e69525d88fddc625e7a978. * switch to .append() (again) * move function call to fix showname length calculation error * fix nonlooping character animations being broken Again * unparent elements from the viewport and do fancy masking arithmetic instead * use override keyword * move scaling override to char.ini, allow stretching, restructure effect property loading * fix some redundancy * unparent chat_arrow from chatbox to prevent accidental masking * at no point do we want a frozen gif to display * overhaul how wtce is handled * oops * also let sounds be pulled from theme miscs * i should probably compile before i push * actually make it work * don't check a default bg * readd 1x1 stretch thing * actually the 1x1 thing was a bad idea * Add missing parenthesis * Use load_image instead of play play is a nonexistent method now * Remote shout_message and usages because it does nothing * Remove multiple redefinitions * Add in missing brackets and indent to fix build I have know idea what this does but it brings fear * fix build error * fix chat arrow and remove duped code * remove more duped code and fix misc themes * only update chat_arrow when needed * consolidate log_chatmessage and display_log_chatmessage Co-authored-by: scatterflower <marisaposs@gameboyprinter.moe> Co-authored-by: Skye Deving <76892045+skyedeving@users.noreply.github.com> Co-authored-by: oldmud0 <oldmud0@users.noreply.github.com>
74 lines
2.0 KiB
C++
74 lines
2.0 KiB
C++
#include "aoevidencedisplay.h"
|
|
|
|
#include "datatypes.h"
|
|
#include "file_functions.h"
|
|
#include "misc_functions.h"
|
|
|
|
AOEvidenceDisplay::AOEvidenceDisplay(QWidget *p_parent, AOApplication *p_ao_app)
|
|
: QLabel(p_parent)
|
|
{
|
|
ao_app = p_ao_app;
|
|
evidence_icon = new QLabel(this);
|
|
sfx_player = new AOSfxPlayer(this, ao_app);
|
|
|
|
evidence_movie = new InterfaceLayer(this, ao_app);
|
|
|
|
connect(evidence_movie, SIGNAL(done()), this, SLOT(show_done()));
|
|
}
|
|
|
|
void AOEvidenceDisplay::show_evidence(QString p_evidence_image,
|
|
bool is_left_side, int p_volume)
|
|
{
|
|
this->reset();
|
|
|
|
sfx_player->set_volume(p_volume);
|
|
|
|
QString final_gif_path;
|
|
QString gif_name;
|
|
QString icon_identifier;
|
|
|
|
if (is_left_side) {
|
|
icon_identifier = "left_evidence_icon";
|
|
gif_name = "evidence_appear_left";
|
|
}
|
|
else {
|
|
icon_identifier = "right_evidence_icon";
|
|
gif_name = "evidence_appear_right";
|
|
}
|
|
|
|
QString f_evidence_path = ao_app->get_evidence_path(p_evidence_image);
|
|
QPixmap f_pixmap(f_evidence_path);
|
|
|
|
pos_size_type icon_dimensions =
|
|
ao_app->get_element_dimensions(icon_identifier, "courtroom_design.ini");
|
|
|
|
f_pixmap = f_pixmap.scaled(icon_dimensions.width, icon_dimensions.height);
|
|
evidence_icon->setPixmap(f_pixmap);
|
|
evidence_icon->resize(f_pixmap.size());
|
|
evidence_icon->move(icon_dimensions.x, icon_dimensions.y);
|
|
evidence_movie->static_duration = 320;
|
|
evidence_movie->max_duration = 1000;
|
|
evidence_movie->set_play_once(true);
|
|
evidence_movie->load_image(gif_name, "");
|
|
sfx_player->play(ao_app->get_sfx("evidence_present", "default"));
|
|
}
|
|
|
|
void AOEvidenceDisplay::reset()
|
|
{
|
|
sfx_player->stop();
|
|
evidence_movie->stop();
|
|
evidence_icon->hide();
|
|
this->clear();
|
|
}
|
|
|
|
void AOEvidenceDisplay::show_done() { evidence_icon->show(); }
|
|
|
|
QLabel *AOEvidenceDisplay::get_evidence_icon() { return evidence_icon; }
|
|
|
|
void AOEvidenceDisplay::combo_resize(int w, int h)
|
|
{
|
|
QSize f_size(w, h);
|
|
this->resize(f_size);
|
|
evidence_movie->combo_resize(w, h);
|
|
}
|