Ingame about and exit

3 files changed, 349 insertions, 562 deletions

diff --git a/ui/ingame.menu b/ui/ingame.menu
index e83fd6ce..d1bc2b75 100644
--- a/ui/ingame.menu
+++ b/ui/ingame.menu
@@ -23,7 +23,7 @@
   {
     name "ingame"
     style WINDOW_STYLE_FILLED
-    visible 1
+    visible 0
     fullScreen 0
     outOfBoundsClick      // this closes the window if it gets a click out of the rectangle
     rect 0 0 640 48 
@@ -34,12 +34,12 @@
     itemDef
     {
       name splashmodel
-      rect 0 0 640 48
+      rect 0 0 640 56 
       type ITEM_TYPE_MODEL
       style WINDOW_STYLE_EMPTY
       asset_model "models/splash/splash_screen.md3"
       model_fovx 32.0
-      model_fovy 2.4
+      model_fovy 2.8
       model_angle 180
       visible 1
       decoration
@@ -49,28 +49,72 @@
     {
       name about
       text "About"  
-      rect 232 0 53 30
+      rect 35 6 65 40
       type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
-      textalign 1
-      textalignx 27
-      textaligny 22
-      textscale .25
+      style WINDOW_STYLE_EMPTY
+      textalign ITEM_ALIGN_CENTER
+      textalignx 32 
+      textaligny 28 
+      textscale .4
       forecolor 1 1 1 1
-      backcolor .0 .17 .0 1 
       visible 1
       action { open ingame_about }
-      mouseEnter { setitemcolor about backcolor .1 .37 .1 1 }
-      mouseExit { setitemcolor about backcolor .0 .17 .0 1 }
     }
 
+    itemDef
+    {
+      name options
+      text "Options"
+      type ITEM_TYPE_BUTTON
+      style WINDOW_STYLE_EMPTY
+      rect 100 6 70 40
+      textalign ITEM_ALIGN_CENTER
+      textalignx 35 
+      textaligny 28 
+      textscale .4
+      forecolor 1 1 1 1
+      visible 1 
+      action { open ingame_options }
+    }
+
+    itemDef
+    {
+      name vote
+      text "Vote"
+      type ITEM_TYPE_BUTTON
+      style WINDOW_STYLE_EMPTY
+      rect 170 6 50 40
+      textalign ITEM_ALIGN_CENTER
+      textalignx 25 
+      textaligny 28 
+      textscale .4
+      forecolor 1 1 1 1
+      visible 1 
+      action { open ingame_vote }
+    }
+
+    itemDef
+    {
+      name leave
+      text "Exit"
+      type ITEM_TYPE_BUTTON
+      style WINDOW_STYLE_EMPTY
+      rect 220 6 50 40 
+      textalign ITEM_ALIGN_CENTER
+      textalignx 25 
+      textaligny 28 
+      textscale .4
+      forecolor 1 1 1 1
+      visible 1 
+      action { open ingame_leave }
+    }
 /*    itemDef
     {
       name player
       text "Player"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 232 0 58 30
+      rect 232 0 48 20
       textalign 1 
       textalignx 29      
       textaligny 22
@@ -83,13 +127,13 @@
       mouseExit { setitemcolor player backcolor 0 .17 0 1 }
     }*/
 
-    itemDef
+/*    itemDef
     {
       name controls
       text "Controls"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_FILLED
-      rect 290 0 58 30
+      rect 290 0 48 20
       textalign 1 
       textalignx 29      
       textaligny 22
@@ -100,28 +144,9 @@
       action { open ingame_controls }
       mouseEnter { setitemcolor controls backcolor .1 .37 .1 1 }
       mouseExit { setitemcolor controls backcolor 0 .17 0 1 }
-    }
-
-    itemDef
-    {
-      name options
-      text "Options"
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
-      rect 348 0 58 30
-      textalign 1 
-      textalignx 29      
-      textaligny 22
-      textscale .25
-      forecolor 1 1 1 1
-      backcolor 0 .17 0 1 
-      visible 1 
-      action { open ingame_options }
-      mouseEnter { setitemcolor options backcolor .1 .37 .1 1 }
-      mouseExit { setitemcolor options backcolor 0 .17 0 1 }
-    }
+    }*/
 
-    itemDef
+/*    itemDef
     {
       name system
       text "System"
@@ -138,31 +163,9 @@
       action { open ingame_system }
       mouseEnter { setitemcolor system backcolor .1 .37 .1 1 }
       mouseExit { setitemcolor system backcolor 0 .17 0 1 }
-    }
-
-    itemDef
-    {
-      name vote
-      text "Vote"
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
-      cvarTest "ui_singleplayeractive"
-      disableCvar { "1" }
-
-      rect 464 0 58 30
-      textalign 1 
-      textalignx 29      
-      textaligny 22
-      textscale .25
-      forecolor 1 1 1 1
-      backcolor 0 .17 0 1 
-      visible 1 
-      action { open ingame_vote }
-      mouseEnter { setitemcolor vote backcolor .1 .37 .1 1 }
-      mouseExit { setitemcolor vote backcolor 0 .17 0 1 }
-    }
+    }*/
 
-    itemDef
+/*    itemDef
     {
       name callvote
       text "CallVote"
@@ -182,25 +185,7 @@
       action { open ingame_callvote }
       mouseEnter { setitemcolor callvote backcolor .1 .37 .1 1 }
       mouseExit { setitemcolor callvote backcolor 0 .17 0 1 }
-    }
+    }*/
     
-    itemDef
-    {
-      name leave
-      text "Exit"
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_FILLED
-      rect 580 0 58 30
-      textalign 1 
-      textalignx 29      
-      textaligny 22
-      textscale .25
-      forecolor 1 1 1 1
-      backcolor 0 .17 0 1 
-      visible 1 
-      action { open ingame_leave }
-      mouseEnter { setitemcolor leave backcolor .1 .37 .1 1 }
-      mouseExit { setitemcolor leave backcolor 0 .17 0 1 }
-    }
   }
 }
diff --git a/ui/ingame_about.menu b/ui/ingame_about.menu
index bc078234..f20191c0 100644
--- a/ui/ingame_about.menu
+++ b/ui/ingame_about.menu
@@ -9,7 +9,7 @@
     visible 0
     fullscreen 0
     outOfBoundsClick			// this closes the window if it gets a click out of the rectangle
-    rect 0 30 256 295
+    rect 10 56 256 160
     focusColor 1 .75 0 1
     style 1
     border 1
@@ -17,152 +17,15 @@
     itemDef
     {
       name window
-      rect 10 15 256 280
+      rect 10 5 256 150
       style 1
-      backcolor 0 .1 0 1
+      backcolor 0 0 0 1
       visible 1
       decoration
-    }
 
-    //	FRAME 	//
-    itemDef
-    {
-      name window
-      rect 0 10 16 128
-      style 3
-      background "ui/assets/ingameleft.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 3 0 65 16
-      style 3
-      background "ui/assets/ingameconnection.tga"
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name window
-      rect 67 10 64 8
-      style 3
-      background "ui/assets/ingametop.tga"
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name window
-      rect 131 10 96 8
-      style 3
-      background "ui/assets/ingametop.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 0 138 16 64
-      style 3
-      background "ui/assets/ingameleft.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 0 202 16 64
-      style 3
-      background "ui/assets/ingameleft.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 0 233 64 64
-      style 3
-      background "ui/assets/ingameleftcornerb.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 212 10 64 64
-      style 3
-      background "ui/assets/ingamerightcorner.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 212 233 64 64
-      style 3
-      background "ui/assets/ingamerightcornerb.tga"
-      visible 1
-      decoration
-    }
-
-    itemDef
-    {
-      name window
-      rect 64 289 66 8
-      style 3
-      background "ui/assets/ingamebottom.tga"
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name window
-      rect 128 289 96 8
-      style 3
-      background "ui/assets/ingamebottom.tga"
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name window
-      rect 260 74 16 64
-      style 3
-      background "ui/assets/ingameright.tga"
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name window
-      rect 260 138 16 64
-      style 3
-      background "ui/assets/ingameright.tga"
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name window
-      rect 260 202 16 64
-      style 3
-      background "ui/assets/ingameright.tga"
-      visible 1
-      decoration
+      border WINDOW_BORDER_KCGRADIENT
+      borderSize 4.0
+      borderColor 0.5 0.5 0.5 1
     }
 
     itemDef
diff --git a/ui/ingame_leave.menu b/ui/ingame_leave.menu
index 70f82971..154d3e0b 100644
--- a/ui/ingame_leave.menu
+++ b/ui/ingame_leave.menu
@@ -1,344 +1,283 @@
 #include "ui/menudef.h"
 
-
 {
-\\ INGAME_LEAVE MENU \\
-
-  menuDef {
-    	name "ingame_leave"
-    	visible 1
-    	fullScreen 0
-	outOfBoundsClick			// this closes the window if it gets a click out of the rectangle
-    	rect 511 30 128 125
-	focusColor 1 .75 0 1
-	onOpen { show grpMenu ; hide grpConfirm }
-
-
-
-itemDef {
-     	name leave
-	style WINDOW_STYLE_FILLED
-     	rect 10 15 108 110   
-	backcolor 0 .1 0 1
-      	visible 1 
-     	decoration
-    	}
-
-
-// FRAME	//
-
-
-itemDef {
-	name window
-	rect 0 10 64 64
-	style 3
-	background "ui/assets/ingameleftcorner.tga"
-	visible 1
-	decoration
-	}
-
-itemDef {
-	name window
-	rect 112 10 16 64
-	style 3
-	background "ui/assets/ingameright.tga"
-	visible 1
-	decoration
-	}
-itemDef {
-	name window
-	rect 64 0 63 16
-	style 3
-	background "ui/assets/ingameconnection.tga"
-	visible 1
-	decoration
-	}
-
-itemDef {
-	name window
-	rect 0 64 64 64
-	style 3
-	background "ui/assets/ingameleftcornerb.tga"
-	visible 1
-	decoration
-	}
-itemDef {
-	name window
-	rect 64 64 64 64
-	style 3
-	background "ui/assets/ingamerightcornerb.tga"
-	visible 1
-	decoration
-	}
-
-
-
-itemDef {
-     	name leave
-     	text "Main Menu"
-	group grpMenu
-      	style 2	
-     	rect 0 30 128 20 
-	type 1  
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-      	forecolor 1 1 1 1
-      	visible 1 
-      	action { hide grpMenu ; show leaveConfirm }
-    	}
-
- itemDef {
-      	name leave
-	group grpMenu
-      	text "Restart"
-      	style 2	
-	type 1
-      	rect 0 50 128 20   
-      	textalign 1	
-      	textalignx 65 
-      	textaligny 18
-	textscale .25
-      	forecolor  1 1 1 1
-      	visible 1 
-	action { hide grpMenu ; show restartConfirm }
-    	}
-
- itemDef {
-      	name leave
-	group grpMenu
-	type 1
-      	text "Quit"
-      	style 2	
-      	rect 0 70 128 20   
-      	textalign 1	
-      	textalignx 64 
-      	textaligny 18
-	textscale .25
-      	forecolor  1 1 1 1
-      	visible 1 
-      	action { hide grpMenu ; show quitConfirm }
-    	}
-
-
-// CONFIRMS	//
-
-
-itemDef {
-     	name leaveConfirm
-     	text "Exit to"
-	group grpConfirm
-      	style 2	
-     	rect 0 33 128 20   
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-	decoration
-      	forecolor 1 1 1 1
-      	visible 1 
-    	}
-itemDef {
-     	name leaveConfirm
-     	text "Main Menu?"
-	group grpConfirm
-      	style 2	
-     	rect 0 50 128 20   
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-	decoration
-      	forecolor 1 1 1 1
-      	visible 1 
-    	}
-
-
-itemDef {
-	name leaveConfirm
-	text "Yes"
-	group grpConfirm
-	type 1
-	textscale .25
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	rect 18 80 40 20
-	textalign 1
-	textalignx 20
-	textaligny 15
-	forecolor 1 1 1 1
-	backcolor .37 .1 .1 1 
-	visible 1
-	action { uiScript leave }
-	mouseEnter { setitemcolor ok backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor ok backcolor .37 .1 .1 1 }
-	}
-
-itemDef {
-	name leaveConfirm
-	text "No"
-	group grpConfirm
-	type 1
-	textscale .25
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	rect 70 80 40 20
-	textalign 1
-	textalignx 20
-	textaligny 15
-	forecolor 1 1 1 1
-	backcolor .37 .1 .1 1 
-	visible 1
-	action { hide grpConfirm ; show grpMenu }
-	mouseEnter { setitemcolor ok backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor ok backcolor .37 .1 .1 1 }
-	}
-
-
-itemDef {
-     	name restartConfirm
-     	text "Want to"
-	group grpConfirm
-      	style 2	
-     	rect 0 33 128 20   
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-	decoration
-      	forecolor 1 1 1 1
-      	visible 1 
-    	}
-itemDef {
-     	name restartConfirm
-     	text "Restart Map?"
-	group grpConfirm
-      	style 2	
-     	rect 0 50 128 20   
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-	decoration
-      	forecolor 1 1 1 1
-      	visible 1 
-    	}
-
-
-
-itemDef {
-	name restartConfirm
-	text "Yes"
-	group grpConfirm
-	type 1
-	textscale .25
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	rect 18 80 40 20
-	textalign 1
-	textalignx 20
-	textaligny 15
-	forecolor 1 1 1 1
-	backcolor .37 .1 .1 1 
-	visible 1
-	action { exec "map_restart" ; close ingame_leave ; close ingame }
-	mouseEnter { setitemcolor ok backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor ok backcolor .37 .1 .1 1 }
-	}
-
-itemDef {
-	name restartConfirm
-	text "No"
-	group grpConfirm
-	type 1
-	textscale .25
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	rect 70 80 40 20
-	textalign 1
-	textalignx 20
-	textaligny 15
-	forecolor 1 1 1 1
-	backcolor .37 .1 .1 1 
-	visible 1
-	action { hide grpConfirm ; show grpMenu }
-	mouseEnter { setitemcolor ok backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor ok backcolor .37 .1 .1 1 }
-	}
-
-itemDef {
-     	name quitConfirm
-     	text "Want to"
-	group grpConfirm
-      	style 2	
-     	rect 0 33 128 20   
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-      	forecolor 1 1 1 1
-	decoration
-      	visible 1 
-    	}
-itemDef {
-     	name quitConfirm
-     	text "Quit Game?"
-	group grpConfirm
-      	style 2	
-     	rect 0 50 128 20   
-     	textalign 1	
-     	textalignx 64
-    	textaligny 18        
-	textscale .25
-      	forecolor 1 1 1 1
-	decoration
-      	visible 1 
-    	}
-
-
-itemDef {
-	name quitConfirm
-	text "Yes"
-	group grpConfirm
-	type 1
-	textscale .25
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	rect 18 80 40 20
-	textalign 1
-	textalignx 20
-	textaligny 15
-	forecolor 1 1 1 1
-	backcolor .37 .1 .1 1 
-	visible 1
-	action { uiScript quit }
-	mouseEnter { setitemcolor ok backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor ok backcolor .37 .1 .1 1 }
-	}
-
-itemDef {
-	name quitConfirm
-	text "No"
-	group grpConfirm
-	type 1
-	textscale .25
-	style WINDOW_STYLE_FILLED
-	background "ui/assets/button_back.tga"
-	rect 70 80 40 20
-	textalign 1
-	textalignx 20
-	textaligny 15
-	forecolor 1 1 1 1
-	backcolor .37 .1 .1 1 
-	visible 1
-	action { hide grpConfirm ; show grpMenu }
-	mouseEnter { setitemcolor ok backcolor .1 .37 .1 1 }
-      	mouseExit { setitemcolor ok backcolor .37 .1 .1 1 }
-	}
-
-
-
+  \\ INGAME_LEAVE MENU \\
+
+  menuDef
+  {
+    name "ingame_leave"
+    visible 1
+    fullScreen 0
+    outOfBoundsClick      // this closes the window if it gets a click out of the rectangle
+    rect 160 56 128 125
+    focusColor 1 .75 0 1
+    onOpen { show grpMenu ; hide grpConfirm }
+
+    itemDef
+    {
+      name leave
+      style WINDOW_STYLE_FILLED
+      rect 5 5 107 90 
+      backcolor 0 0 0 1
+      visible 1 
+      decoration
+
+      border WINDOW_BORDER_KCGRADIENT
+      borderSize 4.0
+      borderColor 0.5 0.5 0.5 1
+    }
+
+    itemDef
+    {
+      name leave
+      text "Main Menu"
+      group grpMenu
+      style 2 
+      rect 0 20 128 20 
+      type 1  
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      forecolor 1 1 1 1
+      visible 1 
+      action { hide grpMenu ; show leaveConfirm }
+    }
+
+    itemDef
+    {
+      name leave
+      group grpMenu
+      text "Restart"
+      style 2 
+      type 1
+      rect 0 40 128 20   
+      textalign 1 
+      textalignx 65 
+      textaligny 18
+      textscale .25
+      forecolor  1 1 1 1
+      visible 1 
+      action { hide grpMenu ; show restartConfirm }
+    }
+
+    itemDef
+    {
+      name leave
+      group grpMenu
+      type 1
+      text "Quit"
+      style 2 
+      rect 0 60 128 20   
+      textalign 1 
+      textalignx 64 
+      textaligny 18
+      textscale .25
+      forecolor  1 1 1 1
+      visible 1 
+      action { hide grpMenu ; show quitConfirm }
+    }
+
+
+    // CONFIRMS //
+
+
+    itemDef
+    {
+      name leaveConfirm
+      text "Exit to"
+      group grpConfirm
+      style 2 
+      rect 0 23 128 20   
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      decoration
+      forecolor 1 1 1 1
+      visible 1 
+    }
+
+    itemDef
+    {
+      name leaveConfirm
+      text "Main Menu?"
+      group grpConfirm
+      style 2 
+      rect 0 40 128 20   
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      decoration
+      forecolor 1 1 1 1
+      visible 1 
+    }
+
+    itemDef
+    {
+      name leaveConfirm
+      text "Yes"
+      group grpConfirm
+      type 1
+      textscale .25
+      style WINDOW_STYLE_EMPTY
+      rect 18 70 40 20
+      textalign 1
+      textalignx 20
+      textaligny 15
+      forecolor 1 1 1 1
+      visible 1
+      action { uiScript leave }
+    }
+
+    itemDef
+    {
+      name leaveConfirm
+      text "No"
+      group grpConfirm
+      type 1
+      textscale .25
+      style WINDOW_STYLE_EMPTY
+      rect 70 70 40 20
+      textalign 1
+      textalignx 20
+      textaligny 15
+      forecolor 1 1 1 1
+      visible 1
+      action { hide grpConfirm ; show grpMenu }
+    }
+
+    itemDef
+    {
+      name restartConfirm
+      text "Want to"
+      group grpConfirm
+      style 2 
+      rect 0 23 128 20   
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      decoration
+      forecolor 1 1 1 1
+      visible 1 
+    }
+    
+    itemDef
+    {
+      name restartConfirm
+      text "Restart Map?"
+      group grpConfirm
+      style 2 
+      rect 0 40 128 20   
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      decoration
+      forecolor 1 1 1 1
+      visible 1 
+    }
+
+    itemDef
+    {
+      name restartConfirm
+      text "Yes"
+      group grpConfirm
+      type 1
+      textscale .25
+      style WINDOW_STYLE_EMPTY
+      rect 18 70 40 20
+      textalign 1
+      textalignx 20
+      textaligny 15
+      forecolor 1 1 1 1
+      visible 1
+      action { exec "map_restart" ; close ingame_leave ; close ingame }
+    }
+
+    itemDef
+    {
+      name restartConfirm
+      text "No"
+      group grpConfirm
+      type 1
+      textscale .25
+      style WINDOW_STYLE_EMPTY
+      rect 70 70 40 20
+      textalign 1
+      textalignx 20
+      textaligny 15
+      forecolor 1 1 1 1
+      visible 1
+      action { hide grpConfirm ; show grpMenu }
+    }
+
+    itemDef
+    {
+      name quitConfirm
+      text "Want to"
+      group grpConfirm
+      style 2 
+      rect 0 23 128 20   
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      forecolor 1 1 1 1
+      decoration
+      visible 1 
+    }
+    
+    itemDef
+    {
+      name quitConfirm
+      text "Quit Game?"
+      group grpConfirm
+      style 2 
+      rect 0 40 128 20   
+      textalign 1 
+      textalignx 64
+      textaligny 18        
+      textscale .25
+      forecolor 1 1 1 1
+      decoration
+      visible 1 
+    }
+
+    itemDef
+    {
+      name quitConfirm
+      text "Yes"
+      group grpConfirm
+      type 1
+      textscale .25
+      style WINDOW_STYLE_EMPTY
+      rect 18 70 40 20
+      textalign 1
+      textalignx 20
+      textaligny 15
+      forecolor 1 1 1 1
+      visible 1
+      action { uiScript quit }
+    }
+
+    itemDef
+    {
+      name quitConfirm
+      text "No"
+      group grpConfirm
+      type 1
+      textscale .25
+      style WINDOW_STYLE_EMPTY
+      rect 70 70 40 20
+      textalign 1
+      textalignx 20
+      textaligny 15
+      forecolor 1 1 1 1
+      visible 1
+      action { hide grpConfirm ; show grpMenu }
+    }
+  }
 }
-
-}
\ No newline at end of file