From e07d4c73dc7fdb4beafa2c7196dea5b722ef0fc4 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 19 Oct 2017 10:50:40 -0700 Subject: [PATCH] Remove SliceSettingsMissingWidget --- MatterControl.csproj | 1 - PartPreviewWindow/PrinterTabPage.cs | 23 +++---- .../SliceSettingsMissingWidget.cs | 62 ------------------- 3 files changed, 8 insertions(+), 78 deletions(-) delete mode 100644 SlicerConfiguration/SliceSettingsMissingWidget.cs diff --git a/MatterControl.csproj b/MatterControl.csproj index 6ab754fd1..aff9cd4bd 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -312,7 +312,6 @@ - diff --git a/PartPreviewWindow/PrinterTabPage.cs b/PartPreviewWindow/PrinterTabPage.cs index 3b5f324ce..6b27e1d4a 100644 --- a/PartPreviewWindow/PrinterTabPage.cs +++ b/PartPreviewWindow/PrinterTabPage.cs @@ -626,21 +626,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; parent.AddChild(sideBar); - if (printer.Settings.PrinterSelected) - { - sideBar.AddPage( - "Slice Settings".Localize(), - new SliceSettingsWidget( - printer, - new SettingsContext( - printer, - null, - SlicerConfiguration.NamedSettingsLayers.All))); - } - else - { - sideBar.AddPage("Slice Settings".Localize(), new SliceSettingsMissingWidget()); - } + sideBar.AddPage( + "Slice Settings".Localize(), + new SliceSettingsWidget( + printer, + new SettingsContext( + printer, + null, + NamedSettingsLayers.All))); sideBar.AddPage("Controls".Localize(), new ManualPrinterControls(printer)); diff --git a/SlicerConfiguration/SliceSettingsMissingWidget.cs b/SlicerConfiguration/SliceSettingsMissingWidget.cs deleted file mode 100644 index 0edc89b2a..000000000 --- a/SlicerConfiguration/SliceSettingsMissingWidget.cs +++ /dev/null @@ -1,62 +0,0 @@ -/* -Copyright (c) 2017, Lars Brubaker, John Lewin -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The views and conclusions contained in the software and documentation are those -of the authors and should not be interpreted as representing official policies, -either expressed or implied, of the FreeBSD Project. -*/ - -using MatterHackers.Agg; -using MatterHackers.Agg.UI; -using MatterHackers.Localizations; - -namespace MatterHackers.MatterControl.SlicerConfiguration -{ - public class SliceSettingsMissingWidget : FlowLayoutWidget - { - public SliceSettingsMissingWidget() : base(FlowDirection.TopToBottom) - { - this.AnchorAll(); - this.Padding = new BorderDouble(3, 0); - - var noConnectionMessageContainer = new AltGroupBox(new WrappedTextWidget("No Printer Selected".Localize(), pointSize: 18, textColor: ActiveTheme.Instance.SecondaryAccentColor)) - { - Margin = new BorderDouble(top: 10), - BorderColor = ActiveTheme.Instance.PrimaryTextColor, - HAnchor = HAnchor.Stretch, - Height = 90 - }; - string noConnectionString = "No printer is currently selected. Please select a printer to edit slice settings.".Localize(); - noConnectionString += "\n\n" + "NOTE: You need to select a printer, but do not need to connect to it.".Localize(); - var noConnectionMessage = new WrappedTextWidget(noConnectionString, pointSize: 10) - { - Margin = new BorderDouble(5), - TextColor = ActiveTheme.Instance.PrimaryTextColor, - HAnchor = HAnchor.Stretch - }; - noConnectionMessageContainer.AddChild(noConnectionMessage); - this.AddChild(noConnectionMessageContainer); - } - } -}