Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

renamed ProtocolICA to IcaProtocol

Browse Source
This commit is contained in:
David Sparer
2017-05-07 16:34:31 -06:00
parent 268a146775
commit 4f5c929a9b
9 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs
View File

@@ -142,7 +142,7 @@ namespace mRemoteNGTests.Connection
{
var wasCalled = false;
_testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
_testAbstractConnectionInfoData.ICAEncryptionStrength = ProtocolICA.EncryptionStrength.Encr128BitLogonOnly;
_testAbstractConnectionInfoData.ICAEncryptionStrength = IcaProtocol.EncryptionStrength.Encr128BitLogonOnly;
Assert.That(wasCalled, Is.True);
}

2
mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializer.cs
View File

@@ -390,7 +390,7 @@ namespace mRemoteNG.Config.Serializers
if (_confVersion >= 1.6)
{
connectionInfo.ICAEncryptionStrength = (ProtocolICA.EncryptionStrength)Tools.MiscTools.StringToEnum(typeof(ProtocolICA.EncryptionStrength), xmlnode.Attributes["ICAEncryptionStrength"].Value);
connectionInfo.ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Tools.MiscTools.StringToEnum(typeof(IcaProtocol.EncryptionStrength), xmlnode.Attributes["ICAEncryptionStrength"].Value);
connectionInfo.Inheritance.ICAEncryptionStrength = bool.Parse(xmlnode.Attributes["InheritICAEncryptionStrength"].Value);
connectionInfo.PreExtApp = xmlnode.Attributes["PreExtApp"].Value;
connectionInfo.PostExtApp = xmlnode.Attributes["PostExtApp"].Value;

2
mRemoteV1/Config/Serializers/DataTableDeserializer.cs
View File

@@ -84,7 +84,7 @@ namespace mRemoteNG.Config.Serializers
connectionInfo.UseConsoleSession = (bool)dataRow["ConnectToConsole"];
connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"];
connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), (string)dataRow["RenderingEngine"]);
connectionInfo.ICAEncryptionStrength = (ProtocolICA.EncryptionStrength)Enum.Parse(typeof(ProtocolICA.EncryptionStrength), (string)dataRow["ICAEncryptionStrength"]);
connectionInfo.ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse(typeof(IcaProtocol.EncryptionStrength), (string)dataRow["ICAEncryptionStrength"]);
connectionInfo.RDPAuthenticationLevel = (ProtocolRDP.AuthenticationLevel)Enum.Parse(typeof(ProtocolRDP.AuthenticationLevel), (string)dataRow["RDPAuthenticationLevel"]);
connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"];
connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"];

4
mRemoteV1/Connection/AbstractConnectionRecord.cs
View File

@@ -30,7 +30,7 @@ namespace mRemoteNG.Connection
private string _extApp = "";
private int _port;
private string _puttySession = "";
private ProtocolICA.EncryptionStrength _icaEncryption;
private IcaProtocol.EncryptionStrength _icaEncryption;
private bool _useConsoleSession;
private ProtocolRDP.AuthenticationLevel _rdpAuthenticationLevel;
private int _rdpMinutesToIdleTimeout;
@@ -200,7 +200,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameEncryptionStrength"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionEncryptionStrength"),
TypeConverter(typeof(MiscTools.EnumTypeConverter))]
public ProtocolICA.EncryptionStrength ICAEncryptionStrength
public IcaProtocol.EncryptionStrength ICAEncryptionStrength
{
get { return GetPropertyValue("ICAEncryptionStrength", _icaEncryption); }
set { SetField(ref _icaEncryption, value, "ICAEncryptionStrength"); }

4
mRemoteV1/Connection/AbstractLegacyConnectionRecord.cs
View File

@@ -29,7 +29,7 @@ namespace mRemoteNG.Connection
private string _extApp;
private int _port;
private string _puttySession;
private ProtocolICA.EncryptionStrength _icaEncryption;
private IcaProtocol.EncryptionStrength _icaEncryption;
private bool _useConsoleSession;
private ProtocolRDP.AuthenticationLevel _rdpAuthenticationLevel;
private int _rdpMinutesToIdleTimeout;
@@ -203,7 +203,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameEncryptionStrength"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionEncryptionStrength"),
TypeConverter(typeof(MiscTools.EnumTypeConverter))]
public ProtocolICA.EncryptionStrength ICAEncryptionStrength
public IcaProtocol.EncryptionStrength ICAEncryptionStrength
{
get { return GetPropertyValue("ICAEncryptionStrength", _icaEncryption); }
set { SetField(ref _icaEncryption, value, "ICAEncryptionStrength"); }

4
mRemoteV1/Connection/ConnectionInfo.cs
View File

@@ -222,7 +222,7 @@ namespace mRemoteNG.Connection
case ProtocolType.HTTPS:
return (int)ProtocolHTTPS.Defaults.Port;
case ProtocolType.ICA:
return (int)ProtocolICA.Defaults.Port;
return (int)IcaProtocol.Defaults.Port;
case ProtocolType.IntApp:
return (int)IntegratedProgram.Defaults.Port;
}
@@ -254,7 +254,7 @@ namespace mRemoteNG.Connection
ExtApp = Settings.Default.ConDefaultExtApp;
Port = 0;
PuttySession = Settings.Default.ConDefaultPuttySession;
ICAEncryptionStrength = (ProtocolICA.EncryptionStrength) Enum.Parse(typeof(ProtocolICA.EncryptionStrength), Settings.Default.ConDefaultICAEncryptionStrength);
ICAEncryptionStrength = (IcaProtocol.EncryptionStrength) Enum.Parse(typeof(IcaProtocol.EncryptionStrength), Settings.Default.ConDefaultICAEncryptionStrength);
UseConsoleSession = Settings.Default.ConDefaultUseConsoleSession;
RDPAuthenticationLevel = (ProtocolRDP.AuthenticationLevel) Enum.Parse(typeof(ProtocolRDP.AuthenticationLevel), Settings.Default.ConDefaultRDPAuthenticationLevel);
RDPMinutesToIdleTimeout = Settings.Default.ConDefaultRDPMinutesToIdleTimeout;

5
mRemoteV1/Connection/Protocol/ICA/Connection.Protocol.ICA.cs → mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs
View File

@@ -1,6 +1,5 @@
using System;
using AxWFICALib;
using System.Drawing;
using System.Windows.Forms;
using mRemoteNG.App;
using System.Threading;
@@ -15,14 +14,14 @@ using mRemoteNG.UI.Forms;
namespace mRemoteNG.Connection.Protocol.ICA
{
public class ProtocolICA : ProtocolBase
public class IcaProtocol : ProtocolBase
{
private AxICAClient _icaClient;
private ConnectionInfo _info;
private readonly FrmMain _frmMain = FrmMain.Default;
#region Public Methods
public ProtocolICA()
public IcaProtocol()
{
try
{

4
mRemoteV1/Connection/Protocol/ProtocolFactory.cs
View File

@@ -46,8 +46,8 @@ namespace mRemoteNG.Connection.Protocol
newProtocol = new ProtocolHTTPS(connectionInfo.RenderingEngine);
break;
case ProtocolType.ICA:
newProtocol = new ProtocolICA();
((ProtocolICA) newProtocol).tmrReconnect.Elapsed += ((ProtocolICA) newProtocol).tmrReconnect_Elapsed;
newProtocol = new IcaProtocol();
((IcaProtocol) newProtocol).tmrReconnect.Elapsed += ((IcaProtocol) newProtocol).tmrReconnect_Elapsed;
break;
case ProtocolType.IntApp:
newProtocol = new IntegratedProgram();

2
mRemoteV1/mRemoteV1.csproj
View File

@@ -553,7 +553,7 @@
<Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTP.cs" />
<Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTPBase.cs" />
<Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTPS.cs" />
<Compile Include="Connection\Protocol\ICA\Connection.Protocol.ICA.cs" />
<Compile Include="Connection\Protocol\ICA\IcaProtocol.cs" />
<Compile Include="Connection\Protocol\IntegratedProgram.cs" />
<Compile Include="Connection\Protocol\ProtocolList.cs" />
<Compile Include="Connection\Protocol\ProtocolType.cs" />