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

small fixes

Browse source
This commit is contained in:
Michele Scandura 2021-09-16 12:38:20 +01:00
parent 85899e1cdc
commit 1e48c041b1
5 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,9 @@ namespace Sledgemapper.UI
private void OnCampaignSelectedMessage(CampaignSelectedMessage obj) private void OnCampaignSelectedMessage(CampaignSelectedMessage obj)
{ {
lblCampaign.Text = State.Instance.CampaignName;
MenuMapNew.Enabled = true;
MenuMapOpen.Enabled = true;
} }
private void OnCenterOnTileMessage(CenterOnTileMessage obj) private void OnCenterOnTileMessage(CenterOnTileMessage obj)
@ -81,7 +83,7 @@ namespace Sledgemapper.UI
private void OnMapOpenedMessage(MapOpenedMessage obj) private void OnMapOpenedMessage(MapOpenedMessage obj)
{ {
lblSessionName.Text = CommunicationManager.SessionData.SessionName; lblMap.Text = CommunicationManager.SessionData.SessionName;
MenuConnectSync.Enabled = true; MenuConnectSync.Enabled = true;
MenuConnectUpload.Enabled = true; MenuConnectUpload.Enabled = true;
CommunicationManager.SessionData.MapEntityAdded -= OnMapEntityAdded; CommunicationManager.SessionData.MapEntityAdded -= OnMapEntityAdded;
@ -488,7 +490,7 @@ namespace Sledgemapper.UI
if (successful) if (successful)
{ {
CommunicationManager.SessionData.SessionName = localContent.Content.TxtSession.Text; CommunicationManager.SessionData.SessionName = localContent.Content.TxtSession.Text;
lblSessionName.Text = CommunicationManager.SessionData.SessionName; lblMap.Text = CommunicationManager.SessionData.SessionName;
MenuConnectSync.Enabled = true; MenuConnectSync.Enabled = true;
MenuConnectUpload.Enabled = true; MenuConnectUpload.Enabled = true;
localContent.Window.Close(); localContent.Window.Close();

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

@ -1,9 +1,10 @@
/* Generated by MyraPad at 19/02/2021 14:56:38 */ /* Generated by MyraPad at 16/09/2021 12:26:31 */
using Myra; using Myra;
using Myra.Graphics2D; using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases; using Myra.Graphics2D.TextureAtlases;
using Myra.Graphics2D.UI; using Myra.Graphics2D.UI;
using Myra.Graphics2D.Brushes; using Myra.Graphics2D.Brushes;
using Myra.Graphics2D.UI.Properties;
#if MONOGAME || FNA #if MONOGAME || FNA
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
@ -292,12 +293,22 @@ namespace Sledgemapper.UI
var verticalSeparator2 = new VerticalSeparator(); var verticalSeparator2 = new VerticalSeparator();
var label3 = new Label(); var label3 = new Label();
label3.Text = "Session name:"; label3.Text = "Campaign:";
lblSessionName = new Label(); lblCampaign = new Label();
lblSessionName.Text = "n/a"; lblCampaign.Text = "n/a";
lblSessionName.MinWidth = 100; lblCampaign.MinWidth = 100;
lblSessionName.Id = "lblSessionName"; lblCampaign.Id = "lblCampaign";
var verticalSeparator3 = new VerticalSeparator();
var label4 = new Label();
label4.Text = "Map:";
lblMap = new Label();
lblMap.Text = "n/a";
lblMap.MinWidth = 100;
lblMap.Id = "lblMap";
var horizontalStackPanel1 = new HorizontalStackPanel(); var horizontalStackPanel1 = new HorizontalStackPanel();
horizontalStackPanel1.Spacing = 10; horizontalStackPanel1.Spacing = 10;
@ -314,7 +325,10 @@ namespace Sledgemapper.UI
horizontalStackPanel1.Widgets.Add(lblUsername); horizontalStackPanel1.Widgets.Add(lblUsername);
horizontalStackPanel1.Widgets.Add(verticalSeparator2); horizontalStackPanel1.Widgets.Add(verticalSeparator2);
horizontalStackPanel1.Widgets.Add(label3); horizontalStackPanel1.Widgets.Add(label3);
horizontalStackPanel1.Widgets.Add(lblSessionName); horizontalStackPanel1.Widgets.Add(lblCampaign);
horizontalStackPanel1.Widgets.Add(verticalSeparator3);
horizontalStackPanel1.Widgets.Add(label4);
horizontalStackPanel1.Widgets.Add(lblMap);
Proportions.Add(new Proportion Proportions.Add(new Proportion
@ -366,6 +380,7 @@ namespace Sledgemapper.UI
public TextBox TxtOverlaySearch; public TextBox TxtOverlaySearch;
public Label lblConnectionStatus; public Label lblConnectionStatus;
public Label lblUsername; public Label lblUsername;
public Label lblSessionName; public Label lblCampaign;
public Label lblMap;
} }
} }

9
Sledgemapper/UI/MainWidget.xmmp
View file

@ -1,5 +1,5 @@
<Project> <Project>
<Project.ExportOptions Namespace="Sledgemapper.UI" Class="MainWidget" OutputPath="C:\dev\Map\Sledgemapper\UI" /> <Project.ExportOptions Namespace="Sledgemapper.UI" Class="MainWidget" OutputPath="C:\src\Map\Sledgemapper\UI" />
<VerticalStackPanel> <VerticalStackPanel>
<VerticalStackPanel.Proportions> <VerticalStackPanel.Proportions>
<Proportion Type="Auto" /> <Proportion Type="Auto" />
@ -85,8 +85,11 @@
<Label Text="Username:" /> <Label Text="Username:" />
<Label Text="n/a" MinWidth="100" Id="lblUsername" /> <Label Text="n/a" MinWidth="100" Id="lblUsername" />
<VerticalSeparator /> <VerticalSeparator />
<Label Text="Session name:" /> <Label Text="Campaign:" />
<Label Text="n/a" MinWidth="100" Id="lblSessionName" /> <Label Text="n/a" MinWidth="100" Id="lblCampaign" />
<VerticalSeparator />
<Label Text="Map:" />
<Label Text="n/a" MinWidth="100" Id="lblMap" />
</HorizontalStackPanel> </HorizontalStackPanel>
</VerticalStackPanel> </VerticalStackPanel>
</Project> </Project>

4
Sledgemapper/UI/PlayerList.Generated.cs
View file

@ -1,4 +1,4 @@
/* Generated by MyraPad at 28/08/2021 19:49:08 */ /* Generated by MyraPad at 16/09/2021 12:29:41 */
using Myra; using Myra;
using Myra.Graphics2D; using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases; using Myra.Graphics2D.TextureAtlases;
@ -23,7 +23,7 @@ namespace Sledgemapper.UI
private void BuildUI() private void BuildUI()
{ {
var label1 = new Label(); var label1 = new Label();
label1.Text = "Campaigns"; label1.Text = "Players";
label1.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Center; label1.HorizontalAlignment = Myra.Graphics2D.UI.HorizontalAlignment.Center;
StackCampaignsList = new VerticalStackPanel(); StackCampaignsList = new VerticalStackPanel();

4
Sledgemapper/UI/PlayerList.xmmp
View file

@ -1,7 +1,7 @@
<Project> <Project>
<Project.ExportOptions Namespace="Sledgemapper.UI" Class="PlayerList" OutputPath="C:\dev\Map\Sledgemapper\UI" /> <Project.ExportOptions Namespace="Sledgemapper.UI" Class="PlayerList" OutputPath="C:\src\Map\Sledgemapper\UI" />
<VerticalStackPanel Spacing="13" Width="400" Padding="10"> <VerticalStackPanel Spacing="13" Width="400" Padding="10">
<Label Text="Campaigns" HorizontalAlignment="Center" /> <Label Text="Players" HorizontalAlignment="Center" />
<ScrollViewer> <ScrollViewer>
<VerticalStackPanel MinHeight="350" MaxHeight="350" Id="StackCampaignsList" /> <VerticalStackPanel MinHeight="350" MaxHeight="350" Id="StackCampaignsList" />
</ScrollViewer> </ScrollViewer>