ui

2021-09-15 16:54:41 +01:00 · 2021-09-15 16:54:41 +01:00 · b8d27a2a6f
commit b8d27a2a6f
parent dd97d5ec4e
6 changed files with 191 additions and 123 deletions
--- a/Sledgemapper/Sledgemapper.csproj
+++ b/Sledgemapper/Sledgemapper.csproj
@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <PublishReadyToRun>false</PublishReadyToRun>
-    <TieredCompilation>false</TieredCompilation>
-    <PublishTrimmed>false</PublishTrimmed>
-    <!-- <TrimMode>link</TrimMode> -->
-    <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose</_ExtraTrimmerArgs>
-  </PropertyGroup>
-  <!-- <Target Name="EnsureAllAssembliesAreLinked" BeforeTargets="PrepareForILLink">
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net5.0</TargetFramework>
+        <PublishReadyToRun>false</PublishReadyToRun>
+        <TieredCompilation>false</TieredCompilation>
+        <PublishTrimmed>false</PublishTrimmed>
+        <!-- <TrimMode>link</TrimMode> -->
+        <_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --verbose</_ExtraTrimmerArgs>
+    </PropertyGroup>
+    <!-- <Target Name="EnsureAllAssembliesAreLinked" BeforeTargets="PrepareForILLink">
    <ItemGroup>
      <ManagedAssemblyToLink>
        <TrimMode>link</TrimMode>
@ -16,58 +16,71 @@
      <TrimmerRootAssembly Include="$(TargetName)" />
    </ItemGroup>
  </Target> -->
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <ApplicationIcon>Icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Icon.ico" />
-    <None Remove="Icon.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Icon.ico" />
-    <EmbeddedResource Include="Icon.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <MonoGameContentReference Include="Content\Content.mgcb" />
-  </ItemGroup>
-  <!-- <ItemGroup>
+    <PropertyGroup>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <ApplicationIcon>Icon.ico</ApplicationIcon>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <DefineConstants>TRACE</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="Icon.ico" />
+        <None Remove="Icon.bmp" />
+   </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Icon.ico" />
+        <EmbeddedResource Include="Icon.bmp" />
+    </ItemGroup>
+    <ItemGroup>
+        <MonoGameContentReference Include="Content\Content.mgcb" />
+    </ItemGroup>
+    <!-- <ItemGroup>
    <TrimmerRootAssembly Include="Microsoft.Xna.Framework.Content.ContentTypeReader" Visible="false" />
  </ItemGroup> -->
-  <ItemGroup>
-    <PackageReference Include="AsyncAwaitBestPractices" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.7.21377.19" />
-    <PackageReference Include="MonoGame.Extended" Version="3.8.0" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client">
-      <Version>6.0.0-preview.7.21378.6</Version>
-    </PackageReference>
-    <PackageReference Include="Myra" Version="1.3.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="polly" Version="7.2.2" />
-    <PackageReference Include="polly.extensions.http" Version="3.0.0" />
-    <PackageReference Include="Refit.HttpClientFactory" Version="6.0.94" />
-    <PackageReference Include="Sentry" Version="3.9.2" />
-    <PackageReference Include="TinyMessenger" Version="1.4.0-alpha3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-   
-     
-  </ItemGroup>
-  <ItemGroup>
-  <Content Include="Content\**\*.xnb">
-    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-  </Content>
-</ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Sledgemapper.Shared\Sledgemapper.Shared.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="AsyncAwaitBestPractices" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.7.21377.19" />
+        <PackageReference Include="MonoGame.Extended" Version="3.8.0" />
+        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
+        <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client">
+            <Version>6.0.0-preview.7.21378.6</Version>
+        </PackageReference>
+        <PackageReference Include="Myra" Version="1.3.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="polly" Version="7.2.2" />
+        <PackageReference Include="polly.extensions.http" Version="3.0.0" />
+        <PackageReference Include="Refit.HttpClientFactory" Version="6.0.94" />
+        <PackageReference Include="Sentry" Version="3.9.2" />
+        <PackageReference Include="TinyMessenger" Version="1.4.0-alpha3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+
+
+    </ItemGroup>
+    <ItemGroup>
+        <Content Include="Content\**\*.xnb">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+    
+    <ItemGroup>
+        <ProjectReference Include="..\Sledgemapper.Shared\Sledgemapper.Shared.csproj" />
+    </ItemGroup>
+    <!--<ItemGroup>
+        <Compile Update="**\*.Custom.cs">
+            <DependentUpon>$([System.String]::Copy(%(Filename)).Replace(".Custom",".cs"))</DependentUpon>
+        </Compile>
+        <Compile Update="**\*.Generated.cs">
+            <DependentUpon>$([System.String]::Copy(%(Filename)).Replace(".Generated",".cs"))</DependentUpon>
+        </Compile>
+        <Content Update="**\*.UI.xmmp">
+            <DependentUpon>$([System.String]::Copy(%(Filename)).Replace(".UI",".cs"))</DependentUpon>
+        </Content>
+    </ItemGroup>-->
+    
 </Project>
--- a/Sledgemapper/UI/CampaignList.Custom.cs
+++ b/Sledgemapper/UI/CampaignList.Custom.cs
@ -11,16 +11,16 @@ namespace Sledgemapper.UI
        private readonly CommunicationManager CommunicationManager;
        private readonly Window Window;
        private readonly TinyMessengerHub Messenger;
-      
+        private readonly Desktop Desktop;
        private Settings _settings;

-        public CampaignList(CommunicationManager communicationManager, Window window, TinyMessengerHub messenger,  Settings settings)
+        public CampaignList(CommunicationManager communicationManager, Window window, TinyMessengerHub messenger,  Settings settings, Desktop desktop)
        {
            BuildUI();
            CommunicationManager = communicationManager;
            Window = window;
            Messenger = messenger;
-          
+          Desktop= desktop;
            _settings = settings;
            BtnNewCampaign.Click += (s, e) =>
            {
@ -56,13 +56,13 @@ namespace Sledgemapper.UI
                Title = "New campaign"
            };

-            var content = new CampaignWindow();
+            var content = new CampaignWindow(CommunicationManager,window,Messenger);
            //content.BtnNewCampaign.Text = "N";
-            content.BtnNewCampaign.Click += OnButtonNewCampaignClicked;
+            //content.BtnNewCampaign.Click += OnButtonNewCampaignClicked;
            window.Content = content;

-            window.ShowModal(Desktop);
-            content.TxtCampaign.SetKeyboardFocus();
+            window.ShowModal(desktop);
+            //content.TxtCampaign.SetKeyboardFocus();
        }

         
@ -85,61 +85,61 @@ namespace Sledgemapper.UI
            campaignSelected = true;
        }

-        private async void OnButtonNewCampaignClicked(object sender, EventArgs e)
-        {
-            var localContent = ((TextButton)sender).GetParentContentInWindow<CampaignWindow>();// localWindow.Content as PlayerWindow;
+        //private async void OnButtonNewCampaignClicked(object sender, EventArgs e)
+        //{
+        //    var localContent = ((TextButton)sender).GetParentContentInWindow<CampaignWindow>();// localWindow.Content as PlayerWindow;

-            var isValid = localContent.Content.TxtCampaign.ValidateTextbox();
-            if (!isValid)
-            {
-                return;
-            }
+        //    var isValid = localContent.Content.TxtCampaign.ValidateTextbox();
+        //    if (!isValid)
+        //    {
+        //        return;
+        //    }

-            //if (CommunicationManager.Connection.State != HubConnectionState.Connected)
-            //{
-            //    lblConnectionStatus.Text = "Connecting";
-            //    await CommunicationManager.Connection.StartAsync();
-            //    UpdateConnectionState(CommunicationManager.Connection);
-            //}
+        //    //if (CommunicationManager.Connection.State != HubConnectionState.Connected)
+        //    //{
+        //    //    lblConnectionStatus.Text = "Connecting";
+        //    //    await CommunicationManager.Connection.StartAsync();
+        //    //    UpdateConnectionState(CommunicationManager.Connection);
+        //    //}

-            var successful = false;
-            try
-            {
-                await CommunicationManager.Api.NewCampaign(localContent.Content.TxtCampaign.Text);
+        //    var successful = false;
+        //    try
+        //    {
+        //        await CommunicationManager.Api.NewCampaign(localContent.Content.TxtCampaign.Text);

-                //if (result)
-                //{
-                //    CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
-                //    CommunicationManager.SessionData.MapEntityAdded -= OnMapEntityAdded;
-                //    CommunicationManager.SessionData.MapEntityDeleted -= OnMapEntityDeleted;
-                //    CommunicationManager.SessionData.MapEntityAdded += OnMapEntityAdded;
-                //    CommunicationManager.SessionData.MapEntityDeleted += OnMapEntityDeleted;
-                //}
-                //successful = result;
-                //var result2 = await CommunicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text);
-                //CommunicationManager.SessionData.SessionId = result2.SessionId;
-                //CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
-            }
-            catch (Exception ex)
-            {
-                //ExceptionlessClient.Default.SubmitException(ex);
-            }
+        //        //if (result)
+        //        //{
+        //        //    CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
+        //        //    CommunicationManager.SessionData.MapEntityAdded -= OnMapEntityAdded;
+        //        //    CommunicationManager.SessionData.MapEntityDeleted -= OnMapEntityDeleted;
+        //        //    CommunicationManager.SessionData.MapEntityAdded += OnMapEntityAdded;
+        //        //    CommunicationManager.SessionData.MapEntityDeleted += OnMapEntityDeleted;
+        //        //}
+        //        //successful = result;
+        //        //var result2 = await CommunicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text);
+        //        //CommunicationManager.SessionData.SessionId = result2.SessionId;
+        //        //CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        //ExceptionlessClient.Default.SubmitException(ex);
+        //    }

-            //if (successful)
-            //{
-            //    //CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
-            //    //CommunicationManager.SessionData.Map = CommunicationManager.SessionData.Map;
-            //    //CommunicationManager.SessionData.Overlays = CommunicationManager.SessionData.Overlays;
-            //    //CommunicationManager.SessionData.Walls = CommunicationManager.SessionData.Walls;
-            //    //lblSessionName.Text = CommunicationManager.SessionData.SessionName;
-            //    //MenuConnectSync.Enabled = true;
-            //    //MenuConnectUpload.Enabled = true;
-            //    localWindow.Close();
-            //}
+        //    //if (successful)
+        //    //{
+        //    //    //CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
+        //    //    //CommunicationManager.SessionData.Map = CommunicationManager.SessionData.Map;
+        //    //    //CommunicationManager.SessionData.Overlays = CommunicationManager.SessionData.Overlays;
+        //    //    //CommunicationManager.SessionData.Walls = CommunicationManager.SessionData.Walls;
+        //    //    //lblSessionName.Text = CommunicationManager.SessionData.SessionName;
+        //    //    //MenuConnectSync.Enabled = true;
+        //    //    //MenuConnectUpload.Enabled = true;
+        //    //    localWindow.Close();
+        //    //}

-            localContent.Window.Close();
+        //    localContent.Window.Close();

-        }
+        //}

        public async Task LoadCampaigns()
        {
--- a/Sledgemapper/UI/campaignsList.xmmp
+++ b/Sledgemapper/UI/campaignsList.xmmp
--- a/Sledgemapper/UI/CampaignWindow.Custom.cs
+++ b/Sledgemapper/UI/CampaignWindow.Custom.cs
@ -1,4 +1,5 @@
 using Myra.Graphics2D.UI;
+using System;
 using System.Threading.Tasks;
 using TinyMessenger;

@ -16,10 +17,64 @@ namespace Sledgemapper.UI
            CommunicationManager = communicationManager;
            Window = window;
            Messenger = messenger;
+            BtnNewCampaign.Click += OnButtonNewCampaignClicked;

-          
        }

+        private async void OnButtonNewCampaignClicked(object sender, EventArgs e)
+        {
+            //var localContent = ((TextButton)sender).GetParentContentInWindow<CampaignWindow>();// localWindow.Content as PlayerWindow;

-	}
+            var isValid = TxtCampaign.ValidateTextbox();
+            if (!isValid)
+            {
+                return;
+            }
+
+            //if (CommunicationManager.Connection.State != HubConnectionState.Connected)
+            //{
+            //    lblConnectionStatus.Text = "Connecting";
+            //    await CommunicationManager.Connection.StartAsync();
+            //    UpdateConnectionState(CommunicationManager.Connection);
+            //}
+
+            var successful = false;
+            try
+            {
+                await CommunicationManager.Api.NewCampaign(TxtCampaign.Text);
+
+                //if (result)
+                //{
+                //    CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
+                //    CommunicationManager.SessionData.MapEntityAdded -= OnMapEntityAdded;
+                //    CommunicationManager.SessionData.MapEntityDeleted -= OnMapEntityDeleted;
+                //    CommunicationManager.SessionData.MapEntityAdded += OnMapEntityAdded;
+                //    CommunicationManager.SessionData.MapEntityDeleted += OnMapEntityDeleted;
+                //}
+                //successful = result;
+                //var result2 = await CommunicationManager.Connection?.InvokeAsync<Session>("JoinSession", localContent.TxtSession.Text);
+                //CommunicationManager.SessionData.SessionId = result2.SessionId;
+                //CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
+            }
+            catch (Exception ex)
+            {
+                //ExceptionlessClient.Default.SubmitException(ex);
+            }
+
+            //if (successful)
+            //{
+            //    //CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
+            //    //CommunicationManager.SessionData.Map = CommunicationManager.SessionData.Map;
+            //    //CommunicationManager.SessionData.Overlays = CommunicationManager.SessionData.Overlays;
+            //    //CommunicationManager.SessionData.Walls = CommunicationManager.SessionData.Walls;
+            //    //lblSessionName.Text = CommunicationManager.SessionData.SessionName;
+            //    //MenuConnectSync.Enabled = true;
+            //    //MenuConnectUpload.Enabled = true;
+            //    localWindow.Close();
+            //}
+
+            Window.Close();
+
+        }
+    }
 }
--- a/Sledgemapper/UI/MainWidget.Custom.cs
+++ b/Sledgemapper/UI/MainWidget.Custom.cs
@ -20,7 +20,7 @@ namespace Sledgemapper.UI
    public partial class MainWidget
    {
        private readonly CommunicationManager CommunicationManager;
-     
+
        private Settings _settings;
        private readonly TinyMessengerHub _messenger;

@ -32,7 +32,7 @@ namespace Sledgemapper.UI
            BuildUI();

            CommunicationManager = communicationManager;
-            
+
            _settings = settings;
            _cachedContent = cachedContent;
            Window = window;
@ -383,7 +383,7 @@ namespace Sledgemapper.UI
                Title = "Campaigns"
            };

-            var content = new CampaignList(CommunicationManager, window, _messenger, _settings);
+            var content = new CampaignList(CommunicationManager, window, _messenger, _settings, Desktop);
            await content.LoadCampaigns();
            //var campaigns = await CommunicationManager.Api.GetCampaigns();
            //foreach (var campaign in campaigns)
--- a/Sledgemapper/UI/MainWidget.UI.xmmp
+++ b/Sledgemapper/UI/MainWidget.UI.xmmp