* Monochrome colour scheme for trem menus

* Corrections to ingame_leave.menu wrt TA graphics
* Ingame menu hanging with trem menu bug fixed

1 files changed, 33 insertions, 37 deletions

diff --git a/ui/tremulous_teamselect.menu b/ui/tremulous_teamselect.menu
index e47a5558..5a504479 100644
--- a/ui/tremulous_teamselect.menu
+++ b/ui/tremulous_teamselect.menu
@@ -8,29 +8,41 @@
     fullscreen 0
     outOfBoundsClick
     rect 112 111 400 247
-    focusColor .6 .6 1 1
-    style WINDOW_STYLE_FILLED
-    disableColor .5 .5 .5 0
-    backcolor 0 0 .5 .25
-    border WINDOW_BORDER_FULL
-    borderSize 1
-    bordercolor .6 .6 1 .25
+    focusColor 1 .75 0 1
+    style 1
+    popup
     onOpen { uiScript LoadTeams }
 
     itemDef
     {
+      name window
+      rect 0 0 400 247
+      style WINDOW_STYLE_FILLED
+      backcolor 0 0 0 1
+      visible 1
+      decoration
+
+      border WINDOW_BORDER_FULL
+      borderSize 1.0
+      borderColor 0.5 0.5 0.5 1
+    }
+    
+    itemDef
+    {
       name "list"
       rect 8 8 136 231
       type ITEM_TYPE_LISTBOX
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       elementwidth 120
       elementheight 15
       textscale .25
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMTEAMS
-      forecolor 1 1 1 1
-      backcolor 0 0 .5 .5
-      outlinecolor .1 .1 .7 .5
+      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 1
     }
     
@@ -39,12 +51,14 @@
       name infopane
       ownerdraw UI_TEAMINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED
-      //background "ui/screen1" // textures/base_trim/proto_comp  textures/base_wall/comp3	
+      style WINDOW_STYLE_EMPTY
       rect 161 8 231 204
       textscale .3
-      forecolor 1 1 1 1
-      backcolor 0 0 .5 .5
+      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 1 
       decoration
     }
@@ -54,13 +68,13 @@
       name "OKCancel"
       text "OK"
       type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       rect 319 218 34 21
       textalign ITEM_ALIGN_LEFT
       textalignx 12.5
       textaligny 16
       textscale .25
-      forecolor .8 .8 1 1
+      forecolor 1 1 1 1
       backcolor .5 0 0 .25
       visible 1
       action { uiScript JoinTeam; close tremulous_teamselect }
@@ -71,34 +85,16 @@
       name "OKCancel"
       text "Cancel"
       type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       rect 358 218 34 21
       textalign ITEM_ALIGN_LEFT
       textalignx 3.8
       textaligny 16
       textscale .25
-      forecolor .8 .8 1 1
+      forecolor 1 1 1 1
       backcolor .5 0 0 .25
       visible 1 
       action { close tremulous_teamselect }
     }
-
-//    itemDef
-//    {
-//      name "weaponmodel"
-//      type ITEM_TYPE_MODEL
-//      asset_model "models/weapons2/plasma/plasma.md3"
-//      rect 177 100 200 100
-//     style WINDOW_STYLE_FILLED
-//      forecolor 1 1 1 1
-//      backcolor 0 0 0 .5
-//      decoration
-//      visible 1
-//      model_origin 100 .01 .01
-//      model_fovx 90
-//      model_fovy 90
-//      model_angle 90
-//      model_rotation 20
-//    }
   }
 }