From 638a7d023a4f053248a33612dc08771f2908bdd9 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Sat, 28 Dec 2024 22:01:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D0=BF=D0=B5=D1=86=D0=B8=D1=84=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B8=D0=BB?= =?UTF-8?q?=D0=B4=D0=B0=20=D1=84=D1=80=D0=B5=D0=BD=D0=B4=D1=80=D0=B8=20?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BA=20=D0=B8=20=D0=B2=20=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Options/UI/OptionsMenu.xaml | 2 +- Content.Client/Options/UI/OptionsMenu.xaml.cs | 14 ++++++++------ .../UI/Tabs/{SunriseTab.xaml => ExtraTab.xaml} | 4 ++-- .../Tabs/{SunriseTab.xaml.cs => ExtraTab.xaml.cs} | 4 ++-- Resources/Changelog/ChangelogSunrise.yml | 11 +++++++++++ .../_sunrise/escape-menu/ui/options-menu.ftl | 2 +- 6 files changed, 25 insertions(+), 12 deletions(-) rename Content.Client/Options/UI/Tabs/{SunriseTab.xaml => ExtraTab.xaml} (96%) rename Content.Client/Options/UI/Tabs/{SunriseTab.xaml.cs => ExtraTab.xaml.cs} (98%) diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml index 2077625c232..1bcd857c0f4 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml +++ b/Content.Client/Options/UI/OptionsMenu.xaml @@ -3,11 +3,11 @@ Title="{Loc 'ui-options-title'}" MinSize="800 450"> + - diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs index 1da25fedaf4..b5afd6f7f0d 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml.cs +++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs @@ -13,12 +13,14 @@ public OptionsMenu() RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-misc")); - Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-graphics")); - Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls")); - Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio")); - Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-accessibility")); - Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-sunrise")); + // Sunrise-Start + Tabs.SetTabTitle(0, Loc.GetString("ui-options-tab-extra")); + Tabs.SetTabTitle(1, Loc.GetString("ui-options-tab-misc")); + Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-graphics")); + Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-controls")); + Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-audio")); + Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-accessibility")); + // Sunrise-End UpdateTabs(); } diff --git a/Content.Client/Options/UI/Tabs/SunriseTab.xaml b/Content.Client/Options/UI/Tabs/ExtraTab.xaml similarity index 96% rename from Content.Client/Options/UI/Tabs/SunriseTab.xaml rename to Content.Client/Options/UI/Tabs/ExtraTab.xaml index d89bdaf4b2a..8581fc669cc 100644 --- a/Content.Client/Options/UI/Tabs/SunriseTab.xaml +++ b/Content.Client/Options/UI/Tabs/ExtraTab.xaml @@ -1,4 +1,4 @@ - @@ -35,4 +35,4 @@ - + diff --git a/Content.Client/Options/UI/Tabs/SunriseTab.xaml.cs b/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs similarity index 98% rename from Content.Client/Options/UI/Tabs/SunriseTab.xaml.cs rename to Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs index c92f1bd8c18..a5125e0548a 100644 --- a/Content.Client/Options/UI/Tabs/SunriseTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/ExtraTab.xaml.cs @@ -12,12 +12,12 @@ namespace Content.Client.Options.UI.Tabs; [GenerateTypedNameReferences] -public sealed partial class SunriseTab : Control +public sealed partial class ExtraTab : Control { [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public SunriseTab() + public ExtraTab() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index 6db5f6b7dd2..1c1e53a5510 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -9012,3 +9012,14 @@ id: 630 time: '2024-12-28T16:40:32.0000000+00:00' url: https://github.com/space-sunrise/space-station-14/pull/956 +- author: VigersRay + changes: + - message: "\u0412\u044B\u043D\u0435\u0441 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\ + \u043A\u0438 \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u043D\u044B\u0435\ + \ \u0434\u043B\u044F \u0431\u0438\u043B\u0434\u0430 \u0432 \u043D\u0430\u0447\ + \u0430\u043B\u043E \u0438 \u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u043E\ + \u0432\u0430\u043B \u0438\u0445 \u0432 \"\u042D\u043A\u0441\u0442\u0440\u0430\ + \"." + type: Tweak + id: 631 + time: '2024-12-28T19:00:44.457841+00:00' diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/escape-menu/ui/options-menu.ftl index 2c71b6cd761..3ff8138a2aa 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/escape-menu/ui/options-menu.ftl @@ -8,7 +8,7 @@ ui-options-sunrise-general-audio = Аудио ui-options-sunrise-general-graphics = Графика ui-options-sunrise-general-lobby = Лобби ui-options-sunrise-general-combat = Бой -ui-options-tab-sunrise = Санрайз +ui-options-tab-extra = Экстра ui-options-tts-enabled = TTS интеграция ui-options-tape-player-enabled = Школьники с колонками (Нужен рестарт раунда) ui-options-jump-sound-enabled = Звук прыжка