iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Re #307 More consistency in GfuiMenu* API

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

Former-commit-id: c3349ffef9e1d9e612f47db8c9cd0f5868131a0b
Former-commit-id: 959a283fcdb4281db24e974412d08ca63c7df82c
This commit is contained in:
pouillot 2011-05-25 22:02:47 +00:00
parent ea73801ebe
commit 4417fc2bd8
30 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libs/tgfclient/guihelp.cpp
View file

@ -61,7 +61,7 @@ GfuiHelpScreen(void *prevScreen)
void *hmenu = GfuiMenuLoad("helpmenu.xml");
GfuiMenuCreateStaticControls(hmenu, scrHandle);
GfuiMenuCreateStaticControls(scrHandle, hmenu);
// Get menu properties.
const int nXLeftColumn = (int)GfuiMenuGetNumProperty(hmenu, "xLeftColumn", 30);

4
src/libs/tgfclient/guimenu.cpp
View file

@ -913,7 +913,7 @@ GfuiMenuCreateProgressbarControl(void* hscr, void* hparm, const char* pszName)
}
bool
GfuiMenuCreateStaticControls(void* hparm, void* hscr)
GfuiMenuCreateStaticControls(void* hscr, void* hparm)
{
if (!hparm)
{
@ -1057,7 +1057,7 @@ bool GfuiMenuScreen::createStaticControls()
return false;
return m_priv->menuHdle && m_priv->xmlDescParmHdle
&& ::GfuiMenuCreateStaticControls(m_priv->xmlDescParmHdle, m_priv->menuHdle);
&& ::GfuiMenuCreateStaticControls(m_priv->menuHdle, m_priv->xmlDescParmHdle);
}
int GfuiMenuScreen::createButtonControl(const char* pszName,

2
src/libs/tgfclient/tgfclient.h
View file

@ -513,7 +513,7 @@ TGFCLIENT_API void GfuiMenuDefaultKeysAdd(void* scr);
*******************************************/
TGFCLIENT_API void* GfuiMenuLoad(const char* pFilePath);
TGFCLIENT_API bool GfuiMenuCreateStaticControls(void* hparm,void* hscr);
TGFCLIENT_API bool GfuiMenuCreateStaticControls(void* hscr, void* hparm);
TGFCLIENT_API int GfuiMenuCreateButtonControl(void* hscr, void* hparm, const char* pszName,
void* userDataOnPush, tfuiCallback onPush,

7
src/modules/userinterface/legacymenu/confscreens/aiconfig.cpp
View file

@ -22,8 +22,8 @@
@version $Id$
*/
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <tgfclient.h>
#include <robot.h>
@ -31,6 +31,7 @@
#include "aiconfig.h"
static const char* AIGlobalSkillFilePathName = "config/raceman/extra/skill.xml";
/* Available skill level names and associated values */
@ -121,7 +122,7 @@ AIMenuInit(void *prevMenu)
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, onActivate, NULL, (tfuiCallback)NULL, 1);
void *param = GfuiMenuLoad("aiconfigmenu.xml");
GfuiMenuCreateStaticControls(param,ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, param);
GfuiMenuCreateButtonControl(ScrHandle,param,"skillleftarrow",(void*)-1,ChangeSkillLevel);
GfuiMenuCreateButtonControl(ScrHandle,param,"skillrightarrow",(void*)1,ChangeSkillLevel);

2
src/modules/userinterface/legacymenu/confscreens/controlconfig.cpp
View file

@ -568,7 +568,7 @@ ControlMenuInit(void *prevMenu, void *prefHdle, unsigned index, tGearChangeMode
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, onActivate, NULL, (tfuiCallback)NULL, 1);
void *param = GfuiMenuLoad("controlconfigmenu.xml");
GfuiMenuCreateStaticControls(param,ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, param);
/* Default keyboard shortcuts */
GfuiMenuDefaultKeysAdd(ScrHandle);

2
src/modules/userinterface/legacymenu/confscreens/graphconfig.cpp
View file

@ -266,7 +266,7 @@ GraphMenuInit(void* prevMenu)
void* param = GfuiMenuLoad("graphicconfig.xml");
GfuiMenuCreateStaticControls(param,ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, param);
FovEditId = GfuiMenuCreateEditControl(ScrHandle, param, "fovedit", NULL, NULL, ChangeFov);
SmokeEditId = GfuiMenuCreateEditControl(ScrHandle, param, "smokeedit", NULL, NULL, ChangeSmoke);

2
src/modules/userinterface/legacymenu/confscreens/joystickconfig.cpp
View file

@ -252,7 +252,7 @@ JoyCalMenuInit(void *nextMenu, tCmdInfo *cmd, int maxcmd)
void *menuXMLDescHdle = GfuiMenuLoad("joystickconfigmenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, menuXMLDescHdle);
// Create joystick axis label controls (axis name, axis Id, axis min value, axis max value)
for (i = 0; i < NbMaxCalAxis; i++) {

2
src/modules/userinterface/legacymenu/confscreens/mouseconfig.cpp
View file

@ -189,7 +189,7 @@ MouseCalMenuInit(void *nextMenu, tCmdInfo *cmd, int maxcmd)
void *menuXMLDescHdle = GfuiMenuLoad("mouseconfigmenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, menuXMLDescHdle);
// Create instruction variable label.
InstId = GfuiMenuCreateLabelControl(ScrHandle, menuXMLDescHdle, "instructionlabel");

2
src/modules/userinterface/legacymenu/confscreens/openglconfig.cpp
View file

@ -309,7 +309,7 @@ void* OpenGLMenuInit(void *prevMenu)
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, onActivate, NULL, (tfuiCallback)NULL, 1);
void *hparmMenu = GfuiMenuLoad("opengloptionsmenu.xml");
GfuiMenuCreateStaticControls(hparmMenu,ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, hparmMenu);
// Texture compression.
TextureCompLeftButtonId =

2
src/modules/userinterface/legacymenu/confscreens/playerconfig.cpp
View file

@ -829,7 +829,7 @@ PlayerConfigMenuInit(void *prevMenu)
/* Create the screen, load menu XML descriptor and create static controls */
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, onActivate, NULL, (tfuiCallback)NULL, 1);
void *param = GfuiMenuLoad("playerconfigmenu.xml");
GfuiMenuCreateStaticControls(param,ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, param);
/* Player scroll list */
ScrollList = GfuiMenuCreateScrollListControl(ScrHandle,param,"playerscrolllist",NULL, onSelect);

2
src/modules/userinterface/legacymenu/confscreens/simuconfig.cpp
View file

@ -176,7 +176,7 @@ SimuMenuInit(void *prevMenu)
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, onActivate, NULL, (tfuiCallback)NULL, 1);
void *menuDescHdle = GfuiMenuLoad("simulationmenu.xml");
GfuiMenuCreateStaticControls(menuDescHdle, ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, menuDescHdle);
SimuVersionId = GfuiMenuCreateLabelControl(ScrHandle,menuDescHdle,"simulabel");
GfuiMenuCreateButtonControl(ScrHandle, menuDescHdle, "simuleftarrow", (void*)-1, onChangeSimuVersion);

2
src/modules/userinterface/legacymenu/confscreens/soundconfig.cpp
View file

@ -162,7 +162,7 @@ void * SoundMenuInit(void *prevMenu)
scrHandle = GfuiScreenCreate((float*)NULL, NULL, onActivate, NULL, (tfuiCallback)NULL, 1);
void *param = GfuiMenuLoad("soundmenu.xml");
GfuiMenuCreateStaticControls(param,scrHandle);
GfuiMenuCreateStaticControls(scrHandle, param);
GfuiMenuCreateButtonControl(scrHandle,param,"soundleftarrow",(void*)-1,changeSoundState);
GfuiMenuCreateButtonControl(scrHandle,param,"soundrightarrow",(void*)1,changeSoundState);

2
src/modules/userinterface/legacymenu/mainscreens/creditsmenu.cpp
View file

@ -110,7 +110,7 @@ static void* creditsPageCreate(int startChapterIndex, int startRecordIndex)
void *hmenu = GfuiMenuLoad("creditsmenu.xml");
GfuiMenuCreateStaticControls(hmenu, hscrPage);
GfuiMenuCreateStaticControls(hscrPage, hmenu);
// Create title label from chapter name
sprintf(buf, "Credits - %s", chapName);

2
src/modules/userinterface/legacymenu/mainscreens/exitmenu.cpp
View file

@ -44,7 +44,7 @@ void* exitMenuInit(void *prevMenu, void *menuHandle)
void *param = GfuiMenuLoad("exitmenu.xml");
GfuiMenuCreateStaticControls(param,menuHandle);
GfuiMenuCreateStaticControls(menuHandle, param);
GfuiMenuCreateButtonControl(menuHandle, param, "yesquit", NULL, onAcceptExit);
GfuiMenuCreateButtonControl(menuHandle, param, "nobacktogame", prevMenu, GfuiScreenActivate);

2
src/modules/userinterface/legacymenu/mainscreens/mainmenu.cpp
View file

@ -100,7 +100,7 @@ MainMenuInit(void)
void *menuDescHdle = GfuiMenuLoad("mainmenu.xml");
GfuiMenuCreateStaticControls(menuDescHdle, MenuHandle);
GfuiMenuCreateStaticControls(MenuHandle, menuDescHdle);
//Add buttons and create based on xml
GfuiMenuCreateButtonControl(MenuHandle, menuDescHdle, "race", NULL, onRaceSelectMenuActivate);

2
src/modules/userinterface/legacymenu/mainscreens/optionsmenu.cpp
View file

@ -78,7 +78,7 @@ OptionsMenuInit(void *prevMenu)
void *param = GfuiMenuLoad("optionsmenu.xml");
GfuiMenuCreateStaticControls(param,MenuHandle);
GfuiMenuCreateStaticControls(MenuHandle, param);
GfuiMenuCreateButtonControl(MenuHandle, param, "display", NULL, onDisplayMenuActivate);
GfuiMenuCreateButtonControl(MenuHandle, param, "graphic", NULL, onGraphMenuActivate);

2
src/modules/userinterface/legacymenu/racescreens/driverselect.cpp
View file

@ -611,7 +611,7 @@ RmDriversSelect(void *vs)
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, rmdsActivate, NULL, (tfuiCallback)NULL, 1);
void *menuDescHdle = GfuiMenuLoad("driverselectmenu.xml");
GfuiMenuCreateStaticControls(menuDescHdle, ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, menuDescHdle);
CompetitorsScrollListId = GfuiMenuCreateScrollListControl(ScrHandle, menuDescHdle, "competitorsscrolllist", NULL, rmdsClickOnDriver);
CandidatesScrollListId = GfuiMenuCreateScrollListControl(ScrHandle, menuDescHdle, "candidatesscrolllist", NULL, rmdsClickOnDriver);

8
src/modules/userinterface/legacymenu/racescreens/networkingmenu.cpp
View file

@ -576,7 +576,7 @@ RmNetworkHostMenu(void * /* dummy */)
void *mparam = GfuiMenuLoad("networkhostmenu.xml");
GfuiMenuCreateStaticControls(mparam,racemanMenuHdle);
GfuiMenuCreateStaticControls(racemanMenuHdle, mparam);
RmSetRacemanMenuHandle(racemanMenuHdle);
@ -688,7 +688,7 @@ RmNetworkClientMenu(void * /* dummy */)
NULL, (tfuiCallback)NULL, 1);
void *mparam = GfuiMenuLoad("networkclientmenu.xml");
GfuiMenuCreateStaticControls(mparam,racemanMenuHdle);
GfuiMenuCreateStaticControls(racemanMenuHdle, mparam);
GfuiMenuDefaultKeysAdd(racemanMenuHdle);
@ -793,7 +793,7 @@ NetworkClientConnectMenu(void * /* dummy */)
void *mparam = GfuiMenuLoad("networkclientconnectmenu.xml");
GfuiMenuCreateStaticControls(mparam, racemanMenuHdle);
GfuiMenuCreateStaticControls(racemanMenuHdle, mparam);
g_IPEditId = GfuiMenuCreateEditControl(racemanMenuHdle, mparam, "IPAddrEdit",
0, 0, ChangeIP);
@ -834,7 +834,7 @@ RmNetworkMenu(void *)
void *mparam = GfuiMenuLoad("networkmenu.xml");
GfuiMenuCreateStaticControls(mparam, racemanMenuHdle);
GfuiMenuCreateStaticControls(racemanMenuHdle, mparam);
const int nTitleLabelId =
GfuiMenuCreateLabelControl(racemanMenuHdle, mparam, "TitleLabel");

2
src/modules/userinterface/legacymenu/racescreens/raceloadingmenu.cpp
View file

@ -74,7 +74,7 @@ RmLoadingScreenStart(const char *title, const char *bgimg)
void *hmenu = GfuiMenuLoad("loadingscreen.xml");
GfuiMenuCreateStaticControls(hmenu, HScreen);
GfuiMenuCreateStaticControls(HScreen, hmenu);
// Create variable title label.
int titleId = GfuiMenuCreateLabelControl(HScreen, hmenu, "titlelabel");

2
src/modules/userinterface/legacymenu/racescreens/racemanmenu.cpp
View file

@ -380,7 +380,7 @@ RmRacemanMenu()
NULL, (tfuiCallback)NULL, 1);
void *menuXMLDescHdle = GfuiMenuLoad("racemanmenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, menuXMLDescHdle);
// Create and initialize static title label (race mode name).
const int nRaceModeTitleLabelId =

2
src/modules/userinterface/legacymenu/racescreens/racenexteventmenu.cpp
View file

@ -67,7 +67,7 @@ RmNextEventMenu(void)
NULL, (tfuiCallback)NULL,
1);
void *menuXMLDescHdle = GfuiMenuLoad("racenexteventmenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, rmScrHandle);
GfuiMenuCreateStaticControls(rmScrHandle, menuXMLDescHdle);
// Create background image from race params.
const char* pszBGImg = GfParmGetStr(params, RM_SECT_HEADER, RM_ATTR_BGIMG, 0);

2
src/modules/userinterface/legacymenu/racescreens/raceparamsmenu.cpp
View file

@ -358,7 +358,7 @@ RmRaceParamsMenu(void *vrp)
// Create the screen, load menu XML descriptor and create static controls.
ScrHandle = GfuiScreenCreate((float*)NULL, NULL, NULL, NULL, (tfuiCallback)NULL, 1);
void *menuXMLDescHdle = GfuiMenuLoad("raceparamsmenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle,ScrHandle);
GfuiMenuCreateStaticControls(ScrHandle, menuXMLDescHdle);
// Create the variable title label.
int titleId = GfuiMenuCreateLabelControl(ScrHandle, menuXMLDescHdle, "titlelabel");

2
src/modules/userinterface/legacymenu/racescreens/racepitmenu.cpp
View file

@ -105,7 +105,7 @@ RmPitMenuStart(tCarElt *car, tfuiCallback callback)
void *menuXMLDescHdle = GfuiMenuLoad("pitmenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, menuHandle);
GfuiMenuCreateStaticControls(menuHandle, menuXMLDescHdle);
// Create labels for driver name, remaining laps and remaining fuel.
int driverNameId = GfuiMenuCreateLabelControl(menuHandle, menuXMLDescHdle, "drivernamelabel");

8
src/modules/userinterface/legacymenu/racescreens/raceresultsmenus.cpp
View file

@ -118,7 +118,7 @@ rmPracticeResults(void *prevHdle, tRmInfo *info, int start)
GfLogTrace("Entering Practice Results menu\n");
void *hmenu = GfuiMenuLoad("practiceresultsmenu.xml");
GfuiMenuCreateStaticControls(hmenu, rmScrHdle);
GfuiMenuCreateStaticControls(rmScrHdle, hmenu);
// Create variable title labels.
snprintf(buf, sizeof(buf), "Practice Results on %s", info->track->name);
@ -243,7 +243,7 @@ rmRaceResults(void *prevHdle, tRmInfo *info, int start)
// Create screen, load menu XML descriptor and create static controls.
rmScrHdle = GfuiScreenCreate();
void *hmenu = GfuiMenuLoad("raceresultsmenu.xml");
GfuiMenuCreateStaticControls(hmenu,rmScrHdle);
GfuiMenuCreateStaticControls(rmScrHdle, hmenu);
// Create variable title label.
sprintf(buf, "%s", info->track->name);
@ -406,7 +406,7 @@ rmQualifResults(void *prevHdle, tRmInfo *info, int start)
rmScrHdle = GfuiScreenCreate();
void *hmenu = GfuiMenuLoad("qualifsresultsmenu.xml");
GfuiMenuCreateStaticControls(hmenu,rmScrHdle);
GfuiMenuCreateStaticControls(rmScrHdle, hmenu);
sprintf(buf, "%s", info->track->name);
const int subTitleId = GfuiMenuCreateLabelControl(rmScrHdle, hmenu, "racetitle");
@ -524,7 +524,7 @@ RmShowStandings(void *prevHdle, tRmInfo *info, int start)
rmScrHdle = GfuiScreenCreate();
void *hmenu = GfuiMenuLoad("standingsmenu.xml");
GfuiMenuCreateStaticControls(hmenu,rmScrHdle);
GfuiMenuCreateStaticControls(rmScrHdle, hmenu);
//Set title
sprintf(buf, "%s Standings", race);

4
src/modules/userinterface/legacymenu/racescreens/racerunningmenus.cpp
View file

@ -417,7 +417,7 @@ RmScreenInit()
// Create screen, load menu XML descriptor and create static controls.
rmScreenHandle = GfuiScreenCreate(black, 0, rmScreenActivate, 0, 0, 0);
void *menuXMLDescHdle = GfuiMenuLoad("raceglscreen.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, rmScreenHandle);
GfuiMenuCreateStaticControls(rmScreenHandle, menuXMLDescHdle);
// Create Message, BigMessage and Pause labels.
rmMsgId = GfuiMenuCreateLabelControl(rmScreenHandle, menuXMLDescHdle, "message");
@ -562,7 +562,7 @@ RmResScreenInit()
// Create screen, load menu XML descriptor and create static controls.
rmResScreenHdle = GfuiScreenCreate(black, 0, rmResScreenActivate, 0, rmResScreenShutdown, 0);
void *menuXMLDescHdle = GfuiMenuLoad("raceblindscreen.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, rmResScreenHdle);
GfuiMenuCreateStaticControls(rmResScreenHdle, menuXMLDescHdle);
// Create variable main title (race type/stage) label.
rmResMainTitleId = GfuiMenuCreateLabelControl(rmResScreenHdle, menuXMLDescHdle, "title");

2
src/modules/userinterface/legacymenu/racescreens/raceselectmenu.cpp
View file

@ -129,7 +129,7 @@ RmRaceSelectInit(void *prevMenu)
NULL, (tfuiCallback)NULL,
1);
void *hMenuXMLDesc = GfuiMenuLoad("raceselectmenu.xml");
GfuiMenuCreateStaticControls(hMenuXMLDesc, rmRaceSelectHandle);
GfuiMenuCreateStaticControls(rmRaceSelectHandle, hMenuXMLDesc);
// Create the raceman type buttons and sub-type combo-boxes (if any).
const std::vector<std::string>& vecRaceManTypes = GfRaceManagers::self()->getTypes();

2
src/modules/userinterface/legacymenu/racescreens/racestartmenu.cpp
View file

@ -122,7 +122,7 @@ rmDisplayStartRace(tRmInfo *info, void *startScr, void *abortScr, int start)
void *menuXMLDescHdle = GfuiMenuLoad("startracemenu.xml");
GfuiMenuCreateStaticControls(menuXMLDescHdle, rmScrHdle);
GfuiMenuCreateStaticControls(rmScrHdle, menuXMLDescHdle);
// Create variable title label.
int titleId = GfuiMenuCreateLabelControl(rmScrHdle, menuXMLDescHdle, "titlelabel");

2
src/modules/userinterface/legacymenu/racescreens/racestopmenu.cpp
View file

@ -144,7 +144,7 @@ rmStopRaceScreen(const tButtonDesc aButtons[], int nButtons, int nCancelIndex)
void *hmenu = GfuiMenuLoad("stopracemenu.xml");
GfuiMenuCreateStaticControls(hmenu, hscreen);
GfuiMenuCreateStaticControls(hscreen, hmenu);
// Create buttons from menu properties and button template.
const int xpos = (int)GfuiMenuGetNumProperty(hmenu, "xButton", 270);

2
src/modules/userinterface/legacymenu/racescreens/trackselect.cpp
View file

@ -255,7 +255,7 @@ RmTrackSelect(void *vs)
GfuiScreenCreate((float*)NULL, NULL, rmtsActivate, NULL, (tfuiCallback)NULL, 1);
void *hparmMenu = GfuiMenuLoad("trackselectmenu.xml");
GfuiMenuCreateStaticControls(hparmMenu, ScrHandle);
GfuiMenuCreateStaticControls( ScrHandle, hparmMenu);
GfuiMenuCreateButtonControl(ScrHandle, hparmMenu, "trackcatleftarrow",(void*)-1, rmtsTrackCatPrevNext);
GfuiMenuCreateButtonControl(ScrHandle, hparmMenu, "trackcatrightarrow",(void*)1, rmtsTrackCatPrevNext);

2
src/tools/menuview/previewmenu.cpp
View file

@ -103,7 +103,7 @@ LoadMenuScreen()
if (param == NULL)
param = GfParmReadFileLocal(g_strFile.c_str(), GFPARM_RMODE_REREAD);
GfuiMenuCreateStaticControls(param,menuHandle);
GfuiMenuCreateStaticControls(menuHandle, param);
ShowDynamicControls(param);
GfuiAddKey(menuHandle, GFUIK_F5, "reload", NULL, ReloadMenuScreen, NULL);
GfuiAddKey(menuHandle, 'Q', "Quit", 0, onQuit, NULL);