From f7b9bb55513eebe8261d08dff92f3ad3009cb1f0 Mon Sep 17 00:00:00 2001 From: miloush Date: Tue, 12 Sep 2023 12:39:26 +0100 Subject: [PATCH] rename inherited members to base members --- ILSpy/FilterSettings.cs | 16 ++++++++-------- ILSpy/MainWindow.xaml | 2 +- ILSpy/Properties/Resources.Designer.cs | 6 +++--- ILSpy/Properties/Resources.resx | 4 ++-- ILSpy/Properties/Resources.zh-Hans.resx | 4 ++-- ILSpy/TreeNodes/TypeTreeNode.cs | 14 +++++++------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ILSpy/FilterSettings.cs b/ILSpy/FilterSettings.cs index 1c7224fc5..5bbbbcab1 100644 --- a/ILSpy/FilterSettings.cs +++ b/ILSpy/FilterSettings.cs @@ -47,7 +47,7 @@ namespace ICSharpCode.ILSpy public FilterSettings(XElement element) { this.ShowApiLevel = (ApiVisibility?)(int?)element.Element("ShowAPILevel") ?? ApiVisibility.PublicAndInternal; - this.ShowApiInherited = (bool?)element.Element("ShowAPIInherited") ?? false; + this.ShowBaseApi = (bool?)element.Element("ShowBaseAPI") ?? false; this.Language = Languages.GetLanguage((string)element.Element("Language")); this.LanguageVersion = Language.LanguageVersions.FirstOrDefault(v => v.Version == (string)element.Element("LanguageVersion")); if (this.LanguageVersion == default(LanguageVersion)) @@ -59,7 +59,7 @@ namespace ICSharpCode.ILSpy return new XElement( "FilterSettings", new XElement("ShowAPILevel", (int)this.ShowApiLevel), - new XElement("ShowAPIInherited", this.ShowApiInherited), + new XElement("ShowBaseAPI", this.ShowBaseApi), new XElement("Language", this.Language.Name), new XElement("LanguageVersion", this.LanguageVersion?.Version) ); @@ -144,15 +144,15 @@ namespace ICSharpCode.ILSpy } } - bool showApiInherited; + bool showBaseApi; - public bool ShowApiInherited { - get { return showApiInherited; } + public bool ShowBaseApi { + get { return showBaseApi; } set { - if (showApiInherited != value) + if (showBaseApi != value) { - showApiInherited = value; - OnPropertyChanged(nameof(ShowApiInherited)); + showBaseApi = value; + OnPropertyChanged(nameof(ShowBaseApi)); } } } diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml index 449a6f83d..8b758993d 100644 --- a/ILSpy/MainWindow.xaml +++ b/ILSpy/MainWindow.xaml @@ -138,7 +138,7 @@ - + diff --git a/ILSpy/Properties/Resources.Designer.cs b/ILSpy/Properties/Resources.Designer.cs index 48ddf90ba..c7836f616 100644 --- a/ILSpy/Properties/Resources.Designer.cs +++ b/ILSpy/Properties/Resources.Designer.cs @@ -2503,11 +2503,11 @@ namespace ICSharpCode.ILSpy.Properties { } /// - /// Looks up a localized string similar to Show in_herited members. + /// Looks up a localized string similar to Show _base members. /// - public static string Show_inheritedMembers { + public static string Show_baseMembers { get { - return ResourceManager.GetString("Show_inheritedMembers", resourceCulture); + return ResourceManager.GetString("Show_baseMembers", resourceCulture); } } diff --git a/ILSpy/Properties/Resources.resx b/ILSpy/Properties/Resources.resx index 9fd24357c..4ef938692 100644 --- a/ILSpy/Properties/Resources.resx +++ b/ILSpy/Properties/Resources.resx @@ -901,8 +901,8 @@ Do you want to continue? Show _all types and members - - Show in_herited members + + Show _base members Show public, private and _internal diff --git a/ILSpy/Properties/Resources.zh-Hans.resx b/ILSpy/Properties/Resources.zh-Hans.resx index ee78054e8..a29cf414f 100644 --- a/ILSpy/Properties/Resources.zh-Hans.resx +++ b/ILSpy/Properties/Resources.zh-Hans.resx @@ -872,8 +872,8 @@ 显示所有类型和成员(_A) - - 显示继承成员(_H) + + 显示基成员(_B) 显示内部类型和成员(_I) diff --git a/ILSpy/TreeNodes/TypeTreeNode.cs b/ILSpy/TreeNodes/TypeTreeNode.cs index b10ff32e7..05909b642 100644 --- a/ILSpy/TreeNodes/TypeTreeNode.cs +++ b/ILSpy/TreeNodes/TypeTreeNode.cs @@ -90,7 +90,7 @@ namespace ICSharpCode.ILSpy.TreeNodes protected override void OnFilterSettingsChanged() { base.OnFilterSettingsChanged(); - if (loadedInheritedMembers != null && loadedInheritedMembers != FilterSettings.ShowApiInherited) + if (loadedInheritedMembers != null && loadedInheritedMembers != FilterSettings.ShowBaseApi) { this.Children.Clear(); if (IsVisible) @@ -106,12 +106,12 @@ namespace ICSharpCode.ILSpy.TreeNodes this.Children.Add(new BaseTypesTreeNode(ParentAssemblyNode.LoadedAssembly.GetPEFileOrNull(), TypeDefinition)); if (!TypeDefinition.IsSealed) this.Children.Add(new DerivedTypesTreeNode(ParentAssemblyNode.AssemblyList, TypeDefinition)); - loadedInheritedMembers = FilterSettings.ShowApiInherited; - IEnumerable nestedTypes = GetMembers(TypeDefinition, t => t.NestedTypes, FilterSettings.ShowApiInherited); - IEnumerable fields = GetMembers(TypeDefinition, t => t.Fields, FilterSettings.ShowApiInherited); - IEnumerable properties = GetMembers(TypeDefinition, t => t.Properties, FilterSettings.ShowApiInherited); - IEnumerable events = GetMembers(TypeDefinition, t => t.Events, FilterSettings.ShowApiInherited); - IEnumerable methods = GetMembers(TypeDefinition, t => t.Methods, FilterSettings.ShowApiInherited); + loadedInheritedMembers = FilterSettings.ShowBaseApi; + IEnumerable nestedTypes = GetMembers(TypeDefinition, t => t.NestedTypes, FilterSettings.ShowBaseApi); + IEnumerable fields = GetMembers(TypeDefinition, t => t.Fields, FilterSettings.ShowBaseApi); + IEnumerable properties = GetMembers(TypeDefinition, t => t.Properties, FilterSettings.ShowBaseApi); + IEnumerable events = GetMembers(TypeDefinition, t => t.Events, FilterSettings.ShowBaseApi); + IEnumerable methods = GetMembers(TypeDefinition, t => t.Methods, FilterSettings.ShowBaseApi); foreach (var nestedType in nestedTypes.OrderBy(t => t.Name, NaturalStringComparer.Instance)) { this.Children.Add(new TypeTreeNode(nestedType, ParentAssemblyNode));