mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-10 04:43:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added "exit map editor" button to map editor

Browse Source
This commit is contained in:
Yair Morgenstern 2019-02-09 23:26:59 +02:00
parent ae7cbcb3c9
commit cc0a999471
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/mapeditor/MapScreenOptionsTable.kt → core/src/com/unciv/ui/mapeditor/MapEditorOptionsTable.kt
View File

@ -9,7 +9,7 @@ import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.onClick import com.unciv.ui.utils.onClick
import com.unciv.ui.worldscreen.optionstable.PopupTable import com.unciv.ui.worldscreen.optionstable.PopupTable
class MapScreenOptionsTable(mapEditorScreen: MapEditorScreen): PopupTable(mapEditorScreen){ class MapEditorOptionsTable(mapEditorScreen: MapEditorScreen): PopupTable(mapEditorScreen){
init{ init{
val mapNameEditor = TextField(mapEditorScreen.mapName, CameraStageBaseScreen.skin) val mapNameEditor = TextField(mapEditorScreen.mapName, CameraStageBaseScreen.skin)
mapNameEditor.addListener{ mapEditorScreen.mapName=mapNameEditor.text; true } mapNameEditor.addListener{ mapEditorScreen.mapName=mapNameEditor.text; true }
@ -26,6 +26,10 @@ class MapScreenOptionsTable(mapEditorScreen: MapEditorScreen): PopupTable(mapEdi
loadMapButton.onClick { MapScreenLoadTable(mapEditorScreen); remove() } loadMapButton.onClick { MapScreenLoadTable(mapEditorScreen); remove() }
add(loadMapButton).row() add(loadMapButton).row()
val exitMapEditorButton = TextButton("Exit map editor".tr(), CameraStageBaseScreen.skin)
exitMapEditorButton.onClick { UnCivGame.Current.setWorldScreen(); mapEditorScreen.dispose() }
add(exitMapEditorButton ).row()
val closeOptionsButtton = TextButton("Close".tr(), CameraStageBaseScreen.skin) val closeOptionsButtton = TextButton("Close".tr(), CameraStageBaseScreen.skin)
closeOptionsButtton.onClick { remove() } closeOptionsButtton.onClick { remove() }
add(closeOptionsButtton).row() add(closeOptionsButtton).row()

2
core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
View File

@ -77,7 +77,7 @@ class MapEditorScreen(var mapToLoad:String?=null): CameraStageBaseScreen(){
val saveMapButton = TextButton("Options".tr(),skin) val saveMapButton = TextButton("Options".tr(),skin)
saveMapButton.onClick { saveMapButton.onClick {
MapScreenOptionsTable(this) MapEditorOptionsTable(this)
} }
stage.addActor(saveMapButton) stage.addActor(saveMapButton)
} }

4
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
View File

@ -3,9 +3,9 @@ package com.unciv.ui.worldscreen.optionstable
import com.unciv.UnCivGame import com.unciv.UnCivGame
import com.unciv.models.gamebasics.tr import com.unciv.models.gamebasics.tr
import com.unciv.ui.CivilopediaScreen import com.unciv.ui.CivilopediaScreen
import com.unciv.ui.mapeditor.MapEditorScreen
import com.unciv.ui.NewGameScreen import com.unciv.ui.NewGameScreen
import com.unciv.ui.VictoryScreen import com.unciv.ui.VictoryScreen
import com.unciv.ui.mapeditor.MapEditorScreen
import com.unciv.ui.pickerscreens.PolicyPickerScreen import com.unciv.ui.pickerscreens.PolicyPickerScreen
import com.unciv.ui.saves.LoadScreen import com.unciv.ui.saves.LoadScreen
import com.unciv.ui.saves.SaveScreen import com.unciv.ui.saves.SaveScreen
@ -14,7 +14,7 @@ import com.unciv.ui.worldscreen.WorldScreen
class WorldScreenOptionsTable(val worldScreen: WorldScreen) : PopupTable(worldScreen) { class WorldScreenOptionsTable(val worldScreen: WorldScreen) : PopupTable(worldScreen) {
init { init {
addButton("Map editor - IN PROGRESS".tr()){ addButton("Map editor".tr()){
UnCivGame.Current.screen = MapEditorScreen() UnCivGame.Current.screen = MapEditorScreen()
remove() remove()
} }