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

Remove SliceSettingsMissingWidget

Browse source
This commit is contained in:
John Lewin 2017-10-19 10:50:40 -07:00
parent 00de58b9b3
commit e07d4c73dc
3 changed files with 8 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControl.csproj
View file

@ -312,7 +312,6 @@
<Compile Include="SetupWizard\SetupWizardTroubleshooting.cs" /> <Compile Include="SetupWizard\SetupWizardTroubleshooting.cs" />
<Compile Include="SetupWizard\SetupWizardWifi.cs" /> <Compile Include="SetupWizard\SetupWizardWifi.cs" />
<Compile Include="SetupWizard\WizardWindow.cs" /> <Compile Include="SetupWizard\WizardWindow.cs" />
<Compile Include="SlicerConfiguration\SliceSettingsMissingWidget.cs" />
<Compile Include="SlicerConfiguration\SliceSettingListControl.cs" /> <Compile Include="SlicerConfiguration\SliceSettingListControl.cs" />
<Compile Include="SlicerConfiguration\SliceSettingsRow.cs" /> <Compile Include="SlicerConfiguration\SliceSettingsRow.cs" />
<Compile Include="SlicerConfiguration\UIFields\BoundDoubleField.cs" /> <Compile Include="SlicerConfiguration\UIFields\BoundDoubleField.cs" />

23
PartPreviewWindow/PrinterTabPage.cs
View file

@ -626,21 +626,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}; };
parent.AddChild(sideBar); parent.AddChild(sideBar);
if (printer.Settings.PrinterSelected) sideBar.AddPage(
{ "Slice Settings".Localize(),
sideBar.AddPage( new SliceSettingsWidget(
"Slice Settings".Localize(), printer,
new SliceSettingsWidget( new SettingsContext(
printer, printer,
new SettingsContext( null,
printer, NamedSettingsLayers.All)));
null,
SlicerConfiguration.NamedSettingsLayers.All)));
}
else
{
sideBar.AddPage("Slice Settings".Localize(), new SliceSettingsMissingWidget());
}
sideBar.AddPage("Controls".Localize(), new ManualPrinterControls(printer)); sideBar.AddPage("Controls".Localize(), new ManualPrinterControls(printer));

62
SlicerConfiguration/SliceSettingsMissingWidget.cs
View file

@ -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);
}
}
}