From f6b107353ab4e64deef52526db494cee9bd0d282 Mon Sep 17 00:00:00 2001 From: Valtos Date: Wed, 20 Mar 2024 22:54:45 +0300 Subject: [PATCH] - add: OldNeoInterface (#108) * ebal * setup gui * AAAAAAAAAA EBLAN --- .../CustomControls/PlayerListControl.xaml.cs | 2 +- .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs | 2 +- .../Atmos/Monitor/UI/AirAlarmWindow.xaml | 6 +- Content.Client/Cargo/UI/CargoBountyMenu.xaml | 2 +- .../Chemistry/UI/ChemMasterWindow.xaml | 8 +- .../Chemistry/UI/ReagentDispenserWindow.xaml | 2 +- .../Construction/UI/FlatpackCreatorMenu.xaml | 4 +- Content.Client/DoAfter/DoAfterOverlay.cs | 2 +- Content.Client/FlavorText/FlavorText.xaml | 2 +- .../Humanoid/SingleMarkingPicker.xaml | 2 +- Content.Client/Lathe/UI/LatheMenu.xaml | 2 +- Content.Client/Lathe/UI/RecipeTooltip.xaml | 8 +- .../Launcher/LauncherConnectingGui.xaml | 119 ++---- .../Launcher/LauncherConnectingGui.xaml.cs | 6 +- Content.Client/Lobby/UI/LobbyGui.xaml | 2 +- Content.Client/Lobby/UI/LobbyGui.xaml.cs | 2 + Content.Client/MainMenu/BackgroundControl.cs | 52 +++ .../MassMedia/Ui/NewsWriteMenu.xaml | 2 +- Content.Client/Mech/Ui/MechMenu.xaml | 2 +- .../NetworkConfiguratorLinkMenu.xaml.cs | 2 +- Content.Client/Options/UI/OptionsMenu.xaml | 2 +- .../Options/UI/Tabs/AdminSettingsTab.xaml | 1 + Content.Client/Options/UI/Tabs/AudioTab.xaml | 2 + .../Options/UI/Tabs/GraphicsTab.xaml | 1 + Content.Client/Options/UI/Tabs/MiscTab.xaml | 1 + .../Options/UI/Tabs/NetworkTab.xaml | 1 + .../PDA/PdaNavigationButton.xaml.cs | 6 +- Content.Client/PDA/PdaProgramItem.xaml.cs | 2 +- Content.Client/PDA/PdaSettingsButton.xaml.cs | 2 +- Content.Client/Parallax/ParallaxControl.cs | 2 +- .../UI/ParticleAcceleratorControlMenu.cs | 4 +- .../Preferences/UI/CharacterSetupGui.xaml | 22 +- .../Preferences/UI/CharacterSetupGui.xaml.cs | 14 +- .../Preferences/UI/HumanoidProfileEditor.xaml | 369 ++++++++++-------- .../UI/HumanoidProfileEditor.xaml.cs | 1 - .../Research/UI/ResearchConsoleMenu.xaml | 6 +- Content.Client/Silicons/Borgs/BorgMenu.xaml | 4 +- .../Silicons/Laws/Ui/SiliconLawMenu.xaml | 2 +- Content.Client/Stylesheets/StyleBase.cs | 21 +- Content.Client/Stylesheets/StyleNano.cs | 201 ++++++---- Content.Client/Stylesheets/StyleSpace.cs | 23 +- .../UserInterface/Controls/MenuButton.cs | 9 +- .../Screens/DefaultGameScreen.xaml.cs | 1 + .../Screens/SeparatedChatGameScreen.xaml | 2 - .../Systems/Atmos/GasTank/GasTankWindow.cs | 2 +- .../Systems/Chat/ChatUIController.cs | 3 +- .../Systems/Chat/Widgets/ChatBox.xaml | 6 +- .../MenuBar/Widgets/GameTopMenuBar.xaml | 206 +++++----- .../Ranged/Systems/GunSystem.AmmoCounter.cs | 15 +- Content.Client/Wires/UI/WiresMenu.cs | 2 +- Content.Client/_White/JoinQueue/QueueGui.xaml | 41 +- .../BodyScanner/BodyScannerConsoleWindow.xaml | 4 +- Content.Shared/_White/WhiteCVars.cs | 2 +- .../ru-RU/escape-menu/ui/escape-menu.ftl | 2 +- .../ru-RU/launcher/launcher-connecting.ftl | 49 +-- .../humanoid-character-profile.ftl | 2 +- .../preferences/ui/character-setup-gui.ftl | 1 + .../Locale/ru-RU/voting/ui/vote-call-menu.ftl | 2 +- .../ru-RU/white/join-queue/queue-screen.ftl | 5 +- Resources/Prototypes/Shaders/shaders.yml | 5 + .../Interface/Default/SlotBackground.png | Bin 318 -> 206 bytes .../Default/down_arrow.svg.192dpi.png | Bin 0 -> 898 bytes .../Default/left_arrow.svg.192dpi.png | Bin 777 -> 916 bytes .../Default/right_arrow.svg.192dpi.png | Bin 842 -> 945 bytes .../Interface/Default/slot_highlight.png | Bin 123 -> 234 bytes .../Interface/Default/up_arrow.svg.192dpi.png | Bin 0 -> 849 bytes .../ItemStatus/Bullets/chambered.png | Bin 496 -> 579 bytes .../ItemStatus/Bullets/chambered_rotated.png | Bin 496 -> 578 bytes .../Interface/ItemStatus/Bullets/empty.png | Bin 524 -> 561 bytes .../Interface/ItemStatus/Bullets/normal.png | Bin 498 -> 578 bytes .../Interface/ItemStatus/Bullets/small.png | Bin 497 -> 583 bytes .../Interface/ItemStatus/Bullets/tiny.png | Bin 479 -> 538 bytes .../Interface/Misc/progress_bar.rsi/icon.png | Bin 2107 -> 552 bytes .../Nano/black_panel_dark_thin_border.png | Bin 142 -> 163 bytes .../Nano/black_panel_light_thin_border.png | Bin 142 -> 163 bytes .../Interface/Nano/button.svg.96dpi.png | Bin 615 -> 194 bytes .../Interface/Nano/chat_sub_background.png | Bin 88 -> 163 bytes .../Interface/Nano/checkbox_checked.svg | 53 +-- .../Nano/checkbox_checked.svg.96dpi.png | Bin 333 -> 235 bytes .../Interface/Nano/checkbox_unchecked.svg | 39 +- .../Nano/checkbox_unchecked.svg.96dpi.png | Bin 252 -> 217 bytes .../Textures/Interface/Nano/cross.svg.png | Bin 237 -> 239 bytes .../Interface/Nano/filter.svg.96dpi.png | Bin 404 -> 868 bytes .../Textures/Interface/Nano/fucky_wucky.png | Bin 33061 -> 52223 bytes .../Textures/Interface/Nano/gay_shit.png | Bin 1820 -> 181 bytes .../Nano/item_status_left.svg.96dpi.png | Bin 459 -> 216 bytes .../Nano/item_status_middle.svg.96dpi.png | Bin 438 -> 220 bytes .../Nano/item_status_right.svg.96dpi.png | Bin 409 -> 225 bytes .../Nano/light_panel_background_bordered.png | Bin 88 -> 163 bytes .../Textures/Interface/Nano/lineedit.png | Bin 139 -> 163 bytes .../Textures/Interface/Nano/lobby_gay.png | Bin 1023 -> 1023 bytes .../Textures/Interface/Nano/placeholder.png | Bin 482 -> 516 bytes .../Textures/Interface/Nano/shaded_lobby.png | Bin 0 -> 4676 bytes .../Interface/Nano/slider_fill.svg.96dpi.png | Bin 267 -> 222 bytes .../Nano/slider_grabber.svg.96dpi.png | Bin 371 -> 278 bytes .../Nano/slider_outline.svg.96dpi.png | Bin 284 -> 247 bytes Resources/Textures/Interface/Nano/square.png | Bin 170 -> 154 bytes .../Textures/Interface/Nano/stripeback.svg | 42 +- .../Interface/Nano/stripeback.svg.96dpi.png | Bin 251 -> 226 bytes .../Interface/Nano/tabcontainer_panel.png | Bin 123 -> 200 bytes Resources/Textures/Interface/Nano/tooltip.png | Bin 102 -> 163 bytes ...transparent_window_background_bordered.png | Bin 88 -> 196 bytes Resources/Textures/Interface/Nano/whisper.png | Bin 103 -> 1771 bytes .../Interface/Nano/window_background.png | Bin 105 -> 163 bytes .../Nano/window_background_bordered.png | Bin 88 -> 163 bytes .../Textures/Interface/Nano/window_header.png | Bin 81 -> 237 bytes .../Interface/Nano/window_header_alert.png | Bin 85 -> 224 bytes .../VerbIcons/Spare/poweronoff.svg.192dpi.png | Bin 2010 -> 1989 bytes .../Interface/VerbIcons/anchor.svg.192dpi.png | Bin 1156 -> 902 bytes .../VerbIcons/antag-e_sword-temp.192dpi.png | Bin 1061 -> 1551 bytes .../Interface/VerbIcons/buckle.svg.192dpi.png | Bin 656 -> 1585 bytes .../Interface/VerbIcons/clock.svg.192dpi.png | Bin 1681 -> 1346 bytes .../Interface/VerbIcons/close.svg.192dpi.png | Bin 487 -> 1097 bytes .../VerbIcons/cutlery.svg.192dpi.png | Bin 855 -> 629 bytes .../Interface/VerbIcons/debug.svg.192dpi.png | Bin 1113 -> 1465 bytes .../Interface/VerbIcons/delete.svg.192dpi.png | Bin 1124 -> 293 bytes .../delete_transparent.svg.192dpi.png | Bin 650 -> 419 bytes .../Interface/VerbIcons/die.svg.192dpi.png | Bin 755 -> 387 bytes .../Interface/VerbIcons/dot.svg.192dpi.png | Bin 570 -> 1410 bytes .../Interface/VerbIcons/drink.svg.192dpi.png | Bin 2130 -> 941 bytes .../Interface/VerbIcons/drop.svg.192dpi.png | Bin 587 -> 1291 bytes .../Interface/VerbIcons/eject.svg.192dpi.png | Bin 457 -> 957 bytes .../VerbIcons/examine.svg.192dpi.png | Bin 986 -> 1285 bytes .../Interface/VerbIcons/flip.svg.192dpi.png | Bin 1863 -> 1632 bytes .../Interface/VerbIcons/fold.svg.192dpi.png | Bin 2619 -> 1867 bytes .../Interface/VerbIcons/group.svg.192dpi.png | Bin 415 -> 659 bytes .../Interface/VerbIcons/in.svg.192dpi.png | Bin 574 -> 957 bytes .../VerbIcons/information.svg.192dpi.png | Bin 1707 -> 1398 bytes .../Interface/VerbIcons/insert.svg.192dpi.png | Bin 543 -> 957 bytes .../Interface/VerbIcons/light.svg.192dpi.png | Bin 764 -> 1295 bytes .../Interface/VerbIcons/lock.svg.192dpi.png | Bin 8059 -> 3426 bytes .../Interface/VerbIcons/open.svg.192dpi.png | Bin 481 -> 977 bytes .../Interface/VerbIcons/outfit.svg.192dpi.png | Bin 1044 -> 1033 bytes .../Interface/VerbIcons/pickup.svg.192dpi.png | Bin 513 -> 1241 bytes .../Interface/VerbIcons/plus.svg.192dpi.png | Bin 693 -> 219 bytes .../Interface/VerbIcons/point.svg.192dpi.png | Bin 821 -> 1425 bytes .../VerbIcons/refresh.svg.192dpi.png | Bin 1175 -> 1730 bytes .../VerbIcons/rejuvenate.svg.192dpi.png | Bin 1577 -> 1513 bytes .../Interface/VerbIcons/remove_tape.png | Bin 973 -> 1314 bytes .../VerbIcons/rotate_ccw.svg.192dpi.png | Bin 724 -> 1690 bytes .../VerbIcons/rotate_cw.svg.192dpi.png | Bin 713 -> 1632 bytes .../VerbIcons/sentient.svg.192dpi.png | Bin 1412 -> 1200 bytes .../VerbIcons/settings.svg.192dpi.png | Bin 1139 -> 1721 bytes .../Interface/VerbIcons/smite.svg.192dpi.png | Bin 766 -> 1233 bytes .../Interface/VerbIcons/snow.svg.192dpi.png | Bin 3194 -> 1890 bytes .../Interface/VerbIcons/spill.svg.192dpi.png | Bin 872 -> 1289 bytes .../VerbIcons/unbuckle.svg.192dpi.png | Bin 730 -> 442 bytes .../Interface/VerbIcons/unlock.svg.192dpi.png | Bin 7983 -> 3492 bytes .../Interface/VerbIcons/vv.svg.192dpi.png | Bin 1052 -> 842 bytes .../Interface/VerbIcons/zap.svg.192dpi.png | Bin 1371 -> 1012 bytes .../Interface/character.svg.192dpi.png | Bin 1068 -> 327 bytes .../Interface/emotions.svg.192dpi.png | Bin 355 -> 769 bytes .../Textures/Interface/fist.svg.192dpi.png | Bin 991 -> 1023 bytes .../Textures/Interface/gavel.svg.192dpi.png | Bin 1060 -> 1254 bytes .../Interface/hamburger.svg.192dpi.png | Bin 309 -> 206 bytes .../Textures/Interface/hammer.svg.192dpi.png | Bin 808 -> 634 bytes .../Textures/Interface/info.svg.192dpi.png | Bin 1076 -> 585 bytes .../Interface/inventory.svg.192dpi.png | Bin 884 -> 328 bytes .../Textures/Interface/meatyore-shop-icon.png | Bin 2206 -> 690 bytes .../Textures/Interface/sandbox.svg.192dpi.png | Bin 1469 -> 243 bytes Resources/Textures/Logo/icon.ico | Bin 112724 -> 15406 bytes Resources/Textures/Logo/icon/icon-128x128.png | Bin 4392 -> 2893 bytes Resources/Textures/Logo/icon/icon-16x16.png | Bin 924 -> 310 bytes Resources/Textures/Logo/icon/icon-24x24.png | Bin 1297 -> 451 bytes Resources/Textures/Logo/icon/icon-256x256.png | Bin 8696 -> 8595 bytes Resources/Textures/Logo/icon/icon-32x32.png | Bin 1670 -> 546 bytes Resources/Textures/Logo/icon/icon-48x48.png | Bin 1827 -> 862 bytes Resources/Textures/Logo/icon/icon-64x64.png | Bin 2360 -> 1184 bytes Resources/Textures/Logo/logo-ru-mini.png | Bin 0 -> 30655 bytes Resources/Textures/Logo/logo-ru.pdn | Bin 0 -> 126601 bytes Resources/Textures/Logo/logo-ru.png | Bin 539450 -> 93778 bytes .../Textures/Shaders/White/bettercrt.swsl | 8 +- Resources/Textures/Shaders/White/comet.swsl | 270 +++++++++++++ .../Textures/Shaders/White/cyberglitch.swsl | 78 ++++ Resources/Textures/Shaders/White/grid.swsl | 60 +++ Resources/Textures/Shaders/White/melt.swsl | 28 ++ .../Textures/Shaders/White/postglitch.swsl | 54 +++ .../Textures/Shaders/White/starfield.swsl | 159 ++++++++ 178 files changed, 1370 insertions(+), 696 deletions(-) create mode 100644 Content.Client/MainMenu/BackgroundControl.cs create mode 100644 Resources/Textures/Interface/Default/down_arrow.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Default/up_arrow.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/shaded_lobby.png create mode 100644 Resources/Textures/Logo/logo-ru-mini.png create mode 100644 Resources/Textures/Logo/logo-ru.pdn create mode 100644 Resources/Textures/Shaders/White/comet.swsl create mode 100644 Resources/Textures/Shaders/White/cyberglitch.swsl create mode 100644 Resources/Textures/Shaders/White/grid.swsl create mode 100644 Resources/Textures/Shaders/White/melt.swsl create mode 100644 Resources/Textures/Shaders/White/postglitch.swsl create mode 100644 Resources/Textures/Shaders/White/starfield.swsl diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs index 7366fc5633..4957782a8a 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs @@ -49,7 +49,7 @@ namespace Content.Client.Administration.UI.CustomControls PopulateList(_adminSystem.PlayerList); FilterLineEdit.OnTextChanged += _ => FilterList(); _adminSystem.PlayerListChanged += PopulateList; - BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(20, 20, 20)}; + BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(11, 11, 11)}; } private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data) diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs index 222ee83324..4799d76e19 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs @@ -19,7 +19,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab private const string ArrowUp = "↑"; private const string ArrowDown = "↓"; - private readonly Color _altColor = Color.FromHex("#141414"); + private readonly Color _altColor = Color.FromHex("#050505"); private readonly Color _defaultColor = Color.FromHex("#191919"); private readonly AdminSystem _adminSystem; private IReadOnlyList _players = new List(); diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml index 1cdc1b7da7..1e6083c8b0 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml @@ -43,7 +43,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/Content.Client/Cargo/UI/CargoBountyMenu.xaml b/Content.Client/Cargo/UI/CargoBountyMenu.xaml index bb263ff6c4..506947a774 100644 --- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml +++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml @@ -9,7 +9,7 @@ HorizontalExpand="True"> - + - + @@ -39,7 +39,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml index c83660f8f5..f118b03f92 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml @@ -40,7 +40,7 @@ SizeFlagsStretchRatio="6" MinSize="0 150"> - + - + @@ -35,7 +35,7 @@ HorizontalExpand="True" RectClipContent="True"> - + diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs index 7440f98fe6..24f139c4d9 100644 --- a/Content.Client/DoAfter/DoAfterOverlay.cs +++ b/Content.Client/DoAfter/DoAfterOverlay.cs @@ -134,7 +134,7 @@ public sealed class DoAfterOverlay : Overlay } var xProgress = (EndX - StartX) * elapsedRatio + StartX; - var box = new Box2(new Vector2(StartX, 3f) / EyeManager.PixelsPerMeter, + var box = new Box2(new Vector2(StartX, 2f) / EyeManager.PixelsPerMeter, new Vector2(xProgress, 4f) / EyeManager.PixelsPerMeter); box = box.Translated(position); diff --git a/Content.Client/FlavorText/FlavorText.xaml b/Content.Client/FlavorText/FlavorText.xaml index f36bf9fe18..3578f82d41 100644 --- a/Content.Client/FlavorText/FlavorText.xaml +++ b/Content.Client/FlavorText/FlavorText.xaml @@ -2,7 +2,7 @@ xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"> - + diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml b/Content.Client/Humanoid/SingleMarkingPicker.xaml index c816c52e9c..3b4392e030 100644 --- a/Content.Client/Humanoid/SingleMarkingPicker.xaml +++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml @@ -13,7 +13,7 @@ - + diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml index 2b97166f05..b924798395 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml +++ b/Content.Client/Lathe/UI/LatheMenu.xaml @@ -38,7 +38,7 @@ SizeFlagsStretchRatio="4"> - + - - diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml index 0e8120e958..d8ba4e8534 100644 --- a/Content.Client/Launcher/LauncherConnectingGui.xaml +++ b/Content.Client/Launcher/LauncherConnectingGui.xaml @@ -1,96 +1,37 @@ - - - - - - - - - - - -