diff --git a/Mutagen.Bethesda.Synthesis/Settings Attributes/SynthesisObjectNameMember.cs b/Mutagen.Bethesda.Synthesis/Settings Attributes/SynthesisObjectNameMember.cs new file mode 100644 index 00000000..01129b98 --- /dev/null +++ b/Mutagen.Bethesda.Synthesis/Settings Attributes/SynthesisObjectNameMember.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Mutagen.Bethesda.Synthesis.Settings +{ + /// + /// Specifies a member to be displayed when the object is part of any summary areas, + /// such as when scoping a child setting and this object is being displayed in the drill down summary + /// + [AttributeUsage( + AttributeTargets.Class, + AllowMultiple = true)] + public class SynthesisObjectNameMember : Attribute + { + public string Name { get; } + + public SynthesisObjectNameMember(string name) + { + Name = name; + } + } +} diff --git a/Mutagen.Bethesda.Synthesis/SolutionInitialization.cs b/Mutagen.Bethesda.Synthesis/SolutionInitialization.cs index 5950bafa..03043b12 100644 --- a/Mutagen.Bethesda.Synthesis/SolutionInitialization.cs +++ b/Mutagen.Bethesda.Synthesis/SolutionInitialization.cs @@ -47,26 +47,16 @@ public static string[] CreateProject(string projPath, GameCategory category, boo // Generate Project File FileGeneration fg = new FileGeneration(); fg.AppendLine(""); - using (new DepthWrapper(fg)) - { - fg.AppendLine($""); - using (new DepthWrapper(fg)) - { - fg.AppendLine($"Exe"); - fg.AppendLine($"netcoreapp3.1"); - } - fg.AppendLine($""); - fg.AppendLine(); - - fg.AppendLine($""); - using (new DepthWrapper(fg)) - { - fg.AppendLine($""); - fg.AppendLine($""); - } - fg.AppendLine($""); - fg.AppendLine(); - } + fg.AppendLine($" "); + fg.AppendLine($" Exe"); + fg.AppendLine($" net5.0"); + fg.AppendLine($" Windows"); + fg.AppendLine($" "); + fg.AppendLine(); + fg.AppendLine($" "); + fg.AppendLine($" "); + fg.AppendLine($" "); + fg.AppendLine($" "); fg.AppendLine(""); fg.Generate(projPath); @@ -79,7 +69,7 @@ public static string[] CreateProject(string projPath, GameCategory category, boo fg.AppendLine("using Mutagen.Bethesda.Synthesis;"); fg.AppendLine($"using Mutagen.Bethesda.{category};"); fg.AppendLine("using System.Threading.Tasks;"); - fg.AppendLine(); + fg.AppendLine(); fg.AppendLine($"namespace {projName}"); using (new BraceWrapper(fg)) { @@ -178,5 +168,359 @@ public static void AddProjectToSolution(string solutionpath, string projPath) $"Project(\"{{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}\") = \"{projName}\", \"{projName}\\{projName}.csproj\", \"{{8BA2E1B7-DD65-42B6-A780-17E4037A3C1B}}\"".AsEnumerable() .And($"EndProject")); } + + public static void GenerateGitIgnore(string folder) + { + File.WriteAllText(Path.Combine(folder, ".gitignore"), +@"## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/"); + } } } diff --git a/Mutagen.Bethesda.Synthesis/SynthesisPipeline.cs b/Mutagen.Bethesda.Synthesis/SynthesisPipeline.cs index ef29b9d1..c1235a95 100644 --- a/Mutagen.Bethesda.Synthesis/SynthesisPipeline.cs +++ b/Mutagen.Bethesda.Synthesis/SynthesisPipeline.cs @@ -152,7 +152,7 @@ public SynthesisPipeline SetOpenForSettings(AsyncOpenForSettingsFunction action) return this; } - public SynthesisPipeline SetAutogeneratedSettings(string nickname, string path, out Lazy setting, bool throwIfSettingsMissing = true) + public SynthesisPipeline SetAutogeneratedSettings(string nickname, string path, out Lazy setting, bool throwIfSettingsMissing = false) where TSetting : class, new() { if (_openForSettings != null) diff --git a/Synthesis.Bethesda.Execution/CLI/Commands.cs b/Synthesis.Bethesda.Execution/CLI/Commands.cs index 0993b325..40c58064 100644 --- a/Synthesis.Bethesda.Execution/CLI/Commands.cs +++ b/Synthesis.Bethesda.Execution/CLI/Commands.cs @@ -113,8 +113,10 @@ public static async Task GetSettingsStyle( string path, bool directExe, CancellationToken cancel, - bool build) + bool build, + Action log) { + log($"Checking {path} for settings. Direct exe? {directExe}. Build? {build}"); using var proc = ProcessWrapper.Create( GetStart(path, directExe, new Synthesis.Bethesda.SettingsQuery(), build: build), cancel: cancel, diff --git a/Synthesis.Bethesda.Execution/DotNetCommands.cs b/Synthesis.Bethesda.Execution/DotNetCommands.cs index 321d8b56..b17b354a 100644 --- a/Synthesis.Bethesda.Execution/DotNetCommands.cs +++ b/Synthesis.Bethesda.Execution/DotNetCommands.cs @@ -12,8 +12,12 @@ namespace Synthesis.Bethesda.Execution { + public record DotNetVersion(string Version, bool Acceptable); + public static class DotNetCommands { + public const int MinVersion = 5; + public static string GetBuildString(string args) { return $"build --runtime win-x64 {args}"; @@ -118,7 +122,7 @@ public static bool TryParseLibraryLine( return (mutagenVersion, synthesisVersion); } - public static async Task DotNetSdkVersion(CancellationToken cancel) + public static async Task DotNetSdkVersion(CancellationToken cancel) { using var proc = ProcessWrapper.Create( new System.Diagnostics.ProcessStartInfo("dotnet", "--version"), @@ -136,11 +140,23 @@ public static async Task DotNetSdkVersion(CancellationToken cancel) { throw new ArgumentException($"Unexpected messages:\n{string.Join("\n", outs)}"); } - if (!Version.TryParse(outs[0], out var v)) + return GetDotNetVersion(outs[0]); + } + + public static DotNetVersion GetDotNetVersion(ReadOnlySpan str) + { + var orig = str; + var indexOf = str.IndexOf('-'); + if (indexOf != -1) + { + str = str.Slice(0, indexOf); + } + if (Version.TryParse(str, out var vers) + && vers.Major >= MinVersion) { - throw new ArgumentException($"Could not parse dotnet SDK version: {outs[0]}"); + return new DotNetVersion(orig.ToString(), true); } - return v; + return new DotNetVersion(orig.ToString(), false); } public static async Task> GetExecutablePath(string projectPath, CancellationToken cancel, Action? log) diff --git a/Synthesis.Bethesda.Execution/IsExternalInit.cs b/Synthesis.Bethesda.Execution/IsExternalInit.cs new file mode 100644 index 00000000..4811b18c --- /dev/null +++ b/Synthesis.Bethesda.Execution/IsExternalInit.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +#if NET_5 +#else +namespace System.Runtime.CompilerServices +{ + public sealed class IsExternalInit + { + } +} +#endif diff --git a/Synthesis.Bethesda.Execution/Settings/GithubPatcherSettings.cs b/Synthesis.Bethesda.Execution/Settings/GithubPatcherSettings.cs index da1c842e..3a02ee12 100644 --- a/Synthesis.Bethesda.Execution/Settings/GithubPatcherSettings.cs +++ b/Synthesis.Bethesda.Execution/Settings/GithubPatcherSettings.cs @@ -4,6 +4,13 @@ namespace Synthesis.Bethesda.Execution.Settings { + public record GithubPatcherLastRunState( + string TargetRepo, + string ProjectSubpath, + string Commit, + string MutagenVersion, + string SynthesisVersion); + public class GithubPatcherSettings : PatcherSettings { public string ID = string.Empty; @@ -21,6 +28,7 @@ public class GithubPatcherSettings : PatcherSettings public string ManualMutagenVersion = string.Empty; public PatcherNugetVersioningEnum SynthesisVersionType = PatcherNugetVersioningEnum.Profile; public string ManualSynthesisVersion = string.Empty; + public GithubPatcherLastRunState? LastSuccessfulRun; public override void Print(IRunReporter logger) { diff --git a/Synthesis.Bethesda.GUI/Resources.xaml b/Synthesis.Bethesda.GUI/Resources.xaml index 2816b2c4..fc3a02e4 100644 --- a/Synthesis.Bethesda.GUI/Resources.xaml +++ b/Synthesis.Bethesda.GUI/Resources.xaml @@ -148,6 +148,18 @@ + + - - - - + + HorizontalAlignment="Left"> diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableObjectSettingsNodeView.xaml.cs b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableObjectSettingsNodeView.xaml.cs index 003d32cf..bfacfd83 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableObjectSettingsNodeView.xaml.cs +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableObjectSettingsNodeView.xaml.cs @@ -25,8 +25,11 @@ public EnumerableObjectSettingsNodeView() InitializeComponent(); this.WhenActivated(disposable => { + this.WhenAnyValue(x => x.ViewModel!.FocusSettingCommand) + .BindToStrict(this, x => x.SettingNameButton.Command) + .DisposeWith(disposable); this.WhenAnyValue(x => x.ViewModel!.Meta.DisplayName) - .BindToStrict(this, x => x.SettingsNameBlock.Text) + .BindToStrict(this, x => x.SettingNameBlock.Text) .DisposeWith(disposable); this.WhenAnyValue(x => x.ViewModel!.Values.Count) .BindToStrict(this, x => x.SettingsListBox.AlternationCount) @@ -42,6 +45,8 @@ public EnumerableObjectSettingsNodeView() .DisposeWith(disposable); this.WhenAnyValue(x => x.ViewModel!.DeleteCommand.CanExecute) .Switch() + .CombineLatest(this.WhenAnyValue(x => x.ViewModel!.IsFocused), + (canExecute, focused) => canExecute && focused) .Select(x => x ? Visibility.Visible : Visibility.Collapsed) .BindToStrict(this, x => x.DeleteButton.Visibility) .DisposeWith(disposable); @@ -68,6 +73,22 @@ public EnumerableObjectSettingsNodeView() Noggog.WPF.Drag.ListBoxDragDrop(this.SettingsListBox, () => this.ViewModel?.Values) .DisposeWith(disposable); + this.WhenAnyValue(x => x.ViewModel!.IsFocused) + .Select((sel) => sel ? Visibility.Visible : Visibility.Collapsed) + .BindToStrict(this, x => x.SettingsListBox.Visibility) + .DisposeWith(disposable); + this.WhenAnyValue(x => x.ViewModel!.IsFocused) + .Select((sel) => sel ? Visibility.Visible : Visibility.Collapsed) + .BindToStrict(this, x => x.AddButton.Visibility) + .DisposeWith(disposable); + this.WhenAnyValue(x => x.ViewModel!.Values.Count) + .Select(x => + { + if (x == 0) return "No Items"; + return $"{x} Items"; + }) + .BindToStrict(this, x => x.NumItemsBlock.Text) + .DisposeWith(disposable); }); } } diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableSimpleSettingsNodeView.xaml b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableSimpleSettingsNodeView.xaml index 452adcb7..cc8b1869 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableSimpleSettingsNodeView.xaml +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/EnumerableSimpleSettingsNodeView.xaml @@ -20,12 +20,13 @@ - + Style="{StaticResource ReflectionSettingButton}"> + + - + SelectionMode="Extended"> - - - { + this.WhenAnyValue(x => x.ViewModel!.FocusSettingCommand) + .BindToStrict(this, x => x.SettingNameButton.Command) + .DisposeWith(disposable); this.WhenAnyValue(x => x.ViewModel!.Meta.DisplayName) - .BindToStrict(this, x => x.SettingsNameBlock.Text) + .BindToStrict(this, x => x.SettingNameBlock.Text) .DisposeWith(disposable); this.WhenAnyValue(x => x.ViewModel!.Values.Count) .BindToStrict(this, x => x.SettingsListBox.AlternationCount) diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml index 50710acc..c8fa7f4e 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml @@ -14,11 +14,25 @@ - - + HorizontalAlignment="Left" + Style="{StaticResource ReflectionSettingButton}"> + + + + + + + + + diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml.cs b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml.cs index 530ab2f7..7595d9dd 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml.cs +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/ObjectSettingsNodeView.xaml.cs @@ -4,6 +4,7 @@ using System.Reactive.Disposables; using System.Reactive.Linq; using System.Windows; +using System; namespace Synthesis.Bethesda.GUI.Views { @@ -26,6 +27,31 @@ public ObjectSettingsNodeView() .Select(x => x.IsNullOrWhitespace() ? Visibility.Collapsed : Visibility.Visible) .BindToStrict(this, x => x.SettingNameBlock.Visibility) .DisposeWith(disposable); + this.WhenAnyValue(x => x.ViewModel!.Nodes) + .BindToStrict(this, x => x.Nodes.ItemsSource) + .DisposeWith(disposable); + this.WhenAnyValue(x => x.ViewModel!.FocusSettingCommand) + .BindToStrict(this, x => x.SettingNameButton.Command) + .DisposeWith(disposable); + this.WhenAnyValue(x => x.ViewModel!.Meta.MainVM.ScrolledToSettings) + .WithLatestFrom(this.WhenAnyValue(x => x.ViewModel!.Meta.MainVM.SelectedSettings), + (Scrolled, Selected) => (Scrolled, Selected)) + .Where(x => x.Selected == this.ViewModel) + .Delay(TimeSpan.FromMilliseconds(300), RxApp.MainThreadScheduler) + .Subscribe(setting => + { + if (this.ViewModel == null || this.Nodes.Items == null || this.Nodes.Items.Count == 0) return; + var target = setting.Scrolled; + while (target != null) + { + if (this.ViewModel.Nodes.Contains(target)) + { + this.Nodes.ScrollIntoView(target); + } + target = target.Meta.Parent; + } + }) + .DisposeWith(disposable); }); } } diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/StaticEnumDictionaryView.xaml b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/StaticEnumDictionaryView.xaml index a877dee3..5fdf6439 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/StaticEnumDictionaryView.xaml +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/FieldViews/StaticEnumDictionaryView.xaml @@ -12,17 +12,17 @@ - + - - + Style="{StaticResource ReflectionSettingButton}"> + + + + + + + + + + + + + + + + + + + diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingDepthView.xaml.cs b/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingDepthView.xaml.cs new file mode 100644 index 00000000..63b03bc7 --- /dev/null +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingDepthView.xaml.cs @@ -0,0 +1,26 @@ +using Noggog.WPF; +using ReactiveUI; +using System.Reactive.Disposables; +using System.Reactive.Linq; + +namespace Synthesis.Bethesda.GUI.Views +{ + public class SettingDepthViewBase : NoggogUserControl { } + + /// + /// Interaction logic for SettingDepthView.xaml + /// + public partial class SettingDepthView : SettingDepthViewBase + { + public SettingDepthView() + { + InitializeComponent(); + this.WhenActivated((disposable) => + { + this.WhenAnyValue(x => x.ViewModel!.Parents.Value) + .BindToStrict(this, x => x.ParentSettingList.ItemsSource) + .DisposeWith(disposable); + }); + } + } +} diff --git a/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingsNodeView.xaml b/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingsNodeView.xaml index 19fbe7ea..3243b896 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingsNodeView.xaml +++ b/Synthesis.Bethesda.GUI/Views/Config/Settings/SettingsNodeView.xaml @@ -150,7 +150,6 @@ Text="{Binding Meta.DisplayName}" /> @@ -191,35 +190,12 @@ VerticalAlignment="Center" FormKey="{Binding Value}" LinkCache="{Binding LinkCache}" - ScopedTypes="{Binding ScopedTypes, Mode=OneWay}" - SearchBoxHeight="200" /> + ScopedTypes="{Binding ScopedTypes, Mode=OneWay}" /> - - - - - - - - - - + diff --git a/Synthesis.Bethesda.GUI/Views/Config/Solution/SolutionConfigView.xaml b/Synthesis.Bethesda.GUI/Views/Config/Solution/SolutionConfigView.xaml index 627de371..d340a96c 100644 --- a/Synthesis.Bethesda.GUI/Views/Config/Solution/SolutionConfigView.xaml +++ b/Synthesis.Bethesda.GUI/Views/Config/Solution/SolutionConfigView.xaml @@ -122,7 +122,7 @@