diff --git a/CodeOutputPlugin/Views/CodeWindow.xaml.cs b/CodeOutputPlugin/Views/CodeWindow.xaml.cs index 8a305e59..ef28f4c6 100644 --- a/CodeOutputPlugin/Views/CodeWindow.xaml.cs +++ b/CodeOutputPlugin/Views/CodeWindow.xaml.cs @@ -110,11 +110,11 @@ private InstanceMember CreateProjectTypeSelectionMember() { var member = new InstanceMember("Output Library", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.OutputLibrary = (OutputLibrary)value; + CodeOutputProjectSettings.OutputLibrary = (OutputLibrary)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -139,11 +139,11 @@ private InstanceMember CreateProjectUsingStatementsMember() { var member = new InstanceMember("Project-wide Using Statements", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.CommonUsingStatements = (string)value; + CodeOutputProjectSettings.CommonUsingStatements = (string)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -159,11 +159,11 @@ private InstanceMember CreateCodeProjectRootMember() { var member = new InstanceMember("Code Project Root", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - var valueToSet = (string)value; + var valueToSet = (string)args.Value; var needsAppendedSlash = !string.IsNullOrEmpty(valueToSet) && !valueToSet.EndsWith("\\") && !valueToSet.EndsWith("/"); @@ -206,11 +206,11 @@ private InstanceMember CreateRootNamespaceMember() { var member = new InstanceMember("Root Namespace", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if(CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.RootNamespace = (string)value; + CodeOutputProjectSettings.RootNamespace = (string)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -226,11 +226,11 @@ private InstanceMember CreateDefaultScreenBaseMember() var member = new InstanceMember("Default Screen Base", this); member.DetailText = "Base class for screens"; - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.DefaultScreenBase = (string)value; + CodeOutputProjectSettings.DefaultScreenBase = (string)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -244,11 +244,11 @@ private InstanceMember CreateDefaultScreenBaseMember() private InstanceMember CreateAdjustPixelValuesForDensityMember() { var member = new InstanceMember("Adjust Pixel Values for Density", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.AdjustPixelValuesForDensity = (bool)value; + CodeOutputProjectSettings.AdjustPixelValuesForDensity = (bool)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -263,11 +263,11 @@ private InstanceMember CreateAdjustPixelValuesForDensityMember() private InstanceMember CreateBaseTypesNotCodeGenerated() { var member = new InstanceMember("Base types ignored in code generation", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.BaseTypesNotCodeGenerated = (string)value; + CodeOutputProjectSettings.BaseTypesNotCodeGenerated = (string)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -283,11 +283,11 @@ private InstanceMember CreateBaseTypesNotCodeGenerated() private InstanceMember CreateGenerateGumDataTypesCode() { var member = new InstanceMember("Generate Gum DataTypes Code", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if(CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.GenerateGumDataTypes = (bool)value; + CodeOutputProjectSettings.GenerateGumDataTypes = (bool)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -302,11 +302,11 @@ private InstanceMember CreateGenerateGumDataTypesCode() private InstanceMember CreateGenerateObjectInstantiationTypeMember() { var member = new InstanceMember("Object Instantiation Type", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (CodeOutputProjectSettings != null) { - CodeOutputProjectSettings.ObjectInstantiationType = (ObjectInstantiationType)value; + CodeOutputProjectSettings.ObjectInstantiationType = (ObjectInstantiationType)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -325,11 +325,11 @@ private InstanceMember CreateAutoGenerateOnChangeMember() { var member = new InstanceMember("Generation Behavior", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { - if (codeOutputElementSettings != null && value != null) + if (codeOutputElementSettings != null && args.Value != null) { - codeOutputElementSettings.GenerationBehavior = (GenerationBehavior)value; + codeOutputElementSettings.GenerationBehavior = (GenerationBehavior)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -344,11 +344,11 @@ private InstanceMember CreateUsingStatementMember() { var member = new InstanceMember("Using Statements", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if(codeOutputElementSettings != null) { - codeOutputElementSettings.UsingStatements = (string)value; + codeOutputElementSettings.UsingStatements = (string)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -369,11 +369,11 @@ private InstanceMember CreateNamespaceMember() { var member = new InstanceMember("Namespace", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (codeOutputElementSettings != null) { - codeOutputElementSettings.Namespace = (string)value; + codeOutputElementSettings.Namespace = (string)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } }; @@ -392,11 +392,11 @@ private InstanceMember CreateFileLocationMember() { var member = new InstanceMember("Generated File Name", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (codeOutputElementSettings != null) { - var valueAsString = (string)value; + var valueAsString = (string)args.Value; if(!string.IsNullOrWhiteSpace(ProjectState.Self.ProjectDirectory) && FileManager.IsRelative(valueAsString) == false) { valueAsString = FileManager.MakeRelative(valueAsString, ProjectState.Self.ProjectDirectory, preserveCase:true); @@ -417,11 +417,11 @@ private InstanceMember CreateGenerateLocalizeMethod() { var member = new InstanceMember("Localize Element", this); - member.CustomSetEvent += (owner, value) => + member.CustomSetPropertyEvent += (owner, args) => { if (codeOutputElementSettings != null) { - codeOutputElementSettings.LocalizeElement = (bool)value; + codeOutputElementSettings.LocalizeElement = (bool)args.Value; CodeOutputSettingsPropertyChanged?.Invoke(this, null); } diff --git a/Gum/Plugins/InternalPlugins/TreeView/ElementTreeViewManager.cs b/Gum/Plugins/InternalPlugins/TreeView/ElementTreeViewManager.cs index b774c994..eb8fb067 100644 --- a/Gum/Plugins/InternalPlugins/TreeView/ElementTreeViewManager.cs +++ b/Gum/Plugins/InternalPlugins/TreeView/ElementTreeViewManager.cs @@ -1699,6 +1699,7 @@ private Control CreateSearchCheckBoxUi() deepSearchCheckBox = new CheckBox(); deepSearchCheckBox.Checked = false; + deepSearchCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; deepSearchCheckBox.Text = "Search instance properties"; deepSearchCheckBox.CheckedChanged += (object sender, EventArgs args) => { diff --git a/Gum/Plugins/PluginManager.cs b/Gum/Plugins/PluginManager.cs index ab082ea1..1d9805dd 100644 --- a/Gum/Plugins/PluginManager.cs +++ b/Gum/Plugins/PluginManager.cs @@ -46,7 +46,6 @@ public class PluginManager private const String ReferenceFileName = "References.txt"; private const String CompatibilityFileName = "Compatibility.txt"; - private bool mError = false; static PluginManager mGlobalInstance; static PluginManager mProjectInstance; @@ -231,7 +230,6 @@ private static void LoadPlugins(PluginManager instance, MainWindow mainWindow) { #region Get the Catalog - instance.mError = false; ResolveEventHandler reh = new ResolveEventHandler(instance.currentDomain_AssemblyResolve); diff --git a/Gum/Properties/AssemblyInfo.cs b/Gum/Properties/AssemblyInfo.cs index a70098e5..42c8a125 100644 --- a/Gum/Properties/AssemblyInfo.cs +++ b/Gum/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2024.8.20")] -[assembly: AssemblyFileVersion("2024.8.20")] \ No newline at end of file +[assembly: AssemblyVersion("2024.10.21")] +[assembly: AssemblyFileVersion("2024.10.21")] \ No newline at end of file