Matchmaking button

DXMainClient/DXGUI/GameClass.cs

@@ -282,6 +282,7 @@ private IServiceProvider BuildServiceProvider(WindowManager windowManager)
                             .AddSingletonXnaControl<CnCNetGameLoadingLobby>()
                             .AddSingletonXnaControl<CnCNetLobby>()
                             .AddSingletonXnaControl<GameInProgressWindow>()
+                            .AddSingletonXnaControl<MatchFoundWindow>()
                             .AddSingletonXnaControl<SkirmishLobby>()
                             .AddSingletonXnaControl<MainMenu>()
                             .AddSingletonXnaControl<MapPreviewBox>()

DXMainClient/DXGUI/Generic/GameSessionDropDown.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 using ClientCore.Extensions;
 using ClientCore.I18N;
@@ -88,6 +88,7 @@ static string Localize(XNAControl control, string attributeName, string defaultV
         switch (key)
         {
             case "Items":
+                Items.Clear();
                 string[] items = value.SplitWithCleanup();
                 string[] itemLabels = iniFile.GetStringListValue(Name, "ItemLabels", "");
                 string[] iconNames = iniFile.GetStringListValue(Name, "Icons", "");

DXMainClient/DXGUI/Generic/MainMenu.cs

@@ -61,6 +61,7 @@ public MainMenu(
             ManualUpdateQueryWindow manualUpdateQueryWindow,
             UpdateWindow updateWindow,
             ExtrasWindow extrasWindow,
+            MatchFoundWindow matchFoundWindow,
             DirectDrawWrapperManager directDrawWrapperManager
         ) : base(windowManager)
         {
@@ -84,6 +85,7 @@ DirectDrawWrapperManager directDrawWrapperManager
             this.manualUpdateQueryWindow = manualUpdateQueryWindow;
             this.updateWindow = updateWindow;
             this.extrasWindow = extrasWindow;
+            this.matchFoundWindow = matchFoundWindow;
             this.directDrawWrapperManager = directDrawWrapperManager;
 
             this.cncnetLobby.UpdateCheck += CncnetLobby_UpdateCheck;
@@ -120,6 +122,7 @@ DirectDrawWrapperManager directDrawWrapperManager
         private readonly ManualUpdateQueryWindow manualUpdateQueryWindow;
         private readonly UpdateWindow updateWindow;
         private readonly ExtrasWindow extrasWindow;
+        private readonly MatchFoundWindow matchFoundWindow;
         private readonly DirectDrawWrapperManager directDrawWrapperManager;
 
         private XNAMessageBox firstRunMessageBox;
@@ -630,6 +633,7 @@ public void PostInit()
             topBar.SetTertiarySwitch(privateMessagingWindow);
             topBar.SetOptionsWindow(optionsWindow);
             WindowManager.AddAndInitializeControl(gameInProgressWindow);
+            WindowManager.AddAndInitializeControl(matchFoundWindow);
 
             foreach (XNAControl control in new XNAControl[]
             {

DXMainClient/DXGUI/Generic/MatchFoundWindow.cs

@@ -0,0 +1,77 @@
+using Rampastring.XNAUI.XNAControls;
+using System;
+using ClientCore;
+using Rampastring.XNAUI;
+using ClientGUI;
+using ClientCore.Extensions;
+using Rectangle = Microsoft.Xna.Framework.Rectangle;
+using Color = Microsoft.Xna.Framework.Color;
+
+namespace DTAClient.DXGUI.Generic
+{
+    /// <summary>
+    /// Displays a dialog in the client when a matchmaking match is found.
+    /// Blocks user interaction until the game process starts.
+    /// </summary>
+    public class MatchFoundWindow : XNAPanel
+    {
+        public MatchFoundWindow(WindowManager windowManager) : base(windowManager)
+        {
+        }
+
+        private bool initialized = false;
+
+        public override void Initialize()
+        {
+            if (initialized)
+                throw new InvalidOperationException("MatchFoundWindow cannot be initialized twice!");
+
+            initialized = true;
+
+            BackgroundTexture = AssetLoader.CreateTexture(new Color(0, 0, 0, 128), 1, 1);
+            PanelBackgroundDrawMode = PanelBackgroundImageDrawMode.STRETCHED;
+            DrawBorders = false;
+            ClientRectangle = new Rectangle(0, 0, WindowManager.RenderResolutionX, WindowManager.RenderResolutionY);
+
+            XNAWindow window = new XNAWindow(WindowManager);
+            window.Name = "MatchFoundWindowBox";
+            window.BackgroundTexture = AssetLoader.CreateTexture(new Color(0, 0, 0, 220), 2, 2);
+            window.PanelBackgroundDrawMode = PanelBackgroundImageDrawMode.STRETCHED;
+            window.ClientRectangle = new Rectangle(0, 0, 350, 120);
+
+            XNALabel explanation = new XNALabel(WindowManager);
+            explanation.FontIndex = 1;
+            explanation.Text = "Match found! Joining room...".L10N("Client:Main:MatchFoundLabel");
+
+            AddChild(window);
+            window.AddChild(explanation);
+
+            base.Initialize();
+
+            explanation.CenterOnParent();
+            window.CenterOnParent();
+
+            Visible = false;
+            Enabled = false;
+
+            GameProcessLogic.GameProcessStarted += SharedUILogic_GameProcessStarted;
+        }
+
+        private void SharedUILogic_GameProcessStarted()
+        {
+            Hide();
+        }
+
+        public void Show()
+        {
+            Visible = true;
+            Enabled = true;
+        }
+
+        public void Hide()
+        {
+            Visible = false;
+            Enabled = false;
+        }
+    }
+}