merged develop into powershell_remoting

This commit is contained in:
Faryan Rezagholi
2019-09-09 23:04:48 +02:00
25 changed files with 199 additions and 31 deletions

View File

@@ -15,18 +15,19 @@
## Screenshots (if appropriate):
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Updated translation
<!--- What types of changes does your code introduce? -->
<!--- Uncomment the line(s) that apply(s) to you pull request -->
<!--- - Bug fix (non-breaking change which fixes an issue) -->
<!--- - New feature (non-breaking change which adds functionality) -->
<!--- - Breaking change (fix or feature that would cause existing functionality to change) -->
<!--- - Updated translation -->
## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- Go over all the following points. All of them must apply to your pull request to be merged. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] I have read the **CONTRIBUTING** document.
- [ ] My code follows the code style of this project.
- [ ] All Tests within VisualStudio are passing
- [ ] This pull request does not target the master branch.
- [ ] I have updated the changelog file accordingly.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have updated the changelog file accordingly, if necessary.
- [ ] I have updated the documentation accordingly, if necessary.

View File

@@ -61,6 +61,7 @@ Marco Sousa (github.com/marcomsousa)
github.com/wwj402
github.com/Fyers
github.com/pablomh
Damian Szczepanik (github.com/damianszczepanik)
## Included Source Code
Command Line Arguments Parser

View File

@@ -98,6 +98,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
UseConsoleSession = true,
UseCredSsp = true,
UseVmId = false,
UseEnhancedMode = false,
RenderingEngine = HTTPBase.RenderingEngine.Gecko,
ICAEncryptionStrength = IcaProtocol.EncryptionStrength.Encr40Bit,
RDPAuthenticationLevel = AuthenticationLevel.WarnOnFailedAuth,

View File

@@ -64,6 +64,7 @@
public TType VNCColors { get; set; }
public TType VNCSmartSizeMode { get; set; }
public TType VNCViewOnly { get; set; }
public TType RdpVersion { get; set; }
}
public TType RdpVersion { get; set; }
public TType UseEnhancedMode { get; set; }
}
}

View File

@@ -164,6 +164,13 @@ namespace mRemoteNG.Config.Serializers.Csv
connectionRecord.UseVmId = value;
}
if (headers.Contains("UseEnhancedMode"))
{
bool value;
if (bool.TryParse(connectionCsv[headers.IndexOf("UseEnhancedMode")], out value))
connectionRecord.UseEnhancedMode = value;
}
if (headers.Contains("RenderingEngine"))
{
HTTPBase.RenderingEngine value;
@@ -564,6 +571,13 @@ namespace mRemoteNG.Config.Serializers.Csv
connectionRecord.Inheritance.UseVmId = value;
}
if (headers.Contains("InheritUseEnhancedMode"))
{
bool value;
if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUseEnhancedMode")], out value))
connectionRecord.Inheritance.UseEnhancedMode = value;
}
if (headers.Contains("InheritRenderingEngine"))
{
bool value;

View File

@@ -56,7 +56,7 @@ namespace mRemoteNG.Config.Serializers.Csv
if (_saveFilter.SaveDomain)
sb.Append("Domain;");
sb.Append("Hostname;VmId;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;UseVmId;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;" +
sb.Append("Hostname;Port;VmId;Protocol;PuttySession;ConnectToConsole;UseCredSsp;UseVmId;UseEnhancedMode;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;" +
"LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;" +
"CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;" +
"PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;" +
@@ -68,7 +68,7 @@ namespace mRemoteNG.Config.Serializers.Csv
"InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;" +
"InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;" +
"InheritRedirectClipboard;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;" +
"InheritUseConsoleSession;InheritUseCredSsp;InheritUseVmId;InheritVmId;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;" +
"InheritUseConsoleSession;InheritUseCredSsp;InheritUseVmId;InheritUseEnhancedMode;InheritVmId;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;" +
"InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;" +
"InheritFavorite;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;" +
"InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;" +
@@ -116,13 +116,14 @@ namespace mRemoteNG.Config.Serializers.Csv
sb.Append(FormatForCsv(con.Domain));
sb.Append(FormatForCsv(con.Hostname))
.Append(FormatForCsv(con.Port))
.Append(FormatForCsv(con.VmId))
.Append(FormatForCsv(con.Protocol))
.Append(FormatForCsv(con.PuttySession))
.Append(FormatForCsv(con.Port))
.Append(FormatForCsv(con.UseConsoleSession))
.Append(FormatForCsv(con.UseCredSsp))
.Append(FormatForCsv(con.UseVmId))
.Append(FormatForCsv(con.UseEnhancedMode))
.Append(FormatForCsv(con.RenderingEngine))
.Append(FormatForCsv(con.ICAEncryptionStrength))
.Append(FormatForCsv(con.RDPAuthenticationLevel))
@@ -198,6 +199,7 @@ namespace mRemoteNG.Config.Serializers.Csv
.Append(FormatForCsv(con.Inheritance.UseConsoleSession))
.Append(FormatForCsv(con.Inheritance.UseCredSsp))
.Append(FormatForCsv(con.Inheritance.UseVmId))
.Append(FormatForCsv(con.Inheritance.UseEnhancedMode))
.Append(FormatForCsv(con.Inheritance.VmId))
.Append(FormatForCsv(con.Inheritance.RenderingEngine))
.Append(FormatForCsv(con.Inheritance.Username))

View File

@@ -89,6 +89,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
connectionInfo.Password = DecryptValue((string)dataRow["Password"]);
connectionInfo.Hostname = (string)dataRow["Hostname"];
connectionInfo.VmId = (string)dataRow["VmId"];
connectionInfo.UseEnhancedMode = (bool)dataRow["UseEnhancedMode"];
connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]);
connectionInfo.PuttySession = (string)dataRow["PuttySession"];
connectionInfo.Port = (int)dataRow["Port"];
@@ -195,6 +196,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
connectionInfo.Inheritance.UseConsoleSession = (bool)dataRow["InheritUseConsoleSession"];
connectionInfo.Inheritance.UseCredSsp = (bool)dataRow["InheritUseCredSsp"];
connectionInfo.Inheritance.UseVmId = (bool)dataRow["InheritUseVmId"];
connectionInfo.Inheritance.UseEnhancedMode = (bool)dataRow["InheritUseEnhancedMode"];
connectionInfo.Inheritance.VmId = (bool)dataRow["InheritVmId"];
connectionInfo.Inheritance.RenderingEngine = (bool)dataRow["InheritRenderingEngine"];
connectionInfo.Inheritance.Username = (bool)dataRow["InheritUsername"];

View File

@@ -191,10 +191,14 @@ namespace mRemoteNG.Config.Serializers.MsSql
dataTable.Columns.Add("InheritSoundQuality", typeof(bool));
dataTable.Columns.Add("VmId", typeof(string));
dataTable.Columns.Add("UseVmId", typeof(bool));
dataTable.Columns.Add("UseEnhancedMode", typeof(bool));
dataTable.Columns.Add("InheritVmId", typeof(bool));
dataTable.Columns.Add("InheritUseVmId", typeof(bool));
dataTable.Columns.Add("InheritUseEnhancedMode", typeof(bool));
dataTable.Columns.Add("RdpVersion", typeof(string));
dataTable.Columns.Add("InheritRdpVersion", typeof(bool));
dataTable.Columns.Add("EnhancedMode", typeof(bool));
dataTable.Columns.Add("InheritEnhancedMode", typeof(bool));
}
private void SetPrimaryKey(DataTable dataTable)
@@ -241,6 +245,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
dataRow["ConnectToConsole"] = connectionInfo.UseConsoleSession;
dataRow["UseCredSsp"] = connectionInfo.UseCredSsp;
dataRow["UseVmId"] = connectionInfo.UseVmId;
dataRow["UseEnhancedMode"] = connectionInfo.UseEnhancedMode;
dataRow["RenderingEngine"] = connectionInfo.RenderingEngine;
dataRow["ICAEncryptionStrength"] = connectionInfo.ICAEncryptionStrength;
dataRow["RDPAuthenticationLevel"] = connectionInfo.RDPAuthenticationLevel;
@@ -324,6 +329,7 @@ namespace mRemoteNG.Config.Serializers.MsSql
dataRow["InheritUsername"] = connectionInfo.Inheritance.Username;
dataRow["InheritVmId"] = connectionInfo.Inheritance.VmId;
dataRow["InheritUseVmId"] = connectionInfo.Inheritance.UseVmId;
dataRow["InheritUseEnhancedMode"] = connectionInfo.Inheritance.UseEnhancedMode;
dataRow["InheritICAEncryptionStrength"] = connectionInfo.Inheritance.ICAEncryptionStrength;
dataRow["InheritRDPAuthenticationLevel"] = connectionInfo.Inheritance.RDPAuthenticationLevel;
dataRow["InheritRDPMinutesToIdleTimeout"] = connectionInfo.Inheritance.RDPMinutesToIdleTimeout;

View File

@@ -47,6 +47,7 @@ namespace mRemoteNG.Config.Serializers.Xml
element.Add(new XAttribute("Name", connectionInfo.Name));
element.Add(new XAttribute("VmId", connectionInfo.VmId));
element.Add(new XAttribute("UseVmId", connectionInfo.UseVmId));
element.Add(new XAttribute("UseEnhancedMode", connectionInfo.UseVmId));
element.Add(new XAttribute("Type", connectionInfo.GetTreeNodeType().ToString()));
if (nodeAsContainer != null)
element.Add(new XAttribute("Expanded", nodeAsContainer.IsExpanded.ToString().ToLowerInvariant()));
@@ -296,6 +297,8 @@ namespace mRemoteNG.Config.Serializers.Xml
connectionInfo.Inheritance.VmId.ToString().ToLowerInvariant()));
element.Add(new XAttribute("InheritUseVmId",
connectionInfo.Inheritance.UseVmId.ToString().ToLowerInvariant()));
element.Add(new XAttribute("InheritUseEnhancedMode",
connectionInfo.Inheritance.UseEnhancedMode.ToString().ToLowerInvariant()));
}
else
{

View File

@@ -542,12 +542,14 @@ namespace mRemoteNG.Config.Serializers.Xml
connectionInfo.Favorite = xmlnode.GetAttributeAsBool("Favorite");
connectionInfo.UseVmId = xmlnode.GetAttributeAsBool("UseVmId");
connectionInfo.VmId = xmlnode.GetAttributeAsString("VmId");
connectionInfo.UseEnhancedMode = xmlnode.GetAttributeAsBool("UseEnhancedMode");
connectionInfo.Inheritance.RedirectClipboard = xmlnode.GetAttributeAsBool("InheritRedirectClipboard");
connectionInfo.Inheritance.Favorite = xmlnode.GetAttributeAsBool("InheritFavorite");
connectionInfo.RdpVersion = xmlnode.GetAttributeAsEnum("RdpVersion", RdpVersion.Highest);
connectionInfo.Inheritance.RdpVersion = xmlnode.GetAttributeAsBool("InheritRdpVersion");
connectionInfo.Inheritance.UseVmId = xmlnode.GetAttributeAsBool("InheritUseVmId");
connectionInfo.Inheritance.VmId = xmlnode.GetAttributeAsBool("InheritVmId");
connectionInfo.Inheritance.UseEnhancedMode = xmlnode.GetAttributeAsBool("InheritUseEnhancedMode");
}
}
catch (Exception ex)

View File

@@ -29,8 +29,10 @@ ADD RedirectClipboard bit NOT NULL DEFAULT 0,
InheritRedirectClipboard bit NOT NULL DEFAULT 0,
VmId varchar NOT NULL DEFAULT 0,
UseVmId bit NOT NULL DEFAULT 0,
UseEnhancedMode bit NOT NULL DEFAULT 0,
InheritVmId bit NOT NULL DEFAULT 0,
InheritUseVmId bit NOT NULL DEFAULT 0;
InheritUseVmId bit NOT NULL DEFAULT 0,
InheritUseEnhancedMode bit NOT NULL DEFAULT 0;
UPDATE tblRoot
SET ConfVersion='2.7'";
var dbCommand = _databaseConnector.DbCommand(sqlText);

View File

@@ -25,6 +25,7 @@ namespace mRemoteNG.Connection
private string _password = "";
private string _domain = "";
private string _vmId = "";
private bool _useEnhancedMode;
private ProtocolType _protocol;
private RdpVersion _rdpProtocolVersion;
@@ -344,6 +345,16 @@ namespace mRemoteNG.Connection
set => SetField(ref _useVmId, value, "UseVmId");
}
[LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
LocalizedAttributes.LocalizedDisplayName("strPropertyNameUseEnhancedMode"),
LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUseEnhancedMode"),
TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
UsedInProtocol(ProtocolType.RDP)]
public bool UseEnhancedMode
{
get => GetPropertyValue("UseEnhancedMode", _useEnhancedMode);
set => SetField(ref _useEnhancedMode, value, "UseEnhancedMode");
}
#endregion
#region RD Gateway

View File

@@ -312,6 +312,7 @@ namespace mRemoteNG.Connection
Settings.Default.ConDefaultRenderingEngine);
UseCredSsp = Settings.Default.ConDefaultUseCredSsp;
UseVmId = Settings.Default.ConDefaultUseVmId;
UseEnhancedMode = Settings.Default.ConDefaultUseEnhancedMode;
}
private void SetRdGatewayDefaults()

View File

@@ -166,6 +166,12 @@ namespace mRemoteNG.Connection
TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
public bool UseVmId { get; set; }
[LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseEnhancedMode"),
LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseEnhancedMode"),
TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
public bool UseEnhancedMode { get; set; }
#endregion
#region RD Gateway

View File

@@ -29,6 +29,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
rdpClient7.AdvancedSettings8.EnableCredSspSupport = true;
rdpClient7.AdvancedSettings8.NegotiateSecurityLayer = false;
rdpClient7.AdvancedSettings7.PCB = $"{connectionInfo.VmId};EnhancedMode=1";
if (connectionInfo.UseEnhancedMode)
rdpClient7.AdvancedSettings7.PCB += ";EnhancedMode=1";
}
}
catch (Exception ex)

View File

@@ -140,8 +140,10 @@ CREATE TABLE [dbo].[tblCons] (
InheritRdpVersion bit DEFAULT ((0)) NOT NULL,
VmId varchar(100),
UseVmId bit,
UseEnhancedMode bit,
InheritVmId bit,
InheritUseVmId bit
InheritUseVmId bit,
InheritUseEnhancedMode bit
) GO
CREATE TABLE [dbo].[tblRoot] (

View File

@@ -143,8 +143,10 @@ CREATE TABLE `tblCons` (
`InheritRdpVersion` tinyint(1) NOT NULL DEFAULT 0,
`VmId` varchar(512) DEFAULT NULL,
`UseVmId` tinyint(1) DEFAULT NULL,
`UseEnhancedMode` tinyint(1) DEFAULT NULL,
`InheritVmId` tinyint(1) DEFAULT NULL,
`InheritUseVmId` tinyint(1) DEFAULT NULL,
`InheritUseEnhancedMode` tinyint(1) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB AUTO_INCREMENT=3324 DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

View File

@@ -12,7 +12,7 @@ namespace mRemoteNG {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -2938,5 +2938,17 @@ namespace mRemoteNG {
this["StartMinimized"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultUseEnhancedMode {
get {
return ((bool)(this["ConDefaultUseEnhancedMode"]));
}
set {
this["ConDefaultUseEnhancedMode"] = value;
}
}
}
}

View File

@@ -731,5 +731,8 @@
<Setting Name="StartMinimized" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="ConDefaultUseEnhancedMode" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -6288,6 +6288,17 @@ namespace mRemoteNG
}
}
/// <summary>
/// Looks up a localized string similar to Connect to a Hyper-V host with enhanced mode enabled..
/// </summary>
internal static string strPropertyDescriptionUseEnhancedMode
{
get
{
return ResourceManager.GetString("strPropertyDescriptionUseEnhancedMode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Feel free to enter any information you need here..
/// </summary>
@@ -6981,6 +6992,17 @@ namespace mRemoteNG
}
}
/// <summary>
/// Looks up a localized string similar to Use enhanced mode.
/// </summary>
internal static string strPropertyNameUseEnhancedMode
{
get
{
return ResourceManager.GetString("strPropertyNameUseEnhancedMode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to User Field.
/// </summary>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -210,13 +210,16 @@
<data name="strButtonIcon" xml:space="preserve">
<value>Ikona</value>
</data>
<data name="strButtonImport" xml:space="preserve">
<value>&amp;Import</value>
<data name="strButtonImport" xml:space="preserve">
<value>&amp;Importuj</value>
</data>
<data name="strButtonInheritance" xml:space="preserve">
<value>Dziedziczenie</value>
</data>
<data name="strButtonLaunchPutty" xml:space="preserve">
<data name="strButtonLaunch" xml:space="preserve">
<value>Uruchom</value>
</data>
<data name="strButtonLaunchPutty" xml:space="preserve">
<value>Uruchom PuTTY</value>
</data>
<data name="strButtonNew" xml:space="preserve">
@@ -407,7 +410,10 @@ Proszę upewnić się, że albo masz Putty.exe w katalogu mRemoteNG (domyślnie:
<data name="strCompatibilityLenovoAutoScrollUtilityDetected" xml:space="preserve">
<value>{0} wykrył, że w systemie działa Lenovo Auto Scroll Utility. To narzędzie jest znane jako przyczyna problemów z {0}. Zaleca się, wyłączyć lub odinstalować ten program.</value>
</data>
<data name="strCompatibilityProblemDetected" xml:space="preserve">
<data name="strCommandTryAgain" xml:space="preserve">
<value>Spróbuj ponownie</value>
</data>
<data name="strCompatibilityProblemDetected" xml:space="preserve">
<value>Wykryto problem z kompatybilnością</value>
</data>
<data name="strComponentsCheck" xml:space="preserve">
@@ -507,7 +513,10 @@ Załadowano nowy plik połączeń.</value>
<data name="strConnectionsFileCouldNotSaveAs" xml:space="preserve">
<value>Nie można zapisać pliku połączeń jako "{0}"!</value>
</data>
<data name="strConnectToConsoleSession" xml:space="preserve">
<data name="strConnectNoCredentials" xml:space="preserve">
<value>Połącz się bez uwierzytelnienia</value>
</data>
<data name="strConnectToConsoleSession" xml:space="preserve">
<value>Połącz się z sesją konsoli</value>
</data>
<data name="strConnectWithOptions" xml:space="preserve">
@@ -558,7 +567,13 @@ Załadowano nowy plik połączeń.</value>
<data name="strEnc128BitLogonOnly" xml:space="preserve">
<value>128-bit (tylko logowanie)</value>
</data>
<data name="strEncBasic" xml:space="preserve">
<data name="strEnc40Bit" xml:space="preserve">
<value>40-bitowe</value>
</data>
<data name="strEnc56Bit" xml:space="preserve">
<value>56-bitowe</value>
</data>
<data name="strEncBasic" xml:space="preserve">
<value>Podstawowe</value>
</data>
<data name="strEncryptCompleteConnectionFile" xml:space="preserve">
@@ -588,7 +603,10 @@ Załadowano nowy plik połączeń.</value>
<data name="strErrorConnectionListSaveFailed" xml:space="preserve">
<value>Nie można zapisać listy połączeń.</value>
</data>
<data name="strErrorDecryptionFailed" xml:space="preserve">
<data name="strErrorCouldNotLaunchPutty" xml:space="preserve">
<value>Nie udało się uruchomić PuTTY.</value>
</data>
<data name="strErrorDecryptionFailed" xml:space="preserve">
<value>Odszyfrowywanie nie powiodło się. {0}</value>
</data>
<data name="strErrorEncryptionFailed" xml:space="preserve">
@@ -612,13 +630,22 @@ Załadowano nowy plik połączeń.</value>
<data name="strExport" xml:space="preserve">
<value>Eksport</value>
</data>
<data name="strExportmRemoteXML" xml:space="preserve">
<data name="strExportEverything" xml:space="preserve">
<value>Eksportuj wszystko</value>
</data>
<data name="strExportFile" xml:space="preserve">
<value>Eksportuj do pliku</value>
</data>
<data name="strExportmRemoteXML" xml:space="preserve">
<value>Eksport mRemote/mRemoteNG XML</value>
</data>
<data name="strExtApp" xml:space="preserve">
<value>Aplikacja zewnętrzna</value>
</data>
<data name="strFAMFAMFAMAttribution" xml:space="preserve">
<data name="strExternalToolDefaultName" xml:space="preserve">
<value>Nowe narzędzie zewnętrzne</value>
</data>
<data name="strFAMFAMFAMAttribution" xml:space="preserve">
<value>Zawiera ikony ze strony [FAMFAMFAM]</value>
</data>
<data name="strFilterAll" xml:space="preserve">
@@ -972,7 +999,10 @@ Załadowano nowy plik połączeń.</value>
<data name="strMenuReportBug" xml:space="preserve">
<value>Zgłoś błąd</value>
</data>
<data name="strMenuSaveConnectionFile" xml:space="preserve">
<data name="strMenuResetLayout" xml:space="preserve">
<value>Przywróć domyślny layout</value>
</data>
<data name="strMenuSaveConnectionFile" xml:space="preserve">
<value>Zapisz plik połączeń</value>
</data>
<data name="strMenuSaveConnectionFileAs" xml:space="preserve">
@@ -1098,7 +1128,10 @@ Załadowano nowy plik połączeń.</value>
<data name="strPanelName" xml:space="preserve">
<value>Nazwa panelu</value>
</data>
<data name="strPleaseFillAllFields" xml:space="preserve">
<data name="strPasswordProtect" xml:space="preserve">
<value>Zabezpiecz hasłem</value>
</data>
<data name="strPleaseFillAllFields" xml:space="preserve">
<value>Wypełnij wszystkie pola</value>
</data>
<data name="strPortScanCouldNotLoadPanel" xml:space="preserve">
@@ -1125,7 +1158,10 @@ Załadowano nowy plik połączeń.</value>
<data name="strPropertyDescriptionDisplayThemes" xml:space="preserve">
<value>Wybierz "Tak" jeśli motyw ma być wyświetlany na zdalnym komputerze.</value>
</data>
<data name="strPropertyDescriptionDomain" xml:space="preserve">
<data name="strPropertyDescriptionName" xml:space="preserve">
<value>To jest nazwa, która będzie wyświetlana na drzewie połączeń.</value>
</data>
<data name="strPropertyDescriptionDomain" xml:space="preserve">
<value>Podaj domenę.</value>
</data>
<data name="strPropertyDescriptionPassword" xml:space="preserve">
@@ -1365,7 +1401,16 @@ Załadowano nowy plik połączeń.</value>
<data name="strRadioCloseWarnAll" xml:space="preserve">
<value>&amp;Ostrzegaj przed zamknięciem połączenia</value>
</data>
<data name="strRAW" xml:space="preserve">
<data name="strRadioCloseWarnExit" xml:space="preserve">
<value>Ostrzegaj tylko przy zamykaniu mRemoteNG</value>
</data>
<data name="strRadioCloseWarnMultiple" xml:space="preserve">
<value>Otrzegaj tylko przy zamykaniu wielu połączeń</value>
</data>
<data name="strRadioCloseWarnNever" xml:space="preserve">
<value>Nie ostrzegaj przed zamknięciem połączeń</value>
</data>
<data name="strRAW" xml:space="preserve">
<value>RAW</value>
</data>
<data name="strRDP" xml:space="preserve">
@@ -1915,4 +1960,19 @@ mRemoteNG zostanie teraz zamknięty i rozpocznie instalację.</value>
<data name="strLogToAppDir" xml:space="preserve">
<value>Loguj do katalogu aplikacji</value>
</data>
<data name="Credentials" xml:space="preserve">
<value>Uwierzytelnienia</value>
</data>
<data name="strRDPOverallConnectionTimeout" xml:space="preserve">
<value>Timeout połączeń RDP</value>
</data>
<data name="srtWorkingDirectory" xml:space="preserve">
<value>Katalog roboczy:</value>
</data>
<data name="strCreateEmptyPanelOnStartUp" xml:space="preserve">
<value>Stwórz pusty panel przy uruchamianiu mRemoteNG</value>
</data>
<data name="strWorkingDirColumnHeader" xml:space="preserve">
<value>Katalog roboczy</value>
</data>
</root>

View File

@@ -2819,6 +2819,12 @@ Development Channel includes Alphas, Betas &amp; Release Candidates.</value>
<data name="strPropertyDescriptionPasswordProtect" xml:space="preserve">
<value>Set a password needed to encrypt the connection file with. You will be prompted to enter your passcode before starting mRemoteNG.</value>
</data>
<data name="strPropertyDescriptionUseEnhancedMode" xml:space="preserve">
<value>Connect to a Hyper-V host with enhanced mode enabled.</value>
</data>
<data name="strPropertyNameUseEnhancedMode" xml:space="preserve">
<value>Use enhanced mode</value>
</data>
<data name="strPowerShell" xml:space="preserve">
<value>PowerShell</value>
</data>

View File

@@ -47,6 +47,7 @@
<xs:attribute name="RdpVersion" type="xs:string" use="required" />
<xs:attribute name="VmId" type="xs:string" use="required" />
<xs:attribute name="UseVmId" type="xs:boolean" use="required" />
<xs:attribute name="UseEnhancedMode" type="xs:boolean" use="required" />
<xs:attribute name="PuttySession" type="xs:string" use="required" />
<xs:attribute name="Port" type="xs:int" use="required" />
<xs:attribute name="ConnectToConsole" type="xs:boolean" use="required" />
@@ -139,6 +140,7 @@
<xs:attribute name="InheritUseCredSsp" type="xs:boolean" use="optional" />
<xs:attribute name="InheritVmId" type="xs:boolean" use="optional" />
<xs:attribute name="InheritUseVmId" type="xs:boolean" use="optional" />
<xs:attribute name="InheritUseEnhancedMode" type="xs:boolean" use="optional" />
<xs:attribute name="InheritUserField" type="xs:boolean" use="optional" />
<xs:attribute name="InheritExtApp" type="xs:boolean" use="optional" />
<xs:attribute name="InheritFavorite" type="xs:boolean" use="optional" />

View File

@@ -251,6 +251,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid
if (!SelectedConnectionInfo.UseVmId)
{
strHide.Add(nameof(AbstractConnectionRecord.VmId));
strHide.Add(nameof(AbstractConnectionRecord.UseEnhancedMode));
}
return strHide;

View File

@@ -757,6 +757,9 @@
<setting name="StartMinimized" serializeAs="String">
<value>False</value>
</setting>
<setting name="ConDefaultUseEnhancedMode" serializeAs="String">
<value>False</value>
</setting>
</mRemoteNG.Settings>
</userSettings>
<applicationSettings>