fixed the spelling of label
an acronymed some variables txt -> text lbl -> label
This commit is contained in:
larsbrubaker
parent
8d07751dc7
commit
49c8a045a5
25 changed files with 188 additions and 188 deletions
|
|
@ -146,10 +146,10 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
printerNameText.HAnchor = HAnchor.ParentCenter;
|
||||
printerNameText.TextColor = textColor;
|
||||
|
||||
string printerStatusTxtBeg = LocalizedString.Get("Status");
|
||||
string printerStatusTxtEnd = LocalizedString.Get("Connected");
|
||||
string printerStatusTxtFull = string.Format("{0}: {1}", printerStatusTxtBeg, printerStatusTxtEnd);
|
||||
printerStatusText = new TextWidget(printerStatusTxtFull, pointSize:statusTextHeight);
|
||||
string printerStatusTextBeg = LocalizedString.Get("Status");
|
||||
string printerStatusTextEnd = LocalizedString.Get("Connected");
|
||||
string printerStatusTextFull = string.Format("{0}: {1}", printerStatusTextBeg, printerStatusTextEnd);
|
||||
printerStatusText = new TextWidget(printerStatusTextFull, pointSize:statusTextHeight);
|
||||
printerStatusText.AutoExpandBoundsToText = true;
|
||||
printerStatusText.HAnchor = HAnchor.ParentCenter;
|
||||
printerStatusText.TextColor = textColor;
|
||||
|
|
@ -207,15 +207,15 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
{
|
||||
if (GetPrinterRecordCount() > 0)
|
||||
{
|
||||
string printerNameLbl = LocalizedString.Get("Select Printer");
|
||||
string printerNameLblFull = string.Format("- {0} -", printerNameLbl);
|
||||
printerNameText.Text = (printerNameLblFull);
|
||||
string printerNameLabel = LocalizedString.Get("Select Printer");
|
||||
string printerNameLabelFull = string.Format("- {0} -", printerNameLabel);
|
||||
printerNameText.Text = (printerNameLabelFull);
|
||||
}
|
||||
else
|
||||
{
|
||||
string addPrinterLbl = LocalizedString.Get("Add Printer");
|
||||
string addPrinterLblFull = string.Format ("- {0} -", addPrinterLbl);
|
||||
printerNameText.Text = (addPrinterLblFull);
|
||||
string addPrinterLabel = LocalizedString.Get("Add Printer");
|
||||
string addPrinterLabelFull = string.Format ("- {0} -", addPrinterLabel);
|
||||
printerNameText.Text = (addPrinterLabelFull);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,37 +64,37 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
startButton.tooltipText = LocalizedString.Get("Begin printing the selected item.");
|
||||
startButton.Margin = new BorderDouble(0, 6, 6, 3);
|
||||
|
||||
string skipButtonTxt = LocalizedString.Get("Skip");
|
||||
string skipButtonText = LocalizedString.Get("Skip");
|
||||
string skipButtonMessage = LocalizedString.Get("Skip the current item and move to the next in queue");
|
||||
skipButton = makeButton(skipButtonTxt, skipButtonMessage);
|
||||
skipButton = makeButton(skipButtonText, skipButtonMessage);
|
||||
|
||||
string removeButtonTxt = LocalizedString.Get("Remove");
|
||||
string removeButtonText = LocalizedString.Get("Remove");
|
||||
string removeButtonMessage = LocalizedString.Get("Remove current item from queue");
|
||||
removeButton = makeButton(removeButtonTxt, removeButtonMessage);
|
||||
removeButton = makeButton(removeButtonText, removeButtonMessage);
|
||||
|
||||
string pauseButtonTxt = LocalizedString.Get("Pause");
|
||||
string pauseButtonText = LocalizedString.Get("Pause");
|
||||
string pauseButtonMessage = LocalizedString.Get("Pause the current print");
|
||||
pauseButton = makeButton(pauseButtonTxt, pauseButtonMessage);
|
||||
pauseButton = makeButton(pauseButtonText, pauseButtonMessage);
|
||||
|
||||
string cancelCancelButtonTxt = LocalizedString.Get("Cancel Connect");
|
||||
string cancelCancelButtonText = LocalizedString.Get("Cancel Connect");
|
||||
string cancelConnectButtonMessage = LocalizedString.Get("Stop trying to connect to the printer.");
|
||||
cancelConnectButton = makeButton(cancelCancelButtonTxt, cancelConnectButtonMessage);
|
||||
cancelConnectButton = makeButton(cancelCancelButtonText, cancelConnectButtonMessage);
|
||||
|
||||
string cancelButtonTxt = LocalizedString.Get("Cancel");
|
||||
string cancelButtonText = LocalizedString.Get("Cancel");
|
||||
string cancelButtonMessage = LocalizedString.Get("Stop the current print");
|
||||
cancelButton = makeButton(cancelButtonTxt, cancelButtonMessage);
|
||||
cancelButton = makeButton(cancelButtonText, cancelButtonMessage);
|
||||
|
||||
string resumeButtonTxt = LocalizedString.Get("Resume");
|
||||
string resumeButtonText = LocalizedString.Get("Resume");
|
||||
string resumeButtonMessage = LocalizedString.Get ("Resume the current print");
|
||||
resumeButton = makeButton(resumeButtonTxt, resumeButtonMessage);
|
||||
resumeButton = makeButton(resumeButtonText, resumeButtonMessage);
|
||||
|
||||
string reprintButtonTxt = LocalizedString.Get("Reprint");
|
||||
string reprintButtonText = LocalizedString.Get("Reprint");
|
||||
string reprintButtonMessage = LocalizedString.Get ("Print current item again");
|
||||
reprintButton = makeButton(reprintButtonTxt, reprintButtonMessage);
|
||||
reprintButton = makeButton(reprintButtonText, reprintButtonMessage);
|
||||
|
||||
string doneCurrentPartButtonTxt = LocalizedString.Get ("Done");
|
||||
string doneCurrentPartButtonText = LocalizedString.Get ("Done");
|
||||
string doenCurrentPartButtonMessage = LocalizedString.Get ("Move to next print in queue");
|
||||
doneWithCurrentPartButton = makeButton(doneCurrentPartButtonTxt, doenCurrentPartButtonMessage);
|
||||
doneWithCurrentPartButton = makeButton(doneCurrentPartButtonText, doenCurrentPartButtonMessage);
|
||||
|
||||
this.AddChild(addButton);
|
||||
allPrintButtons.Add(addButton);
|
||||
|
|
|
|||
|
|
@ -151,9 +151,9 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
topRow.Name = "PrintStatusRow.ActivePrinterInfo.TopRow";
|
||||
topRow.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
string nextPrintLbl = LocalizedString.Get("Next Print");
|
||||
string nextPrintLblFull = string.Format("{0}:", nextPrintLbl);
|
||||
activePrintLabel = getPrintStatusLabel(nextPrintLblFull, pointSize: 11);
|
||||
string nextPrintLabel = LocalizedString.Get("Next Print");
|
||||
string nextPrintLabelFull = string.Format("{0}:", nextPrintLabel);
|
||||
activePrintLabel = getPrintStatusLabel(nextPrintLabelFull, pointSize: 11);
|
||||
activePrintLabel.VAnchor = VAnchor.ParentTop;
|
||||
|
||||
topRow.AddChild(activePrintLabel);
|
||||
|
|
@ -276,15 +276,15 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
//GC.WaitForFullGCComplete();
|
||||
|
||||
string printPercentRemainingText;
|
||||
string printPercentCompleteTxt = LocalizedString.Get("complete");
|
||||
printPercentRemainingText = string.Format("{0:0.0}% {1}", PrinterCommunication.Instance.PercentComplete,printPercentCompleteTxt);
|
||||
string printPercentCompleteText = LocalizedString.Get("complete");
|
||||
printPercentRemainingText = string.Format("{0:0.0}% {1}", PrinterCommunication.Instance.PercentComplete,printPercentCompleteText);
|
||||
|
||||
switch (PrinterCommunication.Instance.CommunicationState)
|
||||
{
|
||||
case PrinterCommunication.CommunicationStates.PreparingToPrint:
|
||||
string preparingPrintLbl = LocalizedString.Get("Preparing To Print");
|
||||
string preparingPrintLblFull = string.Format("{0}:", preparingPrintLbl);
|
||||
activePrintLabel.Text = preparingPrintLblFull;
|
||||
string preparingPrintLabel = LocalizedString.Get("Preparing To Print");
|
||||
string preparingPrintLabelFull = string.Format("{0}:", preparingPrintLabel);
|
||||
activePrintLabel.Text = preparingPrintLabelFull;
|
||||
//ActivePrintStatusText = ""; // set by slicer
|
||||
activePrintInfo.Text = "";
|
||||
break;
|
||||
|
|
@ -298,25 +298,25 @@ namespace MatterHackers.MatterControl.ActionBar
|
|||
|
||||
case PrinterCommunication.CommunicationStates.Paused:
|
||||
{
|
||||
string activePrintLblTxt = LocalizedString.Get ("Printing Paused");
|
||||
string activePrintLblTxtFull = string.Format("{0}:", activePrintLblTxt);
|
||||
activePrintLabel.Text = activePrintLblTxtFull;
|
||||
string activePrintLabelText = LocalizedString.Get ("Printing Paused");
|
||||
string activePrintLabelTextFull = string.Format("{0}:", activePrintLabelText);
|
||||
activePrintLabel.Text = activePrintLabelTextFull;
|
||||
ActivePrintStatusText = totalPrintTimeText;
|
||||
}
|
||||
break;
|
||||
|
||||
case PrinterCommunication.CommunicationStates.FinishedPrint:
|
||||
string donePrintingTxt = LocalizedString.Get ("Done Printing");
|
||||
string donePrintingTxtFull = string.Format ("{0}:", donePrintingTxt);
|
||||
activePrintLabel.Text = donePrintingTxtFull;
|
||||
string donePrintingText = LocalizedString.Get ("Done Printing");
|
||||
string donePrintingTextFull = string.Format ("{0}:", donePrintingText);
|
||||
activePrintLabel.Text = donePrintingTextFull;
|
||||
ActivePrintStatusText = totalPrintTimeText;
|
||||
break;
|
||||
|
||||
default:
|
||||
string nextPrintLblActive = LocalizedString.Get ("Next Print");
|
||||
string nextPrintLblActiveFull = string.Format("{0}: ", nextPrintLblActive);
|
||||
string nextPrintLabelActive = LocalizedString.Get ("Next Print");
|
||||
string nextPrintLabelActiveFull = string.Format("{0}: ", nextPrintLabelActive);
|
||||
|
||||
activePrintLabel.Text = nextPrintLblActiveFull;
|
||||
activePrintLabel.Text = nextPrintLabelActiveFull;
|
||||
ActivePrintStatusText = "";
|
||||
activePrintInfo.Text = "";
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ namespace MatterHackers.MatterControl
|
|||
private GuiWidget CreatePrintLevelingControlsContainer()
|
||||
{
|
||||
Button editButton;
|
||||
GroupBox printLevelingControlsContainer = new GroupBox(textImageButtonFactory.GenerateGroupBoxLableWithEdit(LocalizedString.Get("Automatic Calibration"), out editButton));
|
||||
GroupBox printLevelingControlsContainer = new GroupBox(textImageButtonFactory.GenerateGroupBoxLabelWithEdit(LocalizedString.Get("Automatic Calibration"), out editButton));
|
||||
editButton.Click += (sender, e) =>
|
||||
{
|
||||
if (editLevelingSettingsWindow == null)
|
||||
|
|
|
|||
|
|
@ -220,12 +220,12 @@ namespace MatterHackers.MatterControl
|
|||
{
|
||||
static string setZHeightCoarseInstruction1 = LocalizedString.Get("Using the [Z] controls on this screen, we will now take a coarse measurement of the extruder height at this position.");
|
||||
|
||||
static string setZHeightCourseInstructTxtOne = "Place the paper under the extruder".Localize();
|
||||
static string setZHeightCourseInstructTxtTwo = "Using the above contols".Localize();
|
||||
static string setZHeightCourseInstructTxtThree = LocalizedString.Get("Press [Z-] until there is resistance to moving the paper");
|
||||
static string setZHeightCourseInstructTxtFour = LocalizedString.Get("Press [Z+] once to release the paper");
|
||||
static string setZHeightCourseInstructTxtFive = LocalizedString.Get("Finally click 'Next' to continue.");
|
||||
static string setZHeightCoarseInstruction2 = string.Format("\t• {0}\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}", setZHeightCourseInstructTxtOne, setZHeightCourseInstructTxtTwo, setZHeightCourseInstructTxtThree,setZHeightCourseInstructTxtFour, setZHeightCourseInstructTxtFive);
|
||||
static string setZHeightCourseInstructTextOne = "Place the paper under the extruder".Localize();
|
||||
static string setZHeightCourseInstructTextTwo = "Using the above contols".Localize();
|
||||
static string setZHeightCourseInstructTextThree = LocalizedString.Get("Press [Z-] until there is resistance to moving the paper");
|
||||
static string setZHeightCourseInstructTextFour = LocalizedString.Get("Press [Z+] once to release the paper");
|
||||
static string setZHeightCourseInstructTextFive = LocalizedString.Get("Finally click 'Next' to continue.");
|
||||
static string setZHeightCoarseInstruction2 = string.Format("\t• {0}\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}", setZHeightCourseInstructTextOne, setZHeightCourseInstructTextTwo, setZHeightCourseInstructTextThree,setZHeightCourseInstructTextFour, setZHeightCourseInstructTextFive);
|
||||
|
||||
Vector3 probeStartPosition;
|
||||
WizardControl container;
|
||||
|
|
@ -265,10 +265,10 @@ namespace MatterHackers.MatterControl
|
|||
public class GetFineBedHeight : FindBedHeight
|
||||
{
|
||||
static string setZHeightFineInstruction1 = LocalizedString.Get("We will now refine our measurement of the extruder height at this position.");
|
||||
static string setZHeightFineInstructionTxtOne = LocalizedString.Get("Press [Z-] until there is resistance to moving the paper");
|
||||
static string setZHeightFineInstructionTxtTwo = LocalizedString.Get("Press [Z+] once to release the paper");
|
||||
static string setZHeightFineInstructionTxtThree = LocalizedString.Get("Finally click 'Next' to continue.");
|
||||
static string setZHeightFineInstruction2 = string.Format("\t• {0}\n\t• {1}\n\n{2}",setZHeightFineInstructionTxtOne, setZHeightFineInstructionTxtTwo, setZHeightFineInstructionTxtThree);
|
||||
static string setZHeightFineInstructionTextOne = LocalizedString.Get("Press [Z-] until there is resistance to moving the paper");
|
||||
static string setZHeightFineInstructionTextTwo = LocalizedString.Get("Press [Z+] once to release the paper");
|
||||
static string setZHeightFineInstructionTextThree = LocalizedString.Get("Finally click 'Next' to continue.");
|
||||
static string setZHeightFineInstruction2 = string.Format("\t• {0}\n\t• {1}\n\n{2}",setZHeightFineInstructionTextOne, setZHeightFineInstructionTextTwo, setZHeightFineInstructionTextThree);
|
||||
|
||||
public GetFineBedHeight(string instructionsText, ProbePosition whereToWriteProbePosition)
|
||||
: base(instructionsText, setZHeightFineInstruction1, setZHeightFineInstruction2, .1, whereToWriteProbePosition)
|
||||
|
|
@ -279,9 +279,9 @@ namespace MatterHackers.MatterControl
|
|||
public class GetUltraFineBedHeight : FindBedHeight
|
||||
{
|
||||
static string setZHeightFineInstruction1 = LocalizedString.Get("We will now finalize our measurement of the extruder height at this position.");
|
||||
static string setHeightFineInstructionTxtOne = LocalizedString.Get("Press [Z-] one click PAST the first hint of resistance");
|
||||
static string setHeightFineInstructionTxtTwo = LocalizedString.Get("Finally click 'Next' to continue.");
|
||||
static string setZHeightFineInstruction2 = string.Format("\t• {0}\n\n\n{1}", setHeightFineInstructionTxtOne, setHeightFineInstructionTxtTwo);
|
||||
static string setHeightFineInstructionTextOne = LocalizedString.Get("Press [Z-] one click PAST the first hint of resistance");
|
||||
static string setHeightFineInstructionTextTwo = LocalizedString.Get("Finally click 'Next' to continue.");
|
||||
static string setZHeightFineInstruction2 = string.Format("\t• {0}\n\n\n{1}", setHeightFineInstructionTextOne, setHeightFineInstructionTextTwo);
|
||||
|
||||
public GetUltraFineBedHeight(string instructionsText, ProbePosition whereToWriteProbePosition)
|
||||
: base(instructionsText, setZHeightFineInstruction1, setZHeightFineInstruction2, .02, whereToWriteProbePosition)
|
||||
|
|
@ -310,31 +310,31 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
public class PrintLevelWizardWindow : SystemWindow
|
||||
{
|
||||
string pageOneInstructionsTxtOne = LocalizedString.Get("Welcome to the print leveling wizard. Here is a quick overview on what we are going to do.");
|
||||
string pageOneInstructionsTxtTwo = LocalizedString.Get("'Home' the printer");
|
||||
string pageOneInstructionsTxtThree = LocalizedString.Get("Sample the bed at three points");
|
||||
string pageOneInstructionsTxtFour = LocalizedString.Get("Turn auto leveling on");
|
||||
string pageOneInstructionsTxtFive = LocalizedString.Get("You should be done in about 3 minutes.");
|
||||
string pageOneInstructionsTxtSix = LocalizedString.Get("Click 'Next' to continue.");
|
||||
string pageOneInstructionsTextOne = LocalizedString.Get("Welcome to the print leveling wizard. Here is a quick overview on what we are going to do.");
|
||||
string pageOneInstructionsTextTwo = LocalizedString.Get("'Home' the printer");
|
||||
string pageOneInstructionsTextThree = LocalizedString.Get("Sample the bed at three points");
|
||||
string pageOneInstructionsTextFour = LocalizedString.Get("Turn auto leveling on");
|
||||
string pageOneInstructionsTextFive = LocalizedString.Get("You should be done in about 3 minutes.");
|
||||
string pageOneInstructionsTextSix = LocalizedString.Get("Click 'Next' to continue.");
|
||||
string pageOneInstructions;
|
||||
|
||||
string homingPageInstructionsTxtOne = LocalizedString.Get("The printer should now be 'homing'. Once it is finished homing we will move it to the first point to sample.\n\nTo complete the next few steps you will need");
|
||||
string homingPageInstructionsTxtTwo = LocalizedString.Get("A standard sheet of paper");
|
||||
string homingPageInstructionsTxtThree = LocalizedString.Get("We will use this paper to measure the distance between the extruder and the bed.\n\nClick 'Next' to continue.");
|
||||
string homingPageInstructionsTextOne = LocalizedString.Get("The printer should now be 'homing'. Once it is finished homing we will move it to the first point to sample.\n\nTo complete the next few steps you will need");
|
||||
string homingPageInstructionsTextTwo = LocalizedString.Get("A standard sheet of paper");
|
||||
string homingPageInstructionsTextThree = LocalizedString.Get("We will use this paper to measure the distance between the extruder and the bed.\n\nClick 'Next' to continue.");
|
||||
string homingPageInstructions;
|
||||
|
||||
string doneInstructionsTxt = LocalizedString.Get("Congratulations!\n\nAuto Print Leveling is now configured and enabled.");
|
||||
string doneInstructionsTxtTwo = LocalizedString.Get("Remove the paper");
|
||||
string doneInstructionsTxtThree = LocalizedString.Get("If in the future you wish to turn Auto Print Leveling off, you can uncheck the 'Enabled' button found in 'Advanced Settings'->'Printer Controls'.\n\nClick 'Done' to close this window.");
|
||||
string doneInstructionsText = LocalizedString.Get("Congratulations!\n\nAuto Print Leveling is now configured and enabled.");
|
||||
string doneInstructionsTextTwo = LocalizedString.Get("Remove the paper");
|
||||
string doneInstructionsTextThree = LocalizedString.Get("If in the future you wish to turn Auto Print Leveling off, you can uncheck the 'Enabled' button found in 'Advanced Settings'->'Printer Controls'.\n\nClick 'Done' to close this window.");
|
||||
string doneInstructions;
|
||||
|
||||
WizardControl printLevelWizard;
|
||||
public PrintLevelWizardWindow()
|
||||
: base(500, 370)
|
||||
{
|
||||
pageOneInstructions = string.Format("{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}",pageOneInstructionsTxtOne, pageOneInstructionsTxtTwo, pageOneInstructionsTxtThree, pageOneInstructionsTxtFour, pageOneInstructionsTxtFive, pageOneInstructionsTxtSix);
|
||||
homingPageInstructions = string.Format("{0}:\n\n\t• {1}\n\n{2}", homingPageInstructionsTxtOne, homingPageInstructionsTxtTwo, homingPageInstructionsTxtThree);
|
||||
doneInstructions = string.Format("{0}\n\n\t• {1}\n\n{2}",doneInstructionsTxt, doneInstructionsTxtTwo, doneInstructionsTxtThree);
|
||||
pageOneInstructions = string.Format("{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}",pageOneInstructionsTextOne, pageOneInstructionsTextTwo, pageOneInstructionsTextThree, pageOneInstructionsTextFour, pageOneInstructionsTextFive, pageOneInstructionsTextSix);
|
||||
homingPageInstructions = string.Format("{0}:\n\n\t• {1}\n\n{2}", homingPageInstructionsTextOne, homingPageInstructionsTextTwo, homingPageInstructionsTextThree);
|
||||
doneInstructions = string.Format("{0}\n\n\t• {1}\n\n{2}",doneInstructionsText, doneInstructionsTextTwo, doneInstructionsTextThree);
|
||||
|
||||
string printLevelWizardTitle = LocalizedString.Get("MatterControl");
|
||||
string printLevelWizardTitleFull = LocalizedString.Get ("Print Leveling Wizard");
|
||||
|
|
@ -353,37 +353,37 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
Vector2 probeBackCenter = ActiveSliceSettings.Instance.GetPrintLevelPositionToSample(0);
|
||||
|
||||
string lowPrecisionPositionLbl = LocalizedString.Get ("Position");
|
||||
string lowPrecisionLbl = LocalizedString.Get ("Low Precision");
|
||||
string lowPrecisionPositionLabel = LocalizedString.Get ("Position");
|
||||
string lowPrecisionLabel = LocalizedString.Get ("Low Precision");
|
||||
GetCoarseBedHeight getCourseBedHeight = new GetCoarseBedHeight (printLevelWizard,
|
||||
new Vector3 (probeBackCenter, 10),
|
||||
string.Format ("{0} {1} 1 - {2}", Step (),lowPrecisionPositionLbl, lowPrecisionLbl),
|
||||
string.Format ("{0} {1} 1 - {2}", Step (),lowPrecisionPositionLabel, lowPrecisionLabel),
|
||||
probePositions [0]);
|
||||
|
||||
printLevelWizard.AddPage(getCourseBedHeight);
|
||||
string precisionPositionLbl = LocalizedString.Get("Position");
|
||||
string medPrecisionLbl = LocalizedString.Get("Medium Precision");
|
||||
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} {1} 1 - {2}", Step(), precisionPositionLbl, medPrecisionLbl), probePositions[0]));
|
||||
string highPrecisionLbl = LocalizedString.Get("High Precision");
|
||||
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} {1} 1 - {2}", Step(), precisionPositionLbl, highPrecisionLbl), probePositions[0]));
|
||||
string precisionPositionLabel = LocalizedString.Get("Position");
|
||||
string medPrecisionLabel = LocalizedString.Get("Medium Precision");
|
||||
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} {1} 1 - {2}", Step(), precisionPositionLabel, medPrecisionLabel), probePositions[0]));
|
||||
string highPrecisionLabel = LocalizedString.Get("High Precision");
|
||||
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} {1} 1 - {2}", Step(), precisionPositionLabel, highPrecisionLabel), probePositions[0]));
|
||||
|
||||
Vector2 probeFrontLeft = ActiveSliceSettings.Instance.GetPrintLevelPositionToSample(1);
|
||||
string positionLblTwo = LocalizedString.Get("Position");
|
||||
string lowPrecisionTwoLbl = LocalizedString.Get("Low Precision");
|
||||
string medPrecisionTwoLbl = LocalizedString.Get("Medium Precision");
|
||||
string highPrecisionTwoLbl = LocalizedString.Get("High Precision");
|
||||
printLevelWizard.AddPage(new GetCoarseBedHeight(printLevelWizard, new Vector3(probeFrontLeft, 10), string.Format("{0} {1} 2 - {2}", Step(), positionLblTwo, lowPrecisionTwoLbl ), probePositions[1]));
|
||||
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} {1} 2 - {2}", Step(), positionLblTwo,medPrecisionTwoLbl), probePositions[1]));
|
||||
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} {1} 2 - {2}", Step(), positionLblTwo,highPrecisionTwoLbl), probePositions[1]));
|
||||
string positionLabelTwo = LocalizedString.Get("Position");
|
||||
string lowPrecisionTwoLabel = LocalizedString.Get("Low Precision");
|
||||
string medPrecisionTwoLabel = LocalizedString.Get("Medium Precision");
|
||||
string highPrecisionTwoLabel = LocalizedString.Get("High Precision");
|
||||
printLevelWizard.AddPage(new GetCoarseBedHeight(printLevelWizard, new Vector3(probeFrontLeft, 10), string.Format("{0} {1} 2 - {2}", Step(), positionLabelTwo, lowPrecisionTwoLabel ), probePositions[1]));
|
||||
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} {1} 2 - {2}", Step(), positionLabelTwo,medPrecisionTwoLabel), probePositions[1]));
|
||||
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} {1} 2 - {2}", Step(), positionLabelTwo,highPrecisionTwoLabel), probePositions[1]));
|
||||
|
||||
Vector2 probeFrontRight = ActiveSliceSettings.Instance.GetPrintLevelPositionToSample(2);
|
||||
string positionLabelThree = LocalizedString.Get("Position");
|
||||
string lowPrecisionLblThree = LocalizedString.Get("Low Precision");
|
||||
string medPrecisionLblThree = LocalizedString.Get("Medium Precision");
|
||||
string highPrecisionLblThree = LocalizedString.Get("High Precision");
|
||||
printLevelWizard.AddPage(new GetCoarseBedHeight(printLevelWizard, new Vector3(probeFrontRight, 10), string.Format("{0} {1} 3 - {2}", Step(), positionLabelThree, lowPrecisionLblThree), probePositions[2]));
|
||||
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} {1} 3 - {2}", Step(),positionLabelThree, medPrecisionLblThree ), probePositions[2]));
|
||||
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} {1} 3 - {2}", Step(), positionLabelThree, highPrecisionLblThree ), probePositions[2]));
|
||||
string lowPrecisionLabelThree = LocalizedString.Get("Low Precision");
|
||||
string medPrecisionLabelThree = LocalizedString.Get("Medium Precision");
|
||||
string highPrecisionLabelThree = LocalizedString.Get("High Precision");
|
||||
printLevelWizard.AddPage(new GetCoarseBedHeight(printLevelWizard, new Vector3(probeFrontRight, 10), string.Format("{0} {1} 3 - {2}", Step(), positionLabelThree, lowPrecisionLabelThree), probePositions[2]));
|
||||
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} {1} 3 - {2}", Step(),positionLabelThree, medPrecisionLabelThree ), probePositions[2]));
|
||||
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} {1} 3 - {2}", Step(), positionLabelThree, highPrecisionLabelThree ), probePositions[2]));
|
||||
|
||||
printLevelWizard.AddPage(new LastPageInstructions(doneInstructions, probePositions));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ namespace MatterHackers.MatterControl
|
|||
return buffer;
|
||||
}
|
||||
|
||||
public GuiWidget GenerateGroupBoxLableWithEdit(string label, out Button editButton)
|
||||
public GuiWidget GenerateGroupBoxLabelWithEdit(string label, out Button editButton)
|
||||
{
|
||||
FlowLayoutWidget groupLableAndEditControl = new FlowLayoutWidget();
|
||||
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@ namespace MatterHackers.MatterControl
|
|||
headerContainer.Margin = new BorderDouble (0, 3, 0, 0);
|
||||
headerContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
|
||||
string exportLblTxt = LocalizedString.Get ("File export options");
|
||||
string exportLblTxtFull = string.Format ("{0}:", exportLblTxt);
|
||||
TextWidget exportLabel = new TextWidget(exportLblTxtFull);
|
||||
string exportLabelText = LocalizedString.Get ("File export options");
|
||||
string exportLabelTextFull = string.Format ("{0}:", exportLabelText);
|
||||
TextWidget exportLabel = new TextWidget(exportLabelTextFull);
|
||||
exportLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
headerContainer.AddChild (exportLabel);
|
||||
topToBottom.AddChild(headerContainer);
|
||||
|
|
@ -82,10 +82,10 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
if (!partIsGCode)
|
||||
{
|
||||
string exportStlTxt = LocalizedString.Get("Export as");
|
||||
string exportStlTxtFull = string.Format("{0} STL", exportStlTxt);
|
||||
string exportStlText = LocalizedString.Get("Export as");
|
||||
string exportStlTextFull = string.Format("{0} STL", exportStlText);
|
||||
|
||||
Button exportAsStlButton = textImageButtonFactory.Generate(exportStlTxtFull);
|
||||
Button exportAsStlButton = textImageButtonFactory.Generate(exportStlTextFull);
|
||||
exportAsStlButton.Click += new ButtonBase.ButtonEventHandler(exportSTL_Click);
|
||||
exportSTLGCodeButtonsContainer.AddChild (exportAsStlButton);
|
||||
}
|
||||
|
|
@ -108,10 +108,10 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
if (!showExportGCodeButton)
|
||||
{
|
||||
string noGCodeMessageTxtBeg = LocalizedString.Get("Note");
|
||||
string noGCodeMessageTxtEnd = LocalizedString.Get ("To enable GCode export, select a printer profile.");
|
||||
string noGCodeMessageTxtFull = string.Format ("{0}: {1}", noGCodeMessageTxtBeg, noGCodeMessageTxtEnd);
|
||||
TextWidget noGCodeMessage = new TextWidget(noGCodeMessageTxtFull, textColor:ActiveTheme.Instance.PrimaryTextColor, pointSize: 10);
|
||||
string noGCodeMessageTextBeg = LocalizedString.Get("Note");
|
||||
string noGCodeMessageTextEnd = LocalizedString.Get ("To enable GCode export, select a printer profile.");
|
||||
string noGCodeMessageTextFull = string.Format ("{0}: {1}", noGCodeMessageTextBeg, noGCodeMessageTextEnd);
|
||||
TextWidget noGCodeMessage = new TextWidget(noGCodeMessageTextFull, textColor:ActiveTheme.Instance.PrimaryTextColor, pointSize: 10);
|
||||
exportSTLGCodeButtonsContainer.AddChild(noGCodeMessage);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -295,10 +295,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
|
||||
//modelInfoContainer.AddChild(new TextWidget("Size:", textColor: ActiveTheme.Instance.PrimaryTextColor));
|
||||
|
||||
string filamentLengthLbl = "Filament Length".Localize().ToUpper();
|
||||
string filamentLengthLblFull = string.Format ("{0}:", filamentLengthLbl);
|
||||
string filamentLengthLabel = "Filament Length".Localize().ToUpper();
|
||||
string filamentLengthLabelFull = string.Format ("{0}:", filamentLengthLabel);
|
||||
// show the filament used
|
||||
modelInfoContainer.AddChild(new TextWidget(filamentLengthLblFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9));
|
||||
modelInfoContainer.AddChild(new TextWidget(filamentLengthLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9));
|
||||
{
|
||||
double filamentUsed = gcodeViewWidget.LoadedGCode.GetFilamentUsedMm(ActiveSliceSettings.Instance.NozzleDiameter);
|
||||
|
||||
|
|
|
|||
|
|
@ -61,11 +61,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
|
||||
double buildHeight = ActiveSliceSettings.Instance.BuildHeight;
|
||||
|
||||
string part3DViewLblBeg = ("3D");
|
||||
string part3DViewLblEnd = LocalizedString.Get ("View");
|
||||
string part3DViewLblFull = string.Format("{0} {1} ", part3DViewLblBeg, part3DViewLblEnd);
|
||||
string part3DViewLabelBegining = ("3D");
|
||||
string part3DViewLabelEnd = LocalizedString.Get ("View");
|
||||
string part3DViewLabelFull = string.Format("{0} {1} ", part3DViewLabelBegining, part3DViewLabelEnd);
|
||||
part3DView = new View3DTransformPart(printItem, new Vector3(ActiveSliceSettings.Instance.BedSize, buildHeight), ActiveSliceSettings.Instance.BedShape, true);
|
||||
TabPage partPreview3DView = new TabPage(part3DView, part3DViewLblFull);
|
||||
TabPage partPreview3DView = new TabPage(part3DView, part3DViewLabelFull);
|
||||
|
||||
partGcodeView = new GcodeViewBasic(printItem, ActiveSliceSettings.Instance.GetBedSize, ActiveSliceSettings.Instance.GetBedCenter, true);
|
||||
TabPage layerView = new TabPage(partGcodeView, LocalizedString.Get("Layer View"));
|
||||
|
|
|
|||
|
|
@ -289,10 +289,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
{
|
||||
FlowLayoutWidget editToolBar = new FlowLayoutWidget();
|
||||
|
||||
string progressFindPartsLbl = LocalizedString.Get("Finding Parts");
|
||||
string progressFindPartsLblFull = "{0}:".FormatWith(progressFindPartsLbl);
|
||||
string progressFindPartsLabel = LocalizedString.Get("Finding Parts");
|
||||
string progressFindPartsLabelFull = "{0}:".FormatWith(progressFindPartsLabel);
|
||||
|
||||
processingProgressControl = new ProgressControl(progressFindPartsLblFull);
|
||||
processingProgressControl = new ProgressControl(progressFindPartsLabelFull);
|
||||
processingProgressControl.VAnchor = Agg.UI.VAnchor.ParentCenter;
|
||||
editToolBar.AddChild(processingProgressControl);
|
||||
editToolBar.VAnchor |= Agg.UI.VAnchor.ParentCenter;
|
||||
|
|
@ -958,9 +958,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
};
|
||||
|
||||
PartInfoOptionContainer.Margin = new BorderDouble(8, 3);
|
||||
string sizeInfoLbl = LocalizedString.Get("Size");
|
||||
string sizeInfoLblFull = "{0}:".FormatWith(sizeInfoLbl);
|
||||
TextWidget sizeInfo = new TextWidget(sizeInfoLblFull, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
string sizeInfoLabel = LocalizedString.Get("Size");
|
||||
string sizeInfoLabelFull = "{0}:".FormatWith(sizeInfoLabel);
|
||||
TextWidget sizeInfo = new TextWidget(sizeInfoLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
PartInfoOptionContainer.AddChild(sizeInfo);
|
||||
TextWidget xSizeInfo = new TextWidget(" x 10.1", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
xSizeInfo.AutoExpandBoundsToText = true;
|
||||
|
|
@ -1102,9 +1102,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
scaleRatioContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
scaleRatioContainer.Padding = new BorderDouble(5);
|
||||
|
||||
string scaleRatioLblTxt = LocalizedString.Get("Ratio");
|
||||
string scaleRatioLblTxtFull = "{0}:".FormatWith(scaleRatioLblTxt);
|
||||
TextWidget scaleRatioLabel = new TextWidget(scaleRatioLblTxtFull, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
string scaleRatioLabelText = LocalizedString.Get("Ratio");
|
||||
string scaleRatioLabelTextFull = "{0}:".FormatWith(scaleRatioLabelText);
|
||||
TextWidget scaleRatioLabel = new TextWidget(scaleRatioLabelTextFull, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
scaleRatioLabel.VAnchor = VAnchor.ParentCenter;
|
||||
scaleRatioContainer.AddChild(scaleRatioLabel);
|
||||
|
||||
|
|
@ -1279,9 +1279,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
GuiWidget horizontalSpacer = new GuiWidget();
|
||||
horizontalSpacer.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
string degreesLabelTxt = LocalizedString.Get("Degrees");
|
||||
string degreesLabelTxtFull = "{0}:".FormatWith(degreesLabelTxt);
|
||||
TextWidget degreesLabel = new TextWidget(degreesLabelTxt, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
string degreesLabelText = LocalizedString.Get("Degrees");
|
||||
string degreesLabelTextFull = "{0}:".FormatWith(degreesLabelText);
|
||||
TextWidget degreesLabel = new TextWidget(degreesLabelText, textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
degreesContainer.AddChild(degreesLabel);
|
||||
degreesContainer.AddChild(horizontalSpacer);
|
||||
|
||||
|
|
@ -1474,9 +1474,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
{
|
||||
partSelectButtonWasClicked = partSelectButton.Checked;
|
||||
|
||||
string progressSavingPartslbl = LocalizedString.Get ("Saving");
|
||||
string progressSavingPartsLblFull = "{0}:".FormatWith(progressSavingPartslbl);
|
||||
processingProgressControl.textWidget.Text = progressSavingPartsLblFull;
|
||||
string progressSavingPartsLabel = LocalizedString.Get("Saving");
|
||||
string progressSavingPartsLabelFull = "{0}:".FormatWith(progressSavingPartsLabel);
|
||||
processingProgressControl.textWidget.Text = progressSavingPartsLabelFull;
|
||||
processingProgressControl.Visible = true;
|
||||
processingProgressControl.PercentComplete = 0;
|
||||
LockEditControls();
|
||||
|
|
|
|||
|
|
@ -71,10 +71,10 @@ namespace MatterHackers.MatterControl.CreatorPlugins
|
|||
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
|
||||
{
|
||||
string elementHeaderLblBeg = LocalizedString.Get("Select a Design Tool");
|
||||
string elementHeaderLblFull = string.Format("{0}:", elementHeaderLblBeg);
|
||||
string elementHeaderLbl = elementHeaderLblFull;
|
||||
TextWidget elementHeader = new TextWidget(string.Format(elementHeaderLbl), pointSize: 14);
|
||||
string elementHeaderLabelBeg = LocalizedString.Get("Select a Design Tool");
|
||||
string elementHeaderLabelFull = string.Format("{0}:", elementHeaderLabelBeg);
|
||||
string elementHeaderLabel = elementHeaderLabelFull;
|
||||
TextWidget elementHeader = new TextWidget(string.Format(elementHeaderLabel), pointSize: 14);
|
||||
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
elementHeader.HAnchor = HAnchor.ParentLeftRight;
|
||||
elementHeader.VAnchor = Agg.UI.VAnchor.ParentBottom;
|
||||
|
|
|
|||
|
|
@ -90,11 +90,11 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
partLabel.TextColor = WidgetTextColor;
|
||||
partLabel.MinimumSize = new Vector2(1, 16);
|
||||
|
||||
string partStatusLblTxt = LocalizedString.Get ("Status").ToUpper();
|
||||
string partStatusLblTxtTest = LocalizedString.Get ("Queued to Print");
|
||||
string partStatusLblTxtFull = "{0}: {1}".FormatWith(partStatusLblTxt,partStatusLblTxtTest);
|
||||
string partStatusLabelTxt = LocalizedString.Get ("Status").ToUpper();
|
||||
string partStatusLabelTxtTest = LocalizedString.Get ("Queued to Print");
|
||||
string partStatusLabelTxtFull = "{0}: {1}".FormatWith(partStatusLabelTxt,partStatusLabelTxtTest);
|
||||
|
||||
partStatus = new TextWidget(partStatusLblTxtFull, pointSize: 10);
|
||||
partStatus = new TextWidget(partStatusLabelTxtFull, pointSize: 10);
|
||||
partStatus.AutoExpandBoundsToText = true;
|
||||
partStatus.TextColor = WidgetTextColor;
|
||||
partStatus.MinimumSize = new Vector2(50, 12);
|
||||
|
|
@ -425,8 +425,8 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
string notFoundMessage = LocalizedString.Get("Oops! Could not find this file");
|
||||
string notFoundMessageEnd = LocalizedString.Get("Would you like to remove it from the queue");
|
||||
string message = "{0}:\n'{1}'\n\n{2}?".FormatWith(notFoundMessage, maxLengthName,notFoundMessageEnd);
|
||||
string titleLbl = LocalizedString.Get("Item not Found");
|
||||
if (StyledMessageBox.ShowMessageBox(message, titleLbl, StyledMessageBox.MessageType.YES_NO))
|
||||
string titleLabel = LocalizedString.Get("Item not Found");
|
||||
if (StyledMessageBox.ShowMessageBox(message, titleLabel, StyledMessageBox.MessageType.YES_NO))
|
||||
{
|
||||
PrintQueueControl.Instance.RemoveIndex(PrintQueueControl.Instance.GetIndex(printItem));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,9 +119,9 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Parts Sheet|*.pdf");
|
||||
|
||||
saveParams.ActionButtonLabel = LocalizedString.Get("Save Parts Sheet");
|
||||
string saveParamsTitleLable = "MatterControl".Localize();
|
||||
string saveParamsTitleLblFull = LocalizedString.Get ("Save");
|
||||
saveParams.Title = string.Format("{0}: {1}",saveParamsTitleLable,saveParamsTitleLblFull);
|
||||
string saveParamsTitleLabel = "MatterControl".Localize();
|
||||
string saveParamsTitleLabelFull = LocalizedString.Get ("Save");
|
||||
saveParams.Title = string.Format("{0}: {1}",saveParamsTitleLabel,saveParamsTitleLabelFull);
|
||||
|
||||
System.IO.Stream streamToSaveTo = FileDialog.SaveFileDialog(ref saveParams);
|
||||
if (streamToSaveTo != null)
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ namespace MatterHackers.MatterControl
|
|||
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
|
||||
{
|
||||
string movementSpeedsLbl = LocalizedString.Get("Sampled Positions".Localize());
|
||||
TextWidget elementHeader = new TextWidget(string.Format("{0}:", movementSpeedsLbl), pointSize: 14);
|
||||
string movementSpeedsLabel = LocalizedString.Get("Sampled Positions".Localize());
|
||||
TextWidget elementHeader = new TextWidget(string.Format("{0}:", movementSpeedsLabel), pointSize: 14);
|
||||
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
elementHeader.HAnchor = HAnchor.ParentLeftRight;
|
||||
elementHeader.VAnchor = Agg.UI.VAnchor.ParentBottom;
|
||||
|
|
|
|||
|
|
@ -144,9 +144,9 @@ namespace MatterHackers.MatterControl
|
|||
macroNameInput = new MHTextEditWidget(windowController.ActiveMacro.Name);
|
||||
macroNameInput.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
string giveMacroANameLbl = LocalizedString.Get("Give your macro a name");
|
||||
string giveMacroANameLblFull = string.Format ("{0}.", giveMacroANameLbl);
|
||||
macroNameError = new TextWidget(giveMacroANameLblFull, 0, 0, 10);
|
||||
string giveMacroANameLabel = LocalizedString.Get("Give your macro a name");
|
||||
string giveMacroANameLabelFull = string.Format("{0}.", giveMacroANameLabel);
|
||||
macroNameError = new TextWidget(giveMacroANameLabelFull, 0, 0, 10);
|
||||
macroNameError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
macroNameError.HAnchor = HAnchor.ParentLeftRight;
|
||||
macroNameError.Margin = elementMargin;
|
||||
|
|
@ -164,9 +164,9 @@ namespace MatterHackers.MatterControl
|
|||
container.Margin = new BorderDouble(0, 5);
|
||||
BorderDouble elementMargin = new BorderDouble(top: 3);
|
||||
|
||||
string macroCommandLblTxt = LocalizedString.Get("Macro Commands");
|
||||
string macroCommandLblTxtFull = string.Format ("{0}:", macroCommandLblTxt);
|
||||
TextWidget macroCommandLabel = new TextWidget(macroCommandLblTxtFull, 0, 0, 12);
|
||||
string macroCommandLabelTxt = LocalizedString.Get("Macro Commands");
|
||||
string macroCommandLabelTxtFull = string.Format("{0}:", macroCommandLabelTxt);
|
||||
TextWidget macroCommandLabel = new TextWidget(macroCommandLabelTxtFull, 0, 0, 12);
|
||||
macroCommandLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
macroCommandLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
macroCommandLabel.Margin = new BorderDouble(0, 0, 0, 1);
|
||||
|
|
@ -174,9 +174,9 @@ namespace MatterHackers.MatterControl
|
|||
macroCommandInput = new MHTextEditWidget(windowController.ActiveMacro.Value, pixelHeight: 120, multiLine: true);
|
||||
macroCommandInput.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
string shouldBeGCodeLbl = LocalizedString.Get("This should be in 'Gcode'");
|
||||
string shouldBeGCodeLblFull = string.Format("{0}.", shouldBeGCodeLbl);
|
||||
macroCommandError = new TextWidget(shouldBeGCodeLblFull, 0, 0, 10);
|
||||
string shouldBeGCodeLabel = LocalizedString.Get("This should be in 'Gcode'");
|
||||
string shouldBeGCodeLabelFull = string.Format("{0}.", shouldBeGCodeLabel);
|
||||
macroCommandError = new TextWidget(shouldBeGCodeLabelFull, 0, 0, 10);
|
||||
macroCommandError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
macroCommandError.HAnchor = HAnchor.ParentLeftRight;
|
||||
macroCommandError.Margin = elementMargin;
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ namespace MatterHackers.MatterControl
|
|||
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
|
||||
{
|
||||
string movementSpeedsLbl = LocalizedString.Get("Movement Speeds Presets".Localize());
|
||||
TextWidget elementHeader = new TextWidget(string.Format("{0}:",movementSpeedsLbl), pointSize: 14);
|
||||
string movementSpeedsLabel = LocalizedString.Get("Movement Speeds Presets".Localize());
|
||||
TextWidget elementHeader = new TextWidget(string.Format("{0}:", movementSpeedsLabel), pointSize: 14);
|
||||
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
elementHeader.HAnchor = HAnchor.ParentLeftRight;
|
||||
elementHeader.VAnchor = Agg.UI.VAnchor.ParentBottom;
|
||||
|
|
@ -133,13 +133,13 @@ namespace MatterHackers.MatterControl
|
|||
if (settingsArray[i].StartsWith("e"))
|
||||
{
|
||||
int extruderIndex = (int)double.Parse(settingsArray[i].Substring(1)) + 1;
|
||||
string extruderLblTxt = LocalizedString.Get("Extruder");
|
||||
axisLabel = new TextWidget(string.Format("{0} {1}",extruderLblTxt ,extruderIndex), textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
string extruderLabelTxt = LocalizedString.Get("Extruder");
|
||||
axisLabel = new TextWidget(string.Format("{0} {1}", extruderLabelTxt, extruderIndex), textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
}
|
||||
else
|
||||
{
|
||||
string axisLblText = LocalizedString.Get("Axis");
|
||||
axisLabel = new TextWidget(string.Format("{0} {1}",axisLblText, settingsArray[i]), textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
string axisLabelText = LocalizedString.Get("Axis");
|
||||
axisLabel = new TextWidget(string.Format("{0} {1}", axisLabelText, settingsArray[i]), textColor: ActiveTheme.Instance.PrimaryTextColor);
|
||||
}
|
||||
axisLabel.VAnchor = VAnchor.ParentCenter;
|
||||
leftRightEdit.AddChild(axisLabel);
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@ namespace MatterHackers.MatterControl
|
|||
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
|
||||
{
|
||||
string tempShortcutPresetLbl = LocalizedString.Get("Temperature Shortcut Presets");
|
||||
string tempShortcutPresetLblFull = string.Format ("{0}:", tempShortcutPresetLbl);
|
||||
TextWidget elementHeader = new TextWidget(tempShortcutPresetLblFull, pointSize: 14);
|
||||
string tempShortcutPresetLabel = LocalizedString.Get("Temperature Shortcut Presets");
|
||||
string tempShortcutPresetLabelFull = string.Format("{0}:", tempShortcutPresetLabel);
|
||||
TextWidget elementHeader = new TextWidget(tempShortcutPresetLabelFull, pointSize: 14);
|
||||
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
elementHeader.HAnchor = HAnchor.ParentLeftRight;
|
||||
elementHeader.VAnchor = Agg.UI.VAnchor.ParentBottom;
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl
|
|||
void AddChildElements()
|
||||
{
|
||||
Button editButton;
|
||||
GroupBox groupBox = new GroupBox(textImageButtonFactory.GenerateGroupBoxLableWithEdit(LocalizedString.Get("Macros"), out editButton));
|
||||
GroupBox groupBox = new GroupBox(textImageButtonFactory.GenerateGroupBoxLabelWithEdit(LocalizedString.Get("Macros"), out editButton));
|
||||
editButton.Click += (sender, e) =>
|
||||
{
|
||||
if (editSettingsWindow == null)
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@ namespace MatterHackers.MatterControl
|
|||
private void AddMovementControls(FlowLayoutWidget controlsTopToBottomLayout)
|
||||
{
|
||||
Button editButton;
|
||||
GroupBox movementControlsGroupBox = new GroupBox(textImageButtonFactory.GenerateGroupBoxLableWithEdit("Movement Controls".Localize(), out editButton));
|
||||
GroupBox movementControlsGroupBox = new GroupBox(textImageButtonFactory.GenerateGroupBoxLabelWithEdit("Movement Controls".Localize(), out editButton));
|
||||
editButton.Click += (sender, e) =>
|
||||
{
|
||||
if (editManualMovementSettingsWindow == null)
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
public PrinterChooser(string selectedMake = null)
|
||||
{
|
||||
string defaultManufacturerLbl = LocalizedString.Get ("Select Make");
|
||||
string defaultManufacturerLblFull = string.Format ("- {0} -", defaultManufacturerLbl);
|
||||
ManufacturerDropList = new StyledDropDownList(defaultManufacturerLblFull);
|
||||
string defaultManufacturerLabel = LocalizedString.Get("Select Make");
|
||||
string defaultManufacturerLabelFull = string.Format("- {0} -", defaultManufacturerLabel);
|
||||
ManufacturerDropList = new StyledDropDownList(defaultManufacturerLabelFull);
|
||||
bool addOther = false;
|
||||
string pathToWhitelist = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "OEMSettings", "PrinterSettingsWhitelist.txt");
|
||||
string[] folderWhitelist = File.ReadAllLines(pathToWhitelist);
|
||||
|
|
@ -82,9 +82,9 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
public ModelChooser(string manufacturer)
|
||||
{
|
||||
string defaultModelDropDownLbl = LocalizedString.Get("Select Model");
|
||||
string defaultModelDropDownLblFull = string.Format("- {0} -", defaultModelDropDownLbl);
|
||||
ModelDropList = new StyledDropDownList(defaultModelDropDownLblFull);
|
||||
string defaultModelDropDownLabel = LocalizedString.Get("Select Model");
|
||||
string defaultModelDropDownLabelFull = string.Format("- {0} -", defaultModelDropDownLabel);
|
||||
ModelDropList = new StyledDropDownList(defaultModelDropDownLabelFull);
|
||||
string pathToModels = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "PrinterSettings", manufacturer);
|
||||
if (Directory.Exists(pathToModels))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -264,9 +264,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
this.ActivePrinter.Commit();
|
||||
printerComPortHelpLink.Visible = false;
|
||||
printerComPortError.TextColor = RGBA_Bytes.White;
|
||||
string printerComPortErrorLbl = LocalizedString.Get("Attempting to connect");
|
||||
string printerComPortErrorLblFull = string.Format("{0}...",printerComPortErrorLbl);
|
||||
printerComPortError.Text = printerComPortErrorLblFull;
|
||||
string printerComPortErrorLabel = LocalizedString.Get("Attempting to connect");
|
||||
string printerComPortErrorLabelFull = string.Format("{0}...",printerComPortErrorLabel);
|
||||
printerComPortError.Text = printerComPortErrorLabelFull;
|
||||
ActivePrinterProfile.Instance.ActivePrinter = this.ActivePrinter;
|
||||
PrinterCommunication.Instance.ConnectToActivePrinter();
|
||||
connectButton.Visible = false;
|
||||
|
|
|
|||
|
|
@ -161,16 +161,16 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
if (candidatePort == null)
|
||||
{
|
||||
printerErrorMessage.TextColor = RGBA_Bytes.Red;
|
||||
string printerErrorMessageLblFull = LocalizedString.Get ("Oops! Printer could not be detected ");
|
||||
printerErrorMessage.Text = printerErrorMessageLblFull;
|
||||
string printerErrorMessageLabelFull = LocalizedString.Get ("Oops! Printer could not be detected ");
|
||||
printerErrorMessage.Text = printerErrorMessageLabelFull;
|
||||
}
|
||||
else
|
||||
{
|
||||
ActivePrinter.ComPort = candidatePort;
|
||||
printerErrorMessage.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
string printerErrorMessageLblTwo = LocalizedString.Get ("Attempting to connect");
|
||||
string printerErrorMessageLblTwoFull = string.Format("{0}...",printerErrorMessageLblTwo);
|
||||
printerErrorMessage.Text = printerErrorMessageLblTwoFull;
|
||||
string printerErrorMessageLabelTwo = LocalizedString.Get ("Attempting to connect");
|
||||
string printerErrorMessageLabelTwoFull = string.Format("{0}...",printerErrorMessageLabelTwo);
|
||||
printerErrorMessage.Text = printerErrorMessageLabelTwoFull;
|
||||
this.ActivePrinter.Commit();
|
||||
ActivePrinterProfile.Instance.ActivePrinter = this.ActivePrinter;
|
||||
PrinterCommunication.Instance.ConnectToActivePrinter();
|
||||
|
|
@ -202,9 +202,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
void onConnectionSuccess()
|
||||
{
|
||||
printerErrorMessage.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
string printerErrorMessageLblThree = LocalizedString.Get ("Connection succeeded");
|
||||
string printerErrorMessageLblThreeFull = string.Format ("{0}!", printerErrorMessageLblThree);
|
||||
printerErrorMessage.Text = printerErrorMessageLblThreeFull;
|
||||
string printerErrorMessageLabelThree = LocalizedString.Get ("Connection succeeded");
|
||||
string printerErrorMessageLabelThreeFull = string.Format ("{0}!", printerErrorMessageLabelThree);
|
||||
printerErrorMessage.Text = printerErrorMessageLabelThreeFull;
|
||||
nextButton.Visible = true;
|
||||
connectButton.Visible = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -161,9 +161,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
{
|
||||
try
|
||||
{
|
||||
string printerDriverMessageLbl = LocalizedString.Get("Installing");
|
||||
string printerDriverMessageLblFull = string.Format("{0}...", printerDriverMessageLbl);
|
||||
printerDriverMessage.Text = printerDriverMessageLblFull;
|
||||
string printerDriverMessageLabel = LocalizedString.Get("Installing");
|
||||
string printerDriverMessageLabelFull = string.Format("{0}...", printerDriverMessageLabel);
|
||||
printerDriverMessage.Text = printerDriverMessageLabelFull;
|
||||
InstallDriver(this.printerDriverFilePath);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ namespace MatterHackers.MatterControl
|
|||
void AddChildElements()
|
||||
{
|
||||
Button editButton;
|
||||
GroupBox groupBox = new GroupBox(textImageButtonFactory.GenerateGroupBoxLableWithEdit(label, out editButton));
|
||||
GroupBox groupBox = new GroupBox(textImageButtonFactory.GenerateGroupBoxLabelWithEdit(label, out editButton));
|
||||
editButton.Click += (sender, e) =>
|
||||
{
|
||||
if (editSettingsWindow == null)
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
|
|||
for (int categoryIndex = 0; categoryIndex < SliceSettingsOrganizer.Instance.UserLevels[UserLevel].CategoriesList.Count; categoryIndex++)
|
||||
{
|
||||
OrganizerCategory category = SliceSettingsOrganizer.Instance.UserLevels[UserLevel].CategoriesList[categoryIndex];
|
||||
string categoryPageLbl = LocalizedString.Get (category.Name);
|
||||
TabPage categoryPage = new TabPage(categoryPageLbl);
|
||||
string categoryPageLabel = LocalizedString.Get (category.Name);
|
||||
TabPage categoryPage = new TabPage(categoryPageLabel);
|
||||
SimpleTextTabWidget textTabWidget = new SimpleTextTabWidget(categoryPage, 16,
|
||||
ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), ActiveTheme.Instance.TabLabelUnselected, new RGBA_Bytes());
|
||||
categoryPage.AnchorAll();
|
||||
|
|
@ -324,8 +324,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
|
|||
foreach (OrganizerGroup group in category.GroupsList)
|
||||
{
|
||||
tabIndexForItem = 0;
|
||||
string groupTabLbl = LocalizedString.Get (group.Name);
|
||||
TabPage groupTabPage = new TabPage(groupTabLbl);
|
||||
string groupTabLabel = LocalizedString.Get (group.Name);
|
||||
TabPage groupTabPage = new TabPage(groupTabLabel);
|
||||
groupTabPage.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
SimpleTextTabWidget groupTabWidget = new SimpleTextTabWidget(groupTabPage, 14,
|
||||
|
|
@ -360,8 +360,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
|
|||
if (addedSettingToSubGroup)
|
||||
{
|
||||
needToAddSubGroup = true;
|
||||
string groupBoxLbl = LocalizedString.Get (subGroup.Name);
|
||||
GroupBox groupBox = new GroupBox (groupBoxLbl);
|
||||
string groupBoxLabel = LocalizedString.Get (subGroup.Name);
|
||||
GroupBox groupBox = new GroupBox (groupBoxLabel);
|
||||
groupBox.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
groupBox.BorderColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
groupBox.AddChild(topToBottomSettings);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue