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

absolute mess, but decided on a Strategy pattern for choosing connection protocols

Browse Source
This commit is contained in:
Sparer, David
2016-03-16 15:41:24 -06:00
parent 97736b19cd
commit b39b367ef2
65 changed files with 715 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mRemoteV1.v12.suo
View File

Binary file not shown.

50
mRemoteV1/App/App.Runtime.cs
View File

@@ -406,7 +406,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "App.Runtime.Windows.Show() failed." + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "App.Runtime.Windows.Show() failed." + Environment.NewLine + ex.Message, true);
}
}
@@ -868,7 +868,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strCommandLineArgsCouldNotBeParsed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strCommandLineArgsCouldNotBeParsed + Environment.NewLine + ex.Message);
}
}
@@ -933,7 +933,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strSettingsCouldNotBeSavedOrTrayDispose + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strSettingsCouldNotBeSavedOrTrayDispose + Environment.NewLine + ex.Message, true);
}
}
@@ -949,7 +949,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "The update could not be started." + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "The update could not be started." + Environment.NewLine + ex.Message, true);
}
}
@@ -1146,7 +1146,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t add panel" + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t add panel" + Environment.NewLine + ex.Message);
return null;
}
}
@@ -1167,7 +1167,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t rename panel" + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t rename panel" + Environment.NewLine + ex.Message);
}
}
@@ -1191,7 +1191,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t enumerate screens" + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t enumerate screens" + Environment.NewLine + ex.Message);
}
}
@@ -1450,7 +1450,7 @@ namespace mRemoteNG.App
}
else
{
Interaction.MsgBox(string.Format(My.Language.strErrorStartupConnectionFileLoad, Constants.vbNewLine, System.Windows.Forms.Application.ProductName, GetStartupConnectionFileName(), Misc.GetExceptionMessageRecursive(ex)), (int) MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, null);
Interaction.MsgBox(string.Format(My.Language.strErrorStartupConnectionFileLoad, Environment.NewLine, System.Windows.Forms.Application.ProductName, GetStartupConnectionFileName(), Misc.GetExceptionMessageRecursive(ex)), (int) MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, null);
Application.Exit();
return ;
}
@@ -1602,7 +1602,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionsFileCouldNotBeSaved + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionsFileCouldNotBeSaved + Environment.NewLine + ex.Message);
}
finally
{
@@ -1731,7 +1731,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1764,7 +1764,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1776,7 +1776,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1788,7 +1788,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1800,7 +1800,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1812,7 +1812,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1848,9 +1848,9 @@ namespace mRemoteNG.App
switch (newConnectionInfo.Protocol)
{
case Protocols.RDP:
newProtocol = new RDP();
((RDP) newProtocol).tmrReconnect.Elapsed += ((RDP) newProtocol).tmrReconnect_Elapsed;
((RDP) newProtocol).tmrReconnect.Elapsed += ((RDP) newProtocol).tmrReconnect_Elapsed;
newProtocol = new RDPConnectionProtocolImp();
((RDPConnectionProtocolImp) newProtocol).tmrReconnect.Elapsed += ((RDPConnectionProtocolImp) newProtocol).tmrReconnect_Elapsed;
((RDPConnectionProtocolImp) newProtocol).tmrReconnect.Elapsed += ((RDPConnectionProtocolImp) newProtocol).tmrReconnect_Elapsed;
break;
case Protocols.VNC:
newProtocol = new VNC();
@@ -1995,7 +1995,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -2033,11 +2033,11 @@ namespace mRemoteNG.App
{
if (!string.IsNullOrEmpty(ReasonDescription))
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strRdpDisconnected + Constants.vbNewLine + ReasonDescription + Constants.vbNewLine + string.Format(My.Language.strErrorCode, ReasonCode));
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strRdpDisconnected + Environment.NewLine + ReasonDescription + Environment.NewLine + string.Format(My.Language.strErrorCode, ReasonCode));
}
else
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strRdpDisconnected + Constants.vbNewLine + string.Format(My.Language.strErrorCode, ReasonCode));
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strRdpDisconnected + Environment.NewLine + string.Format(My.Language.strErrorCode, ReasonCode));
}
}
}
@@ -2076,7 +2076,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnenctionCloseEventFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnenctionCloseEventFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -2100,13 +2100,13 @@ namespace mRemoteNG.App
{
if (System.Convert.ToInt32(ErrorMessage) > -1)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, string.Format(My.Language.strConnectionRdpErrorDetail, ErrorMessage, Connection.Protocol.RDP.FatalErrors.GetError(ErrorMessage)));
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, string.Format(My.Language.strConnectionRdpErrorDetail, ErrorMessage, Connection.Protocol.RDPConnectionProtocolImp.FatalErrors.GetError(ErrorMessage)));
}
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionEventConnectionFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionEventConnectionFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -2198,7 +2198,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLogWriteToFileFinalLocationFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLogWriteToFileFinalLocationFailed + Environment.NewLine + ex.Message, true);
return false;
}
finally

56
mRemoteV1/Config/Config.Connections.Load.cs
View File

@@ -458,14 +458,14 @@ namespace mRemoteNG.Config.Connections
connectionRecord.RedirectPorts = System.Convert.ToBoolean(sqlRd["RedirectPorts"]);
connectionRecord.RedirectSmartCards = System.Convert.ToBoolean(sqlRd["RedirectSmartCards"]);
connectionRecord.RedirectKeys = System.Convert.ToBoolean(sqlRd["RedirectKeys"]);
connectionRecord.RedirectSound = (Connection.Protocol.RDP.RDPSounds)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.RDPSounds), System.Convert.ToString(sqlRd["RedirectSound"]));
connectionRecord.RedirectSound = (Connection.Protocol.RDPConnectionProtocolImp.RDPSounds)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPSounds), System.Convert.ToString(sqlRd["RedirectSound"]));
connectionRecord.Protocol = (Connection.Protocol.Protocols)Tools.Misc.StringToEnum(typeof(Connection.Protocol.Protocols), System.Convert.ToString(sqlRd["Protocol"]));
connectionRecord.Port = System.Convert.ToInt32(sqlRd["Port"]);
connectionRecord.PuttySession = System.Convert.ToString(sqlRd["PuttySession"]);
connectionRecord.Colors = (Connection.Protocol.RDP.RDPColors)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.RDPColors), System.Convert.ToString(sqlRd["Colors"]));
connectionRecord.Resolution = (Connection.Protocol.RDP.RDPResolutions)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.RDPResolutions), System.Convert.ToString(sqlRd["Resolution"]));
connectionRecord.Colors = (Connection.Protocol.RDPConnectionProtocolImp.RDPColors)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPColors), System.Convert.ToString(sqlRd["Colors"]));
connectionRecord.Resolution = (Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions), System.Convert.ToString(sqlRd["Resolution"]));
connectionRecord.Inherit = new ConnectionRecordInheritanceImp(connectionRecord);
connectionRecord.Inherit.CacheBitmaps = System.Convert.ToBoolean(sqlRd["InheritCacheBitmaps"]);
@@ -498,8 +498,8 @@ namespace mRemoteNG.Config.Connections
connectionRecord.ICAEncryption = (Connection.Protocol.ICA.EncryptionStrength)Tools.Misc.StringToEnum(typeof(Connection.Protocol.ICA.EncryptionStrength), System.Convert.ToString(sqlRd["ICAEncryptionStrength"]));
connectionRecord.Inherit.ICAEncryption = System.Convert.ToBoolean(sqlRd["InheritICAEncryptionStrength"]);
connectionRecord.ExternalTool.PreExtApp = System.Convert.ToString(sqlRd["PreExtApp"]);
connectionRecord.ExternalTool.PostExtApp = System.Convert.ToString(sqlRd["PostExtApp"]);
connectionRecord.PreExtApp = System.Convert.ToString(sqlRd["PreExtApp"]);
connectionRecord.PostExtApp = System.Convert.ToString(sqlRd["PostExtApp"]);
connectionRecord.Inherit.PreExtApp = System.Convert.ToBoolean(sqlRd["InheritPreExtApp"]);
connectionRecord.Inherit.PostExtApp = System.Convert.ToBoolean(sqlRd["InheritPostExtApp"]);
}
@@ -533,7 +533,7 @@ namespace mRemoteNG.Config.Connections
if (this.confVersion > 1.7) //1.8
{
connectionRecord.RDPAuthenticationLevel = (Connection.Protocol.RDP.AuthenticationLevel)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.AuthenticationLevel), System.Convert.ToString(sqlRd["RDPAuthenticationLevel"]));
connectionRecord.RDPAuthenticationLevel = (Connection.Protocol.RDPConnectionProtocolImp.AuthenticationLevel)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.AuthenticationLevel), System.Convert.ToString(sqlRd["RDPAuthenticationLevel"]));
connectionRecord.Inherit.RDPAuthenticationLevel = System.Convert.ToBoolean(sqlRd["InheritRDPAuthenticationLevel"]);
}
@@ -563,9 +563,9 @@ namespace mRemoteNG.Config.Connections
if (this.confVersion >= 2.2)
{
connectionRecord.RDGatewayUsageMethod = (mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), System.Convert.ToString(sqlRd["RDGatewayUsageMethod"]));
connectionRecord.RDGatewayUsageMethod = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod), System.Convert.ToString(sqlRd["RDGatewayUsageMethod"]));
connectionRecord.RDGatewayHostname = System.Convert.ToString(sqlRd["RDGatewayHostname"]);
connectionRecord.RDGatewayUseConnectionCredentials = (mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), System.Convert.ToString(sqlRd["RDGatewayUseConnectionCredentials"]));
connectionRecord.RDGatewayUseConnectionCredentials = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials), System.Convert.ToString(sqlRd["RDGatewayUseConnectionCredentials"]));
connectionRecord.RDGatewayUsername = System.Convert.ToString(sqlRd["RDGatewayUsername"]);
connectionRecord.RDGatewayPassword = Security.Crypt.Decrypt(System.Convert.ToString(sqlRd["RDGatewayPassword"]), pW);
connectionRecord.RDGatewayDomain = System.Convert.ToString(sqlRd["RDGatewayDomain"]);
@@ -607,7 +607,7 @@ namespace mRemoteNG.Config.Connections
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strGetConnectionInfoFromSqlFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strGetConnectionInfoFromSqlFailed + Environment.NewLine + ex.Message, true);
}
return null;
@@ -715,7 +715,7 @@ namespace mRemoteNG.Config.Connections
System.Windows.Forms.Application.ProductName,
"Incompatible connection file format",
string.Format("The format of this connection file is not supported. Please upgrade to a newer version of {0}.", System.Windows.Forms.Application.ProductName),
string.Format("{1}{0}File Format Version: {2}{0}Highest Supported Version: {3}", Constants.vbNewLine, ConnectionFileName, confVersion.ToString(), maxSupportedConfVersion.ToString()),
string.Format("{1}{0}File Format Version: {2}{0}Highest Supported Version: {3}", Environment.NewLine, ConnectionFileName, confVersion.ToString(), maxSupportedConfVersion.ToString()),
"",
"",
"",
@@ -834,7 +834,7 @@ namespace mRemoteNG.Config.Connections
catch (Exception ex)
{
App.Runtime.IsConnectionsFileLoaded = false;
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromXmlFailed + Constants.vbNewLine + ex.Message + Constants.vbNewLine + ex.StackTrace, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromXmlFailed + Environment.NewLine + ex.Message + Environment.NewLine + ex.StackTrace, true);
throw;
}
}
@@ -936,7 +936,7 @@ namespace mRemoteNG.Config.Connections
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodeFromXmlFailed + Constants.vbNewLine + ex.Message + ex.StackTrace, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodeFromXmlFailed + Environment.NewLine + ex.Message + ex.StackTrace, true);
throw;
}
}
@@ -963,11 +963,11 @@ namespace mRemoteNG.Config.Connections
{
if (System.Convert.ToBoolean(xmlnode.Attributes["Fullscreen"].Value) == true)
{
conI.Resolution = Connection.Protocol.RDP.RDPResolutions.Fullscreen;
conI.Resolution = Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions.Fullscreen;
}
else
{
conI.Resolution = Connection.Protocol.RDP.RDPResolutions.FitToWindow;
conI.Resolution = Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions.FitToWindow;
}
}
}
@@ -989,7 +989,7 @@ namespace mRemoteNG.Config.Connections
}
else
{
conI.Port = (int)Connection.Protocol.RDP.Defaults.Port;
conI.Port = (int)Connection.Protocol.RDPConnectionProtocolImp.Defaults.Port;
conI.Protocol = Connection.Protocol.Protocols.RDP;
}
@@ -1019,7 +1019,7 @@ namespace mRemoteNG.Config.Connections
}
else
{
conI.Port = (int)Connection.Protocol.RDP.Defaults.Port;
conI.Port = (int)Connection.Protocol.RDPConnectionProtocolImp.Defaults.Port;
}
}
conI.UseConsoleSession = false;
@@ -1058,32 +1058,32 @@ namespace mRemoteNG.Config.Connections
if (this.confVersion > 1.2) //1.3
{
conI.Colors = (Connection.Protocol.RDP.RDPColors)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.RDPColors), xmlnode.Attributes["Colors"].Value);
conI.Resolution = (Connection.Protocol.RDP.RDPResolutions)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.RDPResolutions), System.Convert.ToString(xmlnode.Attributes["Resolution"].Value));
conI.RedirectSound = (Connection.Protocol.RDP.RDPSounds)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDP.RDPSounds), System.Convert.ToString(xmlnode.Attributes["RedirectSound"].Value));
conI.Colors = (Connection.Protocol.RDPConnectionProtocolImp.RDPColors)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPColors), xmlnode.Attributes["Colors"].Value);
conI.Resolution = (Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions), System.Convert.ToString(xmlnode.Attributes["Resolution"].Value));
conI.RedirectSound = (Connection.Protocol.RDPConnectionProtocolImp.RDPSounds)Tools.Misc.StringToEnum(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPSounds), System.Convert.ToString(xmlnode.Attributes["RedirectSound"].Value));
}
else
{
switch (System.Convert.ToInt32(xmlnode.Attributes["Colors"].Value))
{
case 0:
conI.Colors = Connection.Protocol.RDP.RDPColors.Colors256;
conI.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors256;
break;
case 1:
conI.Colors = Connection.Protocol.RDP.RDPColors.Colors16Bit;
conI.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors16Bit;
break;
case 2:
conI.Colors = Connection.Protocol.RDP.RDPColors.Colors24Bit;
conI.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors24Bit;
break;
case 3:
conI.Colors = Connection.Protocol.RDP.RDPColors.Colors32Bit;
conI.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors32Bit;
break;
case 4:
conI.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit;
conI.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors15Bit;
break;
}
conI.RedirectSound = (Connection.Protocol.RDP.RDPSounds) System.Convert.ToInt32(xmlnode.Attributes["RedirectSound"].Value);
conI.RedirectSound = (Connection.Protocol.RDPConnectionProtocolImp.RDPSounds) System.Convert.ToInt32(xmlnode.Attributes["RedirectSound"].Value);
}
if (this.confVersion > 1.2) //1.3
@@ -1167,7 +1167,7 @@ namespace mRemoteNG.Config.Connections
if (this.confVersion > 1.7) //1.8
{
conI.RDPAuthenticationLevel = (mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel), xmlnode.Attributes["RDPAuthenticationLevel"].Value);
conI.RDPAuthenticationLevel = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.AuthenticationLevel)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.AuthenticationLevel), xmlnode.Attributes["RDPAuthenticationLevel"].Value);
conI.Inherit.RDPAuthenticationLevel = bool.Parse(xmlnode.Attributes["InheritRDPAuthenticationLevel"].Value);
}
@@ -1196,9 +1196,9 @@ namespace mRemoteNG.Config.Connections
if (this.confVersion > 2.1) //2.2
{
// Get settings
conI.RDGatewayUsageMethod = (mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), System.Convert.ToString(xmlnode.Attributes["RDGatewayUsageMethod"].Value));
conI.RDGatewayUsageMethod = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod), System.Convert.ToString(xmlnode.Attributes["RDGatewayUsageMethod"].Value));
conI.RDGatewayHostname = xmlnode.Attributes["RDGatewayHostname"].Value;
conI.RDGatewayUseConnectionCredentials = (mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), System.Convert.ToString(xmlnode.Attributes["RDGatewayUseConnectionCredentials"].Value));
conI.RDGatewayUseConnectionCredentials = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials)Tools.Misc.StringToEnum(typeof(mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials), System.Convert.ToString(xmlnode.Attributes["RDGatewayUseConnectionCredentials"].Value));
conI.RDGatewayUsername = xmlnode.Attributes["RDGatewayUsername"].Value;
conI.RDGatewayPassword = Security.Crypt.Decrypt(System.Convert.ToString(xmlnode.Attributes["RDGatewayPassword"].Value), pW);
conI.RDGatewayDomain = xmlnode.Attributes["RDGatewayDomain"].Value;

10
mRemoteV1/Config/Config.Connections.Save.cs
View File

@@ -619,7 +619,7 @@ namespace mRemoteNG.Config.Connections
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveToXml failed" + Constants.vbNewLine + ex.Message, false);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveToXml failed" + Environment.NewLine + ex.Message, false);
}
}
@@ -657,7 +657,7 @@ namespace mRemoteNG.Config.Connections
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveNode failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveNode failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -915,7 +915,7 @@ namespace mRemoteNG.Config.Connections
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -1225,7 +1225,7 @@ namespace mRemoteNG.Config.Connections
//Smart Size
_xmlTextWriter.WriteStartElement("AutoSize");
_xmlTextWriter.WriteValue(con.Resolution == Connection.Protocol.RDP.RDPResolutions.SmartSize);
_xmlTextWriter.WriteValue(con.Resolution == Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions.SmartSize);
_xmlTextWriter.WriteEndElement();
//SeparateResolutionX
@@ -1238,7 +1238,7 @@ namespace mRemoteNG.Config.Connections
_xmlTextWriter.WriteValue("768");
_xmlTextWriter.WriteEndElement();
Rectangle resolution = Connection.Protocol.RDP.GetResolutionRectangle(con.Resolution);
Rectangle resolution = Connection.Protocol.RDPConnectionProtocolImp.GetResolutionRectangle(con.Resolution);
if (resolution.Width == 0)
{
resolution.Width = 1024;

8
mRemoteV1/Config/Config.Settings.Load.cs
View File

@@ -46,7 +46,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.Log.Error("My.Settings.Upgrade() failed" + Constants.vbNewLine + ex.Message);
Runtime.Log.Error("My.Settings.Upgrade() failed" + Environment.NewLine + ex.Message);
}
My.Settings.Default.DoUpgrade = false;
@@ -165,7 +165,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.Log.Error("Loading settings failed" + Constants.vbNewLine + ex.Message);
Runtime.Log.Error("Loading settings failed" + Environment.NewLine + ex.Message);
}
}
@@ -255,7 +255,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.Log.Error("LoadPanelsFromXML failed" + Constants.vbNewLine + ex.Message);
Runtime.Log.Error("LoadPanelsFromXML failed" + Environment.NewLine + ex.Message);
}
}
@@ -345,7 +345,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.Log.Error("GetContentFromPersistString failed" + Constants.vbNewLine + ex.Message);
Runtime.Log.Error("GetContentFromPersistString failed" + Environment.NewLine + ex.Message);
}
return null;

6
mRemoteV1/Config/Config.Settings.Save.cs
View File

@@ -65,7 +65,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" + Constants.vbNewLine + Constants.vbNewLine + ex.Message, false);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" + Environment.NewLine + Environment.NewLine + ex.Message, false);
}
}
@@ -82,7 +82,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" + Constants.vbNewLine + Constants.vbNewLine + ex.Message, false);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" + Environment.NewLine + Environment.NewLine + ex.Message, false);
}
}
@@ -120,7 +120,7 @@ namespace mRemoteNG.Config.Settings
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" + Constants.vbNewLine + Constants.vbNewLine + ex.Message, false);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" + Environment.NewLine + Environment.NewLine + ex.Message, false);
}
}
#endregion

20
mRemoteV1/Config/Import/RemoteDesktopConnection.cs
View File

@@ -84,19 +84,19 @@ namespace mRemoteNG.Config.Import
switch (value)
{
case "8":
connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors256;
connectionInfo.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors256;
break;
case "15":
connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit;
connectionInfo.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors15Bit;
break;
case "16":
connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors16Bit;
connectionInfo.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors16Bit;
break;
case "24":
connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors24Bit;
connectionInfo.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors24Bit;
break;
case "32":
connectionInfo.Colors = Connection.Protocol.RDP.RDPColors.Colors32Bit;
connectionInfo.Colors = Connection.Protocol.RDPConnectionProtocolImp.RDPColors.Colors32Bit;
break;
}
break;
@@ -113,11 +113,11 @@ namespace mRemoteNG.Config.Import
case "screen mode id":
if (value == "2")
{
connectionInfo.Resolution = Connection.Protocol.RDP.RDPResolutions.Fullscreen;
connectionInfo.Resolution = Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions.Fullscreen;
}
else
{
connectionInfo.Resolution = Connection.Protocol.RDP.RDPResolutions.FitToWindow;
connectionInfo.Resolution = Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions.FitToWindow;
}
break;
case "connect to console":
@@ -210,13 +210,13 @@ namespace mRemoteNG.Config.Import
switch (value)
{
case "0":
connectionInfo.RedirectSound = Connection.Protocol.RDP.RDPSounds.BringToThisComputer;
connectionInfo.RedirectSound = Connection.Protocol.RDPConnectionProtocolImp.RDPSounds.BringToThisComputer;
break;
case "1":
connectionInfo.RedirectSound = Connection.Protocol.RDP.RDPSounds.LeaveAtRemoteComputer;
connectionInfo.RedirectSound = Connection.Protocol.RDPConnectionProtocolImp.RDPSounds.LeaveAtRemoteComputer;
break;
case "2":
connectionInfo.RedirectSound = Connection.Protocol.RDP.RDPSounds.DoNotPlay;
connectionInfo.RedirectSound = Connection.Protocol.RDPConnectionProtocolImp.RDPSounds.DoNotPlay;
break;
}
break;

26
mRemoteV1/Config/Import/RemoteDesktopConnectionManager.cs
View File

@@ -179,11 +179,11 @@ namespace mRemoteNG.Config.Import
{
if (gatewaySettingsNode.SelectSingleNode("./enabled").InnerText == "True")
{
connectionInfo.RDGatewayUsageMethod = RDP.RDGatewayUsageMethod.Always;
connectionInfo.RDGatewayUsageMethod = RDPConnectionProtocolImp.RDGatewayUsageMethod.Always;
}
else
{
connectionInfo.RDGatewayUsageMethod = RDP.RDGatewayUsageMethod.Never;
connectionInfo.RDGatewayUsageMethod = RDPConnectionProtocolImp.RDGatewayUsageMethod.Never;
}
connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName").InnerText;
@@ -219,25 +219,25 @@ namespace mRemoteNG.Config.Import
string resolutionString = System.Convert.ToString(remoteDesktopNode.SelectSingleNode("./size").InnerText.Replace(" ", ""));
try
{
connectionInfo.Resolution = (Connection.Protocol.RDP.RDPResolutions)Enum.Parse(typeof(Connection.Protocol.RDP.RDPResolutions), "Res" + resolutionString);
connectionInfo.Resolution = (Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions)Enum.Parse(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPResolutions), "Res" + resolutionString);
}
catch (ArgumentException)
{
connectionInfo.Resolution = RDP.RDPResolutions.FitToWindow;
connectionInfo.Resolution = RDPConnectionProtocolImp.RDPResolutions.FitToWindow;
}
if (remoteDesktopNode.SelectSingleNode("./sameSizeAsClientArea").InnerText == "True")
{
connectionInfo.Resolution = RDP.RDPResolutions.FitToWindow;
connectionInfo.Resolution = RDPConnectionProtocolImp.RDPResolutions.FitToWindow;
}
if (remoteDesktopNode.SelectSingleNode("./fullScreen").InnerText == "True")
{
connectionInfo.Resolution = RDP.RDPResolutions.Fullscreen;
connectionInfo.Resolution = RDPConnectionProtocolImp.RDPResolutions.Fullscreen;
}
connectionInfo.Colors = (Connection.Protocol.RDP.RDPColors)Enum.Parse(typeof(Connection.Protocol.RDP.RDPColors), remoteDesktopNode.SelectSingleNode("./colorDepth").InnerText);
connectionInfo.Colors = (Connection.Protocol.RDPConnectionProtocolImp.RDPColors)Enum.Parse(typeof(Connection.Protocol.RDPConnectionProtocolImp.RDPColors), remoteDesktopNode.SelectSingleNode("./colorDepth").InnerText);
}
else
{
@@ -251,13 +251,13 @@ namespace mRemoteNG.Config.Import
switch (localResourcesNode.SelectSingleNode("./audioRedirection").InnerText)
{
case "0": // Bring to this computer
connectionInfo.RedirectSound = RDP.RDPSounds.BringToThisComputer;
connectionInfo.RedirectSound = RDPConnectionProtocolImp.RDPSounds.BringToThisComputer;
break;
case "1": // Leave at remote computer
connectionInfo.RedirectSound = RDP.RDPSounds.LeaveAtRemoteComputer;
connectionInfo.RedirectSound = RDPConnectionProtocolImp.RDPSounds.LeaveAtRemoteComputer;
break;
case "2": // Do not play
connectionInfo.RedirectSound = RDP.RDPSounds.DoNotPlay;
connectionInfo.RedirectSound = RDPConnectionProtocolImp.RDPSounds.DoNotPlay;
break;
}
@@ -299,13 +299,13 @@ namespace mRemoteNG.Config.Import
switch (securitySettingsNode.SelectSingleNode("./authentication").InnerText)
{
case "0": // No authentication
connectionInfo.RDPAuthenticationLevel = RDP.AuthenticationLevel.NoAuth;
connectionInfo.RDPAuthenticationLevel = RDPConnectionProtocolImp.AuthenticationLevel.NoAuth;
break;
case "1": // Do not connect if authentication fails
connectionInfo.RDPAuthenticationLevel = RDP.AuthenticationLevel.AuthRequired;
connectionInfo.RDPAuthenticationLevel = RDPConnectionProtocolImp.AuthenticationLevel.AuthRequired;
break;
case "2": // Warn if authentication fails
connectionInfo.RDPAuthenticationLevel = RDP.AuthenticationLevel.WarnOnFailedAuth;
connectionInfo.RDPAuthenticationLevel = RDPConnectionProtocolImp.AuthenticationLevel.WarnOnFailedAuth;
break;
}
}

2
mRemoteV1/Connection/Connection.Icon.cs
View File

@@ -40,7 +40,7 @@ namespace mRemoteNG.Connection
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t get Icon from String" + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t get Icon from String" + Environment.NewLine + ex.Message);
}
return null;

2
mRemoteV1/Connection/Connection.InterfaceControl.cs
View File

@@ -40,7 +40,7 @@ namespace mRemoteNG.Connection
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t create new InterfaceControl" + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t create new InterfaceControl" + Environment.NewLine + ex.Message);
}
}
#endregion

68
mRemoteV1/Connection/ConnectionProtocolImp.cs Normal file
View File

@@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Reflection;
namespace mRemoteNG.Connection
{
public class ConnectionProtocolImp : ConnectionProtocol
{
private ConnectionProtocol _strategy;
private ConnectingEventHandler ConnectingEvent;
private ConnectedEventHandler ConnectedEvent;
private DisconnectedEventHandler DisconnectedEvent;
private ErrorOccuredEventHandler ErrorOccuredEvent;
private ClosingEventHandler ClosingEvent;
private ClosedEventHandler ClosedEvent;
Protocols Name { get; }
PropertyInfo[] SupportedSettings { get; }
Version ProtocolVersion { get; }
public ConnectionProtocolImp(ConnectionProtocol Protocol)
{
this._strategy = Protocol;
}
public ConnectionProtocolImp(Protocols ProtocolEnum)
{
this._strategy = ProtocolManagerImp.GetConnectionProtocol(ProtocolEnum);
}
public void Initialize()
{
_strategy.Initialize();
}
public void Connect()
{
_strategy.Connect();
}
public void Disconnect()
{
_strategy.Disconnect();
}
delegate void ConnectingEventHandler(object sender);
delegate void ConnectedEventHandler(object sender);
delegate void DisconnectedEventHandler(object sender, string DisconnectedMessage);
delegate void ErrorOccuredEventHandler(object sender, string ErrorMessage);
delegate void ClosingEventHandler(object sender);
delegate void ClosedEventHandler(object sender);
event ConnectingEventHandler Connecting;
event ConnectedEventHandler Connected;
event DisconnectedEventHandler Disconnected;
event ErrorOccuredEventHandler ErrorOccured;
event ClosingEventHandler Closing;
event ClosedEventHandler Closed;
void Event_Connecting(object sender);
void Event_Connected(object sender);
void Event_Disconnected(object sender, string DisconnectedMessage);
void Event_ErrorOccured(object sender, string ErrorMsg);
void Event_Closing(object sender);
void Event_Closed(object sender);
}
}

31
mRemoteV1/Connection/ConnectionRecordImp.cs
View File

@@ -19,6 +19,9 @@ namespace mRemoteNG.Connection
ConnectionProtocol _protocol;
private string _constantId;
// Meta data
//private Protocol.Protocols _protocol;
private ConnectionRecordInheritanceImp _Inherit;
@@ -245,7 +248,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameAuthenticationLevel"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAuthenticationLevel"),
TypeConverter(typeof(Tools.Misc.EnumTypeConverter))]
public Protocol.RDP.AuthenticationLevel RDPAuthenticationLevel
public Protocol.RDPConnectionProtocolImp.AuthenticationLevel RDPAuthenticationLevel
{
get { return GetInheritedPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); }
set { _rdpAuthenticationLevel = value; }
@@ -285,7 +288,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUsageMethod"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsageMethod"),
TypeConverter(typeof(Tools.Misc.EnumTypeConverter))]
public Protocol.RDP.RDGatewayUsageMethod RDGatewayUsageMethod
public Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod RDGatewayUsageMethod
{
get { return GetInheritedPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); }
set { _rdGatewayUsageMethod = value; }
@@ -304,7 +307,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUseConnectionCredentials"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUseConnectionCredentials"),
TypeConverter(typeof(Tools.Misc.EnumTypeConverter))]
public Protocol.RDP.RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
public Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
{
get { return GetInheritedPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); }
set { _rdGatewayUseConnectionCredentials = value; }
@@ -343,7 +346,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameResolution"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionResolution"),
TypeConverter(typeof(Tools.Misc.EnumTypeConverter))]
public Protocol.RDP.RDPResolutions Resolution
public Protocol.RDPConnectionProtocolImp.RDPResolutions Resolution
{
get { return GetInheritedPropertyValue("Resolution", _resolution); }
set { _resolution = value; }
@@ -363,7 +366,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameColors"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionColors"),
TypeConverter(typeof(Tools.Misc.EnumTypeConverter))]
public Protocol.RDP.RDPColors Colors
public Protocol.RDPConnectionProtocolImp.RDPColors Colors
{
get { return GetInheritedPropertyValue("Colors", _colors); }
set { _colors = value; }
@@ -474,7 +477,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectSounds"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectSounds"),
TypeConverter(typeof(Tools.Misc.EnumTypeConverter))]
public Protocol.RDP.RDPSounds RedirectSound
public Protocol.RDPConnectionProtocolImp.RDPSounds RedirectSound
{
get { return GetInheritedPropertyValue("RedirectSound", _redirectSound); }
set { _redirectSound = value; }
@@ -618,7 +621,7 @@ namespace mRemoteNG.Connection
_metaData = new ConnectionRecordMetaDataImp();
_credential = new CredentialRecordImp();
_externalTool = new ExternalToolRecordImp();
_protocol = ProtocolManagerImp.GetConnectionProtocol(protocol);
_protocol = new ConnectionProtocolImp(protocol);
SetDefaults();
}
@@ -713,7 +716,7 @@ namespace mRemoteNG.Connection
switch (protocol)
{
case Connection.Protocol.Protocols.RDP:
return (int)Connection.Protocol.RDP.Defaults.Port;
return (int)Connection.Protocol.RDPConnectionProtocolImp.Defaults.Port;
case Connection.Protocol.Protocols.VNC:
return (int)Connection.Protocol.VNC.Defaults.Port;
case Connection.Protocol.Protocols.SSH1:
@@ -768,7 +771,7 @@ namespace mRemoteNG.Connection
_puttySession = My.Settings.Default.ConDefaultPuttySession;
_icaEncryption = (Protocol.ICA.EncryptionStrength)System.Enum.Parse(typeof(Protocol.ICA.EncryptionStrength), My.Settings.Default.ConDefaultICAEncryptionStrength);
_useConsoleSession = My.Settings.Default.ConDefaultUseConsoleSession;
_rdpAuthenticationLevel = (Protocol.RDP.AuthenticationLevel)System.Enum.Parse(typeof(Protocol.RDP.AuthenticationLevel), My.Settings.Default.ConDefaultRDPAuthenticationLevel);
_rdpAuthenticationLevel = (Protocol.RDPConnectionProtocolImp.AuthenticationLevel)System.Enum.Parse(typeof(Protocol.RDPConnectionProtocolImp.AuthenticationLevel), My.Settings.Default.ConDefaultRDPAuthenticationLevel);
_loadBalanceInfo = My.Settings.Default.ConDefaultLoadBalanceInfo;
_renderingEngine = (Protocol.HTTPBase.RenderingEngine)System.Enum.Parse(typeof(Protocol.HTTPBase.RenderingEngine), My.Settings.Default.ConDefaultRenderingEngine);
_useCredSsp = My.Settings.Default.ConDefaultUseCredSsp;
@@ -776,9 +779,9 @@ namespace mRemoteNG.Connection
private void SetRDGatewayDefaults()
{
_rdGatewayUsageMethod = (Protocol.RDP.RDGatewayUsageMethod)System.Enum.Parse(typeof(Protocol.RDP.RDGatewayUsageMethod), My.Settings.Default.ConDefaultRDGatewayUsageMethod);
_rdGatewayUsageMethod = (Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod)System.Enum.Parse(typeof(Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod), My.Settings.Default.ConDefaultRDGatewayUsageMethod);
_rdGatewayHostname = My.Settings.Default.ConDefaultRDGatewayHostname;
_rdGatewayUseConnectionCredentials = (Protocol.RDP.RDGatewayUseConnectionCredentials)System.Enum.Parse(typeof(Protocol.RDP.RDGatewayUseConnectionCredentials), My.Settings.Default.ConDefaultRDGatewayUseConnectionCredentials); ;
_rdGatewayUseConnectionCredentials = (Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials)System.Enum.Parse(typeof(Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials), My.Settings.Default.ConDefaultRDGatewayUseConnectionCredentials); ;
_rdGatewayUsername = My.Settings.Default.ConDefaultRDGatewayUsername;
_rdGatewayPassword = My.Settings.Default.ConDefaultRDGatewayPassword;
_rdGatewayDomain = My.Settings.Default.ConDefaultRDGatewayDomain;
@@ -786,9 +789,9 @@ namespace mRemoteNG.Connection
private void SetAppearanceDefaults()
{
_resolution = (Protocol.RDP.RDPResolutions)System.Enum.Parse(typeof(Protocol.RDP.RDPResolutions), My.Settings.Default.ConDefaultResolution);
_resolution = (Protocol.RDPConnectionProtocolImp.RDPResolutions)System.Enum.Parse(typeof(Protocol.RDPConnectionProtocolImp.RDPResolutions), My.Settings.Default.ConDefaultResolution);
_automaticResize = My.Settings.Default.ConDefaultAutomaticResize;
_colors = (Protocol.RDP.RDPColors)System.Enum.Parse(typeof(Protocol.RDP.RDPColors), My.Settings.Default.ConDefaultColors);
_colors = (Protocol.RDPConnectionProtocolImp.RDPColors)System.Enum.Parse(typeof(Protocol.RDPConnectionProtocolImp.RDPColors), My.Settings.Default.ConDefaultColors);
_cacheBitmaps = My.Settings.Default.ConDefaultCacheBitmaps;
_displayWallpaper = My.Settings.Default.ConDefaultDisplayWallpaper;
_displayThemes = My.Settings.Default.ConDefaultDisplayThemes;
@@ -803,7 +806,7 @@ namespace mRemoteNG.Connection
_redirectPrinters = My.Settings.Default.ConDefaultRedirectPrinters;
_redirectPorts = My.Settings.Default.ConDefaultRedirectPorts;
_redirectSmartCards = My.Settings.Default.ConDefaultRedirectSmartCards;
_redirectSound = (Protocol.RDP.RDPSounds)System.Enum.Parse(typeof(Protocol.RDP.RDPSounds), My.Settings.Default.ConDefaultRedirectSound);
_redirectSound = (Protocol.RDPConnectionProtocolImp.RDPSounds)System.Enum.Parse(typeof(Protocol.RDPConnectionProtocolImp.RDPSounds), My.Settings.Default.ConDefaultRedirectSound);
}
private void SetVNCDefaults()

34
mRemoteV1/Connection/Interfaces/Connectable.cs Normal file
View File

@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace mRemoteNG.Connection
{
public interface Connectable
{
void Connect();
void Disconnect();
//void Close();
delegate void ConnectingEventHandler(object sender);
delegate void ConnectedEventHandler(object sender);
delegate void DisconnectedEventHandler(object sender, string DisconnectedMessage);
delegate void ErrorOccuredEventHandler(object sender, string ErrorMessage);
delegate void ClosingEventHandler(object sender);
delegate void ClosedEventHandler(object sender);
event ConnectingEventHandler Connecting;
event ConnectedEventHandler Connected;
event DisconnectedEventHandler Disconnected;
event ErrorOccuredEventHandler ErrorOccured;
event ClosingEventHandler Closing;
event ClosedEventHandler Closed;
void Event_Connecting(object sender);
void Event_Connected(object sender);
void Event_Disconnected(object sender, string DisconnectedMessage);
void Event_ErrorOccured(object sender, string ErrorMsg);
void Event_Closing(object sender);
void Event_Closed(object sender);
}
}

9
mRemoteV1/Connection/Interfaces/ConnectionProtocol.cs
View File

@@ -5,13 +5,12 @@ using System.Reflection;
namespace mRemoteNG.Connection
{
public interface ConnectionProtocol
public interface ConnectionProtocol : Connectable
{
Protocols Name { get; }
PropertyInfo[] SupportedSettings { get; }
void Connect();
void Disconnect();
void Reconnect();
Version ProtocolVersion { get; }
void Initialize();
}
}

13
mRemoteV1/Connection/Interfaces/ConnectionRecord.cs
View File

@@ -6,7 +6,7 @@ using mRemoteNG.Credential;
namespace mRemoteNG.Connection
{
public interface ConnectionRecord : Record
public interface ConnectionRecord : Record, Connectable
{
string Name { get; set; }
string Description { get; set; }
@@ -16,10 +16,13 @@ namespace mRemoteNG.Connection
ConnectionRecordInheritanceController Inherit { get; }
ConnectionProtocol Protocol { get; set; }
CredentialRecord Credential { get; set; }
ExternalToolRecord ExternalTool { get; set; }
void Connect();
void Disconnect();
void Reconnect();
//ExternalToolRecord ExternalTool { get; set; }
string PreExtApp { get; set; }
string PostExtApp { get; set; }
string MacAddress { get; set; }
string UserField { get; set; }
}
}

14
mRemoteV1/Connection/Interfaces/RDPConnectionProtocol.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace mRemoteNG.Connection.Protocol
{
interface RDPConnectionProtocol : ConnectionProtocol
{
bool SmartSize { get; set; }
bool Fullscreen { get; set; }
bool RedirectKeys { get; set; }
}
}

0
mRemoteV1/Connection/Protocols/HttpConnectionProtocol.cs → mRemoteV1/Connection/Protocol/HttpConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/HttpsConnectionProtocol.cs → mRemoteV1/Connection/Protocol/HttpsConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/ICAConnectionProtocol.cs → mRemoteV1/Connection/Protocol/ICAConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/OtherConnectionProtocol.cs → mRemoteV1/Connection/Protocol/OtherConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/RAWConnectionProtocol.cs → mRemoteV1/Connection/Protocol/RAWConnectionProtocol.cs
View File

352
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.RDP.cs → mRemoteV1/Connection/Protocol/RDP/RDPConnectionProtocolImp.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.Drawing;
using System.Diagnostics;
using AxMSTSCLib;
using Microsoft.VisualBasic;
using System.Collections;
using System.Windows.Forms;
using System.Threading;
@@ -12,12 +11,23 @@ using mRemoteNG.Messages;
using mRemoteNG.App;
using MSTSCLib;
using mRemoteNG.Tools;
using mRemoteNG.Connection.Protocol.RDP;
namespace mRemoteNG.Connection.Protocol
{
public class RDP : Base
public class RDPConnectionProtocolImp : RDPConnectionProtocol
{
#region Private Declarations
private MsRdpClient6NotSafeForScripting _rdpClient;
private Version _rdpVersion;
private ConnectionRecordImp _connectionInfo;
private bool _loginComplete;
private Size _controlBeginningSize = new Size();
private bool _redirectKeys = false;
private Control _Control;
#endregion
#region Properties
public bool SmartSize
{
@@ -31,7 +41,7 @@ namespace mRemoteNG.Connection.Protocol
ReconnectForResize();
}
}
public bool Fullscreen
{
get
@@ -44,8 +54,7 @@ namespace mRemoteNG.Connection.Protocol
ReconnectForResize();
}
}
private bool _redirectKeys = false;
public bool RedirectKeys
{
get
@@ -68,28 +77,43 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetRedirectKeysFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetRedirectKeysFailed + Environment.NewLine + ex.Message, true);
}
}
}
#endregion
#region Private Declarations
private MSTSCLib.MsRdpClient6NotSafeForScripting _rdpClient;
private Version _rdpVersion;
private ConnectionRecordImp _connectionInfo;
private bool _loginComplete;
#endregion
#region Public Methods
public RDP()
public RDPConnectionProtocolImp()
{
Control = new AxMsRdpClient5NotSafeForScripting();
_rdpClient = new MsRdpClient6NotSafeForScriptingClass();
_rdpVersion = new Version(_rdpClient.Version);
}
public override bool SetProps()
{
base.SetProps();
try
{
this._interfaceControl.Parent.Tag = this._interfaceControl;
this._interfaceControl.Show();
if (this._Control != null)
{
this._Control.Name = this._Name;
this._Control.Parent = this._interfaceControl;
this._Control.Location = this._interfaceControl.Location;
this._Control.Size = this.InterfaceControl.Size;
this._Control.Anchor = this._interfaceControl.Anchor;
}
return true;
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t SetProps (Connection.Protocol.Base)" + Environment.NewLine + ex.Message, true);
return false;
}
try
{
@@ -113,9 +137,9 @@ namespace mRemoteNG.Connection.Protocol
return false;
}
_rdpVersion = new Version(_rdpClient.Version);
this._rdpVersion = new Version(_rdpClient.Version);
_rdpClient.Server = this._connectionInfo.Hostname;
this._rdpClient.Server = this._connectionInfo.Hostname;
this.SetCredentials();
this.SetResolution();
@@ -128,10 +152,9 @@ namespace mRemoteNG.Connection.Protocol
_rdpClient.AdvancedSettings2.keepAliveInterval = 60000; //in milliseconds (10.000 = 10 seconds)
_rdpClient.AdvancedSettings5.AuthenticationLevel = 0;
_rdpClient.AdvancedSettings2.EncryptionEnabled = 1;
_rdpClient.AdvancedSettings2.overallConnectionTimeout = 20;
_rdpClient.AdvancedSettings2.BitmapPeristence = System.Convert.ToInt32(this._connectionInfo.CacheBitmaps);
if (_rdpVersion >= Versions.RDC61)
{
_rdpClient.AdvancedSettings7.EnableCredSspSupport = _connectionInfo.UseCredSsp;
@@ -139,29 +162,25 @@ namespace mRemoteNG.Connection.Protocol
this.SetUseConsoleSession();
this.SetPort();
RedirectKeys = _connectionInfo.RedirectKeys;
this.RedirectKeys = _connectionInfo.RedirectKeys;
this.SetRedirection();
this.SetAuthenticationLevel();
SetLoadBalanceInfo();
this.SetLoadBalanceInfo();
this.SetRdGateway();
_rdpClient.ColorDepth = System.Convert.ToInt32(Conversion.Int(this._connectionInfo.Colors));
this._rdpClient.ColorDepth = System.Convert.ToInt32(Conversion.Int(this._connectionInfo.Colors));
this.SetPerformanceFlags();
_rdpClient.ConnectingText = My.Language.strConnecting;
Control.Anchor = AnchorStyles.None;
this._rdpClient.ConnectingText = My.Language.strConnecting;
base.Control.Anchor = AnchorStyles.None;
return true;
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPropsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
public override bool Connect()
{
_loginComplete = false;
@@ -170,17 +189,21 @@ namespace mRemoteNG.Connection.Protocol
try
{
_rdpClient.Connect();
base.Connect();
if (ConnectedEvent != null)
{
ConnectedEvent(this);
return true;
}
return true;
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpConnectionOpenFailed + Environment.NewLine + ex.Message);
}
return false;
}
public override void Disconnect()
{
try
@@ -189,11 +212,11 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpDisconnectFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpDisconnectFailed + Environment.NewLine + ex.Message, true);
base.Close();
}
}
public void ToggleFullscreen()
{
try
@@ -202,10 +225,10 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpToggleFullscreenFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpToggleFullscreenFailed + Environment.NewLine + ex.Message, true);
}
}
public void ToggleSmartSize()
{
try
@@ -214,10 +237,10 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpToggleSmartSizeFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpToggleSmartSizeFailed + Environment.NewLine + ex.Message, true);
}
}
public override void Focus()
{
try
@@ -229,16 +252,15 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpFocusFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpFocusFailed + Environment.NewLine + ex.Message, true);
}
}
private Size _controlBeginningSize = new Size();
public override void ResizeBegin(object sender, EventArgs e)
{
_controlBeginningSize = Control.Size;
}
public override void Resize(object sender, EventArgs e)
{
if (DoResize() && _controlBeginningSize.IsEmpty)
@@ -247,7 +269,7 @@ namespace mRemoteNG.Connection.Protocol
}
base.Resize(sender, e);
}
public override void ResizeEnd(object sender, EventArgs e)
{
DoResize();
@@ -258,7 +280,7 @@ namespace mRemoteNG.Connection.Protocol
_controlBeginningSize = Size.Empty;
}
#endregion
#region Private Methods
private bool DoResize()
{
@@ -362,7 +384,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetGatewayFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetGatewayFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -464,7 +486,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetCredentialsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetCredentialsFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -501,7 +523,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetResolutionFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetResolutionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -516,7 +538,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPortFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPortFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -532,7 +554,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetRedirectionFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetRedirectionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -543,29 +565,29 @@ namespace mRemoteNG.Connection.Protocol
int pFlags = 0;
if (this._connectionInfo.DisplayThemes == false)
{
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDP.RDPPerformanceFlags.DisableThemes));
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDPConnectionProtocolImp.RDPPerformanceFlags.DisableThemes));
}
if (this._connectionInfo.DisplayWallpaper == false)
{
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDP.RDPPerformanceFlags.DisableWallpaper));
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDPConnectionProtocolImp.RDPPerformanceFlags.DisableWallpaper));
}
if (this._connectionInfo.EnableFontSmoothing)
{
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDP.RDPPerformanceFlags.EnableFontSmoothing));
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDPConnectionProtocolImp.RDPPerformanceFlags.EnableFontSmoothing));
}
if (this._connectionInfo.EnableDesktopComposition)
{
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDP.RDPPerformanceFlags.EnableDesktopComposition));
pFlags += System.Convert.ToInt32(Conversion.Int(Connection.Protocol.RDPConnectionProtocolImp.RDPPerformanceFlags.EnableDesktopComposition));
}
_rdpClient.AdvancedSettings2.PerformanceFlags = pFlags;
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPerformanceFlagsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPerformanceFlagsFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -577,7 +599,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetAuthenticationLevelFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetAuthenticationLevelFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -610,11 +632,11 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetEventHandlersFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
#region Private Events & Handlers
private void RDPEvent_OnFatalError(int errorCode)
{
@@ -668,9 +690,9 @@ namespace mRemoteNG.Connection.Protocol
LeaveFullscreenEvent(this, new EventArgs());
}
#endregion
#region Public Events & Handlers
public delegate void LeaveFullscreenEventHandler(Connection.Protocol.RDP sender, System.EventArgs e);
public delegate void LeaveFullscreenEventHandler(Connection.Protocol.RDPConnectionProtocolImp sender, System.EventArgs e);
private LeaveFullscreenEventHandler LeaveFullscreenEvent;
public event LeaveFullscreenEventHandler LeaveFullscreen
@@ -685,111 +707,7 @@ namespace mRemoteNG.Connection.Protocol
}
}
#endregion
#region Enums
public enum Defaults
{
Colors = RDPColors.Colors16Bit,
Sounds = RDPSounds.DoNotPlay,
Resolution = RDPResolutions.FitToWindow,
Port = 3389
}
public enum RDPColors
{
[LocalizedAttributes.LocalizedDescription("strRDP256Colors")]
Colors256 = 8,
[LocalizedAttributes.LocalizedDescription("strRDP32768Colors")]
Colors15Bit = 15,
[LocalizedAttributes.LocalizedDescription("strRDP65536Colors")]
Colors16Bit = 16,
[LocalizedAttributes.LocalizedDescription("strRDP16777216Colors")]
Colors24Bit = 24,
[LocalizedAttributes.LocalizedDescription("strRDP4294967296Colors")]
Colors32Bit = 32
}
public enum RDPSounds
{
[LocalizedAttributes.LocalizedDescription("strRDPSoundBringToThisComputer")]
BringToThisComputer = 0,
[LocalizedAttributes.LocalizedDescription("strRDPSoundLeaveAtRemoteComputer")]
LeaveAtRemoteComputer = 1,
[LocalizedAttributes.LocalizedDescription("strRDPSoundDoNotPlay")]
DoNotPlay = 2
}
private enum RDPPerformanceFlags
{
[Description("strRDPDisableWallpaper")]DisableWallpaper = 0x1,
[Description("strRDPDisableFullWindowdrag")]DisableFullWindowDrag = 0x2,
[Description("strRDPDisableMenuAnimations")]DisableMenuAnimations = 0x4,
[Description("strRDPDisableThemes")]DisableThemes = 0x8,
[Description("strRDPDisableCursorShadow")]DisableCursorShadow = 0x20,
[Description("strRDPDisableCursorblinking")]DisableCursorBlinking = 0x40,
[Description("strRDPEnableFontSmoothing")]EnableFontSmoothing = 0x80,
[Description("strRDPEnableDesktopComposition")]EnableDesktopComposition = 0x100
}
public enum RDPResolutions
{
[LocalizedAttributes.LocalizedDescription("strRDPFitToPanel")]
FitToWindow,
[LocalizedAttributes.LocalizedDescription("strFullscreen")]
Fullscreen,
[LocalizedAttributes.LocalizedDescription("strRDPSmartSize")]
SmartSize,
[Description("640x480")]Res640x480,
[Description("800x600")]Res800x600,
[Description("1024x768")]Res1024x768,
[Description("1152x864")]Res1152x864,
[Description("1280x800")]Res1280x800,
[Description("1280x1024")]Res1280x1024,
[Description("1400x1050")]Res1400x1050,
[Description("1440x900")]Res1440x900,
[Description("1600x1024")]Res1600x1024,
[Description("1600x1200")]Res1600x1200,
[Description("1600x1280")]Res1600x1280,
[Description("1680x1050")]Res1680x1050,
[Description("1900x1200")]Res1900x1200,
[Description("1920x1200")]Res1920x1200,
[Description("2048x1536")]Res2048x1536,
[Description("2560x2048")]Res2560x2048,
[Description("3200x2400")]Res3200x2400,
[Description("3840x2400")]Res3840x2400
}
public enum AuthenticationLevel
{
[LocalizedAttributes.LocalizedDescription("strAlwaysConnectEvenIfAuthFails")]
NoAuth = 0,
[LocalizedAttributes.LocalizedDescription("strDontConnectWhenAuthFails")]
AuthRequired = 1,
[LocalizedAttributes.LocalizedDescription("strWarnIfAuthFails")]
WarnOnFailedAuth = 2
}
public enum RDGatewayUsageMethod
{
[LocalizedAttributes.LocalizedDescription("strNever")]
Never = 0, // TSC_PROXY_MODE_NONE_DIRECT
[LocalizedAttributes.LocalizedDescription("strAlways")]
Always = 1, // TSC_PROXY_MODE_DIRECT
[LocalizedAttributes.LocalizedDescription("strDetect")]
Detect = 2 // TSC_PROXY_MODE_DETECT
}
public enum RDGatewayUseConnectionCredentials
{
[LocalizedAttributes.LocalizedDescription("strUseDifferentUsernameAndPassword")]
No = 0,
[LocalizedAttributes.LocalizedDescription("strUseSameUsernameAndPassword")]
Yes = 1,
[LocalizedAttributes.LocalizedDescription("strUseSmartCard")]
SmartCard = 2
}
#endregion
#region Resolution
public static Rectangle GetResolutionRectangle(RDPResolutions resolution)
{
@@ -808,7 +726,7 @@ namespace mRemoteNG.Connection.Protocol
}
}
#endregion
public class Versions
{
public static Version RDC60 = new Version(6, 0, 6000);
@@ -816,7 +734,7 @@ namespace mRemoteNG.Connection.Protocol
public static Version RDC70 = new Version(6, 1, 7600);
public static Version RDC80 = new Version(6, 2, 9200);
}
#region Terminal Sessions
public class TerminalSessions
{
@@ -992,7 +910,7 @@ namespace mRemoteNG.Connection.Protocol
public string SessionName {get; set;}
}
#endregion
#region Fatal Errors
public class FatalErrors
{
@@ -1023,13 +941,13 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpErrorGetFailure + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpErrorGetFailure + Environment.NewLine + ex.Message, true);
return string.Format(My.Language.strRdpErrorUnknown, id);
}
}
}
#endregion
#region Reconnect Stuff
public void tmrReconnect_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
@@ -1046,5 +964,91 @@ namespace mRemoteNG.Connection.Protocol
}
}
#endregion
#region Events
public delegate void ConnectingEventHandler(object sender);
public event ConnectingEventHandler Connecting
{
add { ConnectingEvent = (ConnectingEventHandler)System.Delegate.Combine(ConnectingEvent, value); }
remove { ConnectingEvent = (ConnectingEventHandler)System.Delegate.Remove(ConnectingEvent, value); }
}
public delegate void ConnectedEventHandler(object sender);
public event ConnectedEventHandler Connected
{
add { ConnectedEvent = (ConnectedEventHandler)System.Delegate.Combine(ConnectedEvent, value); }
remove { ConnectedEvent = (ConnectedEventHandler)System.Delegate.Remove(ConnectedEvent, value); }
}
public delegate void DisconnectedEventHandler(object sender, string DisconnectedMessage);
public event DisconnectedEventHandler Disconnected
{
add { DisconnectedEvent = (DisconnectedEventHandler)System.Delegate.Combine(DisconnectedEvent, value); }
remove { DisconnectedEvent = (DisconnectedEventHandler)System.Delegate.Remove(DisconnectedEvent, value); }
}
public delegate void ErrorOccuredEventHandler(object sender, string ErrorMessage);
public event ErrorOccuredEventHandler ErrorOccured
{
add { ErrorOccuredEvent = (ErrorOccuredEventHandler)System.Delegate.Combine(ErrorOccuredEvent, value); }
remove { ErrorOccuredEvent = (ErrorOccuredEventHandler)System.Delegate.Remove(ErrorOccuredEvent, value); }
}
public delegate void ClosingEventHandler(object sender);
public event ClosingEventHandler Closing
{
add { ClosingEvent = (ClosingEventHandler)System.Delegate.Combine(ClosingEvent, value); }
remove { ClosingEvent = (ClosingEventHandler)System.Delegate.Remove(ClosingEvent, value); }
}
public delegate void ClosedEventHandler(object sender);
public event ClosedEventHandler Closed
{
add { ClosedEvent = (ClosedEventHandler)System.Delegate.Combine(ClosedEvent, value); }
remove { ClosedEvent = (ClosedEventHandler)System.Delegate.Remove(ClosedEvent, value); }
}
public void Event_Closing(object sender)
{
if (ClosingEvent != null)
ClosingEvent(sender);
}
public void Event_Closed(object sender)
{
if (ClosedEvent != null)
ClosedEvent(sender);
}
public void Event_Connecting(object sender)
{
if (ConnectingEvent != null)
ConnectingEvent(sender);
}
public void Event_Connected(object sender)
{
if (ConnectedEvent != null)
ConnectedEvent(sender);
}
public void Event_Disconnected(object sender, string DisconnectedMessage)
{
if (DisconnectedEvent != null)
DisconnectedEvent(sender, DisconnectedMessage);
}
public void Event_ErrorOccured(object sender, string ErrorMsg)
{
if (ErrorOccuredEvent != null)
ErrorOccuredEvent(sender, ErrorMsg);
}
public void Event_ReconnectGroupCloseClicked()
{
Close();
}
#endregion
}
}
}

136
mRemoteV1/Connection/Protocol/RDP/RDPEnums.cs Normal file
View File

@@ -0,0 +1,136 @@
using System;
using System.Collections.Generic;
using System.Text;
using mRemoteNG.Tools;
using System.ComponentModel;
namespace mRemoteNG.Connection.Protocol.RDP
{
public enum Defaults
{
Colors = RDPColors.Colors16Bit,
Sounds = RDPSounds.DoNotPlay,
Resolution = RDPResolutions.FitToWindow,
Port = 3389
}
public enum RDPColors
{
[LocalizedAttributes.LocalizedDescription("strRDP256Colors")]
Colors256 = 8,
[LocalizedAttributes.LocalizedDescription("strRDP32768Colors")]
Colors15Bit = 15,
[LocalizedAttributes.LocalizedDescription("strRDP65536Colors")]
Colors16Bit = 16,
[LocalizedAttributes.LocalizedDescription("strRDP16777216Colors")]
Colors24Bit = 24,
[LocalizedAttributes.LocalizedDescription("strRDP4294967296Colors")]
Colors32Bit = 32
}
public enum RDPSounds
{
[LocalizedAttributes.LocalizedDescription("strRDPSoundBringToThisComputer")]
BringToThisComputer = 0,
[LocalizedAttributes.LocalizedDescription("strRDPSoundLeaveAtRemoteComputer")]
LeaveAtRemoteComputer = 1,
[LocalizedAttributes.LocalizedDescription("strRDPSoundDoNotPlay")]
DoNotPlay = 2
}
private enum RDPPerformanceFlags
{
[Description("strRDPDisableWallpaper")]
DisableWallpaper = 0x1,
[Description("strRDPDisableFullWindowdrag")]
DisableFullWindowDrag = 0x2,
[Description("strRDPDisableMenuAnimations")]
DisableMenuAnimations = 0x4,
[Description("strRDPDisableThemes")]
DisableThemes = 0x8,
[Description("strRDPDisableCursorShadow")]
DisableCursorShadow = 0x20,
[Description("strRDPDisableCursorblinking")]
DisableCursorBlinking = 0x40,
[Description("strRDPEnableFontSmoothing")]
EnableFontSmoothing = 0x80,
[Description("strRDPEnableDesktopComposition")]
EnableDesktopComposition = 0x100
}
public enum RDPResolutions
{
[LocalizedAttributes.LocalizedDescription("strRDPFitToPanel")]
FitToWindow,
[LocalizedAttributes.LocalizedDescription("strFullscreen")]
Fullscreen,
[LocalizedAttributes.LocalizedDescription("strRDPSmartSize")]
SmartSize,
[Description("640x480")]
Res640x480,
[Description("800x600")]
Res800x600,
[Description("1024x768")]
Res1024x768,
[Description("1152x864")]
Res1152x864,
[Description("1280x800")]
Res1280x800,
[Description("1280x1024")]
Res1280x1024,
[Description("1400x1050")]
Res1400x1050,
[Description("1440x900")]
Res1440x900,
[Description("1600x1024")]
Res1600x1024,
[Description("1600x1200")]
Res1600x1200,
[Description("1600x1280")]
Res1600x1280,
[Description("1680x1050")]
Res1680x1050,
[Description("1900x1200")]
Res1900x1200,
[Description("1920x1200")]
Res1920x1200,
[Description("2048x1536")]
Res2048x1536,
[Description("2560x2048")]
Res2560x2048,
[Description("3200x2400")]
Res3200x2400,
[Description("3840x2400")]
Res3840x2400
}
public enum AuthenticationLevel
{
[LocalizedAttributes.LocalizedDescription("strAlwaysConnectEvenIfAuthFails")]
NoAuth = 0,
[LocalizedAttributes.LocalizedDescription("strDontConnectWhenAuthFails")]
AuthRequired = 1,
[LocalizedAttributes.LocalizedDescription("strWarnIfAuthFails")]
WarnOnFailedAuth = 2
}
public enum RDGatewayUsageMethod
{
[LocalizedAttributes.LocalizedDescription("strNever")]
Never = 0, // TSC_PROXY_MODE_NONE_DIRECT
[LocalizedAttributes.LocalizedDescription("strAlways")]
Always = 1, // TSC_PROXY_MODE_DIRECT
[LocalizedAttributes.LocalizedDescription("strDetect")]
Detect = 2 // TSC_PROXY_MODE_DETECT
}
public enum RDGatewayUseConnectionCredentials
{
[LocalizedAttributes.LocalizedDescription("strUseDifferentUsernameAndPassword")]
No = 0,
[LocalizedAttributes.LocalizedDescription("strUseSameUsernameAndPassword")]
Yes = 1,
[LocalizedAttributes.LocalizedDescription("strUseSmartCard")]
SmartCard = 2
}
}

0
mRemoteV1/Connection/Protocols/RloginConnectionProtocol.cs → mRemoteV1/Connection/Protocol/RloginConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/SSH1ConnectionProtocol.cs → mRemoteV1/Connection/Protocol/SSH1ConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/SSH2ConnectionProtocol.cs → mRemoteV1/Connection/Protocol/SSH2ConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/TelnetConnectionProtocol.cs → mRemoteV1/Connection/Protocol/TelnetConnectionProtocol.cs
View File

0
mRemoteV1/Connection/Protocols/VNCConnectionProtocol.cs → mRemoteV1/Connection/Protocol/VNCConnectionProtocol.cs
View File

2
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.Base.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.Base.cs
View File

@@ -13,7 +13,7 @@ namespace mRemoteNG.Connection.Protocol
private UI.Window.Connection _connectionWindow;
private InterfaceControl _interfaceControl;
private Control _Control;
private mRemoteNG.Connection.ConnectionRecordImp.Force _Force;
private ConnectionRecordImp.Force _Force;
private ConnectingEventHandler ConnectingEvent;
private ConnectedEventHandler ConnectedEvent;
private DisconnectedEventHandler DisconnectedEvent;

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.HTTP.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.HTTP.cs
View File

12
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.HTTPBase.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.HTTPBase.cs
View File

@@ -34,7 +34,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectionFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -80,7 +80,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpSetPropsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -94,7 +94,7 @@ namespace mRemoteNG.Connection.Protocol
if (!(((int)Force & (int)ConnectionRecordImp.Force.NoCredentials) == (int)ConnectionRecordImp.Force.NoCredentials) && !string.IsNullOrEmpty(InterfaceControl.Info.Username) && !string.IsNullOrEmpty(InterfaceControl.Info.Password))
{
strAuth = "Authorization: Basic " + Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(this.InterfaceControl.Info.Username + ":" + this.InterfaceControl.Info.Password)) + Constants.vbNewLine;
strAuth = "Authorization: Basic " + Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(this.InterfaceControl.Info.Username + ":" + this.InterfaceControl.Info.Password)) + Environment.NewLine;
}
if (this.InterfaceControl.Info.Port != defaultPort)
@@ -140,7 +140,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -227,7 +227,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -278,7 +278,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.HTTPS.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.HTTPS.cs
View File

26
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.ICA.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.ICA.cs
View File

@@ -56,7 +56,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaControlFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaControlFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -112,7 +112,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetPropsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -129,7 +129,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaConnectionFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaConnectionFailed + Environment.NewLine + ex.Message);
return false;
}
}
@@ -198,7 +198,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetCredentialsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetCredentialsFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -214,28 +214,28 @@ namespace mRemoteNG.Connection.Protocol
return;
}
if (this.InterfaceControl.Info.Resolution == RDP.RDPResolutions.FitToWindow)
if (this.InterfaceControl.Info.Resolution == RDPConnectionProtocolImp.RDPResolutions.FitToWindow)
{
_ICAClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, this.InterfaceControl.Size.Width, this.InterfaceControl.Size.Height, 0);
}
else if (this.InterfaceControl.Info.Resolution == RDP.RDPResolutions.SmartSize)
else if (this.InterfaceControl.Info.Resolution == RDPConnectionProtocolImp.RDPResolutions.SmartSize)
{
_ICAClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, this.InterfaceControl.Size.Width, this.InterfaceControl.Size.Height, 0);
}
else if (this.InterfaceControl.Info.Resolution == RDP.RDPResolutions.Fullscreen)
else if (this.InterfaceControl.Info.Resolution == RDPConnectionProtocolImp.RDPResolutions.Fullscreen)
{
_ICAClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, Screen.FromControl(frmMain.Default).Bounds.Width, Screen.FromControl(frmMain.Default).Bounds.Height, 0);
_ICAClient.FullScreenWindow();
}
else
{
Rectangle resolution = RDP.GetResolutionRectangle(_Info.Resolution);
Rectangle resolution = RDPConnectionProtocolImp.GetResolutionRectangle(_Info.Resolution);
_ICAClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, resolution.Width, resolution.Height, 0);
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetResolutionFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetResolutionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -243,13 +243,13 @@ namespace mRemoteNG.Connection.Protocol
{
switch (_Info.Colors)
{
case RDP.RDPColors.Colors256:
case RDPConnectionProtocolImp.RDPColors.Colors256:
_ICAClient.SetProp("DesiredColor", "2");
break;
case RDP.RDPColors.Colors15Bit:
case RDPConnectionProtocolImp.RDPColors.Colors15Bit:
_ICAClient.SetProp("DesiredColor", "4");
break;
case RDP.RDPColors.Colors16Bit:
case RDPConnectionProtocolImp.RDPColors.Colors16Bit:
_ICAClient.SetProp("DesiredColor", "4");
break;
default:
@@ -292,7 +292,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetEventHandlersFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.IntegratedProgram.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.IntegratedProgram.cs
View File

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.List.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.List.cs
View File

12
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.PuttyBase.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.PuttyBase.cs
View File

@@ -235,7 +235,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyConnectionFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyConnectionFailed + Environment.NewLine + ex.Message);
return false;
}
}
@@ -252,7 +252,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyFocusFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyFocusFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -268,7 +268,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyResizeFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyResizeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -283,7 +283,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyKillFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyKillFailed + Environment.NewLine + ex.Message, true);
}
try
@@ -292,7 +292,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyDisposeFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyDisposeFailed + Environment.NewLine + ex.Message, true);
}
base.Close();
@@ -307,7 +307,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyShowSettingsDialogFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyShowSettingsDialogFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.RAW.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.RAW.cs
View File

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.Rlogin.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.Rlogin.cs
View File

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.SSH1.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.SSH1.cs
View File

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.SSH2.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.SSH2.cs
View File

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.Serial.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.Serial.cs
View File

0
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.Telnet.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.Telnet.cs
View File

18
mRemoteV1/Connection/Protocols/deprecated/Connection.Protocol.VNC.cs → mRemoteV1/Connection/Protocol/deprecated/Connection.Protocol.VNC.cs
View File

@@ -113,7 +113,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetPropsFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -128,7 +128,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionOpenFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionOpenFailed + Environment.NewLine + ex.Message);
return false;
}
@@ -143,7 +143,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionDisconnectFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionDisconnectFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -163,7 +163,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSendSpecialKeysFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSendSpecialKeysFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -176,7 +176,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleSmartSizeFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleSmartSizeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -188,7 +188,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleViewOnlyFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleViewOnlyFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -205,7 +205,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncStartChatFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncStartChatFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -233,7 +233,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncRefreshFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncRefreshFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -253,7 +253,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetEventHandlersFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion

2
mRemoteV1/Connection/ProtocolManagerImp.cs
View File

@@ -23,7 +23,7 @@ namespace mRemoteNG.Connection
_enumInterfaceProtocolPairs.Add(Protocols.ICA, new ICAConnectionProtocol());
_enumInterfaceProtocolPairs.Add(Protocols.IntApp, new OtherConnectionProtocol());
_enumInterfaceProtocolPairs.Add(Protocols.RAW, new RAWConnectionProtocol());
_enumInterfaceProtocolPairs.Add(Protocols.RDP, new RDPConnectionProtocol());
_enumInterfaceProtocolPairs.Add(Protocols.RDP, new RDPConnectionProtocolImp());
_enumInterfaceProtocolPairs.Add(Protocols.Rlogin, new RloginConnectionProtocol());
_enumInterfaceProtocolPairs.Add(Protocols.SSH1, new SSH1ConnectionProtocol());
_enumInterfaceProtocolPairs.Add(Protocols.SSH2, new SSH2ConnectionProtocol());

29
mRemoteV1/Connection/Protocols/RDPConnectionProtocol.cs
View File

@@ -1,29 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace mRemoteNG.Connection.Protocol
{
public class RDPConnectionProtocol : ConnectionProtocol
{
private string _name = "RDP";
public Protocols Name
{
get { return _name; }
}
public RDPConnectionProtocol()
{
}
public void Connect()
{ }
public void Disconnect()
{ }
public void Reconnect()
{ }
}
}

2
mRemoteV1/Connection/PuttySession.Info.cs
View File

@@ -32,7 +32,7 @@ namespace mRemoteNG.Connection.PuttySession
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strErrorCouldNotLaunchPutty + Constants.vbNewLine + ex.Message, false);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strErrorCouldNotLaunchPutty + Environment.NewLine + ex.Message, false);
}
}
#endregion

12
mRemoteV1/Connection/RDPProtocolOptionsImp.cs
View File

@@ -7,12 +7,12 @@ namespace mRemoteNG.Connection
{
public class RDPProtocolOptionsImp : ConnectionProtocolOptions
{
private Protocol.RDP.RDGatewayUsageMethod _rdGatewayUsageMethod;
private Protocol.RDP.AuthenticationLevel _rdpAuthenticationLevel;
private Protocol.RDP.RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
private Protocol.RDP.RDPResolutions _resolution;
private Protocol.RDP.RDPSounds _redirectSound;
private Protocol.RDP.RDPColors _colors;
private Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod _rdGatewayUsageMethod;
private Protocol.RDPConnectionProtocolImp.AuthenticationLevel _rdpAuthenticationLevel;
private Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
private Protocol.RDPConnectionProtocolImp.RDPResolutions _resolution;
private Protocol.RDPConnectionProtocolImp.RDPSounds _redirectSound;
private Protocol.RDPConnectionProtocolImp.RDPColors _colors;
private string _rdGatewayHostname;
private string _rdGatewayUsername;
private string _rdGatewayPassword;

13
mRemoteV1/Connection/Resizeable.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace mRemoteNG.Connection
{
public interface Resizeable
{
void Resize(System.Object sender, EventArgs e);
void ResizeBegin(System.Object sender, EventArgs e);
void ResizeEnd(System.Object sender, EventArgs e)
}
}

4
mRemoteV1/Messages/Messages.Collector.cs
View File

@@ -121,7 +121,7 @@ namespace mRemoteNG.Messages
ListViewItem lvItem = new ListViewItem();
lvItem.ImageIndex = System.Convert.ToInt32(nMsg.MsgClass);
lvItem.Text = nMsg.MsgText.Replace(Constants.vbNewLine, " ");
lvItem.Text = nMsg.MsgText.Replace(Environment.NewLine, " ");
lvItem.Tag = nMsg;
AddToList(lvItem);
@@ -129,7 +129,7 @@ namespace mRemoteNG.Messages
public void AddExceptionMessage(string message, Exception ex, MessageClass msgClass = MessageClass.ErrorMsg, bool logOnly = false)
{
AddMessage(msgClass, message + Constants.vbNewLine + Tools.Misc.GetExceptionMessageRecursive(ex), logOnly);
AddMessage(msgClass, message + Environment.NewLine + Tools.Misc.GetExceptionMessageRecursive(ex), logOnly);
}
#endregion

4
mRemoteV1/Security/Security.Impersonator.cs
View File

@@ -78,7 +78,7 @@ namespace mRemoteNG.Security
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Starting Impersonation failed (Sessions feature will not work)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Starting Impersonation failed (Sessions feature will not work)" + Environment.NewLine + ex.Message, true);
}
}
@@ -95,7 +95,7 @@ namespace mRemoteNG.Security
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Stopping Impersonation failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Stopping Impersonation failed" + Environment.NewLine + ex.Message, true);
throw;
}
finally

6
mRemoteV1/Tools/Tools.Controls.cs
View File

@@ -105,7 +105,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new SysTrayIcon failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new SysTrayIcon failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -120,7 +120,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Disposing SysTrayIcon failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Disposing SysTrayIcon failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -168,7 +168,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" + Environment.NewLine + ex.Message, true);
}
}

10
mRemoteV1/Tools/Tools.Misc.cs
View File

@@ -67,7 +67,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetIconFromFile failed (Tools.Misc)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetIconFromFile failed (Tools.Misc)" + Environment.NewLine + ex.Message, true);
return null;
}
}
@@ -146,7 +146,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsSQLUpdateAvailable failed (Tools.Misc)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsSQLUpdateAvailable failed (Tools.Misc)" + Environment.NewLine + ex.Message, true);
}
return false;
@@ -212,7 +212,7 @@ namespace mRemoteNG.Tools
return Enum.Parse(t, value);
}
public static string GetExceptionMessageRecursive(Exception ex, string separator = Constants.vbNewLine)
public static string GetExceptionMessageRecursive(Exception ex, string separator = Environment.NewLine)
{
string message = ex.Message;
if (ex.InnerException != null)
@@ -242,7 +242,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Taking Screenshot failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Taking Screenshot failed" + Environment.NewLine + ex.Message, true);
}
return null;
@@ -526,7 +526,7 @@ namespace mRemoteNG.Tools
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new Args failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new Args failed" + Environment.NewLine + ex.Message, true);
}
}
}

4
mRemoteV1/Tools/Tools.PortScan.cs
View File

@@ -50,7 +50,7 @@ namespace mRemoteNG.Tools.PortScan
set { _RloginPort = value; }
}
private static int _RDPPort = (int)Connection.Protocol.RDP.Defaults.Port;
private static int _RDPPort = (int)Connection.Protocol.RDPConnectionProtocolImp.Defaults.Port;
public static int RDPPort
{
get { return _RDPPort; }
@@ -406,7 +406,7 @@ namespace mRemoteNG.Tools.PortScan
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "StartScanBG failed (Tools.PortScan)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "StartScanBG failed (Tools.PortScan)" + Environment.NewLine + ex.Message, true);
}
}

22
mRemoteV1/Tree/Tree.Node.cs
View File

@@ -138,7 +138,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t get node type" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t get node type" + Environment.NewLine + ex.Message, true);
}
return Type.None;
@@ -160,7 +160,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t get node type from string" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t get node type from string" + Environment.NewLine + ex.Message, true);
}
return Type.None;
@@ -190,7 +190,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" + Environment.NewLine + ex.Message, true);
}
return null;
@@ -220,7 +220,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" + Environment.NewLine + ex.Message, true);
}
return null;
@@ -237,7 +237,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "IsEmpty (Tree.Node) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "IsEmpty (Tree.Node) failed" + Environment.NewLine + ex.Message, true);
}
return true;
@@ -284,7 +284,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNode failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNode failed" + Environment.NewLine + ex.Message, true);
}
return null;
@@ -403,7 +403,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SetNodeToolTip failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SetNodeToolTip failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -455,7 +455,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Deleting selected node failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Deleting selected node failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -511,7 +511,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeUp failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeUp failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -537,7 +537,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeDown failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeDown failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -675,7 +675,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Sort nodes failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Sort nodes failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion

2
mRemoteV1/UI/Windows/UI.Window.About.cs
View File

@@ -326,7 +326,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Loading About failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Loading About failed" + Environment.NewLine + ex.Message, true);
}
}

4
mRemoteV1/UI/Windows/UI.Window.ComponentsCheck.cs
View File

@@ -514,9 +514,9 @@ namespace mRemoteNG.UI.Window
System.Windows.Forms.Application.DoEvents();
}
if (!(new Version(System.Convert.ToString(rdpClient.Version)) >= mRemoteNG.Connection.Protocol.RDP.Versions.RDC60))
if (!(new Version(System.Convert.ToString(rdpClient.Version)) >= mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.Versions.RDC60))
{
throw (new Exception(string.Format("Found RDC Client version {0} but version {1} or higher is required.", rdpClient.Version, mRemoteNG.Connection.Protocol.RDP.Versions.RDC60)));
throw (new Exception(string.Format("Found RDC Client version {0} but version {1} or higher is required.", rdpClient.Version, mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.Versions.RDC60)));
}
pbCheck1.Image = My.Resources.Good_Symbol;

6
mRemoteV1/UI/Windows/UI.Window.Config.cs
View File

@@ -902,7 +902,7 @@ namespace mRemoteNG.UI.Window
strHide.Add("VNCProxyUsername");
strHide.Add("VNCSmartSizeMode");
strHide.Add("VNCViewOnly");
if (conI.RDGatewayUsageMethod == mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod.Never)
if (conI.RDGatewayUsageMethod == mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUsageMethod.Never)
{
strHide.Add("RDGatewayDomain");
strHide.Add("RDGatewayHostname");
@@ -910,13 +910,13 @@ namespace mRemoteNG.UI.Window
strHide.Add("RDGatewayUseConnectionCredentials");
strHide.Add("RDGatewayUsername");
}
else if (conI.RDGatewayUseConnectionCredentials == mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials.Yes)
else if (conI.RDGatewayUseConnectionCredentials == mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.RDGatewayUseConnectionCredentials.Yes)
{
strHide.Add("RDGatewayDomain");
strHide.Add("RDGatewayPassword");
strHide.Add("RDGatewayUsername");
}
if (!(conI.Resolution == RDP.RDPResolutions.FitToWindow || conI.Resolution == RDP.RDPResolutions.Fullscreen))
if (!(conI.Resolution == RDPConnectionProtocolImp.RDPResolutions.FitToWindow || conI.Resolution == RDPConnectionProtocolImp.RDPResolutions.Fullscreen))
{
strHide.Add("AutomaticResize");
}

60
mRemoteV1/UI/Windows/UI.Window.Connection.cs
View File

@@ -327,7 +327,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddConnectionTab (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddConnectionTab (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
return null;
@@ -443,7 +443,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Connection.Connection_FormClosing() failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Connection.Connection_FormClosing() failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -527,7 +527,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Connection.CloseConnectionTab() failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Connection.CloseConnectionTab() failed" + Environment.NewLine + ex.Message, true);
}
UpdateSelectedConnection();
@@ -585,7 +585,7 @@ namespace mRemoteNG.UI.Window
if (IC.Info.Protocol == mRemoteNG.Connection.Protocol.Protocols.RDP)
{
mRemoteNG.Connection.Protocol.RDP rdp = (mRemoteNG.Connection.Protocol.RDP)IC.Protocol;
mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp rdp = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp)IC.Protocol;
cmenTabFullscreen.Enabled = true;
cmenTabFullscreen.Checked = rdp.Fullscreen;
@@ -640,7 +640,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideMenuButtons (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideMenuButtons (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -733,9 +733,9 @@ namespace mRemoteNG.UI.Window
{
mRemoteNG.Connection.InterfaceControl IC = (mRemoteNG.Connection.InterfaceControl)this.TabController.SelectedTab.Tag;
if (IC.Protocol is mRemoteNG.Connection.Protocol.RDP)
if (IC.Protocol is mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp)
{
mRemoteNG.Connection.Protocol.RDP rdp = (mRemoteNG.Connection.Protocol.RDP)IC.Protocol;
mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp rdp = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp)IC.Protocol;
rdp.ToggleSmartSize();
}
else if (IC.Protocol is mRemoteNG.Connection.Protocol.VNC)
@@ -748,7 +748,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleSmartSize (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleSmartSize (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -775,7 +775,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TransferFile (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TransferFile (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -797,7 +797,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -811,7 +811,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "VNCTransferFile (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "VNCTransferFile (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -837,7 +837,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleViewOnly (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleViewOnly (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -861,7 +861,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartChat (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartChat (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -885,7 +885,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshScreen (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshScreen (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -909,7 +909,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SendSpecialKeys (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SendSpecialKeys (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -923,9 +923,9 @@ namespace mRemoteNG.UI.Window
{
mRemoteNG.Connection.InterfaceControl IC = (mRemoteNG.Connection.InterfaceControl)this.TabController.SelectedTab.Tag;
if (IC.Protocol is mRemoteNG.Connection.Protocol.RDP)
if (IC.Protocol is mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp)
{
mRemoteNG.Connection.Protocol.RDP rdp = (mRemoteNG.Connection.Protocol.RDP)IC.Protocol;
mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp rdp = (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp)IC.Protocol;
rdp.ToggleFullscreen();
}
}
@@ -933,7 +933,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleFullscreen (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleFullscreen (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -958,7 +958,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowPuttySettingsDialog (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowPuttySettingsDialog (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -985,7 +985,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" + Environment.NewLine + ex.Message, true);
}
}
@@ -1006,7 +1006,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cmenTabExternalAppsEntry_Click failed (UI.Window.Tree)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cmenTabExternalAppsEntry_Click failed (UI.Window.Tree)" + Environment.NewLine + ex.Message, true);
}
}
@@ -1026,7 +1026,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CloseTabMenu (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CloseTabMenu (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -1047,7 +1047,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DuplicateTab (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DuplicateTab (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -1070,7 +1070,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Reconnect (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Reconnect (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -1087,7 +1087,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RenameTab (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RenameTab (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -1118,7 +1118,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t close tab" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t close tab" + Environment.NewLine + ex.Message, true);
}
}
else
@@ -1134,7 +1134,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t close tab" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn\'t close tab" + Environment.NewLine + ex.Message, true);
}
if (this.TabController.TabPages.Count == 0)
@@ -1198,7 +1198,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseUp (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseUp (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -1217,7 +1217,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "FocusIC (UI.Window.Connections) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "FocusIC (UI.Window.Connections) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -1240,7 +1240,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshIC (UI.Window.Connection) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshIC (UI.Window.Connection) failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion

16
mRemoteV1/UI/Windows/UI.Window.ErrorsAndInfos.cs
View File

@@ -240,7 +240,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutVertical (UI.Window.ErrorsAndInfos) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutVertical (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -260,7 +260,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutHorizontal (UI.Window.ErrorsAndInfos) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutHorizontal (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -287,7 +287,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ErrorsAndInfos_Resize (UI.Window.ErrorsAndInfos) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ErrorsAndInfos_Resize (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -303,7 +303,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "pnlErrorMsg_ResetDefaultStyle (UI.Window.ErrorsAndInfos) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "pnlErrorMsg_ResetDefaultStyle (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -331,7 +331,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MC_KeyDown (UI.Window.ErrorsAndInfos) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MC_KeyDown (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -371,7 +371,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "lvErrorCollector_SelectedIndexChanged (UI.Window.ErrorsAndInfos) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "lvErrorCollector_SelectedIndexChanged (UI.Window.ErrorsAndInfos) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -443,7 +443,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.CopyMessagesToClipboard() failed." + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.CopyMessagesToClipboard() failed." + Environment.NewLine + ex.Message, true);
}
finally
{
@@ -476,7 +476,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.DeleteMessages() failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.ErrorsAndInfos.DeleteMessages() failed" + Environment.NewLine + ex.Message, true);
}
finally
{

2
mRemoteV1/UI/Windows/UI.Window.PortScan.cs
View File

@@ -204,7 +204,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartScan failed (UI.Window.PortScan)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartScan failed (UI.Window.PortScan)" + Environment.NewLine + ex.Message, true);
}
}

6
mRemoteV1/UI/Windows/UI.Window.SSHTransfer.cs
View File

@@ -429,7 +429,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHTransferFailed + Constants.vbNewLine + ex.Message);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHTransferFailed + Environment.NewLine + ex.Message);
this.sshT.Close();
}
}
@@ -446,7 +446,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHStartTransferBG + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHStartTransferBG + Environment.NewLine + ex.Message, true);
}
}
@@ -561,7 +561,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHTransferEndFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHTransferEndFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion

12
mRemoteV1/UI/Windows/UI.Window.ScreenshotManager.cs
View File

@@ -194,7 +194,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddScreenshot (UI.Window.ScreenshotManager) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddScreenshot (UI.Window.ScreenshotManager) failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -255,7 +255,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "OpenScreenshot (UI.Window.ScreenshotManager) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "OpenScreenshot (UI.Window.ScreenshotManager) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -267,7 +267,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "btnCloseScreenshot_Click (UI.Window.ScreenshotManager) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "btnCloseScreenshot_Click (UI.Window.ScreenshotManager) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -317,7 +317,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveAllImages (UI.Window.ScreenshotManager) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveAllImages (UI.Window.ScreenshotManager) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -334,7 +334,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CopyImageToClipboard (UI.Window.ScreenshotManager) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CopyImageToClipboard (UI.Window.ScreenshotManager) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -368,7 +368,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveSingleImage (UI.Window.ScreenshotManager) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveSingleImage (UI.Window.ScreenshotManager) failed" + Environment.NewLine + ex.Message, true);
}
}

20
mRemoteV1/UI/Windows/UI.Window.Sessions.cs
View File

@@ -87,7 +87,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Sessions.GetSessions() failed." + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Sessions.GetSessions() failed." + Environment.NewLine + ex.Message, true);
}
}
@@ -133,7 +133,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Sessions.KillSession() failed." + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Sessions.KillSession() failed." + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -166,7 +166,7 @@ namespace mRemoteNG.UI.Window
}
Security.Impersonator impersonator = new Security.Impersonator();
mRemoteNG.Connection.Protocol.RDP.TerminalSessions terminalSessions = new mRemoteNG.Connection.Protocol.RDP.TerminalSessions();
mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.TerminalSessions terminalSessions = new mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.TerminalSessions();
int serverHandle = 0;
try
{
@@ -188,7 +188,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSessionGetFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSessionGetFailed + Environment.NewLine + ex.Message, true);
}
finally
{
@@ -201,16 +201,16 @@ namespace mRemoteNG.UI.Window
}
// Get sessions from an already impersonated and connected TerminalSessions object
private void GetSessions(mRemoteNG.Connection.Protocol.RDP.TerminalSessions terminalSessions, int serverHandle)
private void GetSessions(mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.TerminalSessions terminalSessions, int serverHandle)
{
mRemoteNG.Connection.Protocol.RDP.SessionsCollection rdpSessions = terminalSessions.GetSessions(serverHandle);
foreach (mRemoteNG.Connection.Protocol.RDP.Session session in rdpSessions)
mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.SessionsCollection rdpSessions = terminalSessions.GetSessions(serverHandle);
foreach (mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.Session session in rdpSessions)
{
ListViewItem item = new ListViewItem();
item.Tag = session.SessionId;
item.Text = session.SessionUser;
item.SubItems.Add(session.SessionState);
item.SubItems.Add(session.SessionName.Replace(Constants.vbNewLine, ""));
item.SubItems.Add(session.SessionName.Replace(Environment.NewLine, ""));
AddToList(item);
}
}
@@ -224,7 +224,7 @@ namespace mRemoteNG.UI.Window
}
Security.Impersonator impersonator = new Security.Impersonator();
mRemoteNG.Connection.Protocol.RDP.TerminalSessions terminalSessions = new mRemoteNG.Connection.Protocol.RDP.TerminalSessions();
mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.TerminalSessions terminalSessions = new mRemoteNG.Connection.Protocol.RDPConnectionProtocolImp.TerminalSessions();
int serverHandle = 0;
try
{
@@ -253,7 +253,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSessionKillFailed + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSessionKillFailed + Environment.NewLine + ex.Message, true);
}
finally
{

38
mRemoteV1/UI/Windows/UI.Window.Tree.cs
View File

@@ -120,7 +120,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "FillImageList (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "FillImageList (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -142,7 +142,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterLabelEdit (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterLabelEdit (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -175,7 +175,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterSelect (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterSelect (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -203,7 +203,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_NodeMouseClick (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_NodeMouseClick (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -224,7 +224,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_MouseMove (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_MouseMove (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -373,7 +373,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideTreeContextMenuItems (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideTreeContextMenuItems (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -459,7 +459,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragDrop (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragDrop (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -481,7 +481,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragEnter (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragEnter (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -529,7 +529,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragOver (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragOver (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -558,7 +558,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_ItemDrag (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_ItemDrag (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -713,7 +713,7 @@ namespace mRemoteNG.UI.Window
TreeNode newTreeNode = mRemoteNG.Tree.Node.AddNode(mRemoteNG.Tree.Node.Type.Connection);
if (newTreeNode == null)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Tree.AddConnection() failed." + Constants.vbNewLine + "mRemoteNG.Tree.Node.AddNode() returned Nothing.", true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Tree.AddConnection() failed." + Environment.NewLine + "mRemoteNG.Tree.Node.AddNode() returned Nothing.", true);
return ;
}
@@ -744,7 +744,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Tree.AddConnection() failed." + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "UI.Window.Tree.AddConnection() failed." + Environment.NewLine + ex.Message, true);
}
}
@@ -833,7 +833,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DisconnectConnection (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DisconnectConnection (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -852,7 +852,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -879,7 +879,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" + Environment.NewLine + ex.Message, true);
}
}
@@ -894,7 +894,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.Tree)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.Tree)" + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -961,7 +961,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "txtSearch_KeyDown (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "txtSearch_KeyDown (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -984,7 +984,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyPress (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyPress (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
@@ -1019,7 +1019,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyDown (UI.Window.Tree) failed" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyDown (UI.Window.Tree) failed" + Environment.NewLine + ex.Message, true);
}
}
#endregion

4
mRemoteV1/UI/Windows/UI.Window.UltraVNCSC.cs
View File

@@ -120,7 +120,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" + Constants.vbNewLine + ex.Message, false);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" + Environment.NewLine + ex.Message, false);
Close();
}
}
@@ -135,7 +135,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed (UI.Window.UltraVNCSC)" + Constants.vbNewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed (UI.Window.UltraVNCSC)" + Environment.NewLine + ex.Message, true);
}
}