From 3d86baa92e5927e9a8c4f1b0a84abf558a425b06 Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Wed, 7 Dec 2022 01:14:48 +0200 Subject: [PATCH] Confirmation button (#12671) Closes https://github.com/space-wizards/space-station-14/issues/12579 --- .../Preferences/UI/CharacterSetupGui.xaml.cs | 24 +++++++++++++++---- .../preferences/ui/character-setup-gui.ftl | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs index a91b6c2490..e979650528 100644 --- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs +++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs @@ -3,6 +3,7 @@ using Content.Client.Humanoid; using Content.Client.Info; using Content.Client.Lobby.UI; using Content.Client.Resources; +using Content.Client.Stylesheets; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Prototypes; using Content.Shared.Preferences; @@ -130,7 +131,7 @@ namespace Content.Client.Preferences.UI var characterIndexCopy = slot; characterPickerButton.OnPressed += args => { - _humanoidProfileEditor.Profile = (HumanoidCharacterProfile) character; + _humanoidProfileEditor.Profile = (HumanoidCharacterProfile)character; _humanoidProfileEditor.CharacterSlot = characterIndexCopy; _humanoidProfileEditor.UpdateControls(); _preferencesManager.SelectCharacter(character); @@ -170,7 +171,7 @@ namespace Content.Client.Preferences.UI _previewDummy = entityManager.SpawnEntity(prototypeManager.Index(SharedHumanoidSystem.DefaultSpecies).DollPrototype, MapCoordinates.Nullspace); } - EntitySystem.Get().LoadProfile(_previewDummy, (HumanoidCharacterProfile) profile); + EntitySystem.Get().LoadProfile(_previewDummy, (HumanoidCharacterProfile)profile); if (humanoid != null) { @@ -209,11 +210,25 @@ namespace Content.Client.Preferences.UI Text = Loc.GetString("character-setup-gui-character-picker-button-delete-button"), Visible = !isSelectedCharacter, }; - deleteButton.OnPressed += _ => + var confirmDeleteButton = new Button + { + Text = Loc.GetString("character-setup-gui-character-picker-button-confirm-delete-button"), + Visible = false, + }; + confirmDeleteButton.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault; + confirmDeleteButton.OnPressed += _ => { Parent?.RemoveChild(this); + Parent?.RemoveChild(confirmDeleteButton); preferencesManager.DeleteCharacter(profile); }; + deleteButton.OnPressed += _ => + { + + deleteButton.Visible = false; + confirmDeleteButton.Visible = true; + + }; var internalHBox = new BoxContainer { @@ -224,7 +239,8 @@ namespace Content.Client.Preferences.UI { view, descriptionLabel, - deleteButton + deleteButton, + confirmDeleteButton } }; diff --git a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl index 82108f7c40..6644bd62aa 100644 --- a/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl +++ b/Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl @@ -5,3 +5,4 @@ character-setup-gui-character-setup-close-button = Close character-setup-gui-create-new-character-button = Create new slot... character-setup-gui-create-new-character-button-tooltip = A maximum of {$maxCharacters} characters are allowed. character-setup-gui-character-picker-button-delete-button = Delete +character-setup-gui-character-picker-button-confirm-delete-button = Confirm