* Monochrome colour scheme for trem menus

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

8 files changed, 205 insertions, 130 deletions

diff --git a/ui/ingame.menu b/ui/ingame.menu
index d1bc2b75..bf1d1b91 100644
--- a/ui/ingame.menu
+++ b/ui/ingame.menu
@@ -31,6 +31,11 @@
     disableColor .5 .5 .5 1
     backColor 0 0 0 1
 
+    onEsc
+    {
+      close ingame;
+    }
+    
     itemDef
     {
       name splashmodel
diff --git a/ui/ingame_leave.menu b/ui/ingame_leave.menu
index e763907f..15461c1c 100644
--- a/ui/ingame_leave.menu
+++ b/ui/ingame_leave.menu
@@ -32,7 +32,7 @@
       name leave
       text "Main Menu"
       group grpMenu
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 20 128 20 
       type 1  
       textalign 1 
@@ -49,7 +49,7 @@
       name leave
       group grpMenu
       text "Restart"
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       type 1
       rect 0 40 128 20   
       textalign 1 
@@ -67,7 +67,7 @@
       group grpMenu
       type 1
       text "Quit"
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 60 128 20   
       textalign 1 
       textalignx 64 
@@ -87,7 +87,7 @@
       name leaveConfirm
       text "Exit to"
       group grpConfirm
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 23 128 20   
       textalign 1 
       textalignx 64
@@ -103,7 +103,7 @@
       name leaveConfirm
       text "Main Menu?"
       group grpConfirm
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 40 128 20   
       textalign 1 
       textalignx 64
@@ -153,7 +153,7 @@
       name restartConfirm
       text "Want to"
       group grpConfirm
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 23 128 20   
       textalign 1 
       textalignx 64
@@ -169,7 +169,7 @@
       name restartConfirm
       text "Restart Map?"
       group grpConfirm
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 40 128 20   
       textalign 1 
       textalignx 64
@@ -219,7 +219,7 @@
       name quitConfirm
       text "Want to"
       group grpConfirm
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 23 128 20   
       textalign 1 
       textalignx 64
@@ -235,7 +235,7 @@
       name quitConfirm
       text "Quit Game?"
       group grpConfirm
-      style 2 
+      style WINDOW_STYLE_EMPTY 
       rect 0 40 128 20   
       textalign 1 
       textalignx 64
diff --git a/ui/tremulous_alienbuild.menu b/ui/tremulous_alienbuild.menu
index 2be8631b..168a35ca 100644
--- a/ui/tremulous_alienbuild.menu
+++ b/ui/tremulous_alienbuild.menu
@@ -8,29 +8,41 @@
     fullscreen 0
     outOfBoundsClick
     rect 112 111 400 247
-    focusColor 0.835294 0.784314 0.85098 1
-    style WINDOW_STYLE_FILLED
-    disableColor .5 .5 .5 0
-    backcolor 0.235294 0.184314 0.25098 .25
-    border WINDOW_BORDER_FULL
-    borderSize 1
-    bordercolor 0.835294 0.784314 0.85098 .25
+    focusColor 1 .75 0 1
+    style 1
+    popup
     onOpen { uiScript LoadAlienBuilds }
 
     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_TREMALIENBUILD
-      forecolor 1 1 1 1
-      backcolor 0.235294 0.184314 0.25098 .25
-      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,11 +51,14 @@
       name infopane
       ownerdraw UI_ABUILDINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED	
+      style WINDOW_STYLE_EMPTY
       rect 161 8 231 204
       textscale .3
-      forecolor 1 1 1 1
-      backcolor 0.235294 0.184314 0.25098 .25
+      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
     }
@@ -53,14 +68,14 @@
       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 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0 0 0 1
       visible 1
       action { uiScript BuildAlienBuildable; close tremulous_alienbuild }
     }
@@ -70,14 +85,14 @@
       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 1 1 1 1
-      backcolor .5 0 0 .25
+      backcolor 0 0 0 1
       visible 1 
       action { close tremulous_alienbuild }
     }
diff --git a/ui/tremulous_alienclass.menu b/ui/tremulous_alienclass.menu
index d10d6191..4790e1f7 100644
--- a/ui/tremulous_alienclass.menu
+++ b/ui/tremulous_alienclass.menu
@@ -8,29 +8,41 @@
     fullscreen 0
     outOfBoundsClick
     rect 112 111 400 247
-    focusColor 0.835294 0.784314 0.85098 1
-    style WINDOW_STYLE_FILLED
-    disableColor .5 .5 .5 0
-    backcolor 0.235294 0.184314 0.25098 .25
-    border WINDOW_BORDER_FULL
-    borderSize 1
-    bordercolor 0.835294 0.784314 0.85098 .25
+    focusColor 1 .75 0 1
+    style 1
+    popup
     onOpen { uiScript LoadAlienClasses }
 
     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_TREMALIENCLASSES
-      forecolor 1 1 1 1
-      backcolor 0.235294 0.184314 0.25098 .25
-      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,11 +51,14 @@
       name infopane
       ownerdraw UI_ACLASSINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED	
+      style WINDOW_STYLE_EMPTY
       rect 161 8 231 204
       textscale .3
-      forecolor 1 1 1 1
-      backcolor 0.235294 0.184314 0.25098 .25
+      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
     }
@@ -53,7 +68,7 @@
       name "Back"
       text "< Back"
       type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       rect 161 218 34 21
       textalign ITEM_ALIGN_LEFT
       textalignx 3
@@ -70,7 +85,7 @@
       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
@@ -87,7 +102,7 @@
       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
diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu
index 98d35b3d..4fc92fac 100644
--- a/ui/tremulous_alienupgrade.menu
+++ b/ui/tremulous_alienupgrade.menu
@@ -8,29 +8,41 @@
     fullscreen 0
     outOfBoundsClick
     rect 112 111 400 247
-    focusColor 0.835294 0.784314 0.85098 1
-    style WINDOW_STYLE_FILLED
-    disableColor .5 .5 .5 0
-    backcolor 0.235294 0.184314 0.25098 .25
-    border WINDOW_BORDER_FULL
-    borderSize 1
-    bordercolor 0.835294 0.784314 0.85098 .25
+    focusColor 1 .75 0 1
+    style 1
+    popup
     onOpen { uiScript LoadAlienUpgrades }
 
     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_TREMALIENUPGRADE
-      forecolor 1 1 1 1
-      backcolor 0.235294 0.184314 0.25098 .25
-      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,11 +51,14 @@
       name infopane
       ownerdraw UI_AUPGRADEINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED	
+      style WINDOW_STYLE_EMPTY	
       rect 161 8 231 204
       textscale .3
-      forecolor 1 1 1 1
-      backcolor 0.235294 0.184314 0.25098 .25
+      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
     }
@@ -53,7 +68,7 @@
       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
@@ -70,7 +85,7 @@
       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
diff --git a/ui/tremulous_humanbuild.menu b/ui/tremulous_humanbuild.menu
index faf0dbc5..5356db2f 100644
--- a/ui/tremulous_humanbuild.menu
+++ b/ui/tremulous_humanbuild.menu
@@ -8,29 +8,41 @@
     fullscreen 0
     outOfBoundsClick
     rect 112 111 400 247
-    focusColor 0.6784314 0.74902 0.82549 1
-    style WINDOW_STYLE_FILLED
-    disableColor .5 .5 .5 0
-    backcolor 0.0784314 0.14902 0.32549 .25
-    border WINDOW_BORDER_FULL
-    borderSize 1
-    bordercolor 0.6784314 0.74902 0.82549 .25
+    focusColor 1 .75 0 1
+    style 1
+    popup
     onOpen { uiScript LoadHumanBuilds }
 
     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_TREMHUMANBUILD
-      forecolor 1 1 1 1
-      backcolor 0.0784314 0.14902 0.32549 .25
-      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,11 +51,13 @@
       name infopane
       ownerdraw UI_HBUILDINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED	
+      style WINDOW_STYLE_EMPTY
       rect 161 8 231 204
       textscale .3
-      forecolor 1 1 1 1
-      backcolor 0.0784314 0.14902 0.32549 .25
+      border 1
+      bordercolor   0.5 0.5 0.5 0.5
+      forecolor     1   1   1   1
+      backcolor     0.2 0.2 0.2 1
       visible 1 
       decoration
     }
@@ -53,7 +67,7 @@
       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
@@ -70,7 +84,7 @@
       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
diff --git a/ui/tremulous_humanitem.menu b/ui/tremulous_humanitem.menu
index e1cd0ca5..09e5e7fe 100644
--- a/ui/tremulous_humanitem.menu
+++ b/ui/tremulous_humanitem.menu
@@ -8,29 +8,41 @@
     fullscreen 0
     outOfBoundsClick
     rect 112 111 400 247
-    focusColor 0.6784314 0.74902 0.82549 1
-    style WINDOW_STYLE_FILLED
-    disableColor .5 .5 .5 0
-    backcolor 0.0784314 0.14902 0.32549 .25
-    border WINDOW_BORDER_FULL
-    borderSize 1
-    bordercolor 0.6784314 0.74902 0.82549 .25
+    focusColor 1 .75 0 1
+    style 1
+    popup
     onOpen { uiScript LoadHumanItems }
 
     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_TREMHUMANITEMS
-      forecolor 1 1 1 1
-      backcolor 0.0784314 0.14902 0.32549 .25
-      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,11 +51,14 @@
       name infopane
       ownerdraw UI_HITEMINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_FILLED	
+      style WINDOW_STYLE_EMPTY
       rect 161 8 231 204
       textscale .3
-      forecolor 1 1 1 1
-      backcolor 0.0784314 0.14902 0.32549 .25
+      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
     }
@@ -53,7 +68,7 @@
       name "Back"
       text "< Back"
       type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       rect 161 218 34 21
       textalign ITEM_ALIGN_LEFT
       textalignx 3
@@ -70,7 +85,7 @@
       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
@@ -87,7 +102,7 @@
       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
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
-//    }
   }
 }