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

masterserver screen more friendly for other than english languages

This commit is contained in:
filux 2015-02-06 01:12:21 +01:00
parent 1db511c345
commit f6e1383f56
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/glest_game/menu/menu_state_masterserver.cpp
View File

@ -117,7 +117,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
// header
labelTitle.registerGraphicComponent(containerName,"labelTitle");
labelTitle.init(330, serverLinesYBase+40);
labelTitle.init(410, serverLinesYBase+45);
labelTitle.setFont(CoreData::getInstance().getMenuFontBig());
labelTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D());
labelTitle.setText(lang.getString("AvailableServers"));
@ -132,7 +132,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
// Titles for current games - START
int lineIndex = 0;
int lineOffset=25*lineIndex;
int i=7;
int i=5;
int startOffset=serverLinesYBase+23;
//general info:
@ -141,9 +141,9 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
glestVersionLabel.init(i,startOffset-lineOffset);
glestVersionLabel.setText(lang.getString("MGVersion"));
i+=70;
i+=80;
platformLabel.registerGraphicComponent(containerName,"platformLabel");
platformLabel.init(i,startOffset-lineOffset);
platformLabel.init(i+15,startOffset-lineOffset);
platformLabel.setText(lang.getString("MGPlatform"));
// i+=50;
@ -152,17 +152,17 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
// binaryCompileDateLabel.setText(lang.getString("MGBuildDateTime"));
//game info:
i+=130;
i+=120;
serverTitleLabel.registerGraphicComponent(containerName,"serverTitleLabel");
serverTitleLabel.init(i,startOffset-lineOffset);
serverTitleLabel.setText(lang.getString("MGGameTitle"));
i+=150;
i+=170;
countryLabel.registerGraphicComponent(containerName,"countryLabel");
countryLabel.init(i,startOffset-lineOffset);
countryLabel.init(i-10,startOffset-lineOffset);
countryLabel.setText(lang.getString("MGGameCountry"));
i+=65;
i+=60;
// ipAddressLabel.registerGraphicComponent(containerName,"ipAddressLabel");
// ipAddressLabel.init(i,startOffset-lineOffset);
@ -174,12 +174,12 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
techLabel.init(i,startOffset-lineOffset);
techLabel.setText(lang.getString("TechTree"));
i+=120;
i+=165;
mapLabel.registerGraphicComponent(containerName,"mapLabel");
mapLabel.init(i,startOffset-lineOffset);
mapLabel.setText(lang.getString("Map"));
i+=120;
i+=95;
// tilesetLabel.registerGraphicComponent(containerName,"tilesetLabel");
// tilesetLabel.init(i,startOffset-lineOffset);
// tilesetLabel.setText(lang.getString("Tileset"));
@ -190,18 +190,18 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
activeSlotsLabel.setText(lang.getString("MGGameSlots"));
i+=50;
externalConnectPort.registerGraphicComponent(containerName,"externalConnectPort");
externalConnectPort.init(i,startOffset-lineOffset);
externalConnectPort.setText(lang.getString("Port"));
//externalConnectPort.registerGraphicComponent(containerName,"externalConnectPort");
//externalConnectPort.init(i,startOffset-lineOffset);
//externalConnectPort.setText(lang.getString("Port"));
i+=60;
i+=30;
statusLabel.registerGraphicComponent(containerName,"statusLabel");
statusLabel.init(i,startOffset-lineOffset);
statusLabel.init(i+5,startOffset-lineOffset);
statusLabel.setText(lang.getString("MGGameStatus"));
i+=130;
selectButton.registerGraphicComponent(containerName,"selectButton");
selectButton.init(i, startOffset-lineOffset);
selectButton.init(i-5, startOffset-lineOffset);
selectButton.setText(lang.getString("MGJoinGameSlots"));
// Titles for current games - END
@ -210,10 +210,10 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
buttonReturn.init(50, buttonPos, 150);
buttonCreateGame.registerGraphicComponent(containerName,"buttonCreateGame");
buttonCreateGame.init(300, buttonPos, 150);
buttonCreateGame.init(275, buttonPos, 150);
buttonRefresh.registerGraphicComponent(containerName,"buttonRefresh");
buttonRefresh.init(550, buttonPos, 150);
buttonRefresh.init(500, buttonPos, 150);
buttonRefresh.setText(lang.getString("RefreshList"));
buttonReturn.setText(lang.getString("Return"));
@ -221,15 +221,15 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
labelAutoRefresh.setText(lang.getString("AutoRefreshRate"));
labelAutoRefresh.registerGraphicComponent(containerName,"labelAutoRefresh");
labelAutoRefresh.init(800,buttonPos+30);
labelAutoRefresh.init(750,buttonPos+30);
listBoxAutoRefresh.registerGraphicComponent(containerName,"listBoxAutoRefresh");
listBoxAutoRefresh.init(800,buttonPos);
listBoxAutoRefresh.init(750,buttonPos);
listBoxAutoRefresh.pushBackItem(lang.getString("Off"));
listBoxAutoRefresh.pushBackItem("10 s");
listBoxAutoRefresh.pushBackItem("20 s");
listBoxAutoRefresh.pushBackItem("30 s");
listBoxAutoRefresh.setSelectedItemIndex(1);
listBoxAutoRefresh.setSelectedItemIndex(2);
autoRefreshTime=10*listBoxAutoRefresh.getSelectedItemIndex();
ircOnlinePeopleLabel.registerGraphicComponent(containerName,"ircOnlinePeopleLabel");
@ -383,7 +383,7 @@ void MenuStateMasterserver::reloadUI() {
activeSlotsLabel.setText(lang.getString("MGGameSlots"));
externalConnectPort.setText(lang.getString("Port"));
//externalConnectPort.setText(lang.getString("Port"));
statusLabel.setText(lang.getString("MGGameStatus"));
@ -732,7 +732,7 @@ void MenuStateMasterserver::render(){
renderer.renderLabel(&mapLabel,&titleLabelColor);
//renderer.renderLabel(&tilesetLabel,&titleLabelColor);
renderer.renderLabel(&activeSlotsLabel,&titleLabelColor);
renderer.renderLabel(&externalConnectPort,&titleLabelColor);
//renderer.renderLabel(&externalConnectPort,&titleLabelColor);
renderer.renderLabel(&selectButton,&titleLabelColor);
Lang &lang= Lang::getInstance();

38
source/glest_game/menu/server_line.cpp
View File

@ -37,7 +37,7 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
this->lineHeight= lineHeight;
int lineOffset= lineHeight * lineIndex;
masterServerInfo= *mServerInfo;
int i= 7;
int i= 5;
this->baseY= baseY;
Vec3f color=Vec3f(1.0f,1.0f,1.0f);
@ -50,13 +50,13 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
//i+= 10;
glestVersionLabel.init(i, baseY - lineOffset);
glestVersionLabel.setRenderBackground(true);
glestVersionLabel.setMaxEditRenderWidth(960); // use background for whole line
glestVersionLabel.setMaxEditRenderWidth(970); // use background for whole line
glestVersionLabel.setTextColor(color);
glestVersionLabel.setText(masterServerInfo.getGlestVersion());
glestVersionLabel.setText(" " + masterServerInfo.getGlestVersion());
glestVersionLabel.setFont(CoreData::getInstance().getDisplayFontSmall());
glestVersionLabel.setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
i+= 70;
i+= 80;
string platform=masterServerInfo.getPlatform();
size_t revOffset = platform.find("-Rev");
if(revOffset != platform.npos) {
@ -76,12 +76,12 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
// binaryCompileDateLabel.setText(masterServerInfo.getBinaryCompileDate());
//game info:
i+= 130;
i+= 120;
serverTitleLabel.init(i, baseY - lineOffset);
serverTitleLabel.setTextColor(color);
serverTitleLabel.setText(masterServerInfo.getServerTitle());
i+= 150;
i+= 170;
country.init(i, baseY - lineOffset);
country.setTextColor(color);
country.setText(masterServerInfo.getCountry());
@ -112,7 +112,7 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
renderer.initTexture(rsGlobal, countryTexture);
}
i+= 65;
i+= 60;
// ipAddressLabel.init(i,baseY-lineOffset);
// ipAddressLabel.setText(masterServerInfo.getIpAddress());
// i+=100;
@ -126,11 +126,11 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
techLabel.setTextColor(color);
techLabel.setText(masterServerInfo.getTech());
i+= 120;
i+= 130;
mapLabel.init(i, baseY - lineOffset);
mapLabel.setTextColor(color);
mapLabel.setText(masterServerInfo.getMap());
i+= 120;
i+= 130;
// tilesetLabel.init(i,baseY-lineOffset);
// tilesetLabel.setText(masterServerInfo.getTileset());
@ -142,17 +142,17 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
masterServerInfo.getNetworkSlots()) + "/" + intToStr(masterServerInfo.getConnectedClients()));
i+= 50;
externalConnectPort.init(i, baseY - lineOffset);
externalConnectPort.setTextColor(color);
externalConnectPort.setText(intToStr(masterServerInfo.getExternalConnectPort()));
//externalConnectPort.init(i, baseY - lineOffset);
//externalConnectPort.setTextColor(color);
//externalConnectPort.setText(intToStr(masterServerInfo.getExternalConnectPort()));
i+= 60;
status.init(i, baseY - lineOffset);
i+= 30;
status.init(i-10, baseY - lineOffset);
status.setTextColor(color);
status.setText(lang.getString("MGGameStatus" + intToStr(masterServerInfo.getStatus())));
i+= 130;
selectButton.init(i, baseY - lineOffset, 30);
selectButton.init(i+25, baseY - lineOffset, 35, lineHeight - 5);
selectButton.setText(">");
selectButton.setAlwaysLighted(true);
@ -188,7 +188,7 @@ void ServerLine::reloadUI() {
activeSlotsLabel.setText(intToStr(masterServerInfo.getActiveSlots()) + "/" + intToStr(
masterServerInfo.getNetworkSlots()) + "/" + intToStr(masterServerInfo.getConnectedClients()));
externalConnectPort.setText(intToStr(masterServerInfo.getExternalConnectPort()));
//externalConnectPort.setText(intToStr(masterServerInfo.getExternalConnectPort()));
status.setText(lang.getString("MGGameStatus" + intToStr(masterServerInfo.getStatus())));
@ -230,7 +230,7 @@ void ServerLine::render(){
//game info:
renderer.renderLabel(&serverTitleLabel);
if(countryTexture != NULL){
renderer.renderTextureQuad(country.getX() + 20, country.getY(), countryTexture->getTextureWidth(),
renderer.renderTextureQuad(country.getX()+1, country.getY()+4, countryTexture->getTextureWidth(),
countryTexture->getTextureHeight(), countryTexture, 0.7f);
}
else{
@ -244,7 +244,7 @@ void ServerLine::render(){
renderer.renderLabel(&mapLabel);
//renderer.renderLabel(&tilesetLabel);
renderer.renderLabel(&activeSlotsLabel);
renderer.renderLabel(&externalConnectPort);
//renderer.renderLabel(&externalConnectPort);
renderer.renderLabel(&status);
}
}
@ -287,7 +287,7 @@ void ServerLine::setY(int y){
//tilesetLabel.setY(y);
activeSlotsLabel.setY(y);
externalConnectPort.setY(y);
//externalConnectPort.setY(y);
}