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

12
MatterControlLib/AboutPage/AboutPage.cs
View file

@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl
this.MinimumSize = new Vector2(480 * GuiWidget.DeviceScale, 520 * GuiWidget.DeviceScale);
this.WindowSize = new Vector2(500 * GuiWidget.DeviceScale, 550 * GuiWidget.DeviceScale);
ContentRow.BackgroundColor = Color.Transparent;
contentRow.BackgroundColor = Color.Transparent;
headerRow.Visible = false;
@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Absolute,
Height = 100,
};
ContentRow.AddChild(altHeadingRow);
contentRow.AddChild(altHeadingRow);
var productInfo = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Center
});
ContentRow.AddChild(
contentRow.AddChild(
new WrappedTextWidget(
"MatterControl is made possible by the team at MatterHackers and other open source software".Localize() + ":",
pointSize: theme.DefaultFontSize,
@ -167,7 +167,7 @@ namespace MatterHackers.MatterControl
scrollable.ScrollArea.HAnchor = HAnchor.Stretch;
scrollable.AddChild(licensePanel);
ContentRow.AddChild( scrollable);
contentRow.AddChild( scrollable);
var feedbackButton = new TextButton("Send Feedback", theme)
{
@ -181,7 +181,7 @@ namespace MatterHackers.MatterControl
this.AddPageAction(feedbackButton, highlightFirstAction: false);
ContentRow.AddChild(
contentRow.AddChild(
new TextWidget("Copyright © 2018 MatterHackers, Inc.", textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
HAnchor = HAnchor.Center,
@ -196,7 +196,7 @@ namespace MatterHackers.MatterControl
{
ApplicationController.Instance.LaunchBrowser("http://www.matterhackers.com");
});
ContentRow.AddChild(siteLink);
contentRow.AddChild(siteLink);
}
private class LazyLicenseText : GuiWidget

6
MatterControlLib/AboutPage/CheckForUpdatesPage.cs
View file

@ -46,10 +46,10 @@ namespace MatterHackers.MatterControl
this.AnchorAll();
// Clear padding so UpdateControlView toolbar appears like toolbar
ContentRow.Padding = 0;
contentRow.Padding = 0;
// Update Status Widget
ContentRow.AddChild(
contentRow.AddChild(
new UpdateControlView(theme));
var contentPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Stretch,
Padding = 8
};
ContentRow.AddChild(contentPanel);
contentRow.AddChild(contentPanel);
var currentBuildInfo = new TextWidget("Current Build".Localize() + $" : {VersionInfo.Instance.BuildVersion}")
{

30
MatterControlLib/AboutPage/ContactFormPage.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.ContactForm
this.WindowTitle = "MatterControl : " + "Submit Feedback".Localize();
this.HeaderText = "How can we improve?".Localize();
ContentRow.Padding = theme.DefaultContainerPadding;
contentRow.Padding = theme.DefaultContainerPadding;
submitButton = theme.CreateDialogButton("Submit".Localize());
submitButton.Click += (sender, eventArgs) =>
@ -72,9 +72,9 @@ namespace MatterHackers.MatterControl.ContactForm
{
ContactFormRequest postRequest = new ContactFormRequest(questionInput.Text, detailInput.Text, emailInput.Text, nameInput.Text, "");
ContentRow.RemoveAllChildren();
contentRow.RemoveAllChildren();
ContentRow.AddChild(messageContainer);
contentRow.AddChild(messageContainer);
submitButton.Visible = false;
@ -111,33 +111,33 @@ namespace MatterHackers.MatterControl.ContactForm
// Default sizing results in too much top whitespace, revise Subject row to only be as big as content
var subjectRow = CreateLabelRow("Subject".Localize());
subjectRow.VAnchor = VAnchor.Fit;
ContentRow.AddChild(subjectRow);
ContentRow.AddChild(questionInput = new MHTextEditWidget("", theme)
contentRow.AddChild(subjectRow);
contentRow.AddChild(questionInput = new MHTextEditWidget("", theme)
{
HAnchor = HAnchor.Stretch
});
ContentRow.AddChild(questionErrorMessage = CreateErrorRow());
contentRow.AddChild(questionErrorMessage = CreateErrorRow());
ContentRow.AddChild(CreateLabelRow("Message".Localize()));
ContentRow.AddChild(detailInput = new MHTextEditWidget("", theme, pixelHeight: 120, multiLine: true)
contentRow.AddChild(CreateLabelRow("Message".Localize()));
contentRow.AddChild(detailInput = new MHTextEditWidget("", theme, pixelHeight: 120, multiLine: true)
{
HAnchor = HAnchor.Stretch
});
ContentRow.AddChild(detailErrorMessage = CreateErrorRow());
contentRow.AddChild(detailErrorMessage = CreateErrorRow());
ContentRow.AddChild(CreateLabelRow("Email Address".Localize()));
ContentRow.AddChild(emailInput = new MHTextEditWidget("", theme)
contentRow.AddChild(CreateLabelRow("Email Address".Localize()));
contentRow.AddChild(emailInput = new MHTextEditWidget("", theme)
{
HAnchor = HAnchor.Stretch
});
ContentRow.AddChild(emailErrorMessage = CreateErrorRow());
contentRow.AddChild(emailErrorMessage = CreateErrorRow());
ContentRow.AddChild(CreateLabelRow("Name".Localize()));
ContentRow.AddChild(nameInput = new MHTextEditWidget("", theme)
contentRow.AddChild(CreateLabelRow("Name".Localize()));
contentRow.AddChild(nameInput = new MHTextEditWidget("", theme)
{
HAnchor = HAnchor.Stretch
});
ContentRow.AddChild(nameErrorMessage = CreateErrorRow());
contentRow.AddChild(nameErrorMessage = CreateErrorRow());
}
private GuiWidget CreateLabelRow(string labelText, int fontSize = 12, int height = 28)

3
MatterControlLib/ApplicationView/Themes/ThemeConfig.cs
View file

@ -1,5 +1,4 @@

/*
/*
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.

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)

6
MatterControlLib/ControlElements/StyledMessageBoxWindow.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
responseCallback = callback;
unwrappedMessage = message;
ContentRow.AddChild(messageContainer = new TextWidget(message, textColor: theme.TextColor, pointSize: 12 * DeviceScale)
contentRow.AddChild(messageContainer = new TextWidget(message, textColor: theme.TextColor, pointSize: 12 * DeviceScale)
{
AutoExpandBoundsToText = true,
HAnchor = HAnchor.Left
@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl
{
foreach (GuiWidget widget in extraWidgetsToAdd)
{
ContentRow.AddChild(widget);
contentRow.AddChild(widget);
}
}
@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl
{
if (messageContainer != null)
{
double wrappingSize = ContentRow.Width - (ContentRow.Padding.Width + messageContainer.Margin.Width);
double wrappingSize = contentRow.Width - (contentRow.Padding.Width + messageContainer.Margin.Width);
if (wrappingSize > 0)
{
var wrapper = new EnglishTextWrapping(12 * GuiWidget.DeviceScale);

8
MatterControlLib/CustomWidgets/ExportPrintItemPage.cs
View file

@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
Cursor = Cursors.Hand,
Name = plugin.ButtonText + " Button"
};
ContentRow.AddChild(pluginButton);
contentRow.AddChild(pluginButton);
if (isFirstItem)
{
@ -104,14 +104,14 @@ namespace MatterHackers.MatterControl
{
optionPanel.HAnchor = HAnchor.Stretch;
optionPanel.VAnchor = VAnchor.Fit;
ContentRow.AddChild(optionPanel);
contentRow.AddChild(optionPanel);
}
}
exportPluginButtons.Add(pluginButton, plugin);
}
ContentRow.AddChild(new VerticalSpacer());
contentRow.AddChild(new VerticalSpacer());
// TODO: make this work on the mac and then delete this if
if (AggContext.OperatingSystem == OSType.Windows
@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Left,
Cursor = Cursors.Hand
};
ContentRow.AddChild(showInFolderAfterSave);
contentRow.AddChild(showInFolderAfterSave);
}
var exportButton = theme.CreateDialogButton("Export".Localize());

2
MatterControlLib/EeProm/EePromMarlinWindow.cs
View file

@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.EeProm
var settingsAreaScrollBox = new ScrollableWidget(true);
settingsAreaScrollBox.ScrollArea.HAnchor |= HAnchor.Stretch;
settingsAreaScrollBox.AnchorAll();
ContentRow.AddChild(settingsAreaScrollBox);
contentRow.AddChild(settingsAreaScrollBox);
settingsAreaScrollBox.AddChild(conterContent);

2
MatterControlLib/EeProm/EePromRepetierWindow.cs
View file

@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.EeProm
currentEePromSettings = new EePromRepetierStorage();
var topToBottom = ContentRow;
var topToBottom = contentRow;
var row = new FlowLayoutWidget
{

8
MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl
this.WindowSize = new Vector2(480, 500);
ContentRow.Padding = 0;
contentRow.Padding = 0;
// Create a new library context for the SaveAs view
libraryNavContext = new LibraryConfig()
@ -72,10 +72,10 @@ namespace MatterHackers.MatterControl
// put in the bread crumb widget
breadCrumbWidget = new FolderBreadCrumbWidget(librarySelectorWidget, theme);
breadCrumbWidget.BackgroundColor = theme.MinimalShade;
ContentRow.AddChild(breadCrumbWidget);
ContentRow.BackgroundColor = Color.Transparent;
contentRow.AddChild(breadCrumbWidget);
contentRow.BackgroundColor = Color.Transparent;
ContentRow.AddChild(librarySelectorWidget);
contentRow.AddChild(librarySelectorWidget);
acceptButton = theme.CreateDialogButton(acceptButtonText);
acceptButton.Name = "Accept Button";

4
MatterControlLib/PartPreviewWindow/MarkdownEditPage.cs
View file

@ -55,8 +55,8 @@ namespace MatterHackers.MatterControl
tabControl.TabBar.BackgroundColor = theme.TabBarBackground;
tabControl.TabBar.Padding = 0;
ContentRow.AddChild(tabControl);
ContentRow.Padding = 0;
contentRow.AddChild(tabControl);
contentRow.Padding = 0;
var editContainer = new GuiWidget()
{

4
MatterControlLib/PartPreviewWindow/SaveAsPage.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl
Margin = new BorderDouble(5),
HAnchor = HAnchor.Left
};
ContentRow.AddChild(fileNameHeader);
contentRow.AddChild(fileNameHeader);
//Adds text box and check box to the above container
itemNameWidget = new MHTextEditWidget("", theme, pixelWidth: 300, messageWhenEmptyAndNotSelected: "Enter a Design Name Here".Localize())
@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl
{
acceptButton.InvokeClick();
};
ContentRow.AddChild(itemNameWidget);
contentRow.AddChild(itemNameWidget);
}
}
}

4
MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs
View file

@ -59,10 +59,10 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Stretch,
};
scrollableWidget.ScrollArea.HAnchor = HAnchor.Stretch;
ContentRow.AddChild(scrollableWidget);
contentRow.AddChild(scrollableWidget);
// No right padding removes unexpected spacing to the right of scrollbar
ContentRow.Padding = ContentRow.Padding.Clone(right: 0);
contentRow.Padding = contentRow.Padding.Clone(right: 0);
var column = new FlowLayoutWidget(FlowDirection.TopToBottom)
{

16
MatterControlLib/PrinterControls/MacroDetailPage.cs
View file

@ -55,28 +55,28 @@ namespace MatterHackers.MatterControl
var elementMargin = new BorderDouble(top: 3);
ContentRow.Padding += 3;
contentRow.Padding += 3;
ContentRow.AddChild(new TextWidget("Macro Name".Localize() + ":", 0, 0, 12)
contentRow.AddChild(new TextWidget("Macro Name".Localize() + ":", 0, 0, 12)
{
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(0, 0, 0, 1)
});
ContentRow.AddChild(macroNameInput = new MHTextEditWidget(GCodeMacro.FixMacroName(gcodeMacro.Name), theme)
contentRow.AddChild(macroNameInput = new MHTextEditWidget(GCodeMacro.FixMacroName(gcodeMacro.Name), theme)
{
HAnchor = HAnchor.Stretch
});
ContentRow.AddChild(macroNameError = new TextWidget("Give the macro a name".Localize() + ".", 0, 0, 10)
contentRow.AddChild(macroNameError = new TextWidget("Give the macro a name".Localize() + ".", 0, 0, 10)
{
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
});
ContentRow.AddChild(new TextWidget("Macro Commands".Localize() + ":", 0, 0, 12)
contentRow.AddChild(new TextWidget("Macro Commands".Localize() + ":", 0, 0, 12)
{
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
@ -90,9 +90,9 @@ namespace MatterHackers.MatterControl
};
macroCommandInput.ActualTextEditWidget.VAnchor = VAnchor.Stretch;
macroCommandInput.DrawFromHintedCache();
ContentRow.AddChild(macroCommandInput);
contentRow.AddChild(macroCommandInput);
ContentRow.AddChild(macroCommandError = new TextWidget("This should be in 'G-Code'".Localize() + ".", 0, 0, 10)
contentRow.AddChild(macroCommandError = new TextWidget("This should be in 'G-Code'".Localize() + ".", 0, 0, 10)
{
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Stretch
};
ContentRow.AddChild(container);
contentRow.AddChild(container);
var saveMacroButton = theme.CreateDialogButton("Save".Localize());
saveMacroButton.Click += (s, e) =>

4
MatterControlLib/PrinterControls/MacroListPage.cs
View file

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl
private void RebuildList(PrinterSettings printerSettings)
{
this.ContentRow.CloseAllChildren();
this.contentRow.CloseAllChildren();
if (printerSettings?.Macros != null)
{
@ -111,7 +111,7 @@ namespace MatterHackers.MatterControl
};
macroRow.AddChild(removeLink);
ContentRow.AddChild(macroRow);
contentRow.AddChild(macroRow);
}
}
}

4
MatterControlLib/PrinterControls/MovementSpeedsPage.cs
View file

@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl
headerBar.AddChild(new TextWidget(this.WindowTitle, textColor: theme.TextColor, pointSize: theme.FontSize10));
ContentRow.AddChild(headerBar);
contentRow.AddChild(headerBar);
// put in the movement edit controls
string[] settingsArray = printer.Settings.Helpers.GetMovementSpeedsString().Split(',');
@ -112,7 +112,7 @@ namespace MatterHackers.MatterControl
row.AddChild(valueEdit);
valueEditors.Add(valueEdit);
ContentRow.AddChild(row);
contentRow.AddChild(row);
preset_count += 1;
}

2
MatterControlLib/PrinterControls/PrinterConnections/SelectPrinterPage.cs
View file

@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
Margin = theme.DefaultContainerPadding
};
treeView.ScrollArea.HAnchor = HAnchor.Stretch;
ContentRow.AddChild(treeView);
contentRow.AddChild(treeView);
var nextButton = new TextButton(continueButtonText, theme)
{

2
MatterControlLib/PrinterControls/PrinterConnections/SetupStepBaudRate.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
this.printer = printer;
printerBaudRateContainer = createPrinterBaudRateContainer();
ContentRow.AddChild(printerBaudRateContainer);
contentRow.AddChild(printerBaudRateContainer);
{
nextButton = theme.CreateDialogButton("Continue".Localize());
nextButton.Click += (s, e) =>

2
MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
this.printer = printer;
FlowLayoutWidget printerComPortContainer = createComPortContainer();
ContentRow.AddChild(printerComPortContainer);
contentRow.AddChild(printerComPortContainer);
//Construct buttons
nextButton = theme.CreateDialogButton("Done".Localize());

2
MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortOne.cs
View file

@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
});
container.AddChild(skipConnectionLink);
ContentRow.AddChild(container);
contentRow.AddChild(container);
//Construct buttons
var nextButton = theme.CreateDialogButton("Continue".Localize());

2
MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
this.printer = printer;
startingPortNames = FrostedSerialPort.GetPortNames();
ContentRow.AddChild(createPrinterConnectionMessageContainer());
contentRow.AddChild(createPrinterConnectionMessageContainer());
//Construct buttons
nextButton = theme.CreateDialogButton("Done".Localize());

12
MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -116,11 +116,11 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
if (userIsLoggedIn)
{
ContentRow.AddChild(addPrinterColumn);
contentRow.AddChild(addPrinterColumn);
}
else
{
ContentRow.Padding = 10;
contentRow.Padding = 10;
addPrinterColumn.Margin = new BorderDouble(28, 15, 15, 5);
var commonMargin = new BorderDouble(4, 2);
@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
Cursor = Cursors.Hand,
Name = "Sign In Radio Button",
};
ContentRow.AddChild(signInRadioButton);
contentRow.AddChild(signInRadioButton);
createPrinterRadioButton = new RadioButton(new RadioButtonViewText("Create a new printer", theme.TextColor))
{
@ -143,7 +143,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
Name = "Create Printer Radio Button",
Checked = true
};
ContentRow.AddChild(createPrinterRadioButton);
contentRow.AddChild(createPrinterRadioButton);
createPrinterRadioButton.CheckedStateChanged += (s, e) =>
{
@ -151,7 +151,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
this.SetElementVisibility();
};
ContentRow.AddChild(addPrinterColumn);
contentRow.AddChild(addPrinterColumn);
}
nextButton = theme.CreateDialogButton("Next".Localize());
@ -302,7 +302,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
printerModelSelector.SelectedIndex = 0;
}
ContentRow.Invalidate();
contentRow.Invalidate();
SetElementVisibility();
}

14
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -53,9 +53,9 @@ namespace MatterHackers.MatterControl
this.WindowTitle = this.HeaderText = "MatterControl " + "Settings".Localize();
this.WindowSize = new Vector2(700 * GuiWidget.DeviceScale, 600 * GuiWidget.DeviceScale);
ContentRow.Padding = theme.DefaultContainerPadding;
ContentRow.Padding = 0;
ContentRow.BackgroundColor = Color.Transparent;
contentRow.Padding = theme.DefaultContainerPadding;
contentRow.Padding = 0;
contentRow.BackgroundColor = Color.Transparent;
var generalPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
};
ContentRow.AddChild(generalSection);
contentRow.AddChild(generalSection);
theme.ApplyBoxStyle(generalSection);
@ -314,7 +314,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Fit,
Margin = 0
};
ContentRow.AddChild(themeSection);
contentRow.AddChild(themeSection);
theme.ApplyBoxStyle(themeSection);
@ -329,7 +329,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Fit,
Margin = 0
};
ContentRow.AddChild(advancedSection);
contentRow.AddChild(advancedSection);
theme.ApplyBoxStyle(advancedSection);
@ -388,7 +388,7 @@ namespace MatterHackers.MatterControl
advancedPanel.Children<SettingsItem>().First().Border = new BorderDouble(0, 1);
// Enforce consistent SectionWidget spacing and last child borders
foreach (var section in ContentRow.Children<SectionWidget>())
foreach (var section in contentRow.Children<SectionWidget>())
{
section.Margin = new BorderDouble(0, 10, 0, 0);

18
MatterControlLib/SetupWizard/AndroidConnectDevicePage.cs
View file

@ -61,12 +61,12 @@ namespace MatterHackers.MatterControl
TextColor = theme.TextColor,
Margin = new BorderDouble(bottom: 10)
};
ContentRow.AddChild(printerNameLabel);
contentRow.AddChild(printerNameLabel);
ContentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:theme.TextColor));
ContentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:theme.TextColor));
ContentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:theme.TextColor));
ContentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:theme.TextColor));
contentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:theme.TextColor));
contentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:theme.TextColor));
contentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:theme.TextColor));
contentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:theme.TextColor));
//Add inputs to main container
ApplicationController.Instance.ActivePrinter.Connection.CommunicationStateChanged.RegisterEvent(communicationStateChanged, ref unregisterEvents);
@ -87,10 +87,10 @@ namespace MatterHackers.MatterControl
connectButtonContainer.AddChild(connectButton);
connectButtonContainer.AddChild(skipButton);
connectButtonContainer.AddChild(new HorizontalSpacer());
ContentRow.AddChild(connectButtonContainer);
contentRow.AddChild(connectButtonContainer);
skipMessage = new TextWidget("(Press 'Skip' to setup connection later)".Localize(), 0, 0, 10, textColor: theme.TextColor);
ContentRow.AddChild(skipMessage);
contentRow.AddChild(skipMessage);
generalError = new TextWidget("", 0, 0, errorFontSize)
{
@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl
Visible = false,
Margin = new BorderDouble(top: 20),
};
ContentRow.AddChild(generalError);
contentRow.AddChild(generalError);
//Construct buttons
retryButton = theme.CreateLightDialogButton("Retry".Localize());
@ -125,7 +125,7 @@ namespace MatterHackers.MatterControl
retryButtonContainer.AddChild(troubleshootButton);
retryButtonContainer.AddChild(new HorizontalSpacer());
ContentRow.AddChild(retryButtonContainer);
contentRow.AddChild(retryButtonContainer);
//Construct buttons
nextButton = theme.CreateDialogButton("Continue".Localize());

2
MatterControlLib/SetupWizard/AndroidNetworkTroubleshootingPage.cs
View file

@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl
{
public NetworkTroubleshooting()
{
ContentRow.AddChild(
contentRow.AddChild(
new TextWidget(
"MatterControl was unable to connect to the Internet. Please check your Wifi connection and try again".Localize() + "...",
textColor: theme.TextColor));

4
MatterControlLib/SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Stretch,
};
scrollWindow.ScrollArea.HAnchor = HAnchor.Stretch;
ContentRow.AddChild(scrollWindow);
contentRow.AddChild(scrollWindow);
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
@ -132,7 +132,7 @@ namespace MatterHackers.MatterControl
};
rememberChoice = new CheckBox("Don't remind me again".Localize(), theme.TextColor);
ContentRow.AddChild(rememberChoice);
contentRow.AddChild(rememberChoice);
syncButton.Visible = true;

10
MatterControlLib/SetupWizard/DialogPage.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2017, Lars Brubaker, John Lewin
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl
public class DialogPage : FlowLayoutWidget
{
protected GuiWidget headerRow;
public FlowLayoutWidget ContentRow { get; }
protected FlowLayoutWidget contentRow;
protected FlowLayoutWidget footerRow;
private TextWidget headerLabel;
@ -106,14 +106,14 @@ namespace MatterHackers.MatterControl
headerRow.AddChild(headerLabel);
// Create the main control container
ContentRow = new FlowLayoutWidget(FlowDirection.TopToBottom)
contentRow = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
Padding = new BorderDouble(10),
BackgroundColor = theme.SectionBackgroundColor,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch
};
this.AddChild(ContentRow);
this.AddChild(contentRow);
// Create the footer (button) container
footerRow = new FlowLayoutWidget(FlowDirection.LeftToRight)
@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl
headerLabel.PointSize = 14;
headerLabel.TextColor = theme.TextColor;
ContentRow.Padding = new BorderDouble(5);
contentRow.Padding = new BorderDouble(5);
footerRow.Padding = 0;
footerRow.Margin = new BorderDouble(top: theme.DefaultContainerPadding);

4
MatterControlLib/SetupWizard/HelpPage.cs
View file

@ -76,8 +76,8 @@ namespace MatterHackers.MatterControl
};
tabControl.TabBar.BackgroundColor = theme.TabBarBackground;
ContentRow.AddChild(tabControl);
ContentRow.Padding = 0;
contentRow.AddChild(tabControl);
contentRow.Padding = 0;
// add the mouse commands
var mouseControls = new FlowLayoutWidget()

4
MatterControlLib/SetupWizard/ImportSettingsPage.cs
View file

@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Stretch,
};
scrollWindow.ScrollArea.HAnchor = HAnchor.Stretch;
ContentRow.AddChild(scrollWindow);
contentRow.AddChild(scrollWindow);
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
@ -244,7 +244,7 @@ namespace MatterHackers.MatterControl
this.WindowTitle = "Import Wizard".Localize();
this.HeaderText = "Import Successful".Localize();
ContentRow.AddChild(new WrappedTextWidget(successMessage, textColor: theme.TextColor));
contentRow.AddChild(new WrappedTextWidget(successMessage, textColor: theme.TextColor));
}
}
}

4
MatterControlLib/SetupWizard/InputBoxPage.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
GuiWidget actionButton = null;
ContentRow.AddChild(new TextWidget(label, pointSize: 12)
contentRow.AddChild(new TextWidget(label, pointSize: 12)
{
TextColor = theme.TextColor,
Margin = new BorderDouble(5),
@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl
{
actionButton.OnClick(null);
};
ContentRow.AddChild(textEditWidget);
contentRow.AddChild(textEditWidget);
actionButton = theme.CreateDialogButton(actionButtonTitle);
actionButton.Name = "InputBoxPage Action Button";

2
MatterControlLib/SetupWizard/LicenseAgreementPage.cs
View file

@ -45,7 +45,7 @@ public class LicenseAgreementPage : DialogPage
var scrollable = new ScrollableWidget(true);
scrollable.AnchorAll();
scrollable.ScrollArea.HAnchor = HAnchor.Stretch;
ContentRow.AddChild(scrollable);
contentRow.AddChild(scrollable);
scrollable.ScrollArea.Margin = new BorderDouble(0, 0, 15, 0);
scrollable.AddChild(new WrappedTextWidget(eulaText, textColor: theme.TextColor, doubleBufferText: false)

4
MatterControlLib/SetupWizard/PrinterProfileHistoryPage.cs
View file

@ -31,8 +31,8 @@ namespace MatterHackers.MatterControl.SetupWizard
VAnchor = VAnchor.Stretch,
};
scrollWindow.ScrollArea.HAnchor = HAnchor.Stretch;
ContentRow.FlowDirection = FlowDirection.TopToBottom;
ContentRow.AddChild(scrollWindow);
contentRow.FlowDirection = FlowDirection.TopToBottom;
contentRow.AddChild(scrollWindow);
var revertButton = theme.CreateDialogButton("Restore".Localize());
revertButton.Click += async (s, e) =>

6
MatterControlLib/SetupWizard/SetupWizardTroubleshooting.cs
View file

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl
CriteriaRow.ResetAll();
// Clear the main container
ContentRow.CloseAllChildren();
contentRow.CloseAllChildren();
// Regen and refresh the troubleshooting criteria
var printerNameLabel = new TextWidget(string.Format("{0}:", "Connection Troubleshooting".Localize()), 0, 0, labelFontSize)
@ -194,7 +194,7 @@ namespace MatterHackers.MatterControl
() => printer.Connection.Connect(),
theme);
ContentRow.AddChild(connectToPrinterRow);
contentRow.AddChild(connectToPrinterRow);
if (CriteriaRow.ActiveErrorItem != null) {
@ -208,7 +208,7 @@ namespace MatterHackers.MatterControl
TextColor = theme.PrimaryAccentColor
});
ContentRow.AddChild(errorText);
contentRow.AddChild(errorText);
}
}

8
MatterControlLib/SetupWizard/SetupWizardWifi.cs
View file

@ -42,14 +42,14 @@ namespace MatterHackers.MatterControl
{
this.WindowTitle = "Setup Wizard".Localize();
ContentRow.AddChild(new TextWidget("Wifi Setup".Localize() + ":", 0, 0, labelFontSize)
contentRow.AddChild(new TextWidget("Wifi Setup".Localize() + ":", 0, 0, labelFontSize)
{
TextColor = theme.TextColor,
Margin = new BorderDouble(bottom: 10)
});
ContentRow.AddChild(new TextWidget("Some features may require an internet connection.".Localize(), 0, 0, 12, textColor: theme.TextColor));
ContentRow.AddChild(new TextWidget("Would you like to setup Wifi?".Localize(), 0, 0, 12, textColor: theme.TextColor));
contentRow.AddChild(new TextWidget("Some features may require an internet connection.".Localize(), 0, 0, 12, textColor: theme.TextColor));
contentRow.AddChild(new TextWidget("Would you like to setup Wifi?".Localize(), 0, 0, 12, textColor: theme.TextColor));
var connectButtonContainer = new FlowLayoutWidget()
{
@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl
connectButtonContainer.AddChild(skipButton);
connectButtonContainer.AddChild(new HorizontalSpacer());
ContentRow.AddChild(connectButtonContainer);
contentRow.AddChild(connectButtonContainer);
this.AddPageAction(nextButton);
}

10
MatterControlLib/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
View file

@ -78,19 +78,19 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.AnchorAll();
this.headerRow.Visible = false;
this.ContentRow.Padding = 0;
this.contentRow.Padding = 0;
ContentRow.BackgroundColor = Color.Transparent;
contentRow.BackgroundColor = Color.Transparent;
var inlineNameEdit = new InlineStringEdit(presetsContext.PersistenceLayer.Name, theme, presetsContext.LayerType.ToString() + " Name", boldFont: true);
inlineNameEdit.ValueChanged += (s, e) =>
{
printer.Settings.SetValue(SettingsKey.layer_name, inlineNameEdit.Text, presetsContext.PersistenceLayer);
};
ContentRow.AddChild(inlineNameEdit);
contentRow.AddChild(inlineNameEdit);
var sliceSettingsWidget = CreateSliceSettingsWidget(printer, presetsContext.PersistenceLayer);
ContentRow.AddChild(sliceSettingsWidget);
contentRow.AddChild(sliceSettingsWidget);
var duplicateButton = theme.CreateDialogButton("Duplicate".Localize());
duplicateButton.Click += (s, e) =>
@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
sliceSettingsWidget.Close();
sliceSettingsWidget = CreateSliceSettingsWidget(printer, clonedLayer);
ContentRow.AddChild(sliceSettingsWidget);
contentRow.AddChild(sliceSettingsWidget);
inlineNameEdit.Text = newProfileName;
});

4
MatterControlLib/SlicerConfiguration/UIFields/SurfacedEditorPage.cs
View file

@ -58,8 +58,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
tabControl.TabBar.BackgroundColor = theme.TabBarBackground;
tabControl.TabBar.Padding = 0;
ContentRow.AddChild(tabControl);
ContentRow.Padding = 0;
contentRow.AddChild(tabControl);
contentRow.Padding = 0;
var editContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
{

2
MatterControlLib/Utilities/MarkdigAgg/MarkdownPage.cs
View file

@ -52,7 +52,7 @@ namespace Markdig.Agg
theme,
new Uri("https://raw.githubusercontent.com/lunet-io/markdig/master/readme.md"));
}
ContentRow.AddChild(widget);
contentRow.AddChild(widget);
}
}
}