diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/aoapplication.h | 1 | ||||
| -rw-r--r-- | include/courtroom.h | 15 | ||||
| -rw-r--r-- | include/datatypes.h | 7 |
3 files changed, 21 insertions, 2 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h index 4a3c669b..8d998f46 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -78,6 +78,7 @@ public: bool arup_enabled = false; bool casing_alerts_enabled = false; bool modcall_reason_enabled = false; + bool looping_sfx_support_enabled = false; ///////////////loading info/////////////////// diff --git a/include/courtroom.h b/include/courtroom.h index b3303374..682e12a1 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -49,6 +49,9 @@ #include <QInputDialog> #include <QFileDialog> #include <QTextBoundaryFinder> +#include <QPropertyAnimation> +#include <QParallelAnimationGroup> +#include <QRandomGenerator> #include <stack> @@ -124,6 +127,9 @@ public: //reads theme inis and sets size and pos based on the identifier void set_size_and_pos(QWidget *p_widget, QString p_identifier); + //reads theme inis and returns the size and pos as defined by it + QPoint get_theme_pos(QString p_identifier); + //sets status as taken on character with cid n_char and places proper shading on charselect void set_taken(int n_char, bool p_taken); @@ -213,6 +219,8 @@ public: void announce_case(QString title, bool def, bool pro, bool jud, bool jur, bool steno); void check_connection_received(); + void do_screenshake(); + void doRealization(); ~Courtroom(); @@ -231,6 +239,8 @@ private: bool first_message_sent = false; int maximumMessages = 0; + QParallelAnimationGroup *screenshake_animation_group; + // This is for inline message-colouring. enum INLINE_COLOURS { @@ -320,7 +330,7 @@ private: //the amount of time non-animated witness testimony/cross-examination images stay onscreen for in ms const int wtce_stay_time = 1500; - static const int chatmessage_size = 23; + static const int chatmessage_size = 28; QString m_chatmessage[chatmessage_size]; bool chatmessage_is_empty = false; @@ -346,6 +356,7 @@ private: int objection_state = 0; int realization_state = 0; + int screenshake_state = 0; int text_color = 0; bool is_presenting_evidence = false; @@ -472,6 +483,7 @@ private: AOButton *ui_custom_objection; AOButton *ui_realization; + AOButton *ui_screenshake; AOButton *ui_mute; AOButton *ui_defense_plus; @@ -595,6 +607,7 @@ private slots: void on_custom_objection_clicked(); void on_realization_clicked(); + void on_screenshake_clicked(); void on_mute_clicked(); void on_pair_clicked(); diff --git a/include/datatypes.h b/include/datatypes.h index aaa5de52..1b76f725 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -100,7 +100,12 @@ enum CHAT_MESSAGE SELF_OFFSET, OTHER_OFFSET, OTHER_FLIP, - NONINTERRUPTING_PRE + NONINTERRUPTING_PRE, + LOOPING_SFX, + SCREENSHAKE, + FRAME_SCREENSHAKE, + FRAME_REALIZATION, + FRAME_SFX }; enum COLOR |
