nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Default the update button to be hiden

Browse source
This commit is contained in:
Lars Brubaker 2018-06-11 15:23:39 -07:00
parent 2acc789508
commit 34b5d070cb
20 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
DesignTools/Attributes/HideUpdateButtonAttribute.cs → DesignTools/Attributes/ShowUpdateButtonAttribute.cs
View file

@ -32,9 +32,9 @@ using System;
namespace MatterHackers.MatterControl.DesignTools
{
[AttributeUsage(AttributeTargets.Class)]
public class HideUpdateButtonAttribute : Attribute
public class ShowUpdateButtonAttribute : Attribute
{
public HideUpdateButtonAttribute()
public ShowUpdateButtonAttribute()
{
}
}

1
DesignTools/Operations/Align3D.cs
View file

@ -177,7 +177,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
}
}
[HideUpdateButtonAttribute]
public class Align3D : Object3D, IPublicPropertyObject, IPropertyGridModifier
{
// We need to serialize this so we can remove the arrange and get back to the objects before arranging

1
DesignTools/Operations/FitToBounds3D.cs
View file

@ -45,7 +45,6 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
public enum MaintainRatio { None, X_Y, X_Y_Z }
[HideUpdateButtonAttribute]
public class FitToBounds3D : Object3D, IPublicPropertyObject, IEditorDraw, IPropertyGridModifier
{
[Description("Set the shape the part will be fit into.")]

1
DesignTools/Primitives/ConeObject3D.cs
View file

@ -39,7 +39,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class ConeObject3D : Object3D, IPublicPropertyObject
{
public ConeObject3D()

1
DesignTools/Primitives/CubeObject3D.cs
View file

@ -35,7 +35,6 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class CubeObject3D : Object3D, IPublicPropertyObject
{
public CubeObject3D()

1
DesignTools/Primitives/CylinderObject3D.cs
View file

@ -39,7 +39,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class CylinderObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier
{
public CylinderObject3D()

1
DesignTools/Primitives/HalfCylinderObject3D.cs
View file

@ -38,7 +38,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class HalfCylinderObject3D : Object3D, IPublicPropertyObject
{
public HalfCylinderObject3D()

1
DesignTools/Primitives/HalfSphereObject3D.cs
View file

@ -38,7 +38,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class HalfSphereObject3D : Object3D, IPublicPropertyObject
{
public HalfSphereObject3D()

1
DesignTools/Primitives/HalfWedgeObject3D.cs
View file

@ -38,7 +38,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class HalfWedgeObject3D : Object3D, IPublicPropertyObject
{
public HalfWedgeObject3D()

1
DesignTools/Primitives/PyramidObject3D.cs
View file

@ -37,7 +37,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class PyramidObject3D : Object3D, IPublicPropertyObject
{
public PyramidObject3D()

1
DesignTools/Primitives/RingObject3D.cs
View file

@ -40,7 +40,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class RingObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier
{
public RingObject3D()

1
DesignTools/Primitives/SphereObject3D.cs
View file

@ -38,7 +38,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class SphereObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier
{
public SphereObject3D()

1
DesignTools/Primitives/TorusObject3D.cs
View file

@ -36,7 +36,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class TorusObject3D : Object3D, IPublicPropertyObject, IPropertyGridModifier
{
public TorusObject3D()

1
DesignTools/Primitives/WedgeObject3D.cs
View file

@ -39,7 +39,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.DesignTools
{
[HideUpdateButtonAttribute]
public class WedgeObject3D : Object3D, IPublicPropertyObject
{
public WedgeObject3D()

4
DesignTools/PublicPropertyEditor.cs
View file

@ -146,8 +146,8 @@ namespace MatterHackers.MatterControl.DesignTools
}
// add in an Update button if applicable
var hideUpdate = context.item.GetType().GetCustomAttributes(typeof(HideUpdateButtonAttribute), true).FirstOrDefault() as HideUpdateButtonAttribute;
if (hideUpdate == null)
var showUpdate = context.item.GetType().GetCustomAttributes(typeof(ShowUpdateButtonAttribute), true).FirstOrDefault() as ShowUpdateButtonAttribute;
if (showUpdate != null)
{
var updateButton = theme.ButtonFactory.Generate("Update".Localize());
updateButton.Margin = new BorderDouble(5);

2
MatterControl.csproj
View file

@ -88,6 +88,7 @@
<Compile Include="CustomWidgets\TreeView\TreeNode.cs" />
<Compile Include="CustomWidgets\TreeView\TreeView.cs" />
<Compile Include="DesignTools\Attributes\ShowSearchFieldAttribute.cs" />
<Compile Include="DesignTools\Attributes\ShowUpdateButtonAttribute.cs" />
<Compile Include="DesignTools\Interfaces\IPublicPropertyObject.cs" />
<Compile Include="DesignTools\EditableTypes\DirectionAxis.cs" />
<Compile Include="DesignTools\EditableTypes\DirectionVector.cs" />
@ -141,7 +142,6 @@
<Compile Include="ApplicationView\OemProfileDictionary.cs" />
<Compile Include="ApplicationView\WindowsPlatformsFeatures.cs" />
<Compile Include="DataStorage\ApplicationDataStorage.cs" />
<Compile Include="DesignTools\Attributes\HideUpdateButtonAttribute.cs" />
<Compile Include="DesignTools\Attributes\IconsAttribute.cs" />
<Compile Include="DesignTools\Attributes\WebPageLinkAttribute.cs" />
<Compile Include="DesignTools\Interfaces\IEditorDraw.cs" />

1
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -42,7 +42,6 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
[HideUpdateButtonAttribute]
public class SelectedObjectPanel : FlowLayoutWidget, IContentStore
{
private IObject3D item = new Object3D();

1
PartPreviewWindow/View3D/Actions/SubtractAndReplaceObject3D.cs
View file

@ -42,6 +42,7 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
[ShowUpdateButtonAttribute]
public class SubtractAndReplaceObject3D : MeshWrapperObject3D, IPublicPropertyObject
{
public SubtractAndReplaceObject3D()

1
PartPreviewWindow/View3D/Actions/SubtractObject3D.cs
View file

@ -42,6 +42,7 @@ using System.Threading.Tasks;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
[ShowUpdateButtonAttribute]
public class SubtractObject3D : MeshWrapperObject3D, IPublicPropertyObject
{
public SubtractObject3D()

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit ff2b0c012a0f2e3cec4c27e8c7a4e1bbe004e36f
Subproject commit 4a69f0ae9b14876c8c4226d8d0d94a3d1283edbf