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

UI label updates

Browse source
This commit is contained in:
rytz 2016-05-18 12:51:39 -07:00
parent 61f63b75cf
commit b78dadd25c
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -1268,7 +1268,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
OnSettingsChanged(settingData); OnSettingsChanged(settingData);
}; };
dataArea.AddChild(xEditWidget); dataArea.AddChild(xEditWidget);
dataArea.AddChild(new TextWidget("x", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor) dataArea.AddChild(new TextWidget("X", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
{ {
VAnchor = VAnchor.ParentCenter, VAnchor = VAnchor.ParentCenter,
Margin = new BorderDouble(5, 0), Margin = new BorderDouble(5, 0),
@ -1288,7 +1288,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Padding = new BorderDouble(5, 0), Padding = new BorderDouble(5, 0),
HAnchor = HAnchor.ParentLeftRight, HAnchor = HAnchor.ParentLeftRight,
}; };
yLabel.AddChild(new WrappedTextWidget("y", 0, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)); yLabel.AddChild(new WrappedTextWidget("Y", 0, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor));
unitsArea.AddChild(yLabel); unitsArea.AddChild(yLabel);
settingsRow.ValueChanged = (text) => settingsRow.ValueChanged = (text) =>
@ -1332,14 +1332,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
xEditWidget.ActuallNumberEdit.EditComplete += (sender, e) => xEditWidget.ActuallNumberEdit.EditComplete += (sender, e) =>
{ {
int extruderIndexLocal = extruderIndex; int extruderIndexLocal = extruderIndex;
SaveCommaSeparatedIndexSetting(extruderIndexLocal, settingData.SlicerConfigName, xEditWidget.ActuallNumberEdit.Value.ToString() + "x" + yEditWidget.ActuallNumberEdit.Value.ToString()); SaveCommaSeparatedIndexSetting(extruderIndexLocal, settingData.SlicerConfigName, xEditWidget.ActuallNumberEdit.Value.ToString() + "X" + yEditWidget.ActuallNumberEdit.Value.ToString());
settingsRow.UpdateStyle(); settingsRow.UpdateStyle();
OnSettingsChanged(settingData); OnSettingsChanged(settingData);
}; };
dataArea.AddChild(xEditWidget); dataArea.AddChild(xEditWidget);
dataArea.AddChild(new TextWidget("x", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor) dataArea.AddChild(new TextWidget("X", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
{ {
VAnchor = VAnchor.ParentCenter, VAnchor = VAnchor.ParentCenter,
Margin = new BorderDouble(5, 0), Margin = new BorderDouble(5, 0),
@ -1348,7 +1348,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
yEditWidget.ActuallNumberEdit.EditComplete += (sender, e) => yEditWidget.ActuallNumberEdit.EditComplete += (sender, e) =>
{ {
int extruderIndexLocal = extruderIndex; int extruderIndexLocal = extruderIndex;
SaveCommaSeparatedIndexSetting(extruderIndexLocal, settingData.SlicerConfigName, xEditWidget.ActuallNumberEdit.Value.ToString() + "x" + yEditWidget.ActuallNumberEdit.Value.ToString()); SaveCommaSeparatedIndexSetting(extruderIndexLocal, settingData.SlicerConfigName, xEditWidget.ActuallNumberEdit.Value.ToString() + "X" + yEditWidget.ActuallNumberEdit.Value.ToString());
settingsRow.UpdateStyle(); settingsRow.UpdateStyle();
@ -1360,7 +1360,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Padding = new BorderDouble(5, 0), Padding = new BorderDouble(5, 0),
HAnchor = HAnchor.ParentLeftRight, HAnchor = HAnchor.ParentLeftRight,
}; };
yLabel.AddChild(new WrappedTextWidget("y", 0, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)); yLabel.AddChild(new WrappedTextWidget("Y", 0, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor));
unitsArea.AddChild(yLabel); unitsArea.AddChild(yLabel);
settingsRow.ValueChanged = (text) => settingsRow.ValueChanged = (text) =>

4
StaticData/SliceSettings/Properties.json
View file

@ -1247,8 +1247,8 @@
}, },
{ {
"SlicerConfigName": "MatterControl.ComPort", "SlicerConfigName": "MatterControl.ComPort",
"PresentationName": "ComPort", "PresentationName": "COM Port",
"HelpText": "Set the com port to use while connecting to this printer.", "HelpText": "The COM port to use while connecting to this printer.",
"DataEditType": "COM_PORT", "DataEditType": "COM_PORT",
"ExtraSettings": "" "ExtraSettings": ""
}, },