From b11bcd793358ff3ffce3dc2f5063379f9e307616 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 17 Jan 2017 11:08:39 +0100 Subject: configured more courtroom widgets and started reimagining UI --- courtroom.h | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'courtroom.h') diff --git a/courtroom.h b/courtroom.h index 932bbe34..3a8aed2a 100644 --- a/courtroom.h +++ b/courtroom.h @@ -3,7 +3,7 @@ #include "aoimage.h" #include "aobutton.h" -#include "aobuttongrid.h" +#include "aocharbutton.h" #include "aopacket.h" #include @@ -13,6 +13,7 @@ #include #include #include +#include class AOApplication; @@ -21,19 +22,31 @@ class Courtroom : public QMainWindow Q_OBJECT public: explicit Courtroom(AOApplication *parent = 0); + void set_widgets(); + ~Courtroom(); private: AOApplication *ao_app; + const int m_courtroom_width = 714; + const int m_courtroom_height = 668; + + const int m_viewport_x = 0; + const int m_viewport_y = 0; + + const int m_viewport_width = 256; + const int m_viewport_height = 192; + AOImage *ui_background; //viewport elements like background, desk, etc. QPlainTextEdit *ui_ic_chatlog; - QPlainTextEdit *ui_server_chatlog; QPlainTextEdit *ui_ms_chatlog; + QPlainTextEdit *ui_server_chatlog; + - QListWidget *ui_muted_list; + QListWidget *ui_mute_list; QListWidget *ui_area_list; QListWidget *ui_music_list; @@ -89,11 +102,21 @@ private: QSlider *ui_sfx_slider; QSlider *ui_blip_slider; - AOImage *ui_muted; + //char select stuff under here + AOImage *ui_char_select_background; - AOButtonGrid *char_button_grid; + + QVector ui_char_button_list; + AOImage *ui_selector; + + AOButton *ui_back_to_lobby; + + QLineEdit *ui_char_password; + + AOButton *ui_spectator; + }; #endif // COURTROOM_H -- cgit