From 7478537f3e271c312b7aa5ddc2c61f6c23335c75 Mon Sep 17 00:00:00 2001 From: "massimo.antonello" Date: Fri, 17 Oct 2025 16:18:57 +0200 Subject: [PATCH] Revert RootNode Properties --- .../Xml/XmlConnectionsDeserializer.cs | 1 - .../Xml/XmlRootNodeSerializer.cs | 1 - mRemoteNG/Language/Language.Designer.cs | 54 +++++++------------ mRemoteNG/Language/Language.cs-CZ.resx | 6 --- mRemoteNG/Language/Language.de.resx | 6 --- mRemoteNG/Language/Language.el.resx | 6 --- mRemoteNG/Language/Language.es-AR.resx | 6 --- mRemoteNG/Language/Language.es.resx | 6 --- mRemoteNG/Language/Language.fi-FI.resx | 6 --- mRemoteNG/Language/Language.fr.resx | 6 --- mRemoteNG/Language/Language.hu.resx | 6 --- mRemoteNG/Language/Language.it.resx | 6 --- mRemoteNG/Language/Language.ja-JP.resx | 6 --- mRemoteNG/Language/Language.ko-KR.resx | 6 --- mRemoteNG/Language/Language.lt.resx | 6 --- mRemoteNG/Language/Language.nb-NO.resx | 6 --- mRemoteNG/Language/Language.nl.resx | 6 --- mRemoteNG/Language/Language.pl.resx | 6 --- mRemoteNG/Language/Language.pt-BR.resx | 6 --- mRemoteNG/Language/Language.pt.resx | 6 --- mRemoteNG/Language/Language.resx | 6 --- mRemoteNG/Language/Language.ru.resx | 6 --- mRemoteNG/Language/Language.sv-SE.resx | 6 --- mRemoteNG/Language/Language.ta.resx | 6 --- mRemoteNG/Language/Language.tr-TR.resx | 6 --- mRemoteNG/Language/Language.uk.resx | 6 --- mRemoteNG/Language/Language.zh-CN.resx | 6 --- mRemoteNG/Language/Language.zh-TW.resx | 6 --- mRemoteNG/Tree/Root/RootNodeInfo.cs | 22 -------- .../ConnectionInfoPropertyGrid.cs | 4 +- 30 files changed, 19 insertions(+), 213 deletions(-) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs index 97d15dde..8b4b523f 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs @@ -120,7 +120,6 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml private void InitializeRootNode(XmlElement connectionsRootElement) { _rootNodeInfo.Name = connectionsRootElement?.Attributes["Name"]?.Value.Trim(); - _rootNodeInfo.VaultOpenbaoUrl = connectionsRootElement?.Attributes["VaultOpenbaoUrl"]?.Value.Trim(); } private void CreateDecryptor(RootNodeInfo rootNodeInfo, XmlElement connectionsRootElement = null) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs index 8b38f6ef..a28813eb 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs @@ -15,7 +15,6 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml XElement element = new(xmlNamespace + "Connections"); element.Add(new XAttribute(XNamespace.Xmlns + "mrng", xmlNamespace)); element.Add(new XAttribute(XName.Get("Name"), rootNodeInfo.Name)); - element.Add(new XAttribute(XName.Get("VaultOpenbaoUrl"), rootNodeInfo.VaultOpenbaoUrl)); element.Add(new XAttribute(XName.Get("Export"), "false")); element.Add(new XAttribute(XName.Get("EncryptionEngine"), cryptographyProvider.CipherEngine)); element.Add(new XAttribute(XName.Get("BlockCipherMode"), cryptographyProvider.CipherMode)); diff --git a/mRemoteNG/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs index d69a9c50..f4071952 100644 --- a/mRemoteNG/Language/Language.Designer.cs +++ b/mRemoteNG/Language/Language.Designer.cs @@ -1609,6 +1609,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Discard. + /// + internal static string Discard { + get { + return ResourceManager.GetString("Discard", resourceCulture); + } + } + /// /// Looks up a localized string similar to Disconnect. /// @@ -5775,24 +5784,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Do you want to save the changes made to the options?. - /// - internal static string SaveOptionsBeforeClosing { - get { - return ResourceManager.GetString("SaveOptionsBeforeClosing", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Discard. - /// - internal static string Discard { - get { - return ResourceManager.GetString("Discard", resourceCulture); - } - } - /// /// Looks up a localized string similar to SaveConnectionsOnExit. /// @@ -5820,6 +5811,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Do you want to save the changes made to the options?. + /// + internal static string SaveOptionsBeforeClosing { + get { + return ResourceManager.GetString("SaveOptionsBeforeClosing", resourceCulture); + } + } + /// /// Looks up a localized string similar to Screen. /// @@ -6973,24 +6973,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Vault/Openbao Url. - /// - internal static string VaultOpenbaoUrl { - get { - return ResourceManager.GetString("VaultOpenbaoUrl", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The URL of the Vault/Openbao server to retrieve credentials. - /// - internal static string VaultOpenbaoUrlPropertyDescription { - get { - return ResourceManager.GetString("VaultOpenbaoUrlPropertyDescription", resourceCulture); - } - } - /// /// Looks up a localized string similar to Verify:. /// diff --git a/mRemoteNG/Language/Language.cs-CZ.resx b/mRemoteNG/Language/Language.cs-CZ.resx index a324506e..99f20fa0 100644 --- a/mRemoteNG/Language/Language.cs-CZ.resx +++ b/mRemoteNG/Language/Language.cs-CZ.resx @@ -1900,12 +1900,6 @@ mRemoteNG se nyní ukončí a zahájí instalaci. - - - - - - diff --git a/mRemoteNG/Language/Language.de.resx b/mRemoteNG/Language/Language.de.resx index eaf5cbf3..7c3b9c4d 100644 --- a/mRemoteNG/Language/Language.de.resx +++ b/mRemoteNG/Language/Language.de.resx @@ -2069,12 +2069,6 @@ Nightly umfasst Alphas, Betas und Release Candidates. - - - - - - diff --git a/mRemoteNG/Language/Language.el.resx b/mRemoteNG/Language/Language.el.resx index 456b4941..fb250889 100644 --- a/mRemoteNG/Language/Language.el.resx +++ b/mRemoteNG/Language/Language.el.resx @@ -292,12 +292,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.es-AR.resx b/mRemoteNG/Language/Language.es-AR.resx index 536c97a9..78d0838d 100644 --- a/mRemoteNG/Language/Language.es-AR.resx +++ b/mRemoteNG/Language/Language.es-AR.resx @@ -331,12 +331,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.es.resx b/mRemoteNG/Language/Language.es.resx index c3e70b6e..da5ba8b1 100644 --- a/mRemoteNG/Language/Language.es.resx +++ b/mRemoteNG/Language/Language.es.resx @@ -1560,12 +1560,6 @@ mRemoteNG ahora se cerrará y comenzará la instalación. - - - - - - diff --git a/mRemoteNG/Language/Language.fi-FI.resx b/mRemoteNG/Language/Language.fi-FI.resx index d8ed19cc..51634a40 100644 --- a/mRemoteNG/Language/Language.fi-FI.resx +++ b/mRemoteNG/Language/Language.fi-FI.resx @@ -157,12 +157,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.fr.resx b/mRemoteNG/Language/Language.fr.resx index e68e89d1..ea7ed8ff 100644 --- a/mRemoteNG/Language/Language.fr.resx +++ b/mRemoteNG/Language/Language.fr.resx @@ -2172,12 +2172,6 @@ Le canal nightly inclut les versions alpha, beta et release candidates. - - - - - - diff --git a/mRemoteNG/Language/Language.hu.resx b/mRemoteNG/Language/Language.hu.resx index 56870233..847545ce 100644 --- a/mRemoteNG/Language/Language.hu.resx +++ b/mRemoteNG/Language/Language.hu.resx @@ -352,12 +352,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.it.resx b/mRemoteNG/Language/Language.it.resx index 6bc51d94..ba541242 100644 --- a/mRemoteNG/Language/Language.it.resx +++ b/mRemoteNG/Language/Language.it.resx @@ -1578,12 +1578,6 @@ mRemoteNG verrà chiuso e l'installazione avrà inizio. - - - - - - diff --git a/mRemoteNG/Language/Language.ja-JP.resx b/mRemoteNG/Language/Language.ja-JP.resx index 56b6f21b..5431613e 100644 --- a/mRemoteNG/Language/Language.ja-JP.resx +++ b/mRemoteNG/Language/Language.ja-JP.resx @@ -1735,12 +1735,6 @@ mRemoteNGを終了してインストールを開始します - - - - - - diff --git a/mRemoteNG/Language/Language.ko-KR.resx b/mRemoteNG/Language/Language.ko-KR.resx index 3d90db05..4e1f9d39 100644 --- a/mRemoteNG/Language/Language.ko-KR.resx +++ b/mRemoteNG/Language/Language.ko-KR.resx @@ -1825,12 +1825,6 @@ mRemoteNG는 이제 종료되고 설치로 시작됩니다. - - - - - - diff --git a/mRemoteNG/Language/Language.lt.resx b/mRemoteNG/Language/Language.lt.resx index 4cedd646..ecb2fd46 100644 --- a/mRemoteNG/Language/Language.lt.resx +++ b/mRemoteNG/Language/Language.lt.resx @@ -247,12 +247,6 @@ Nightly Channel includes Alphas, Betas & Release Candidates. - - - - - - diff --git a/mRemoteNG/Language/Language.nb-NO.resx b/mRemoteNG/Language/Language.nb-NO.resx index 76748c96..90a78863 100644 --- a/mRemoteNG/Language/Language.nb-NO.resx +++ b/mRemoteNG/Language/Language.nb-NO.resx @@ -2024,12 +2024,6 @@ Nightly-kanalen inkluderer alpha-, beta- og release candidate-versjoner. - - - - - - diff --git a/mRemoteNG/Language/Language.nl.resx b/mRemoteNG/Language/Language.nl.resx index 9b758081..b4ed2e91 100644 --- a/mRemoteNG/Language/Language.nl.resx +++ b/mRemoteNG/Language/Language.nl.resx @@ -1607,12 +1607,6 @@ mRemoteNG zal nu worden gesloten en beginnen met de installatie. - - - - - - diff --git a/mRemoteNG/Language/Language.pl.resx b/mRemoteNG/Language/Language.pl.resx index b3eab02f..a9c3fb64 100644 --- a/mRemoteNG/Language/Language.pl.resx +++ b/mRemoteNG/Language/Language.pl.resx @@ -2378,12 +2378,6 @@ Kanał nocny obejmuje wersje alfa, beta i RC (gotowe do wydania). - - - - - - diff --git a/mRemoteNG/Language/Language.pt-BR.resx b/mRemoteNG/Language/Language.pt-BR.resx index c1778b52..b0de4ec9 100644 --- a/mRemoteNG/Language/Language.pt-BR.resx +++ b/mRemoteNG/Language/Language.pt-BR.resx @@ -388,12 +388,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.pt.resx b/mRemoteNG/Language/Language.pt.resx index 0dbb7ce1..daf5c5ae 100644 --- a/mRemoteNG/Language/Language.pt.resx +++ b/mRemoteNG/Language/Language.pt.resx @@ -1573,12 +1573,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.resx b/mRemoteNG/Language/Language.resx index 43f705b7..aafda966 100644 --- a/mRemoteNG/Language/Language.resx +++ b/mRemoteNG/Language/Language.resx @@ -2494,12 +2494,6 @@ Nightly Channel includes Alphas, Betas & Release Candidates. Token to access Vault/Openbao server - - Vault/Openbao Url - - - The URL of the Vault/Openbao server to retrieve credentials - Vault/Openbao Secret Engine diff --git a/mRemoteNG/Language/Language.ru.resx b/mRemoteNG/Language/Language.ru.resx index fa87d548..e08d0a06 100644 --- a/mRemoteNG/Language/Language.ru.resx +++ b/mRemoteNG/Language/Language.ru.resx @@ -2017,12 +2017,6 @@ mRemoteNG сейчас прекратит работу и начнет проц - - - - - - diff --git a/mRemoteNG/Language/Language.sv-SE.resx b/mRemoteNG/Language/Language.sv-SE.resx index 144efce3..ec208978 100644 --- a/mRemoteNG/Language/Language.sv-SE.resx +++ b/mRemoteNG/Language/Language.sv-SE.resx @@ -2191,12 +2191,6 @@ Nattliga kanalen inkluderar Alfa, Betor & Utgåvokandidater. - - - - - - diff --git a/mRemoteNG/Language/Language.ta.resx b/mRemoteNG/Language/Language.ta.resx index 85dee411..c2aec0f8 100644 --- a/mRemoteNG/Language/Language.ta.resx +++ b/mRemoteNG/Language/Language.ta.resx @@ -2435,12 +2435,6 @@ - - - - - - diff --git a/mRemoteNG/Language/Language.tr-TR.resx b/mRemoteNG/Language/Language.tr-TR.resx index 43270bec..c95e4919 100644 --- a/mRemoteNG/Language/Language.tr-TR.resx +++ b/mRemoteNG/Language/Language.tr-TR.resx @@ -1647,12 +1647,6 @@ MRemoteNG şimdi kapanacak ve kurulum başlayacak. - - - - - - diff --git a/mRemoteNG/Language/Language.uk.resx b/mRemoteNG/Language/Language.uk.resx index 056a7567..8e4b08ab 100644 --- a/mRemoteNG/Language/Language.uk.resx +++ b/mRemoteNG/Language/Language.uk.resx @@ -2021,12 +2021,6 @@ mRemoteNG зараз припинить роботу і почне процес - - - - - - diff --git a/mRemoteNG/Language/Language.zh-CN.resx b/mRemoteNG/Language/Language.zh-CN.resx index cb93d77c..20d5517d 100644 --- a/mRemoteNG/Language/Language.zh-CN.resx +++ b/mRemoteNG/Language/Language.zh-CN.resx @@ -2099,12 +2099,6 @@ mRemoteNG 将退出并安装更新。 - - - - - - diff --git a/mRemoteNG/Language/Language.zh-TW.resx b/mRemoteNG/Language/Language.zh-TW.resx index df2c0a6b..c28660a0 100644 --- a/mRemoteNG/Language/Language.zh-TW.resx +++ b/mRemoteNG/Language/Language.zh-TW.resx @@ -1594,12 +1594,6 @@ mRemoteNG 將立即結束並開始安裝。 - - - - - - diff --git a/mRemoteNG/Tree/Root/RootNodeInfo.cs b/mRemoteNG/Tree/Root/RootNodeInfo.cs index a035e6b5..c24fda3b 100644 --- a/mRemoteNG/Tree/Root/RootNodeInfo.cs +++ b/mRemoteNG/Tree/Root/RootNodeInfo.cs @@ -14,8 +14,6 @@ namespace mRemoteNG.Tree.Root { private string _name = Language.Connections; private string _customPassword = ""; - private string _vaultOpenbaoToken = ""; - private string _vaultOpenbaoUrl = ""; public RootNodeInfo(RootNodeType rootType) : this(rootType, Guid.NewGuid().ToString()) @@ -63,26 +61,6 @@ namespace mRemoteNG.Tree.Root ? TreeNodeType.Root : TreeNodeType.PuttyRoot; } - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous)), - Browsable(true), - LocalizedAttributes.LocalizedDefaultValue(nameof(Language.Connections)), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.VaultOpenbaoUrl)), - LocalizedAttributes.LocalizedDescription(nameof(Language.VaultOpenbaoUrlPropertyDescription))] - public string VaultOpenbaoUrl { - get => _vaultOpenbaoUrl; - set => _vaultOpenbaoUrl = value; - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous)), - Browsable(true), - LocalizedAttributes.LocalizedDefaultValue(nameof(Language.Connections)), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.VaultOpenbaoToken)), - LocalizedAttributes.LocalizedDescription(nameof(Language.VaultOpenbaoTokenPropertyDescription))] - public string VaultOpenbaoToken { - get => _vaultOpenbaoToken; - set => _vaultOpenbaoToken = value; - } - #endregion } } \ No newline at end of file diff --git a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs index 780b693d..7750a4e2 100644 --- a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs +++ b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs @@ -119,9 +119,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid { BrowsableProperties = new[] { nameof(RootNodeInfo.Name), - nameof(RootNodeInfo.Password), - nameof(RootNodeInfo.VaultOpenbaoUrl), - nameof(RootNodeInfo.VaultOpenbaoToken) + nameof(RootNodeInfo.Password) }; }