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

Revert accessibility of contentRow

Browse source 
- Add public PrinterSetupWizardPage proxy to private .contentRow
- Use PrinterSetupWizardPage.ContentRow in LoadFilamentWizard
This commit is contained in:
John Lewin 2018-11-03 10:12:27 -07:00
parent c79afc741a
commit b1053b8198
44 changed files with 136 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/ConfigurationPage/PrintLeveling/PrinterSetupWizardPage.cs
View file

@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl
if (!string.IsNullOrEmpty(instructionsText))
{
ContentRow.AddChild(
contentRow.AddChild(
this.CreateTextField(instructionsText.Replace("\t", " ")));
}
@ -70,6 +70,8 @@ namespace MatterHackers.MatterControl
this.AddPageAction(NextButton);
}
public GuiWidget ContentRow => contentRow;
public override void PageIsBecomingActive()
{
BecomingActive?.Invoke();

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
View file

@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.probePositionsBeingEditedIndex = probePositionsBeingEditedIndex;
var spacer = new GuiWidget(15, 15);
ContentRow.AddChild(spacer);
contentRow.AddChild(spacer);
FlowLayoutWidget textFields = new FlowLayoutWidget(FlowDirection.TopToBottom);
}

6
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs
View file

@ -56,14 +56,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
+ "If you wish to re-calibrate your probe in the future:".Localize() + "\n"
+ " 1. Select the 'Controls' tab on the right" + "\n"
+ " 2. Look for the calibration section (pictured below)".Localize() + "\n";
ContentRow.AddChild(this.CreateTextField(calibrated));
contentRow.AddChild(this.CreateTextField(calibrated));
ContentRow.AddChild(new ImageWidget(AggContext.StaticData.LoadImage(Path.Combine("Images", "probe.png")))
contentRow.AddChild(new ImageWidget(AggContext.StaticData.LoadImage(Path.Combine("Images", "probe.png")))
{
HAnchor = HAnchor.Center
});
ContentRow.AddChild(this.CreateTextField("Click 'Done' to close this window.".Localize()));
contentRow.AddChild(this.CreateTextField("Click 'Done' to close this window.".Localize()));
this.ShowWizardFinished();
}

6
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
View file

@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.probePositionsBeingEditedIndex = probePositionsBeingEditedIndex;
GuiWidget spacer = new GuiWidget(15, 15);
ContentRow.AddChild(spacer);
contentRow.AddChild(spacer);
FlowLayoutWidget zButtonsAndInfo = new FlowLayoutWidget();
zButtonsAndInfo.HAnchor |= Agg.UI.HAnchor.Center;
@ -85,9 +85,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
zButtonsAndInfo.AddChild(zPosition);
ContentRow.AddChild(zButtonsAndInfo);
contentRow.AddChild(zButtonsAndInfo);
ContentRow.AddChild(
contentRow.AddChild(
this.CreateTextField(setZHeightCoarseInstruction2));
}

6
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs
View file

@ -54,14 +54,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
+ "If you wish to re-calibrate leveling in the future:".Localize() + "\n"
+ " 1. Select the 'Controls' tab on the right" + "\n"
+ " 2. Look for the calibration section (pictured below)".Localize() + "\n";
ContentRow.AddChild(this.CreateTextField(calibrated));
contentRow.AddChild(this.CreateTextField(calibrated));
ContentRow.AddChild(new ImageWidget(AggContext.StaticData.LoadImage(Path.Combine("Images", "leveling.png")))
contentRow.AddChild(new ImageWidget(AggContext.StaticData.LoadImage(Path.Combine("Images", "leveling.png")))
{
HAnchor = HAnchor.Center
});
ContentRow.AddChild(this.CreateTextField("Click 'Done' to close this window.".Localize()));
contentRow.AddChild(this.CreateTextField("Click 'Done' to close this window.".Localize()));
this.ShowWizardFinished();
}

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/SelectMaterialPage.cs
View file

@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public SelectMaterialPage(PrinterSetupWizard context, string headerText, string instructionsText, bool onlyLoad)
: base(context, headerText, instructionsText)
{
ContentRow.AddChild(
contentRow.AddChild(
new PresetSelectorWidget(printer, "Material".Localize(), Color.Transparent, NamedSettingsLayers.Material, theme)
{
BackgroundColor = Color.Transparent,

8
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
};
// put in bar name
ContentRow.AddChild(new TextWidget("Hotend Temperature:".Localize(), pointSize: 10, textColor: theme.TextColor)
contentRow.AddChild(new TextWidget("Hotend Temperature:".Localize(), pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 5, 5),
@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
hotEndProgressHolder.AddChild(hotEndDoneText);
ContentRow.AddChild(hotEndProgressHolder);
contentRow.AddChild(hotEndProgressHolder);
}
if (bedTargetTemp > 0)
@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
};
// put in bar name
ContentRow.AddChild(new TextWidget("Bed Temperature:".Localize(), pointSize: 10, textColor: theme.TextColor)
contentRow.AddChild(new TextWidget("Bed Temperature:".Localize(), pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 5, 5),
@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
bedProgressHolder.AddChild(bedDoneText);
ContentRow.AddChild(bedProgressHolder);
contentRow.AddChild(bedProgressHolder);
}
}

6
MatterControlLib/ConfigurationPage/RunningMacroPage.cs
View file

@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.PrinterControls
if (macroData.showMaterialSelector)
{
ContentRow.AddChild(new PresetSelectorWidget(printer, "Material".Localize(), Color.Transparent, NamedSettingsLayers.Material, theme)
contentRow.AddChild(new PresetSelectorWidget(printer, "Material".Localize(), Color.Transparent, NamedSettingsLayers.Material, theme)
{
BackgroundColor = Color.Transparent,
Margin = new BorderDouble(0, 0, 0, 15)
@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl.PrinterControls
markdown.Markdown = macroData.markdown;
ContentRow.AddChild(markdown);
contentRow.AddChild(markdown);
}
#endif
@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.PrinterControls
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);
ContentRow.AddChild(holder);
contentRow.AddChild(holder);
progressBar.Visible = false;
if (macroData.countDown > 0)