Re-organize all projects (#4166)
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
<v:VoteCallMenu xmlns="https://spacestation14.io"
|
||||
xmlns:cuic="clr-namespace:Content.Client.UserInterface.Controls"
|
||||
<ui:VoteCallMenu xmlns="https://spacestation14.io"
|
||||
xmlns:v="clr-namespace:Content.Client.Voting"
|
||||
xmlns:ui="clr-namespace:Content.Client.Voting.UI"
|
||||
xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
|
||||
MouseFilter="Stop" MinSize="350 150">
|
||||
<PanelContainer StyleClasses="AngleRect" />
|
||||
<VBoxContainer>
|
||||
@@ -13,7 +14,7 @@
|
||||
SizeFlagsVertical="ShrinkCenter" />
|
||||
</MarginContainer>
|
||||
</HBoxContainer>
|
||||
<cuic:HighDivider />
|
||||
<ui1:HighDivider />
|
||||
|
||||
<MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
|
||||
MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">
|
||||
@@ -36,4 +37,4 @@
|
||||
</MarginContainer>
|
||||
|
||||
</VBoxContainer>
|
||||
</v:VoteCallMenu>
|
||||
</ui:VoteCallMenu>
|
||||
@@ -1,5 +1,5 @@
|
||||
#nullable enable
|
||||
using Content.Client.UserInterface.Stylesheets;
|
||||
using Content.Client.Stylesheets;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.Console;
|
||||
@@ -11,7 +11,7 @@ using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Maths;
|
||||
|
||||
namespace Content.Client.Voting
|
||||
namespace Content.Client.Voting.UI
|
||||
{
|
||||
[GenerateTypedNameReferences]
|
||||
public partial class VoteCallMenu : BaseWindow
|
||||
@@ -2,7 +2,7 @@
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
|
||||
namespace Content.Client.Voting
|
||||
namespace Content.Client.Voting.UI
|
||||
{
|
||||
/// <summary>
|
||||
/// LITERALLY just a button that opens the vote call menu.
|
||||
@@ -1,16 +1,15 @@
|
||||
using System;
|
||||
using Content.Client.UserInterface.Stylesheets;
|
||||
using Content.Client.Stylesheets;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Log;
|
||||
using Robust.Shared.Maths;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Client.Voting
|
||||
namespace Content.Client.Voting.UI
|
||||
{
|
||||
[GenerateTypedNameReferences]
|
||||
public partial class VotePopup : Control
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Content.Shared.Network.NetMessages;
|
||||
using Content.Shared.Voting;
|
||||
using Robust.Client;
|
||||
using Robust.Client.Console;
|
||||
using Robust.Client.UserInterface;
|
||||
@@ -31,7 +31,7 @@ namespace Content.Client.Voting
|
||||
[Dependency] private readonly IBaseClient _client = default!;
|
||||
|
||||
private readonly Dictionary<int, ActiveVote> _votes = new();
|
||||
private readonly Dictionary<int, VotePopup> _votePopups = new();
|
||||
private readonly Dictionary<int, UI.VotePopup> _votePopups = new();
|
||||
private Control? _popupContainer;
|
||||
|
||||
public bool CanCallVote { get; private set; }
|
||||
@@ -83,7 +83,7 @@ namespace Content.Client.Voting
|
||||
|
||||
foreach (var (vId, vote) in _votes)
|
||||
{
|
||||
var popup = new VotePopup(vote);
|
||||
var popup = new UI.VotePopup(vote);
|
||||
|
||||
_votePopups.Add(vId, popup);
|
||||
_popupContainer.AddChild(popup);
|
||||
@@ -148,7 +148,7 @@ namespace Content.Client.Voting
|
||||
|
||||
if (@new && _popupContainer != null)
|
||||
{
|
||||
var popup = new VotePopup(existingVote);
|
||||
var popup = new UI.VotePopup(existingVote);
|
||||
|
||||
_votePopups.Add(voteId, popup);
|
||||
_popupContainer.AddChild(popup);
|
||||
|
||||
Reference in New Issue
Block a user