Skip to content

[TWEAK] update Overlay flavor #2669

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
Darkiich merged 2 commits into from
Mar 31, 2026
+67 −64
Merged

[TWEAK] update Overlay flavor #2669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a585807
update Overlay
CrimeMoot Mar 30, 2026
de3ca43
fix
CrimeMoot Mar 30, 2026
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
118 changes: 59 additions & 59 deletions Content.Client/FlavorText/FlavorText.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<!-- ФАЙЛ БЫЛ ПОЛНОСТЬЮ ПЕРЕПИСАН ADT, ПРИ АПСТРИМЕ ОСТАВЛЯТЬ НАШУ ВЕРСИЮ -->
<Control Name="CFlavorText" xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
xmlns:ui="clr-namespace:Robust.Client.UserInterface.Controls;assembly=Robust.Client">

<BoxContainer Orientation="Vertical"
HorizontalExpand="True"
VerticalExpand="True"
SeparationOverride="10">
<PanelContainer HorizontalExpand="True" VerticalExpand="True">
<!-- Основной контент -->
<BoxContainer Orientation="Vertical"
HorizontalExpand="True"
VerticalExpand="True"
SeparationOverride="10">

<PanelContainer HorizontalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#2d2d2d"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Vertical" Margin="10">
<ui:Label Text="{Loc 'flavor-interface-rules-title'}"
Margin="0 0 0 8"
StyleClasses="LabelHeading"/>
<BoxContainer Orientation="Horizontal">
<Button Name="RulesButton"
Text="{Loc 'flavor-interface-rules-button'}"
HorizontalExpand="True"/>
<ui:Label Name="RulesStatusLabel"
Text="{Loc 'flavor-interface-rules-not-accepted'}"
HorizontalExpand="True"
HorizontalAlignment="Right"/>
</BoxContainer>
</BoxContainer>
</PanelContainer>
<!-- Flavor Text Section -->
<PanelContainer HorizontalExpand="True" VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#2d2d2d"/>
</PanelContainer.PanelOverride>

<!-- Flavor Text Section -->
<PanelContainer HorizontalExpand="True" VerticalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#2d2d2d"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Vertical" Margin="10">
<Button Name="PreviewButton" Text="{Loc 'flavor-interface-prewiev'}" />
<ui:Label Text="{Loc 'flavor-interface-flavor-text-title'}"
Margin="0 0 0 8"
StyleClasses="LabelHeading"/>

<BoxContainer Orientation="Vertical" Margin="10">
<Button Name="PreviewButton" Text="{Loc 'flavor-interface-prewiev'}" />
<ui:Label Text="{Loc 'flavor-interface-flavor-text-title'}"
Margin="0 0 0 8"
StyleClasses="LabelHeading"/>
<TextEdit Name="CFlavorTextInput"
Access="Public"
MinSize="220 100"
HorizontalExpand="True"
VerticalExpand="True"
Editable="False"/>
</BoxContainer>
</PanelContainer>

<TextEdit Name="CFlavorTextInput"
Access="Public"
MinSize="220 100"
HorizontalExpand="True"
VerticalExpand="True"
Editable="False"/>
</BoxContainer>
</PanelContainer>
<!-- Headshot URL Section -->
<PanelContainer HorizontalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#2d2d2d"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Vertical" Margin="10">
<ui:Label Text="{Loc 'flavor-interface-headshot-url'}"
Margin="0 0 0 8"
StyleClasses="LabelHeading"/>
<ui:Label Text="{Loc 'flavor-interface-headshot-url-desc'}"
Margin="0 0 0 18"/>
<ui:LineEdit Name="CHeadshotUrlInput"
Access="Public"
HorizontalExpand="True"
PlaceHolder="Вставьте сюда ссылку"
MinSize="0 30"
Editable="False"/>
</BoxContainer>
</PanelContainer>
</BoxContainer>

<!-- Headshot URL Section -->
<PanelContainer HorizontalExpand="True">
<PanelContainer.PanelOverride>
<gfx:StyleBoxFlat BackgroundColor="#2d2d2d"/>
</PanelContainer.PanelOverride>
<BoxContainer Orientation="Vertical" Margin="10">
<ui:Label Text="{Loc 'flavor-interface-headshot-url'}"
Margin="0 0 0 8"
StyleClasses="LabelHeading"/>
<ui:Label Text="{Loc 'flavor-interface-headshot-url-desc'}"
Margin="0 0 0 18"/>
<ui:LineEdit Name="CHeadshotUrlInput"
Access="Public"
<!-- Overlay с кнопкой правил -->
<controls:StripeBack Name="RulesOverlay"
HorizontalExpand="True"
PlaceHolder="Вставьте сюда ссылку"
MinSize="0 30"
Editable="False"/>
VerticalExpand="True">
<BoxContainer Orientation="Vertical"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Button Name="RulesButton"
Text="{Loc 'flavor-interface-rules-button'}"
Margin="0 0 0 8"/>
<ui:Label Name="RulesStatusLabel"
Text="{Loc 'flavor-interface-rules-not-accepted'}"
HorizontalAlignment="Center"/>
</BoxContainer>
</PanelContainer>
</BoxContainer>
</controls:StripeBack>
</PanelContainer>
</Control>
6 changes: 4 additions & 2 deletions Content.Client/FlavorText/FlavorText.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private void OpenRulesPopup()

_rulesPopup = new FlavorTextRulesPopup
{
Timer = 5f
Timer = 1f
};

_rulesPopup.OnAcceptPressed += OnRulesAccepted;
Expand Down Expand Up @@ -82,7 +82,7 @@ private void CloseRulesPopup()

_rulesPopup.OnAcceptPressed -= OnRulesAccepted;
_rulesPopup.OnCancelPressed -= OnRulesPopupClosed;

_rulesPopup.Orphan();
_rulesPopup = null;
}
Expand All @@ -96,6 +96,8 @@ private void UpdateControlsState()
RulesStatusLabel.Text = _rulesAccepted
? _rulesAcceptedText
: _rulesNotAcceptedText;

RulesOverlay.Visible = !_rulesAccepted;
// ADT-Tweak-end
}

Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/ADT/Preferences/ui/flavor-text.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
flavor-interface-rules-title = Правила описания персонажа
flavor-interface-rules-button = Читать правила
flavor-interface-rules-accepted = Правила приняты
flavor-interface-rules-not-accepted = Правила не приняты
flavor-interface-rules-not-accepted = Чтобы отредактировать описание персонажа, вы должны прочитать и понять приведенные выше правила.
flavor-rules-accept = Я ознакомился и согласен следовать правилам
flavor-rules-cancel = Отмена
flavor-rules-wait = Кнопка принятия будет разблокирована через { $time } секунд.
Loading