Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Position of scenario settings changed in custom menu

This commit is contained in:
titiger 2015-12-13 03:00:35 +01:00
parent 01673dbb39
commit 4f5ecb13e5
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -332,6 +332,21 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
checkBoxAllowNativeLanguageTechtree.setEditable(false);
checkBoxAllowNativeLanguageTechtree.setEnabled(false);
// Network Scenario
int scenarioX=xoffset+700;
int scenarioY=aPos;
labelScenario.registerGraphicComponent(containerName,"labelScenario");
labelScenario.init(scenarioX, aHeadPos);
labelScenario.setText(lang.getString("Scenario"));
listBoxScenario.registerGraphicComponent(containerName,"listBoxScenario");
listBoxScenario.init(scenarioX+30, scenarioY,190);
listBoxScenario.setEditable(false);
listBoxScenario.setEnabled(false);
checkBoxScenario.registerGraphicComponent(containerName,"checkBoxScenario");
checkBoxScenario.init(scenarioX, scenarioY);
checkBoxScenario.setValue(false);
checkBoxScenario.setEditable(false);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
xoffset=5;
@ -498,16 +513,6 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
int initialTechSelection = setupTechList("",true);
listBoxTechTree.setSelectedItemIndex(initialTechSelection);
int scenarioX=800;
int scenarioY=140;
labelScenario.registerGraphicComponent(containerName,"labelScenario");
labelScenario.init(scenarioX+30, scenarioY);
labelScenario.setText(lang.getString("Scenario"));
listBoxScenario.registerGraphicComponent(containerName,"listBoxScenario");
listBoxScenario.init(scenarioX, scenarioY-30,190);
checkBoxScenario.registerGraphicComponent(containerName,"checkBoxScenario");
checkBoxScenario.init(scenarioX, scenarioY);
checkBoxScenario.setValue(false);
//scenario listbox
vector<string> resultsScenarios;

8
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -376,13 +376,13 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
checkBoxAllowNativeLanguageTechtree.setValue(false);
// Network Scenario
int scenarioX=800;
int scenarioY=140;
int scenarioX=xoffset+700;
int scenarioY=aPos;
labelScenario.registerGraphicComponent(containerName,"labelScenario");
labelScenario.init(scenarioX+30, scenarioY);
labelScenario.init(scenarioX, aHeadPos);
labelScenario.setText(lang.getString("Scenario"));
listBoxScenario.registerGraphicComponent(containerName,"listBoxScenario");
listBoxScenario.init(scenarioX, scenarioY-30,190);
listBoxScenario.init(scenarioX+30, scenarioY,190);
checkBoxScenario.registerGraphicComponent(containerName,"checkBoxScenario");
checkBoxScenario.init(scenarioX, scenarioY);
checkBoxScenario.setValue(false);