From b66d0058b7b974ad06e2c87c57c021f646e2c806 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Thu, 1 May 2014 17:52:45 -0700 Subject: [PATCH 1/3] Fixed a bug with remove. --- ActionBar/PrintStatusRow.cs | 4 ++-- StaticData/Translations/Master.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index e681a7724..4018646fa 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -80,11 +80,11 @@ namespace MatterHackers.MatterControl.ActionBar this.HAnchor = HAnchor.ParentLeftRight; + this.queueDataView = queueDataView; + AddChildElements(); AddHandlers(); - this.queueDataView = queueDataView; - onActivePrintItemChanged(null, null); if (privateAddIconToPrintStatusRow != null) diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index d845d2df0..24c5b6356 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2112,3 +2112,6 @@ Translated:Install Driver English:Apply Translated:Apply +English:Buy Materials +Translated:Buy Materials + From 0e0dfbb2f53e330d06d29fa88bca59e15c29a7c3 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Fri, 2 May 2014 12:07:27 -0700 Subject: [PATCH 2/3] don't show the add button if there is no part showing. --- PartPreviewWindow/View3DTransfromPart.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs index 27fd3d4ab..76a8e2402 100644 --- a/PartPreviewWindow/View3DTransfromPart.cs +++ b/PartPreviewWindow/View3DTransfromPart.cs @@ -235,7 +235,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow base.OnMouseUp(mouseEvent); } - public View3DTransformPart(PrintItemWrapper printItemWrapper, Vector3 viewerVolume, MeshViewerWidget.BedShape bedShape, bool addCloseButton) + public View3DTransformPart(PrintItemWrapper printItemWrapper, Vector3 viewerVolume, MeshViewerWidget.BedShape bedShape, bool standAloneWindow) { MeshExtraData = new List(); MeshExtraData.Add(new PlatingMeshData()); @@ -282,6 +282,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow editToolBar.VAnchor |= Agg.UI.VAnchor.ParentCenter; processingProgressControl.Visible = false; + // If the window is embeded (in the center pannel) and there is no item loaded then don't show the add button enterEditButtonsContainer = new FlowLayoutWidget(); { Button addButton = textImageButtonFactory.Generate(LocalizedString.Get("Add"), "icon_circle_plus.png"); @@ -387,7 +388,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow leftRightSpacer.HAnchor = HAnchor.ParentLeftRight; buttonBottomPanel.AddChild(leftRightSpacer); - if (addCloseButton) + if (standAloneWindow) { Button closeButton = textImageButtonFactory.Generate(LocalizedString.Get("Close")); buttonBottomPanel.AddChild(closeButton); @@ -418,6 +419,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } UiThread.RunOnIdle(AutoSpin); + + if (printItemWrapper == null && !standAloneWindow) + { + enterEditButtonsContainer.Visible = false; + } } bool hasDrawn = false; From 8048df02ec0ce885c55efc6c8a7038ec0e10cdce Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Fri, 2 May 2014 12:41:41 -0700 Subject: [PATCH 3/3] more translation --- StaticData/Translations/Master.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 24c5b6356..c3f038906 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2115,3 +2115,6 @@ Translated:Apply English:Buy Materials Translated:Buy Materials +English:Select an STL file +Translated:Select an STL file +