From 3728fff67bedb6e2fe8234066c124bc6ca150624 Mon Sep 17 00:00:00 2001 From: filux Date: Fri, 6 Feb 2015 01:26:16 +0100 Subject: [PATCH] battle configuration screen with more synchronized look (host/admin<>client) and more friendly for other than english languages --- .../menu/menu_state_connected_game.cpp | 106 +++++++++--------- .../menu/menu_state_custom_game.cpp | 90 +++++++-------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 1e67ff5f..e03f8ddc 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -198,30 +198,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM labelDataSynchInfo.setFont(CoreData::getInstance().getMenuFontBig()); labelDataSynchInfo.setFont3D(CoreData::getInstance().getMenuFontBig3D()); - // fog - o - war - int xoffset=70; - labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar"); - labelFogOfWar.init(xoffset+100, aHeadPos, 130); - labelFogOfWar.setText(lang.getString("FogOfWar")); - - listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar"); - listBoxFogOfWar.init(xoffset+100, aPos, 150); - listBoxFogOfWar.pushBackItem(lang.getString("Enabled")); - listBoxFogOfWar.pushBackItem(lang.getString("Explored")); - listBoxFogOfWar.pushBackItem(lang.getString("Disabled")); - listBoxFogOfWar.setSelectedItemIndex(0); - listBoxFogOfWar.setEditable(false); - - - labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers"); - labelAllowObservers.init(xoffset+310, aHeadPos, 80); - labelAllowObservers.setText(lang.getString("AllowObservers")); - - checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers"); - checkBoxAllowObservers.init(xoffset+310, aPos); - checkBoxAllowObservers.setValue(false); - checkBoxAllowObservers.setEditable(false); - + int xoffset=90; labelAllowTeamUnitSharing.registerGraphicComponent(containerName,"labelAllowTeamUnitSharing"); labelAllowTeamUnitSharing.init(xoffset+410, 670, 80); labelAllowTeamUnitSharing.setText(lang.getString("AllowTeamUnitSharing")); @@ -244,36 +221,59 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM checkBoxAllowTeamResourceSharing.setVisible(true); checkBoxAllowTeamResourceSharing.setEditable(false); + // fog - o - war + xoffset=62; + labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar"); + labelFogOfWar.init(xoffset+100, aHeadPos, 165); + labelFogOfWar.setText(lang.getString("FogOfWar")); + + listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar"); + listBoxFogOfWar.init(xoffset+100, aPos, 165); + listBoxFogOfWar.pushBackItem(lang.getString("Enabled")); + listBoxFogOfWar.pushBackItem(lang.getString("Explored")); + listBoxFogOfWar.pushBackItem(lang.getString("Disabled")); + listBoxFogOfWar.setSelectedItemIndex(0); + listBoxFogOfWar.setEditable(false); + + labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers"); + labelAllowObservers.init(xoffset+325, aHeadPos, 80); + labelAllowObservers.setText(lang.getString("AllowObservers")); + + checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers"); + checkBoxAllowObservers.init(xoffset+325, aPos); + checkBoxAllowObservers.setValue(false); + checkBoxAllowObservers.setEditable(false); + for(int i=0; i<45; ++i){ rMultiplier.push_back(floatToStr(0.5f+0.1f*i,1)); } labelFallbackCpuMultiplier.registerGraphicComponent(containerName,"labelFallbackCpuMultiplier"); - labelFallbackCpuMultiplier.init(xoffset+460, aHeadPos, 80); + labelFallbackCpuMultiplier.init(xoffset+500, aHeadPos, 80); labelFallbackCpuMultiplier.setText(lang.getString("FallbackCpuMultiplier")); listBoxFallbackCpuMultiplier.registerGraphicComponent(containerName,"listBoxFallbackCpuMultiplier"); - listBoxFallbackCpuMultiplier.init(xoffset+460, aPos, 80); + listBoxFallbackCpuMultiplier.init(xoffset+500, aPos, 80); listBoxFallbackCpuMultiplier.setItems(rMultiplier); listBoxFallbackCpuMultiplier.setSelectedItem("1.0"); // Allow Switch Team Mode labelEnableSwitchTeamMode.registerGraphicComponent(containerName,"labelEnableSwitchTeamMode"); - labelEnableSwitchTeamMode.init(xoffset+310, aHeadPos+45, 80); + labelEnableSwitchTeamMode.init(xoffset+325, aHeadPos+45, 80); labelEnableSwitchTeamMode.setText(lang.getString("EnableSwitchTeamMode")); checkBoxEnableSwitchTeamMode.registerGraphicComponent(containerName,"checkBoxEnableSwitchTeamMode"); - checkBoxEnableSwitchTeamMode.init(xoffset+310, aPos+45); + checkBoxEnableSwitchTeamMode.init(xoffset+325, aPos+45); checkBoxEnableSwitchTeamMode.setValue(false); checkBoxEnableSwitchTeamMode.setEditable(false); labelAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"labelAISwitchTeamAcceptPercent"); - labelAISwitchTeamAcceptPercent.init(xoffset+460, aHeadPos+45, 80); + labelAISwitchTeamAcceptPercent.init(xoffset+500, aHeadPos+45, 80); labelAISwitchTeamAcceptPercent.setText(lang.getString("AISwitchTeamAcceptPercent")); listBoxAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"listBoxAISwitchTeamAcceptPercent"); - listBoxAISwitchTeamAcceptPercent.init(xoffset+460, aPos+45, 80); + listBoxAISwitchTeamAcceptPercent.init(xoffset+500, aPos+45, 80); for(int i = 0; i <= 100; i = i + 10) { listBoxAISwitchTeamAcceptPercent.pushBackItem(intToStr(i)); } @@ -286,12 +286,12 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM buttonCancelDownloads.setText(lang.getString("CancelDownloads")); // Network Frame Period - xoffset=70; + xoffset=62; //map listBox // put them all in a set, to weed out duplicates (gbm & mgm with same name) // will also ensure they are alphabetically listed (rather than how the OS provides them) listBoxMap.registerGraphicComponent(containerName,"listBoxMap"); - listBoxMap.init(xoffset+100, mapPos, 200); + listBoxMap.init(xoffset+100, mapPos, 220); listBoxMap.setEditable(false); labelMapInfo.registerGraphicComponent(containerName,"labelMapInfo"); @@ -304,11 +304,11 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM //tileset listBox listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset"); - listBoxTileset.init(xoffset+460, mapPos, 150); + listBoxTileset.init(xoffset+500, mapPos, 160); listBoxTileset.setEditable(false); labelTileset.registerGraphicComponent(containerName,"labelTileset"); - labelTileset.init(xoffset+460, mapHeadPos); + labelTileset.init(xoffset+500, mapHeadPos); labelTileset.setText(lang.getString("Tileset")); @@ -316,63 +316,63 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM listBoxTechTree.setEditable(false); listBoxTechTree.registerGraphicComponent(containerName,"listBoxTechTree"); - listBoxTechTree.init(xoffset+620, mapPos, 150); + listBoxTechTree.init(xoffset+700, mapPos, 180); labelTechTree.registerGraphicComponent(containerName,"labelTechTree"); - labelTechTree.init(xoffset+620, mapHeadPos); + labelTechTree.init(xoffset+700, mapHeadPos); labelTechTree.setText(lang.getString("TechTree")); labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree"); - labelAllowNativeLanguageTechtree.init(xoffset+620, mapHeadPos-45); + labelAllowNativeLanguageTechtree.init(xoffset+700, aHeadPos+45); labelAllowNativeLanguageTechtree.setText(lang.getString("AllowNativeLanguageTechtree")); checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree"); - checkBoxAllowNativeLanguageTechtree.init(xoffset+620, mapHeadPos-65); + checkBoxAllowNativeLanguageTechtree.init(xoffset+700, aPos+45); 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=30; + xoffset=5; int rowHeight=27; for(int i=0; i"); } @@ -456,11 +456,11 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM setupMapList(""); listBoxMap.setItems(formattedPlayerSortedMaps[0]); - int buttonx=170; + int buttonx=162; int buttony=180; listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); - listBoxPlayerStatus.init(buttonx, buttony, 150); + listBoxPlayerStatus.init(buttonx, buttony, 165); listBoxPlayerStatus.setTextColor(Vec3f(1.0f,0.f,0.f)); listBoxPlayerStatus.setLighted(true); playerStatuses.push_back(lang.getString("PlayerStatusSetup")); @@ -474,9 +474,9 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM buttonx+=130; buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings"); - buttonRestoreLastSettings.init(buttonx, buttony, 220); + buttonRestoreLastSettings.init(buttonx, buttony, 240); buttonRestoreLastSettings.setText(lang.getString("ReloadLastGameSettings")); - buttonx+=225; + buttonx+=245; buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); buttonPlayNow.init(buttonx, buttony, 125); @@ -498,7 +498,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM int initialTechSelection = setupTechList("",true); listBoxTechTree.setSelectedItemIndex(initialTechSelection); - int scenarioX=810; + int scenarioX=800; int scenarioY=140; labelScenario.registerGraphicComponent(containerName,"labelScenario"); labelScenario.init(scenarioX, scenarioY); diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index 3cad6200..b2398a5e 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -194,12 +194,12 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, int xoffset=10; //create - int buttonx=170; + int buttonx=162; int buttony=180; // player status listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); - listBoxPlayerStatus.init(buttonx, buttony, 150); + listBoxPlayerStatus.init(buttonx, buttony, 165); vector playerStatuses; playerStatuses.push_back(lang.getString("PlayerStatusSetup")); playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack")); @@ -216,8 +216,8 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, buttonx+=130; buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings"); - buttonRestoreLastSettings.init(buttonx, buttony, 220); - buttonx+=225; + buttonRestoreLastSettings.init(buttonx, buttony, 240); + buttonx+=245; buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); buttonPlayNow.init(buttonx, buttony, 125); @@ -252,14 +252,14 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, labelLocalGameVersion.setText(glestVersionString + " [" + getCompileDateTime() + ", " + getGITRevisionString() + "]"); } - xoffset=70; + xoffset=62; // MapFilter labelMapFilter.registerGraphicComponent(containerName,"labelMapFilter"); - labelMapFilter.init(xoffset+310, mapHeadPos); - labelMapFilter.setText(lang.getString("MapFilter")+":"); + labelMapFilter.init(xoffset+325, mapHeadPos); + labelMapFilter.setText(lang.getString("MapFilter")); listBoxMapFilter.registerGraphicComponent(containerName,"listBoxMapFilter"); - listBoxMapFilter.init(xoffset+310, mapPos, 80); + listBoxMapFilter.init(xoffset+325, mapPos, 80); listBoxMapFilter.pushBackItem("-"); for(int i=1; i 0) { listBoxTechTree.setSelectedItemIndex(initialTechSelection); } labelTechTree.registerGraphicComponent(containerName,"labelTechTree"); - labelTechTree.init(xoffset+650, mapHeadPos); + labelTechTree.init(xoffset+700, mapHeadPos); labelTechTree.setText(lang.getString("TechTree")); // fog - o - war // @350 ? 300 ? labelFogOfWar.registerGraphicComponent(containerName,"labelFogOfWar"); - labelFogOfWar.init(xoffset+100, aHeadPos, 130); + labelFogOfWar.init(xoffset+100, aHeadPos, 165); labelFogOfWar.setText(lang.getString("FogOfWar")); listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar"); - listBoxFogOfWar.init(xoffset+100, aPos, 130); + listBoxFogOfWar.init(xoffset+100, aPos, 165); listBoxFogOfWar.pushBackItem(lang.getString("Enabled")); listBoxFogOfWar.pushBackItem(lang.getString("Explored")); listBoxFogOfWar.pushBackItem(lang.getString("Disabled")); @@ -325,11 +325,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, // Allow Observers labelAllowObservers.registerGraphicComponent(containerName,"labelAllowObservers"); - labelAllowObservers.init(xoffset+310, aHeadPos, 80); + labelAllowObservers.init(xoffset+325, aHeadPos, 80); labelAllowObservers.setText(lang.getString("AllowObservers")); checkBoxAllowObservers.registerGraphicComponent(containerName,"checkBoxAllowObservers"); - checkBoxAllowObservers.init(xoffset+310, aPos); + checkBoxAllowObservers.init(xoffset+325, aPos); checkBoxAllowObservers.setValue(false); vector rMultiplier; @@ -338,44 +338,44 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, } labelFallbackCpuMultiplier.registerGraphicComponent(containerName,"labelFallbackCpuMultiplier"); - labelFallbackCpuMultiplier.init(xoffset+460, aHeadPos, 80); + labelFallbackCpuMultiplier.init(xoffset+500, aHeadPos, 80); labelFallbackCpuMultiplier.setText(lang.getString("FallbackCpuMultiplier")); listBoxFallbackCpuMultiplier.registerGraphicComponent(containerName,"listBoxFallbackCpuMultiplier"); - listBoxFallbackCpuMultiplier.init(xoffset+460, aPos, 80); + listBoxFallbackCpuMultiplier.init(xoffset+500, aPos, 80); listBoxFallbackCpuMultiplier.setItems(rMultiplier); listBoxFallbackCpuMultiplier.setSelectedItem("1.0"); // Allow Switch Team Mode labelEnableSwitchTeamMode.registerGraphicComponent(containerName,"labelEnableSwitchTeamMode"); - labelEnableSwitchTeamMode.init(xoffset+310, aHeadPos+45, 80); + labelEnableSwitchTeamMode.init(xoffset+325, aHeadPos+45, 80); labelEnableSwitchTeamMode.setText(lang.getString("EnableSwitchTeamMode")); checkBoxEnableSwitchTeamMode.registerGraphicComponent(containerName,"checkBoxEnableSwitchTeamMode"); - checkBoxEnableSwitchTeamMode.init(xoffset+310, aPos+45); + checkBoxEnableSwitchTeamMode.init(xoffset+325, aPos+45); checkBoxEnableSwitchTeamMode.setValue(false); labelAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"labelAISwitchTeamAcceptPercent"); - labelAISwitchTeamAcceptPercent.init(xoffset+460, aHeadPos+45, 80); + labelAISwitchTeamAcceptPercent.init(xoffset+500, aHeadPos+45, 80); labelAISwitchTeamAcceptPercent.setText(lang.getString("AISwitchTeamAcceptPercent")); listBoxAISwitchTeamAcceptPercent.registerGraphicComponent(containerName,"listBoxAISwitchTeamAcceptPercent"); - listBoxAISwitchTeamAcceptPercent.init(xoffset+460, aPos+45, 80); + listBoxAISwitchTeamAcceptPercent.init(xoffset+500, aPos+45, 80); for(int i = 0; i <= 100; i = i + 10) { listBoxAISwitchTeamAcceptPercent.pushBackItem(intToStr(i)); } listBoxAISwitchTeamAcceptPercent.setSelectedItem(intToStr(30)); labelAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"labelAllowNativeLanguageTechtree"); - labelAllowNativeLanguageTechtree.init(xoffset+650, mapHeadPos-50); + labelAllowNativeLanguageTechtree.init(xoffset+700, aHeadPos+45); labelAllowNativeLanguageTechtree.setText(lang.getString("AllowNativeLanguageTechtree")); checkBoxAllowNativeLanguageTechtree.registerGraphicComponent(containerName,"checkBoxAllowNativeLanguageTechtree"); - checkBoxAllowNativeLanguageTechtree.init(xoffset+650, mapHeadPos-70); + checkBoxAllowNativeLanguageTechtree.init(xoffset+700, aPos+45); checkBoxAllowNativeLanguageTechtree.setValue(false); // Network Scenario - int scenarioX=810; + int scenarioX=800; int scenarioY=140; labelScenario.registerGraphicComponent(containerName,"labelScenario"); labelScenario.init(scenarioX, scenarioY); @@ -431,11 +431,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, } // Advanced Options labelAdvanced.registerGraphicComponent(containerName,"labelAdvanced"); - labelAdvanced.init(810, 80, 80); + labelAdvanced.init(scenarioX, 80, 80); labelAdvanced.setText(lang.getString("AdvancedGameOptions")); checkBoxAdvanced.registerGraphicComponent(containerName,"checkBoxAdvanced"); - checkBoxAdvanced.init(810, 80-labelOffset); + checkBoxAdvanced.init(scenarioX, 80-labelOffset); checkBoxAdvanced.setValue(false); // network things @@ -443,11 +443,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, xoffset=90; labelPublishServer.registerGraphicComponent(containerName,"labelPublishServer"); - labelPublishServer.init(50, networkHeadPos, 100); + labelPublishServer.init(20, networkHeadPos, 100); labelPublishServer.setText(lang.getString("PublishServer")); checkBoxPublishServer.registerGraphicComponent(containerName,"checkBoxPublishServer"); - checkBoxPublishServer.init(50, networkPos); + checkBoxPublishServer.init(20, networkPos); checkBoxPublishServer.setValue(false); if((this->headlessServerMode == true || @@ -457,7 +457,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, } labelGameName.registerGraphicComponent(containerName,"labelGameName"); - labelGameName.init(50+checkBoxPublishServer.getW()+2, networkPos,200); + labelGameName.init(20+checkBoxPublishServer.getW()+5, networkPos,200); labelGameName.setFont(CoreData::getInstance().getMenuFontBig()); labelGameName.setFont3D(CoreData::getInstance().getMenuFontBig3D()); if(this->headlessServerMode == false) { @@ -514,49 +514,49 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, checkBoxNetworkPauseGameForLaggedClients.setValue(true); //list boxes - xoffset=30; + xoffset=5; int rowHeight=27; for(int i=0; i