Skip to content

Commit

Permalink
Prepared for release
Browse files Browse the repository at this point in the history 
Fixed some warnings.
  • Loading branch information
@vchelaru
vchelaru committed Oct 21, 2024
1 parent ed1dc19 commit 4bcec63
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 33 deletions.
58 changes: 29 additions & 29 deletions CodeOutputPlugin/Views/CodeWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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("/");
Expand Down Expand Up @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
}
};
Expand All @@ -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);
Expand All @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions Gum/Plugins/InternalPlugins/TreeView/ElementTreeViewManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
{
Expand Down
2 changes: 0 additions & 2 deletions Gum/Plugins/PluginManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions Gum/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("2024.10.21")]
[assembly: AssemblyFileVersion("2024.10.21")]

0 comments on commit 4bcec63

Please sign in to comment.