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

bugfixing

Browse source
This commit is contained in:
Michele Scandura 2020-12-09 14:12:43 +00:00
parent ca86ef9cd7
commit fdff421a89
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Sledgemapper/Sledgemapper.cs
View file

@ -13,6 +13,7 @@ using Sledgemapper.Shared.Entities;
using Sledgemapper.UI; using Sledgemapper.UI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -63,16 +64,19 @@ namespace Sledgemapper
private async Task OnHubDisconnected(Exception arg) private async Task OnHubDisconnected(Exception arg)
{ {
_mainWidget.lblConnectionStatus.Text = "Disconnected"; _mainWidget.lblConnectionStatus.Text = "Disconnected";
await Task.Yield();
} }
private async Task OnHubReconnecting(Exception arg) private async Task OnHubReconnecting(Exception arg)
{ {
_mainWidget.lblConnectionStatus.Text = "Reconnecting"; _mainWidget.lblConnectionStatus.Text = "Reconnecting";
await Task.Yield();
} }
private async Task OnHubReconnected(string arg) private async Task OnHubReconnected(string arg)
{ {
_mainWidget.lblConnectionStatus.Text = "Connected"; _mainWidget.lblConnectionStatus.Text = "Connected";
await Task.Yield();
} }
protected override void Initialize() protected override void Initialize()
@ -839,6 +843,8 @@ namespace Sledgemapper
{ {
_sessionData.SessionName = localContent.TxtSession.Text; _sessionData.SessionName = localContent.TxtSession.Text;
_mainWidget.lblSessionName.Text = _sessionData.SessionName; _mainWidget.lblSessionName.Text = _sessionData.SessionName;
_mainWidget.MenuConnectSync.Enabled = true;
_mainWidget.MenuConnectUpload.Enabled = true;
localWindow.Close(); localWindow.Close();
} }
} }
@ -895,7 +901,8 @@ namespace Sledgemapper
_communicationManager.SessionData.Overlays = _sessionData.Overlays; _communicationManager.SessionData.Overlays = _sessionData.Overlays;
_communicationManager.SessionData.Walls = _sessionData.Walls; _communicationManager.SessionData.Walls = _sessionData.Walls;
_mainWidget.lblSessionName.Text = _sessionData.SessionName; _mainWidget.lblSessionName.Text = _sessionData.SessionName;
_mainWidget.MenuConnectSync.Enabled = true;
_mainWidget.MenuConnectUpload.Enabled = true;
localWindow.Close(); localWindow.Close();
} }
} }
@ -921,7 +928,7 @@ namespace Sledgemapper
} }
} }
private async void OnButtonNoteOkClick(object sender, EventArgs e) private void OnButtonNoteOkClick(object sender, EventArgs e)
{ {
var button = ((TextButton)sender); var button = ((TextButton)sender);
Container container = button.Parent; Container container = button.Parent;
@ -942,7 +949,7 @@ namespace Sledgemapper
localWindow.Close(); localWindow.Close();
} }
private async void OnButtonNoteCancelClick(object sender, EventArgs e) private void OnButtonNoteCancelClick(object sender, EventArgs e)
{ {
var button = ((TextButton)sender); var button = ((TextButton)sender);
Container container = button.Parent; Container container = button.Parent;
@ -1006,6 +1013,7 @@ namespace Sledgemapper
{ {
localContent.LblLoginError.Text = "Can't connect to the server"; localContent.LblLoginError.Text = "Can't connect to the server";
localContent.LblLoginError.Visible = true; localContent.LblLoginError.Visible = true;
Debug.Write(ex);
} }
finally finally
{ {
@ -1017,8 +1025,6 @@ namespace Sledgemapper
{ {
_mainWidget.MenuConnectNew.Enabled = true; _mainWidget.MenuConnectNew.Enabled = true;
_mainWidget.MenuConnectJoin.Enabled = true; _mainWidget.MenuConnectJoin.Enabled = true;
_mainWidget.MenuConnectSync.Enabled = true;
_mainWidget.MenuConnectUpload.Enabled = true;
_mainWidget.lblUsername.Text = $"{_authResponse.Username} - {_authResponse.Initials}"; _mainWidget.lblUsername.Text = $"{_authResponse.Username} - {_authResponse.Initials}";
localWindow.Close(); localWindow.Close();
} }
@ -1094,6 +1100,7 @@ namespace Sledgemapper
{ {
localContent.LblLoginError.Text = "Can't connect to the server"; localContent.LblLoginError.Text = "Can't connect to the server";
localContent.LblLoginError.Visible = true; localContent.LblLoginError.Visible = true;
Debug.Write(ex);
} }
finally finally
{ {
@ -1104,8 +1111,6 @@ namespace Sledgemapper
{ {
_mainWidget.MenuConnectNew.Enabled = true; _mainWidget.MenuConnectNew.Enabled = true;
_mainWidget.MenuConnectJoin.Enabled = true; _mainWidget.MenuConnectJoin.Enabled = true;
_mainWidget.MenuConnectSync.Enabled = true;
_mainWidget.MenuConnectUpload.Enabled = true;
_mainWidget.lblUsername.Text = $"{_authResponse.Username} - {_authResponse.Initials}"; _mainWidget.lblUsername.Text = $"{_authResponse.Username} - {_authResponse.Initials}";
@ -1228,7 +1233,7 @@ namespace Sledgemapper
content.BtnRegister.Click += OnButtonRegisterClick; content.BtnRegister.Click += OnButtonRegisterClick;
content.BtnLogin.Click += OnButtonLoginClick; content.BtnLogin.Click += OnButtonLoginClick;
window.Content = content; window.Content = content;
window.ShowModal(_desktop); window.ShowModal(_desktop);
content.TxtEmail.SetKeyboardFocus(); content.TxtEmail.SetKeyboardFocus();
@ -1245,6 +1250,7 @@ namespace Sledgemapper
_sessionData.Overlays = serverMap.Overlays; _sessionData.Overlays = serverMap.Overlays;
_sessionData.Map = serverMap.Map; _sessionData.Map = serverMap.Map;
_sessionData.Walls = serverMap.Walls; _sessionData.Walls = serverMap.Walls;
_sessionData.Notes = serverMap.Notes;
} }
private async void OnMenuConnectUploadSelected(object sender, EventArgs e) private async void OnMenuConnectUploadSelected(object sender, EventArgs e)

1
Sledgemapper/Utils.cs
View file

@ -18,7 +18,6 @@ namespace Sledgemapper
public static Color ToColor(this string s) public static Color ToColor(this string s)
{ {
System.Console.WriteLine(s);
var hexs = s.TrimStart('#').Split(2).ToArray(); var hexs = s.TrimStart('#').Split(2).ToArray();
var color = new Color(int.Parse(hexs[0], System.Globalization.NumberStyles.HexNumber), var color = new Color(int.Parse(hexs[0], System.Globalization.NumberStyles.HexNumber),
int.Parse(hexs[1], System.Globalization.NumberStyles.HexNumber), int.Parse(hexs[1], System.Globalization.NumberStyles.HexNumber),