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

Extract trailing colons

Browse source
This commit is contained in:
John Lewin 2017-12-02 22:07:45 -08:00
parent 40b43b16b8
commit 2cfd11d104
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AboutPage/CheckForUpdatesPage.cs
View file

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.AboutPage
additionalInfoContainer.HAnchor = HAnchor.Stretch;
additionalInfoContainer.Padding = new BorderDouble(left: 6, top: 6);
string aboutUpdateChannel = "Changing your update channel will change the version of MatterControl that you receive when updating:".Localize();
string aboutUpdateChannel = "Changing your update channel will change the version of MatterControl that you receive when updating".Localize() + ":";
var updateChannelLabel = new WrappedTextWidget(aboutUpdateChannel);
updateChannelLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
updateChannelLabel.HAnchor = HAnchor.Stretch;

2
CustomWidgets/ExportPrintItemPage.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl
public ExportPrintItemPage(IEnumerable<ILibraryItem> libraryItems)
{
this.WindowTitle = "Export File".Localize();
this.HeaderText = "Export selection to:".Localize();
this.HeaderText = "Export selection to".Localize() + ":";
this.libraryItems = libraryItems;
this.Name = "Export Item Window";

24
EeProm/EePromMarlinWindow.cs
View file

@ -136,42 +136,42 @@ namespace MatterHackers.MatterControl.EeProm
conterContent.Padding = new BorderDouble(top: 3);
conterContent.Margin = new BorderDouble(top: topBarHeight);
conterContent.AddChild(Create4FieldSet("Steps per mm:".Localize(),
conterContent.AddChild(Create4FieldSet("Steps per mm".Localize() + ":",
"X:", ref stepsPerMmX,
"Y:", ref stepsPerMmY,
"Z:", ref stepsPerMmZ,
"E:", ref stepsPerMmE));
conterContent.AddChild(Create4FieldSet("Maximum feedrates [mm/s]:".Localize(),
conterContent.AddChild(Create4FieldSet("Maximum feedrates [mm/s]".Localize() + ":",
"X:", ref maxFeedrateMmPerSX,
"Y:", ref maxFeedrateMmPerSY,
"Z:", ref maxFeedrateMmPerSZ,
"E:", ref maxFeedrateMmPerSE));
conterContent.AddChild(Create4FieldSet("Maximum Acceleration [mm/s²]:".Localize(),
conterContent.AddChild(Create4FieldSet("Maximum Acceleration [mm/s²]".Localize() + ":",
"X:", ref maxAccelerationMmPerSSqrdX,
"Y:", ref maxAccelerationMmPerSSqrdY,
"Z:", ref maxAccelerationMmPerSSqrdZ,
"E:", ref maxAccelerationMmPerSSqrdE));
conterContent.AddChild(CreateField("Acceleration:".Localize(), ref acceleration));
conterContent.AddChild(CreateField("Retract Acceleration:".Localize(), ref retractAcceleration));
conterContent.AddChild(CreateField("Acceleration".Localize() + ":", ref acceleration));
conterContent.AddChild(CreateField("Retract Acceleration".Localize() + ":", ref retractAcceleration));
conterContent.AddChild(Create3FieldSet("PID settings:".Localize(),
conterContent.AddChild(Create3FieldSet("PID settings".Localize() + ":",
"P:", ref pidP,
"I:", ref pidI,
"D:", ref pidD));
conterContent.AddChild(Create3FieldSet("Homing Offset:".Localize(),
conterContent.AddChild(Create3FieldSet("Homing Offset".Localize() + ":",
"X:", ref homingOffsetX,
"Y:", ref homingOffsetY,
"Z:", ref homingOffsetZ));
conterContent.AddChild(CreateField("Min feedrate [mm/s]:".Localize(), ref minFeedrate));
conterContent.AddChild(CreateField("Min travel feedrate [mm/s]:".Localize(), ref minTravelFeedrate));
conterContent.AddChild(CreateField("Minimum segment time [ms]:".Localize(), ref minSegmentTime));
conterContent.AddChild(CreateField("Maximum X-Y jerk [mm/s]:".Localize(), ref maxXYJerk));
conterContent.AddChild(CreateField("Maximum Z jerk [mm/s]:".Localize(), ref maxZJerk));
conterContent.AddChild(CreateField("Min feedrate [mm/s]".Localize() + ":", ref minFeedrate));
conterContent.AddChild(CreateField("Min travel feedrate [mm/s]".Localize() + ":", ref minTravelFeedrate));
conterContent.AddChild(CreateField("Minimum segment time [ms]".Localize() + ":", ref minSegmentTime));
conterContent.AddChild(CreateField("Maximum X-Y jerk [mm/s]".Localize() + ":", ref maxXYJerk));
conterContent.AddChild(CreateField("Maximum Z jerk [mm/s]".Localize() + ":", ref maxZJerk));
GuiWidget topBottomSpacer = new GuiWidget(1, 1);
topBottomSpacer.VAnchor = VAnchor.Stretch;

2
History/PrintHistoryListItem.cs
View file

@ -335,7 +335,7 @@ namespace MatterHackers.MatterControl.PrintHistory
string end = maxLengthName.Substring(maxLengthName.Length - amountRemaining, amountRemaining);
maxLengthName = start + end;
}
string notFoundMessage = "Oops! Could not find this file:".Localize();
string notFoundMessage = "Oops! Could not find this file".Localize() + ":";
string message = "{0}:\n'{1}'".FormatWith(notFoundMessage, maxLengthName);
string titleLabel = "Item not Found".Localize();
StyledMessageBox.ShowMessageBox(onConfirmRemove, message, titleLabel, StyledMessageBox.MessageType.OK);

2
PrinterControls/PrinterConnections/ShowAuthPanel.cs
View file

@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
this.WindowTitle = "Setup Wizard".Localize();
WrappedTextWidget userSignInPromptLabel = new WrappedTextWidget("Sign in to access your cloud printer profiles.\n\nOnce signed in you will be able to access:".Localize())
WrappedTextWidget userSignInPromptLabel = new WrappedTextWidget("Sign in to access your cloud printer profiles.\n\nOnce signed in you will be able to access".Localize() + ":")
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
};

2
SetupWizard/AndroidConnectDevicePage.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl
};
contentRow.AddChild(printerNameLabel);
contentRow.AddChild(new TextWidget("Instructions:".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));

2
SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -72,7 +72,7 @@ namespace MatterHackers.MatterControl
var guest = ProfileManager.Load("guest");
if (guest?.Profiles.Count > 0)
{
container.AddChild(new TextWidget("Printers to Copy:".Localize())
container.AddChild(new TextWidget("Printers to Copy".Localize() + ":")
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
Margin = new BorderDouble(0, 3, 0, 15),

2
SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs
View file

@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
};
// Add label
topRow.AddChild(new TextWidget("Preset Name:".Localize(), pointSize: 14)
topRow.AddChild(new TextWidget("Preset Name".Localize() + ":", pointSize: 14)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
VAnchor = VAnchor.Center,

2
TextCreator/Text/TextEditor.cs
View file

@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator
textToAddWidget.ActualTextEditWidget.EnterPressed += (s, e) => RebuildText(textToAddWidget.Text);
container.AddChild(textToAddWidget);
var spacingScrollBar = theme.CreateSolidSlider(container, "Spacing:".Localize(), .5, 1);
var spacingScrollBar = theme.CreateSolidSlider(container, "Spacing".Localize() + ":", .5, 1);
spacingScrollBar.Value = injectedItem.Spacing;
spacingScrollBar.ValueChanged += (sender, e) =>
{