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

fixed merge errors

Browse Source
This commit is contained in:
Faryan Rezagholi
2020-05-30 19:52:09 +02:00
parent b03b5830b1
commit 87f842203c
3 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mRemoteV1/Connection/AbstractConnectionRecord.cs
View File

@@ -531,7 +531,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableFullWindowDrag)),
LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableFullWindowDrag)),
TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
UsedInProtocol(ProtocolType.RDP)]
AttributeUsedInProtocol(ProtocolType.RDP)]
public bool DisableFullWindowDrag
{
get => GetPropertyValue("DisableFullWindowDrag", _disableFullWindowDrag);
@@ -542,7 +542,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableMenuAnimations)),
LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableMenuAnimations)),
TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
UsedInProtocol(ProtocolType.RDP)]
AttributeUsedInProtocol(ProtocolType.RDP)]
public bool DisableMenuAnimations
{
get => GetPropertyValue("DisableMenuAnimations", _disableMenuAnimations);
@@ -553,7 +553,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableCursorShadow)),
LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
UsedInProtocol(ProtocolType.RDP)]
AttributeUsedInProtocol(ProtocolType.RDP)]
public bool DisableCursorShadow
{
get => GetPropertyValue("DisableCursorShadow", _disableCursorShadow);
@@ -564,7 +564,7 @@ namespace mRemoteNG.Connection
LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableCursorShadow)),
LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
UsedInProtocol(ProtocolType.RDP)]
AttributeUsedInProtocol(ProtocolType.RDP)]
public bool DisableCursorBlinking
{
get => GetPropertyValue("DisableCursorBlinking", _disableCursorBlinking);

32
mRemoteV1/UI/Forms/OptionsPages/ComponentsPage.cs
View File

@@ -4,7 +4,6 @@ using System.Drawing;
using System.IO;
using System.Linq;
using System.Threading;
using AxWFICALib;
using Gecko;
using mRemoteNG.App;
using mRemoteNG.App.Info;
@@ -55,7 +54,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages
CheckRdp();
CheckVnc();
CheckPutty();
CheckIca();
CheckGeckoBrowser();
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Finished component check", true);
}
@@ -159,36 +157,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages
}
}
private void CheckIca()
{
pnlCheck4.Visible = true;
try
{
using (var ica = new AxICAClient())
{
ica.Parent = this;
pbCheck4.Image = Resources.Good_Symbol;
lblCheck4.ForeColor = Color.DarkOliveGreen;
lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckSucceeded;
txtCheck4.Text = string.Format(Language.strCcICAOK, ica.Version);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "ICA installed", true);
}
}
catch (Exception ex)
{
pbCheck4.Image = Resources.Bad_Symbol;
lblCheck4.ForeColor = Color.Firebrick;
lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckFailed;
txtCheck4.Text = string.Format(Language.strCcICAFailed, GeneralAppInfo.UrlForum);
Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
"ICA " + Language.strCcNotInstalledProperly, true);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, ex.Message, true);
}
}
private void CheckGeckoBrowser()
{
pnlCheck5.Visible = true;

2
mRemoteV1/mRemoteV1.csproj
View File

@@ -347,7 +347,7 @@
<Compile Include="Themes\MremoteNGThemeBase.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Tools\Attributes\UsedInAllProtocolsExceptAttribute.cs" />
<Compile Include="Tools\Attributes\AttributeUsedInAllProtocolsExcept.cs" />
<Compile Include="Tools\Clipboard\WindowsClipboard.cs" />
<Compile Include="Tools\CustomCollections\IFullyNotifiableList.cs" />
<Compile Include="Tools\CustomCollections\FullyObservableCollection.cs" />