fix

WWhiteDreamProject · Sep 11, 2024 · 301c2d2 · 301c2d2
1 parent cbeaa0b
commit 301c2d2
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 13 deletions.
diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@@ -19,10 +19,10 @@
         Icon="{xe:Tex '/Textures/Interface/hamburger.svg.192dpi.png'}"
         BoundKey = "{x:Static ic:EngineKeyFunctions.EscapeMenu}"
         ToolTip="{Loc 'game-hud-open-escape-menu-button-tooltip'}"
-        MinSize="70 64"
+        MinSize="42 64"
         HorizontalExpand="True"
         AppendStyleClass="{x:Static style:StyleBase.ButtonOpenRight}"
-        />
+        /> <!-- WD EDIT -->
     <ui:MenuButton
         Name="GuidebookButton"
         Access="Internal"
@@ -46,7 +46,7 @@
     <ui:MenuButton
         Name="EmotionsButton"
         Access="Internal"
-        Icon="{xe:Tex '/Textures/Interface/emotions.svg.192dpi.png'}"
+        Icon="{xe:Tex '/Textures/_White/Interface/emotions.svg.192dpi.png'}"
         ToolTip="{Loc 'game-hud-open-emotions-menu-button-tooltip'}"
         BoundKey = "{x:Static is:ContentKeyFunctions.OpenEmotionsMenu}"
         MinSize="42 64"

diff --git a/Resources/Locale/en-US/_white/HUD/game-hud.ftl b/Resources/Locale/en-US/_white/HUD/game-hud.ftl
@@ -0,0 +1 @@
+game-hud-open-emotions-menu-button-tooltip = Open emotions menu.
diff --git a/Resources/Locale/en-US/emotes/emotes.ftl b/Resources/Locale/en-US/emotes/emotes.ftl
diff --git a/Resources/Locale/ru-RU/HUD/game-hud.ftl b/Resources/Locale/ru-RU/HUD/game-hud.ftl
@@ -1,7 +1,6 @@
 game-hud-open-escape-menu-button-tooltip = Открыть меню паузы.
 game-hud-open-guide-menu-button-tooltip = Открыть руководство.
 game-hud-open-character-menu-button-tooltip = Открыть меню персонажа.
-game-hud-open-emotions-menu-button-tooltip = Открыть меню эмоций.
 game-hud-open-inventory-menu-button-tooltip = Открыть меню инвентаря.
 game-hud-open-crafting-menu-button-tooltip = Открыть меню создания.
 game-hud-open-actions-menu-button-tooltip = Открыть меню действий.

diff --git a/Resources/Locale/ru-RU/_white/HUD/game-hud.ftl b/Resources/Locale/ru-RU/_white/HUD/game-hud.ftl
@@ -0,0 +1 @@
+game-hud-open-emotions-menu-button-tooltip = Открыть меню эмоций.
diff --git a/Resources/Locale/ru-RU/emotes/emotes.ftl b/Resources/Locale/ru-RU/emotes/emotes.ftl
diff --git a/Resources/Prototypes/_White/Voice/speech_emotes.yml b/Resources/Prototypes/_White/Voice/speech_emotes.yml
@@ -15,7 +15,7 @@
 - type: emote
   id: Frown
   category: General
-  buttonText: "emote-chat-button-frown"
+  buttonText: "emote-chat-button-text-frown"
   chatMessages: [ "emote-chat-messages-frown-1" ]
   allowMenu: true
 

diff --git a/Resources/Textures/_White/Interface/emotions.svg.192dpi.png b/Resources/Textures/_White/Interface/emotions.svg.192dpi.png
diff --git a/Resources/Textures/_White/Interface/emotions.svg.192dpi.png.yml b/Resources/Textures/_White/Interface/emotions.svg.192dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		game-hud-open-emotions-menu-button-tooltip = Open emotions menu.