Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,6 @@ public void SetButtons()
LogsButton.Disabled = !_adminManager.CanCommand("adminlogs");
RejuvenateButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
DeleteButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
JobWhitelistsButton.Disabled = !_adminManager.HasFlag(AdminFlags.Whitelist); // DeltaV
JobWhitelistsButton.Disabled = !_adminManager.HasFlag(AdminFlags.WhitelistManager); // Forge-Change: whitelist
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<cc:CommandButton Command="adminlogs" Text="{Loc admin-player-actions-window-admin-logs}"/>
<cc:CommandButton Command="faxui" Text="{Loc admin-player-actions-window-admin-fax}"/>
<cc:CommandButton Command="timetransferpanel" Text="{Loc admin-player-actions-window-time-transfer}"/>
<cc:UICommandButton Command="jobwhitelists" Text="{Loc admin-player-actions-window-whitelists}" WindowType="{x:Type at:WhitelistAccessWindow}"/> <!-- Forge-Change: whitelist -->
</GridContainer>
</BoxContainer>
</Control>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!-- Forge-Change-full: whitelist -->
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc admin-whitelist-window-title}" MinSize="425 250">
<BoxContainer Orientation="Vertical">
<cc:PlayerListControl Name="PlayerList" VerticalExpand="True" />
<BoxContainer Orientation="Horizontal">
<Button Name="OpenWhitelistsButton" Text="{Loc admin-whitelist-window-open}" Disabled="True"/>
</BoxContainer>
</BoxContainer>
</DefaultWindow>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using JetBrains.Annotations;
using Content.Shared.Administration;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

// Forge-Change-full: whitelist
namespace Content.Client.Administration.UI.Tabs.AdminTab;

[GenerateTypedNameReferences]
[UsedImplicitly]
public sealed partial class WhitelistAccessWindow : DefaultWindow
{
private PlayerInfo? _selectedPlayer;

public WhitelistAccessWindow()
{
RobustXamlLoader.Load(this);

PlayerList.OnSelectionChanged += OnSelectionChanged;
OpenWhitelistsButton.OnPressed += OnOpenPressed;
}

private void OnSelectionChanged(PlayerInfo? player)
{
_selectedPlayer = player;
OpenWhitelistsButton.Disabled = _selectedPlayer == null;
}

private void OnOpenPressed(BaseButton.ButtonEventArgs args)
{
if (_selectedPlayer == null)
return;

IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"jobwhitelists \"{_selectedPlayer.SessionId}\"");
Close();
}
}
8 changes: 8 additions & 0 deletions Content.Client/Lobby/UI/Company/CompanyWindow.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!-- Forge-Change-full: company whitelist -->
<controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:company="clr-namespace:Content.Client._Forge.Company.UI"
MinSize="850 520">
<company:CompanySelectControl Name="CompanySelect" VerticalExpand="True" HorizontalExpand="True" />
</controls:FancyWindow>
25 changes: 25 additions & 0 deletions Content.Client/Lobby/UI/Company/CompanyWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Content.Client._Forge.Company.UI;
using Content.Client.UserInterface.Controls;
using Content.Shared._Mono.Company;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;

// Forge-Change-full: company whitelist
namespace Content.Client.Lobby.UI.Company;

[GenerateTypedNameReferences]
public sealed partial class CompanyWindow : FancyWindow
{
public event Action<string>? OnCompanySelected;

public CompanyWindow()
{
RobustXamlLoader.Load(this);
CompanySelect.OnCompanySelected += id => OnCompanySelected?.Invoke(id);
}

public void Populate(List<CompanyPrototype> companies, HashSet<string> selectableCompanyIds, string? currentCompanyId)
{
CompanySelect.Populate(companies, selectableCompanyIds, currentCompanyId);
}
}
32 changes: 0 additions & 32 deletions Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,38 +165,6 @@
<BoxContainer Name="TraitsList" Orientation="Vertical" />
</ScrollContainer>
</BoxContainer>
<!-- Monolith: Company Tab -->
<BoxContainer Orientation="Vertical" Margin="10">
<!-- Company -->
<ScrollContainer VerticalExpand="True">
<!-- Select -->
<BoxContainer Orientation="Vertical">
<BoxContainer Margin="10" Orientation="Horizontal" HorizontalExpand="True">
<Label Text="{Loc 'humanoid-profile-editor-company-label'}" />
<Control HorizontalExpand="True"/>
<OptionButton Name="CompanyButton" HorizontalAlignment="Right" />
</BoxContainer>
<!-- Description -->
<BoxContainer Margin="15,15,15,10" VerticalExpand="True">
<PanelContainer StyleClasses="BackgroundDark" Margin="10,8,10,8" MaxWidth="1200">
<RichTextLabel Name="CompanyDescriptionLabel"
VerticalAlignment="Top"
HorizontalExpand="True"
HorizontalAlignment="Right"
Margin="5,5,5,5"/>
</PanelContainer>
</BoxContainer>
<!-- Company Image -->
<BoxContainer Margin="10,5,10,5" HorizontalAlignment="Center">
<TextureRect Name="CompanyImage" HorizontalAlignment="Center"
Stretch="KeepAspect"
MinWidth="500" MaxWidth="500"
MinHeight="400" MaxHeight="400"
Visible="False"/>
</BoxContainer>
</BoxContainer>
</ScrollContainer>
</BoxContainer>
<BoxContainer Name="MarkingsTab" Orientation="Vertical" Margin="10">
<!-- Markings -->
<ScrollContainer VerticalExpand="True">
Expand Down
Loading
Loading