-
Notifications
You must be signed in to change notification settings - Fork 193
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into plasmaman
- Loading branch information
Showing
192 changed files
with
1,896 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
Content.Client/_NC/Radio/UI/HandheldRadioBoundUserInterface.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| using Content.Shared._NC.Radio; | ||
| using JetBrains.Annotations; | ||
| using Robust.Client.GameObjects; | ||
|
|
||
| namespace Content.Client._NC.Radio.UI; | ||
|
|
||
|
|
||
| [UsedImplicitly] | ||
| public sealed class HandheldRadioBoundUserInterface : BoundUserInterface | ||
| { | ||
| [ViewVariables] | ||
| private HandheldRadioMenu? _menu; | ||
|
|
||
| public HandheldRadioBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) | ||
| { | ||
|
|
||
| } | ||
|
|
||
| protected override void Open() | ||
| { | ||
| base.Open(); | ||
|
|
||
| _menu = new(); | ||
|
|
||
| _menu.OnMicPressed += enabled => | ||
| { | ||
| SendMessage(new ToggleHandheldRadioMicMessage(enabled)); | ||
| }; | ||
| _menu.OnSpeakerPressed += enabled => | ||
| { | ||
| SendMessage(new ToggleHandheldRadioSpeakerMessage(enabled)); | ||
| }; | ||
| _menu.OnFrequencyChanged += frequency => | ||
| { | ||
| if (int.TryParse(frequency.Trim(), out var intFreq) && intFreq > 0) | ||
| SendMessage(new SelectHandheldRadioFrequencyMessage(intFreq)); | ||
| else | ||
| SendMessage(new SelectHandheldRadioFrequencyMessage(-1)); // Query the current frequency | ||
| }; | ||
|
|
||
| _menu.OnClose += Close; | ||
| _menu.OpenCentered(); | ||
| } | ||
|
|
||
| protected override void Dispose(bool disposing) | ||
| { | ||
| base.Dispose(disposing); | ||
| if (!disposing) | ||
| return; | ||
| _menu?.Close(); | ||
| } | ||
|
|
||
| protected override void UpdateState(BoundUserInterfaceState state) | ||
| { | ||
| base.UpdateState(state); | ||
|
|
||
| if (state is not HandheldRadioBoundUIState msg) | ||
| return; | ||
|
|
||
| _menu?.Update(msg); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <controls:FancyWindow xmlns="https://spacestation14.io" | ||
| xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls" | ||
| Title="{Loc 'handheld-radio-menu-title'}" | ||
| MinSize="200 150" | ||
| SetSize="200 150"> | ||
| <BoxContainer Orientation="Vertical" | ||
| HorizontalExpand="True" | ||
| VerticalExpand="True" | ||
| Margin="5 0 5 0"> | ||
| <Control MinHeight="10"/> | ||
| <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150"> | ||
| <Label Name="CurrentTextFrequency" Text="{Loc 'handheld-radio-current-text-frequency'}" /> | ||
| <LineEdit Name="FrequencyLineEdit" Text="1330"/> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Horizontal" HorizontalExpand="True" HorizontalAlignment="Right" Margin="5 0 5 5"> | ||
| <Button Name="MicButton" ToggleMode="True" Text="{Loc 'handheld-radio-button-text-mic'}" StyleClasses="OpenRight" MinWidth="70"/> | ||
| <Button Name="SpeakerButton" ToggleMode="True" Text="{Loc 'handheld-radio-button-text-speaker'}" StyleClasses="OpenLeft" MinWidth="70"/> | ||
| </BoxContainer> | ||
| <BoxContainer Orientation="Vertical"> | ||
| <PanelContainer StyleClasses="LowDivider" /> | ||
| <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom"> | ||
| <Label Text="{Loc 'handheld-radio-flavor-text-left'}" StyleClasses="WindowFooterText" | ||
| HorizontalAlignment="Left" HorizontalExpand="True" Margin="0 0 5 0" /> | ||
| <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered" | ||
| VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/> | ||
| </BoxContainer> | ||
| </BoxContainer> | ||
| </BoxContainer> | ||
| </controls:FancyWindow> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| using Content.Client.UserInterface.Controls; | ||
| using Content.Shared._NC.Radio; | ||
| using Robust.Client.AutoGenerated; | ||
| using Robust.Client.UserInterface.Controls; | ||
| using Robust.Client.UserInterface.XAML; | ||
| using Robust.Shared.Prototypes; | ||
|
|
||
| namespace Content.Client._NC.Radio.UI; | ||
| // TODO: Fix silly ui update issues | ||
| [GenerateTypedNameReferences] | ||
| public sealed partial class HandheldRadioMenu : FancyWindow | ||
| { | ||
|
|
||
| public event Action<bool>? OnMicPressed; | ||
| public event Action<bool>? OnSpeakerPressed; | ||
| public event Action<string>? OnFrequencyChanged; | ||
|
|
||
| private string _lastFrequency = "1330"; | ||
|
|
||
| public HandheldRadioMenu() | ||
| { | ||
| RobustXamlLoader.Load(this); | ||
| IoCManager.InjectDependencies(this); | ||
|
|
||
| MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed); | ||
| SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed); | ||
|
|
||
| FrequencyLineEdit.OnTextEntered += e => OnFrequencyChanged?.Invoke(e.Text); | ||
| FrequencyLineEdit.OnTextChanged += ValidateText; | ||
| FrequencyLineEdit.OnFocusExit += e => OnFrequencyChanged?.Invoke(e.Text); | ||
| } | ||
|
|
||
| private void ValidateText(LineEdit.LineEditEventArgs args) | ||
| { | ||
| if (!int.TryParse(args.Text, out int frequency)) | ||
| { | ||
| FrequencyLineEdit.SetText(_lastFrequency); | ||
| return; | ||
| } | ||
|
|
||
| _lastFrequency = args.Text; | ||
| } | ||
|
|
||
| public void Update(HandheldRadioBoundUIState state) | ||
| { | ||
| if (state.MicEnabled != MicButton.Pressed) | ||
| MicButton.Pressed = state.MicEnabled; | ||
|
|
||
| if (state.SpeakerEnabled != SpeakerButton.Pressed) | ||
| SpeakerButton.Pressed = state.SpeakerEnabled; | ||
|
|
||
| if (state.Frequency.ToString() != FrequencyLineEdit.Text) | ||
| FrequencyLineEdit.Text = state.Frequency.ToString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.