Skip to content

Commit

Permalink
Add inspectors and remove debug file
Browse files Browse the repository at this point in the history
  • Loading branch information
ianmartinez committed Aug 9, 2021
1 parent 2c5bcb3 commit bdd57d3
Show file tree
Hide file tree
Showing 38 changed files with 118 additions and 134 deletions.
2 changes: 1 addition & 1 deletion src-net5/LangPad/LangPad.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.818.41" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.902.49" />
</ItemGroup>

<ItemGroup>
Expand Down
30 changes: 15 additions & 15 deletions src-net5/LangPad/bin/Wpf/net5.0-windows/LangPad.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Eto.Forms": "2.5.11",
"Eto.Platform.Wpf": "2.5.11",
"LangPadData": "1.0.0",
"Microsoft.Web.WebView2": "1.0.818.41"
"Microsoft.Web.WebView2": "1.0.902.49"
},
"runtime": {
"LangPad.dll": {}
Expand Down Expand Up @@ -97,36 +97,36 @@
}
}
},
"Microsoft.Web.WebView2/1.0.818.41": {
"Microsoft.Web.WebView2/1.0.902.49": {
"runtime": {
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll": {
"assemblyVersion": "1.0.818.41",
"fileVersion": "1.0.818.41"
"assemblyVersion": "1.0.902.49",
"fileVersion": "1.0.902.49"
},
"lib/netcoreapp3.0/Microsoft.Web.WebView2.WinForms.dll": {
"assemblyVersion": "1.0.818.41",
"fileVersion": "1.0.818.41"
"assemblyVersion": "1.0.902.49",
"fileVersion": "1.0.902.49"
},
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Wpf.dll": {
"assemblyVersion": "1.0.818.41",
"fileVersion": "1.0.818.41"
"assemblyVersion": "1.0.902.49",
"fileVersion": "1.0.902.49"
}
},
"runtimeTargets": {
"runtimes/win-arm64/native/WebView2Loader.dll": {
"rid": "win-arm64",
"assetType": "native",
"fileVersion": "1.0.818.41"
"fileVersion": "1.0.902.49"
},
"runtimes/win-x64/native/WebView2Loader.dll": {
"rid": "win-x64",
"assetType": "native",
"fileVersion": "1.0.818.41"
"fileVersion": "1.0.902.49"
},
"runtimes/win-x86/native/WebView2Loader.dll": {
"rid": "win-x86",
"assetType": "native",
"fileVersion": "1.0.818.41"
"fileVersion": "1.0.902.49"
}
}
},
Expand Down Expand Up @@ -184,12 +184,12 @@
"path": "extended.wpf.toolkit/3.6.0",
"hashPath": "extended.wpf.toolkit.3.6.0.nupkg.sha512"
},
"Microsoft.Web.WebView2/1.0.818.41": {
"Microsoft.Web.WebView2/1.0.902.49": {
"type": "package",
"serviceable": true,
"sha512": "sha512-fOEZCzNHDtWuNGgOWaA7lD0UkiFXJGhWXEBwqsw9sMrx4QXl8SqNX7qVNYdJrbGvpf3B67CGO3WuUI2z3Yai5w==",
"path": "microsoft.web.webview2/1.0.818.41",
"hashPath": "microsoft.web.webview2.1.0.818.41.nupkg.sha512"
"sha512": "sha512-54GMzepT0Z52wqdNuycUn1DYg/pH2z0UaQKcqT21L5A/rZIL9laabM6GhPxW/QeD9pk3AmbE65NVlXsJRDJ+8w==",
"path": "microsoft.web.webview2/1.0.902.49",
"hashPath": "microsoft.web.webview2.1.0.902.49.nupkg.sha512"
},
"System.ComponentModel.Annotations/4.7.0": {
"type": "package",
Expand Down
Binary file modified src-net5/LangPad/bin/Wpf/net5.0-windows/LangPad.dll
Binary file not shown.
Binary file modified src-net5/LangPad/bin/Wpf/net5.0-windows/LangPad.exe
Binary file not shown.
Binary file modified src-net5/LangPad/bin/Wpf/net5.0-windows/LangPadData.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 12 additions & 12 deletions src-net5/LangPad/obj/LangPad.csproj.nuget.dgspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.203\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json"
}
}
},
Expand Down Expand Up @@ -120,7 +120,7 @@
},
"Microsoft.Web.WebView2": {
"target": "Package",
"version": "[1.0.818.41, )"
"version": "[1.0.902.49, )"
}
},
"imports": [
Expand All @@ -136,47 +136,47 @@
"downloadDependencies": [
{
"name": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Host.linux-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Host.osx-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Runtime.win-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
}
],
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.203\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {
Expand Down
3 changes: 2 additions & 1 deletion src-net5/LangPad/obj/LangPad.csproj.nuget.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Ian Martinez\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.9.1</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.10.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Ian Martinez\.nuget\packages\" />
Expand All @@ -18,6 +18,7 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<PkgMicrosoft_Web_WebView2 Condition=" '$(PkgMicrosoft_Web_WebView2)' == '' ">C:\Users\Ian Martinez\.nuget\packages\microsoft.web.webview2\1.0.902.49</PkgMicrosoft_Web_WebView2>
<PkgExtended_Wpf_Toolkit Condition=" '$(PkgExtended_Wpf_Toolkit)' == '' ">C:\Users\Ian Martinez\.nuget\packages\extended.wpf.toolkit\3.6.0</PkgExtended_Wpf_Toolkit>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src-net5/LangPad/obj/LangPad.csproj.nuget.g.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.web.webview2\1.0.818.41\build\Microsoft.Web.WebView2.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.web.webview2\1.0.818.41\build\Microsoft.Web.WebView2.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.web.webview2\1.0.902.49\build\Microsoft.Web.WebView2.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.web.webview2\1.0.902.49\build\Microsoft.Web.WebView2.targets')" />
<Import Project="$(NuGetPackageRoot)eto.forms\2.5.11\build\Eto.Forms.targets" Condition="Exists('$(NuGetPackageRoot)eto.forms\2.5.11\build\Eto.Forms.targets')" />
</ImportGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\bin\Wpf\net5.0-w
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\bin\Wpf\net5.0-windows\ru\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\bin\Wpf\net5.0-windows\sv\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\bin\Wpf\net5.0-windows\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-windows\LangPad.csprojAssemblyReference.cache
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-windows\LangPad.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-windows\LangPad.AssemblyInfoInputs.cache
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-windows\LangPad.AssemblyInfo.cs
Expand All @@ -44,3 +43,4 @@ C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-w
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-windows\LangPad.csproj.GenerateResource.cache
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\bin\Wpf\net5.0-windows\LangPadData.dll
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\bin\Wpf\net5.0-windows\LangPadData.pdb
C:\Users\Ian Martinez\Documents\GitHub\LangPad\src-net5\LangPad\obj\Wpf\net5.0-windows\LangPad.csproj.AssemblyReference.cache
Binary file modified src-net5/LangPad/obj/Wpf/net5.0-windows/LangPad.dll
Binary file not shown.
Binary file modified src-net5/LangPad/obj/Wpf/net5.0-windows/apphost.exe
Binary file not shown.
44 changes: 23 additions & 21 deletions src-net5/LangPad/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
}
}
},
"Microsoft.Web.WebView2/1.0.818.41": {
"Microsoft.Web.WebView2/1.0.902.49": {
"type": "package",
"compile": {
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll": {},
Expand Down Expand Up @@ -236,7 +236,7 @@
}
}
},
"Microsoft.Web.WebView2/1.0.818.41": {
"Microsoft.Web.WebView2/1.0.902.49": {
"type": "package",
"compile": {
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll": {},
Expand Down Expand Up @@ -375,7 +375,7 @@
}
}
},
"Microsoft.Web.WebView2/1.0.818.41": {
"Microsoft.Web.WebView2/1.0.902.49": {
"type": "package",
"compile": {
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll": {},
Expand Down Expand Up @@ -514,7 +514,7 @@
}
}
},
"Microsoft.Web.WebView2/1.0.818.41": {
"Microsoft.Web.WebView2/1.0.902.49": {
"type": "package",
"compile": {
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Core.dll": {},
Expand Down Expand Up @@ -639,10 +639,11 @@
"tools/install.ps1"
]
},
"Microsoft.Web.WebView2/1.0.818.41": {
"sha512": "fOEZCzNHDtWuNGgOWaA7lD0UkiFXJGhWXEBwqsw9sMrx4QXl8SqNX7qVNYdJrbGvpf3B67CGO3WuUI2z3Yai5w==",
"Microsoft.Web.WebView2/1.0.902.49": {
"sha512": "54GMzepT0Z52wqdNuycUn1DYg/pH2z0UaQKcqT21L5A/rZIL9laabM6GhPxW/QeD9pk3AmbE65NVlXsJRDJ+8w==",
"type": "package",
"path": "microsoft.web.webview2/1.0.818.41",
"path": "microsoft.web.webview2/1.0.902.49",
"hasTools": true,
"files": [
".nupkg.metadata",
".signature.p7s",
Expand Down Expand Up @@ -675,11 +676,12 @@
"lib/netcoreapp3.0/Microsoft.Web.WebView2.WinForms.xml",
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Wpf.dll",
"lib/netcoreapp3.0/Microsoft.Web.WebView2.Wpf.xml",
"microsoft.web.webview2.1.0.818.41.nupkg.sha512",
"microsoft.web.webview2.1.0.902.49.nupkg.sha512",
"microsoft.web.webview2.nuspec",
"runtimes/win-arm64/native/WebView2Loader.dll",
"runtimes/win-x64/native/WebView2Loader.dll",
"runtimes/win-x86/native/WebView2Loader.dll"
"runtimes/win-x86/native/WebView2Loader.dll",
"tools/VisualStudioToolsManifest.xml"
]
},
"System.ComponentModel.Annotations/4.7.0": {
Expand Down Expand Up @@ -808,7 +810,7 @@
"Eto.Forms >= 2.5.11",
"Eto.Platform.Wpf >= 2.5.11",
"LangPadData >= 1.0.0",
"Microsoft.Web.WebView2 >= 1.0.818.41"
"Microsoft.Web.WebView2 >= 1.0.902.49"
]
},
"packageFolders": {
Expand Down Expand Up @@ -872,7 +874,7 @@
},
"Microsoft.Web.WebView2": {
"target": "Package",
"version": "[1.0.818.41, )"
"version": "[1.0.902.49, )"
}
},
"imports": [
Expand All @@ -888,47 +890,47 @@
"downloadDependencies": [
{
"name": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Host.linux-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Host.osx-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Runtime.osx-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.NETCore.App.Runtime.win-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
},
{
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
"version": "[5.0.6, 5.0.6]"
"version": "[5.0.8, 5.0.8]"
}
],
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.203\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.302\\RuntimeIdentifierGraph.json"
}
},
"runtimes": {
Expand Down
14 changes: 14 additions & 0 deletions src-net5/LangPadData/Inspectors/IInspectable.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace LangPadData.Inspectors
{
public interface IInspectable<ValueEnumType>
{
// To be fired when something has changed on the object being inspected
public event EventHandler<InspectorValueChangedEventArgs<ValueEnumType>> ValueChanged;
}
}
20 changes: 20 additions & 0 deletions src-net5/LangPadData/Inspectors/InspectorValueChangedEventArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace LangPadData.Inspectors
{
/// <summary>
/// The EventArgs for a value change on a inspector.
/// </summary>
///
/// <typeparam name="ValueEnumType">The type of the value being changed.</typeparam>
public class InspectorValueChangedEventArgs<ValueEnumType> : EventArgs
{
public object OldValue { get; set; }
public object NewValue { get; set; }
public ValueEnumType TargetValue { get; set; }
}
}
Loading

0 comments on commit bdd57d3

Please sign in to comment.