Skip to content

Commit

Permalink
migrate delta v namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
hivehum committed Jan 8, 2025
1 parent ec861db commit 4ac431d
Show file tree
Hide file tree
Showing 246 changed files with 249 additions and 249 deletions.
6 changes: 3 additions & 3 deletions Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ protected override void Open()
_window.OnNameChanged += OnNameChanged;
_window.OnJobChanged += OnJobChanged;
_window.OnJobIconChanged += OnJobIconChanged;
_window.OnNumberChanged += OnNumberChanged; // DeltaV
_window.OnNumberChanged += OnNumberChanged; // DV
}

// DeltaV - Add number change handler
// DV - Add number change handler
private void OnNumberChanged(uint newNumber)
{
SendMessage(new AgentIDCardNumberChangedMessage(newNumber));
Expand Down Expand Up @@ -63,7 +63,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
_window.SetCurrentName(cast.CurrentName);
_window.SetCurrentJob(cast.CurrentJob);
_window.SetAllowedIcons(cast.CurrentJobIconId);
_window.SetCurrentNumber(cast.CurrentNumber); // DeltaV
_window.SetCurrentNumber(cast.CurrentNumber); // DV
}
}
}
4 changes: 2 additions & 2 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<LineEdit Name="NameLineEdit" />
<Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
<LineEdit Name="JobLineEdit" />
<!-- DeltaV - Add NanoChat number field -->
<!-- DV - Add NanoChat number field -->
<Label Name="CurrentNumber" Text="{Loc 'agent-id-card-current-number'}" />
<LineEdit Name="NumberLineEdit" PlaceHolder="#0000" />
<!-- DeltaV end -->
<!-- DV end -->
<Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
<GridContainer Name="IconGrid" Columns="10">
<!-- Job icon buttons are generated in the code -->
Expand Down
12 changes: 6 additions & 6 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ public sealed partial class AgentIDCardWindow : DefaultWindow

public event Action<string>? OnNameChanged;

private const int MaxNumberLength = 4; // DeltaV - Same as NewChatPopup
private const int MaxNumberLength = 4; // DV - Same as NewChatPopup

public event Action<string>? OnJobChanged;
public event Action<uint>? OnNumberChanged; // DeltaV - Add event for number changes
public event Action<uint>? OnNumberChanged; // DV - Add event for number changes
public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;

public AgentIDCardWindow()
Expand All @@ -41,11 +41,11 @@ public AgentIDCardWindow()
JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);

// DeltaV - Add handlers for number changes
// DV - Add handlers for number changes
NumberLineEdit.OnTextEntered += OnNumberEntered;
NumberLineEdit.OnFocusExit += OnNumberEntered;

// DeltaV - Filter to only allow digits
// DV - Filter to only allow digits
NumberLineEdit.OnTextChanged += args =>
{
if (args.Text.Length > MaxNumberLength)
Expand All @@ -60,14 +60,14 @@ public AgentIDCardWindow()
};
}

// DeltaV - Add number validation and event
// DV - Add number validation and event
private void OnNumberEntered(LineEdit.LineEditEventArgs args)
{
if (uint.TryParse(args.Text, out var number) && number > 0)
OnNumberChanged?.Invoke(number);
}

// DeltaV - Add setter for current number
// DV - Add setter for current number
public void SetCurrentNumber(uint? number)
{
NumberLineEdit.Text = number?.ToString("D4") ?? "";
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ public override void UpdateState(BoundUserInterfaceState state)
if (state is not LogProbeUiState logProbeUiState)
return;

_fragment?.UpdateState(logProbeUiState); // DeltaV - just take the state
_fragment?.UpdateState(logProbeUiState); // DV - just take the state
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@
BorderThickness="0 0 0 1"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Vertical" Margin="4 8">
<!-- DeltaV begin - Add title label -->
<!-- DV begin - Add title label -->
<Label Name="TitleLabel"
Text="{Loc 'log-probe-header-access'}"
StyleClasses="LabelHeading"
HorizontalAlignment="Center"
Margin="0 0 0 8"/>
<!-- DeltaV end -->
<!-- DV end -->

<!-- DeltaV begin - Add card number display -->
<!-- DV begin - Add card number display -->
<Label Name="CardNumberLabel"
StyleClasses="LabelSubText"
HorizontalAlignment="Center"
Margin="0 0 0 8"
Visible="False"/>
<!-- DeltaV end -->
<!-- DV end -->

<!-- DeltaV begin - Adjust column headers -->
<!-- DV begin - Adjust column headers -->
<BoxContainer Orientation="Horizontal">
<Label Align="Right" SetWidth="26" ClipText="True" Text="{Loc 'log-probe-label-number'}"/>
<Label Align="Center" SetWidth="100" ClipText="True" Text="{Loc 'log-probe-label-time'}"/>
<Label Name="ContentLabel" Align="Left" SetWidth="390" ClipText="True" Text="{Loc 'log-probe-label-accessor'}"/>
</BoxContainer>
<!-- DeltaV end -->
<!-- DV end -->
</BoxContainer>
</PanelContainer>
<ScrollContainer VerticalExpand="True" HScrollEnabled="True">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Linq;
using Content.Client._DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DeltaV.CartridgeLoader.Cartridges; // DeltaV
// DeltaV
using Content.Client._DV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges; // DV
// DV
using Content.Shared.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated; // DeltaVusing Robust.Client.AutoGenerated;
using Robust.Client.AutoGenerated; // DVusing Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

Expand All @@ -17,7 +17,7 @@ public LogProbeUiFragment()
RobustXamlLoader.Load(this);
}

// DeltaV begin - Update to handle both types of data
// DV begin - Update to handle both types of data
public void UpdateState(LogProbeUiState state)
{
ProbedDeviceContainer.RemoveAllChildren();
Expand Down Expand Up @@ -119,9 +119,9 @@ private void DisplayNanoChatData(NanoChatData data)
}
}
}
// DeltaV end
// DV end

// DeltaV - Handle this in a separate method
// DV - Handle this in a separate method
private void DisplayAccessLogs(List<PulledAccessLog> logs)
{
//Reverse the list so the oldest entries appear at the bottom
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Shared._DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client._DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatEntry : BoxContainer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client._DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatLogEntry : BoxContainer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<cartridges:NanoChatMessageBubble
xmlns="https://spacestation14.io"
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:cartridges="clr-namespace:Content.Client._DeltaV.CartridgeLoader.Cartridges"
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
HorizontalExpand="True">

<BoxContainer Name="MessageContainer"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Content.Shared._DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client._DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatMessageBubble : BoxContainer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client._DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatPopup : DefaultWindow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Client.UserInterface.Fragments;
using Content.Shared._DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Content.Shared.CartridgeLoader;
using Robust.Client.UserInterface;

namespace Content.Client._DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

public sealed partial class NanoChatUi : UIFragment
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns="https://spacestation14.io"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:cartridges="clr-namespace:Content.Client._DeltaV.CartridgeLoader.Cartridges"
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
Orientation="Vertical"
HorizontalExpand="True"
VerticalExpand="True"
Expand Down Expand Up @@ -53,12 +53,12 @@
<Control HorizontalExpand="True" VerticalExpand="True">
<TextureRect Name="BellIcon"
StyleClasses="ButtonSquare"
TexturePath="/Textures/_DeltaV//Interface/VerbIcons/bell.svg.png"
TexturePath="/Textures/_DV//Interface/VerbIcons/bell.svg.png"
Stretch="KeepAspectCentered"
MinSize="18 18" />
<TextureRect Name="BellMutedIcon"
StyleClasses="ButtonSquare"
TexturePath="/Textures/_DeltaV//Interface/VerbIcons/bell_muted.png"
TexturePath="/Textures/_DV//Interface/VerbIcons/bell_muted.png"
Stretch="KeepAspectCentered"
Visible="False"
MinSize="18 18" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System.Linq;
using System.Numerics;
using Content.Shared._DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Timing;

namespace Content.Client._DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatUiFragment : BoxContainer
Expand Down
5 changes: 5 additions & 0 deletions Content.Client/_DV/NanoChat/NanoChatSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using Content.Shared._DV.NanoChat;

namespace Content.Client._DV.NanoChat;

public sealed class NanoChatSystem : SharedNanoChatSystem;
5 changes: 5 additions & 0 deletions Content.Client/_DV/Recruiter/RecruiterPenSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using Content.Shared.DV.Recruiter;

namespace Content.Client.DV.Recruiter;

public sealed class RecruiterPenSystem : SharedRecruiterPenSystem;
5 changes: 5 additions & 0 deletions Content.Client/_DV/Shipyard/ShipyardConsoleSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using Content.Shared._DV.Shipyard;

namespace Content.Client._DV.Shipyard;

public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem;
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Content.Shared.Access.Systems;
using Content.Shared._DeltaV.Shipyard;
using Content.Shared._DV.Shipyard;
using Content.Shared.Whitelist;
using Robust.Client.GameObjects;
using Robust.Client.Player;
using Robust.Shared.Prototypes;

namespace Content.Client._DeltaV.Shipyard.UI;
namespace Content.Client._DV.Shipyard.UI;

public sealed class ShipyardConsoleBoundUserInterface : BoundUserInterface
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Content.Client.UserInterface.Controls;
using Content.Shared._DeltaV.Shipyard;
using Content.Shared._DeltaV.Shipyard.Prototypes;
using Content.Shared._DV.Shipyard;
using Content.Shared._DV.Shipyard.Prototypes;
using Content.Shared.Access.Systems;
using Content.Shared.Whitelist;
using Robust.Client.AutoGenerated;
Expand All @@ -10,7 +10,7 @@
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;

namespace Content.Client._DeltaV.Shipyard.UI
namespace Content.Client._DV.Shipyard.UI
{
[GenerateTypedNameReferences]
public sealed partial class ShipyardConsoleMenu : FancyWindow
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Content.Shared._DeltaV.Shipyard.Prototypes;
using Content.Shared._DV.Shipyard.Prototypes;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Utility;

namespace Content.Client._DeltaV.Shipyard.UI;
namespace Content.Client._DV.Shipyard.UI;

[GenerateTypedNameReferences]
public sealed partial class VesselRow : PanelContainer
Expand Down
5 changes: 0 additions & 5 deletions Content.Client/_DeltaV/NanoChat/NanoChatSystem.cs

This file was deleted.

5 changes: 0 additions & 5 deletions Content.Client/_DeltaV/Recruiter/RecruiterPenSystem.cs

This file was deleted.

5 changes: 0 additions & 5 deletions Content.Client/_DeltaV/Shipyard/ShipyardConsoleSystem.cs

This file was deleted.

6 changes: 3 additions & 3 deletions Content.IntegrationTests/Tests/_DeltaV/ShipyardTest.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Content.Server.Cargo.Systems;
using Content.Server._DeltaV.Shipyard;
using Content.Server._DV.Shipyard;
using Content.Server.Shuttles.Components;
using Content.Shared._DeltaV.Shipyard.Prototypes;
using Content.Shared._DV.Shipyard.Prototypes;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;

namespace Content.IntegrationTests.Tests.DeltaV;
namespace Content.IntegrationTests.Tests.DV;

[TestFixture]
[TestOf(typeof(ShipyardSystem))]
Expand Down
Loading

0 comments on commit 4ac431d

Please sign in to comment.