michele/sledgemapper
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 4 Wiki Activity

ui
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Michele Scandura 2021-09-15 16:54:41 +01:00
parent dd97d5ec4e
commit b8d27a2a6f
6 changed files with 191 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Sledgemapper/Sledgemapper.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
@ -67,7 +67,20 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Sledgemapper.Shared\Sledgemapper.Shared.csproj" /> <ProjectReference Include="..\Sledgemapper.Shared\Sledgemapper.Shared.csproj" />
</ItemGroup> </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> </Project>

104
Sledgemapper/UI/CampaignList.Custom.cs
View file

@ -11,16 +11,16 @@ namespace Sledgemapper.UI
private readonly CommunicationManager CommunicationManager; private readonly CommunicationManager CommunicationManager;
private readonly Window Window; private readonly Window Window;
private readonly TinyMessengerHub Messenger; private readonly TinyMessengerHub Messenger;
private readonly Desktop Desktop;
private Settings _settings; 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(); BuildUI();
CommunicationManager = communicationManager; CommunicationManager = communicationManager;
Window = window; Window = window;
Messenger = messenger; Messenger = messenger;
Desktop= desktop;
_settings = settings; _settings = settings;
BtnNewCampaign.Click += (s, e) => BtnNewCampaign.Click += (s, e) =>
{ {
@ -56,13 +56,13 @@ namespace Sledgemapper.UI
Title = "New campaign" Title = "New campaign"
}; };
var content = new CampaignWindow(); var content = new CampaignWindow(CommunicationManager,window,Messenger);
//content.BtnNewCampaign.Text = "N"; //content.BtnNewCampaign.Text = "N";
content.BtnNewCampaign.Click += OnButtonNewCampaignClicked; //content.BtnNewCampaign.Click += OnButtonNewCampaignClicked;
window.Content = content; window.Content = content;
window.ShowModal(Desktop); window.ShowModal(desktop);
content.TxtCampaign.SetKeyboardFocus(); //content.TxtCampaign.SetKeyboardFocus();
} }
@ -85,61 +85,61 @@ namespace Sledgemapper.UI
campaignSelected = true; campaignSelected = true;
} }
private async void OnButtonNewCampaignClicked(object sender, EventArgs e) //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;
}
//if (CommunicationManager.Connection.State != HubConnectionState.Connected)
//{ //{
// lblConnectionStatus.Text = "Connecting"; // var localContent = ((TextButton)sender).GetParentContentInWindow<CampaignWindow>();// localWindow.Content as PlayerWindow;
// await CommunicationManager.Connection.StartAsync();
// UpdateConnectionState(CommunicationManager.Connection); // var isValid = localContent.Content.TxtCampaign.ValidateTextbox();
// if (!isValid)
// {
// return;
// } // }
var successful = false; // //if (CommunicationManager.Connection.State != HubConnectionState.Connected)
try // //{
{ // // lblConnectionStatus.Text = "Connecting";
await CommunicationManager.Api.NewCampaign(localContent.Content.TxtCampaign.Text); // // await CommunicationManager.Connection.StartAsync();
// // UpdateConnectionState(CommunicationManager.Connection);
// //}
//if (result) // var successful = false;
// try
// { // {
// CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text; // await CommunicationManager.Api.NewCampaign(localContent.Content.TxtCampaign.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) // //if (result)
//{ // //{
// // CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text; // // CommunicationManager.SessionData.SessionName = localContent.TxtSession.Text;
// //CommunicationManager.SessionData.Map = CommunicationManager.SessionData.Map; // // CommunicationManager.SessionData.MapEntityAdded -= OnMapEntityAdded;
// //CommunicationManager.SessionData.Overlays = CommunicationManager.SessionData.Overlays; // // CommunicationManager.SessionData.MapEntityDeleted -= OnMapEntityDeleted;
// //CommunicationManager.SessionData.Walls = CommunicationManager.SessionData.Walls; // // CommunicationManager.SessionData.MapEntityAdded += OnMapEntityAdded;
// //lblSessionName.Text = CommunicationManager.SessionData.SessionName; // // CommunicationManager.SessionData.MapEntityDeleted += OnMapEntityDeleted;
// //MenuConnectSync.Enabled = true; // //}
// //MenuConnectUpload.Enabled = true; // //successful = result;
// localWindow.Close(); // //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);
// } // }
localContent.Window.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();
//}
public async Task LoadCampaigns() public async Task LoadCampaigns()
{ {

0
Sledgemapper/UI/campaignsList.xmmp → Sledgemapper/UI/CampaignList.xmmp
View file

57
Sledgemapper/UI/CampaignWindow.Custom.cs
View file

@ -1,4 +1,5 @@
using Myra.Graphics2D.UI; using Myra.Graphics2D.UI;
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using TinyMessenger; using TinyMessenger;
@ -16,10 +17,64 @@ namespace Sledgemapper.UI
CommunicationManager = communicationManager; CommunicationManager = communicationManager;
Window = window; Window = window;
Messenger = messenger; 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();
} }
} }
}

2
Sledgemapper/UI/MainWidget.Custom.cs
View file

@ -383,7 +383,7 @@ namespace Sledgemapper.UI
Title = "Campaigns" Title = "Campaigns"
}; };
var content = new CampaignList(CommunicationManager, window, _messenger, _settings); var content = new CampaignList(CommunicationManager, window, _messenger, _settings, Desktop);
await content.LoadCampaigns(); await content.LoadCampaigns();
//var campaigns = await CommunicationManager.Api.GetCampaigns(); //var campaigns = await CommunicationManager.Api.GetCampaigns();
//foreach (var campaign in campaigns) //foreach (var campaign in campaigns)

0
Sledgemapper/UI/mainwidget.xmmp → Sledgemapper/UI/MainWidget.UI.xmmp
View file