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

Initial screensaver prototype

Browse source 
- Consolidate title casing mechanism into PrintItemWrapper.GetFriendlyName
This commit is contained in:
John Lewin 2017-01-18 17:02:58 -08:00
parent 8c465e781f
commit 16c2230018
7 changed files with 643 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ActionBar/PrintStatusRow.cs
View file

@ -69,7 +69,6 @@ namespace MatterHackers.MatterControl.ActionBar
private TemperatureWidgetBase bedTemperatureWidget;
private TemperatureWidgetBase extruderTemperatureWidget;
private QueueDataView queueDataView;
private TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
public DesktopPrintStatusRow(QueueDataView queueDataView)
{
@ -337,9 +336,7 @@ namespace MatterHackers.MatterControl.ActionBar
{
if (PrinterConnectionAndCommunication.Instance.ActivePrintItem != null)
{
string labelName = textInfo.ToTitleCase(PrinterConnectionAndCommunication.Instance.ActivePrintItem.Name);
labelName = labelName.Replace('_', ' ');
this.activePrintName.Text = labelName;
this.activePrintName.Text = PrinterConnectionAndCommunication.Instance.ActivePrintItem.GetFriendlyName();
}
else
{
@ -454,7 +451,6 @@ namespace MatterHackers.MatterControl.ActionBar
private TemperatureWidgetBase extruderTemperatureWidget;
private QueueDataView queueDataView;
private Button setupButton;
private TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
private Stopwatch timeSinceLastDrawTime = new Stopwatch();
public TouchScreenPrintStatusRow(QueueDataView queueDataView)
@ -770,9 +766,7 @@ namespace MatterHackers.MatterControl.ActionBar
{
if (PrinterConnectionAndCommunication.Instance.ActivePrintItem != null)
{
string labelName = textInfo.ToTitleCase(PrinterConnectionAndCommunication.Instance.ActivePrintItem.Name);
labelName = labelName.Replace('_', ' ');
this.activePrintName.Text = labelName;
this.activePrintName.Text = PrinterConnectionAndCommunication.Instance.ActivePrintItem.GetFriendlyName();
}
else
{