aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/background/gs4/Thumbs.dbbin0 -> 39424 bytes
-rw-r--r--base/background/gs4/bancoacusacion.gifbin0 -> 2288 bytes
-rw-r--r--base/background/gs4/bancoacusacion.pngbin0 -> 1838 bytes
-rw-r--r--base/background/gs4/bancodefensa.gifbin0 -> 1446 bytes
-rw-r--r--base/background/gs4/bancodefensa.pngbin0 -> 1918 bytes
-rw-r--r--base/background/gs4/defensedesk.pngbin0 -> 6880 bytes
-rw-r--r--base/background/gs4/defenseempty.pngbin0 -> 20664 bytes
-rw-r--r--base/background/gs4/estrado.gifbin0 -> 3536 bytes
-rw-r--r--base/background/gs4/estrado.pngbin0 -> 3762 bytes
-rw-r--r--base/background/gs4/gallery.gifbin0 -> 29619 bytes
-rw-r--r--base/background/gs4/helperstand.pngbin0 -> 23540 bytes
-rw-r--r--base/background/gs4/judgestand.pngbin0 -> 28073 bytes
-rw-r--r--base/background/gs4/prohelperstand.pngbin0 -> 29440 bytes
-rw-r--r--base/background/gs4/prosecutiondesk.pngbin0 -> 6551 bytes
-rw-r--r--base/background/gs4/prosecutorempty.pngbin0 -> 20487 bytes
-rw-r--r--base/background/gs4/speedlineupclose.pngbin0 -> 3516 bytes
-rw-r--r--base/background/gs4/stand.pngbin0 -> 2657 bytes
-rw-r--r--base/background/gs4/super anim.pngbin0 -> 17676 bytes
-rw-r--r--base/background/gs4/tribunal.gifbin0 -> 29619 bytes
-rw-r--r--base/background/gs4/witnessempty.pngbin0 -> 25245 bytes
-rw-r--r--base/config.ini1
-rw-r--r--base/config.ini~1
-rw-r--r--base/themes/1.8/arrow_left.pngbin0 -> 742 bytes
-rw-r--r--base/themes/1.8/arrow_right.pngbin0 -> 730 bytes
-rw-r--r--base/themes/1.8/chatmed.pngbin0 -> 505 bytes
-rw-r--r--base/themes/1.8/favorites.pngbin0 -> 1682 bytes
-rw-r--r--base/themes/1.8/favorites_selected.pngbin0 -> 2238 bytes
-rw-r--r--base/themes/1.8/holdit.pngbin0 -> 1983 bytes
-rw-r--r--base/themes/1.8/holdit_selected.pngbin0 -> 1835 bytes
-rw-r--r--base/themes/1.8/mute.pngbin0 -> 4984 bytes
-rw-r--r--base/themes/1.8/mute_pressed.pngbin0 -> 4725 bytes
-rw-r--r--base/themes/1.8/objection.pngbin0 -> 2147 bytes
-rw-r--r--base/themes/1.8/objection_selected.pngbin0 -> 1988 bytes
-rw-r--r--base/themes/1.8/publicservers.pngbin0 -> 1836 bytes
-rw-r--r--base/themes/1.8/publicservers_selected.pngbin0 -> 2399 bytes
-rw-r--r--base/themes/1.8/takethat.pngbin0 -> 2057 bytes
-rw-r--r--base/themes/1.8/takethat_selected.pngbin0 -> 1932 bytes
-rw-r--r--base/themes/default/about.pngbin0 -> 3298 bytes
-rw-r--r--base/themes/default/addtofav.pngbin0 -> 972 bytes
-rw-r--r--base/themes/default/addtofav_pressed.pngbin0 -> 938 bytes
-rw-r--r--base/themes/default/arrow_left.pngbin0 -> 1027 bytes
-rw-r--r--base/themes/default/arrow_right.pngbin0 -> 1039 bytes
-rw-r--r--base/themes/default/char_passworded.pngbin0 -> 1904 bytes
-rw-r--r--base/themes/default/char_selector.pngbin0 -> 344 bytes
-rw-r--r--base/themes/default/char_taken.pngbin0 -> 291 bytes
-rw-r--r--base/themes/default/charselect_background.pngbin0 -> 5343 bytes
-rw-r--r--base/themes/default/chat.pngbin0 -> 1529 bytes
-rw-r--r--base/themes/default/chatbig.pngbin0 -> 80093 bytes
-rw-r--r--base/themes/default/chatmed.pngbin0 -> 1669 bytes
-rw-r--r--base/themes/default/connect.pngbin0 -> 914 bytes
-rw-r--r--base/themes/default/connect_pressed.pngbin0 -> 925 bytes
-rw-r--r--base/themes/default/courtroom_design.ini46
-rw-r--r--base/themes/default/courtroom_design.ini~46
-rw-r--r--base/themes/default/courtroombackground.pngbin0 -> 30560 bytes
-rw-r--r--base/themes/default/crossexamination.gifbin0 -> 88834 bytes
-rw-r--r--base/themes/default/crossexamination.pngbin0 -> 4187 bytes
-rw-r--r--base/themes/default/custom.pngbin0 -> 3421 bytes
-rw-r--r--base/themes/default/custom_selected.pngbin0 -> 3468 bytes
-rw-r--r--base/themes/default/defense_speedlines.gifbin0 -> 31308 bytes
-rw-r--r--base/themes/default/defensebar0.pngbin0 -> 286 bytes
-rw-r--r--base/themes/default/defensebar1.pngbin0 -> 2949 bytes
-rw-r--r--base/themes/default/defensebar10.pngbin0 -> 315 bytes
-rw-r--r--base/themes/default/defensebar2.pngbin0 -> 3032 bytes
-rw-r--r--base/themes/default/defensebar3.pngbin0 -> 3033 bytes
-rw-r--r--base/themes/default/defensebar4.pngbin0 -> 3030 bytes
-rw-r--r--base/themes/default/defensebar5.pngbin0 -> 3033 bytes
-rw-r--r--base/themes/default/defensebar6.pngbin0 -> 3031 bytes
-rw-r--r--base/themes/default/defensebar7.pngbin0 -> 3035 bytes
-rw-r--r--base/themes/default/defensebar8.pngbin0 -> 3034 bytes
-rw-r--r--base/themes/default/defensebar9.pngbin0 -> 3035 bytes
-rw-r--r--base/themes/default/defminus.pngbin0 -> 492 bytes
-rw-r--r--base/themes/default/defplus.pngbin0 -> 498 bytes
-rw-r--r--base/themes/default/design.ini28
-rw-r--r--base/themes/default/emote_selected.pngbin0 -> 249 bytes
-rw-r--r--base/themes/default/favorites.pngbin0 -> 3882 bytes
-rw-r--r--base/themes/default/favorites_selected.pngbin0 -> 4306 bytes
-rw-r--r--base/themes/default/holdit.gifbin0 -> 40518 bytes
-rw-r--r--base/themes/default/holdit.pngbin0 -> 1316 bytes
-rw-r--r--base/themes/default/holdit_selected.pngbin0 -> 1211 bytes
-rw-r--r--base/themes/default/lobbybackground.pngbin0 -> 29532 bytes
-rw-r--r--base/themes/default/mute.pngbin0 -> 652 bytes
-rw-r--r--base/themes/default/mute_pressed.pngbin0 -> 608 bytes
-rw-r--r--base/themes/default/muted.pngbin0 -> 5703 bytes
-rw-r--r--base/themes/default/objection.gifbin0 -> 44417 bytes
-rw-r--r--base/themes/default/objection.pngbin0 -> 1383 bytes
-rw-r--r--base/themes/default/objection_selected.pngbin0 -> 1280 bytes
-rw-r--r--base/themes/default/placeholder.gifbin0 -> 9168 bytes
-rw-r--r--base/themes/default/present.pngbin0 -> 3035 bytes
-rw-r--r--base/themes/default/present_disabled.pngbin0 -> 2905 bytes
-rw-r--r--base/themes/default/prominus.pngbin0 -> 493 bytes
-rw-r--r--base/themes/default/proplus.pngbin0 -> 498 bytes
-rw-r--r--base/themes/default/prosecution_speedlines.gifbin0 -> 31252 bytes
-rw-r--r--base/themes/default/prosecutionbar0.pngbin0 -> 286 bytes
-rw-r--r--base/themes/default/prosecutionbar1.pngbin0 -> 2951 bytes
-rw-r--r--base/themes/default/prosecutionbar10.pngbin0 -> 3026 bytes
-rw-r--r--base/themes/default/prosecutionbar2.pngbin0 -> 3041 bytes
-rw-r--r--base/themes/default/prosecutionbar3.pngbin0 -> 3041 bytes
-rw-r--r--base/themes/default/prosecutionbar4.pngbin0 -> 3039 bytes
-rw-r--r--base/themes/default/prosecutionbar5.pngbin0 -> 3041 bytes
-rw-r--r--base/themes/default/prosecutionbar6.pngbin0 -> 3038 bytes
-rw-r--r--base/themes/default/prosecutionbar7.pngbin0 -> 3041 bytes
-rw-r--r--base/themes/default/prosecutionbar8.pngbin0 -> 3041 bytes
-rw-r--r--base/themes/default/prosecutionbar9.pngbin0 -> 3044 bytes
-rw-r--r--base/themes/default/publicservers.pngbin0 -> 3999 bytes
-rw-r--r--base/themes/default/publicservers_selected.pngbin0 -> 4427 bytes
-rw-r--r--base/themes/default/realization.pngbin0 -> 1352 bytes
-rw-r--r--base/themes/default/realization_pressed.pngbin0 -> 1108 bytes
-rw-r--r--base/themes/default/realizationflash.pngbin0 -> 646 bytes
-rw-r--r--base/themes/default/refresh.pngbin0 -> 914 bytes
-rw-r--r--base/themes/default/refresh_pressed.pngbin0 -> 919 bytes
-rw-r--r--base/themes/default/takethat.gifbin0 -> 42063 bytes
-rw-r--r--base/themes/default/takethat.pngbin0 -> 1340 bytes
-rw-r--r--base/themes/default/takethat_selected.pngbin0 -> 1254 bytes
-rw-r--r--base/themes/default/testimony.gifbin0 -> 1033 bytes
-rw-r--r--base/themes/default/witnesstestimony.gifbin0 -> 105223 bytes
-rw-r--r--base/themes/default/witnesstestimony.pngbin0 -> 5186 bytes
-rw-r--r--courtroom.cpp265
-rw-r--r--courtroom.h33
-rw-r--r--lobby.cpp22
-rw-r--r--lobby.h13
-rw-r--r--main.cpp6
121 files changed, 443 insertions, 18 deletions
diff --git a/base/background/gs4/Thumbs.db b/base/background/gs4/Thumbs.db
new file mode 100644
index 00000000..dae67a25
--- /dev/null
+++ b/base/background/gs4/Thumbs.db
Binary files differ
diff --git a/base/background/gs4/bancoacusacion.gif b/base/background/gs4/bancoacusacion.gif
new file mode 100644
index 00000000..7b330a3c
--- /dev/null
+++ b/base/background/gs4/bancoacusacion.gif
Binary files differ
diff --git a/base/background/gs4/bancoacusacion.png b/base/background/gs4/bancoacusacion.png
new file mode 100644
index 00000000..cce6bfe1
--- /dev/null
+++ b/base/background/gs4/bancoacusacion.png
Binary files differ
diff --git a/base/background/gs4/bancodefensa.gif b/base/background/gs4/bancodefensa.gif
new file mode 100644
index 00000000..bb30ac14
--- /dev/null
+++ b/base/background/gs4/bancodefensa.gif
Binary files differ
diff --git a/base/background/gs4/bancodefensa.png b/base/background/gs4/bancodefensa.png
new file mode 100644
index 00000000..c7121cc3
--- /dev/null
+++ b/base/background/gs4/bancodefensa.png
Binary files differ
diff --git a/base/background/gs4/defensedesk.png b/base/background/gs4/defensedesk.png
new file mode 100644
index 00000000..00a3ffb6
--- /dev/null
+++ b/base/background/gs4/defensedesk.png
Binary files differ
diff --git a/base/background/gs4/defenseempty.png b/base/background/gs4/defenseempty.png
new file mode 100644
index 00000000..fc9069e5
--- /dev/null
+++ b/base/background/gs4/defenseempty.png
Binary files differ
diff --git a/base/background/gs4/estrado.gif b/base/background/gs4/estrado.gif
new file mode 100644
index 00000000..cd5075f7
--- /dev/null
+++ b/base/background/gs4/estrado.gif
Binary files differ
diff --git a/base/background/gs4/estrado.png b/base/background/gs4/estrado.png
new file mode 100644
index 00000000..9341a810
--- /dev/null
+++ b/base/background/gs4/estrado.png
Binary files differ
diff --git a/base/background/gs4/gallery.gif b/base/background/gs4/gallery.gif
new file mode 100644
index 00000000..4469bceb
--- /dev/null
+++ b/base/background/gs4/gallery.gif
Binary files differ
diff --git a/base/background/gs4/helperstand.png b/base/background/gs4/helperstand.png
new file mode 100644
index 00000000..882c30ce
--- /dev/null
+++ b/base/background/gs4/helperstand.png
Binary files differ
diff --git a/base/background/gs4/judgestand.png b/base/background/gs4/judgestand.png
new file mode 100644
index 00000000..6a17e7c9
--- /dev/null
+++ b/base/background/gs4/judgestand.png
Binary files differ
diff --git a/base/background/gs4/prohelperstand.png b/base/background/gs4/prohelperstand.png
new file mode 100644
index 00000000..6554d32d
--- /dev/null
+++ b/base/background/gs4/prohelperstand.png
Binary files differ
diff --git a/base/background/gs4/prosecutiondesk.png b/base/background/gs4/prosecutiondesk.png
new file mode 100644
index 00000000..9f626733
--- /dev/null
+++ b/base/background/gs4/prosecutiondesk.png
Binary files differ
diff --git a/base/background/gs4/prosecutorempty.png b/base/background/gs4/prosecutorempty.png
new file mode 100644
index 00000000..eecf8522
--- /dev/null
+++ b/base/background/gs4/prosecutorempty.png
Binary files differ
diff --git a/base/background/gs4/speedlineupclose.png b/base/background/gs4/speedlineupclose.png
new file mode 100644
index 00000000..06dc9b3a
--- /dev/null
+++ b/base/background/gs4/speedlineupclose.png
Binary files differ
diff --git a/base/background/gs4/stand.png b/base/background/gs4/stand.png
new file mode 100644
index 00000000..3719e36a
--- /dev/null
+++ b/base/background/gs4/stand.png
Binary files differ
diff --git a/base/background/gs4/super anim.png b/base/background/gs4/super anim.png
new file mode 100644
index 00000000..fd3ec29a
--- /dev/null
+++ b/base/background/gs4/super anim.png
Binary files differ
diff --git a/base/background/gs4/tribunal.gif b/base/background/gs4/tribunal.gif
new file mode 100644
index 00000000..4469bceb
--- /dev/null
+++ b/base/background/gs4/tribunal.gif
Binary files differ
diff --git a/base/background/gs4/witnessempty.png b/base/background/gs4/witnessempty.png
new file mode 100644
index 00000000..11e22f74
--- /dev/null
+++ b/base/background/gs4/witnessempty.png
Binary files differ
diff --git a/base/config.ini b/base/config.ini
new file mode 100644
index 00000000..61e18830
--- /dev/null
+++ b/base/config.ini
@@ -0,0 +1 @@
+theme = default
diff --git a/base/config.ini~ b/base/config.ini~
new file mode 100644
index 00000000..61e18830
--- /dev/null
+++ b/base/config.ini~
@@ -0,0 +1 @@
+theme = default
diff --git a/base/themes/1.8/arrow_left.png b/base/themes/1.8/arrow_left.png
new file mode 100644
index 00000000..f1098c49
--- /dev/null
+++ b/base/themes/1.8/arrow_left.png
Binary files differ
diff --git a/base/themes/1.8/arrow_right.png b/base/themes/1.8/arrow_right.png
new file mode 100644
index 00000000..2b5ad70d
--- /dev/null
+++ b/base/themes/1.8/arrow_right.png
Binary files differ
diff --git a/base/themes/1.8/chatmed.png b/base/themes/1.8/chatmed.png
new file mode 100644
index 00000000..0c3bae1e
--- /dev/null
+++ b/base/themes/1.8/chatmed.png
Binary files differ
diff --git a/base/themes/1.8/favorites.png b/base/themes/1.8/favorites.png
new file mode 100644
index 00000000..0eec6114
--- /dev/null
+++ b/base/themes/1.8/favorites.png
Binary files differ
diff --git a/base/themes/1.8/favorites_selected.png b/base/themes/1.8/favorites_selected.png
new file mode 100644
index 00000000..f6a2abf8
--- /dev/null
+++ b/base/themes/1.8/favorites_selected.png
Binary files differ
diff --git a/base/themes/1.8/holdit.png b/base/themes/1.8/holdit.png
new file mode 100644
index 00000000..09d1d370
--- /dev/null
+++ b/base/themes/1.8/holdit.png
Binary files differ
diff --git a/base/themes/1.8/holdit_selected.png b/base/themes/1.8/holdit_selected.png
new file mode 100644
index 00000000..51586e74
--- /dev/null
+++ b/base/themes/1.8/holdit_selected.png
Binary files differ
diff --git a/base/themes/1.8/mute.png b/base/themes/1.8/mute.png
new file mode 100644
index 00000000..e64f7025
--- /dev/null
+++ b/base/themes/1.8/mute.png
Binary files differ
diff --git a/base/themes/1.8/mute_pressed.png b/base/themes/1.8/mute_pressed.png
new file mode 100644
index 00000000..334b4ba7
--- /dev/null
+++ b/base/themes/1.8/mute_pressed.png
Binary files differ
diff --git a/base/themes/1.8/objection.png b/base/themes/1.8/objection.png
new file mode 100644
index 00000000..6fbcbc2f
--- /dev/null
+++ b/base/themes/1.8/objection.png
Binary files differ
diff --git a/base/themes/1.8/objection_selected.png b/base/themes/1.8/objection_selected.png
new file mode 100644
index 00000000..384e4e9b
--- /dev/null
+++ b/base/themes/1.8/objection_selected.png
Binary files differ
diff --git a/base/themes/1.8/publicservers.png b/base/themes/1.8/publicservers.png
new file mode 100644
index 00000000..650c20cc
--- /dev/null
+++ b/base/themes/1.8/publicservers.png
Binary files differ
diff --git a/base/themes/1.8/publicservers_selected.png b/base/themes/1.8/publicservers_selected.png
new file mode 100644
index 00000000..308c79fb
--- /dev/null
+++ b/base/themes/1.8/publicservers_selected.png
Binary files differ
diff --git a/base/themes/1.8/takethat.png b/base/themes/1.8/takethat.png
new file mode 100644
index 00000000..8ff2befe
--- /dev/null
+++ b/base/themes/1.8/takethat.png
Binary files differ
diff --git a/base/themes/1.8/takethat_selected.png b/base/themes/1.8/takethat_selected.png
new file mode 100644
index 00000000..3fe0a8cd
--- /dev/null
+++ b/base/themes/1.8/takethat_selected.png
Binary files differ
diff --git a/base/themes/default/about.png b/base/themes/default/about.png
new file mode 100644
index 00000000..50fc8213
--- /dev/null
+++ b/base/themes/default/about.png
Binary files differ
diff --git a/base/themes/default/addtofav.png b/base/themes/default/addtofav.png
new file mode 100644
index 00000000..7d989034
--- /dev/null
+++ b/base/themes/default/addtofav.png
Binary files differ
diff --git a/base/themes/default/addtofav_pressed.png b/base/themes/default/addtofav_pressed.png
new file mode 100644
index 00000000..7b62d52d
--- /dev/null
+++ b/base/themes/default/addtofav_pressed.png
Binary files differ
diff --git a/base/themes/default/arrow_left.png b/base/themes/default/arrow_left.png
new file mode 100644
index 00000000..b44504ed
--- /dev/null
+++ b/base/themes/default/arrow_left.png
Binary files differ
diff --git a/base/themes/default/arrow_right.png b/base/themes/default/arrow_right.png
new file mode 100644
index 00000000..8dd6d3ae
--- /dev/null
+++ b/base/themes/default/arrow_right.png
Binary files differ
diff --git a/base/themes/default/char_passworded.png b/base/themes/default/char_passworded.png
new file mode 100644
index 00000000..e79d0710
--- /dev/null
+++ b/base/themes/default/char_passworded.png
Binary files differ
diff --git a/base/themes/default/char_selector.png b/base/themes/default/char_selector.png
new file mode 100644
index 00000000..566d96f0
--- /dev/null
+++ b/base/themes/default/char_selector.png
Binary files differ
diff --git a/base/themes/default/char_taken.png b/base/themes/default/char_taken.png
new file mode 100644
index 00000000..6230c836
--- /dev/null
+++ b/base/themes/default/char_taken.png
Binary files differ
diff --git a/base/themes/default/charselect_background.png b/base/themes/default/charselect_background.png
new file mode 100644
index 00000000..53a64ca6
--- /dev/null
+++ b/base/themes/default/charselect_background.png
Binary files differ
diff --git a/base/themes/default/chat.png b/base/themes/default/chat.png
new file mode 100644
index 00000000..e11f8c8a
--- /dev/null
+++ b/base/themes/default/chat.png
Binary files differ
diff --git a/base/themes/default/chatbig.png b/base/themes/default/chatbig.png
new file mode 100644
index 00000000..177dc026
--- /dev/null
+++ b/base/themes/default/chatbig.png
Binary files differ
diff --git a/base/themes/default/chatmed.png b/base/themes/default/chatmed.png
new file mode 100644
index 00000000..d2fee4a6
--- /dev/null
+++ b/base/themes/default/chatmed.png
Binary files differ
diff --git a/base/themes/default/connect.png b/base/themes/default/connect.png
new file mode 100644
index 00000000..6a41e86f
--- /dev/null
+++ b/base/themes/default/connect.png
Binary files differ
diff --git a/base/themes/default/connect_pressed.png b/base/themes/default/connect_pressed.png
new file mode 100644
index 00000000..a99d9ec1
--- /dev/null
+++ b/base/themes/default/connect_pressed.png
Binary files differ
diff --git a/base/themes/default/courtroom_design.ini b/base/themes/default/courtroom_design.ini
new file mode 100644
index 00000000..c96d2620
--- /dev/null
+++ b/base/themes/default/courtroom_design.ini
@@ -0,0 +1,46 @@
+courtroom = 0, 0, 714, 668
+viewport = 0, 0, 256, 192
+ic_chatlog = 260, 0, 231, 319
+ms_chatlog = 490, 1, 224, 277
+server_chatlog = 490, 1, 224, 277
+mute_list = 260, 160, 231, 159
+area_list = 266, 494, 224, 174
+music_list = 490, 342, 224, 326
+ic_chat_message = 0, 192, 255, 23
+ooc_chat_message = 492, 281, 222, 19
+ooc_chat_name = 492, 300, 32, 19
+area_password = 266, 471, 224, 23
+music_search = 490, 319, 226, 23
+emote_left = 0, 253, 20, 20
+emote_right = 236, 253, 20, 20
+defense_bar = 393, 323, 84, 14
+prosecution_bar = 393, 340, 84, 14
+music_label = 260, 390, 41, 16
+sfx_label = 260, 410, 21, 16
+blip_label = 260, 430, 31, 16
+hold_it = 10, 312, 76, 28
+objection = 90, 312, 76, 28
+ooc_toggle = 580, 300, 133, 19
+witness_testimony = 5, 345, 85, 42
+cross_examination = 95, 345, 85, 42
+change_character = 5, 390, 121, 23
+reload_theme = 5, 415, 101, 23
+call_mod = 5, 440, 71, 23
+pre = 187, 345, 51, 21
+flip = 187, 362, 51, 21
+guard = 187, 379, 61, 21
+custom_objection = 250, 325, 40, 40
+realization = 295, 323, 40, 40
+mute = 340, 325, 40, 40
+defense_plus = 477, 325, 9, 9
+defense_minus = 385, 325, 9, 9
+prosecution_plus = 477, 342, 9, 9
+prosecution_minus = 385, 342, 9, 9
+text_color = 390, 360, 79, 23
+music_slider = 310, 392, 160, 16
+sfx_slider = 310, 412, 160, 16
+blip_slider = 310, 432, 160, 16
+char_select = 0, 0, 714, 668
+back_to_lobby = 5, 5, 91, 23
+char_password = 297, 7, 120, 22
+spectator = 317, 640, 80, 23
diff --git a/base/themes/default/courtroom_design.ini~ b/base/themes/default/courtroom_design.ini~
new file mode 100644
index 00000000..c96d2620
--- /dev/null
+++ b/base/themes/default/courtroom_design.ini~
@@ -0,0 +1,46 @@
+courtroom = 0, 0, 714, 668
+viewport = 0, 0, 256, 192
+ic_chatlog = 260, 0, 231, 319
+ms_chatlog = 490, 1, 224, 277
+server_chatlog = 490, 1, 224, 277
+mute_list = 260, 160, 231, 159
+area_list = 266, 494, 224, 174
+music_list = 490, 342, 224, 326
+ic_chat_message = 0, 192, 255, 23
+ooc_chat_message = 492, 281, 222, 19
+ooc_chat_name = 492, 300, 32, 19
+area_password = 266, 471, 224, 23
+music_search = 490, 319, 226, 23
+emote_left = 0, 253, 20, 20
+emote_right = 236, 253, 20, 20
+defense_bar = 393, 323, 84, 14
+prosecution_bar = 393, 340, 84, 14
+music_label = 260, 390, 41, 16
+sfx_label = 260, 410, 21, 16
+blip_label = 260, 430, 31, 16
+hold_it = 10, 312, 76, 28
+objection = 90, 312, 76, 28
+ooc_toggle = 580, 300, 133, 19
+witness_testimony = 5, 345, 85, 42
+cross_examination = 95, 345, 85, 42
+change_character = 5, 390, 121, 23
+reload_theme = 5, 415, 101, 23
+call_mod = 5, 440, 71, 23
+pre = 187, 345, 51, 21
+flip = 187, 362, 51, 21
+guard = 187, 379, 61, 21
+custom_objection = 250, 325, 40, 40
+realization = 295, 323, 40, 40
+mute = 340, 325, 40, 40
+defense_plus = 477, 325, 9, 9
+defense_minus = 385, 325, 9, 9
+prosecution_plus = 477, 342, 9, 9
+prosecution_minus = 385, 342, 9, 9
+text_color = 390, 360, 79, 23
+music_slider = 310, 392, 160, 16
+sfx_slider = 310, 412, 160, 16
+blip_slider = 310, 432, 160, 16
+char_select = 0, 0, 714, 668
+back_to_lobby = 5, 5, 91, 23
+char_password = 297, 7, 120, 22
+spectator = 317, 640, 80, 23
diff --git a/base/themes/default/courtroombackground.png b/base/themes/default/courtroombackground.png
new file mode 100644
index 00000000..e940404a
--- /dev/null
+++ b/base/themes/default/courtroombackground.png
Binary files differ
diff --git a/base/themes/default/crossexamination.gif b/base/themes/default/crossexamination.gif
new file mode 100644
index 00000000..a7754b60
--- /dev/null
+++ b/base/themes/default/crossexamination.gif
Binary files differ
diff --git a/base/themes/default/crossexamination.png b/base/themes/default/crossexamination.png
new file mode 100644
index 00000000..044a76b9
--- /dev/null
+++ b/base/themes/default/crossexamination.png
Binary files differ
diff --git a/base/themes/default/custom.png b/base/themes/default/custom.png
new file mode 100644
index 00000000..b34ccfbb
--- /dev/null
+++ b/base/themes/default/custom.png
Binary files differ
diff --git a/base/themes/default/custom_selected.png b/base/themes/default/custom_selected.png
new file mode 100644
index 00000000..68b41601
--- /dev/null
+++ b/base/themes/default/custom_selected.png
Binary files differ
diff --git a/base/themes/default/defense_speedlines.gif b/base/themes/default/defense_speedlines.gif
new file mode 100644
index 00000000..5b454e52
--- /dev/null
+++ b/base/themes/default/defense_speedlines.gif
Binary files differ
diff --git a/base/themes/default/defensebar0.png b/base/themes/default/defensebar0.png
new file mode 100644
index 00000000..44ffa2c2
--- /dev/null
+++ b/base/themes/default/defensebar0.png
Binary files differ
diff --git a/base/themes/default/defensebar1.png b/base/themes/default/defensebar1.png
new file mode 100644
index 00000000..7b929a19
--- /dev/null
+++ b/base/themes/default/defensebar1.png
Binary files differ
diff --git a/base/themes/default/defensebar10.png b/base/themes/default/defensebar10.png
new file mode 100644
index 00000000..9dfbc6fd
--- /dev/null
+++ b/base/themes/default/defensebar10.png
Binary files differ
diff --git a/base/themes/default/defensebar2.png b/base/themes/default/defensebar2.png
new file mode 100644
index 00000000..440783c9
--- /dev/null
+++ b/base/themes/default/defensebar2.png
Binary files differ
diff --git a/base/themes/default/defensebar3.png b/base/themes/default/defensebar3.png
new file mode 100644
index 00000000..93ef86f2
--- /dev/null
+++ b/base/themes/default/defensebar3.png
Binary files differ
diff --git a/base/themes/default/defensebar4.png b/base/themes/default/defensebar4.png
new file mode 100644
index 00000000..a36fec7d
--- /dev/null
+++ b/base/themes/default/defensebar4.png
Binary files differ
diff --git a/base/themes/default/defensebar5.png b/base/themes/default/defensebar5.png
new file mode 100644
index 00000000..321c4f3b
--- /dev/null
+++ b/base/themes/default/defensebar5.png
Binary files differ
diff --git a/base/themes/default/defensebar6.png b/base/themes/default/defensebar6.png
new file mode 100644
index 00000000..c8e70295
--- /dev/null
+++ b/base/themes/default/defensebar6.png
Binary files differ
diff --git a/base/themes/default/defensebar7.png b/base/themes/default/defensebar7.png
new file mode 100644
index 00000000..c3af2a2f
--- /dev/null
+++ b/base/themes/default/defensebar7.png
Binary files differ
diff --git a/base/themes/default/defensebar8.png b/base/themes/default/defensebar8.png
new file mode 100644
index 00000000..e1176f62
--- /dev/null
+++ b/base/themes/default/defensebar8.png
Binary files differ
diff --git a/base/themes/default/defensebar9.png b/base/themes/default/defensebar9.png
new file mode 100644
index 00000000..171e6485
--- /dev/null
+++ b/base/themes/default/defensebar9.png
Binary files differ
diff --git a/base/themes/default/defminus.png b/base/themes/default/defminus.png
new file mode 100644
index 00000000..97093810
--- /dev/null
+++ b/base/themes/default/defminus.png
Binary files differ
diff --git a/base/themes/default/defplus.png b/base/themes/default/defplus.png
new file mode 100644
index 00000000..a3adf510
--- /dev/null
+++ b/base/themes/default/defplus.png
Binary files differ
diff --git a/base/themes/default/design.ini b/base/themes/default/design.ini
new file mode 100644
index 00000000..5488ac4b
--- /dev/null
+++ b/base/themes/default/design.ini
@@ -0,0 +1,28 @@
+hold_it = 10, 312
+objection = 90, 312
+take_that = 170, 312
+objection_custom = 250, 325
+realization = 295, 325
+mute = 340, 325
+text_color = 390, 360
+defense_bar = 393, 323
+prosecution_bar = 393, 340
+def_plus = 477, 325
+def_minus = 385, 325
+pro_plus = 477, 342
+pro_minus = 385, 342
+witness_testimony = 5, 345
+cross_examination = 95, 345
+pre = 187, 345
+flip = 187, 362
+guard = 187, 379
+change_character = 5, 390
+reload_theme = 5, 415
+call_mod = 5, 440
+music_label = 260, 390
+music_slider = 310, 392
+sfx_label = 260, 410
+sfx_slider = 310, 412
+blips_label = 260, 430
+blips_slider = 310, 432
+
diff --git a/base/themes/default/emote_selected.png b/base/themes/default/emote_selected.png
new file mode 100644
index 00000000..377dd077
--- /dev/null
+++ b/base/themes/default/emote_selected.png
Binary files differ
diff --git a/base/themes/default/favorites.png b/base/themes/default/favorites.png
new file mode 100644
index 00000000..6fa31016
--- /dev/null
+++ b/base/themes/default/favorites.png
Binary files differ
diff --git a/base/themes/default/favorites_selected.png b/base/themes/default/favorites_selected.png
new file mode 100644
index 00000000..4c33d432
--- /dev/null
+++ b/base/themes/default/favorites_selected.png
Binary files differ
diff --git a/base/themes/default/holdit.gif b/base/themes/default/holdit.gif
new file mode 100644
index 00000000..5f71ac66
--- /dev/null
+++ b/base/themes/default/holdit.gif
Binary files differ
diff --git a/base/themes/default/holdit.png b/base/themes/default/holdit.png
new file mode 100644
index 00000000..d7112e29
--- /dev/null
+++ b/base/themes/default/holdit.png
Binary files differ
diff --git a/base/themes/default/holdit_selected.png b/base/themes/default/holdit_selected.png
new file mode 100644
index 00000000..68876762
--- /dev/null
+++ b/base/themes/default/holdit_selected.png
Binary files differ
diff --git a/base/themes/default/lobbybackground.png b/base/themes/default/lobbybackground.png
new file mode 100644
index 00000000..094f19c3
--- /dev/null
+++ b/base/themes/default/lobbybackground.png
Binary files differ
diff --git a/base/themes/default/mute.png b/base/themes/default/mute.png
new file mode 100644
index 00000000..6de496c3
--- /dev/null
+++ b/base/themes/default/mute.png
Binary files differ
diff --git a/base/themes/default/mute_pressed.png b/base/themes/default/mute_pressed.png
new file mode 100644
index 00000000..548f804b
--- /dev/null
+++ b/base/themes/default/mute_pressed.png
Binary files differ
diff --git a/base/themes/default/muted.png b/base/themes/default/muted.png
new file mode 100644
index 00000000..f9878f1a
--- /dev/null
+++ b/base/themes/default/muted.png
Binary files differ
diff --git a/base/themes/default/objection.gif b/base/themes/default/objection.gif
new file mode 100644
index 00000000..6aae2e56
--- /dev/null
+++ b/base/themes/default/objection.gif
Binary files differ
diff --git a/base/themes/default/objection.png b/base/themes/default/objection.png
new file mode 100644
index 00000000..655a724d
--- /dev/null
+++ b/base/themes/default/objection.png
Binary files differ
diff --git a/base/themes/default/objection_selected.png b/base/themes/default/objection_selected.png
new file mode 100644
index 00000000..32542638
--- /dev/null
+++ b/base/themes/default/objection_selected.png
Binary files differ
diff --git a/base/themes/default/placeholder.gif b/base/themes/default/placeholder.gif
new file mode 100644
index 00000000..e35aaf4b
--- /dev/null
+++ b/base/themes/default/placeholder.gif
Binary files differ
diff --git a/base/themes/default/present.png b/base/themes/default/present.png
new file mode 100644
index 00000000..134d7428
--- /dev/null
+++ b/base/themes/default/present.png
Binary files differ
diff --git a/base/themes/default/present_disabled.png b/base/themes/default/present_disabled.png
new file mode 100644
index 00000000..9c6a702d
--- /dev/null
+++ b/base/themes/default/present_disabled.png
Binary files differ
diff --git a/base/themes/default/prominus.png b/base/themes/default/prominus.png
new file mode 100644
index 00000000..1191e1ee
--- /dev/null
+++ b/base/themes/default/prominus.png
Binary files differ
diff --git a/base/themes/default/proplus.png b/base/themes/default/proplus.png
new file mode 100644
index 00000000..5e9d563d
--- /dev/null
+++ b/base/themes/default/proplus.png
Binary files differ
diff --git a/base/themes/default/prosecution_speedlines.gif b/base/themes/default/prosecution_speedlines.gif
new file mode 100644
index 00000000..b48802aa
--- /dev/null
+++ b/base/themes/default/prosecution_speedlines.gif
Binary files differ
diff --git a/base/themes/default/prosecutionbar0.png b/base/themes/default/prosecutionbar0.png
new file mode 100644
index 00000000..44ffa2c2
--- /dev/null
+++ b/base/themes/default/prosecutionbar0.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar1.png b/base/themes/default/prosecutionbar1.png
new file mode 100644
index 00000000..bba1ec8a
--- /dev/null
+++ b/base/themes/default/prosecutionbar1.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar10.png b/base/themes/default/prosecutionbar10.png
new file mode 100644
index 00000000..318f0d7e
--- /dev/null
+++ b/base/themes/default/prosecutionbar10.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar2.png b/base/themes/default/prosecutionbar2.png
new file mode 100644
index 00000000..ceb6e065
--- /dev/null
+++ b/base/themes/default/prosecutionbar2.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar3.png b/base/themes/default/prosecutionbar3.png
new file mode 100644
index 00000000..44e87f15
--- /dev/null
+++ b/base/themes/default/prosecutionbar3.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar4.png b/base/themes/default/prosecutionbar4.png
new file mode 100644
index 00000000..a48e67e8
--- /dev/null
+++ b/base/themes/default/prosecutionbar4.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar5.png b/base/themes/default/prosecutionbar5.png
new file mode 100644
index 00000000..e67ca1be
--- /dev/null
+++ b/base/themes/default/prosecutionbar5.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar6.png b/base/themes/default/prosecutionbar6.png
new file mode 100644
index 00000000..14a3b774
--- /dev/null
+++ b/base/themes/default/prosecutionbar6.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar7.png b/base/themes/default/prosecutionbar7.png
new file mode 100644
index 00000000..1d0ac1f8
--- /dev/null
+++ b/base/themes/default/prosecutionbar7.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar8.png b/base/themes/default/prosecutionbar8.png
new file mode 100644
index 00000000..1edc8934
--- /dev/null
+++ b/base/themes/default/prosecutionbar8.png
Binary files differ
diff --git a/base/themes/default/prosecutionbar9.png b/base/themes/default/prosecutionbar9.png
new file mode 100644
index 00000000..ad3a2452
--- /dev/null
+++ b/base/themes/default/prosecutionbar9.png
Binary files differ
diff --git a/base/themes/default/publicservers.png b/base/themes/default/publicservers.png
new file mode 100644
index 00000000..98cf2ad8
--- /dev/null
+++ b/base/themes/default/publicservers.png
Binary files differ
diff --git a/base/themes/default/publicservers_selected.png b/base/themes/default/publicservers_selected.png
new file mode 100644
index 00000000..bcfa4c47
--- /dev/null
+++ b/base/themes/default/publicservers_selected.png
Binary files differ
diff --git a/base/themes/default/realization.png b/base/themes/default/realization.png
new file mode 100644
index 00000000..e1718136
--- /dev/null
+++ b/base/themes/default/realization.png
Binary files differ
diff --git a/base/themes/default/realization_pressed.png b/base/themes/default/realization_pressed.png
new file mode 100644
index 00000000..be029d7c
--- /dev/null
+++ b/base/themes/default/realization_pressed.png
Binary files differ
diff --git a/base/themes/default/realizationflash.png b/base/themes/default/realizationflash.png
new file mode 100644
index 00000000..776c70d2
--- /dev/null
+++ b/base/themes/default/realizationflash.png
Binary files differ
diff --git a/base/themes/default/refresh.png b/base/themes/default/refresh.png
new file mode 100644
index 00000000..0b49cd09
--- /dev/null
+++ b/base/themes/default/refresh.png
Binary files differ
diff --git a/base/themes/default/refresh_pressed.png b/base/themes/default/refresh_pressed.png
new file mode 100644
index 00000000..80366838
--- /dev/null
+++ b/base/themes/default/refresh_pressed.png
Binary files differ
diff --git a/base/themes/default/takethat.gif b/base/themes/default/takethat.gif
new file mode 100644
index 00000000..dd033102
--- /dev/null
+++ b/base/themes/default/takethat.gif
Binary files differ
diff --git a/base/themes/default/takethat.png b/base/themes/default/takethat.png
new file mode 100644
index 00000000..3c878056
--- /dev/null
+++ b/base/themes/default/takethat.png
Binary files differ
diff --git a/base/themes/default/takethat_selected.png b/base/themes/default/takethat_selected.png
new file mode 100644
index 00000000..06581a0f
--- /dev/null
+++ b/base/themes/default/takethat_selected.png
Binary files differ
diff --git a/base/themes/default/testimony.gif b/base/themes/default/testimony.gif
new file mode 100644
index 00000000..6d5898d7
--- /dev/null
+++ b/base/themes/default/testimony.gif
Binary files differ
diff --git a/base/themes/default/witnesstestimony.gif b/base/themes/default/witnesstestimony.gif
new file mode 100644
index 00000000..03b4900c
--- /dev/null
+++ b/base/themes/default/witnesstestimony.gif
Binary files differ
diff --git a/base/themes/default/witnesstestimony.png b/base/themes/default/witnesstestimony.png
new file mode 100644
index 00000000..47c23010
--- /dev/null
+++ b/base/themes/default/witnesstestimony.png
Binary files differ
diff --git a/courtroom.cpp b/courtroom.cpp
index 6032d414..b8d2a5be 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -6,7 +6,268 @@ Courtroom::Courtroom(AOApplication *parent) : QMainWindow()
{
ao_app = parent;
- //viewport elements
+ ui_background = new AOImage(this);
- //emotes
+ //viewport elements like background, desk, etc.
+
+ ui_ic_chatlog = new QPlainTextEdit(this);
+
+ ui_ms_chatlog = new QPlainTextEdit(this);
+ ui_server_chatlog = new QPlainTextEdit(this);
+
+
+ ui_mute_list = new QListWidget(this);
+ ui_area_list = new QListWidget(this);
+ ui_music_list = new QListWidget(this);
+
+ ui_ic_chat_message = new QLineEdit(this);
+
+ ui_ooc_chat_message = new QLineEdit(this);
+ ui_ooc_chat_name = new QLineEdit(this);
+
+ ui_area_password = new QLineEdit(this);
+ ui_music_search = new QLineEdit(this);
+
+ //emote buttons
+
+ ui_emote_left = new AOButton(this);
+ ui_emote_right = new AOButton(this);
+
+ ui_defense_bar = new AOImage(this);
+ ui_prosecution_bar = new AOImage(this);
+
+ ui_music_label = new QLabel(this);
+ ui_sfx_label = new QLabel(this);
+ ui_blip_label = new QLabel(this);
+
+ ui_hold_it = new AOButton(this);
+ ui_objection = new AOButton(this);
+ ui_take_that = new AOButton(this);
+
+ ui_ooc_toggle = new AOButton(this);
+ ui_witness_testimony = new AOButton(this);
+ ui_cross_examination = new AOButton(this);
+
+ ui_change_character = new AOButton(this);
+ ui_reload_theme = new AOButton(this);
+ ui_call_mod = new AOButton(this);
+
+ ui_pre = new QCheckBox(this);
+ ui_flip = new QCheckBox(this);
+ ui_guard = new QCheckBox(this);
+
+ ui_custom_objection = new AOButton(this);
+ ui_realization = new AOButton(this);
+ ui_mute = new AOButton(this);
+
+ ui_defense_plus = new AOButton(this);
+ ui_defense_minus = new AOButton(this);
+
+ ui_prosecution_plus = new AOButton(this);
+ ui_prosecution_minus = new AOButton(this);
+
+ ui_text_color = new QComboBox(this);
+
+ ui_music_slider = new QSlider(this);
+ ui_sfx_slider = new QSlider(this);
+ ui_blip_slider = new QSlider(this);
+
+ ui_muted = new AOImage(this);
+
+ /////////////char select widgets under here///////////////
+
+ ui_char_select_background = new AOImage(this);
+
+ //T0D0: allocate and position charbuttons
+ //QVector<AOCharButton*> ui_char_button_list;
+
+ ui_selector = new AOImage(ui_char_select_background);
+
+ ui_back_to_lobby = new AOButton(ui_char_select_background);
+
+ ui_char_password = new QLineEdit(ui_char_select_background);
+
+ ui_spectator = new AOButton(ui_char_select_background);
+
+ set_widgets();
+}
+
+void Courtroom::set_widgets()
+{
+ this->setFixedSize(m_courtroom_width, m_courtroom_height);
+
+ ui_background->set_image("courtroombackground.png");
+ ui_background->move(0, 0);
+ ui_background->resize(m_courtroom_width, m_courtroom_height);
+
+ //viewport elements like background, desk, etc.
+
+ ui_ic_chatlog->move(231, 319);
+ ui_ic_chatlog->resize(260, 0);
+
+ ui_ms_chatlog->move(490, 1);
+ ui_ms_chatlog->move(224, 277);
+
+ ui_server_chatlog->move(490, 1);
+ ui_server_chatlog->resize(224, 277);
+
+
+
+ ui_mute_list->move(260, 160);
+ ui_mute_list->resize(231, 159);
+
+ ui_area_list->move(266, 494);
+ ui_area_list->resize();
+
+ QListWidget *ui_music_list;
+
+ QLineEdit *ui_ic_chat_message;
+
+ QLineEdit *ui_ooc_chat_message;
+ QLineEdit *ui_ooc_chat_name;
+
+ QLineEdit *ui_area_password;
+ QLineEdit *ui_music_search;
+
+ //emote buttons
+
+ AOButton *ui_emote_left;
+ AOButton *ui_emote_right;
+
+ AOImage *ui_defense_bar;
+ AOImage *ui_prosecution_bar;
+
+ QLabel *ui_music_label;
+ QLabel *ui_sfx_label;
+ QLabel *ui_blip_label;
+
+ AOButton *ui_hold_it;
+ AOButton *ui_objection;
+ AOButton *ui_take_that;
+
+ AOButton *ui_ooc_toggle;
+ AOButton *ui_witness_testimony;
+ AOButton *ui_cross_examination;
+
+ AOButton *ui_change_character;
+ AOButton *ui_reload_theme;
+ AOButton *ui_call_mod;
+
+ QCheckBox *ui_pre;
+ QCheckBox *ui_flip;
+ QCheckBox *ui_guard;
+\
+ AOButton *ui_custom_objection;
+ AOButton *ui_realization;
+ AOButton *ui_mute;
+
+ AOButton *ui_defense_plus;
+ AOButton *ui_defense_minus;
+
+ AOButton *ui_prosecution_plus;
+ AOButton *ui_prosecution_minus;
+
+ QComboBox *ui_text_color;
+
+ QSlider *ui_music_slider;
+ QSlider *ui_sfx_slider;
+ QSlider *ui_blip_slider;
+
+ AOImage *ui_muted;
+
+ //char select stuff under here
+
+ AOImage *ui_char_select_background;
+
+ QVector<AOCharButton*> ui_char_button_list;
+ AOImage *ui_selector;
+
+ AOButton *ui_back_to_lobby;
+
+ QLineEdit *ui_char_password;
+
+ AOButton *ui_spectator;
+}
+
+Courtroom::~Courtroom()
+{
+ delete ui_background;
+
+ //T0D0: deallocate viewport elements like background, desk, etc.
+
+ delete ui_ic_chatlog;
+
+ delete ui_server_chatlog;
+ delete ui_ms_chatlog;
+
+ delete ui_mute_list;
+ delete ui_area_list;
+ delete ui_music_list;
+
+ delete ui_ic_chat_message;
+
+ delete ui_ooc_chat_message;
+ delete ui_ooc_chat_name;
+
+ delete ui_area_password;
+ delete ui_music_search;
+
+ //T0D0: deallocate emote buttons
+
+ delete ui_emote_left;
+ delete ui_emote_right;
+
+ delete ui_defense_bar;
+ delete ui_prosecution_bar;
+
+ delete ui_music_label;
+ delete ui_sfx_label;
+ delete ui_blip_label;
+
+ delete ui_hold_it;
+ delete ui_objection;
+ delete ui_take_that;
+
+ delete ui_ooc_toggle;
+ delete ui_witness_testimony;
+ delete ui_cross_examination;
+
+ delete ui_change_character;
+ delete ui_reload_theme;
+ delete ui_call_mod;
+
+ delete ui_pre;
+ delete ui_flip;
+ delete ui_guard;
+\
+ delete ui_custom_objection;
+ delete ui_realization;
+ delete ui_mute;
+
+ delete ui_defense_plus;
+ delete ui_defense_minus;
+
+ delete ui_prosecution_plus;
+ delete ui_prosecution_minus;
+
+ delete ui_text_color;
+
+ delete ui_music_slider;
+ delete ui_sfx_slider;
+ delete ui_blip_slider;
+
+ delete ui_muted;
+
+ delete ui_char_select_background;
+
+ //T0D0: deallocate char buttons
+ //QVector<AOCharButton*> ui_char_button_list;
+
+ delete ui_selector;
+
+ delete ui_back_to_lobby;
+
+ delete ui_char_password;
+
+ delete ui_spectator;
}
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 <QMainWindow>
@@ -13,6 +13,7 @@
#include <QCheckBox>
#include <QComboBox>
#include <QSlider>
+#include <QVector>
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<AOCharButton*> ui_char_button_list;
+ AOImage *ui_selector;
+
+ AOButton *ui_back_to_lobby;
+
+ QLineEdit *ui_char_password;
+
+ AOButton *ui_spectator;
+
};
#endif // COURTROOM_H
diff --git a/lobby.cpp b/lobby.cpp
index 7bcdaff7..99ac66a9 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -46,11 +46,6 @@ Lobby::Lobby(AOApplication *parent) : QMainWindow()
set_widgets();
}
-Lobby::~Lobby()
-{
- delete ui_background;
-}
-
//sets images, position and size
void Lobby::set_widgets()
{
@@ -281,3 +276,20 @@ void Lobby::set_player_count(int players_online, int max_players)
QString f_string = "Online: " + QString::number(players_online) + "/" + QString::number(max_players);
ui_player_count->setText(f_string);
}
+
+Lobby::~Lobby()
+{
+ delete ui_background;
+ delete ui_public_servers;
+ delete ui_favorites;
+ delete ui_refresh;
+ delete ui_add_to_fav;
+ delete ui_connect;
+ delete ui_about;
+ delete ui_server_list;
+ delete ui_player_count;
+ delete ui_description;
+ delete ui_chatbox;
+ delete ui_chatname;
+ delete ui_chatmessage;
+}
diff --git a/lobby.h b/lobby.h
index 520cc791..8ee384b9 100644
--- a/lobby.h
+++ b/lobby.h
@@ -19,7 +19,6 @@ class Lobby : public QMainWindow
public:
Lobby(AOApplication *parent);
- ~Lobby();
void set_widgets();
void list_servers();
@@ -27,9 +26,16 @@ public:
void append_chatmessage(QString p_message_line);
void set_player_count(int players_online, int max_players);
+ ~Lobby();
+
private:
AOApplication *ao_app;
+ const int m_lobby_width = 517;
+ const int m_lobby_height = 666;
+
+ bool public_servers_selected = true;
+
AOImage *ui_background;
AOButton *ui_public_servers;
@@ -51,11 +57,6 @@ private:
QLineEdit *ui_chatname;
QLineEdit *ui_chatmessage;
- const int m_lobby_width = 517;
- const int m_lobby_height = 666;
-
- bool public_servers_selected = true;
-
private slots:
void on_public_servers_clicked();
void on_favorites_clicked();
diff --git a/main.cpp b/main.cpp
index 55367ee3..7e1e800f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,7 @@
#include "datatypes.h"
#include "networkmanager.h"
#include "lobby.h"
+#include "courtroom.h"
int main(int argc, char *argv[])
{
@@ -16,5 +17,10 @@ int main(int argc, char *argv[])
main_app.send_ms_packet(f_packet);
main_app.w_lobby->show();
+ //debug start
+ Courtroom w_courtroom;
+ w_courtroom.show();
+ //debug end
+
return main_app.exec();
}