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

Misc. UI changes

Browse source
This commit is contained in:
rytz 2016-01-28 12:39:14 -08:00
parent d26cb3fccc
commit b7c93a60fd
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -152,10 +152,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
buttonRow.HAnchor = HAnchor.ParentLeftRight;
buttonRow.Margin = new BorderDouble(0, 6);
string settingLabelBeggining = "Theme".Localize();
string settingLabelEnd = "Display".Localize();
string settingLabelFull = String.Format("{0}/{1}", settingLabelBeggining, settingLabelEnd);
TextWidget settingLabel = new TextWidget(settingLabelFull);//"Theme/Display Options"
TextWidget settingLabel = new TextWidget("Theme".Localize());
settingLabel.AutoExpandBoundsToText = true;
settingLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
settingLabel.HAnchor = Agg.UI.HAnchor.ParentLeft;

2
ConfigurationPage/PrintLeveling/LevelWizardBase.cs
View file

@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
protected static readonly string doneInstructionsText = LocalizedString.Get("Congratulations!\n\nAuto Print Leveling is now configured and enabled.");
protected static readonly string doneInstructionsTextTwo = LocalizedString.Get("Remove the paper");
protected static readonly string doneInstructionsTextThree = LocalizedString.Get("If in the future you need to re-calibrate your printer, or you wish to turn Auto Print Leveling off, you can find the print leveling controls in 'Advanced Settings'->'Configuration'.\n\nClick 'Done' to close this window.");
protected static readonly string doneInstructionsTextThree = LocalizedString.Get("To re-calibrate the printer, or to turn off Auto Print Leveling, the print leveling controls can be found under 'Options'->'Calibration'.\n\nClick 'Done' to close this window.");
protected static readonly string stepTextBeg = LocalizedString.Get("Step");
protected static readonly string stepTextEnd = LocalizedString.Get("of");

3
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -117,8 +117,7 @@ namespace MatterHackers.MatterControl
bool showExportGCodeButton = ActivePrinterProfile.Instance.ActivePrinter != null || partIsGCode;
if (showExportGCodeButton)
{
string exportGCodeText = LocalizedString.Get("Export as");
string exportGCodeTextFull = string.Format("{0} GCode", exportGCodeText);
string exportGCodeTextFull = string.Format("{0} G-Code", "Export as".Localize());
Button exportGCode = textImageButtonFactory.Generate(exportGCodeTextFull);
exportGCode.Name = "Export as GCode Button";
exportGCode.HAnchor = HAnchor.ParentLeft;

7
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -1138,9 +1138,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// add in the dimensions
{
buttonPanel.AddChild(createAxisScalingControl("x", 0));
buttonPanel.AddChild(createAxisScalingControl("y", 1));
buttonPanel.AddChild(createAxisScalingControl("z", 2));
buttonPanel.AddChild(createAxisScalingControl("x".ToUpper(), 0));
buttonPanel.AddChild(createAxisScalingControl("y".ToUpper(), 1));
buttonPanel.AddChild(createAxisScalingControl("z".ToUpper(), 2));
uniformScale = new CheckBox("Lock Ratio".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
uniformScale.Checked = true;

4
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -440,7 +440,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
string printTimeLabel = "Print Time".Localize();
string printTimeLabelFull = string.Format("{0}:", printTimeLabel);
// put in the print time
modelInfoContainer.AddChild(new TextWidget(printTimeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 10));
modelInfoContainer.AddChild(new TextWidget(printTimeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9));
{
string timeRemainingText = "---";
@ -493,7 +493,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelInfoContainer.AddChild(estimatedPrintTime);
}
string weightLabel = "Est. Weight".Localize();
string weightLabel = "Estimated Weight".Localize();
string weightLabelFull = string.Format("{0}:", weightLabel);
modelInfoContainer.AddChild(new TextWidget(weightLabelFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor));
{

2
Queue/OptionsMenu/QueueOptionsMenu.cs
View file

@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl.PrintQueue
menuItems = new TupleList<string, Func<bool>>();
menuItems.Add(new Tuple<string, Func<bool>>("Design".Localize(), null));
menuItems.Add(new Tuple<string, Func<bool>>(" Export to Zip".Localize(), exportQueueToZipMenu_Click));
menuItems.Add(new Tuple<string, Func<bool>>("GCode", null));
menuItems.Add(new Tuple<string, Func<bool>>("G-Code", null));
menuItems.Add(new Tuple<string, Func<bool>>(" Export to Folder or SD Card".Localize(), exportGCodeToFolderButton_Click));
//menuItems.Add(new Tuple<string, Func<bool>>("X3G", null));
//menuItems.Add(new Tuple<string, Func<bool>>("Export to Folder".Localize(), exportX3GButton_Click));

3
StaticData/Translations/Master.txt
View file

@ -4477,3 +4477,6 @@ Translated:Create Perimeter
English:Loading G-Code
Translated:Loading G-Code
English:Estimated Weight
Translated:Estimated Weight