Skip to content

Commit

Permalink
refactor: Strip 'Chaos' prefix from panel names and events
Browse files Browse the repository at this point in the history
  • Loading branch information
JJL772 committed Jan 17, 2024
1 parent 356be61 commit a2ed126
Show file tree
Hide file tree
Showing 43 changed files with 549 additions and 549 deletions.
2 changes: 1 addition & 1 deletion layout/components/player-card.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Image class="playercard__background-image" src="file://{images}/playercards/card_bg.png" scaling="stretch-to-cover-preserve-aspect" />
<!-- <Panel class="playercard__black-overlay" /> 50% opacity black overlay to make the white text readable -->
<Panel class="playercard__main">
<ChaosAvatarImage class="playercard__player-avatar" steamid="local" />
<AvatarImage class="playercard__player-avatar" steamid="local" />
<Panel class="playercard__details-panel">
<Label id="PlayerName" class="playercard__player-name" text="{s:name}" />
<Panel id="Units" class="playercard__units">
Expand Down
4 changes: 2 additions & 2 deletions layout/components/settings/enum-dropdown.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosSettingsEnumDropDown class="settings-enum-dropdown">
<SettingsEnumDropDown class="settings-enum-dropdown">
<Panel class="settings-enum-dropdown__title-container">
<Label class="settings-enum-dropdown__title" id="Title" />
</Panel>
<Panel class="settings-enum-dropdown__input-container">
<DropDown id="DropDown" class="dropdown settings-enum-dropdown__dropdown" menuclass="dropdown-menu" />
</Panel>
</ChaosSettingsEnumDropDown>
</SettingsEnumDropDown>
</root>
4 changes: 2 additions & 2 deletions layout/components/settings/enum.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosSettingsEnum class="settings-enum">
<SettingsEnum class="settings-enum">
<Panel class="settings-enum__title-container">
<Label id="title" class="settings-enum__title" />
</Panel>
<Panel id="values" class="settings-enum__values" />
</ChaosSettingsEnum>
</SettingsEnum>
</root>
4 changes: 2 additions & 2 deletions layout/components/settings/keybinder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosSettingsKeyBinder class="settings-keybinder">
<SettingsKeyBinder class="settings-keybinder">
<Panel class="settings-keybinder__title-container">
<Label id="title" class="settings-keybinder__title" />
</Panel>
Expand All @@ -13,5 +13,5 @@
</Panel>
<Button id="clearkeybinding" class="settings-keybinder__clear" />
</Panel>
</ChaosSettingsKeyBinder>
</SettingsKeyBinder>
</root>
4 changes: 2 additions & 2 deletions layout/components/settings/slider.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</styles>


<ChaosSettingsSlider class="settings-slider">
<SettingsSlider class="settings-slider">
<Panel class="settings-slider__title-container">
<Label class="settings-slider__title" id="Title" />
</Panel>
Expand All @@ -15,5 +15,5 @@
</TooltipPanel>
<TextEntry class="textentry settings-slider__textentry" maxchars="6" textmode="numeric" id="Value" />
</Panel>
</ChaosSettingsSlider>
</SettingsSlider>
</root>
4 changes: 2 additions & 2 deletions layout/components/settings/toggle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

<!-- Unused, doesn't have styling -->

<ChaosSettingsToggle>
<SettingsToggle>
<Panel class="flow-right vertical-align-center full-width">
<Panel id="TitleContainer">
<Label id="Title" />
</Panel>
<ToggleButton id="Toggle" />
</Panel>
</ChaosSettingsToggle>
</SettingsToggle>

</root>
4 changes: 2 additions & 2 deletions layout/components/show-fps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosFPSMeter class="fpsmeter">
<FPSMeter class="fpsmeter">
<Label id="FPSLabel" class="fpsmeter__label" />
</ChaosFPSMeter>
</FPSMeter>
</root>
4 changes: 2 additions & 2 deletions layout/hud/bone-counts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosHudBoneCounts class="bonecounts">
<HudBoneCounts class="bonecounts">
<Label class="bonecounts__label" text="All computed bones: {d:bones}" />
<Label class="bonecounts__label" text="Blending rules only: {d:blendingonly}" />
</ChaosHudBoneCounts>
</HudBoneCounts>
</root>
2 changes: 1 addition & 1 deletion layout/hud/ghost-entities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<snippets>
<snippet name="ghost-ent-panel">
<Panel class="ghost-ent">
<ChaosAvatarImage id="GhostAvatar" class="ghost-ent__avatar" />
<AvatarImage id="GhostAvatar" class="ghost-ent__avatar" />
<Panel id="NamePanel" class="ghost-ent__namepanel ghost-ent-namepanel">
<Image class="full-width full-height" src="file://{images}/playercards/card_bg.png" scaling="stretch-to-cover-preserve-aspect" />
<Label id="GhostName" class="ghost-ent-namepanel__label text-l" text="" />
Expand Down
6 changes: 3 additions & 3 deletions layout/hud/hint-text.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Purpose: hard-coded layout file for <ChaosHudHintText />
Purpose: hard-coded layout file for <HudHintText />
Label with id HintLabel is required
.hud-hint-\-visible class will be set when the panel should be visible, otherwise it should be invisible
Expand All @@ -10,11 +10,11 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosHudHintText hittest="false" class="hud-hint">
<HudHintText hittest="false" class="hud-hint">
<Panel class="hud-hint__text">
<Panel class="vertical-center top-bottom-flow">
<Label id="HintLabel" html="true" class="hud-hint__label mono-spaced-font-bold" />
</Panel>
</Panel>
</ChaosHudHintText>
</HudHintText>
</root>
20 changes: 10 additions & 10 deletions layout/hud/hud.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<include src="file://{resources}/styles/main.scss" />
</styles>

<ChaosHud hittest="false">
<Hud hittest="false">
<!-- Non-interactive HUD elements have hit test disabled for efficiency -->

<!-- In world UI is first to make sure it shows up behind all "screen-looking" UI -->
Expand Down Expand Up @@ -39,7 +39,7 @@
<MomHudTimer />
<MomHudStrafeSync />
<MomHudGroundboost />
<ChaosHudHintText id="HudHintText" />
<HudHintText id="HudHintText" />
</Panel>

<!-- Anchored to the bottom-left corner of the screen, laid out from top to bottom -->
Expand All @@ -63,9 +63,9 @@
<MomHudWeaponSelection />
</Panel>

<ChaosHudBlurTarget id="HudBlur" blurrects="Leaderboards TrickList" class="hud-blur" hittest="false" hittestchildren="false">
<ChaosBackbufferImagePanel class="full" />
</ChaosHudBlurTarget>
<HudBlurTarget id="HudBlur" blurrects="Leaderboards TrickList" class="hud-blur" hittest="false" hittestchildren="false">
<BackbufferImagePanel class="full" />
</HudBlurTarget>

<!-- HUD anchored to top center of screen, laid out vertically top-to-bottom
- NOTE: Not really set up properly - HudTeamCounter should dynamically move
Expand All @@ -74,8 +74,8 @@
- while HudTeamCounter is visible
-->
<Panel id="HudTopCenter" hittest="false">
<ChaosHudShowPos />
<ChaosHudBoneCounts />
<HudShowPos />
<HudBoneCounts />
<MomHudSpectate id="Spectator" />
<MomHudJumpStats />
</Panel>
Expand All @@ -89,13 +89,13 @@

<!-- Make sure these are at the bottom to get the z-order right -->
<ToastManager />
<ChaosPopupManager id="PopupManager" onpopupsdismissed="" />
<PopupManager id="PopupManager" onpopupsdismissed="" />
<ContextMenuManager id="ContextMenuManager" />
<ChaosTooltipManager id="TooltipManager" hittest="false" />
<TooltipManager id="TooltipManager" hittest="false" />

<!-- Console notifications should always draw above anything else! -->
<Panel id="HudNotify" hittest="false" hittestchildren="false">
<Frame src="file://{resources}/layout/hud/console-notify.xml" />
</Panel>
</ChaosHud>
</Hud>
</root>
2 changes: 1 addition & 1 deletion layout/hud/replay-controls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TextEntry class="textentry replaycontrols__gototick" id="ReplayControlsGotoTick" placeholder="Goto tick" oninputsubmit="ReplayControls.gotoTick()" clearaftersubmit="true" />
</Panel>
<Label text="Time: {g:time:curr_time}/{g:time:total_time}" />
<ChaosSettingsSlider text="#Replay_Timescale" min="0" max="10" percentage="true" value100percent="1" convar="mom_replay_timescale" />
<SettingsSlider text="#Replay_Timescale" min="0" max="10" percentage="true" value100percent="1" convar="mom_replay_timescale" />
</Panel>
<Panel class="flow-right">
<Button class="button" onactivate="GameInterfaceAPI.ConsoleCommand('mom_replay_restart');">
Expand Down
4 changes: 2 additions & 2 deletions layout/hud/show-pos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
</snippet>
</snippets>

<ChaosHudShowPos class="showpos">
</ChaosHudShowPos>
<HudShowPos class="showpos">
</HudShowPos>
</root>
2 changes: 1 addition & 1 deletion layout/modals/toasts/custom-layout-example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</script>

<Panel class="toast flow-right p-3 bg-gray-100" onload="onLoad()">
<ChaosAvatarImage class="vertical-align-center mr-5" style="width: 32px; height: 32px;" steamid="local" />
<AvatarImage class="vertical-align-center mr-5" style="width: 32px; height: 32px;" steamid="local" />
<Panel class="flow-down">
<Label class="toast__title" text="Custom Toast Example" />
<Label class="toast__message" text="you can put whatever stupid panels in here" />
Expand Down
10 changes: 5 additions & 5 deletions layout/pages/controls-library.xml
Original file line number Diff line number Diff line change
Expand Up @@ -747,15 +747,15 @@

<Label class="text-h3 mt-3" text="Settings" />
<Panel class="flow-down half-width">
<ChaosSettingsEnum text="ChaosSettingsEnum">
<SettingsEnum text="SettingsEnum">
<RadioButton group="settingsenum" text="1" value="0" />
<RadioButton group="settingsenum" text="2" value="1" />
</ChaosSettingsEnum>
<ChaosSettingsEnumDropDown text="ChaosSettingsEnumDropDown">
</SettingsEnum>
<SettingsEnumDropDown text="SettingsEnumDropDown">
<Label text="1" value="0" id="settingsenumdropdown1" />
<Label text="2" value="1" id="settingsenumdropdown2" />
</ChaosSettingsEnumDropDown>
<ChaosSettingsSlider text="ChaosSettingsSlider" min="0.1" max="10" />
</SettingsEnumDropDown>
<SettingsSlider text="SettingsSlider" min="0.1" max="10" />
</Panel>

<Label class="text-h1 mt-3 overflow-noclip" text="THIS LETS ME SEE THE STUFF AT THE BOTTOM IN WINDOWED MODE :)" />
Expand Down
4 changes: 2 additions & 2 deletions layout/pages/drawer/lobby.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Panel class="lobby-lobbies__wrapper" acceptsinput="true">
<Panel id="LobbyOrigin" class="lobby-lobbies__origin" />
<Panel class="lobby-lobbies__entry">
<ChaosAvatarImage id="LobbyPlayerAvatar" class="lobby-lobbies__avatar" acceptsinput="true" />
<AvatarImage id="LobbyPlayerAvatar" class="lobby-lobbies__avatar" acceptsinput="true" />
<Image id="LobbyType" class="lobby-lobbies__type" textureheight="64" onmouseout="UiToolkitAPI.HideTitleImageTextTooltip();" />
<Label id="LobbyTitle" class="lobby-lobbies__text lobby-lobbies__title" text="{s:lobbyTitle}" />
<Label id="LobbyPlayerNumbers" class="text-h lobby-lobbies__text lobby-lobbies__players" text="{s:lobbyPlayerCount}" />
Expand All @@ -24,7 +24,7 @@
</snippet>
<snippet name="lobby-member-entry">
<Panel class="lobby-members__entry" acceptsinput="true">
<ChaosAvatarImage id="MemberAvatar" class="lobby-members__avatar" />
<AvatarImage id="MemberAvatar" class="lobby-members__avatar" />
<Label id="MemberName" class="lobby-members__text lobby-members__name" text="{s:memberName}" />
<!--<Label id="MemberPrestige" /> -->
<Panel class="lobby-members__map-container">
Expand Down
4 changes: 2 additions & 2 deletions layout/pages/intro-movie.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<include src="file://{scripts}/pages/intro-movie.js" />
</scripts>

<ChaosIntroMovie hittest="false">
<IntroMovie hittest="false">
<!-- Doesn't actually include the notifications, but we use its position to figure out where to show them -->
<Panel id="SteamNotificationsPlaceholder" hittest="false" />
</ChaosIntroMovie>
</IntroMovie>
</root>
2 changes: 1 addition & 1 deletion layout/pages/leaderboards/entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Label class="leaderboard-entry__item leaderboard-entry__rank" text="{d:rank}" />

<Panel class="leaderboard-entry__item leaderboard-entry__item leaderboard-entry__player">
<ChaosAvatarImage id="LeaderboardEntryAvatarPanel" class="leaderboard-entry__item leaderboard-entry__avatar" />
<AvatarImage id="LeaderboardEntryAvatarPanel" class="leaderboard-entry__item leaderboard-entry__avatar" />
<Label class="leaderboard-entry__item leaderboard-entry__name" text="{s:player}" />
</Panel>

Expand Down
10 changes: 5 additions & 5 deletions layout/pages/main-menu/main-menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</snippet>
</snippets>

<ChaosMainMenu class="InitialDisplay MainMenuRootPanel" hittest="false" onload="MainMenu.onMainMenuLoaded()">
<MainMenu class="InitialDisplay MainMenuRootPanel" hittest="false" onload="MainMenu.onMainMenuLoaded()">

<Panel id="MainMenuInput" class="mainmenu">
<!-- Topnav -->
Expand Down Expand Up @@ -115,7 +115,7 @@
<!-- Backbuffer blur: used to blur the backbuffer in the pause menu -->
<BaseBlurTarget id="PauseMenuMainMenuBlur" class="mainmenu__pause-blur" blurrects="PauseMenuMainMenuContent">
<!-- Backbuffer background -->
<ChaosBackbufferImagePanel class="mainmenu__background PauseMenuModeOnly" />
<BackbufferImagePanel class="mainmenu__background PauseMenuModeOnly" />
</BaseBlurTarget>
</BaseBlurTarget>
<!-- /Backgrounds -->
Expand Down Expand Up @@ -174,12 +174,12 @@

<!-- Make sure these are at the bottom to get the z-order right -->
<ToastManager />
<ChaosPopupManager id="PopupManager" onpopupsdismissed="" />
<PopupManager id="PopupManager" onpopupsdismissed="" />
<ContextMenuManager id="ContextMenuManager" />
<ChaosTooltipManager id="TooltipManager" hittest="false" />
<TooltipManager id="TooltipManager" hittest="false" />

<!-- Doesn't actually include the notifications, but we use its position to figure out where to show them -->
<Panel id="SteamNotificationsPlaceholder" hittest="false" />

</ChaosMainMenu>
</MainMenu>
</root>
30 changes: 15 additions & 15 deletions layout/pages/settings/audio.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@
</Panel>
</Panel>

<ChaosSettingsSlider text="#Settings_Volume_Master" min="0" max="1" percentage="true" convar="volume" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_Master" min="0" max="1" percentage="true" convar="volume" hasdocspage="false" />

<ChaosSettingsSlider text="#Settings_Volume_Music" min="0" max="1" percentage="true" convar="snd_volume_music" tags="music" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_Music" min="0" max="1" percentage="true" convar="snd_volume_music" tags="music" hasdocspage="false" />

<ChaosSettingsSlider text="#Settings_Volume_Ambient" min="0" max="1" percentage="true" convar="snd_volume_ambient" tags="ambient" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_Ambient" min="0" max="1" percentage="true" convar="snd_volume_ambient" tags="ambient" hasdocspage="false" />

<ChaosSettingsSlider text="#Settings_Volume_Weapon" min="0" max="1" percentage="true" convar="snd_volume_weapon" tags="weapon" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_Weapon" min="0" max="1" percentage="true" convar="snd_volume_weapon" tags="weapon" hasdocspage="false" />

<ChaosSettingsSlider text="#Settings_Volume_Movement" min="0" max="1" percentage="true" convar="snd_volume_footsteps" tags="movement,footsteps" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_Movement" min="0" max="1" percentage="true" convar="snd_volume_footsteps" tags="movement,footsteps" hasdocspage="false" />

<ChaosSettingsSlider text="#Settings_Volume_Ghosts" min="0" max="1" percentage="true" convar="mom_snd_volume_ghosts" infomessage="#Settings_Volume_Ghost_Info" tags="ghosts" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_Ghosts" min="0" max="1" percentage="true" convar="mom_snd_volume_ghosts" infomessage="#Settings_Volume_Ghost_Info" tags="ghosts" hasdocspage="false" />

<ChaosSettingsSlider text="#Settings_Volume_UI" min="0" max="1" percentage="true" convar="snd_volume_ui" tags="ui,interface" hasdocspage="false" />
<SettingsSlider text="#Settings_Volume_UI" min="0" max="1" percentage="true" convar="snd_volume_ui" tags="ui,interface" hasdocspage="false" />

</Panel>

Expand All @@ -59,14 +59,14 @@
</TooltipPanel>
</Panel>

<ChaosSettingsEnumDropDown text="#Settings_AudioDevices_Speaker" convar="snd_surround_speakers" oninputsubmit="BaseSpeakerConfigurationChanged()" hasdocspage="false">
<SettingsEnumDropDown text="#Settings_AudioDevices_Speaker" convar="snd_surround_speakers" oninputsubmit="BaseSpeakerConfigurationChanged()" hasdocspage="false">
<Label text="#Settings_AudioDevices_Speaker_StereoHeadphones" id="speakerconfig1" value="0" />
<Label text="#Settings_AudioDevices_Speaker_StereoSpeakers" id="speakerconfig2" value="2" />
<Label text="#Settings_AudioDevices_Speaker_Quad" id="speakerconfig3" value="4" />
<Label text="#Settings_AudioDevices_Speaker_51" id="speakerconfig4" value="5" />
</ChaosSettingsEnumDropDown>
</SettingsEnumDropDown>

<ChaosSettingsEnumDropDown text="#Settings_AudioDevices_Device" id="DeviceConfigurationEnum" convar="sound_device_override" oninputsubmit="BaseAudioDeviceConfigurationChanged()" hasdocspage="false">
<SettingsEnumDropDown text="#Settings_AudioDevices_Device" id="DeviceConfigurationEnum" convar="sound_device_override" oninputsubmit="BaseAudioDeviceConfigurationChanged()" hasdocspage="false">
<!--placeholder labels that will be modified in cui_audiosettingsscreen-->
<Label id="device1" text="XXXXXX 1" />
<Label id="device2" text="XXXXXX 2" />
Expand All @@ -76,17 +76,17 @@
<Label id="device6" text="XXXXXX 6" />
<Label id="device7" text="XXXXXX 7" />
<Label id="device8" text="XXXXXX 8" />
</ChaosSettingsEnumDropDown>
</SettingsEnumDropDown>

<ChaosSettingsEnum text="#Settings_AudioDevices_HWCompat" convar="snd_hwcompat" hasdocspage="false">
<SettingsEnum text="#Settings_AudioDevices_HWCompat" convar="snd_hwcompat" hasdocspage="false">
<RadioButton group="hwcompat" text="#Common_Off" value="0" />
<RadioButton group="hwcompat" text="#Common_On" value="1" />
</ChaosSettingsEnum>
</SettingsEnum>

<ChaosSettingsEnum text="#Settings_AudioDevices_Background" convar="snd_mute_losefocus" hasdocspage="false">
<SettingsEnum text="#Settings_AudioDevices_Background" convar="snd_mute_losefocus" hasdocspage="false">
<RadioButton group="losefocus" text="#Common_Off" value="0" />
<RadioButton group="losefocus" text="#Common_On" value="1" />
</ChaosSettingsEnum>
</SettingsEnum>

</Panel>
</BaseAudioSettings>
Expand Down
Loading

0 comments on commit a2ed126

Please sign in to comment.