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

stability improvements
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse source
This commit is contained in:
Michele Scandura 2021-09-22 16:16:46 +01:00
parent 79edfcc4d3
commit 333c6c4046
37 changed files with 286 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,7 @@ namespace Sledgemapper.UI
private void OnBtnToolbarDeleteClicked(object sender, EventArgs e)
{
Messenger.Publish(new ErrorMessage(this,"test"));
Messenger.Publish(new ErrorMessage(this, "test"));
State.Instance.InsertMode = InsertMode.NewDelete;
ClearSelection();
@ -201,7 +201,7 @@ namespace Sledgemapper.UI
private void OnErrorMessage(ErrorMessage obj)
{
new ErrorWindow(obj.Message).Toast(Desktop,null);
new ErrorWindow(obj.Message).Toast(Desktop);
}
private void OneMenuFileSettingsSelected(object sender, EventArgs e)
@ -273,7 +273,7 @@ namespace Sledgemapper.UI
private void OnMenuCampaignNew(object sender, EventArgs e)
{
if (sender is MenuItem && !((MenuItem)sender).Enabled) return;
if (sender is MenuItem { Enabled: false }) return;
new CampaignWindow(CommunicationManager, Messenger).ShowInModalWindow(Desktop, "New campaign");
;
@ -284,8 +284,10 @@ namespace Sledgemapper.UI
if (!((MenuItem)sender).Enabled) return;
var content = new CampaignList(CommunicationManager, Messenger);
await content.LoadCampaigns();
content.ShowInModalWindow(Desktop, "Campaigns");
if (await content.LoadCampaigns())
{
content.ShowInModalWindow(Desktop, "Campaigns");
}
}
private async void OnMenuCampaignPlayersSelected(object sender, EventArgs e)
@ -293,8 +295,10 @@ namespace Sledgemapper.UI
if (!((MenuItem)sender).Enabled) return;
var content = new PlayerList(CommunicationManager);
await content.LoadPlayers();
content.ShowInModalWindow(Desktop, "Players");
if (await content.LoadPlayers())
{
content.ShowInModalWindow(Desktop, "Players");
}
}
private void OnMenuConnectLoginSelected(object sender, EventArgs e)
@ -373,7 +377,7 @@ namespace Sledgemapper.UI
private void OnMenuMapNew(object sender, EventArgs e)
{
if (sender is MenuItem && !((MenuItem)sender).Enabled) return;
if (sender is MenuItem { Enabled: false }) return;
new MapWindow(CommunicationManager, Messenger).ShowInModalWindow(Desktop, "New map");
}
@ -383,8 +387,10 @@ namespace Sledgemapper.UI
if (!((MenuItem)sender).Enabled) return;
var content = new MapList(CommunicationManager, Messenger);
await content.LoadMaps();
content.ShowInModalWindow(Desktop, "Maps");
if (await content.LoadMaps())
{
content.ShowInModalWindow(Desktop, "Maps");
}
}
private void OnMenuViewCenterOnSelectionSelected(object sender, EventArgs e)
@ -394,11 +400,6 @@ namespace Sledgemapper.UI
private void OnMenuViewNotesSelected(object sender, EventArgs e)
{
Window window = new()
{
Title = "Notes"
};
new NoteList(CommunicationManager, Messenger).ShowInModalWindow(Desktop, "Notes");
}