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

client can now see if techtree translated setting shows

This commit is contained in:
Mark Vejvoda 2013-06-19 01:03:51 +00:00
parent aceb9aec0a
commit 06c3186466
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,6 +286,16 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
labelTechTree.init(xoffset+620, mapHeadPos);
labelTechTree.setText(lang.get("TechTree"));
labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree");
labelAllowNativeLanguageTechtree.init(xoffset+620, mapHeadPos-45);
labelAllowNativeLanguageTechtree.setText(lang.get("AllowNativeLanguageTechtree"));
checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree");
checkBoxAllowNativeLanguageTechtree.init(xoffset+620, mapHeadPos-65);
checkBoxAllowNativeLanguageTechtree.setValue(false);
checkBoxAllowNativeLanguageTechtree.setEditable(false);
checkBoxAllowNativeLanguageTechtree.setEnabled(false);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);
xoffset=100;
@ -677,6 +687,8 @@ void MenuStateConnectedGame::reloadUI() {
labelScenario.setText(lang.get("Scenario"));
labelAllowNativeLanguageTechtree.setText(lang.get("AllowNativeLanguageTechtree"));
buttonPlayNow.setText(lang.get("PlayNow"));
buttonRestoreLastSettings.setText(lang.get("ReloadLastGameSettings"));
@ -2281,6 +2293,8 @@ void MenuStateConnectedGame::mouseMove(int x, int y, const MouseState *ms) {
checkBoxScenario.mouseMove(x, y);
listBoxScenario.mouseMove(x, y);
checkBoxAllowNativeLanguageTechtree.mouseMove(x, y);
buttonPlayNow.mouseMove(x, y);
buttonRestoreLastSettings.mouseMove(x, y);
}
@ -2524,6 +2538,9 @@ void MenuStateConnectedGame::render() {
renderer.renderListBox(&listBoxScenario);
}
renderer.renderLabel(&labelAllowNativeLanguageTechtree);
renderer.renderCheckBox(&checkBoxAllowNativeLanguageTechtree);
MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__));
// !!! START TEMP MV
@ -4590,6 +4607,8 @@ void MenuStateConnectedGame::setupUIFromGameSettings(GameSettings *gameSettings,
}
}
}
checkBoxAllowNativeLanguageTechtree.setValue(gameSettings->getNetworkAllowNativeLanguageTechtree());
}
void MenuStateConnectedGame::initFactionPreview(const GameSettings *gameSettings) {

4
source/glest_game/menu/menu_state_connected_game.h
View File

@ -92,9 +92,11 @@ private:
int nonAdminPlayerStatusX;
GraphicLabel labelAllowObservers;
//GraphicListBox listBoxAllowObservers;
GraphicCheckBox checkBoxAllowObservers;
GraphicLabel labelAllowNativeLanguageTechtree;
GraphicCheckBox checkBoxAllowNativeLanguageTechtree;
GraphicLabel *activeInputLabel;
time_t timerLabelFlash;