aboutsummaryrefslogtreecommitdiff
path: root/src/courtroom.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <Varsash@Gmail.com>2022-07-23 18:18:54 +0300
committerGitHub <noreply@github.com>2022-07-23 18:18:54 +0300
commitef49b46c37c3d1922db7afcbfd7a715a250a5b4c (patch)
tree04c3e245f90bf30b88984ac557f79642b583bd0b /src/courtroom.cpp
parentad578eb0bd15dfa828c8c43518991ee8ce81e261 (diff)
Add Emote preview (#774)
* Add an emote preview which pops up from right click context menu * rename action names to "preanim/idle/talk" * Improve emote preview window * Preview no longer ignores offsets No longer override stylesheets Add "Preview Selected" option to the dropdown * bruh * Fix "set play once" being ignored when a (c) emote is loaded * Remove useless comments * Implement Salanto suggestions Co-authored-by: stonedDiscord <Tukz@gmx.de>
Diffstat (limited to 'src/courtroom.cpp')
-rw-r--r--src/courtroom.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index e76ba414..60d2948e 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -209,8 +209,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_music_search->setPlaceholderText(tr("Search"));
ui_music_search->setObjectName("ui_music_search");
- initialize_emotes();
-
ui_pos_dropdown = new QComboBox(this);
ui_pos_dropdown->view()->setTextElideMode(Qt::ElideLeft);
ui_pos_dropdown->setObjectName("ui_pos_dropdown");
@@ -404,6 +402,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
ui_evidence_button = new AOButton(this, ao_app);
ui_evidence_button->setObjectName("ui_evidence_button");
+ initialize_emotes();
initialize_evidence();
construct_char_select();