Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin event preference panel #480

Merged
merged 19 commits into from
Dec 17, 2024
Merged

admin event preference panel #480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e724a6e
starting event preference work
Nov 19, 2024
2587bfe
add xaml cs file
Nov 21, 2024
09d76a5
initial commit
Nov 21, 2024
67c94d2
more xaml fun
Nov 21, 2024
f3b7761
MAKE IT WORK WOO
Nov 21, 2024
99e3e63
initial commit
Nov 21, 2024
9ca29d1
MAKE IT WORK WOO
Nov 21, 2024
29d4209
rebase casualty now uncasualtied
Nov 21, 2024
3450be2
final clean up
Nov 21, 2024
c1638a7
clean up my beloathed
Nov 21, 2024
011ab98
hate git simple as
Nov 21, 2024
26f5ee0
git
Nov 21, 2024
f852583
toss
Nov 21, 2024
f528168
final final final cleanup
Nov 21, 2024
0f82e46
documentation stuff
Nov 21, 2024
ec0daef
condensed method in EventPreferencesPanel.xaml.cs
lunarcomets Dec 12, 2024
50313c5
setstate code moved to constructor
lunarcomets Dec 12, 2024
d9bf81c
Remove whitespace change
dffdff2423 Dec 17, 2024
f83babb
Only show enabled preferences
dffdff2423 Dec 17, 2024
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
2 changes: 1 addition & 1 deletion .run/Content Server+Client.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<toRun name="Content.Server" type="DotNetProject" />
<method v="2" />
</configuration>
</component>
dffdff2423 marked this conversation as resolved.
Show resolved Hide resolved
</component>
3 changes: 1 addition & 2 deletions Content.Client/_CD/Admin/UI/EventPreferencePanelEui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public override void HandleState(EuiStateBase state)
if (state is not EventPreferencePanelEuiState s)
return;

EventPreferencesPanel.SetDetails(s.Username, s.Preferences);
EventPreferencesPanel.SetPreferenceList(s.Preferences, s.VisibleAntagPrototypes);
EventPreferencesPanel.SetDetails(s.Username, s.Preferences, s.VisibleAntagPrototypes);
}

}
9 changes: 2 additions & 7 deletions Content.Client/_CD/Admin/UI/EventPreferencesPanel.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client._CD.Admin.UI;

[GenerateTypedNameReferences]
Expand All @@ -19,18 +18,14 @@ public EventPreferencesPanel()
/// </summary>
/// <param name="username">Player's username</param>
/// <param name="currentPreferences">Profile preference to fetch the character name from</param>
public void SetDetails(string username, HumanoidCharacterProfile currentPreferences)
public void SetDetails(string username, HumanoidCharacterProfile currentPreferences, IEnumerable<AntagPrototype> listablePreferences)
{
PlayerLabel.Text = Loc.GetString("cd-eventpreferencepanel-player", ("player", username));
CharacterLabel.Text = Loc.GetString(
"cd-eventpreferencepanel-character",
("characterName", currentPreferences.Name)
);
}

/// <inheritdoc cref="EventPreferences.SetPreferenceList"/>
public void SetPreferenceList(HumanoidCharacterProfile userPreferences, IEnumerable<AntagPrototype> listablePreferences)
{
EventPreferenceControl.SetPreferenceList(userPreferences, listablePreferences);
EventPreferenceControl.SetPreferenceList(currentPreferences, listablePreferences);
}
}
4 changes: 2 additions & 2 deletions Content.Server/_CD/Admin/Commands/EventPreferencesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public sealed class EventPreferencesCommand : LocalizedCommands
{
[Dependency] private readonly IPlayerLocator _locator = default!;
[Dependency] private readonly IServerPreferencesManager _pref = default!;
[Dependency] private readonly EuiManager _euis = default!;
[Dependency] private readonly EuiManager _eui = default!;
[Dependency] private readonly IPlayerManager _players = default!;
public override string Command => "eventpreferences";

Expand Down Expand Up @@ -43,7 +43,7 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
var pref = (HumanoidCharacterProfile)_pref.GetPreferences(queriedPlayer.UserId).SelectedCharacter;

var ui = new EventPreferencesPanelEui(queriedPlayer, pref);
_euis.OpenEui(ui, admin);
_eui.OpenEui(ui, admin);
ui.SetState();
}

Expand Down