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

More Localization

Browse source 
Edited previously modified strings for more consistency. Also modified
most strings in Print Level Wizard, and other strings that were not
previously visible because of printer connection difficulties.
This commit is contained in:
gregory-diaz 2014-02-05 18:29:58 -08:00
parent cc0d8a5095
commit ccc0eb898d
14 changed files with 143 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ActionBar/PrintActionRow.cs
View file

@ -56,20 +56,37 @@ namespace MatterHackers.MatterControl.ActionBar
addButton.tooltipText = new LocalizedString("Add a file to be printed").Translated;
addButton.Margin = new BorderDouble(0, 6, 6, 3);
startButton = (TooltipButton)textImageButtonFactory.GenerateTooltipButton("Start", "icon_play_32x32.png");
startButton.tooltipText = "Begin printing the selected item.";
startButton = (TooltipButton)textImageButtonFactory.GenerateTooltipButton(new LocalizedString("Start").Translated, "icon_play_32x32.png");
startButton.tooltipText = new LocalizedString("Begin printing the selected item.").Translated;
startButton.Margin = new BorderDouble(0, 6, 6, 3);
skipButton = makeButton("Skip", "Skip the current item and move to the next in queue");
removeButton = makeButton("Remove", "Remove current item from queue");
string skipButtonTxt = new LocalizedString("Skip").Translated;
string skipButtonMessage = new LocalizedString("Skip the current item and move to the next in queue").Translated;
skipButton = makeButton(skipButtonTxt, skipButtonMessage);
pauseButton = makeButton("Pause", "Pause the current print");
cancelButton = makeButton("Cancel", "Stop the current print");
string removeButtonTxt = new LocalizedString("Remove").Translated;
string removeButtonMessage = new LocalizedString("Remove current item from queue").Translated;
removeButton = makeButton(removeButtonTxt, removeButtonMessage);
resumeButton = makeButton("Resume", "Resume the current print");
string pauseButtonTxt = new LocalizedString("Pause").Translated;
string pauseButtonMessage = new LocalizedString("Pause the current print").Translated;
pauseButton = makeButton(pauseButtonTxt, pauseButtonMessage);
reprintButton = makeButton("Reprint", "Print current item again");
doneWithCurrentPartButton = makeButton("Done", "Move to next print in queue");
string cancelButtonTxt = new LocalizedString("Cancel").Translated;
string cancelButtonMessage = new LocalizedString("Stop the current print").Translated;
cancelButton = makeButton(cancelButtonTxt, cancelButtonMessage);
string resumeButtonTxt = new LocalizedString("Resume").Translated;
string resumeButtonMessage = new LocalizedString ("Resume the current print").Translated;
resumeButton = makeButton(resumeButtonTxt, resumeButtonMessage);
string reprintButtonTxt = new LocalizedString("Reprint").Translated;
string reprintButtonMessage = new LocalizedString ("Print current item again").Translated;
reprintButton = makeButton(reprintButtonTxt, reprintButtonMessage);
string doneCurrentPartButtonTxt = new LocalizedString ("Done").Translated;
string doenCurrentPartButtonMessage = new LocalizedString ("Move to next print in queue").Translated;
doneWithCurrentPartButton = makeButton(doneCurrentPartButtonTxt, doenCurrentPartButtonMessage);
this.AddChild(addButton);
allPrintButtons.Add(addButton);

7
ControlElements/StyledMessageBoxWindow.cs
View file

@ -7,6 +7,7 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.Font;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl
{
@ -75,14 +76,14 @@ namespace MatterHackers.MatterControl
FlowLayoutWidget yesNoButtonsFlow = new FlowLayoutWidget();
yesNoButtonsFlow.HAnchor |= HAnchor.ParentCenter;
Button yesButton = textImageButtonFactory.Generate("Yes", centerText:true);
Button yesButton = textImageButtonFactory.Generate(new LocalizedString("Yes").Translated, centerText:true);
yesButton.Click += new ButtonBase.ButtonEventHandler(okButton_Click);
yesNoButtonsFlow.AddChild(yesButton);
GuiWidget buttonSpacer = new GuiWidget(10, 10);
yesNoButtonsFlow.AddChild(buttonSpacer);
Button noButton = textImageButtonFactory.Generate("No", centerText: true);
Button noButton = textImageButtonFactory.Generate(new LocalizedString("No").Translated, centerText: true);
noButton.Click += new ButtonBase.ButtonEventHandler(noButton_Click);
yesNoButtonsFlow.AddChild(noButton);
@ -92,7 +93,7 @@ namespace MatterHackers.MatterControl
case MessageType.OK:
{
Button okButton = textImageButtonFactory.Generate("Ok", centerText: true);
Button okButton = textImageButtonFactory.Generate(new LocalizedString("Ok").Translated, centerText: true);
//okButton.DebugShowBounds = true;
okButton.Click += new ButtonBase.ButtonEventHandler(okButton_Click);
okButton.HAnchor = HAnchor.ParentCenter;

7
CustomWidgets/WizardControl.cs
View file

@ -5,6 +5,7 @@ using System.Text;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl
{
@ -56,13 +57,13 @@ namespace MatterHackers.MatterControl
FlowLayoutWidget buttonBar = new FlowLayoutWidget();
textImageButtonFactory.FixedWidth = 60;
backButton = textImageButtonFactory.Generate("Back", centerText: true);
backButton = textImageButtonFactory.Generate(new LocalizedString("Back").Translated, centerText: true);
backButton.Click += new ButtonBase.ButtonEventHandler(back_Click);
nextButton = textImageButtonFactory.Generate("Next", centerText: true);
nextButton = textImageButtonFactory.Generate(new LocalizedString("Next").Translated, centerText: true);
nextButton.Click += new ButtonBase.ButtonEventHandler(next_Click);
doneButton = textImageButtonFactory.Generate("Done", centerText: true);
doneButton = textImageButtonFactory.Generate(new LocalizedString("Done").Translated, centerText: true);
doneButton.Click += new ButtonBase.ButtonEventHandler(done_Click);
textImageButtonFactory.FixedWidth = 0;

23
MatterControl.userprefs
View file

@ -1,22 +1,25 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="SliceConfiguration\SliceSettingsWidget.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="PrintLevelWizard.cs">
<Files>
<File FileName="MatterControlApplication.cs" Line="1" Column="1" />
<File FileName="..\agg-sharp\OpenGlGui\TrackballTumbleWidget.cs" Line="1" Column="1" />
<File FileName="PrinterControls\PrinterConnections\SetupStepComPortOne.cs" Line="1" Column="1" />
<File FileName="Localizations\LocalizedString.cs" Line="1" Column="1" />
<File FileName="MainSlidePanel.cs" Line="1" Column="1" />
<File FileName="WidescreenPanel.cs" Line="1" Column="1" />
<File FileName="SliceConfiguration\SettingsControlBar.cs" Line="34" Column="10" />
<File FileName="SliceConfiguration\ActiveSliceSettings.cs" Line="514" Column="109" />
<File FileName="..\agg-sharp\OpenGlGui\MeshViewerWidget.cs" Line="1" Column="1" />
<File FileName="c:\Users\Matter Hackers 1\Development\MatterControl\SliceConfiguration\SlicingQueue.cs" Line="1" Column="1" />
<File FileName="PrintLevelWizard.cs" Line="343" Column="19" />
<File FileName="CustomWidgets\WizardControl.cs" Line="66" Column="87" />
<File FileName="c:\Users\Matter Hackers 1\Development\agg-sharp\Gui\GUIWidget.cs" Line="1736" Column="1" />
<File FileName="SliceConfiguration\ActiveSliceSettings.cs" Line="434" Column="5" />
<File FileName="SliceConfiguration\CuraEnginMappings.cs" Line="447" Column="39" />
<File FileName="SliceConfiguration\SliceSettingsLayerSelector.cs" Line="1" Column="1" />
<File FileName="SliceConfiguration\SliceSettingsOrganizer.cs" Line="286" Column="36" />
<File FileName="SliceConfiguration\SliceSettingsWidget.cs" Line="449" Column="118" />
<File FileName="PartPreviewWindow\GcodeViewBasic.cs" Line="1" Column="1" />
<File FileName="SliceConfiguration\SliceSettingsOrganizer.cs" Line="282" Column="18" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
<BreakpointStore>
<Breakpoint file="C:\Users\Matter Hackers 1\Development\mattercontrol\PartPreviewWindow\GcodeViewBasic.cs" line="264" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
</Properties>

8
PartPreviewWindow/GcodeViewBasic.cs
View file

@ -134,7 +134,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
else
{
startingMessage = "Press 'generate' to view layers";
startingMessage = new LocalizedString("Press 'generate' to view layers").Translated;
}
if (File.Exists(gcodePathAndFileName) && gcodeFileIsComplete)
@ -208,7 +208,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
BorderDouble buttonMargin = new BorderDouble(top: 3);
expandModelOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Model", "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandModelOptions = expandMenuOptionFactory.GenerateCheckBoxButton(new LocalizedString("Model").Translated, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandModelOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandModelOptions);
expandModelOptions.Checked = true;
@ -218,7 +218,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
//modelOptionsContainer.Visible = false;
buttonRightPanel.AddChild(modelOptionsContainer);
expandLayerOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Layer", "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandLayerOptions = expandMenuOptionFactory.GenerateCheckBoxButton(new LocalizedString("Layer").Translated, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandLayerOptions.Margin = new BorderDouble(bottom: 2);
//buttonRightPanel.AddChild(expandLayerOptions);
@ -227,7 +227,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
layerOptionsContainer.Visible = false;
buttonRightPanel.AddChild(layerOptionsContainer);
expandDisplayOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Display", "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandDisplayOptions = expandMenuOptionFactory.GenerateCheckBoxButton(new LocalizedString("Display").Translated, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandDisplayOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandDisplayOptions);
expandDisplayOptions.Checked = true;

70
PrintLevelWizard.cs
View file

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2013, Lars Brubaker
All rights reserved.
@ -37,6 +37,7 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.VectorMath;
using MatterHackers.Agg.Font;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl
{
@ -205,8 +206,15 @@ namespace MatterHackers.MatterControl
public class GetCoarseBedHeight : FindBedHeight
{
static string setZHeightCoarseInstruction1 = "Using the [Z] controls on this screen, we will now take a coarse measurement of the extruder height at this position.";
static string setZHeightCoarseInstruction2 = "\t• Place the paper under the extruder\n\t• Using the above contols\n\t• Press [Z-] until there is resistance to moving the paper\n\t• Press [Z+] once to release the paper\n\nFinally click 'Next' to continue.";
static string setZHeightCoarseInstruction1 = new LocalizedString("Using the [Z] controls on this screen, we will now take a coarse measurement of the extruder height at this position.").Translated;
static string setZHeightCourseInstructTxtOne = new LocalizedString("Place the paper under the extruder").Translated;
static string setZHeightCourseInstructTxtTwo = new LocalizedString("Using the above contols").Translated;
static string setZHeightCourseInstructTxtThree = new LocalizedString("Press [Z-] until there is resistance to moving the paper").Translated;
static string setZHeightCourseInstructTxtFour = new LocalizedString("Press [Z+] once to release the paper").Translated;
static string setZHeightCourseInstructTxtFive = new LocalizedString("Finally click 'Next' to continue.").Translated;
static string setZHeightCoarseInstruction2 = string.Format("\t• {0}\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}", setZHeightCourseInstructTxtOne, setZHeightCourseInstructTxtTwo, setZHeightCourseInstructTxtThree,setZHeightCourseInstructTxtFour, setZHeightCourseInstructTxtFive);
Vector3 probeStartPosition;
WizardControl container;
@ -244,8 +252,11 @@ namespace MatterHackers.MatterControl
public class GetFineBedHeight : FindBedHeight
{
static string setZHeightFineInstruction1 = "We will now refine our measurement of the extruder height at this position.";
static string setZHeightFineInstruction2 = "\t• Press [Z-] until there is resistance to moving the paper\n\t• Press [Z+] once to release the paper\n\nFinally click 'Next' to continue.";
static string setZHeightFineInstruction1 = new LocalizedString("We will now refine our measurement of the extruder height at this position.").Translated;
static string setZHeightFineInstructionTxtOne = new LocalizedString("Press [Z-] until there is resistance to moving the paper").Translated;
static string setZHeightFineInstructionTxtTwo = new LocalizedString("Press [Z+] once to release the paper").Translated;
static string setZHeightFineInstructionTxtThree = new LocalizedString("Finally click 'Next' to continue.").Translated;
static string setZHeightFineInstruction2 = string.Format("\t• {0}\n\t• {1}\n\n{2}",setZHeightFineInstructionTxtOne, setZHeightFineInstructionTxtTwo, setZHeightFineInstructionTxtThree);
public GetFineBedHeight(string instructionsText, ProbePosition whereToWriteProbePosition)
: base(instructionsText, setZHeightFineInstruction1, setZHeightFineInstruction2, .1, whereToWriteProbePosition)
@ -255,8 +266,10 @@ namespace MatterHackers.MatterControl
public class GetUltraFineBedHeight : FindBedHeight
{
static string setZHeightFineInstruction1 = "We will now finalize our measurement of the extruder height at this position.";
static string setZHeightFineInstruction2 = "\t• Press [Z-] one click PAST the first hint of resistance\n\n\nFinally click 'Next' to continue.";
static string setZHeightFineInstruction1 = new LocalizedString("We will now finalize our measurement of the extruder height at this position.").Translated;
static string setHeightFineInstructionTxtOne = new LocalizedString("Press [Z-] one click PAST the first hint of resistance").Translated;
static string setHeightFineInstructionTxtTwo = new LocalizedString("Finally click 'Next' to continue.").Translated;
static string setZHeightFineInstruction2 = string.Format("\t• {0}\n\n\n{1}", setHeightFineInstructionTxtOne, setHeightFineInstructionTxtTwo);
public GetUltraFineBedHeight(string instructionsText, ProbePosition whereToWriteProbePosition)
: base(instructionsText, setZHeightFineInstruction1, setZHeightFineInstruction2, .02, whereToWriteProbePosition)
@ -285,17 +298,36 @@ namespace MatterHackers.MatterControl
public class PrintLevelWizardWindow : SystemWindow
{
string pageOneInstructions = "Welcome to the print leveling wizard. Here is a quick overview on what we are going to do.\n\n\t• 'Home' the printer\n\t• Sample the bed at three points\n\t• Turn auto leveling on\n\nYou should be done in about 3 minutes.\n\nClick 'Next' to continue.";
string pageOneInstructionsTxtOne = new LocalizedString("Welcome to the print leveling wizard. Here is a quick overview on what we are going to do.").Translated;
string pageOneInstructionsTxtTwo = new LocalizedString("'Home' the printer").Translated;
string pageOneInstructionsTxtThree = new LocalizedString("Sample the bed at three points").Translated;
string pageOneInstructionsTxtFour = new LocalizedString("Turn auto leveling on").Translated;
string pageOneInstructionsTxtFive = new LocalizedString("You should be done in about 3 minutes.").Translated;
string pageOneInstructionsTxtSix = new LocalizedString("Click 'Next' to continue.").Translated;
string pageOneInstructions;
string homingPageInstructions = "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:\n\n\t• A standard sheet of paper\n\nWe will use this paper to measure the distance between the extruder and the bed.\n\nClick 'Next' to continue.";
string doneInstructions = "Congratulations!\n\nAuto Print Leveling is now configured and enabled.\n\n\t• Remove the paper\n\nIf 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 homingPageInstructionsTxtOne = new LocalizedString("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").Translated;
string homingPageInstructionsTxtTwo = new LocalizedString("A standard sheet of paper").Translated;
string homingPageInstructionsTxtThree = new LocalizedString("We will use this paper to measure the distance between the extruder and the bed.\n\nClick 'Next' to continue.").Translated;
string homingPageInstructions;
string doneInstructionsTxt = new LocalizedString("Congratulations!\n\nAuto Print Leveling is now configured and enabled.").Translated;
string doneInstructionsTxtTwo = new LocalizedString("Remove the paper").Translated;
string doneInstructionsTxtThree = new LocalizedString("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.").Translated;
string doneInstructions;
WizardControl printLevelWizard;
public PrintLevelWizardWindow()
: base(500, 370)
{
Title = "MatterControl - Print Leveling Wizard";
{
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);
string printLevelWizardTitle = new LocalizedString("MatterControl").Translated;
string printLevelWizardTitleFull = new LocalizedString ("Print Leveling Wizard").Translated;
Title = string.Format("{0} - {1}",printLevelWizardTitle, printLevelWizardTitleFull);
ProbePosition[] probePositions = new ProbePosition[3];
probePositions[0] = new ProbePosition();
probePositions[1] = new ProbePosition();
@ -309,7 +341,13 @@ namespace MatterHackers.MatterControl
printLevelWizard.AddPage(new HomePrinterPage(homingPageInstructions));
Vector2 probeBackCenter = ActiveSliceSettings.Instance.GetPrintLevelSamplePosition(0);
printLevelWizard.AddPage(new GetCoarseBedHeight(printLevelWizard, new Vector3(probeBackCenter, 10), string.Format("{0} Position 1 - Low Precision", Step()), probePositions[0]));
GetCoarseBedHeight getCourseBedHeight = new GetCoarseBedHeight (printLevelWizard,
new Vector3 (probeBackCenter, 10),
string.Format ("{0} Position 1 - Low Precision", Step ()),
probePositions [0]);
printLevelWizard.AddPage(getCourseBedHeight);
printLevelWizard.AddPage(new GetFineBedHeight(string.Format("{0} Position 1 - Medium Precision", Step()), probePositions[0]));
printLevelWizard.AddPage(new GetUltraFineBedHeight(string.Format("{0} Position 1 - High Precision", Step()), probePositions[0]));
@ -327,9 +365,11 @@ namespace MatterHackers.MatterControl
}
int step = 1;
string stepTextBeg = new LocalizedString("Step").Translated;
string stepTextEnd = new LocalizedString("of").Translated;
string Step()
{
return string.Format("Step {0} of 9:", step++);
return string.Format("{0} {1} {2} 9:",stepTextBeg, step++, stepTextEnd);
}
void DoneButton_Click(object sender, MouseEventArgs mouseEvent)

4
PrintLibrary/PluginChooserWindow.cs
View file

@ -71,7 +71,9 @@ namespace MatterHackers.MatterControl.PrintLibrary
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
{
string elementHeaderLbl = new LocalizedString ("Select a Design Tool:").Translated;
string elementHeaderLblBeg = new LocalizedString("Select a Design Tool").Translated;
string elementHeaderLblFull = string.Format("{0}:", elementHeaderLblBeg);
string elementHeaderLbl = elementHeaderLblFull;
TextWidget elementHeader = new TextWidget(string.Format(elementHeaderLbl), pointSize: 14);
elementHeader.TextColor = ActiveTheme.Instance.PrimaryTextColor;
elementHeader.HAnchor = HAnchor.ParentLeftRight;

7
PrintQueue/PrintQueueItem.cs
View file

@ -370,8 +370,11 @@ namespace MatterHackers.MatterControl.PrintQueue
string end = maxLengthName.Substring(maxLengthName.Length - amountRemaining, amountRemaining);
maxLengthName = start + end;
}
string message = String.Format("Oops! Could not find this file:\n'{0}'\n\nWould you like to remove it from the queue?", maxLengthName);
if (StyledMessageBox.ShowMessageBox(message, "Item not found", StyledMessageBox.MessageType.YES_NO))
string notFoundMessage = new LocalizedString("Oops! Could not find this file").Translated;
string notFoundMessageEnd = new LocalizedString("Would you like to remove it from the queue").Translated;
string message = String.Format("{0}:\n'{1}'\n\n{2}?",notFoundMessage, maxLengthName,notFoundMessageEnd);
string titleLbl = new LocalizedString("Item not Found").Translated;
if (StyledMessageBox.ShowMessageBox(message, titleLbl, StyledMessageBox.MessageType.YES_NO))
{
PrintQueueControl.Instance.RemoveIndex(PrintQueueControl.Instance.GetIndex(printItem));
}

8
PrinterControls/PrinterConnections/PrinterChooser.cs
View file

@ -17,7 +17,9 @@ namespace MatterHackers.MatterControl
public PrinterChooser(string selectedMake = null)
{
ManufacturerDropList = new StyledDropDownList(new LocalizedString("- Select Make -").Translated);
string defaultManufacturerLbl = new LocalizedString ("Select Make").Translated;
string defaultManufacturerLblFull = string.Format ("- {0} -", defaultManufacturerLbl);
ManufacturerDropList = new StyledDropDownList(defaultManufacturerLblFull);
bool addOther = false;
string pathToWhitelist = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "OEMSettings", "PrinterSettingsWhitelist.txt");
string[] folderWhitelist = File.ReadAllLines(pathToWhitelist);
@ -80,7 +82,9 @@ namespace MatterHackers.MatterControl
public ModelChooser(string manufacturer)
{
ModelDropList = new StyledDropDownList(new LocalizedString("- Select Model -").Translated);
string defaultModelDropDownLbl = new LocalizedString("Select Model").Translated;
string defaultModelDropDownLblFull = string.Format("- {0} -", defaultModelDropDownLbl);
ModelDropList = new StyledDropDownList(defaultModelDropDownLblFull);
string pathToModels = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "PrinterSettings", manufacturer);
if (Directory.Exists(pathToModels))
{

4
PrinterControls/PrinterConnections/SetupStepInstallDriver.cs
View file

@ -161,7 +161,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
try
{
printerDriverMessage.Text = new LocalizedString("Installing...").Translated;
string printerDriverMessageLbl = new LocalizedString("Installing").Translated;
string printerDriverMessageLblFull = string.Format("{0}...", printerDriverMessageLbl);
printerDriverMessage.Text = printerDriverMessageLblFull;
InstallDriver(this.printerDriverFilePath);
return true;
}

14
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -77,7 +77,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
container.Margin = new BorderDouble(0, 5);
BorderDouble elementMargin = new BorderDouble(top: 3);
TextWidget printerNameLabel = new TextWidget(new LocalizedString("Printer Name:").Translated, 0, 0, 12);
string printerNameLabelTxt = new LocalizedString("Printer Name").Translated;
string printerNameLabelTxtFull = string.Format ("{0}:", printerNameLabelTxt);
TextWidget printerNameLabel = new TextWidget(printerNameLabelTxtFull, 0, 0, 12);
printerNameLabel.TextColor = this.defaultTextColor;
printerNameLabel.HAnchor = HAnchor.ParentLeftRight;
printerNameLabel.Margin = new BorderDouble(0, 0, 0, 1);
@ -103,7 +105,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
container.Margin = new BorderDouble(0, 5);
BorderDouble elementMargin = new BorderDouble(top: 3);
TextWidget printerManufacturerLabel = new TextWidget(new LocalizedString("Select Make:").Translated, 0, 0, 12);
string printerManufacturerLabelTxt = new LocalizedString("Select Make").Translated;
string printerManufacturerLabelTxtFull = string.Format("{0}:", printerManufacturerLabelTxt);
TextWidget printerManufacturerLabel = new TextWidget(printerManufacturerLabelTxtFull, 0, 0, 12);
printerManufacturerLabel.TextColor = this.defaultTextColor;
printerManufacturerLabel.HAnchor = HAnchor.ParentLeftRight;
printerManufacturerLabel.Margin = elementMargin;
@ -132,7 +136,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
container.Margin = new BorderDouble(0, 5);
BorderDouble elementMargin = new BorderDouble(top: 3);
TextWidget printerModelLabel = new TextWidget(new LocalizedString("Select Model:").Translated, 0, 0, 12);
string printerModelLabelTxt = new LocalizedString("Select Model").Translated;
string printerModelLabelTxtFull = string.Format ("{0}:", printerModelLabelTxt);
TextWidget printerModelLabel = new TextWidget(printerModelLabelTxtFull, 0, 0, 12);
printerModelLabel.TextColor = this.defaultTextColor;
printerModelLabel.HAnchor = HAnchor.ParentLeftRight;
printerModelLabel.Margin = elementMargin;
@ -399,7 +405,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
else
{
this.printerNameError.TextColor = RGBA_Bytes.Red;
this.printerNameError.Text = "Printer name cannot be blank";
this.printerNameError.Text = "Printer name cannot be blank";
this.printerNameError.Visible = true;
return false;
}

4
PrinterControls/TemperatureIndicator.cs
View file

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2013, Lars Brubaker
All rights reserved.
@ -404,7 +404,7 @@ namespace MatterHackers.MatterControl
public class ExtruderTemperatureControlWidget : TemperatureControlBase
{
public ExtruderTemperatureControlWidget()
: base("Extruder Temperature Override", "Extruder Temperature Settings")
: base("Extruder Temperature Override", "Extruder Temperature Settings")
{
AddHandlers();
}

6
SliceConfiguration/SettingsControlBar.cs
View file

@ -64,7 +64,9 @@ namespace MatterHackers.MatterControl
settingsStatusDescription.AutoExpandBoundsToText = true;
settingsStatusDescription.TextColor = ActiveTheme.Instance.PrimaryTextColor;
unsavedChangesIndicator = new TextWidget("(unsaved changes)", pointSize: 10);
string unsavedChangesTxtBeg = new LocalizedString("unsaved changes").Translated;
string unsavedChangesTxtFull = string.Format ("({0})", unsavedChangesTxtBeg);
unsavedChangesIndicator = new TextWidget(unsavedChangesTxtFull, pointSize: 10);
unsavedChangesIndicator.AutoExpandBoundsToText = true;
unsavedChangesIndicator.Visible = false;
unsavedChangesIndicator.Margin = new BorderDouble(left: 4);
@ -212,7 +214,7 @@ namespace MatterHackers.MatterControl
slicerOptionsMenuItems = new TupleList<string, Func<bool>>
{
{"Import", ImportQueueMenu_Click},
{"Export", ExportQueueMenu_Click},
{"Export", ExportQueueMenu_Click},
};
//Add the menu items to the menu itself

5
SliceConfiguration/SlicingQueue.cs
View file

@ -11,6 +11,7 @@ using MatterHackers.Agg;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl
{
@ -47,7 +48,9 @@ namespace MatterHackers.MatterControl
public void QueuePartForSlicing(PrintItemWrapper itemToQueue)
{
itemToQueue.DoneSlicing = false;
itemToQueue.OnSlicingOutputMessage(new StringEventArgs("Preparing to slice model..."));
string preparingToSliceModelTxt = new LocalizedString("Preparing to slice model").Translated;
string peparingToSliceModelFull = string.Format ("{0}...", preparingToSliceModelTxt);
itemToQueue.OnSlicingOutputMessage(new StringEventArgs(peparingToSliceModelFull));
using (TimedLock.Lock(listOfSlicingItems, "QueuePartForSlicing"))
{
//Add to thumbnail generation queue