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/error.menu | 88 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

(limited to 'ui/error.menu')

diff --git a/ui/error.menu b/ui/error.menu
index ac57084b..14e9d058 100644
--- a/ui/error.menu
+++ b/ui/error.menu
@@ -1,23 +1,33 @@
 #include "ui/menudef.h"
 
 {
-  \\ ERROR \\
+
+#define W         320
+#define H         320
+#define BORDER    10
+
+#define BUTT_H    25
+#define BUTT_W    65
+
+#define INFO_W    (W-(2*BORDER))
+#define INFO_H    (H-((4*BORDER)+(2*BUTT_H)))
+#define INFO_X    BORDER
+#define INFO_Y    ((2*BORDER)+BUTT_H)
 
   menuDef
   {
     name "error_popmenu"
-    visible 0
-    fullscreen 0
-    rect 158 80 320 320
+    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
     onClose { uiScript clearError }
-    onOpen { }
     onESC
     {
-      play "sound/misc/menu1.wav"; 
+      play "sound/misc/menu1.wav";
       close error_popmenu;
       open main
     }
@@ -26,10 +36,10 @@
     itemDef
     {
       name window
-      rect 10 15 300 320
+      rect 0 0 W H
       style WINDOW_STYLE_FILLED
       backcolor 0 0 0 1
-      visible 1
+      visible MENU_TRUE
       decoration
 
       border WINDOW_BORDER_FULL
@@ -39,62 +49,50 @@
 
     itemDef
     {
-      name errorinfo
-      rect 0 50 320 20	
-      text "Error:"
-      textalign 1
-      textstyle 6
-      textscale .333
-      textalignx 160
-      textaligny 23
+      name dropinfo
+      rect BORDER BORDER INFO_W BUTT_H
+      text "Error"
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
+      textscale .4
       forecolor 1 1 1 1
-      visible 1
+      visible MENU_TRUE
       decoration
     }
-    
+
     itemDef
     {
-      name errorinfo
-      rect 60 80 200 270
+      name dropinfo
+      rect INFO_X INFO_Y INFO_W INFO_H
       type ITEM_TYPE_TEXT
-      style 1
-      textstyle 3
-      autowrapped
+      style WINDOW_STYLE_FILLED
+      wrapped
       cvar "com_errorMessage"
       textalign ITEM_ALIGN_CENTER
-      textalignx 100
-      textaligny 23
-      textscale .25
+      textvalign ITEM_VALIGN_CENTER
+      textscale .33
       forecolor 1 1 1 1
-      visible 1
+      visible MENU_TRUE
       decoration
     }
-   
-
-    //	BUTTON	//
-
 
     itemDef
     {
       name exit
-      text "Exit"
-      type 1
-      textscale .25
-      group grpControlbutton
+      text "OK"
       type ITEM_TYPE_BUTTON
+      textscale .4
       style WINDOW_STYLE_EMPTY
-      rect 138 295 45 26
-      textalign 1
-      textalignx 22
-      textaligny 20
+      rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
       backcolor .37 .1 .1 1
-      visible 1
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
-        close error_popmenu;
-        open main
+        play "sound/misc/menu1.wav";
+        close error_popmenu
       }
     }
   }
-- 
cgit