Functional ingame menu

1 files changed, 55 insertions, 44 deletions

diff --git a/ui/ingame_vote.menu b/ui/ingame_vote.menu
index 14eedb47..bceb2c5d 100644
--- a/ui/ingame_vote.menu
+++ b/ui/ingame_vote.menu
@@ -9,15 +9,22 @@
     visible 0
     fullscreen 0
     outOfBoundsClick			// this closes the window if it gets a click out of the rectangle
-    rect 230 56 256 190
+    rect 27 56 250 185
     focusColor 1 .75 0 1
-    style 1
-    border 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 240 180
+      rect 10 5 235 180
       style WINDOW_STYLE_FILLED
       backcolor 0 0 0 1
       visible 1
@@ -39,8 +46,6 @@
       textalignx 18
       textaligny 17
       forecolor 1 1 1 1
-      style WINDOW_STYLE_FILLED
-      backcolor .1 .1 .1 1
       visible 1
       action { exec "vote yes" ; uiScript closeingame }
     }
@@ -51,13 +56,11 @@
       text "No"
       type 1
       textscale .35
-      rect 128 20 32 20
+      rect 160 20 32 20
       textalign ITEM_ALIGN_CENTER
       textalignx 18 
       textaligny 17
       forecolor 1 1 1 1
-      style WINDOW_STYLE_FILLED
-      backcolor .1 .1 .1 1
       visible 1
       action { exec "vote no" ; uiScript closeingame }
     }
@@ -68,16 +71,22 @@
       text "Misc"
       textscale .25
       group grpbutton
-      style WINDOW_STYLE_FILLED
-      rect 20 65 45 20
+      rect 20 75 45 20
       type ITEM_TYPE_BUTTON
       textalign ITEM_ALIGN_CENTER
       textalignx 22
       textaligny 16
       forecolor 1 1 1 1
-      backcolor .37 .1 .1 1 
       visible 1
-      action { hide grpCallVote ; show misc }
+      action
+      {
+        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
@@ -86,34 +95,46 @@
       text "Kick"
       textscale .25
       group grpbutton
-      style WINDOW_STYLE_FILLED
-      rect 20 90 45 20
+      rect 20 100 45 20
       type ITEM_TYPE_BUTTON
       textalign ITEM_ALIGN_CENTER
       textalignx 22
       textaligny 16
       forecolor 1 1 1 1
-      backcolor .37 .1 .1 1 
       visible 1
-      action { hide grpCallVote ; show kick }
+      action
+      {
+        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
+      name mapBtn
       text "Map"
       textscale .25
       group grpbutton
-      style WINDOW_STYLE_FILLED
-      rect 20 115 45 20
+      rect 20 125 45 20
       type ITEM_TYPE_BUTTON
       textalign ITEM_ALIGN_CENTER
       textalignx 22
       textaligny 16
       forecolor 1 1 1 1
-      backcolor .37 .1 .1 1 
       visible 1
-      action { hide grpCallVote ; show map }
+      action
+      {
+        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
+      }
     }
 
 
@@ -125,14 +146,12 @@
       text "Restart Map"
       group grpCallVote
       textscale .25
-      rect 70 70 96 20
+      rect 100 90 96 20
       type 1
       textalign 1
       textalignx 50
       textaligny 16
       forecolor 1 1 1 1
-      style WINDOW_STYLE_FILLED
-      backcolor .1 .1 .1 1
       visible 0
       action { exec "cmd callvote map_restart" ; uiScript closeingame }
     }
@@ -143,14 +162,12 @@
       group grpCallVote
       text "Next Map"
       textscale .25
-      rect 70 90 96 20
+      rect 100 110 96 20
       type 1
       textalign 1
       textalignx 50
       textaligny 16
       forecolor 1 1 1 1
-      style WINDOW_STYLE_FILLED
-      backcolor .1 .1 .1 1
       visible 0
       action { exec "cmd callvote nextmap" ; uiScript closeingame }
     }
@@ -187,10 +204,10 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_PLAYER_LIST
       border 1
-      bordercolor .5 .5 .5 .5
-      forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
-      outlinecolor .1 .1 .7 .5
+      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
     }
 
@@ -198,17 +215,14 @@
     {
       name kick
       text "OK"
-      type 1
+      type ITEM_TYPE_BUTTON
       textscale .25
       group grpCallVote
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/button_back.tga"
       rect 183 160 50 20
       textalign 1
       textalignx 25
       textaligny 15
       forecolor 1 1 1 1
-      backcolor .37 .1 .1 1 
       visible 0
       action { uiScript voteKick ; uiScript closeingame }
     }
@@ -246,10 +260,10 @@
       elementtype LISTBOX_TEXT
       feeder FEEDER_ALLMAPS
       border 1
-      bordercolor .5 .5 .5 .5
-      forecolor 1 1 1 1
-      backcolor 0 0 .5 .25
-      outlinecolor .1 .1 .7 .5
+      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
     }
 
@@ -257,17 +271,14 @@
     {
       name map
       text "OK"
-      type 1
+      type ITEM_TYPE_BUTTON
       textscale .25
       group grpCallVote
-      style WINDOW_STYLE_FILLED
-      background "ui/assets/button_back.tga"
       rect 183 160 50 20
       textalign 1
       textalignx 25
       textaligny 15
       forecolor 1 1 1 1
-      backcolor .37 .1 .1 1 
       visible 0
       action { uiScript voteMap ; uiScript closeingame }
     }