WingMan

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 32  →  ?path2? @ 31
File deleted
/trunk/WingMan/Discovery/Discovery.cs
File deleted
/trunk/WingMan/Discovery/DiscoveryType.cs
File deleted
/trunk/WingMan/Discovery/DiscoveryFailedEventArgs.cs
/trunk/WingMan/Properties/Strings.Designer.cs
@@ -151,16 +151,6 @@
}
/// <summary>
/// Looks up a localized string similar to Failed creating automatic port mapping, please ensure that the port is routed through the firewall properly.
/// </summary>
internal static string Failed_creating_automatic_port_mapping_please_make_sure_the_port_is_routed_properly {
get {
return ResourceManager.GetString("Failed_creating_automatic_port_mapping_please_make_sure_the_port_is_routed_proper" +
"ly", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Failed loading autocomplete source.
/// </summary>
internal static string Failed_loading_autocomplete_source {
@@ -251,24 +241,6 @@
}
/// <summary>
/// Looks up a localized string similar to Failed to create PMP port mapping.
/// </summary>
internal static string Failed_to_create_PMP_port_mapping {
get {
return ResourceManager.GetString("Failed_to_create_PMP_port_mapping", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Failed to create UPnp port mapping.
/// </summary>
internal static string Failed_to_create_UPnP_port_mapping {
get {
return ResourceManager.GetString("Failed_to_create_UPnP_port_mapping", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Lobby message.
/// </summary>
internal static string Lobby_message {
/trunk/WingMan/Properties/Strings.resx
@@ -147,9 +147,6 @@
<data name="Executing_binding_from_remote_client" xml:space="preserve">
<value>Executing binding from remote client</value>
</data>
<data name="Failed_creating_automatic_port_mapping_please_make_sure_the_port_is_routed_properly" xml:space="preserve">
<value>Failed creating automatic port mapping, please ensure that the port is routed through the firewall properly</value>
</data>
<data name="Failed_loading_autocomplete_source" xml:space="preserve">
<value>Failed loading autocomplete source</value>
</data>
@@ -180,12 +177,6 @@
<data name="Failed_to_authenticate_with_server" xml:space="preserve">
<value>Failed to authenticate with server</value>
</data>
<data name="Failed_to_create_PMP_port_mapping" xml:space="preserve">
<value>Failed to create PMP port mapping</value>
</data>
<data name="Failed_to_create_UPnP_port_mapping" xml:space="preserve">
<value>Failed to create UPnp port mapping</value>
</data>
<data name="Lobby_message" xml:space="preserve">
<value>Lobby message</value>
</data>
/trunk/WingMan/WingMan.csproj
@@ -84,9 +84,6 @@
<Compile Include="AutoCompletion\AutoCompletionFailedEventArgs.cs" />
<Compile Include="AutoCompletion\AutoCompletionFailedType.cs" />
<Compile Include="Communication\MqttAuthenticationFailureEventArgs.cs" />
<Compile Include="Discovery\Discovery.cs" />
<Compile Include="Discovery\DiscoveryFailedEventArgs.cs" />
<Compile Include="Discovery\DiscoveryType.cs" />
<Compile Include="Lobby\LobbyMessageReceivedEventArgs.cs" />
<Compile Include="Lobby\LobbyMessageSynchronizer.cs" />
<Compile Include="Bindings\ExecuteKeyBinding.cs" />
/trunk/WingMan/WingManForm.cs
@@ -15,7 +15,6 @@
using WingMan.AutoCompletion;
using WingMan.Bindings;
using WingMan.Communication;
using WingMan.Discovery;
using WingMan.Lobby;
using WingMan.Properties;
using WingMan.Utilities;
@@ -31,10 +30,6 @@
FormTaskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
FormCancellationTokenSource = new CancellationTokenSource();
 
// Set up discovery.
Discovery = new Discovery.Discovery(FormCancellationTokenSource, FormTaskScheduler);
Discovery.OnPortMapFailed += OnDiscoveryPortMapFailed;
 
// Set up autocompletion.
AutoCompletion = new AutoCompletion.AutoCompletion(FormTaskScheduler, FormCancellationTokenSource.Token);
AutoCompletion.OnSaveFailed += AutoCompletionOnSaveFailed;
@@ -101,7 +96,6 @@
KeySimulator.OnMouseKeyBindingExecuting += OnMouseKeyBindingExecuting;
}
 
private static Discovery.Discovery Discovery { get; set; }
private static AutoCompletion.AutoCompletion AutoCompletion { get; set; }
private static CancellationTokenSource FormCancellationTokenSource { get; set; }
 
@@ -131,21 +125,6 @@
 
public KeySimulator KeySimulator { get; set; }
 
public void OnDiscoveryPortMapFailed(object sender, DiscoveryFailedEventArgs args)
{
switch (args.Type)
{
case DiscoveryType.UPnP:
ActivityTextBox.AppendText(
$"{Strings.Failed_to_create_UPnP_port_mapping}{Environment.NewLine}");
break;
case DiscoveryType.PMP:
ActivityTextBox.AppendText(
$"{Strings.Failed_to_create_PMP_port_mapping}{Environment.NewLine}");
break;
}
}
 
private void LocalCheckedListBoxBindingSourceOnListChanged(object sender, ListChangedEventArgs e)
{
// Check items
@@ -363,12 +342,6 @@
 
StoreConnectionAutocomplete();
 
// Try to reserve port: try UPnP followed by PMP.
if (!await Discovery.CreateMapping(DiscoveryType.UPnP, port) &&
!await Discovery.CreateMapping(DiscoveryType.PMP, port))
ActivityTextBox.AppendText(
$"{Strings.Failed_creating_automatic_port_mapping_please_make_sure_the_port_is_routed_properly}{Environment.NewLine}");
 
// Start the MQTT server.
if (!await MqttCommunication
.Start(MqttCommunicationType.Server, ipAddress, port, nick, password))