diff --git a/ApplicationView/ThemeConfig.cs b/ApplicationView/ThemeConfig.cs index 19263dbd4..5652aef28 100644 --- a/ApplicationView/ThemeConfig.cs +++ b/ApplicationView/ThemeConfig.cs @@ -91,6 +91,7 @@ namespace MatterHackers.MatterControl public TextImageButtonFactory imageConverterExpandMenuOptionFactory; public TextImageButtonFactory imageConverterButtonFactory; + public TextImageButtonFactory imageConverterUnlockButtonFactory; public Color TabBodyBackground => new Color(ActiveTheme.Instance.TertiaryBackgroundColor, 175); @@ -306,6 +307,22 @@ namespace MatterHackers.MatterControl BorderWidth = 1, }); + imageConverterUnlockButtonFactory = new TextImageButtonFactory(new ButtonFactoryOptions(commonOptions) + { + FixedWidth = 185, + FixedHeight = 30, + + NormalFillColor = ActiveTheme.Instance.PrimaryAccentColor.SetLightness(.8).ToColor(), + NormalTextColor = Color.Black, + NormalBorderColor = new Color(ActiveTheme.Instance.PrimaryAccentColor.SetLightness(.8).ToColor(), 200), + + HoverFillColor = ActiveTheme.Instance.PrimaryAccentColor.SetLightness(.9).ToColor(), + HoverTextColor = Color.Black, + HoverBorderColor = new Color(ActiveTheme.Instance.PrimaryAccentColor.SetLightness(.9).ToColor(), 200), + + BorderWidth = 1, + }); + imageConverterExpandMenuOptionFactory = new TextImageButtonFactory(new ButtonFactoryOptions(commonOptions) { FixedWidth = 200, diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 0c0534e1c..61d2f1d7b 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -268,18 +268,18 @@ namespace MatterHackers.MatterControl.PartPreviewWindow selectionActionBar.AddChild(this.CreateActionSeparator()); - var copyButton = smallMarginButtonFactory.Generate("Copy".Localize()); - copyButton.Name = "3D View Copy"; - copyButton.Margin = buttonSpacing; - copyButton.Click += (sender, e) => + var duplicateButton = smallMarginButtonFactory.Generate("Duplicate".Localize()); + duplicateButton.Name = "3D View Copy"; + duplicateButton.Margin = buttonSpacing; + duplicateButton.Click += (sender, e) => { this.Scene.DuplicateSelection(this); }; this.Scene.SelectionChanged += (s, e) => { - copyButton.Enabled = this.Scene.HasSelection; + duplicateButton.Enabled = this.Scene.HasSelection; }; - selectionActionBar.AddChild(copyButton); + selectionActionBar.AddChild(duplicateButton); var deleteButton = smallMarginButtonFactory.Generate("Remove".Localize()); deleteButton.Name = "3D View Remove"; diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 4a00055f6..37dcb2f6f 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 4a00055f6ed13dc4649d13c4cb499f3b7e09b202 +Subproject commit 37dcb2f6fed1868eb9e557d82ef7be1b893ff332