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

Fixed many all upper case words to be Title case instead.

Browse source
This commit is contained in:
larsbrubaker 2014-04-10 14:07:25 -07:00
parent a749bdc6c2
commit 771280f6df
6 changed files with 45 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ConfigurationPage/ConfigurationPage.cs
View file

@ -207,7 +207,7 @@ namespace MatterHackers.MatterControl
ImageWidget eePromIcon = new ImageWidget(eePromImage);
eePromIcon.Margin = new BorderDouble (right: 6);
Button openEePromWindow = textImageButtonFactory.Generate(LocalizedString.Get("CONFIGURE"));
Button openEePromWindow = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
openEePromWindow.Click += (sender, e) =>
{
#if false // This is to force the creation of the repetier window for testing when we don't have repetier firmware.
@ -311,7 +311,7 @@ namespace MatterHackers.MatterControl
this.textImageButtonFactory.FixedHeight = TallButtonHeight;
Button runPrintLevelingButton = textImageButtonFactory.Generate(LocalizedString.Get("CONFIGURE"));
Button runPrintLevelingButton = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
runPrintLevelingButton.Margin = new BorderDouble(left:6);
runPrintLevelingButton.VAnchor = VAnchor.ParentCenter;
runPrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(runPrintLeveling_Click);
@ -326,12 +326,12 @@ namespace MatterHackers.MatterControl
ImageWidget levelingIcon = new ImageWidget(levelingImage);
levelingIcon.Margin = new BorderDouble (right: 6);
enablePrintLevelingButton = textImageButtonFactory.Generate(LocalizedString.Get("ENABLE"));
enablePrintLevelingButton = textImageButtonFactory.Generate("Enable".Localize().ToUpper());
enablePrintLevelingButton.Margin = new BorderDouble(left:6);
enablePrintLevelingButton.VAnchor = VAnchor.ParentCenter;
enablePrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(enablePrintLeveling_Click);
disablePrintLevelingButton = textImageButtonFactory.Generate(LocalizedString.Get("DISABLE"));
disablePrintLevelingButton = textImageButtonFactory.Generate("Disable".Localize().ToUpper());
disablePrintLevelingButton.Margin = new BorderDouble(left:6);
disablePrintLevelingButton.VAnchor = VAnchor.ParentCenter;
disablePrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(disablePrintLeveling_Click);

3
Launcher/Launcher.csproj
View file

@ -6,7 +6,7 @@
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Exe</OutputType>
<ProjectGuid>{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}</ProjectGuid>
<ProjectGuid>{3DF4CB3D-9A03-4256-9A81-70523AAD828B}</ProjectGuid>
<OutputPath>bin\Release\</OutputPath>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MatterHackers.MatterControl.Launcher</RootNamespace>
@ -42,7 +42,6 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
<Compile Include="Launcher.cs" />

26
PartPreviewWindow/GcodeViewBasic.cs
View file

@ -205,7 +205,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
BorderDouble buttonMargin = new BorderDouble(top: 3);
string label = LocalizedString.Get("MODEL");
string label = "MODEL".Localize().ToUpper();
expandModelOptions = expandMenuOptionFactory.GenerateCheckBoxButton(label, "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandModelOptions.Margin = new BorderDouble(bottom: 2);
buttonRightPanel.AddChild(expandModelOptions);
@ -216,7 +216,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
//modelOptionsContainer.Visible = false;
buttonRightPanel.AddChild(modelOptionsContainer);
expandLayerOptions = expandMenuOptionFactory.GenerateCheckBoxButton(LocalizedString.Get("LAYER"), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandLayerOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Layer".Localize().ToUpper(), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandLayerOptions.Margin = new BorderDouble(bottom: 2);
//buttonRightPanel.AddChild(expandLayerOptions);
@ -225,7 +225,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
layerOptionsContainer.Visible = false;
buttonRightPanel.AddChild(layerOptionsContainer);
expandDisplayOptions = expandMenuOptionFactory.GenerateCheckBoxButton(LocalizedString.Get("DISPLAY"), "icon_arrow_right_no_border_32x32.png", "icon_arrow_down_no_border_32x32.png");
expandDisplayOptions = expandMenuOptionFactory.GenerateCheckBoxButton("Display".Localize().ToUpper(), "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;
@ -263,10 +263,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelInfoContainer.HAnchor = HAnchor.ParentLeftRight;
modelInfoContainer.Padding = new BorderDouble(5);
string printTimeLbl = LocalizedString.Get ("PRINT TIME");
string printTimeLblFull = string.Format ("{0}:", printTimeLbl);
string printTimeLabel = "Print Time".Localize().ToUpper();
string printTimeLabelFull = string.Format ("{0}:", printTimeLabel);
// put in the print time
modelInfoContainer.AddChild(new TextWidget(printTimeLblFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize:10));
modelInfoContainer.AddChild(new TextWidget(printTimeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize:10));
{
string timeRemainingText = "---";
@ -294,7 +294,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
//modelInfoContainer.AddChild(new TextWidget("Size:", textColor: ActiveTheme.Instance.PrimaryTextColor));
string filamentLengthLbl = LocalizedString.Get ("FILAMENT LENGTH");
string filamentLengthLbl = "Filament Length".Localize().ToUpper();
string filamentLengthLblFull = string.Format ("{0}:", filamentLengthLbl);
// show the filament used
modelInfoContainer.AddChild(new TextWidget(filamentLengthLblFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9));
@ -307,9 +307,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelInfoContainer.AddChild(estimatedPrintTime);
}
string filamentVolumeLbl = LocalizedString.Get ("FILAMENT VOLUME");
string filamentVolumeLblFull = string.Format("{0}:", filamentVolumeLbl);
modelInfoContainer.AddChild(new TextWidget(filamentVolumeLblFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9));
string filamentVolumeLabel = "Filament Volume".Localize().ToUpper();
string filamentVolumeLabelFull = string.Format("{0}:", filamentVolumeLabel);
modelInfoContainer.AddChild(new TextWidget(filamentVolumeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9));
{
double filamentMm3 = gcodeViewWidget.LoadedGCode.GetFilamentCubicMm(ActiveSliceSettings.Instance.FilamentDiameter);
@ -319,9 +319,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelInfoContainer.AddChild(estimatedPrintTime);
}
string weightLbl = LocalizedString.Get("EST. WEIGHT");
string weightLblFull = string.Format("{0}:", weightLbl);
modelInfoContainer.AddChild(new TextWidget(weightLblFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor));
string weightLabel = "Est. Weight".Localize().ToUpper();
string weightLabelFull = string.Format("{0}:", weightLabel);
modelInfoContainer.AddChild(new TextWidget(weightLabelFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor));
{
var density = 1.0;
string filamentType = "PLA";

18
PrintHistory/PrintHistoryListItem.cs
View file

@ -119,18 +119,20 @@ namespace MatterHackers.MatterControl.PrintHistory
buttonContainer.Margin = new BorderDouble(0);
buttonContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
{
TextWidget statusIndicator = new TextWidget("Status: Completed", pointSize:8);
TextWidget statusIndicator = new TextWidget("Status: Completed".Localize(), pointSize:8);
statusIndicator.Margin = new BorderDouble(right: 3);
//buttonContainer.AddChild(statusIndicator);
TextWidget timeLabel = new TextWidget("PRINT TIME: ", pointSize:8);
string printTimeLabel = "Print Time".Localize().ToUpper();
string printTimeLabelFull = string.Format("{0}: ", printTimeLabel);
TextWidget timeLabel = new TextWidget(printTimeLabelFull, pointSize: 8);
timeLabel.TextColor = timeTextColor;
TextWidget timeIndicator;
int minutes = printTask.PrintTimeMinutes;
if (minutes < 0)
{
timeIndicator = new TextWidget("Unknown");
timeIndicator = new TextWidget("Unknown".Localize());
}
else if (minutes > 60)
{
@ -147,7 +149,7 @@ namespace MatterHackers.MatterControl.PrintHistory
buttonContainer.AddChild(timeLabel);
buttonContainer.AddChild(timeIndicator);
printAgainLink = linkButtonFactory.Generate(LocalizedString.Get("Print Again"));
printAgainLink = linkButtonFactory.Generate("Print Again".Localize());
printAgainLink.Margin = new BorderDouble(left: 0, right: 10);
printAgainLink.VAnchor = VAnchor.ParentCenter;
@ -176,7 +178,8 @@ namespace MatterHackers.MatterControl.PrintHistory
startTimeContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
startTimeContainer.Padding = new BorderDouble(0, 3);
TextWidget startLabel = new TextWidget("START:", pointSize: 8);
string startLabelFull = "{0}:".FormatWith("Start".Localize().ToUpper());
TextWidget startLabel = new TextWidget(startLabelFull, pointSize: 8);
startLabel.TextColor = timeTextColor;
string startTimeString = printTask.PrintStart.ToString("MMM d yyyy h:mm ") + printTask.PrintStart.ToString("tt").ToLower();
@ -192,7 +195,8 @@ namespace MatterHackers.MatterControl.PrintHistory
endTimeContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
endTimeContainer.Padding = new BorderDouble(0, 3);
TextWidget endLabel = new TextWidget("END:", pointSize: 8);
string endLabelFull = "{0}:".FormatWith("End".Localize().ToUpper());
TextWidget endLabel = new TextWidget(endLabelFull, pointSize: 8);
endLabel.TextColor = timeTextColor;
string endTimeString;
@ -202,7 +206,7 @@ namespace MatterHackers.MatterControl.PrintHistory
}
else
{
endTimeString = "Unknown";
endTimeString = "Unknown".Localize();
}
TextWidget endDate = new TextWidget(endTimeString, pointSize: 12);

2
PrinterControls/ManualPrinterControls.cs
View file

@ -246,7 +246,7 @@ namespace MatterHackers.MatterControl
ImageWidget eePromIcon = new ImageWidget(eePromImage);
eePromIcon.Margin = new BorderDouble (right: 6);
Button openEePromWindow = textImageButtonFactory.Generate(LocalizedString.Get("CONFIGURE"));
Button openEePromWindow = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
openEePromWindow.Click += (sender, e) =>
{
#if false // This is to force the creation of the repetier window for testing when we don't have repetier firmware.

15
StaticData/Translations/Master.txt
View file

@ -1935,3 +1935,18 @@ Translated:Edit Preset
English:Slice-Engine
Translated:Slice-Engine
English:Status: Completed
Translated:Status: Completed
English:Unlock
Translated:Unlock
English:Show Terminal
Translated:Show Terminal
English:Configure
Translated:Configure
English:Disable
Translated:Disable