From 3afdad90c8eceef4194657713033c6c48d6e97cd Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Wed, 29 Jul 2020 17:45:46 -0500 Subject: Add support for multiple custom interjections via context menu (#162) * YOU DO NOT BELONG IN THIS PR GET OUT Co-authored-by: oldmud0 Co-authored-by: likeawindrammer <31085911+likeawindrammer@users.noreply.github.com> Co-authored-by: Crystalwarrior --- include/courtroom.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/courtroom.h b/include/courtroom.h index 1862c77..af3059a 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -224,8 +224,8 @@ public: void append_ic_text(QString p_text, QString p_name = "", QString action = "", int color = 0); // prints who played the song to IC chat and plays said song(if found on local - // filesystem) takes in a list where the first element is the song name and the - // second is the char id of who played it + // filesystem) takes in a list where the first element is the song name and + // the second is the char id of who played it void handle_song(QStringList *p_contents); void play_preanim(bool noninterrupting); @@ -380,6 +380,7 @@ private: QString current_char = ""; int objection_state = 0; + QString objection_custom = ""; int realization_state = 0; int screenshake_state = 0; int text_color = 0; @@ -561,6 +562,7 @@ private: QCheckBox *ui_showname_enable; AOButton *ui_custom_objection; + QMenu *custom_obj_menu; AOButton *ui_realization; AOButton *ui_screenshake; AOButton *ui_mute; @@ -723,6 +725,7 @@ private slots: void on_objection_clicked(); void on_take_that_clicked(); void on_custom_objection_clicked(); + void show_custom_objection_menu(const QPoint &pos); void on_realization_clicked(); void on_screenshake_clicked(); -- cgit