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

Moved all the easy static localized strings to non-static strings

Browse source
This commit is contained in:
Lars Brubaker 2017-03-01 13:48:49 -08:00
parent 9bd15f936f
commit 4d96a26cd0
10 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AboutPage/UpdateControlView.cs
View file

@ -127,8 +127,8 @@ namespace MatterHackers.MatterControl
UpdateControlData.Instance.InitiateUpdateDownload();
}
static string recommendedUpdateAvailable = "There is a recommended update available.".Localize();
static string requiredUpdateAvailable = "There is a required update available.".Localize();
string recommendedUpdateAvailable = "There is a recommended update available.".Localize();
string requiredUpdateAvailable = "There is a required update available.".Localize();
private void UpdateStatusChanged(object sender, EventArgs e)
{

4
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -502,8 +502,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
return buttonRow;
}
private static string rebuildThumbnailsMessage = "You are switching to a different thumbnail rendering mode. If you want, your current thumbnails can be removed and recreated in the new style. You can switch back and forth at any time. There will be some processing overhead while the new thumbnails are created.\n\nDo you want to rebuild your existing thumbnails now?".Localize();
private static string rebuildThumbnailsTitle = "Rebuild Thumbnails Now".Localize();
private string rebuildThumbnailsMessage = "You are switching to a different thumbnail rendering mode. If you want, your current thumbnails can be removed and recreated in the new style. You can switch back and forth at any time. There will be some processing overhead while the new thumbnails are created.\n\nDo you want to rebuild your existing thumbnails now?".Localize();
private string rebuildThumbnailsTitle = "Rebuild Thumbnails Now".Localize();
private void AddHandlers()
{

11
History/PrintHistoryData.cs
View file

@ -42,15 +42,16 @@ namespace MatterHackers.MatterControl.PrintHistory
{
public static class PrintRecovery
{
static string recoverPrint = "Recover Print".Localize();
static string cancelRecovery = "Cancel".Localize();
static string printRecoveryWarningMessage = "WARNING: In order to perform print recovery, your printer must move down to reach its home position.\nIf your print is too large, part of your printer may collide with it when moving down.\nMake sure it is safe to perform this operation before proceeding.".Localize();
static string printRecoveryMessage = "It appears your last print failed to complete.\n\nWould your like to attempt to recover from the last know position?".Localize();
static string recoverPrintTitle = "Recover Last Print".Localize();
static PrintTask lastPrintTask;
public static void CheckIfNeedToRecoverPrint(object sender, EventArgs e)
{
string recoverPrint = "Recover Print".Localize();
string cancelRecovery = "Cancel".Localize();
string printRecoveryWarningMessage = "WARNING: In order to perform print recovery, your printer must move down to reach its home position.\nIf your print is too large, part of your printer may collide with it when moving down.\nMake sure it is safe to perform this operation before proceeding.".Localize();
string printRecoveryMessage = "It appears your last print failed to complete.\n\nWould your like to attempt to recover from the last know position?".Localize();
string recoverPrintTitle = "Recover Last Print".Localize();
foreach (PrintTask lastPrint in PrintHistoryData.Instance.GetHistoryItems(1))
{
if (!lastPrint.PrintComplete // Top Print History Item is not complete

4
PartPreviewWindow/View3D/View3DCreateSelectionData.cs
View file

@ -40,8 +40,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public partial class View3DWidget
{
private static string PartsNotPrintableMessage = "Parts are not on the bed or outside the print area.\n\nWould you like to center them on the bed?".Localize();
private static string PartsNotPrintableTitle = "Parts not in print area".Localize();
private string PartsNotPrintableMessage = "Parts are not on the bed or outside the print area.\n\nWould you like to center them on the bed?".Localize();
private string PartsNotPrintableTitle = "Parts not in print area".Localize();
private void CreateSelectionData()
{

8
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -80,10 +80,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public delegate Vector2 GetSizeFunction();
private static string slicingErrorMessage = "Slicing Error.\nPlease review your slice settings.".Localize();
private static string pressGenerateMessage = "Press 'generate' to view layers".Localize();
private static string fileNotFoundMessage = "File not found on disk.".Localize();
private static string fileTooBigToLoad = "GCode file too big to preview ({0}).".Localize();
private string slicingErrorMessage = "Slicing Error.\nPlease review your slice settings.".Localize();
private string pressGenerateMessage = "Press 'generate' to view layers".Localize();
private string fileNotFoundMessage = "File not found on disk.".Localize();
private string fileTooBigToLoad = "GCode file too big to preview ({0}).".Localize();
private Vector2 bedCenter;
private Vector3 viewerVolume;

4
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -217,8 +217,8 @@ namespace MatterHackers.MatterControl
}
#endif
readonly static string writeFaildeWaring = "WARNING: Write Failed!".Localize();
readonly static string cantAccessPath = "Can't access '{0}'.".Localize();
string writeFaildeWaring = "WARNING: Write Failed!".Localize();
string cantAccessPath = "Can't access '{0}'.".Localize();
private void onExportLogFileSelected(SaveFileDialogParams saveParams)
{

7
Queue/PrintItemWrapper.cs
View file

@ -46,11 +46,10 @@ namespace MatterHackers.MatterControl.PrintQueue
public event EventHandler SlicingDone;
public event EventHandler<StringEventArgs> SlicingOutputMessage;
private static string fileNotFound = "File Not Found\n'{0}'".Localize();
private static string readyToPrint = "Ready to Print".Localize();
private static string slicingError = "Slicing Error".Localize();
private string fileNotFound = "File Not Found\n'{0}'".Localize();
private string readyToPrint = "Ready to Print".Localize();
private string slicingError = "Slicing Error".Localize();
private bool doneSlicing;

2
SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl
{
public class CopyGuestProfilesToUser : WizardPage
{
static string importMessage = "It's time to copy your existing printer settings to your MatterHackers account. Once copied, these printers will be available whenever you sign in to MatterControl. Printers that are not copied will only be available when not signed in.".Localize();
string importMessage = "It's time to copy your existing printer settings to your MatterHackers account. Once copied, these printers will be available whenever you sign in to MatterControl. Printers that are not copied will only be available when not signed in.".Localize();
List<CheckBox> checkBoxes = new List<CheckBox>();

11
SetupWizard/ImportSettingsPage.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl
{
public class SelectPartsOfPrinterToImport : WizardPage
{
private static string importMessage = "Select what you would like to merge into your current profile.".Localize();
private string importMessage = "Select what you would like to merge into your current profile.".Localize();
private string settingsFilePath;
private PrinterSettings settingsToImport;
@ -239,7 +239,8 @@ namespace MatterHackers.MatterControl
if (!isMergeIntoUserLayer)
{
string sourceName = isMergeIntoUserLayer ? Path.GetFileNameWithoutExtension(settingsFilePath) : destinationLayer[SettingsKey.layer_name];
successMessage = ImportSettingsPage.importSettingSuccessMessage.FormatWith(sourceName, sectionName);
string importSettingSuccessMessage = "You have successfully imported a new {1} setting. You can find '{0}' in your list of {1} settings.".Localize();
successMessage = importSettingSuccessMessage.FormatWith(sourceName, sectionName);
}
WizardWindow.ChangeToPage(new ImportSucceeded(successMessage)
@ -250,7 +251,7 @@ namespace MatterHackers.MatterControl
}
}
private static string importPrinterSuccessMessage = "Settings have been merged into your current printer.".Localize();
private string importPrinterSuccessMessage = "Settings have been merged into your current printer.".Localize();
}
public class ImportSucceeded : WizardPage
@ -399,8 +400,8 @@ namespace MatterHackers.MatterControl
return container;
}
private static string importPrinterSuccessMessage = "You have successfully imported a new printer profile. You can find '{0}' in your list of available printers.".Localize();
internal static string importSettingSuccessMessage = "You have successfully imported a new {1} setting. You can find '{0}' in your list of {1} settings.".Localize();
protected string importPrinterSuccessMessage = "You have successfully imported a new printer profile. You can find '{0}' in your list of available printers.".Localize();
protected string importSettingSuccessMessage = "You have successfully imported a new {1} setting. You can find '{0}' in your list of {1} settings.".Localize();
private void ImportSettingsFile(string settingsFilePath)
{

4
SlicerConfiguration/SliceSettingsDetailControl.cs
View file

@ -18,8 +18,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private CheckBox showHelpBox;
private TupleList<string, Func<bool>> slicerOptionsMenuItems;
private static string resetToDefaultsMessage = "Resetting to default values will remove your current overrides and restore your original printer settings.\nAre you sure you want to continue?".Localize();
private static string resetToDefaultsWindowTitle = "Revert Settings".Localize();
string resetToDefaultsMessage = "Resetting to default values will remove your current overrides and restore your original printer settings.\nAre you sure you want to continue?".Localize();
string resetToDefaultsWindowTitle = "Revert Settings".Localize();
bool primarySettingsView;
public SliceSettingsDetailControl(List<PrinterSettingsLayer> layerCascade)