mirror of https://github.com/icsharpcode/ILSpy.git
Siegfried Pammer
9 months ago
committed by
GitHub
37 changed files with 486 additions and 462 deletions
@ -1,46 +0,0 @@ |
|||||||
// Copyright (c) 2020 AlphaSierraPapa for the SharpDevelop Team
|
|
||||||
//
|
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
|
||||||
// software and associated documentation files (the "Software"), to deal in the Software
|
|
||||||
// without restriction, including without limitation the rights to use, copy, modify, merge,
|
|
||||||
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
|
|
||||||
// to whom the Software is furnished to do so, subject to the following conditions:
|
|
||||||
//
|
|
||||||
// The above copyright notice and this permission notice shall be included in all copies or
|
|
||||||
// substantial portions of the Software.
|
|
||||||
//
|
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
|
||||||
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
|
||||||
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
|
|
||||||
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
||||||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
// DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
using System; |
|
||||||
using System.Globalization; |
|
||||||
using System.Windows; |
|
||||||
using System.Windows.Data; |
|
||||||
using System.Windows.Markup; |
|
||||||
|
|
||||||
namespace ICSharpCode.ILSpy.Controls.TreeView |
|
||||||
{ |
|
||||||
public class CollapsedWhenFalse : MarkupExtension, IValueConverter |
|
||||||
{ |
|
||||||
public static CollapsedWhenFalse Instance = new CollapsedWhenFalse(); |
|
||||||
|
|
||||||
public override object ProvideValue(IServiceProvider serviceProvider) |
|
||||||
{ |
|
||||||
return Instance; |
|
||||||
} |
|
||||||
|
|
||||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) |
|
||||||
{ |
|
||||||
return (bool)value ? Visibility.Visible : Visibility.Collapsed; |
|
||||||
} |
|
||||||
|
|
||||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) |
|
||||||
{ |
|
||||||
throw new NotImplementedException(); |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
@ -0,0 +1,75 @@ |
|||||||
|
// Copyright (c) 2019 AlphaSierraPapa for the SharpDevelop Team
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
||||||
|
// software and associated documentation files (the "Software"), to deal in the Software
|
||||||
|
// without restriction, including without limitation the rights to use, copy, modify, merge,
|
||||||
|
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
|
||||||
|
// to whom the Software is furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in all copies or
|
||||||
|
// substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
||||||
|
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||||
|
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
|
||||||
|
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||||
|
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
using System.ComponentModel.Composition; |
||||||
|
using System.Windows.Input; |
||||||
|
using System.Windows.Media; |
||||||
|
|
||||||
|
using ICSharpCode.ILSpy.Util; |
||||||
|
using ICSharpCode.ILSpy.ViewModels; |
||||||
|
using ICSharpCode.ILSpyX.Search; |
||||||
|
|
||||||
|
namespace ICSharpCode.ILSpy.Search |
||||||
|
{ |
||||||
|
public class SearchModeModel |
||||||
|
{ |
||||||
|
public SearchMode Mode { get; init; } |
||||||
|
public string Name { get; init; } |
||||||
|
public ImageSource Image { get; init; } |
||||||
|
} |
||||||
|
|
||||||
|
[ExportToolPane] |
||||||
|
[PartCreationPolicy(CreationPolicy.Shared)] |
||||||
|
[Export] |
||||||
|
public class SearchPaneModel : ToolPaneModel |
||||||
|
{ |
||||||
|
private string searchTerm; |
||||||
|
public const string PaneContentId = "searchPane"; |
||||||
|
|
||||||
|
public SearchPaneModel() |
||||||
|
{ |
||||||
|
ContentId = PaneContentId; |
||||||
|
Title = Properties.Resources.SearchPane_Search; |
||||||
|
Icon = "Images/Search"; |
||||||
|
ShortcutKey = new(Key.F, ModifierKeys.Control | ModifierKeys.Shift); |
||||||
|
IsCloseable = true; |
||||||
|
} |
||||||
|
|
||||||
|
public SearchModeModel[] SearchModes { get; } = [ |
||||||
|
new() { Mode = SearchMode.TypeAndMember, Image = Images.Library, Name = "Types and Members" }, |
||||||
|
new() { Mode = SearchMode.Type, Image = Images.Class, Name = "Type" }, |
||||||
|
new() { Mode = SearchMode.Member, Image = Images.Property, Name = "Member" }, |
||||||
|
new() { Mode = SearchMode.Method, Image = Images.Method, Name = "Method" }, |
||||||
|
new() { Mode = SearchMode.Field, Image = Images.Field, Name = "Field" }, |
||||||
|
new() { Mode = SearchMode.Property, Image = Images.Property, Name = "Property" }, |
||||||
|
new() { Mode = SearchMode.Event, Image = Images.Event, Name = "Event" }, |
||||||
|
new() { Mode = SearchMode.Literal, Image = Images.Literal, Name = "Constant" }, |
||||||
|
new() { Mode = SearchMode.Token, Image = Images.Library, Name = "Metadata Token" }, |
||||||
|
new() { Mode = SearchMode.Resource, Image = Images.Resource, Name = "Resource" }, |
||||||
|
new() { Mode = SearchMode.Assembly, Image = Images.Assembly, Name = "Assembly" }, |
||||||
|
new() { Mode = SearchMode.Namespace, Image = Images.Namespace, Name = "Namespace" } |
||||||
|
]; |
||||||
|
|
||||||
|
public SessionSettings SessionSettings => SettingsService.Instance.SessionSettings; |
||||||
|
|
||||||
|
public string SearchTerm { |
||||||
|
get => searchTerm; |
||||||
|
set => SetProperty(ref searchTerm, value); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -1,20 +1,34 @@ |
|||||||
using ICSharpCode.ILSpyX.Settings; |
using ICSharpCode.Decompiler; |
||||||
|
using ICSharpCode.ILSpy.Options; |
||||||
|
using ICSharpCode.ILSpyX; |
||||||
|
using ICSharpCode.ILSpyX.Settings; |
||||||
|
|
||||||
namespace ICSharpCode.ILSpy.Util |
namespace ICSharpCode.ILSpy.Util |
||||||
{ |
{ |
||||||
internal class SettingsService |
public class SettingsService |
||||||
{ |
{ |
||||||
public static readonly SettingsService Instance = new SettingsService(); |
public static readonly SettingsService Instance = new(); |
||||||
|
|
||||||
private SettingsService() |
private SettingsService() |
||||||
{ |
{ |
||||||
this.SpySettings = ILSpySettings.Load(); |
SpySettings = ILSpySettings.Load(); |
||||||
|
SessionSettings = new(SpySettings); |
||||||
SessionSettings = new(this.SpySettings); |
DecompilerSettings = DecompilerSettingsPanel.LoadDecompilerSettings(SpySettings); |
||||||
|
DisplaySettings = DisplaySettingsPanel.LoadDisplaySettings(SpySettings, SessionSettings); |
||||||
|
AssemblyListManager = new(SpySettings) { |
||||||
|
ApplyWinRTProjections = DecompilerSettings.ApplyWindowsRuntimeProjections, |
||||||
|
UseDebugSymbols = DecompilerSettings.UseDebugSymbols |
||||||
|
}; |
||||||
} |
} |
||||||
|
|
||||||
public ILSpySettings SpySettings { get; } |
public ILSpySettings SpySettings { get; } |
||||||
|
|
||||||
public SessionSettings SessionSettings { get; } |
public SessionSettings SessionSettings { get; } |
||||||
|
|
||||||
|
public DecompilerSettings DecompilerSettings { get; set; } |
||||||
|
|
||||||
|
public DisplaySettings DisplaySettings { get; } |
||||||
|
|
||||||
|
public AssemblyListManager AssemblyListManager { get; } |
||||||
} |
} |
||||||
} |
} |
||||||
|
|||||||
@ -1,46 +0,0 @@ |
|||||||
// Copyright (c) 2019 AlphaSierraPapa for the SharpDevelop Team
|
|
||||||
//
|
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of this
|
|
||||||
// software and associated documentation files (the "Software"), to deal in the Software
|
|
||||||
// without restriction, including without limitation the rights to use, copy, modify, merge,
|
|
||||||
// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
|
|
||||||
// to whom the Software is furnished to do so, subject to the following conditions:
|
|
||||||
//
|
|
||||||
// The above copyright notice and this permission notice shall be included in all copies or
|
|
||||||
// substantial portions of the Software.
|
|
||||||
//
|
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
|
||||||
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
|
||||||
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
|
|
||||||
// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
||||||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
// DEALINGS IN THE SOFTWARE.
|
|
||||||
|
|
||||||
using System.ComponentModel.Composition; |
|
||||||
using System.Windows; |
|
||||||
using System.Windows.Input; |
|
||||||
|
|
||||||
namespace ICSharpCode.ILSpy.ViewModels |
|
||||||
{ |
|
||||||
[ExportToolPane] |
|
||||||
[PartCreationPolicy(CreationPolicy.Shared)] |
|
||||||
public class SearchPaneModel : ToolPaneModel |
|
||||||
{ |
|
||||||
public const string PaneContentId = "searchPane"; |
|
||||||
|
|
||||||
public SearchPaneModel() |
|
||||||
{ |
|
||||||
ContentId = PaneContentId; |
|
||||||
Title = Properties.Resources.SearchPane_Search; |
|
||||||
Icon = "Images/Search"; |
|
||||||
ShortcutKey = new KeyGesture(Key.F, ModifierKeys.Control | ModifierKeys.Shift); |
|
||||||
IsCloseable = true; |
|
||||||
} |
|
||||||
|
|
||||||
public override void Show() |
|
||||||
{ |
|
||||||
base.Show(); |
|
||||||
MainWindow.Instance.SearchPane.Show(); |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
Loading…
Reference in new issue