From 265a43e31ccef64ac06e087d5250ed488308fded Mon Sep 17 00:00:00 2001 From: Dimitrij Date: Tue, 7 Oct 2025 22:12:15 +0100 Subject: [PATCH 1/2] fix --- .../Connection/AbstractConnectionRecord.cs | 7 +-- .../Connection/ConnectionInfoInheritance.cs | 2 +- mRemoteNG/Language/Language.Designer.cs | 47 +++++++++++++++---- mRemoteNG/Language/Language.resx | 1 + 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index c354a553d..5cecc1bea 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -165,9 +165,10 @@ namespace mRemoteNG.Connection { get => GetPropertyValue("Color", _color); set => SetField(ref _color, value, "Color"); - LocalizedAttributes.LocalizedDisplayName(nameof(Language.TabColor)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionTabColor)), - TypeConverter(typeof(MiscTools.TabColorConverter))] + } + [LocalizedAttributes.LocalizedDisplayName(nameof(Language.TabColor)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionTabColor)), + TypeConverter(typeof(MiscTools.TabColorConverter))] public virtual string TabColor { get => GetPropertyValue("TabColor", _tabColor); diff --git a/mRemoteNG/Connection/ConnectionInfoInheritance.cs b/mRemoteNG/Connection/ConnectionInfoInheritance.cs index 1e0a28485..ebd4b9ebf 100644 --- a/mRemoteNG/Connection/ConnectionInfoInheritance.cs +++ b/mRemoteNG/Connection/ConnectionInfoInheritance.cs @@ -55,7 +55,7 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionColor)), TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool Color { get; set; } - LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.TabColor)), + [LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.TabColor)), LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionTabColor)), TypeConverter(typeof(MiscTools.YesNoTypeConverter))] public bool TabColor { get; set; } diff --git a/mRemoteNG/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs index 8b75827c8..7aa95d15a 100644 --- a/mRemoteNG/Language/Language.Designer.cs +++ b/mRemoteNG/Language/Language.Designer.cs @@ -19,7 +19,7 @@ namespace mRemoteNG.Resources.Language { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Language { @@ -420,6 +420,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to ARD (Apple Remote Desktop). + /// + internal static string Ard { + get { + return ResourceManager.GetString("Ard", resourceCulture); + } + } + /// /// Looks up a localized string similar to Arguments. /// @@ -609,15 +618,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Color. - /// - internal static string Color { - get { - return ResourceManager.GetString("Color", resourceCulture); - } - } - /// /// Looks up a localized string similar to Cannot start Port Scan, incorrect IP format!. /// @@ -852,6 +852,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Color. + /// + internal static string Color { + get { + return ResourceManager.GetString("Color", resourceCulture); + } + } + /// /// Looks up a localized string similar to Colors. /// @@ -4332,6 +4341,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Sets the color of the connection tab. Leave empty for default theme color.. + /// + internal static string PropertyDescriptionTabColor { + get { + return ResourceManager.GetString("PropertyDescriptionTabColor", resourceCulture); + } + } + /// /// Looks up a localized string similar to Connect to the console session of the remote host.. /// @@ -6207,6 +6225,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Tab Color. + /// + internal static string TabColor { + get { + return ResourceManager.GetString("TabColor", resourceCulture); + } + } + /// /// Looks up a localized string similar to Tabs && Panels. /// diff --git a/mRemoteNG/Language/Language.resx b/mRemoteNG/Language/Language.resx index fe2cd4579..7958c0cb4 100644 --- a/mRemoteNG/Language/Language.resx +++ b/mRemoteNG/Language/Language.resx @@ -1025,6 +1025,7 @@ If you run into such an error, please create a new connection file! Sets the color for the connection or folder in the connections tree. Connections inherit this color from their parent folder. + Sets the color of the connection tab. Leave empty for default theme color. From ea6b76202190f22a5ded5253b7e93ffc1ab978f1 Mon Sep 17 00:00:00 2001 From: Simon Monai <33432894+simonai1254@users.noreply.github.com> Date: Tue, 7 Oct 2025 23:16:12 +0200 Subject: [PATCH 2/2] Update README.md Add Visual C++ Dependency back in --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d5b8b6a3a..589399ef2 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,7 @@ You will need to compile it yourself using Visual Studio. ### Minimum Requirements * [Microsoft .NET Desktop Runtime 9.0](https://dotnet.microsoft.com/download/dotnet/6.0) +* [Microsoft Visual C++ Redistributable x86 (note: use 32-bit, required until #2870 is resolved)](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170#latest-supported-redistributable-version) * Microsoft Terminal Service Client 6.0 or later (needed if you use RDP with mstscax.dll and/or msrdp.ocx to be registered) ### Download