From fdba5519da2d9de08d2bd397ad63fa98d968c4ce Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 17 Aug 2017 17:18:33 -0700 Subject: [PATCH] Make sure we can ungroup meshes Better colors on align pop up --- PartPreviewWindow/View3D/View3DWidget.cs | 7 +++---- StaticData/Translations/Master.txt | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 22f47e609..581f8054e 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -256,8 +256,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; this.Scene.SelectionChanged += (s, e) => { - ungroupButton.Enabled = this.Scene.HasSelection - && this.Scene.SelectedItem.ItemType == Object3DTypes.Group; + ungroupButton.Enabled = this.Scene.HasSelection; }; selectionActionBar.AddChild(ungroupButton); @@ -1580,7 +1579,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; buttonPanel.AddChild(alignButtons); - alignButtons.AddChild(new TextWidget(axisNames[axisIndex], textColor: ActiveTheme.Instance.PrimaryTextColor) + alignButtons.AddChild(new TextWidget(axisNames[axisIndex]) { VAnchor = VAnchor.Center, Margin = new BorderDouble(0, 0, 3, 0) @@ -1600,7 +1599,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow internal enum AxisAlignment { Min, Center, Max }; private GuiWidget CreateAlignButton(int axisIndex, AxisAlignment alignment, string lable) { - var smallMarginButtonFactory = ApplicationController.Instance.Theme.SmallMarginButtonFactory; + var smallMarginButtonFactory = ApplicationController.Instance.Theme.MenuButtonFactory; var alignButton = smallMarginButtonFactory.Generate(lable); alignButton.Margin = new BorderDouble(3, 0); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 87582912d..e8591466a 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4408,3 +4408,21 @@ Translated:Lay Flat English:Part Translated:Part +English:File export options: +Translated:File export options: + +English:To Folder +Translated:To Folder + +English:ZIP File +Translated:ZIP File + +English:G-Code File +Translated:G-Code File + +English:STL File +Translated:STL File + +English:AMF File +Translated:AMF File +