aboutsummaryrefslogtreecommitdiff
path: root/include/courtroom.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/courtroom.h')
-rw-r--r--include/courtroom.h7
1 files changed, 5 insertions, 2 deletions
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();