From 274d12ed26c19e62121d81eaf6a762091f73acba Mon Sep 17 00:00:00 2001 From: OmniTroid Date: Mon, 6 Mar 2017 01:16:16 +0100 Subject: [PATCH] changed emote icon image priority --- aoemotebutton.cpp | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/aoemotebutton.cpp b/aoemotebutton.cpp index b6ba8e0..d8f10c9 100644 --- a/aoemotebutton.cpp +++ b/aoemotebutton.cpp @@ -14,31 +14,11 @@ AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app, int p_x connect(this, SIGNAL(clicked()), this, SLOT(on_clicked())); } -/* -void AOEmoteButton::set_on(QString p_char, int p_emote) -{ - //+1 because programmatical emotes start on 0, while filesystem ones start on 1 - QString emotion_number = QString::number(p_emote + 1); - QString image_path = ao_app->get_character_path(p_char) + "emotions/button" + emotion_number + "_on.png"; - - if (file_exists(image_path)) - { - this->setText(""); - this->setStyleSheet("border-image:url(\"" + image_path + "\")"); - } - else - { - this->setText(ao_app->get_emote_comment(p_char, p_emote)); - this->setStyleSheet("border-image:url(\"\")"); - } -} -*/ - void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix) { QString emotion_number = QString::number(p_emote + 1); - QString image_path = ao_app->get_character_path(p_char) + "emotions/button" + emotion_number + suffix; - QString alt_path = ao_app->get_character_path(p_char) + "emotions/ao2/button" + emotion_number + suffix; + QString image_path = ao_app->get_character_path(p_char) + "emotions/ao2/button" + emotion_number + suffix; + QString alt_path = ao_app->get_character_path(p_char) + "emotions/button" + emotion_number + suffix; if (file_exists(image_path)) {