Browse Source

Move view models and other xplat class for SharpTreeView to ILSpyX, Windows-dependent classes to ILSpy/Controls/TreeView

pull/3240/head
Christoph Wille 11 months ago
parent
commit
a95abfcc58
  1. 4
      ICSharpCode.ILSpyX/TreeView/FlatListTreeNode.cs
  2. 2
      ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDataObject.cs
  3. 2
      ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragDrop.cs
  4. 2
      ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragEventArgs.cs
  5. 2
      ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs
  6. 2
      ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs
  7. 2
      ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/XPlatDragDropEffects.cs
  8. 6
      ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs
  9. 4
      ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs
  10. 4
      ICSharpCode.ILSpyX/TreeView/TreeFlattener.cs
  11. 2
      ICSharpCode.ILSpyX/TreeView/TreeTraversal.cs
  12. 1
      ILSpy.Wpf.slnf
  13. 8
      ILSpy.sln
  14. 4
      ILSpy/Analyzers/AnalyzerEntityTreeNode.cs
  15. 4
      ILSpy/Analyzers/AnalyzerTreeNode.cs
  16. 3
      ILSpy/Analyzers/AnalyzerTreeView.cs
  17. 2
      ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
  18. 2
      ILSpy/App.xaml.cs
  19. 2
      ILSpy/Commands/SaveCodeContextMenuEntry.cs
  20. 2
      ILSpy/Commands/SortAssemblyListCommand.cs
  21. 3
      ILSpy/ContextMenuEntry.cs
  22. 2
      ILSpy/Controls/TreeView/Converters.cs
  23. 4
      ILSpy/Controls/TreeView/EditTextBox.cs
  24. 2
      ILSpy/Controls/TreeView/ExtensionMethods.cs
  25. 2
      ILSpy/Controls/TreeView/GeneralAdorner.cs
  26. 2
      ILSpy/Controls/TreeView/InsertMarker.cs
  27. 2
      ILSpy/Controls/TreeView/LinesRenderer.cs
  28. 2
      ILSpy/Controls/TreeView/SharpGridView.cs
  29. 5
      ILSpy/Controls/TreeView/SharpTreeNodeView.cs
  30. 4
      ILSpy/Controls/TreeView/SharpTreeView.cs
  31. 2
      ILSpy/Controls/TreeView/SharpTreeView.xaml
  32. 2
      ILSpy/Controls/TreeView/SharpTreeViewAutomationPeer.cs
  33. 4
      ILSpy/Controls/TreeView/SharpTreeViewItem.cs
  34. 4
      ILSpy/Controls/TreeView/SharpTreeViewItemAutomationPeer.cs
  35. 4
      ILSpy/Controls/TreeView/SharpTreeViewTextSearch.cs
  36. 4
      ILSpy/Controls/TreeView/WpfWindowsDataObject.cs
  37. 4
      ILSpy/Controls/TreeView/WpfWindowsDragDropManager.cs
  38. 4
      ILSpy/Controls/TreeView/WpfWindowsDragEventArgs.cs
  39. 4
      ILSpy/Controls/TreeView/WpfWindowsRoutedEventArgs.cs
  40. 1
      ILSpy/ILSpy.csproj
  41. 2
      ILSpy/Images/WpfWindowsTreeNodeImagesProvider.cs
  42. 7
      ILSpy/MainWindow.xaml
  43. 3
      ILSpy/MainWindow.xaml.cs
  44. 2
      ILSpy/NavigationState.cs
  45. 3
      ILSpy/Themes/generic.xaml
  46. 6
      ILSpy/TreeNodes/AssemblyListTreeNode.cs
  47. 2
      ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
  48. 6
      ILSpy/TreeNodes/AssemblyTreeNode.cs
  49. 4
      ILSpy/TreeNodes/BaseTypesEntryNode.cs
  50. 2
      ILSpy/TreeNodes/BaseTypesTreeNode.cs
  51. 2
      ILSpy/TreeNodes/DerivedTypesEntryNode.cs
  52. 8
      ILSpy/TreeNodes/ILSpyTreeNode.cs
  53. 2
      ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
  54. 2
      ILSpy/TreeNodes/PackageFolderTreeNode.cs
  55. 2
      ILSpy/TreeNodes/ThreadingSupport.cs
  56. 28
      SharpTreeView/ICSharpCode.TreeView.csproj
  57. 54
      SharpTreeView/Properties/AssemblyInfo.cs
  58. 51
      SharpTreeView/Properties/GlobalAssemblyInfo.cs

4
SharpTreeView/FlatListTreeNode.cs → ICSharpCode.ILSpyX/TreeView/FlatListTreeNode.cs

@ -20,7 +20,9 @@ using System; @@ -20,7 +20,9 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace ICSharpCode.TreeView
#nullable disable
namespace ICSharpCode.ILSpyX.TreeView
{
// This part of SharpTreeNode controls the 'flat list' data structure, which emulates
// a big flat list containing the whole tree; allowing access by visible index.

2
SharpTreeView/PlatformAbstractions/IPlatformDataObject.cs → ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDataObject.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
namespace ICSharpCode.TreeView.PlatformAbstractions
namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
{
public interface IPlatformDataObject
{

2
SharpTreeView/PlatformAbstractions/IPlatformDragDrop.cs → ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragDrop.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
namespace ICSharpCode.TreeView.PlatformAbstractions
namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
{
public interface IPlatformDragDrop
{

2
SharpTreeView/PlatformAbstractions/IPlatformDragEventArgs.cs → ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformDragEventArgs.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
namespace ICSharpCode.TreeView.PlatformAbstractions
namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
{
public interface IPlatformDragEventArgs
{

2
SharpTreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs → ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/IPlatformRoutedEventArgs.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
namespace ICSharpCode.TreeView.PlatformAbstractions
namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
{
public interface IPlatformRoutedEventArgs
{

2
SharpTreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs → ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/ITreeNodeImagesProvider.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
namespace ICSharpCode.TreeView.PlatformAbstractions
namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
{
public interface ITreeNodeImagesProvider
{

2
SharpTreeView/PlatformAbstractions/XPlatDragDropEffects.cs → ICSharpCode.ILSpyX/TreeView/PlatformAbstractions/XPlatDragDropEffects.cs

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
using System;
namespace ICSharpCode.TreeView.PlatformAbstractions
namespace ICSharpCode.ILSpyX.TreeView.PlatformAbstractions
{
//
// Summary:

6
SharpTreeView/SharpTreeNode.cs → ICSharpCode.ILSpyX/TreeView/SharpTreeNode.cs

@ -23,9 +23,11 @@ using System.ComponentModel; @@ -23,9 +23,11 @@ using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using ICSharpCode.TreeView.PlatformAbstractions;
#nullable disable
namespace ICSharpCode.TreeView
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpyX.TreeView
{
public partial class SharpTreeNode : INotifyPropertyChanged
{

4
SharpTreeView/SharpTreeNodeCollection.cs → ICSharpCode.ILSpyX/TreeView/SharpTreeNodeCollection.cs

@ -22,7 +22,9 @@ using System.Collections.Specialized; @@ -22,7 +22,9 @@ using System.Collections.Specialized;
using System.Diagnostics;
using System.Linq;
namespace ICSharpCode.TreeView
#nullable disable
namespace ICSharpCode.ILSpyX.TreeView
{
/// <summary>
/// Collection that validates that inserted nodes do not have another parent.

4
SharpTreeView/TreeFlattener.cs → ICSharpCode.ILSpyX/TreeView/TreeFlattener.cs

@ -22,7 +22,9 @@ using System.Collections.Generic; @@ -22,7 +22,9 @@ using System.Collections.Generic;
using System.Collections.Specialized;
using System.Diagnostics;
namespace ICSharpCode.TreeView
#nullable disable
namespace ICSharpCode.ILSpyX.TreeView
{
sealed class TreeFlattener : IList, INotifyCollectionChanged
{

2
SharpTreeView/TreeTraversal.cs → ICSharpCode.ILSpyX/TreeView/TreeTraversal.cs

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
using System;
using System.Collections.Generic;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpyX.TreeView
{
/// <summary>
/// Static helper methods for traversing trees.

1
ILSpy.Wpf.slnf

@ -12,7 +12,6 @@ @@ -12,7 +12,6 @@
"ILSpy.ReadyToRun\\ILSpy.ReadyToRun.csproj",
"ILSpy.Tests\\ILSpy.Tests.csproj",
"ILSpy\\ILSpy.csproj",
"SharpTreeView\\ICSharpCode.TreeView.csproj",
"TestPlugin\\TestPlugin.csproj"
]
}

8
ILSpy.sln

@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E7 @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F45DB999-7E7
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILSpy", "ILSpy\ILSpy.csproj", "{1E85EFF9-E370-4683-83E4-8A3D063FF791}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.TreeView", "SharpTreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler", "ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Tests", "ICSharpCode.Decompiler.Tests\ICSharpCode.Decompiler.Tests.csproj", "{FEC0DA52-C4A6-4710-BE36-B484A20C5E22}"
@ -36,7 +34,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Test @@ -36,7 +34,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.Decompiler.Test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.ILSpyX", "ICSharpCode.ILSpyX\ICSharpCode.ILSpyX.csproj", "{F8EFCF9D-B9A3-4BA0-A1B2-B026A71DAC22}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.BamlDecompiler", "ICSharpCode.BamlDecompiler\ICSharpCode.BamlDecompiler.csproj", "{81A30182-3378-4952-8880-F44822390040}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ICSharpCode.BamlDecompiler", "ICSharpCode.BamlDecompiler\ICSharpCode.BamlDecompiler.csproj", "{81A30182-3378-4952-8880-F44822390040}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -48,10 +46,6 @@ Global @@ -48,10 +46,6 @@ Global
{1E85EFF9-E370-4683-83E4-8A3D063FF791}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E85EFF9-E370-4683-83E4-8A3D063FF791}.Release|Any CPU.Build.0 = Release|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}.Release|Any CPU.Build.0 = Release|Any CPU
{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{984CC812-9470-4A13-AFF9-CC44068D666C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{984CC812-9470-4A13-AFF9-CC44068D666C}.Release|Any CPU.ActiveCfg = Release|Any CPU

4
ILSpy/Analyzers/AnalyzerEntityTreeNode.cs

@ -22,8 +22,8 @@ using System.Windows; @@ -22,8 +22,8 @@ using System.Windows;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Analyzers
{

4
ILSpy/Analyzers/AnalyzerTreeNode.cs

@ -21,7 +21,7 @@ using System.Collections.Specialized; @@ -21,7 +21,7 @@ using System.Collections.Specialized;
using System.Linq;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Analyzers
{
@ -56,7 +56,7 @@ namespace ICSharpCode.ILSpy.Analyzers @@ -56,7 +56,7 @@ namespace ICSharpCode.ILSpy.Analyzers
DeleteCore();
}
protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
internal protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
{
if (e.NewItems != null)
{

3
ILSpy/Analyzers/AnalyzerTreeView.cs

@ -27,7 +27,8 @@ using ICSharpCode.ILSpy.Analyzers.TreeNodes; @@ -27,7 +27,8 @@ using ICSharpCode.ILSpy.Analyzers.TreeNodes;
using ICSharpCode.ILSpy.Docking;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpy.Controls.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Analyzers
{

2
ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs

@ -22,7 +22,7 @@ using System.Windows; @@ -22,7 +22,7 @@ using System.Windows;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpyX.Analyzers;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.Analyzers.TreeNodes
{

2
ILSpy/App.xaml.cs

@ -34,13 +34,13 @@ using ICSharpCode.ILSpy.AppEnv; @@ -34,13 +34,13 @@ using ICSharpCode.ILSpy.AppEnv;
using ICSharpCode.ILSpy.Options;
using ICSharpCode.ILSpyX.Analyzers;
using ICSharpCode.ILSpyX.Settings;
using ICSharpCode.TreeView;
using Medo.Application;
using Microsoft.VisualStudio.Composition;
using TomsToolbox.Wpf.Styles;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy
{

2
ILSpy/Commands/SaveCodeContextMenuEntry.cs

@ -27,9 +27,9 @@ using ICSharpCode.ILSpy.Options; @@ -27,9 +27,9 @@ using ICSharpCode.ILSpy.Options;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.TreeView;
using Microsoft.Win32;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TextView
{

2
ILSpy/Commands/SortAssemblyListCommand.cs

@ -21,7 +21,7 @@ using System.Collections.Generic; @@ -21,7 +21,7 @@ using System.Collections.Generic;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy
{

3
ILSpy/ContextMenuEntry.cs

@ -28,7 +28,8 @@ using System.Windows.Media; @@ -28,7 +28,8 @@ using System.Windows.Media;
using ICSharpCode.AvalonEdit;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpyX.Search;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpy.Controls.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy
{

2
SharpTreeView/Converters.cs → ILSpy/Controls/TreeView/Converters.cs

@ -22,7 +22,7 @@ using System.Windows; @@ -22,7 +22,7 @@ using System.Windows;
using System.Windows.Data;
using System.Windows.Markup;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class CollapsedWhenFalse : MarkupExtension, IValueConverter
{

4
SharpTreeView/EditTextBox.cs → ILSpy/Controls/TreeView/EditTextBox.cs

@ -20,7 +20,9 @@ using System.Windows; @@ -20,7 +20,9 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
namespace ICSharpCode.TreeView
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
class EditTextBox : TextBox
{

2
SharpTreeView/ExtensionMethods.cs → ILSpy/Controls/TreeView/ExtensionMethods.cs

@ -22,7 +22,7 @@ using System.Linq; @@ -22,7 +22,7 @@ using System.Linq;
using System.Windows;
using System.Windows.Media;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
static class ExtensionMethods
{

2
SharpTreeView/GeneralAdorner.cs → ILSpy/Controls/TreeView/GeneralAdorner.cs

@ -20,7 +20,7 @@ using System.Windows; @@ -20,7 +20,7 @@ using System.Windows;
using System.Windows.Documents;
using System.Windows.Media;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class GeneralAdorner : Adorner
{

2
SharpTreeView/InsertMarker.cs → ILSpy/Controls/TreeView/InsertMarker.cs

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
using System.Windows;
using System.Windows.Controls;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class InsertMarker : Control
{

2
SharpTreeView/LinesRenderer.cs → ILSpy/Controls/TreeView/LinesRenderer.cs

@ -20,7 +20,7 @@ using System.Diagnostics; @@ -20,7 +20,7 @@ using System.Diagnostics;
using System.Windows;
using System.Windows.Media;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
class LinesRenderer : FrameworkElement
{

2
SharpTreeView/SharpGridView.cs → ILSpy/Controls/TreeView/SharpGridView.cs

@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
using System.Windows;
using System.Windows.Controls;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class SharpGridView : GridView
{

5
SharpTreeView/SharpTreeNodeView.cs → ILSpy/Controls/TreeView/SharpTreeNodeView.cs

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Windows;
@ -24,7 +23,9 @@ using System.Windows.Controls; @@ -24,7 +23,9 @@ using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Media;
namespace ICSharpCode.TreeView
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class SharpTreeNodeView : Control
{

4
SharpTreeView/SharpTreeView.cs → ILSpy/Controls/TreeView/SharpTreeView.cs

@ -28,9 +28,9 @@ using System.Windows.Documents; @@ -28,9 +28,9 @@ using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Threading;
using ICSharpCode.TreeView.PlatformAbstractions.WpfWindows;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class SharpTreeView : ListView
{

2
SharpTreeView/Themes/Generic.xaml → ILSpy/Controls/TreeView/SharpTreeView.xaml

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Default="clr-namespace:ICSharpCode.TreeView"
xmlns:Default="clr-namespace:ICSharpCode.ILSpy.Controls.TreeView"
xmlns:styles="urn:TomsToolbox.Wpf.Styles">
<Style x:Key="ExpandCollapseToggleStyle"

2
SharpTreeView/SharpTreeViewAutomationPeer.cs → ILSpy/Controls/TreeView/SharpTreeViewAutomationPeer.cs

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
using System.Windows.Automation.Peers;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
class SharpTreeViewAutomationPeer : FrameworkElementAutomationPeer
{

4
SharpTreeView/SharpTreeViewItem.cs → ILSpy/Controls/TreeView/SharpTreeViewItem.cs

@ -22,9 +22,9 @@ using System.Windows; @@ -22,9 +22,9 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using ICSharpCode.TreeView.PlatformAbstractions.WpfWindows;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.TreeView
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class SharpTreeViewItem : ListViewItem
{

4
SharpTreeView/SharpTreeViewItemAutomationPeer.cs → ILSpy/Controls/TreeView/SharpTreeViewItemAutomationPeer.cs

@ -22,7 +22,9 @@ using System.Windows.Automation; @@ -22,7 +22,9 @@ using System.Windows.Automation;
using System.Windows.Automation.Peers;
using System.Windows.Automation.Provider;
namespace ICSharpCode.TreeView
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
class SharpTreeViewItemAutomationPeer : FrameworkElementAutomationPeer, IExpandCollapseProvider
{

4
SharpTreeView/SharpTreeViewTextSearch.cs → ILSpy/Controls/TreeView/SharpTreeViewTextSearch.cs

@ -22,7 +22,9 @@ using System.Runtime.InteropServices; @@ -22,7 +22,9 @@ using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Threading;
namespace ICSharpCode.TreeView
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
/// <summary>
/// Custom TextSearch-implementation.

4
SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDataObject.cs → ILSpy/Controls/TreeView/WpfWindowsDataObject.cs

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
using System.Windows;
namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class WpfWindowsDataObject : IPlatformDataObject
{

4
SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragDropManager.cs → ILSpy/Controls/TreeView/WpfWindowsDragDropManager.cs

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
using System.Windows;
namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class WpfWindowsDragDropManager : IPlatformDragDrop
{

4
SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsDragEventArgs.cs → ILSpy/Controls/TreeView/WpfWindowsDragEventArgs.cs

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
using System.Windows;
namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class WpfWindowsDragEventArgs : IPlatformDragEventArgs
{

4
SharpTreeView/PlatformAbstractions/WpfWindows/WpfWindowsRoutedEventArgs.cs → ILSpy/Controls/TreeView/WpfWindowsRoutedEventArgs.cs

@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
using System.Windows;
namespace ICSharpCode.TreeView.PlatformAbstractions.WpfWindows
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.Controls.TreeView
{
public class WpfWindowsRoutedEventArgs : IPlatformRoutedEventArgs
{

1
ILSpy/ILSpy.csproj

@ -86,7 +86,6 @@ @@ -86,7 +86,6 @@
<ItemGroup>
<ProjectReference Include="..\ICSharpCode.ILSpyX\ICSharpCode.ILSpyX.csproj" />
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
<ProjectReference Include="..\SharpTreeView\ICSharpCode.TreeView.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Debug'">

2
ILSpy/Images/WpfWindowsTreeNodeImagesProvider.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy
{

7
ILSpy/MainWindow.xaml

@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
<Window
x:Class="ICSharpCode.ILSpy.MainWindow"
x:ClassModifier="public"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:tv="clr-namespace:ICSharpCode.TreeView;assembly=ICSharpCode.TreeView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:tv="clr-namespace:ICSharpCode.ILSpy.Controls.TreeView"
xmlns:local="clr-namespace:ICSharpCode.ILSpy"
xmlns:search="clr-namespace:ICSharpCode.ILSpy.Search"
xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
@ -144,7 +146,8 @@ @@ -144,7 +146,8 @@
<Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
<Setter Property="Command" Value="{x:Static local:ILSpyCommands.SetTheme}" />
<Setter Property="CommandParameter" Value="{Binding}" />
<Setter Property="IsCheckable" Value="True" /> <!-- Required by AvalonDock's MenuItem style to show the checkmark -->
<Setter Property="IsCheckable" Value="True" />
<!-- Required by AvalonDock's MenuItem style to show the checkmark -->
<Setter Property="IsChecked">
<Setter.Value>
<MultiBinding Converter="{x:Static toms:BinaryOperationConverter.Equality}" Mode="OneWay">

3
ILSpy/MainWindow.xaml.cs

@ -57,9 +57,10 @@ using ICSharpCode.ILSpy.ViewModels; @@ -57,9 +57,10 @@ using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.FileLoaders;
using ICSharpCode.ILSpyX.Settings;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpy.Controls.TreeView;
using Microsoft.Win32;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy
{

2
ILSpy/NavigationState.cs

@ -22,7 +22,7 @@ using System.Diagnostics; @@ -22,7 +22,7 @@ using System.Diagnostics;
using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy
{

3
ILSpy/Themes/generic.xaml

@ -5,8 +5,9 @@ @@ -5,8 +5,9 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="../Controls/SearchBoxStyle.xaml" />
<ResourceDictionary Source="../Controls/ZoomScrollViewer.xaml" />
<ResourceDictionary Source="../Controls/TreeView/SharpTreeView.xaml" />
</ResourceDictionary.MergedDictionaries>
<!-- SortableGridViewColumn.
Displays an up arrow or down arrow in the column header when the grid is sorted using that column.
-->

6
ILSpy/TreeNodes/AssemblyListTreeNode.cs

@ -26,8 +26,8 @@ using ICSharpCode.Decompiler.Metadata; @@ -26,8 +26,8 @@ using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.Decompiler.Util;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TreeNodes
{
@ -187,7 +187,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -187,7 +187,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
if (bundle == null)
return null;
bundle.EnsureLazyChildren();
foreach (var node in TreeTraversal.PreOrder(bundle.Children, ExpandAndGetChildren).OfType<AssemblyTreeNode>())
foreach (var node in ILSpyX.TreeView.TreeTraversal.PreOrder(bundle.Children, ExpandAndGetChildren).OfType<AssemblyTreeNode>())
{
if (node.LoadedAssembly == asm)
return node;

2
ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs

@ -22,7 +22,7 @@ using System.Windows.Threading; @@ -22,7 +22,7 @@ using System.Windows.Threading;
using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using TomsToolbox.Wpf.Controls;

6
ILSpy/TreeNodes/AssemblyTreeNode.cs

@ -35,13 +35,13 @@ using ICSharpCode.ILSpy.ViewModels; @@ -35,13 +35,13 @@ using ICSharpCode.ILSpy.ViewModels;
using ICSharpCode.ILSpyX;
using ICSharpCode.ILSpyX.FileLoaders;
using ICSharpCode.ILSpyX.PdbProvider;
using ICSharpCode.TreeView;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.TreeView.PlatformAbstractions.WpfWindows;
using ICSharpCode.ILSpy.Controls.TreeView;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using Microsoft.Win32;
using TypeDefinitionHandle = System.Reflection.Metadata.TypeDefinitionHandle;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TreeNodes
{

4
ILSpy/TreeNodes/BaseTypesEntryNode.cs

@ -20,8 +20,8 @@ using System.Linq; @@ -20,8 +20,8 @@ using System.Linq;
using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.TreeView;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.TreeNodes
{

2
ILSpy/TreeNodes/BaseTypesTreeNode.cs

@ -25,7 +25,7 @@ using ICSharpCode.Decompiler; @@ -25,7 +25,7 @@ using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TreeNodes
{

2
ILSpy/TreeNodes/DerivedTypesEntryNode.cs

@ -26,7 +26,7 @@ using ICSharpCode.ILSpyX; @@ -26,7 +26,7 @@ using ICSharpCode.ILSpyX;
namespace ICSharpCode.ILSpy.TreeNodes
{
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
class DerivedTypesEntryNode : ILSpyTreeNode, IMemberTreeNode
{

8
ILSpy/TreeNodes/ILSpyTreeNode.cs

@ -23,15 +23,13 @@ using System.ComponentModel; @@ -23,15 +23,13 @@ using System.ComponentModel;
using System.Linq;
using System.Reflection.Metadata;
using System.Reflection.Metadata.Ecma335;
using System.Windows;
using System.Windows.Threading;
using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.TypeSystem;
using ICSharpCode.ILSpy.Options;
using ICSharpCode.ILSpyX.Abstractions;
using ICSharpCode.TreeView;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TreeNodes
{
@ -94,7 +92,7 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -94,7 +92,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
return false;
}
protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
internal protected override void OnChildrenChanged(NotifyCollectionChangedEventArgs e)
{
if (e.NewItems != null)
{

2
ILSpy/TreeNodes/ModuleReferenceTreeNode.cs

@ -21,7 +21,7 @@ using System.Reflection.Metadata; @@ -21,7 +21,7 @@ using System.Reflection.Metadata;
using ICSharpCode.Decompiler;
using ICSharpCode.Decompiler.Metadata;
using ICSharpCode.TreeView.PlatformAbstractions;
using ICSharpCode.ILSpyX.TreeView.PlatformAbstractions;
namespace ICSharpCode.ILSpy.TreeNodes
{

2
ILSpy/TreeNodes/PackageFolderTreeNode.cs

@ -22,7 +22,7 @@ using System.Linq; @@ -22,7 +22,7 @@ using System.Linq;
using ICSharpCode.Decompiler;
using ICSharpCode.ILSpyX;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TreeNodes
{

2
ILSpy/TreeNodes/ThreadingSupport.cs

@ -28,7 +28,7 @@ using System.Windows.Threading; @@ -28,7 +28,7 @@ using System.Windows.Threading;
using ICSharpCode.Decompiler;
using ICSharpCode.ILSpy.Properties;
using ICSharpCode.TreeView;
using ICSharpCode.ILSpyX.TreeView;
namespace ICSharpCode.ILSpy.TreeNodes
{

28
SharpTreeView/ICSharpCode.TreeView.csproj

@ -1,28 +0,0 @@ @@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UseWpf>true</UseWpf>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<SignAssembly>True</SignAssembly>
<TargetFramework>net8.0-windows</TargetFramework>
<AssemblyOriginatorKeyFile>..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk</AssemblyOriginatorKeyFile>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TomsToolbox.Wpf.Styles" />
</ItemGroup>
</Project>

54
SharpTreeView/Properties/AssemblyInfo.cs

@ -1,54 +0,0 @@ @@ -1,54 +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.Reflection;
using System.Windows;
using System.Windows.Markup;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ICSharpCode.TreeView")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
[assembly: XmlnsPrefix("http://icsharpcode.net/sharpdevelop/treeview", "treeview")]
[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/treeview", "ICSharpCode.TreeView")]

51
SharpTreeView/Properties/GlobalAssemblyInfo.cs

@ -1,51 +0,0 @@ @@ -1,51 +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.
/////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////
// //
// DO NOT EDIT GlobalAssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever //
// ICSharpCode.Core is compiled. //
// //
/////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////
using System.Reflection;
using System.Resources;
[assembly: System.Runtime.InteropServices.ComVisible(false)]
[assembly: AssemblyCompany("ic#code")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("2000-2012 AlphaSierraPapa for the SharpDevelop Team")]
[assembly: AssemblyVersion(RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision)]
[assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-ca8a8e28")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly",
Justification = "AssemblyInformationalVersion does not need to be a parsable version")]
internal static class RevisionClass
{
public const string Major = "4";
public const string Minor = "2";
public const string Build = "0";
public const string Revision = "8752";
public const string VersionName = "Beta 2";
public const string FullVersion = Major + "." + Minor + "." + Build + ".8752-Beta 2";
}
Loading…
Cancel
Save