mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 07:31:21 +02:00
Code Issues Projects Releases Wiki Activity

cleanup of option menu layout ( But "advanced translation" is not in final place )

Browse Source
This commit is contained in:
Titus Tscharntke
2012-11-01 00:39:31 +00:00
parent b5dc847b66
commit 37b09daa77
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/glest_game/menu/menu_state_options.cpp
View File

@@ -46,13 +46,13 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
int leftColumnStart=leftLabelStart+180; int leftColumnStart=leftLabelStart+180;
int rightLabelStart=450; int rightLabelStart=450;
int rightColumnStart=rightLabelStart+280; int rightColumnStart=rightLabelStart+280;
int buttonRowPos=80; int buttonRowPos=50;
int buttonStartPos=170; int buttonStartPos=170;
int captionOffset=75; int captionOffset=75;
int currentLabelStart=leftLabelStart; int currentLabelStart=leftLabelStart;
int currentColumnStart=leftColumnStart; int currentColumnStart=leftColumnStart;
int currentLine=700; int currentLine=700;
int lineOffset=26; int lineOffset=27;
mainMessageBox.registerGraphicComponent(containerName,"mainMessageBox"); mainMessageBox.registerGraphicComponent(containerName,"mainMessageBox");
mainMessageBox.init(lang.get("Ok")); mainMessageBox.init(lang.get("Ok"));
@@ -65,6 +65,7 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
labelAudioSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D()); labelAudioSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelAudioSection.setText(lang.get("Audio")); labelAudioSection.setText(lang.get("Audio"));
currentLine-=lineOffset; currentLine-=lineOffset;
currentLine-=lineOffset/2;
//soundboxes //soundboxes
labelSoundFactory.registerGraphicComponent(containerName,"labelSoundFactory"); labelSoundFactory.registerGraphicComponent(containerName,"labelSoundFactory");
@@ -116,13 +117,14 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
listBoxVolumeAmbient.setSelectedItem(intToStr(config.getInt("SoundVolumeAmbient")/5*5)); listBoxVolumeAmbient.setSelectedItem(intToStr(config.getInt("SoundVolumeAmbient")/5*5));
listBoxVolumeMusic.setSelectedItem(intToStr(config.getInt("SoundVolumeMusic")/5*5)); listBoxVolumeMusic.setSelectedItem(intToStr(config.getInt("SoundVolumeMusic")/5*5));
currentLine-=lineOffset; currentLine-=lineOffset/2;
// Video Section // Video Section
labelVideoSection.registerGraphicComponent(containerName,"labelVideoSection"); labelVideoSection.registerGraphicComponent(containerName,"labelVideoSection");
labelVideoSection.init(currentLabelStart+captionOffset, currentLine); labelVideoSection.init(currentLabelStart+captionOffset, currentLine);
labelVideoSection.setFont(CoreData::getInstance().getMenuFontVeryBig()); labelVideoSection.setFont(CoreData::getInstance().getMenuFontVeryBig());
labelVideoSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D()); labelVideoSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelVideoSection.setText(lang.get("Video")); labelVideoSection.setText(lang.get("Video"));
currentLine-=lineOffset/2;
currentLine-=lineOffset; currentLine-=lineOffset;
//resolution //resolution
@@ -322,6 +324,7 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
labelMiscSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D()); labelMiscSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelMiscSection.setText(lang.get("Misc")); labelMiscSection.setText(lang.get("Misc"));
currentLine-=lineOffset; currentLine-=lineOffset;
currentLine-=lineOffset/2;
//lang //lang
labelLang.registerGraphicComponent(containerName,"labelLang"); labelLang.registerGraphicComponent(containerName,"labelLang");
@@ -469,13 +472,13 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
currentLine-=lineOffset; currentLine-=lineOffset;
currentLine-=lineOffset/2;
labelNetworkSettings.registerGraphicComponent(containerName,"labelNetworkSettingsSection"); labelNetworkSettings.registerGraphicComponent(containerName,"labelNetworkSettingsSection");
labelNetworkSettings.init(currentLabelStart+captionOffset, currentLine); labelNetworkSettings.init(currentLabelStart+captionOffset, currentLine);
labelNetworkSettings.setFont(CoreData::getInstance().getMenuFontVeryBig()); labelNetworkSettings.setFont(CoreData::getInstance().getMenuFontVeryBig());
labelNetworkSettings.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D()); labelNetworkSettings.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelNetworkSettings.setText(lang.get("Network")); labelNetworkSettings.setText(lang.get("Network"));
currentLine-=lineOffset/2;
// external server port // external server port
currentLine-=lineOffset; currentLine-=lineOffset;
labelPublishServerExternalPort.registerGraphicComponent(containerName,"labelPublishServerExternalPort"); labelPublishServerExternalPort.registerGraphicComponent(containerName,"labelPublishServerExternalPort");