Ticket #3980: gamesetup_naming_v3.patch
File gamesetup_naming_v3.patch, 5.8 KB (added by , 8 years ago) |
---|
-
binaries/data/mods/public/gui/gamesetup/gamesetup.js
281 281 282 282 function initMapTypes() 283 283 { 284 let mapTypes = Engine.GetGUIObjectByName("mapType Selection");284 let mapTypes = Engine.GetGUIObjectByName("mapType"); 285 285 mapTypes.list = g_MapTypes.Title; 286 286 mapTypes.list_data = g_MapTypes.Name; 287 287 mapTypes.onSelectionChange = function() { … … 294 294 295 295 function initMapFilters() 296 296 { 297 let mapFilters = Engine.GetGUIObjectByName("mapFilter Selection");297 let mapFilters = Engine.GetGUIObjectByName("mapFilter"); 298 298 mapFilters.list = g_MapFilters.map(mapFilter => mapFilter.name); 299 299 mapFilters.list_data = g_MapFilters.map(mapFilter => mapFilter.id); 300 300 mapFilters.onSelectionChange = function() { … … 355 355 function initNumberOfPlayers() 356 356 { 357 357 let playersArray = Array(g_MaxPlayers).fill(0).map((v, i) => i + 1); // 1, 2, ..., MaxPlayers 358 let numPlayers Selection = Engine.GetGUIObjectByName("numPlayersSelection");359 numPlayers Selection.list = playersArray;360 numPlayers Selection.list_data = playersArray;361 numPlayers Selection.onSelectionChange = function() {358 let numPlayers = Engine.GetGUIObjectByName("numPlayers"); 359 numPlayers.list = playersArray; 360 numPlayers.list_data = playersArray; 361 numPlayers.onSelectionChange = function() { 362 362 if (this.selected != -1) 363 363 selectNumPlayers(this.list_data[this.selected]); 364 364 }; 365 numPlayers Selection.selected = g_MaxPlayers - 1;365 numPlayers.selected = g_MaxPlayers - 1; 366 366 } 367 367 368 368 function initGameSpeed() … … 502 502 */ 503 503 function hideControls() 504 504 { 505 hideControl("mapTypeSelection", "mapTypeText"); 506 hideControl("mapFilterSelection", "mapFilterText"); 507 hideControl("mapSelection", "mapSelectionText"); 508 hideControl("victoryCondition", "victoryConditionText"); 509 hideControl("gameSpeed", "gameSpeedText"); 510 hideControl("numPlayersSelection", "numPlayersText"); 505 for (let ctrl of ["mapType", "mapFilter", "mapSelection", "victoryCondition", "gameSpeed", "numPlayers"]) 506 hideControl(ctrl, ctrl + "Text"); 511 507 512 508 // TODO: Shouldn't players be able to choose their own assignment? 513 509 for (let i = 0; i < g_MaxPlayers; ++i) … … 1304 1300 1305 1301 if (g_IsController) 1306 1302 { 1307 Engine.GetGUIObjectByName("mapType Selection").selected = mapTypeIdx;1308 Engine.GetGUIObjectByName("mapFilter Selection").selected = mapFilterIdx;1303 Engine.GetGUIObjectByName("mapType").selected = mapTypeIdx; 1304 Engine.GetGUIObjectByName("mapFilter").selected = mapFilterIdx; 1309 1305 Engine.GetGUIObjectByName("mapSelection").selected = Engine.GetGUIObjectByName("mapSelection").list_data.indexOf(mapName); 1310 1306 Engine.GetGUIObjectByName("mapSize").selected = mapSizeIdx; 1311 Engine.GetGUIObjectByName("numPlayers Selection").selected = numPlayers - 1;1307 Engine.GetGUIObjectByName("numPlayers").selected = numPlayers - 1; 1312 1308 Engine.GetGUIObjectByName("victoryCondition").selected = victoryIdx; 1313 1309 Engine.GetGUIObjectByName("wonderDuration").selected = wonderDurationIdx; 1314 1310 Engine.GetGUIObjectByName("populationCap").selected = popIdx; … … 1355 1351 Engine.GetGUIObjectByName("mapSizeDesc").hidden = !isRandom; 1356 1352 Engine.GetGUIObjectByName("mapSize").hidden = !isRandom || !g_IsController; 1357 1353 Engine.GetGUIObjectByName("mapSizeText").hidden = !isRandom || g_IsController; 1358 hideControl("numPlayers Selection", "numPlayersText", isRandom && g_IsController);1354 hideControl("numPlayers", "numPlayersText", isRandom && g_IsController); 1359 1355 1360 1356 let notScenario = g_GameAttributes.mapType != "scenario" && g_IsController ; 1361 1357 hideControl("victoryCondition", "victoryConditionText", notScenario); -
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
105 105 <object size="24 64 100%-460 358" type="image" sprite="CoverFillDark" name="playerAssignmentsPanelCover" hidden="true"/> 106 106 <!-- Map selection --> 107 107 108 <object size="100%-425 355 100%-285 470" name="mapType SelectionTooltip">108 <object size="100%-425 355 100%-285 470" name="mapTypeTooltip"> 109 109 <object type="text" style="ModernRightLabelText" size="0 0 100% 30"> 110 110 <translatableAttribute id="caption">Map Type:</translatableAttribute> 111 111 </object> … … 124 124 </object> 125 125 126 126 127 <object size="100%-275 355 100%-25 470" name="mapFilter SelectionTooltip">127 <object size="100%-275 355 100%-25 470" name="mapFilterTooltip"> 128 128 <object name="mapTypeText" type="text" style="ModernLeftLabelText" size="0 0 100% 30" hidden="true"/> 129 129 <object name="mapFilterText" type="text" style="ModernLeftLabelText" size="0 32 100% 62" hidden="true"/> 130 130 <object name="mapSelectionText" type="text" style="ModernLeftLabelText" size="0 64 100% 94" hidden="true"/> … … 131 131 <object name="mapSizeText" type="text" style="ModernLeftLabelText" size="0 128 100% 158" hidden="true"/> 132 132 </object> 133 133 134 <object name="mapType Selection"134 <object name="mapType" 135 135 type="dropdown" 136 136 style="ModernDropDown" 137 137 size="100%-275 355 100%-25 383" … … 139 139 <translatableAttribute id="tooltip">Select a map type.</translatableAttribute> 140 140 </object> 141 141 142 <object name="mapFilter Selection"142 <object name="mapFilter" 143 143 type="dropdown" 144 144 style="ModernDropDown" 145 145 size="100%-275 387 100%-25 415" … … 158 158 </object> 159 159 160 160 <object name="numPlayersText" size="100%-275 451 100%-25 483" type="text" style="ModernLeftLabelText"/> 161 <object name="numPlayers Selection"161 <object name="numPlayers" 162 162 type="dropdown" 163 163 style="ModernDropDown" 164 164 size="100%-275 451 100%-25 479"