From 88bacc7c0b86bc49cbe2bbc3cc60520e5d2f7d21 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 6 Aug 2002 02:44:13 +0000 Subject: * Bank menus * Changed font sizes for most trem menus * Changed MCU buy/sell menu to be more compact * Tremulousised the error dialogs --- ui/tremulous_alienbuild.menu | 20 ++++++++++---------- ui/tremulous_alienclass.menu | 26 +++++++++++++------------- ui/tremulous_aliendialogs.menu | 40 ++++++++++++++++++++++++++++------------ ui/tremulous_alienupgrade.menu | 20 ++++++++++---------- ui/tremulous_humanbuild.menu | 20 ++++++++++---------- ui/tremulous_humandialogs.menu | 40 ++++++++++++++++++++++++++++------------ ui/tremulous_humanitem.menu | 26 +++++++++++++------------- ui/tremulous_teamselect.menu | 20 ++++++++++---------- 8 files changed, 122 insertions(+), 90 deletions(-) diff --git a/ui/tremulous_alienbuild.menu b/ui/tremulous_alienbuild.menu index 168a35ca..ae6512ed 100644 --- a/ui/tremulous_alienbuild.menu +++ b/ui/tremulous_alienbuild.menu @@ -34,8 +34,8 @@ type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 15 - textscale .25 + elementheight 20 + textscale .33 elementtype LISTBOX_TEXT feeder FEEDER_TREMALIENBUILD border 1 @@ -52,8 +52,8 @@ ownerdraw UI_ABUILDINFOPANE textstyle ITEM_TEXTSTYLE_NORMAL style WINDOW_STYLE_EMPTY - rect 161 8 231 204 - textscale .3 + rect 152 8 240 204 + textscale .33 border 1 bordercolor 0.5 0.5 0.5 0.5 forecolor 1 1 1 1 @@ -69,11 +69,11 @@ text "OK" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 319 218 34 21 + rect 305 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 12.5 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor 0 0 0 1 visible 1 @@ -86,11 +86,11 @@ text "Cancel" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 358 218 34 21 + rect 344 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3.8 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor 0 0 0 1 visible 1 diff --git a/ui/tremulous_alienclass.menu b/ui/tremulous_alienclass.menu index 4790e1f7..9850af25 100644 --- a/ui/tremulous_alienclass.menu +++ b/ui/tremulous_alienclass.menu @@ -34,8 +34,8 @@ type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 15 - textscale .25 + elementheight 20 + textscale .33 elementtype LISTBOX_TEXT feeder FEEDER_TREMALIENCLASSES border 1 @@ -52,8 +52,8 @@ ownerdraw UI_ACLASSINFOPANE textstyle ITEM_TEXTSTYLE_NORMAL style WINDOW_STYLE_EMPTY - rect 161 8 231 204 - textscale .3 + rect 152 8 240 204 + textscale .33 border 1 bordercolor 0.5 0.5 0.5 0.5 forecolor 1 1 1 1 @@ -69,11 +69,11 @@ text "< Back" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 161 218 34 21 + rect 152 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -86,11 +86,11 @@ text "OK" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 319 218 34 21 + rect 305 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 12.5 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -103,11 +103,11 @@ text "Cancel" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 358 218 34 21 + rect 344 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3.8 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 diff --git a/ui/tremulous_aliendialogs.menu b/ui/tremulous_aliendialogs.menu index 2c7250bb..cee4ad75 100644 --- a/ui/tremulous_aliendialogs.menu +++ b/ui/tremulous_aliendialogs.menu @@ -7,20 +7,33 @@ visible 0 fullscreen 0 outOfBoundsClick - rect 180 180 280 120 + rect 185 140 280 190 focusColor 1 .75 0 1 - style WINDOW_STYLE_FILLED - disableColor .5 .5 .5 0 - backcolor 0 .5 0 .25 + style WINDOW_STYLE_EMPTY + popup + itemDef + { + name window + rect 0 0 280 190 + 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 alien_dialog text "Error" type ITEM_TYPE_TEXT textstyle ITEM_TEXTSTYLE_NORMAL - style WINDOW_STYLE_FILLED - rect 220 10 50 20 + style WINDOW_STYLE_EMPTY + rect 115 10 50 20 textalign ITEM_ALIGN_LEFT textalignx 5 textaligny 18 @@ -30,28 +43,31 @@ visible 1 decoration } + itemDef { name alien_dialog - ownerdraw UI_DIALOG textstyle ITEM_TEXTSTYLE_NORMAL - style WINDOW_STYLE_FILLED - rect 10 50 260 20 + style WINDOW_STYLE_EMPTY + rect 10 50 250 80 + cvar "ui_dialog" + autowrapped textalignx 5 textaligny 18 - textscale .4 + textscale .33 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 decoration } + itemDef { name alien_dialog text "OK" type ITEM_TYPE_BUTTON - style WINDOW_STYLE_FILLED - rect 242 90 28 20 + style WINDOW_STYLE_EMPTY + rect 242 150 28 20 textalign ITEM_ALIGN_LEFT textalignx 5 textaligny 18 diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu index 4fc92fac..d481bbcb 100644 --- a/ui/tremulous_alienupgrade.menu +++ b/ui/tremulous_alienupgrade.menu @@ -34,8 +34,8 @@ type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 15 - textscale .25 + elementheight 20 + textscale .33 elementtype LISTBOX_TEXT feeder FEEDER_TREMALIENUPGRADE border 1 @@ -52,8 +52,8 @@ ownerdraw UI_AUPGRADEINFOPANE textstyle ITEM_TEXTSTYLE_NORMAL style WINDOW_STYLE_EMPTY - rect 161 8 231 204 - textscale .3 + rect 152 8 240 204 + textscale .33 border 1 bordercolor 0.5 0.5 0.5 0.5 forecolor 1 1 1 1 @@ -69,11 +69,11 @@ text "OK" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 319 218 34 21 + rect 305 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 12.5 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -86,11 +86,11 @@ text "Cancel" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 358 218 34 21 + rect 344 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3.8 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 diff --git a/ui/tremulous_humanbuild.menu b/ui/tremulous_humanbuild.menu index 5356db2f..b64c724b 100644 --- a/ui/tremulous_humanbuild.menu +++ b/ui/tremulous_humanbuild.menu @@ -34,8 +34,8 @@ type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 15 - textscale .25 + elementheight 20 + textscale .33 elementtype LISTBOX_TEXT feeder FEEDER_TREMHUMANBUILD border 1 @@ -52,8 +52,8 @@ ownerdraw UI_HBUILDINFOPANE textstyle ITEM_TEXTSTYLE_NORMAL style WINDOW_STYLE_EMPTY - rect 161 8 231 204 - textscale .3 + rect 152 8 240 204 + textscale .33 border 1 bordercolor 0.5 0.5 0.5 0.5 forecolor 1 1 1 1 @@ -68,11 +68,11 @@ text "OK" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 319 218 34 21 + rect 305 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 12.5 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -85,11 +85,11 @@ text "Cancel" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 358 218 34 21 + rect 344 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3.8 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 diff --git a/ui/tremulous_humandialogs.menu b/ui/tremulous_humandialogs.menu index 4fb3ebe5..eb1ae896 100644 --- a/ui/tremulous_humandialogs.menu +++ b/ui/tremulous_humandialogs.menu @@ -7,20 +7,33 @@ visible 0 fullscreen 0 outOfBoundsClick - rect 180 180 280 120 + rect 185 140 280 190 focusColor 1 .75 0 1 - style WINDOW_STYLE_FILLED - disableColor .5 .5 .5 0 - backcolor 0 .5 0 .25 + style WINDOW_STYLE_EMPTY + popup + itemDef + { + name window + rect 0 0 280 190 + 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 human_dialog text "Error" type ITEM_TYPE_TEXT textstyle ITEM_TEXTSTYLE_NORMAL - style WINDOW_STYLE_FILLED - rect 220 10 50 20 + style WINDOW_STYLE_EMPTY + rect 115 10 50 20 textalign ITEM_ALIGN_LEFT textalignx 5 textaligny 18 @@ -30,28 +43,31 @@ visible 1 decoration } + itemDef { name human_dialog - ownerdraw UI_DIALOG textstyle ITEM_TEXTSTYLE_NORMAL - style WINDOW_STYLE_FILLED - rect 10 50 260 20 + style WINDOW_STYLE_EMPTY + rect 10 50 250 80 + cvar "ui_dialog" + autowrapped textalignx 5 textaligny 18 - textscale .4 + textscale .33 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 decoration } + itemDef { name human_dialog text "OK" type ITEM_TYPE_BUTTON - style WINDOW_STYLE_FILLED - rect 242 90 28 20 + style WINDOW_STYLE_EMPTY + rect 242 150 28 20 textalign ITEM_ALIGN_LEFT textalignx 5 textaligny 18 diff --git a/ui/tremulous_humanitem.menu b/ui/tremulous_humanitem.menu index 09e5e7fe..b8e9dab3 100644 --- a/ui/tremulous_humanitem.menu +++ b/ui/tremulous_humanitem.menu @@ -34,8 +34,8 @@ type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 15 - textscale .25 + elementheight 20 + textscale .33 elementtype LISTBOX_TEXT feeder FEEDER_TREMHUMANITEMS border 1 @@ -52,8 +52,8 @@ ownerdraw UI_HITEMINFOPANE textstyle ITEM_TEXTSTYLE_NORMAL style WINDOW_STYLE_EMPTY - rect 161 8 231 204 - textscale .3 + rect 152 8 240 204 + textscale .33 border 1 bordercolor 0.5 0.5 0.5 0.5 forecolor 1 1 1 1 @@ -69,11 +69,11 @@ text "< Back" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 161 218 34 21 + rect 152 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -86,11 +86,11 @@ text "OK" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 319 218 34 21 + rect 305 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 12.5 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -103,11 +103,11 @@ text "Cancel" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 358 218 34 21 + rect 344 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3.8 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 diff --git a/ui/tremulous_teamselect.menu b/ui/tremulous_teamselect.menu index 5a504479..a220daef 100644 --- a/ui/tremulous_teamselect.menu +++ b/ui/tremulous_teamselect.menu @@ -34,8 +34,8 @@ type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 15 - textscale .25 + elementheight 20 + textscale .33 elementtype LISTBOX_TEXT feeder FEEDER_TREMTEAMS border 1 @@ -52,8 +52,8 @@ ownerdraw UI_TEAMINFOPANE textstyle ITEM_TEXTSTYLE_NORMAL style WINDOW_STYLE_EMPTY - rect 161 8 231 204 - textscale .3 + rect 152 8 240 204 + textscale .33 border 1 bordercolor 0.5 0.5 0.5 0.5 forecolor 1 1 1 1 @@ -69,11 +69,11 @@ text "OK" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 319 218 34 21 + rect 305 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 12.5 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 @@ -86,11 +86,11 @@ text "Cancel" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 358 218 34 21 + rect 344 218 34 21 textalign ITEM_ALIGN_LEFT textalignx 3.8 - textaligny 16 - textscale .25 + textaligny 18 + textscale .4 forecolor 1 1 1 1 backcolor .5 0 0 .25 visible 1 -- cgit