diff --git a/mRemoteV1/UI/Window/AboutWindow.cs b/mRemoteV1/UI/Window/AboutWindow.cs index 23158977d..832a549b6 100644 --- a/mRemoteV1/UI/Window/AboutWindow.cs +++ b/mRemoteV1/UI/Window/AboutWindow.cs @@ -13,19 +13,19 @@ namespace mRemoteNG.UI.Window public class AboutWindow : BaseWindow { #region Form Init - private Label lblCopyright; - private Label lblTitle; - private Label lblVersion; - private Label lblLicense; - private TextBox txtChangeLog; - private Label lblChangeLog; - private Panel pnlBottom; - private PictureBox pbLogo; - private Label lblEdition; - private Label lblCredits; - private TextBox txtCredits; + internal Label lblCopyright; + internal Label lblTitle; + internal Label lblVersion; + internal Label lblLicense; + internal TextBox txtChangeLog; + internal Label lblChangeLog; + internal Panel pnlBottom; + internal PictureBox pbLogo; + internal Label lblEdition; + internal Label lblCredits; + internal TextBox txtCredits; private TextBox verText; - private Panel pnlTop; + internal Panel pnlTop; private void InitializeComponent() { diff --git a/mRemoteV1/UI/Window/BaseWindow.cs b/mRemoteV1/UI/Window/BaseWindow.cs index 02e6ddee3..970c19f18 100644 --- a/mRemoteV1/UI/Window/BaseWindow.cs +++ b/mRemoteV1/UI/Window/BaseWindow.cs @@ -1,5 +1,5 @@ +using mRemoteNG.UI.Forms; using WeifenLuo.WinFormsUI.Docking; -// ReSharper disable UnusedAutoPropertyAccessor.Global namespace mRemoteNG.UI.Window @@ -7,40 +7,49 @@ namespace mRemoteNG.UI.Window public class BaseWindow : DockContent { #region Private Variables - + private WindowType _WindowType; + private DockContent _DockPnl; #endregion #region Constructors + public BaseWindow() + { + //InitializeComponent(); + } #endregion #region Public Properties - - protected WindowType WindowType { get; set; } - - protected DockContent DockPnl { get; set; } - + public WindowType WindowType + { + get { return this._WindowType; } + set { this._WindowType = value; } + } + + public DockContent DockPnl + { + get { return this._DockPnl; } + set { this._DockPnl = value; } + } #endregion #region Public Methods - public void SetFormText(string t) + public void SetFormText(string Text) { - this.Text = t; - this.TabText = t; + this.Text = Text; + this.TabText = Text; } #endregion - + #region Private Methods - /* - private void Base_Load(object sender, EventArgs e) + private void Base_Load(System.Object sender, System.EventArgs e) { FrmMain.Default.ShowHidePanelTabs(); } - - private void Base_FormClosed(object sender, System.Windows.Forms.FormClosedEventArgs e) + + private void Base_FormClosed(System.Object sender, System.Windows.Forms.FormClosedEventArgs e) { FrmMain.Default.ShowHidePanelTabs(this); } - */ #endregion - } + } } \ No newline at end of file diff --git a/mRemoteV1/UI/Window/ConfigWindow.cs b/mRemoteV1/UI/Window/ConfigWindow.cs index 376e9c4d5..4e27138b7 100644 --- a/mRemoteV1/UI/Window/ConfigWindow.cs +++ b/mRemoteV1/UI/Window/ConfigWindow.cs @@ -45,7 +45,7 @@ namespace mRemoteNG.UI.Window private AbstractConnectionRecord _selectedTreeNode; public AbstractConnectionRecord SelectedTreeNode { - get => _selectedTreeNode; + get { return _selectedTreeNode; } set { _selectedTreeNode = value; @@ -87,8 +87,8 @@ namespace mRemoteNG.UI.Window // //pGrid // - _pGrid.Anchor = AnchorStyles.Top | AnchorStyles.Bottom - | AnchorStyles.Left + _pGrid.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom) + | AnchorStyles.Left) | AnchorStyles.Right; _pGrid.BrowsableProperties = null; _pGrid.ContextMenuStrip = PropertyGridContextMenu; @@ -206,8 +206,11 @@ namespace mRemoteNG.UI.Window #region Public Properties public bool PropertiesVisible { - get => _btnShowProperties.Checked; - set + get + { + return _btnShowProperties.Checked; + } + set { _btnShowProperties.Checked = value; if (!value) return; @@ -219,8 +222,11 @@ namespace mRemoteNG.UI.Window public bool InheritanceVisible { - get => _btnShowInheritance.Checked; - set + get + { + return _btnShowInheritance.Checked; + } + set { _btnShowInheritance.Checked = value; if (!value) return; @@ -232,8 +238,11 @@ namespace mRemoteNG.UI.Window public bool DefaultPropertiesVisible { - get => _btnShowDefaultProperties.Checked; - set + get + { + return _btnShowDefaultProperties.Checked; + } + set { _btnShowDefaultProperties.Checked = value; if (!value) return; @@ -245,8 +254,8 @@ namespace mRemoteNG.UI.Window public bool DefaultInheritanceVisible { - get => _btnShowDefaultInheritance.Checked; - set + get { return _btnShowDefaultInheritance.Checked; } + set { _btnShowDefaultInheritance.Checked = value; if (!value) return; @@ -277,36 +286,40 @@ namespace mRemoteNG.UI.Window { // Main form handle command key events // Adapted from http://kiwigis.blogspot.com/2009/05/adding-tab-key-support-to-propertygrid.html - if ((keyData & Keys.KeyCode) != Keys.Tab) return base.ProcessCmdKey(ref msg, keyData); - var selectedItem = _pGrid.SelectedGridItem; - var gridRoot = selectedItem; - while (gridRoot.GridItemType != GridItemType.Root) - { - gridRoot = gridRoot.Parent; - } + if ((keyData & Keys.KeyCode) == Keys.Tab) + { + var selectedItem = _pGrid.SelectedGridItem; + var gridRoot = selectedItem; + while (gridRoot.GridItemType != GridItemType.Root) + { + gridRoot = gridRoot.Parent; + } - var gridItems = new List(); - FindChildGridItems(gridRoot, ref gridItems); + var gridItems = new List(); + FindChildGridItems(gridRoot, ref gridItems); - if (!ContainsGridItemProperty(gridItems)) - return true; + if (!ContainsGridItemProperty(gridItems)) + return true; - var newItem = selectedItem; + var newItem = selectedItem; - // ReSharper disable once SwitchStatementMissingSomeCases - switch (keyData) - { - case Keys.Tab | Keys.Shift: - newItem = FindPreviousGridItemProperty(gridItems, selectedItem); - break; - case Keys.Tab: - newItem = FindNextGridItemProperty(gridItems, selectedItem); - break; - } + // ReSharper disable once SwitchStatementMissingSomeCases + switch (keyData) + { + case (Keys.Tab | Keys.Shift): + newItem = FindPreviousGridItemProperty(gridItems, selectedItem); + break; + case Keys.Tab: + newItem = FindNextGridItemProperty(gridItems, selectedItem); + break; + } - _pGrid.SelectedGridItem = newItem; + _pGrid.SelectedGridItem = newItem; - return true; // Handled + return true; // Handled + } + + return base.ProcessCmdKey(ref msg, keyData); } private void FindChildGridItems(GridItem item, ref List gridItems) @@ -402,8 +415,8 @@ namespace mRemoteNG.UI.Window return !nextIndexValid ? null : gridItems[nextIndex]; } - - private void SetPropertyGridObject(object propertyGridObject) + + public void SetPropertyGridObject(object propertyGridObject) { try { @@ -416,55 +429,58 @@ namespace mRemoteNG.UI.Window _btnIcon.Image = null; - if (propertyGridObject is ConnectionInfo gridObjectAsConnectionInfo) //CONNECTION INFO - { - if (propertyGridObject is ContainerInfo gridObjectAsContainerInfo) //CONTAINER + var gridObjectAsConnectionInfo = propertyGridObject as ConnectionInfo; + if (gridObjectAsConnectionInfo != null) //CONNECTION INFO + { + var gridObjectAsContainerInfo = propertyGridObject as ContainerInfo; + if (gridObjectAsContainerInfo != null) //CONTAINER { - if (propertyGridObject is RootNodeInfo gridObjectAsRootNodeInfo) // ROOT - { - // ReSharper disable once SwitchStatementMissingSomeCases + var gridObjectAsRootNodeInfo = propertyGridObject as RootNodeInfo; + if (gridObjectAsRootNodeInfo != null) // ROOT + { + // ReSharper disable once SwitchStatementMissingSomeCases switch (gridObjectAsRootNodeInfo.Type) - { - case RootNodeType.Connection: - PropertiesVisible = true; - DefaultPropertiesVisible = false; - _btnShowProperties.Enabled = true; - _btnShowInheritance.Enabled = false; - _btnShowDefaultProperties.Enabled = true; - _btnShowDefaultInheritance.Enabled = true; - _btnIcon.Enabled = false; - _btnHostStatus.Enabled = false; - break; - case RootNodeType.PuttySessions: - PropertiesVisible = true; - DefaultPropertiesVisible = false; - _btnShowProperties.Enabled = true; - _btnShowInheritance.Enabled = false; - _btnShowDefaultProperties.Enabled = false; - _btnShowDefaultInheritance.Enabled = false; - _btnIcon.Enabled = false; - _btnHostStatus.Enabled = false; - break; - } - - _pGrid.SelectedObject = propertyGridObject; - } - else + { + case RootNodeType.Connection: + PropertiesVisible = true; + DefaultPropertiesVisible = false; + _btnShowProperties.Enabled = true; + _btnShowInheritance.Enabled = false; + _btnShowDefaultProperties.Enabled = true; + _btnShowDefaultInheritance.Enabled = true; + _btnIcon.Enabled = false; + _btnHostStatus.Enabled = false; + break; + case RootNodeType.PuttySessions: + PropertiesVisible = true; + DefaultPropertiesVisible = false; + _btnShowProperties.Enabled = true; + _btnShowInheritance.Enabled = false; + _btnShowDefaultProperties.Enabled = false; + _btnShowDefaultInheritance.Enabled = false; + _btnIcon.Enabled = false; + _btnHostStatus.Enabled = false; + break; + } + + _pGrid.SelectedObject = propertyGridObject; + } + else { - _pGrid.SelectedObject = propertyGridObject; + _pGrid.SelectedObject = propertyGridObject; - _btnShowProperties.Enabled = true; - _btnShowInheritance.Enabled = gridObjectAsContainerInfo.Parent != null; - _btnShowDefaultProperties.Enabled = false; - _btnShowDefaultInheritance.Enabled = false; - _btnIcon.Enabled = true; - _btnHostStatus.Enabled = false; + _btnShowProperties.Enabled = true; + _btnShowInheritance.Enabled = gridObjectAsContainerInfo.Parent != null; + _btnShowDefaultProperties.Enabled = false; + _btnShowDefaultInheritance.Enabled = false; + _btnIcon.Enabled = true; + _btnHostStatus.Enabled = false; - PropertiesVisible = true; - } + PropertiesVisible = true; + } } else //NO CONTAINER - { + { if (PropertiesVisible) //Properties selected { _pGrid.SelectedObject = propertyGridObject; @@ -528,17 +544,17 @@ namespace mRemoteNG.UI.Window } var conIcon = ConnectionIcon.FromString(Convert.ToString(gridObjectAsConnectionInfo.Icon)); - if (conIcon != null) - { + if (conIcon != null) + { _btnIcon.Image = conIcon.ToBitmap(); - } - } - else if (propertyGridObject is ConnectionInfoInheritance) //INHERITANCE - { + } + } + else if (propertyGridObject is ConnectionInfoInheritance) //INHERITANCE + { _pGrid.SelectedObject = propertyGridObject; - - if (InheritanceVisible) - { + + if (InheritanceVisible) + { InheritanceVisible = true; _btnShowProperties.Enabled = true; _btnShowInheritance.Enabled = true; @@ -548,13 +564,13 @@ namespace mRemoteNG.UI.Window _btnHostStatus.Enabled = !((ConnectionInfo)((ConnectionInfoInheritance)propertyGridObject).Parent).IsContainer; InheritanceVisible = true; var conIcon = ConnectionIcon.FromString(Convert.ToString(((ConnectionInfo)((ConnectionInfoInheritance)propertyGridObject).Parent).Icon)); - if (conIcon != null) - { + if (conIcon != null) + { _btnIcon.Image = conIcon.ToBitmap(); - } - } - else if (DefaultInheritanceVisible) - { + } + } + else if (DefaultInheritanceVisible) + { _btnShowProperties.Enabled = true; _btnShowInheritance.Enabled = false; _btnShowDefaultProperties.Enabled = true; @@ -563,9 +579,9 @@ namespace mRemoteNG.UI.Window _btnHostStatus.Enabled = false; DefaultInheritanceVisible = true; - } - - } + } + + } ShowHideGridItems(); SetHostStatus(propertyGridObject); @@ -827,528 +843,529 @@ namespace mRemoteNG.UI.Window strHide.Add("SoundQuality"); strHide.Add("CredentialRecord"); } - else if (_pGrid.SelectedObject is ConnectionInfo conI) - { - // ReSharper disable once SwitchStatementMissingSomeCases - switch (conI.Protocol) - { - case ProtocolType.RDP: - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("PuttySession"); - strHide.Add("RenderingEngine"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + else if (_pGrid.SelectedObject is ConnectionInfo) + { + var conI = (ConnectionInfo)_pGrid.SelectedObject; + // ReSharper disable once SwitchStatementMissingSomeCases + switch (conI.Protocol) + { + case ProtocolType.RDP: + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("PuttySession"); + strHide.Add("RenderingEngine"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); if (conI.RDPMinutesToIdleTimeout <= 0) { strHide.Add("RDPAlertIdleTimeout"); } - if (conI.RDGatewayUsageMethod == RdpProtocol.RDGatewayUsageMethod.Never) - { - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - } + if (conI.RDGatewayUsageMethod == RdpProtocol.RDGatewayUsageMethod.Never) + { + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + } else if (conI.RDGatewayUseConnectionCredentials == RdpProtocol.RDGatewayUseConnectionCredentials.Yes) - { - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsername"); - } - if (!(conI.Resolution == RdpProtocol.RDPResolutions.FitToWindow || conI.Resolution == RdpProtocol.RDPResolutions.Fullscreen)) - { - strHide.Add("AutomaticResize"); - } - if (conI.RedirectSound != RdpProtocol.RDPSounds.BringToThisComputer) - { + { + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsername"); + } + if (!(conI.Resolution == RdpProtocol.RDPResolutions.FitToWindow || conI.Resolution == RdpProtocol.RDPResolutions.Fullscreen)) + { + strHide.Add("AutomaticResize"); + } + if (conI.RedirectSound != RdpProtocol.RDPSounds.BringToThisComputer) + { strHide.Add("SoundQuality"); } - break; - case ProtocolType.VNC: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("PuttySession"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + break; + case ProtocolType.VNC: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("PuttySession"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - if (conI.VNCAuthMode == ProtocolVNC.AuthMode.AuthVNC) - { - strHide.Add("Username"); - strHide.Add("Domain"); - } - if (conI.VNCProxyType == ProtocolVNC.ProxyType.ProxyNone) - { - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyUsername"); - } + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + if (conI.VNCAuthMode == ProtocolVNC.AuthMode.AuthVNC) + { + strHide.Add("Username"); + strHide.Add("Domain"); + } + if (conI.VNCProxyType == ProtocolVNC.ProxyType.ProxyNone) + { + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyUsername"); + } strHide.Add("SoundQuality"); break; - case ProtocolType.SSH1: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.SSH1: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.SSH2: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.SSH2: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.Telnet: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("Password"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.Telnet: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("Password"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("Username"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("Username"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.Rlogin: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("Password"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.Rlogin: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("Password"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("Username"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("Username"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.RAW: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("Password"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.RAW: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("Password"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("Username"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("Username"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.HTTP: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("PuttySession"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.HTTP: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("PuttySession"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.HTTPS: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ExtApp"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("PuttySession"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.HTTPS: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ExtApp"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("PuttySession"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound;Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound;Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.ICA: - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("ExtApp"); - strHide.Add("Port"); - strHide.Add("PuttySession"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.ICA: + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("ExtApp"); + strHide.Add("Port"); + strHide.Add("PuttySession"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.IntApp: - strHide.Add("CacheBitmaps"); - strHide.Add("Colors"); - strHide.Add("DisplayThemes"); - strHide.Add("DisplayWallpaper"); - strHide.Add("EnableFontSmoothing"); - strHide.Add("EnableDesktopComposition"); - strHide.Add("Domain"); - strHide.Add("ICAEncryptionStrength"); - strHide.Add("PuttySession"); - strHide.Add("RDGatewayDomain"); - strHide.Add("RDGatewayHostname"); - strHide.Add("RDGatewayPassword"); - strHide.Add("RDGatewayUsageMethod"); - strHide.Add("RDGatewayUseConnectionCredentials"); - strHide.Add("RDGatewayUsername"); - strHide.Add("RDPAuthenticationLevel"); + case ProtocolType.IntApp: + strHide.Add("CacheBitmaps"); + strHide.Add("Colors"); + strHide.Add("DisplayThemes"); + strHide.Add("DisplayWallpaper"); + strHide.Add("EnableFontSmoothing"); + strHide.Add("EnableDesktopComposition"); + strHide.Add("Domain"); + strHide.Add("ICAEncryptionStrength"); + strHide.Add("PuttySession"); + strHide.Add("RDGatewayDomain"); + strHide.Add("RDGatewayHostname"); + strHide.Add("RDGatewayPassword"); + strHide.Add("RDGatewayUsageMethod"); + strHide.Add("RDGatewayUseConnectionCredentials"); + strHide.Add("RDGatewayUsername"); + strHide.Add("RDPAuthenticationLevel"); strHide.Add("RDPMinutesToIdleTimeout"); strHide.Add("RDPAlertIdleTimeout"); strHide.Add("LoadBalanceInfo"); - strHide.Add("RedirectDiskDrives"); - strHide.Add("RedirectKeys"); - strHide.Add("RedirectPorts"); - strHide.Add("RedirectPrinters"); - strHide.Add("RedirectSmartCards"); - strHide.Add("RedirectSound"); - strHide.Add("RenderingEngine"); - strHide.Add("Resolution"); - strHide.Add("AutomaticResize"); - strHide.Add("UseConsoleSession"); - strHide.Add("UseCredSsp"); - strHide.Add("VNCAuthMode"); - strHide.Add("VNCColors"); - strHide.Add("VNCCompression"); - strHide.Add("VNCEncoding"); - strHide.Add("VNCProxyIP"); - strHide.Add("VNCProxyPassword"); - strHide.Add("VNCProxyPort"); - strHide.Add("VNCProxyType"); - strHide.Add("VNCProxyUsername"); - strHide.Add("VNCSmartSizeMode"); - strHide.Add("VNCViewOnly"); + strHide.Add("RedirectDiskDrives"); + strHide.Add("RedirectKeys"); + strHide.Add("RedirectPorts"); + strHide.Add("RedirectPrinters"); + strHide.Add("RedirectSmartCards"); + strHide.Add("RedirectSound"); + strHide.Add("RenderingEngine"); + strHide.Add("Resolution"); + strHide.Add("AutomaticResize"); + strHide.Add("UseConsoleSession"); + strHide.Add("UseCredSsp"); + strHide.Add("VNCAuthMode"); + strHide.Add("VNCColors"); + strHide.Add("VNCCompression"); + strHide.Add("VNCEncoding"); + strHide.Add("VNCProxyIP"); + strHide.Add("VNCProxyPassword"); + strHide.Add("VNCProxyPort"); + strHide.Add("VNCProxyType"); + strHide.Add("VNCProxyUsername"); + strHide.Add("VNCSmartSizeMode"); + strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - } - - if (!(conI is DefaultConnectionInfo)) - { - if (conI.Inheritance.CacheBitmaps) - strHide.Add("CacheBitmaps"); - if (conI.Inheritance.Colors) - strHide.Add("Colors"); - if (conI.Inheritance.Description) - strHide.Add("Description"); - if (conI.Inheritance.DisplayThemes) - strHide.Add("DisplayThemes"); - if (conI.Inheritance.DisplayWallpaper) - strHide.Add("DisplayWallpaper"); - if (conI.Inheritance.EnableFontSmoothing) - strHide.Add("EnableFontSmoothing"); - if (conI.Inheritance.EnableDesktopComposition) - strHide.Add("EnableDesktopComposition"); - if (conI.Inheritance.Domain) - strHide.Add("Domain"); - if (conI.Inheritance.Icon) - strHide.Add("Icon"); - if (conI.Inheritance.Password) - strHide.Add("Password"); - if (conI.Inheritance.Port) - strHide.Add("Port"); - if (conI.Inheritance.Protocol) - strHide.Add("Protocol"); - if (conI.Inheritance.PuttySession) - strHide.Add("PuttySession"); - if (conI.Inheritance.RedirectDiskDrives) + } + + if (!(conI is DefaultConnectionInfo)) + { + if (conI.Inheritance.CacheBitmaps) + strHide.Add("CacheBitmaps"); + if (conI.Inheritance.Colors) + strHide.Add("Colors"); + if (conI.Inheritance.Description) + strHide.Add("Description"); + if (conI.Inheritance.DisplayThemes) + strHide.Add("DisplayThemes"); + if (conI.Inheritance.DisplayWallpaper) + strHide.Add("DisplayWallpaper"); + if (conI.Inheritance.EnableFontSmoothing) + strHide.Add("EnableFontSmoothing"); + if (conI.Inheritance.EnableDesktopComposition) + strHide.Add("EnableDesktopComposition"); + if (conI.Inheritance.Domain) + strHide.Add("Domain"); + if (conI.Inheritance.Icon) + strHide.Add("Icon"); + if (conI.Inheritance.Password) + strHide.Add("Password"); + if (conI.Inheritance.Port) + strHide.Add("Port"); + if (conI.Inheritance.Protocol) + strHide.Add("Protocol"); + if (conI.Inheritance.PuttySession) + strHide.Add("PuttySession"); + if (conI.Inheritance.RedirectDiskDrives) strHide.Add("RedirectDiskDrives"); if (conI.Inheritance.RedirectKeys) strHide.Add("RedirectKeys"); @@ -1432,17 +1449,17 @@ namespace mRemoteNG.UI.Window strHide.Add("RDGatewayUseConnectionCredentials"); if (conI.Inheritance.RDGatewayHostname) strHide.Add("RDGatewayHostname"); - if (conI.Inheritance.SoundQuality) + if(conI.Inheritance.SoundQuality) strHide.Add("SoundQuality"); - if (conI.Inheritance.CredentialRecord) + if(conI.Inheritance.CredentialRecord) strHide.Add("CredentialRecord"); } - else - { - strHide.Add("Hostname"); - strHide.Add("Name"); - } - } + else + { + strHide.Add("Hostname"); + strHide.Add("Name"); + } + } _pGrid.HiddenProperties = strHide.ToArray(); _pGrid.Refresh(); @@ -1455,35 +1472,36 @@ namespace mRemoteNG.UI.Window private void btnShowProperties_Click(object sender, EventArgs e) { - if (_pGrid.SelectedObject is ConnectionInfoInheritance o) - { - if (_pGrid.SelectedObject is DefaultConnectionInheritance) - { + var o = _pGrid.SelectedObject as ConnectionInfoInheritance; + if (o != null) + { + if (_pGrid.SelectedObject is DefaultConnectionInheritance) + { PropertiesVisible = true; InheritanceVisible = false; DefaultPropertiesVisible = false; DefaultInheritanceVisible = false; SetPropertyGridObject((RootNodeInfo)_selectedTreeNode); - } - else - { + } + else + { PropertiesVisible = true; InheritanceVisible = false; DefaultPropertiesVisible = false; DefaultInheritanceVisible = false; SetPropertyGridObject(o.Parent); - } - } - else if (_pGrid.SelectedObject is ConnectionInfo) - { - if (!((ConnectionInfo)_pGrid.SelectedObject).IsDefault) return; - PropertiesVisible = true; - InheritanceVisible = false; - DefaultPropertiesVisible = false; - DefaultInheritanceVisible = false; - SetPropertyGridObject((RootNodeInfo)_selectedTreeNode); - } - } + } + } + else if (_pGrid.SelectedObject is ConnectionInfo) + { + if (!((ConnectionInfo) _pGrid.SelectedObject).IsDefault) return; + PropertiesVisible = true; + InheritanceVisible = false; + DefaultPropertiesVisible = false; + DefaultInheritanceVisible = false; + SetPropertyGridObject((RootNodeInfo)_selectedTreeNode); + } + } private void btnShowDefaultProperties_Click(object sender, EventArgs e) { @@ -1524,22 +1542,24 @@ namespace mRemoteNG.UI.Window { try { - if (!(_pGrid.SelectedObject is ConnectionInfo) || _pGrid.SelectedObject is PuttySessionInfo) return; - CMenIcons.Items.Clear(); + if (_pGrid.SelectedObject is ConnectionInfo && !(_pGrid.SelectedObject is PuttySessionInfo)) + { + CMenIcons.Items.Clear(); - foreach (var iStr in ConnectionIcon.Icons) - { - var tI = new ToolStripMenuItem - { - Text = iStr, - Image = ConnectionIcon.FromString(iStr).ToBitmap() - }; - tI.Click += IconMenu_Click; + foreach (var iStr in ConnectionIcon.Icons) + { + var tI = new ToolStripMenuItem + { + Text = iStr, + Image = ConnectionIcon.FromString(iStr).ToBitmap() + }; + tI.Click += IconMenu_Click; - CMenIcons.Items.Add(tI); - } - var mPos = new Point(new Size(PointToScreen(new Point(e.Location.X + _pGrid.Width - 100, e.Location.Y)))); - CMenIcons.Show(mPos); + CMenIcons.Items.Add(tI); + } + var mPos = new Point(new Size(PointToScreen(new Point(e.Location.X + _pGrid.Width - 100, e.Location.Y)))); + CMenIcons.Show(mPos); + } } catch (Exception ex) { diff --git a/mRemoteV1/UI/Window/SSHTransferWindow.cs b/mRemoteV1/UI/Window/SSHTransferWindow.cs index a574a1353..ebd55ff29 100644 --- a/mRemoteV1/UI/Window/SSHTransferWindow.cs +++ b/mRemoteV1/UI/Window/SSHTransferWindow.cs @@ -7,7 +7,6 @@ using mRemoteNG.Tools; using mRemoteNG.UI.Forms; using WeifenLuo.WinFormsUI.Docking; using TextBox = System.Windows.Forms.TextBox; -// ReSharper disable RedundantCast namespace mRemoteNG.UI.Window { @@ -276,8 +275,8 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.grpFiles); this.Controls.Add(this.grpConnection); this.Controls.Add(this.pbStatus); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)0); - this.Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); + this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "SSHTransferWindow"; this.TabText = "SSH File Transfer"; this.Text = "SSH File Transfer"; @@ -298,26 +297,50 @@ namespace mRemoteNG.UI.Window #region Public Properties public string Hostname { - get => txtHost.Text; - set => txtHost.Text = value; + get + { + return txtHost.Text; + } + set + { + txtHost.Text = value; + } } public string Port { - get => txtPort.Text; - set => txtPort.Text = value; + get + { + return txtPort.Text; + } + set + { + txtPort.Text = value; + } } public string Username { - get => txtUser.Text; - set => txtUser.Text = value; + get + { + return txtUser.Text; + } + set + { + txtUser.Text = value; + } } public string Password { - get => txtPassword.Text; - set => txtPassword.Text = value; + get + { + return txtPassword.Text; + } + set + { + txtPassword.Text = value; + } } #endregion @@ -471,7 +494,7 @@ namespace mRemoteNG.UI.Window private int maxVal; private int curVal; - private delegate void SetStatusCB(); + delegate void SetStatusCB(); private void SetStatus() { if (pbStatus.InvokeRequired) @@ -486,7 +509,7 @@ namespace mRemoteNG.UI.Window } } - private delegate void EnableButtonsCB(); + delegate void EnableButtonsCB(); private void EnableButtons() { if (btnTransfer.InvokeRequired) @@ -500,7 +523,7 @@ namespace mRemoteNG.UI.Window } } - private delegate void DisableButtonsCB(); + delegate void DisableButtonsCB(); private void DisableButtons() { if (btnTransfer.InvokeRequired) @@ -542,10 +565,12 @@ namespace mRemoteNG.UI.Window #region Form Stuff private void btnBrowse_Click(object sender, EventArgs e) { - if (oDlg.ShowDialog() != DialogResult.OK) return; - if (oDlg.FileName != "") + if (oDlg.ShowDialog() == DialogResult.OK) { - txtLocalFile.Text = oDlg.FileName; + if (oDlg.FileName != "") + { + txtLocalFile.Text = oDlg.FileName; + } } } diff --git a/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs b/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs index 9f511fe76..df89e6195 100644 --- a/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs +++ b/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs @@ -13,16 +13,16 @@ namespace mRemoteNG.UI.Window { #region Form Init internal MenuStrip msMain; - private ToolStripMenuItem mMenFile; - private ToolStripMenuItem mMenFileSaveAll; - private ToolStripMenuItem mMenFileRemoveAll; + internal ToolStripMenuItem mMenFile; + internal ToolStripMenuItem mMenFileSaveAll; + internal ToolStripMenuItem mMenFileRemoveAll; internal ContextMenuStrip cMenScreenshot; - private System.ComponentModel.Container components; - private ToolStripMenuItem cMenScreenshotCopy; - private ToolStripMenuItem cMenScreenshotSave; + private System.ComponentModel.Container components = null; + internal ToolStripMenuItem cMenScreenshotCopy; + internal ToolStripMenuItem cMenScreenshotSave; internal SaveFileDialog dlgSaveSingleImage; internal FolderBrowserDialog dlgSaveAllImages; - private FlowLayoutPanel flpScreenshots; + internal FlowLayoutPanel flpScreenshots; private void InitializeComponent() { @@ -163,7 +163,7 @@ namespace mRemoteNG.UI.Window { } - private ScreenshotManagerWindow(DockContent panel) + public ScreenshotManagerWindow(DockContent panel) { WindowType = WindowType.ScreenshotManager; DockPnl = panel; @@ -174,7 +174,7 @@ namespace mRemoteNG.UI.Window { try { - var nPB = new PictureBox(); + PictureBox nPB = new PictureBox(); nPB.MouseDown += pbScreenshot_MouseDown; nPB.Parent = flpScreenshots; @@ -185,7 +185,7 @@ namespace mRemoteNG.UI.Window nPB.Size = new Size(100, 100); //New Size((Screenshot.Width / 100) * 20, (Screenshot.Height / 100) * 20) nPB.Show(); - var nBtn = new Button(); + Button nBtn = new Button(); nBtn.Click += btnCloseScreenshot_Click; nBtn.Parent = nPB; @@ -232,31 +232,27 @@ namespace mRemoteNG.UI.Window { try { - var mImage = sender.Image; - - var nForm = new Form - { - StartPosition = FormStartPosition.CenterParent, - ShowInTaskbar = false, - ShowIcon = false, - MaximizeBox = false, - MinimizeBox = false, - Width = mImage.Width + 2, - Height = mImage.Height + 2, - FormBorderStyle = FormBorderStyle.None - }; - - var nPB = new PictureBox - { - Parent = nForm, - BorderStyle = BorderStyle.FixedSingle, - Location = new Point(0, 0), - SizeMode = PictureBoxSizeMode.AutoSize, - Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Top, - Image = mImage, - ContextMenuStrip = cMenScreenshot - }; - nPB.Show(); + Image mImage = sender.Image; + + Form nForm = new Form(); + nForm.StartPosition = FormStartPosition.CenterParent; + nForm.ShowInTaskbar = false; + nForm.ShowIcon = false; + nForm.MaximizeBox = false; + nForm.MinimizeBox = false; + nForm.Width = mImage.Width + 2; + nForm.Height = mImage.Height + 2; + nForm.FormBorderStyle = FormBorderStyle.None; + + PictureBox nPB = new PictureBox(); + nPB.Parent = nForm; + nPB.BorderStyle = BorderStyle.FixedSingle; + nPB.Location = new Point(0, 0); + nPB.SizeMode = PictureBoxSizeMode.AutoSize; + nPB.Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Top; + nPB.Image = mImage; + nPB.ContextMenuStrip = cMenScreenshot; + nPB.Show(); nPB.MouseDown += pbScreenshotOpen_MouseDown; @@ -299,26 +295,30 @@ namespace mRemoteNG.UI.Window { try { - var pCount = 1; - - if (dlgSaveAllImages.ShowDialog() != DialogResult.OK) return; - foreach (var fPath in Directory.GetFiles(dlgSaveAllImages.SelectedPath, "Screenshot_*", SearchOption.TopDirectoryOnly)) - { - var f = new FileInfo(fPath); + int pCount = 1; + + if (dlgSaveAllImages.ShowDialog() == DialogResult.OK) + { + foreach (string fPath in Directory.GetFiles(dlgSaveAllImages.SelectedPath, "Screenshot_*", SearchOption.TopDirectoryOnly)) + { + FileInfo f = new FileInfo(fPath); - var fCount = f.Name; - fCount = fCount.Replace(f.Extension, ""); - fCount = fCount.Replace("Screenshot_", ""); + string fCount = f.Name; + fCount = fCount.Replace(f.Extension, ""); + fCount = fCount.Replace("Screenshot_", ""); - pCount = (int) (double.Parse(fCount) + 1); - } + pCount = (int) (double.Parse(fCount) + 1); + } - foreach (Control ctrl in flpScreenshots.Controls) - { - if (!(ctrl is PictureBox)) continue; - (ctrl as PictureBox).Image.Save(dlgSaveAllImages.SelectedPath + "\\Screenshot_" + Tools.MiscTools.LeadingZero(Convert.ToString(pCount)) +".png", System.Drawing.Imaging.ImageFormat.Png); - pCount++; - } + foreach (Control ctrl in flpScreenshots.Controls) + { + if (ctrl is PictureBox) + { + (ctrl as PictureBox).Image.Save(dlgSaveAllImages.SelectedPath + "\\Screenshot_" + Tools.MiscTools.LeadingZero(Convert.ToString(pCount)) +".png", System.Drawing.Imaging.ImageFormat.Png); + pCount++; + } + } + } } catch (Exception ex) { @@ -352,23 +352,24 @@ namespace mRemoteNG.UI.Window { try { - if (dlgSaveSingleImage.ShowDialog() != DialogResult.OK) return; - // ReSharper disable once SwitchStatementMissingSomeCases - switch (dlgSaveSingleImage.FileName.Substring(dlgSaveSingleImage.FileName.LastIndexOf(".", StringComparison.Ordinal) + 1).ToLower()) - { - case "gif": - ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Gif); - break; - case "jpeg": - ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Jpeg); - break; - case "jpg": - ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Jpeg); - break; - case "png": - ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Png); - break; - } + if (dlgSaveSingleImage.ShowDialog() == DialogResult.OK) + { + switch (dlgSaveSingleImage.FileName.Substring(dlgSaveSingleImage.FileName.LastIndexOf(".", StringComparison.Ordinal) + 1).ToLower()) + { + case "gif": + ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Gif); + break; + case "jpeg": + ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Jpeg); + break; + case "jpg": + ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Jpeg); + break; + case "png": + ((PictureBox) cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, System.Drawing.Imaging.ImageFormat.Png); + break; + } + } } catch (Exception ex) {