From 7aef2f53300e1f15b455e7d92b7c4ecd7aaf41b9 Mon Sep 17 00:00:00 2001
From: briangr <briangr@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Tue, 27 Oct 2009 11:33:57 +0000
Subject: [PATCH] ported xml menu changes from sdl-port

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@1685 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c23115bb6420ac326b1765e8d48cc6765a3bdbf6
Former-commit-id: 3489749a43870c086d6adf822d445bfe336ad6f5
---
 src/libs/raceengineclient/racemanmenu.cpp | 40 ++++++++---------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/libs/raceengineclient/racemanmenu.cpp b/src/libs/raceengineclient/racemanmenu.cpp
index fc216e7d2..52b0cff5b 100644
--- a/src/libs/raceengineclient/racemanmenu.cpp
+++ b/src/libs/raceengineclient/racemanmenu.cpp
@@ -254,7 +254,7 @@ ReRacemanMenu(void)
     const char	*str;
     void	*params = ReInfo->params;
 
-    if (racemanMenuHdle) {
+	if (racemanMenuHdle) {
 	GfuiScreenRelease(racemanMenuHdle);
     }
     racemanMenuHdle = GfuiScreenCreateEx(NULL, 
@@ -262,41 +262,29 @@ ReRacemanMenu(void)
 					 NULL, (tfuiCallback)NULL, 
 					 1);
 
-    str = GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_BGIMG, 0);
-    if (str) {
-	GfuiScreenAddBgImg(racemanMenuHdle, str);
-    }
-    
-    GfuiMenuDefaultKeysAdd(racemanMenuHdle);
+	GfuiMenuDefaultKeysAdd(racemanMenuHdle);
+
+	void *param2 = LoadMenuXML("racechoicemenu.xml");
+    CreateStaticControls(param2,racemanMenuHdle);
+
 
     str = GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_NAME, 0);
     if (str) {
-	GfuiTitleCreate(racemanMenuHdle, str, strlen(str));
+		int id = CreateLabelControl(racemanMenuHdle,param2,"title");
+		GfuiLabelSetText(racemanMenuHdle,id,str);
     }
 
+    CreateButtonControl(racemanMenuHdle,param2,"newrace",NULL,ReStartNewRace);
+    CreateButtonControl(racemanMenuHdle,param2,"configurerace",NULL,reConfigureMenu);
+    CreateButtonControl(racemanMenuHdle,param2,"configureplayers",DriverMenuInit(racemanMenuHdle),GfuiScreenActivate);
+    
+	CreateButtonControl(racemanMenuHdle,param2,"backtomain",ReInfo->_reMenuScreen,GfuiScreenActivate);
 
-    GfuiMenuButtonCreate(racemanMenuHdle,
-			 "New Race", "Start a New Race",
-			 NULL, ReStartNewRace);
-
-    GfuiMenuButtonCreate(racemanMenuHdle, 
-			 "Configure Race", "Configure The Race",
-			 NULL, reConfigureMenu);
-
-     GfuiMenuButtonCreate(racemanMenuHdle,
-			  "Configure Players", "Players configuration menu",
-			  NULL, rePlayerConfig);
 
     if (GfParmGetEltNb(params, RM_SECT_TRACKS) > 1) {
-	GfuiMenuButtonCreate(racemanMenuHdle, 
-			     "Load", "Load a Previously Saved Game",
-			     racemanMenuHdle, reLoadMenu);
+			CreateButtonControl(racemanMenuHdle,param2,"load",racemanMenuHdle,reLoadMenu);
     }
     
-    GfuiMenuBackQuitButtonCreate(racemanMenuHdle,
-				 "Back to Main", "Return to previous Menu",
-				 ReInfo->_reMenuScreen, GfuiScreenActivate);
-
     GfuiScreenActivate(racemanMenuHdle);
 
     return RM_ASYNC | RM_NEXT_STEP;