Skip to content

Remove unnecessary skin settings descriptions #33959

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

Merged
bdach merged 1 commit into from
Jun 30, 2025
Merged

Remove unnecessary skin settings descriptions #33959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions osu.Game/Localisation/SkinComponents/BeatmapAttributeTextStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ public static class BeatmapAttributeTextStrings
/// </summary>
public static LocalisableString Attribute => new TranslatableString(getKey(@"attribute"), @"Attribute");

/// <summary>
/// "The attribute to be displayed."
/// </summary>
public static LocalisableString AttributeDescription => new TranslatableString(getKey(@"attribute_description"), @"The attribute to be displayed.");

/// <summary>
/// "Template"
/// </summary>
Expand Down
30 changes: 0 additions & 30 deletions osu.Game/Localisation/SkinComponents/SkinnableComponentStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,16 @@ public static class SkinnableComponentStrings
/// </summary>
public static LocalisableString SpriteName => new TranslatableString(getKey(@"sprite_name"), @"Sprite name");

/// <summary>
/// "The filename of the sprite"
/// </summary>
public static LocalisableString SpriteNameDescription => new TranslatableString(getKey(@"sprite_name_description"), @"The filename of the sprite");

/// <summary>
/// "Font"
/// </summary>
public static LocalisableString Font => new TranslatableString(getKey(@"font"), @"Font");

/// <summary>
/// "The font to use."
/// </summary>
public static LocalisableString FontDescription => new TranslatableString(getKey(@"font_description"), @"The font to use.");

/// <summary>
/// "Text"
/// </summary>
public static LocalisableString TextElementText => new TranslatableString(getKey(@"text_element_text"), @"Text");

/// <summary>
/// "The text to be displayed."
/// </summary>
public static LocalisableString TextElementTextDescription => new TranslatableString(getKey(@"text_element_text_description"), @"The text to be displayed.");

/// <summary>
/// "Corner radius"
/// </summary>
Expand All @@ -54,31 +39,16 @@ public static class SkinnableComponentStrings
/// </summary>
public static LocalisableString ShowLabel => new TranslatableString(getKey(@"show_label"), @"Show label");

/// <summary>
/// "Whether the component&#39;s label should be shown."
/// </summary>
public static LocalisableString ShowLabelDescription => new TranslatableString(getKey(@"show_label_description"), @"Whether the component's label should be shown.");

/// <summary>
/// "Colour"
/// </summary>
public static LocalisableString Colour => new TranslatableString(getKey(@"colour"), @"Colour");

/// <summary>
/// "The colour of the component."
/// </summary>
public static LocalisableString ColourDescription => new TranslatableString(getKey(@"colour_description"), @"The colour of the component.");

/// <summary>
/// "Text colour"
/// </summary>
public static LocalisableString TextColour => new TranslatableString(getKey(@"text_colour"), @"Text colour");

/// <summary>
/// "The colour of the text."
/// </summary>
public static LocalisableString TextColourDescription => new TranslatableString(getKey(@"text_colour_description"), @"The colour of the text.");

/// <summary>
/// "Text weight"
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisab
MaxValue = 1,
};

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel))]
public Bindable<bool> ShowLabel { get; } = new BindableBool(true);

public bool UsesFixedAnchor { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public partial class ArgonComboCounter : ComboCounter
MaxValue = 1,
};

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel))]
public Bindable<bool> ShowLabel { get; } = new BindableBool(true);

[BackgroundDependencyLoader]
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/ArgonPerformancePointsCounter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public partial class ArgonPerformancePointsCounter : PerformancePointsCounter, I
MaxValue = 1,
};

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel))]
public Bindable<bool> ShowLabel { get; } = new BindableBool(true);

public override bool IsValid
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public partial class ArgonScoreCounter : GameplayScoreCounter, ISerialisableDraw
MaxValue = 1,
};

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel), nameof(SkinnableComponentStrings.ShowLabelDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.ShowLabel))]
public Bindable<bool> ShowLabel { get; } = new BindableBool(true);

public bool UsesFixedAnchor { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/ArgonSongProgress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public partial class ArgonSongProgress : SongProgress
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.UseRelativeSize))]
public BindableBool UseRelativeSize { get; } = new BindableBool(true);

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour))]
public BindableColour4 AccentColour { get; } = new BindableColour4(Colour4.White);

[Resolved]
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/ArgonWedgePiece.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public partial class ArgonWedgePiece : CompositeDrawable, ISerialisableDrawable
[SettingSource("Inverted shear")]
public BindableBool InvertShear { get; } = new BindableBool();

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour))]
public BindableColour4 AccentColour { get; } = new BindableColour4(Color4Extensions.FromHex("#66CCFF"));

public ArgonWedgePiece()
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public partial class DefaultSongProgress : SongProgress
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.UseRelativeSize))]
public BindableBool UseRelativeSize { get; } = new BindableBool(true);

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour))]
public BindableColour4 AccentColour { get; } = new BindableColour4(Colour4.White);

[Resolved]
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Skinning/Components/BeatmapAttributeText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace osu.Game.Skinning.Components
[UsedImplicitly]
public partial class BeatmapAttributeText : FontAdjustableSkinComponent
{
[SettingSource(typeof(BeatmapAttributeTextStrings), nameof(BeatmapAttributeTextStrings.Attribute), nameof(BeatmapAttributeTextStrings.AttributeDescription))]
[SettingSource(typeof(BeatmapAttributeTextStrings), nameof(BeatmapAttributeTextStrings.Attribute))]
public Bindable<BeatmapAttribute> Attribute { get; } = new Bindable<BeatmapAttribute>(BeatmapAttribute.StarRating);

[SettingSource(typeof(BeatmapAttributeTextStrings), nameof(BeatmapAttributeTextStrings.Template), nameof(BeatmapAttributeTextStrings.TemplateDescription))]
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Skinning/Components/BoxElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public partial class BoxElement : CompositeDrawable, ISerialisableDrawable
Precision = 0.01f
};

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour), nameof(SkinnableComponentStrings.ColourDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Colour))]
public BindableColour4 AccentColour { get; } = new BindableColour4(Colour4.White);

public BoxElement()
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Skinning/Components/TextElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace osu.Game.Skinning.Components
[UsedImplicitly]
public partial class TextElement : FontAdjustableSkinComponent
{
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextElementText), nameof(SkinnableComponentStrings.TextElementTextDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextElementText))]
public Bindable<string> Text { get; } = new Bindable<string>("Circles!");

private readonly OsuSpriteText text;
Expand Down
4 changes: 2 additions & 2 deletions osu.Game/Skinning/FontAdjustableSkinComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public abstract partial class FontAdjustableSkinComponent : Container, ISerialis
{
public bool UsesFixedAnchor { get; set; }

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Font), nameof(SkinnableComponentStrings.FontDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.Font))]
public Bindable<Typeface> Font { get; } = new Bindable<Typeface>(Typeface.Torus);

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextWeight), SettingControlType = typeof(WeightDropdown))]
public Bindable<FontWeight> TextWeight { get; } = new Bindable<FontWeight>(FontWeight.Regular);

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextColour), nameof(SkinnableComponentStrings.TextColourDescription))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.TextColour))]
public BindableColour4 TextColour { get; } = new BindableColour4(Colour4.White);

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Skinning/SkinnableSprite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public partial class SkinnableSprite : SkinnableDrawable, ISerialisableDrawable
[Resolved]
private TextureStore textures { get; set; } = null!;

[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.SpriteName), nameof(SkinnableComponentStrings.SpriteNameDescription), SettingControlType = typeof(SpriteSelectorControl))]
[SettingSource(typeof(SkinnableComponentStrings), nameof(SkinnableComponentStrings.SpriteName), SettingControlType = typeof(SpriteSelectorControl))]
public Bindable<string> SpriteName { get; } = new Bindable<string>(string.Empty);

[Resolved]
Expand Down
Loading