From 827ad547914530106e318e13871a856cd7cf50b5 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Fri, 10 Oct 2003 03:12:04 +0000
Subject: * Tidied up the voting dialogs -- less ambiguous now
---
ui/ingame.menu | 1 +
ui/ingame.txt | 2 +
ui/ingame_callteamvote.menu | 175 ++++++++++++++++++++++++++++
ui/ingame_callvote.menu | 275 ++++++++++++++++++++++++++++++++++++++++++++
ui/ingame_vote.menu | 248 +++++++++++++++++++++++++++++++++++----
5 files changed, 676 insertions(+), 25 deletions(-)
create mode 100644 ui/ingame_callteamvote.menu
create mode 100644 ui/ingame_callvote.menu
(limited to 'ui')
diff --git a/ui/ingame.menu b/ui/ingame.menu
index 264aa241..34e88376 100644
--- a/ui/ingame.menu
+++ b/ui/ingame.menu
@@ -96,6 +96,7 @@
text "Vote"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
+ ownerdrawflag UI_SHOW_NOTSPECTATING
rect 170 6 50 40
textalign ITEM_ALIGN_CENTER
textalignx 25
diff --git a/ui/ingame.txt b/ui/ingame.txt
index aa944d73..41207b99 100644
--- a/ui/ingame.txt
+++ b/ui/ingame.txt
@@ -5,5 +5,7 @@
loadMenu { "ui/ingame_about.menu" }
loadMenu { "ui/ingame_options.menu" }
loadMenu { "ui/ingame_vote.menu" }
+ loadMenu { "ui/ingame_callvote.menu" }
+ loadMenu { "ui/ingame_callteamvote.menu" }
loadMenu { "ui/ingame_leave.menu" }
}
diff --git a/ui/ingame_callteamvote.menu b/ui/ingame_callteamvote.menu
new file mode 100644
index 00000000..58a0c7cb
--- /dev/null
+++ b/ui/ingame_callteamvote.menu
@@ -0,0 +1,175 @@
+#include "ui/menudef.h"
+
+{
+ menuDef
+ {
+ name "ingame_callteamvote"
+ visible 0
+ fullscreen 0
+ outOfBoundsClick // this closes the window if it gets a click out of the rectangle
+ rect 37 56 250 157
+ focusColor 1 .75 0 1
+ onopen
+ {
+ hide grpCallVote;
+ show teamKick;
+
+ setitemcolor teamKickBtn forecolor 0.2 0.2 0.2 1.0;
+ }
+
+ itemDef
+ {
+ name window
+ rect 10 5 230 147
+ style WINDOW_STYLE_FILLED
+ backcolor 0 0 0 1
+ visible 1
+ decoration
+
+ border WINDOW_BORDER_KCGRADIENT
+ borderSize 2.0
+ borderColor 0.5 0.5 0.5 1
+ }
+
+ itemDef
+ {
+ name teamKickBtn
+ text "Team Kick"
+ textscale .25
+ group grpbutton
+ rect 20 40 45 20
+ type ITEM_TYPE_BUTTON
+ textalign ITEM_ALIGN_CENTER
+ textalignx 22
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ hide grpCallVote;
+ show teamKick;
+
+ setitemcolor teamKickBtn forecolor 0.2 0.2 0.2 1.0;
+ }
+ }
+
+
+ // TEAM KICK PLAYER //
+
+ itemDef
+ {
+ name teamKick
+ group grpCallVote
+ text "Team Kick Player:"
+ textscale .25
+ rect 70 15 110 20
+ textalign 0
+ textalignx 0
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 0
+ decoration
+ }
+
+ itemDef
+ {
+ name teamKick
+ group grpCallVote
+ rect 70 35 150 85
+ style WINDOW_STYLE_EMPTY
+ type ITEM_TYPE_LISTBOX
+ elementwidth 120
+ elementheight 15
+ textscale .25
+ elementtype LISTBOX_TEXT
+ feeder FEEDER_TEAM_LIST
+ border 1
+ bordercolor 0.5 0.5 0.5 0.5
+ forecolor 1 1 1 1
+ backcolor 0.2 0.2 0.2 1
+ outlinecolor 0.1 0.1 0.1 0.5
+ visible 0
+ }
+
+ itemDef
+ {
+ name teamKick
+ text "OK"
+ type ITEM_TYPE_BUTTON
+ textscale .25
+ group grpCallVote
+ rect 173 125 50 20
+ textalign 1
+ textalignx 25
+ textaligny 15
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ uiScript voteTeamKick;
+ uiScript closeingame
+ }
+ }
+
+
+ // KICK PLAYER //
+
+ itemDef
+ {
+ name kick
+ group grpCallVote
+ text "Kick Player:"
+ textscale .25
+ rect 70 15 110 20
+ textalign 0
+ textalignx 0
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 0
+ decoration
+ }
+
+ itemDef
+ {
+ name kick
+ group grpCallVote
+ rect 70 35 150 85
+ style WINDOW_STYLE_EMPTY
+ type ITEM_TYPE_LISTBOX
+ elementwidth 120
+ elementheight 15
+ textscale .25
+ elementtype LISTBOX_TEXT
+ feeder FEEDER_PLAYER_LIST
+ border 1
+ bordercolor 0.5 0.5 0.5 0.5
+ forecolor 1 1 1 1
+ backcolor 0.2 0.2 0.2 1
+ outlinecolor 0.1 0.1 0.1 0.5
+ visible 0
+ }
+
+ itemDef
+ {
+ name kick
+ text "OK"
+ type ITEM_TYPE_BUTTON
+ textscale .25
+ group grpCallVote
+ rect 173 125 50 20
+ textalign 1
+ textalignx 25
+ textaligny 15
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ uiScript voteKick;
+ uiScript closeingame
+ }
+ }
+ }
+}
diff --git a/ui/ingame_callvote.menu b/ui/ingame_callvote.menu
new file mode 100644
index 00000000..bb757287
--- /dev/null
+++ b/ui/ingame_callvote.menu
@@ -0,0 +1,275 @@
+#include "ui/menudef.h"
+
+{
+ menuDef
+ {
+ name "ingame_callvote"
+ visible 0
+ fullscreen 0
+ outOfBoundsClick // this closes the window if it gets a click out of the rectangle
+ rect 37 56 250 157
+ focusColor 1 .75 0 1
+ onopen
+ {
+ hide grpCallVote;
+ show misc;
+
+ setitemcolor miscBtn forecolor 0.2 0.2 0.2 1.0;
+ setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0;
+ }
+
+ itemDef
+ {
+ name window
+ rect 10 5 230 147
+ style WINDOW_STYLE_FILLED
+ backcolor 0 0 0 1
+ visible 1
+ decoration
+
+ border WINDOW_BORDER_KCGRADIENT
+ borderSize 2.0
+ borderColor 0.5 0.5 0.5 1
+ }
+
+ itemDef
+ {
+ name miscBtn
+ text "Misc"
+ textscale .25
+ group grpbutton
+ rect 20 40 45 20
+ type ITEM_TYPE_BUTTON
+ textalign ITEM_ALIGN_CENTER
+ textalignx 22
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ hide grpCallVote;
+ show misc;
+
+ setitemcolor miscBtn forecolor 0.2 0.2 0.2 1.0;
+ setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0
+ }
+ }
+
+ itemDef
+ {
+ name kickBtn
+ text "Kick"
+ textscale .25
+ group grpbutton
+ rect 20 65 45 20
+ type ITEM_TYPE_BUTTON
+ textalign ITEM_ALIGN_CENTER
+ textalignx 22
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ hide grpCallVote;
+ show kick;
+
+ setitemcolor miscBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor kickBtn forecolor 0.2 0.2 0.2 1.0;
+ setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0
+ }
+ }
+
+ itemDef
+ {
+ name mapBtn
+ text "Map"
+ textscale .25
+ group grpbutton
+ rect 20 90 45 20
+ type ITEM_TYPE_BUTTON
+ textalign ITEM_ALIGN_CENTER
+ textalignx 22
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ hide grpCallVote;
+ show map;
+
+ setitemcolor miscBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor mapBtn forecolor 0.2 0.2 0.2 1.0
+ }
+ }
+
+
+ // MISC //
+
+ itemDef
+ {
+ name misc
+ text "Restart Map"
+ group grpCallVote
+ textscale .25
+ rect 90 45 96 20
+ type 1
+ textalign 1
+ textalignx 50
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ exec "cmd callvote map_restart";
+ uiScript closeingame
+ }
+ }
+
+ itemDef
+ {
+ name misc
+ group grpCallVote
+ text "Next Map"
+ textscale .25
+ rect 90 75 96 20
+ type 1
+ textalign 1
+ textalignx 50
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ exec "cmd callvote nextmap";
+ uiScript closeingame
+ }
+ }
+
+
+ // KICK PLAYER //
+
+ itemDef
+ {
+ name kick
+ group grpCallVote
+ text "Kick Player:"
+ textscale .25
+ rect 70 15 110 20
+ textalign 0
+ textalignx 0
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 0
+ decoration
+ }
+
+ itemDef
+ {
+ name kick
+ group grpCallVote
+ rect 70 35 150 85
+ style WINDOW_STYLE_EMPTY
+ type ITEM_TYPE_LISTBOX
+ elementwidth 120
+ elementheight 15
+ textscale .25
+ elementtype LISTBOX_TEXT
+ feeder FEEDER_PLAYER_LIST
+ border 1
+ bordercolor 0.5 0.5 0.5 0.5
+ forecolor 1 1 1 1
+ backcolor 0.2 0.2 0.2 1
+ outlinecolor 0.1 0.1 0.1 0.5
+ visible 0
+ }
+
+ itemDef
+ {
+ name kick
+ text "OK"
+ type ITEM_TYPE_BUTTON
+ textscale .25
+ group grpCallVote
+ rect 173 125 50 20
+ textalign 1
+ textalignx 25
+ textaligny 15
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ uiScript voteKick;
+ uiScript closeingame
+ }
+ }
+
+
+ // NEW MAP //
+
+ itemDef
+ {
+ name map
+ group grpCallVote
+ text "New Map:"
+ ownerdraw UI_ALLMAPS_SELECTION
+ textscale .25
+ rect 70 15 110 20
+ textalign 0
+ textalignx 0
+ textaligny 16
+ forecolor 1 1 1 1
+ decoration
+ visible 0
+ }
+
+ itemDef
+ {
+ name map
+ group grpCallVote
+ rect 70 35 150 85
+ type ITEM_TYPE_LISTBOX
+ style WINDOW_STYLE_EMPTY
+ elementwidth 120
+ elementheight 15
+ textscale .25
+ elementtype LISTBOX_TEXT
+ feeder FEEDER_ALLMAPS
+ border 1
+ bordercolor 0.5 0.5 0.5 0.5
+ forecolor 1 1 1 1
+ backcolor 0.2 0.2 0.2 1
+ outlinecolor 0.1 0.1 0.1 0.5
+ visible 0
+ }
+
+ itemDef
+ {
+ name map
+ text "OK"
+ type ITEM_TYPE_BUTTON
+ textscale .25
+ group grpCallVote
+ rect 173 125 50 20
+ textalign 1
+ textalignx 25
+ textaligny 15
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ uiScript voteMap;
+ uiScript closeingame
+ }
+ }
+ }
+}
diff --git a/ui/ingame_vote.menu b/ui/ingame_vote.menu
index 45593781..902649f8 100644
--- a/ui/ingame_vote.menu
+++ b/ui/ingame_vote.menu
@@ -1,7 +1,7 @@
#include "ui/menudef.h"
{
-\\ SERVER INFO MENU \\
+ \\ VOTE MENU \\
menuDef
{
@@ -9,22 +9,46 @@
visible 0
fullscreen 0
outOfBoundsClick // this closes the window if it gets a click out of the rectangle
- rect 27 56 250 185
+ rect 27 56 260 107
focusColor 1 .75 0 1
- onopen
+
+ itemDef
+ {
+ name window
+ ownerdrawflag UI_SHOW_CANVOTE
+ ownerdrawflag UI_SHOW_CANTEAMVOTE
+ rect 10 5 240 47
+ style WINDOW_STYLE_FILLED
+ backcolor 0 0 0 1
+ visible 1
+ decoration
+
+ border WINDOW_BORDER_KCGRADIENT
+ borderSize 2.0
+ borderColor 0.5 0.5 0.5 1
+ }
+
+ itemDef
{
- hide grpCallVote;
- show misc;
+ name window
+ ownerdrawflag UI_SHOW_VOTEACTIVE
+ ownerdrawflag UI_SHOW_CANTEAMVOTE
+ rect 10 5 240 72
+ style WINDOW_STYLE_FILLED
+ backcolor 0 0 0 1
+ visible 1
+ decoration
- setitemcolor miscBtn forecolor 0.2 0.2 0.2 1.0;
- setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
- setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0
+ border WINDOW_BORDER_KCGRADIENT
+ borderSize 2.0
+ borderColor 0.5 0.5 0.5 1
}
itemDef
{
name window
- rect 10 5 235 180
+ ownerdrawflag UI_SHOW_TEAMVOTEACTIVE
+ rect 10 5 240 97
style WINDOW_STYLE_FILLED
backcolor 0 0 0 1
visible 1
@@ -35,15 +59,58 @@
borderColor 0.5 0.5 0.5 1
}
+ itemDef
+ {
+ name callvote
+ text "Call Vote"
+ type 1
+ ownerdrawflag UI_SHOW_CANVOTE
+ textscale .35
+ rect 30 20 100 20
+ textalign ITEM_ALIGN_CENTER
+ textalignx 50
+ textaligny 17
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ close ingame_vote;
+ open ingame_callvote
+ }
+ }
+
+ itemDef
+ {
+ name callteamvote
+ text "Call Team Vote"
+ type 1
+ ownerdrawflag UI_SHOW_CANTEAMVOTE
+ textscale .35
+ rect 130 20 100 20
+ textalign ITEM_ALIGN_CENTER
+ textalignx 50
+ textaligny 17
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ close ingame_vote;
+ open ingame_callteamvote
+ }
+ }
+
itemDef
{
name yes
- text "Yes"
+ text "Vote Yes"
type 1
+ ownerdrawflag UI_SHOW_VOTEACTIVE
textscale .35
- rect 64 20 32 20
+ rect 30 45 100 20
textalign ITEM_ALIGN_CENTER
- textalignx 18
+ textalignx 50
textaligny 17
forecolor 1 1 1 1
visible 1
@@ -58,12 +125,13 @@
itemDef
{
name no
- text "No"
+ text "Vote No"
type 1
+ ownerdrawflag UI_SHOW_VOTEACTIVE
textscale .35
- rect 160 20 32 20
+ rect 130 45 100 20
textalign ITEM_ALIGN_CENTER
- textalignx 18
+ textalignx 50
textaligny 17
forecolor 1 1 1 1
visible 1
@@ -76,6 +144,48 @@
}
itemDef
+ {
+ name teamyes
+ text "Team Vote Yes"
+ type 1
+ ownerdrawflag UI_SHOW_TEAMVOTEACTIVE
+ textscale .35
+ rect 30 70 100 20
+ textalign ITEM_ALIGN_CENTER
+ textalignx 50
+ textaligny 17
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ exec "teamvote yes";
+ uiScript closeingame
+ }
+ }
+
+ itemDef
+ {
+ name teamno
+ text "Team Vote No"
+ type 1
+ ownerdrawflag UI_SHOW_TEAMVOTEACTIVE
+ textscale .35
+ rect 130 70 100 20
+ textalign ITEM_ALIGN_CENTER
+ textalignx 50
+ textaligny 17
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu4.wav";
+ exec "teamvote no";
+ uiScript closeingame
+ }
+ }
+
+/* itemDef
{
name miscBtn
text "Misc"
@@ -96,6 +206,7 @@
setitemcolor miscBtn forecolor 0.2 0.2 0.2 1.0;
setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor teamKickBtn forecolor 1.0 1.0 1.0 1.0;
setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0
}
}
@@ -121,6 +232,33 @@
setitemcolor miscBtn forecolor 1.0 1.0 1.0 1.0;
setitemcolor kickBtn forecolor 0.2 0.2 0.2 1.0;
+ setitemcolor teamKickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0
+ }
+ }
+
+ itemDef
+ {
+ name teamKickBtn
+ text "Team Kick"
+ textscale .25
+ group grpbutton
+ rect 20 125 45 20
+ type ITEM_TYPE_BUTTON
+ textalign ITEM_ALIGN_CENTER
+ textalignx 22
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 1
+ action
+ {
+ play "sound/misc/menu1.wav";
+ hide grpCallVote;
+ show teamKick;
+
+ setitemcolor miscBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor teamKickBtn forecolor 0.2 0.2 0.2 1.0;
setitemcolor mapBtn forecolor 1.0 1.0 1.0 1.0
}
}
@@ -131,7 +269,7 @@
text "Map"
textscale .25
group grpbutton
- rect 20 125 45 20
+ rect 20 150 45 20
type ITEM_TYPE_BUTTON
textalign ITEM_ALIGN_CENTER
textalignx 22
@@ -146,6 +284,7 @@
setitemcolor miscBtn forecolor 1.0 1.0 1.0 1.0;
setitemcolor kickBtn forecolor 1.0 1.0 1.0 1.0;
+ setitemcolor teamKickBtn forecolor 1.0 1.0 1.0 1.0;
setitemcolor mapBtn forecolor 0.2 0.2 0.2 1.0
}
}
@@ -159,7 +298,7 @@
text "Restart Map"
group grpCallVote
textscale .25
- rect 100 90 96 20
+ rect 100 105 96 20
type 1
textalign 1
textalignx 50
@@ -180,7 +319,7 @@
group grpCallVote
text "Next Map"
textscale .25
- rect 100 110 96 20
+ rect 100 135 96 20
type 1
textalign 1
textalignx 50
@@ -204,7 +343,7 @@
group grpCallVote
text "Kick Player:"
textscale .25
- rect 80 50 110 20
+ rect 80 75 110 20
textalign 0
textalignx 0
textaligny 16
@@ -217,7 +356,7 @@
{
name kick
group grpCallVote
- rect 80 70 150 85
+ rect 80 95 150 85
style WINDOW_STYLE_EMPTY
type ITEM_TYPE_LISTBOX
elementwidth 120
@@ -240,7 +379,7 @@
type ITEM_TYPE_BUTTON
textscale .25
group grpCallVote
- rect 183 160 50 20
+ rect 183 185 50 20
textalign 1
textalignx 25
textaligny 15
@@ -255,6 +394,65 @@
}
+ // TEAM KICK PLAYER //
+
+ itemDef
+ {
+ name teamKick
+ group grpCallVote
+ text "Team Kick Player:"
+ textscale .25
+ rect 80 75 110 20
+ textalign 0
+ textalignx 0
+ textaligny 16
+ forecolor 1 1 1 1
+ visible 0
+ decoration
+ }
+
+ itemDef
+ {
+ name teamKick
+ group grpCallVote
+ rect 80 95 150 85
+ style WINDOW_STYLE_EMPTY
+ type ITEM_TYPE_LISTBOX
+ elementwidth 120
+ elementheight 15
+ textscale .25
+ elementtype LISTBOX_TEXT
+ feeder FEEDER_TEAM_LIST
+ border 1
+ bordercolor 0.5 0.5 0.5 0.5
+ forecolor 1 1 1 1
+ backcolor 0.2 0.2 0.2 1
+ outlinecolor 0.1 0.1 0.1 0.5
+ visible 0
+ }
+
+ itemDef
+ {
+ name teamKick
+ text "OK"
+ type ITEM_TYPE_BUTTON
+ textscale .25
+ group grpCallVote
+ rect 183 185 50 20
+ textalign 1
+ textalignx 25
+ textaligny 15
+ forecolor 1 1 1 1
+ visible 0
+ action
+ {
+ play "sound/misc/menu1.wav";
+ uiScript voteTeamKick;
+ uiScript closeingame
+ }
+ }
+
+
// NEW MAP //
itemDef
@@ -264,7 +462,7 @@
text "New Map:"
ownerdraw UI_ALLMAPS_SELECTION
textscale .25
- rect 80 50 110 20
+ rect 80 75 110 20
textalign 0
textalignx 0
textaligny 16
@@ -277,7 +475,7 @@
{
name map
group grpCallVote
- rect 80 70 150 85
+ rect 80 95 150 85
type ITEM_TYPE_LISTBOX
style WINDOW_STYLE_EMPTY
elementwidth 120
@@ -300,7 +498,7 @@
type ITEM_TYPE_BUTTON
textscale .25
group grpCallVote
- rect 183 160 50 20
+ rect 183 185 50 20
textalign 1
textalignx 25
textaligny 15
@@ -312,6 +510,6 @@
uiScript voteMap;
uiScript closeingame
}
- }
+ }*/
}
}
--
cgit