diff options
| author | David Skoland <davidskoland@gmail.com> | 2017-01-26 16:03:48 +0100 |
|---|---|---|
| committer | David Skoland <davidskoland@gmail.com> | 2017-01-26 16:03:48 +0100 |
| commit | 5e2ea2b24c2c0151ff8b0354632aa00148e0e6d6 (patch) | |
| tree | 4373f833ae982e12d072466df971c91e48a628de /courtroom.h | |
| parent | 47ffce5db5220f476e01e88a17dffcb0f5970f7e (diff) | |
finished charselect and cleaned up some files
Diffstat (limited to 'courtroom.h')
| -rw-r--r-- | courtroom.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/courtroom.h b/courtroom.h index ec31961f..5b2a1115 100644 --- a/courtroom.h +++ b/courtroom.h @@ -16,6 +16,7 @@ #include <QSlider> #include <QVector> #include <QCloseEvent> +#include <QSignalMapper> class AOApplication; @@ -32,6 +33,7 @@ public: void set_widgets(); void set_size_and_pos(QWidget *p_widget, QString p_identifier); void set_taken(int n_char, bool p_taken); + void set_char_select_page(); ~Courtroom(); @@ -51,8 +53,15 @@ private: QVector<evi_type> evidence_list; QVector<QString> music_list; + QSignalMapper *char_button_mapper; + + //0 is the first page, 1 second etc. + //makes char arithmetic easier + int current_char_page = 0; + AOImage *ui_background; - //viewport elements like background, desk, etc. + + //T0D0: add viewport elements like background, desk, etc. QPlainTextEdit *ui_ic_chatlog; @@ -72,7 +81,7 @@ private: QLineEdit *ui_area_password; QLineEdit *ui_music_search; - //emote buttons + //T0D0: add emote buttons AOButton *ui_emote_left; AOButton *ui_emote_right; @@ -129,6 +138,9 @@ private: QLineEdit *ui_char_password; + AOButton *ui_char_select_left; + AOButton *ui_char_select_right; + AOButton *ui_spectator; private slots: void on_change_character_clicked(); @@ -138,6 +150,11 @@ private slots: void on_spectator_clicked(); + void on_char_select_left_clicked(); + void on_char_select_right_clicked(); + + void char_clicked(int n_char); + }; #endif // COURTROOM_H |
