tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed SetSize from Window Size in Admin and AdminRank (#6362)

Browse Source
This commit is contained in:
Aaron Mell
2022-01-29 00:20:26 -05:00
committed by GitHub
parent 6f444f3cee
commit f77ac6c4f3
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Content.Client/Administration/UI/PermissionsEui.cs
View File

@@ -105,14 +105,14 @@ namespace Content.Client.Administration.UI
private void RemoveButtonPressed(EditAdminWindow window) private void RemoveButtonPressed(EditAdminWindow window)
{ {
SendMessage(new RemoveAdmin {UserId = window.SourceData!.Value.UserId}); SendMessage(new RemoveAdmin { UserId = window.SourceData!.Value.UserId });
window.Close(); window.Close();
} }
private void RemoveRankButtonPressed(EditAdminRankWindow window) private void RemoveRankButtonPressed(EditAdminRankWindow window)
{ {
SendMessage(new RemoveAdminRank {Id = window.SourceId!.Value}); SendMessage(new RemoveAdminRank { Id = window.SourceId!.Value });
window.Close(); window.Close();
} }
@@ -206,9 +206,9 @@ namespace Content.Client.Administration.UI
var al = _menu.AdminsList; var al = _menu.AdminsList;
var name = admin.UserName ?? admin.UserId.ToString(); var name = admin.UserName ?? admin.UserId.ToString();
al.AddChild(new Label {Text = name}); al.AddChild(new Label { Text = name });
var titleControl = new Label {Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant()}; var titleControl = new Label { Text = admin.Title ?? Loc.GetString("permissions-eui-edit-admin-title-control-text").ToLowerInvariant() };
if (admin.Title == null) // none if (admin.Title == null) // none
{ {
titleControl.StyleClasses.Add(StyleBase.StyleClassItalic); titleControl.StyleClasses.Add(StyleBase.StyleClassItalic);
@@ -232,7 +232,7 @@ namespace Content.Client.Administration.UI
rank = Loc.GetString("permissions-eui-edit-no-rank-text").ToLowerInvariant(); rank = Loc.GetString("permissions-eui-edit-no-rank-text").ToLowerInvariant();
} }
var rankControl = new Label {Text = rank}; var rankControl = new Label { Text = rank };
if (italic) if (italic)
{ {
rankControl.StyleClasses.Add(StyleBase.StyleClassItalic); rankControl.StyleClasses.Add(StyleBase.StyleClassItalic);
@@ -249,7 +249,7 @@ namespace Content.Client.Administration.UI
HorizontalAlignment = Control.HAlignment.Center, HorizontalAlignment = Control.HAlignment.Center,
}); });
var editButton = new Button {Text = Loc.GetString("permissions-eui-edit-title-button") }; var editButton = new Button { Text = Loc.GetString("permissions-eui-edit-title-button") };
editButton.OnPressed += _ => OnEditPressed(admin); editButton.OnPressed += _ => OnEditPressed(admin);
al.AddChild(editButton); al.AddChild(editButton);
@@ -265,14 +265,14 @@ namespace Content.Client.Administration.UI
{ {
var rank = kv.Value; var rank = kv.Value;
var flagsText = string.Join(' ', AdminFlagsHelper.FlagsToNames(rank.Flags).Select(f => $"+{f}")); var flagsText = string.Join(' ', AdminFlagsHelper.FlagsToNames(rank.Flags).Select(f => $"+{f}"));
_menu.AdminRanksList.AddChild(new Label {Text = rank.Name}); _menu.AdminRanksList.AddChild(new Label { Text = rank.Name });
_menu.AdminRanksList.AddChild(new Label _menu.AdminRanksList.AddChild(new Label
{ {
Text = flagsText, Text = flagsText,
HorizontalExpand = true, HorizontalExpand = true,
HorizontalAlignment = Control.HAlignment.Center, HorizontalAlignment = Control.HAlignment.Center,
}); });
var editButton = new Button {Text = Loc.GetString("permissions-eui-edit-admin-rank-button") }; var editButton = new Button { Text = Loc.GetString("permissions-eui-edit-admin-rank-button") };
editButton.OnPressed += _ => OnEditRankPressed(kv); editButton.OnPressed += _ => OnEditRankPressed(kv);
_menu.AdminRanksList.AddChild(editButton); _menu.AdminRanksList.AddChild(editButton);
@@ -316,19 +316,19 @@ namespace Content.Client.Administration.UI
HorizontalAlignment = HAlignment.Right HorizontalAlignment = HAlignment.Right
}; };
AdminsList = new GridContainer {Columns = 5, VerticalExpand = true}; AdminsList = new GridContainer { Columns = 5, VerticalExpand = true };
var adminVBox = new BoxContainer var adminVBox = new BoxContainer
{ {
Orientation = LayoutOrientation.Vertical, Orientation = LayoutOrientation.Vertical,
Children = {new ScrollContainer(){VerticalExpand = true, Children = { AdminsList }}, AddAdminButton}, Children = { new ScrollContainer() { VerticalExpand = true, Children = { AdminsList } }, AddAdminButton },
}; };
TabContainer.SetTabTitle(adminVBox, Loc.GetString("permissions-eui-menu-admins-tab-title")); TabContainer.SetTabTitle(adminVBox, Loc.GetString("permissions-eui-menu-admins-tab-title"));
AdminRanksList = new GridContainer {Columns = 3, VerticalExpand = true}; AdminRanksList = new GridContainer { Columns = 3, VerticalExpand = true };
var rankVBox = new BoxContainer var rankVBox = new BoxContainer
{ {
Orientation = LayoutOrientation.Vertical, Orientation = LayoutOrientation.Vertical,
Children = { new ScrollContainer(){VerticalExpand = true, Children = {AdminRanksList}}, AddAdminRankButton} Children = { new ScrollContainer() { VerticalExpand = true, Children = { AdminRanksList } }, AddAdminRankButton }
}; };
TabContainer.SetTabTitle(rankVBox, Loc.GetString("permissions-eui-menu-admin-ranks-tab-title")); TabContainer.SetTabTitle(rankVBox, Loc.GetString("permissions-eui-menu-admin-ranks-tab-title"));
@@ -355,7 +355,7 @@ namespace Content.Client.Administration.UI
public EditAdminWindow(PermissionsEui ui, PermissionsEuiState.AdminData? data) public EditAdminWindow(PermissionsEui ui, PermissionsEuiState.AdminData? data)
{ {
SetSize = MinSize = (600, 400); MinSize = (600, 400);
SourceData = data; SourceData = data;
Control nameControl; Control nameControl;
@@ -366,18 +366,18 @@ namespace Content.Client.Administration.UI
Title = Loc.GetString("permissions-eui-edit-admin-window-edit-admin-label", Title = Loc.GetString("permissions-eui-edit-admin-window-edit-admin-label",
("admin", name)); ("admin", name));
nameControl = new Label {Text = name}; nameControl = new Label { Text = name };
} }
else else
{ {
Title = Loc.GetString("permissions-eui-menu-add-admin-button"); Title = Loc.GetString("permissions-eui-menu-add-admin-button");
nameControl = NameEdit = new LineEdit {PlaceHolder = Loc.GetString("permissions-eui-edit-admin-window-name-edit-placeholder") }; nameControl = NameEdit = new LineEdit { PlaceHolder = Loc.GetString("permissions-eui-edit-admin-window-name-edit-placeholder") };
} }
TitleEdit = new LineEdit {PlaceHolder = Loc.GetString("permissions-eui-edit-admin-window-title-edit-placeholder") }; TitleEdit = new LineEdit { PlaceHolder = Loc.GetString("permissions-eui-edit-admin-window-title-edit-placeholder") };
RankButton = new OptionButton(); RankButton = new OptionButton();
SaveButton = new Button {Text = Loc.GetString("permissions-eui-edit-admin-window-save-button"), HorizontalAlignment = HAlignment.Right}; SaveButton = new Button { Text = Loc.GetString("permissions-eui-edit-admin-window-save-button"), HorizontalAlignment = HAlignment.Right };
RankButton.AddItem(Loc.GetString("permissions-eui-edit-admin-window-no-rank-button"), NoRank); RankButton.AddItem(Loc.GetString("permissions-eui-edit-admin-window-no-rank-button"), NoRank);
foreach (var (rId, rank) in ui._ranks) foreach (var (rId, rank) in ui._ranks)
@@ -407,21 +407,21 @@ namespace Content.Client.Administration.UI
var inherit = new Button var inherit = new Button
{ {
Text = "I", Text = "I",
StyleClasses = {StyleBase.ButtonOpenRight}, StyleClasses = { StyleBase.ButtonOpenRight },
Disabled = disable, Disabled = disable,
Group = group, Group = group,
}; };
var sub = new Button var sub = new Button
{ {
Text = "-", Text = "-",
StyleClasses = {StyleBase.ButtonOpenBoth}, StyleClasses = { StyleBase.ButtonOpenBoth },
Disabled = disable, Disabled = disable,
Group = group Group = group
}; };
var plus = new Button var plus = new Button
{ {
Text = "+", Text = "+",
StyleClasses = {StyleBase.ButtonOpenLeft}, StyleClasses = { StyleBase.ButtonOpenLeft },
Disabled = disable, Disabled = disable,
Group = group Group = group
}; };
@@ -446,7 +446,7 @@ namespace Content.Client.Administration.UI
inherit.Pressed = true; inherit.Pressed = true;
} }
permGrid.AddChild(new Label {Text = flagName}); permGrid.AddChild(new Label { Text = flagName });
permGrid.AddChild(inherit); permGrid.AddChild(inherit);
permGrid.AddChild(sub); permGrid.AddChild(sub);
permGrid.AddChild(plus); permGrid.AddChild(plus);
@@ -461,7 +461,7 @@ namespace Content.Client.Administration.UI
if (data != null) if (data != null)
{ {
// show remove button. // show remove button.
RemoveButton = new Button {Text = Loc.GetString("permissions-eui-edit-admin-window-remove-flag-button") }; RemoveButton = new Button { Text = Loc.GetString("permissions-eui-edit-admin-window-remove-flag-button") };
bottomButtons.AddChild(RemoveButton); bottomButtons.AddChild(RemoveButton);
} }
@@ -533,7 +533,7 @@ namespace Content.Client.Administration.UI
public EditAdminRankWindow(PermissionsEui ui, KeyValuePair<int, PermissionsEuiState.AdminRankData>? data) public EditAdminRankWindow(PermissionsEui ui, KeyValuePair<int, PermissionsEuiState.AdminRankData>? data)
{ {
Title = Loc.GetString("permissions-eui-edit-admin-rank-window-title"); Title = Loc.GetString("permissions-eui-edit-admin-rank-window-title");
MinSize = SetSize = (600, 400); MinSize = (600, 400);
SourceId = data?.Key; SourceId = data?.Key;
NameEdit = new LineEdit NameEdit = new LineEdit
@@ -546,10 +546,11 @@ namespace Content.Client.Administration.UI
NameEdit.Text = data.Value.Value.Name; NameEdit.Text = data.Value.Value.Name;
} }
SaveButton = new Button { SaveButton = new Button
{
Text = Loc.GetString("permissions-eui-menu-save-admin-rank-button"), Text = Loc.GetString("permissions-eui-menu-save-admin-rank-button"),
HorizontalAlignment = HAlignment.Right, HorizontalAlignment = HAlignment.Right,
HorizontalExpand = true HorizontalExpand = true,
}; };
var flagsBox = new BoxContainer var flagsBox = new BoxContainer
{ {
@@ -585,7 +586,7 @@ namespace Content.Client.Administration.UI
if (data != null) if (data != null)
{ {
// show remove button. // show remove button.
RemoveButton = new Button {Text = Loc.GetString("permissions-eui-menu-remove-admin-rank-button") }; RemoveButton = new Button { Text = Loc.GetString("permissions-eui-menu-remove-admin-rank-button") };
bottomButtons.AddChild(RemoveButton); bottomButtons.AddChild(RemoveButton);
} }