From 1e0b515a6031a2cd2a77e9c34f2e4292fc9f9750 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Tue, 30 Oct 2007 18:18:47 +0000
Subject: * (bug 3384) Remove server side armoury refresh and replace with UI
 side   refresh * Add trap_Key_SetOverstrikeMode and
 trap_Key_GetOverstrikeMode to cgame * Change Text_[Width|Height] to return
 floats * Add Text_Em[Width|Height] * Add CG_AlignText to cut down on code
 duplication * Add itemDef_t::textvalignment for vertical text alignment * Add
 UI_DrawTextBlock to replace a lot of duplicate code * Rewrite text wrapping
 code from scratch so that it actually works * Add UI_OwnerDrawText * Add
 expression evaluator to .menu parser * Split off Border_Paint from
 Window_Paint * Scale slider items to fit their rect * Rework edit field
 widgets to behave somewhat more correctly * Fix a few listbox widget layout
 issues * Don't display scrollbars in "notselectable" listbox widgets * Make
 scoreboard team labels ownerdrawn * Menu script rework   + Use the expression
 evaluator to replace lots and lots of absolute     coords with relative ones,
 hopefully easing future maintenance   + Remove lots and lots of textalign[xy]
 that were present to work     around broken text alignment routines   +
 Replace a bunch of numeric constants with ones from menudef.h   + Compose the
 huds from tremulous_common_hud.h   + Generally neaten things up   + Lots of
 whitespace fixes

---
 ui/mod.menu | 62 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

(limited to 'ui/mod.menu')

diff --git a/ui/mod.menu b/ui/mod.menu
index bfebebd8..88045167 100644
--- a/ui/mod.menu
+++ b/ui/mod.menu
@@ -3,15 +3,21 @@
 {
   \\ MOD \\
 
+#define W       300
+#define H       240
+#define BUTT_W  45
+#define BUTT_H  35
+#define BORDER  10
+
   menuDef
   {
     name "mod"
-    visible 0
-    fullscreen 0
-    rect 160 120 320 240
+    visible MENU_FALSE
+    fullscreen MENU_FALSE
+    rect (320-(W/2)) (240-(H/2)) W H
     focusColor 1 .75 0 1
-    style 1
-    border 1
+    style WINDOW_STYLE_FILLED
+    border WINDOW_BORDER_FULL
     popup
     onEsc
     {
@@ -25,21 +31,21 @@
     itemDef
     {
       name window
-      rect 0 0 320 240
+      rect 0 0 W H
       style WINDOW_STYLE_FILLED
       backcolor 0 0 0 1
-      visible 1
+      visible MENU_TRUE
       decoration
 
       border WINDOW_BORDER_FULL
       borderSize 1.0
       borderColor 0.5 0.5 0.5 1
     }
-    
+
     itemDef
     {
       name modlist
-      rect 10 10 300 200
+      rect BORDER BORDER (W-(2*BORDER)) (H-(BUTT_H+BORDER))
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_EMPTY
       elementwidth 120
@@ -49,53 +55,51 @@
       feeder FEEDER_MODS
       textalign 3
       textaligny 14
-      border 1
+      border WINDOW_BORDER_FULL
       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
+      visible MENU_TRUE
       doubleClick
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         uiScript RunMod
       }
     }
 
     itemDef
     {
-      name ok
-      text "OK"
-      type 1
+      name load
+      text "Load"
+      type ITEM_TYPE_BUTTON
       textscale .25
-      rect 250 210 30 26
-      textalign 1
-      textalignx 15
-      textaligny 20
+      rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1
+      visible MENU_TRUE
       action
-      { 
+      {
         play "sound/misc/menu1.wav";
         close mod;
         uiScript RunMod
       }
     }
-    
+
     itemDef
     {
       name cancel
       text "Cancel"
-      type 1
+      type ITEM_TYPE_BUTTON
       textscale .25
-      rect 280 210 30 26
-      textalign 1
-      textalignx 15
-      textaligny 20
+      rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1
+      visible MENU_TRUE
       action
-      { 
+      {
         play "sound/misc/menu3.wav";
         close mod
       }
-- 
cgit