1 files changed, 50 insertions, 31 deletions

diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu
index 5dc67318..d31b2832 100644
--- a/ui/tremulous_alienupgrade.menu
+++ b/ui/tremulous_alienupgrade.menu
@@ -1,25 +1,44 @@
 #include "ui/menudef.h"
 
 {
+
+#define W         450
+#define H         250
+#define BORDER    10
+
+#define LIST_W    140
+#define LIST_H    (H-(2*BORDER))
+#define LIST_X    BORDER
+#define LIST_Y    BORDER
+
+#define BUTT_H    25
+#define BUTT_W    45
+
+#define INFO_W    (W-((3*BORDER)+LIST_W))
+#define INFO_H    (H-((3*BORDER)+BUTT_H))
+#define INFO_X    ((2*BORDER)+LIST_W)
+#define INFO_Y    BORDER
+#define INFO_TOFF 6
+
   menuDef
   {
     name "tremulous_alienupgrade"
-    visible 1
-    fullscreen 0
+    visible MENU_TRUE
+    fullscreen MENU_FALSE
     outOfBoundsClick
-    rect 112 111 400 247
+    rect (320-(W/2)) (240-(H/2)) W H
     focusColor 1 .75 0 1
-    style 1
+    style WINDOW_STYLE_FILLED
     popup
     onOpen { uiScript LoadAlienUpgrades; setFocus list }
 
     itemDef
     {
       name window
-      rect 0 0 400 247
+      rect 0 0 W H
       style WINDOW_STYLE_FILLED
       backcolor 0 0 0 1
-      visible 1
+      visible MENU_TRUE
       decoration
 
       border WINDOW_BORDER_FULL
@@ -30,7 +49,7 @@
     itemDef
     {
       name "list"
-      rect 8 8 136 231
+      rect LIST_X LIST_Y LIST_W LIST_H
       type ITEM_TYPE_LISTBOX
       style WINDOW_STYLE_EMPTY
       elementwidth 120
@@ -38,78 +57,78 @@
       textscale .33
       elementtype LISTBOX_TEXT
       feeder FEEDER_TREMALIENUPGRADE
-      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 UpgradeToNewClass;
         close tremulous_alienupgrade
       }
     }
-    
+
     itemDef
     {
       name infopane
       ownerdraw UI_AUPGRADEINFOPANE
       textstyle ITEM_TEXTSTYLE_NORMAL
-      style WINDOW_STYLE_EMPTY	
-      rect 152 8 240 204
+      style WINDOW_STYLE_EMPTY
+      rect INFO_X INFO_Y INFO_W INFO_H
       textscale .33
-      textalignx 6
-      textaligny 12
-      border 1
+      textalign ITEM_ALIGN_LEFT
+      textvalign ITEM_VALIGN_TOP
+      textalignx INFO_TOFF
+      textaligny INFO_TOFF
+      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
       decoration
     }
-    
+
     itemDef
     {
       name "OKCancel"
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
-      rect 305 218 34 21
-      textalign ITEM_ALIGN_LEFT
-      textalignx 12.5
-      textaligny 18
+      rect (W-((2*BORDER)+(2*BUTT_W))) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       textscale .4
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
-      visible 1
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         uiScript UpgradeToNewClass;
         close tremulous_alienupgrade
       }
     }
-    
+
     itemDef
     {
       name "OKCancel"
       text "Cancel"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
-      rect 344 218 50 21
-      textalign ITEM_ALIGN_LEFT
-      textalignx 3.8
-      textaligny 18
+      rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       textscale .4
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu3.wav"; 
+        play "sound/misc/menu3.wav";
         close tremulous_alienupgrade
       }
     }