Skip to content
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

[FIX] - Lobby chat background fix + votemenu button #1042

Merged
merged 2 commits into from
Feb 10, 2025
Merged

[FIX] - Lobby chat background fix + votemenu button #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3189e8
fix + new Button
trest100 Feb 10, 2025
a2aaaba
Merge remote-tracking branch 'upstream/master' into LobbyFIX
trest100 Feb 10, 2025
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
14 changes: 7 additions & 7 deletions Content.Client/Lobby/UI/LobbyGui.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<!-- Vertical Padding -->
<Control VerticalExpand="True" />
<RichTextLabel Name="LabelName" Access="Public" HorizontalAlignment="Left"
VerticalAlignment="Center" Margin="20 0 0 420" />
VerticalAlignment="Center" Margin="20 0 0 450" />
<!-- Left Bot Panel -->
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom">
<info:DevInfoBanner Name="DevInfoBanner" VerticalExpand="false" Margin="3 3 3 3" />
<PanelContainer StyleClasses="AngleRect">
<RichTextLabel Name="LobbySong" Access="Public" HorizontalAlignment="Center" />
<RichTextLabel Name="LobbySong" StyleClasses="LobbyBackground" Access="Public" HorizontalAlignment="Center" />
</PanelContainer>
</BoxContainer>
<!-- Left Panel -->
Expand Down Expand Up @@ -61,11 +61,11 @@
Access="Public"
ButtonText="{Loc 'ui-lobby-options-button'}"
Margin="0 10 0 10" />
<!--<buttons:WhiteLobbyTextButton
Name="DiscordButton"
<buttons:WhiteLobbyTextButton
Name="VotemenuButton"
Access="Public"
ButtonText="Привязать Discord"
Margin="0 10 0 10" />-->
ButtonText="{Loc 'ui-lobby-open-votemenu'}"
Margin="0 10 0 10" />
<buttons:WhiteLobbyTextButton
Name="AHelpButton"
Access="Public"
Expand Down Expand Up @@ -95,7 +95,7 @@
</Control>
</BoxContainer>
<!-- Right Panel -->
<PanelContainer Name="RightSide" Access="Public" StyleClasses="AngleRect" HorizontalAlignment="Right" VerticalExpand="True"
<PanelContainer Name="RightSide" Access="Public" StyleClasses="LobbyBackground" HorizontalAlignment="Right" VerticalExpand="True"
VerticalAlignment="Stretch">
<BoxContainer Orientation="Vertical" HorizontalExpand="True">
<!-- Top row -->
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Lobby/UI/LobbyGui.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public LobbyGui()

OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow();
// BACKMEN Edit Start
/*DiscordButton.OnPressed += _ => _stalinManager.RequestUri();*/
VotemenuButton.OnPressed += _ => _consoleHost.ExecuteCommand("votemenu");
ChangelogButton.OnPressed += _ => UserInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
// BACKMEN Edit End
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/lobby/lobby-gui.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ui-lobby-title = Лобби: {$serverName}
ui-lobby-open-votemenu = Меню Голосований
ui-lobby-ahelp-button = AHelp
ui-lobby-options-button = Настройки
ui-lobby-leave-button = Выйти
Expand Down
Loading