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

Improving default loading markdown text

Browse source 
improving layout of progress bar in loading and unloading
This commit is contained in:
Lars Brubaker 2018-11-06 09:27:25 -08:00
parent 011c348e5d
commit 234ab03072
7 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
View file

@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
BecomingActive = () =>
{
var markdownText = printer.Settings.GetValue(SettingsKey.insert_filament_markdown);
var markdownText = printer.Settings.GetValue(SettingsKey.insert_filament_markdown2);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
insertFilamentPage.ContentRow.AddChild(markdownWidget);
@ -180,18 +180,22 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
loadingFilamentPage.NextButton.Enabled = false;
// add the progress bar
var holder = new FlowLayoutWidget();
var holder = new FlowLayoutWidget()
{
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
VAnchor = VAnchor.Center,
};
var progressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),
VAnchor = VAnchor.Center,
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);
@ -290,7 +294,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
BecomingActive = () =>
{
var markdownText = printer.Settings.GetValue(SettingsKey.running_clean_markdown);
var markdownText = printer.Settings.GetValue(SettingsKey.running_clean_markdown2);
var markdownWidget = new MarkdownWidget(theme);
markdownWidget.Markdown = markdownText = markdownText.Replace("\\n", "\n");
runningCleanPage.ContentRow.AddChild(markdownWidget);
@ -323,8 +327,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if (runningGCodeCommands.Continue)
{
runningGCodeCommands.Continue = false;
printer.Settings.SetValue(SettingsKey.filament_has_been_loaded, "1");
}
printer.Settings.SetValue(SettingsKey.filament_has_been_loaded, "1");
};
yield return runningCleanPage;

8
MatterControlLib/ConfigurationPage/PrintLeveling/UnloadFilamentWizard.cs
View file

@ -108,18 +108,22 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
unloadingFilamentPage.NextButton.Enabled = false;
// add the progress bar
var holder = new FlowLayoutWidget();
var holder = new FlowLayoutWidget()
{
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
VAnchor = VAnchor.Center,
};
var progressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),
VAnchor = VAnchor.Center,
};
holder.AddChild(progressBar);
holder.AddChild(progressBarText);