From b407e0090df28acf026659bd43aec7e47368575e Mon Sep 17 00:00:00 2001 From: titiger Date: Mon, 15 Dec 2014 21:39:11 +0100 Subject: [PATCH] same button layout for custom game menu and connected game menu --- data/glest_game | 2 +- .../menu/menu_state_connected_game.cpp | 49 +++++++++---------- .../menu/menu_state_connected_game.h | 1 - .../menu/menu_state_custom_game.cpp | 37 ++++++++------ 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/data/glest_game b/data/glest_game index 19119ebb9..b1c0f0cc1 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 19119ebb9c7c91d364c8d413194e476aa815000b +Subproject commit b1c0f0cc18cdd2311b581b44e7ae161317438c93 diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 4629661b3..9ae5e5dcc 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -205,7 +205,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM labelFogOfWar.setText(lang.getString("FogOfWar")); listBoxFogOfWar.registerGraphicComponent(containerName,"listBoxFogOfWar"); - listBoxFogOfWar.init(xoffset+100, aPos, 130); + listBoxFogOfWar.init(xoffset+100, aPos, 150); listBoxFogOfWar.pushBackItem(lang.getString("Enabled")); listBoxFogOfWar.pushBackItem(lang.getString("Explored")); listBoxFogOfWar.pushBackItem(lang.getString("Disabled")); @@ -285,16 +285,6 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM buttonCancelDownloads.init(xoffset+620, 180, 150); buttonCancelDownloads.setText(lang.getString("CancelDownloads")); - listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); - nonAdminPlayerStatusX = xoffset+460; - listBoxPlayerStatus.init(nonAdminPlayerStatusX, 180, 150); - listBoxPlayerStatus.setTextColor(Vec3f(1.0f,0.f,0.f)); - listBoxPlayerStatus.setLighted(true); - playerStatuses.push_back(lang.getString("PlayerStatusSetup")); - playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack")); - playerStatuses.push_back(lang.getString("PlayerStatusReady")); - listBoxPlayerStatus.setItems(playerStatuses); - // Network Frame Period xoffset=70; //map listBox @@ -466,17 +456,34 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM setupMapList(""); listBoxMap.setItems(formattedPlayerSortedMaps[0]); - buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); - buttonPlayNow.init(220, 180, 125); - buttonPlayNow.setText(lang.getString("PlayNow")); - buttonPlayNow.setVisible(false); + int buttonx=170; + int buttony=180; + + listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); + listBoxPlayerStatus.init(buttonx, buttony, 150); + listBoxPlayerStatus.setTextColor(Vec3f(1.0f,0.f,0.f)); + listBoxPlayerStatus.setLighted(true); + playerStatuses.push_back(lang.getString("PlayerStatusSetup")); + playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack")); + playerStatuses.push_back(lang.getString("PlayerStatusReady")); + listBoxPlayerStatus.setItems(playerStatuses); + buttonx+=180; buttonDisconnect.registerGraphicComponent(containerName,"buttonDisconnect"); - buttonDisconnect.init(350, 180, 125); + buttonDisconnect.init(buttonx, buttony, 125); + buttonx+=130; buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings"); - buttonRestoreLastSettings.init(480, 180, 220); + buttonRestoreLastSettings.init(buttonx, buttony, 220); buttonRestoreLastSettings.setText(lang.getString("ReloadLastGameSettings")); + buttonx+=225; + + buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); + buttonPlayNow.init(buttonx, buttony, 125); + buttonPlayNow.setText(lang.getString("PlayNow")); + buttonPlayNow.setVisible(false); + buttonx+=130; + // write hint to console: Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); @@ -2495,14 +2502,6 @@ void MenuStateConnectedGame::render() { try { Renderer &renderer= Renderer::getInstance(); - if(isHeadlessAdmin() == true) { - listBoxPlayerStatus.setX(buttonRestoreLastSettings.getX() + - buttonRestoreLastSettings.getW() + 20); - } - else { - listBoxPlayerStatus.setX(nonAdminPlayerStatusX); - } - if(mainMessageBox.getEnabled()) { renderer.renderMessageBox(&mainMessageBox); } diff --git a/source/glest_game/menu/menu_state_connected_game.h b/source/glest_game/menu/menu_state_connected_game.h index ef9f6947a..54ccbd0f4 100644 --- a/source/glest_game/menu/menu_state_connected_game.h +++ b/source/glest_game/menu/menu_state_connected_game.h @@ -90,7 +90,6 @@ private: GraphicListBox listBoxPlayerStatus; GraphicLabel labelPlayerStatus[GameConstants::maxPlayers]; - int nonAdminPlayerStatusX; GraphicLabel labelAllowObservers; GraphicCheckBox checkBoxAllowObservers; diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index 1066d58b7..d165c0b27 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -194,16 +194,34 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, int xoffset=10; //create - int buttonx=200; + int buttonx=170; int buttony=180; + + // player status + listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); + listBoxPlayerStatus.init(buttonx, buttony, 150); + vector playerStatuses; + playerStatuses.push_back(lang.getString("PlayerStatusSetup")); + playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack")); + playerStatuses.push_back(lang.getString("PlayerStatusReady")); + listBoxPlayerStatus.setItems(playerStatuses); + listBoxPlayerStatus.setSelectedItemIndex(2,true); + listBoxPlayerStatus.setTextColor(Vec3f(0.0f,1.0f,0.0f)); + listBoxPlayerStatus.setLighted(false); + listBoxPlayerStatus.setVisible(true); + buttonx+=180; + buttonReturn.registerGraphicComponent(containerName,"buttonReturn"); buttonReturn.init(buttonx, buttony, 125); + buttonx+=130; buttonRestoreLastSettings.registerGraphicComponent(containerName,"buttonRestoreLastSettings"); - buttonRestoreLastSettings.init(buttonx+130, buttony, 220); + buttonRestoreLastSettings.init(buttonx, buttony, 220); + buttonx+=225; buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow"); - buttonPlayNow.init(buttonx+130+225, buttony, 125); + buttonPlayNow.init(buttonx, buttony, 125); + buttonx+=130; labelLocalGameVersion.registerGraphicComponent(containerName,"labelLocalGameVersion"); labelLocalGameVersion.init(10, networkHeadPos+labelOffset); @@ -357,19 +375,6 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, checkBoxAllowNativeLanguageTechtree.init(xoffset+650, mapHeadPos-70); checkBoxAllowNativeLanguageTechtree.setValue(false); - // player status - listBoxPlayerStatus.registerGraphicComponent(containerName,"listBoxPlayerStatus"); - listBoxPlayerStatus.init(810, buttony, 150); - vector playerStatuses; - playerStatuses.push_back(lang.getString("PlayerStatusSetup")); - playerStatuses.push_back(lang.getString("PlayerStatusBeRightBack")); - playerStatuses.push_back(lang.getString("PlayerStatusReady")); - listBoxPlayerStatus.setItems(playerStatuses); - listBoxPlayerStatus.setSelectedItemIndex(2,true); - listBoxPlayerStatus.setTextColor(Vec3f(0.0f,1.0f,0.0f)); - listBoxPlayerStatus.setLighted(false); - listBoxPlayerStatus.setVisible(true); - // Network Scenario int scenarioX=810; int scenarioY=140;