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

Add support for themed text/number edit fields

Browse source
This commit is contained in:
John Lewin 2018-10-14 20:05:37 -07:00
parent 151e753db2
commit 34708054ee
44 changed files with 598 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

20
MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -632,7 +632,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
case SliceSettingData.DataEditTypes.INT:
var intField = new IntField();
var intField = new IntField(theme);
uiField = intField;
if (settingData.SlicerConfigName == "extruder_count")
@ -645,26 +645,26 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
case SliceSettingData.DataEditTypes.DOUBLE:
case SliceSettingData.DataEditTypes.OFFSET:
uiField = new DoubleField();
uiField = new DoubleField(theme);
break;
case SliceSettingData.DataEditTypes.POSITIVE_DOUBLE:
if (settingData.SetSettingsOnChange.Count > 0)
{
uiField = new BoundDoubleField(settingsContext, settingData);
uiField = new BoundDoubleField(settingsContext, settingData, theme);
}
else
{
uiField = new PositiveDoubleField();
uiField = new PositiveDoubleField(theme);
}
break;
case SliceSettingData.DataEditTypes.DOUBLE_OR_PERCENT:
uiField = new DoubleOrPercentField();
uiField = new DoubleOrPercentField(theme);
break;
case SliceSettingData.DataEditTypes.INT_OR_MM:
uiField = new IntOrMmField();
uiField = new IntOrMmField(theme);
break;
case SliceSettingData.DataEditTypes.CHECK_BOX:
@ -698,11 +698,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
case SliceSettingData.DataEditTypes.STRING:
case SliceSettingData.DataEditTypes.WIDE_STRING:
uiField = new TextField();
uiField = new TextField(theme);
break;
case SliceSettingData.DataEditTypes.MULTI_LINE_TEXT:
uiField = new MultilineStringField();
uiField = new MultilineStringField(theme);
placeFieldInDedicatedRow = true;
break;
@ -740,12 +740,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case SliceSettingData.DataEditTypes.VECTOR2:
uiField = new Vector2Field();
uiField = new Vector2Field(theme);
break;
case SliceSettingData.DataEditTypes.OFFSET2:
placeFieldInDedicatedRow = true;
uiField = new ExtruderOffsetField(settingsContext, settingData.SlicerConfigName, theme.Colors.PrimaryTextColor);
uiField = new ExtruderOffsetField(settingsContext, settingData.SlicerConfigName, theme.Colors.PrimaryTextColor, theme);
break;
#if !__ANDROID__
case SliceSettingData.DataEditTypes.IP_LIST:

3
MatterControlLib/SlicerConfiguration/UIFields/BoundDoubleField.cs
View file

@ -41,7 +41,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private SettingsContext settingsContext;
public BoundDoubleField(SettingsContext settingsContext, SliceSettingData settingData)
public BoundDoubleField(SettingsContext settingsContext, SliceSettingData settingData, ThemeConfig theme)
: base (theme)
{
this.settingsContext = settingsContext;
this.settingData = settingData;

8
MatterControlLib/SlicerConfiguration/UIFields/CharField.cs
View file

@ -35,10 +35,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class CharField : UIField
{
protected MHTextEditWidget textEditWidget;
private ThemeConfig theme;
public CharField(ThemeConfig theme)
{
this.theme = theme;
}
public override void Initialize(int tabIndex)
{
textEditWidget = new MHTextEditWidget("", pixelWidth: ControlWidth, tabIndex: tabIndex)
textEditWidget = new MHTextEditWidget("", theme, pixelWidth: ControlWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
SelectAllOnFocus = true,

5
MatterControlLib/SlicerConfiguration/UIFields/DoubleField.cs
View file

@ -37,6 +37,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
private double _doubleValue;
public DoubleField(ThemeConfig theme)
: base (theme)
{
}
public double DoubleValue
{
get { return _doubleValue; }

3
MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs
View file

@ -34,7 +34,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class DoubleOrPercentField : ValueOrUnitsField
{
public DoubleOrPercentField()
public DoubleOrPercentField(ThemeConfig theme)
: base (theme)
{
unitsToken = "%";
}

6
MatterControlLib/SlicerConfiguration/UIFields/ExtruderOffsetField.cs
View file

@ -40,15 +40,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
private SettingsContext settingsContext;
private Color textColor;
private ThemeConfig theme;
private string slicerConfigName;
private List<Vector2Field> childFields;
public ExtruderOffsetField(SettingsContext settingsContext, string slicerConfigName, Color textColor)
public ExtruderOffsetField(SettingsContext settingsContext, string slicerConfigName, Color textColor, ThemeConfig theme)
{
this.slicerConfigName = slicerConfigName;
this.settingsContext = settingsContext;
this.textColor = textColor;
this.theme = theme;
//SaveCommaSeparatedIndexSetting(extruderOffset.ExtruderIndex, settingsContext, slicerConfigName, extruderOffset.Value.Replace(",", "x"));
}
@ -89,7 +91,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
labelWidget.Margin = new BorderDouble(right: 60);
row.AddChild(labelWidget);
var field = new Vector2Field();
var field = new Vector2Field(theme);
field.Initialize(tabIndex++);
field.Content.Margin = new BorderDouble(right: 55);
field.Content.VAnchor = VAnchor.Center;

5
MatterControlLib/SlicerConfiguration/UIFields/IntField.cs
View file

@ -36,6 +36,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class IntField : NumberField
{
public IntField(ThemeConfig theme)
: base (theme)
{
}
int _intValue;
public int IntValue
{

3
MatterControlLib/SlicerConfiguration/UIFields/IntOrMmField.cs
View file

@ -34,7 +34,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class IntOrMmField : ValueOrUnitsField
{
public IntOrMmField()
public IntOrMmField(ThemeConfig theme)
: base (theme)
{
this.unitsToken = "mm";
}

8
MatterControlLib/SlicerConfiguration/UIFields/MultilineStringField.cs
View file

@ -35,10 +35,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class MultilineStringField : UIField
{
private MHTextEditWidget editWidget;
private ThemeConfig theme;
public MultilineStringField(ThemeConfig theme)
{
this.theme = theme;
}
public override void Initialize(int tabIndex)
{
editWidget = new MHTextEditWidget("", pixelWidth: 320, multiLine: true, tabIndex: tabIndex, typeFace: ApplicationController.GetTypeFace(NamedTypeFace.Liberation_Mono))
editWidget = new MHTextEditWidget("", theme, pixelWidth: 320, multiLine: true, tabIndex: tabIndex, typeFace: ApplicationController.GetTypeFace(NamedTypeFace.Liberation_Mono))
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,

8
MatterControlLib/SlicerConfiguration/UIFields/NumberField.cs
View file

@ -34,13 +34,19 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public abstract class NumberField : UIField
{
protected MHNumberEdit numberEdit;
private ThemeConfig theme;
protected bool AllowNegatives { get; set; } = true;
protected bool AllowDecimals { get; set; } = true;
public NumberField(ThemeConfig theme)
{
this.theme = theme;
}
public override void Initialize(int tabIndex)
{
numberEdit = new MHNumberEdit(0, pixelWidth: ControlWidth, allowDecimals: this.AllowDecimals, allowNegatives: this.AllowNegatives, tabIndex: tabIndex)
numberEdit = new MHNumberEdit(0, theme, pixelWidth: ControlWidth, allowDecimals: this.AllowDecimals, allowNegatives: this.AllowNegatives, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
SelectAllOnFocus = true,

3
MatterControlLib/SlicerConfiguration/UIFields/PositiveDoubleField.cs
View file

@ -34,7 +34,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class PositiveDoubleField : DoubleField
{
public PositiveDoubleField()
public PositiveDoubleField(ThemeConfig theme)
: base(theme)
{
this.AllowNegatives = false;
}

2
MatterControlLib/SlicerConfiguration/UIFields/SurfacedEditorPage.cs
View file

@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
BackgroundColor = theme.ActiveTabColor
};
editWidget = new MHTextEditWidget("", multiLine: true)
editWidget = new MHTextEditWidget("", theme, multiLine: true)
{
HAnchor = HAnchor.Stretch,
Name = this.Name

8
MatterControlLib/SlicerConfiguration/UIFields/TextField.cs
View file

@ -34,10 +34,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class TextField : UIField
{
protected MHTextEditWidget textEditWidget;
private ThemeConfig theme;
public TextField(ThemeConfig theme)
{
this.theme = theme;
}
public override void Initialize(int tabIndex)
{
textEditWidget = new MHTextEditWidget("", pixelWidth: ControlWidth, tabIndex: tabIndex)
textEditWidget = new MHTextEditWidget("", theme, pixelWidth: ControlWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
SelectAllOnFocus = true,

5
MatterControlLib/SlicerConfiguration/UIFields/ValueOrUnitsField.cs
View file

@ -34,6 +34,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
protected string unitsToken = "units-token";
public ValueOrUnitsField(ThemeConfig theme)
: base (theme)
{
}
public override void Initialize(int tabIndex)
{
base.Initialize(tabIndex);

12
MatterControlLib/SlicerConfiguration/UIFields/Vector2Field.cs
View file

@ -40,6 +40,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private MHNumberEdit yEditWidget;
private MHNumberEdit xEditWidget;
private ThemeConfig theme;
public Vector2Field(ThemeConfig theme)
{
this.theme = theme;
}
public Vector2 Vector2
{
@ -60,7 +66,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var container = new FlowLayoutWidget();
string[] xyValueStrings = this.Value?.Split(',');
if (xyValueStrings == null
if (xyValueStrings == null
|| xyValueStrings.Length != 2)
{
xyValueStrings = new string[] { "0", "0" };
@ -68,7 +74,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyValueStrings[0], out double currentXValue);
xEditWidget = new MHNumberEdit(currentXValue, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYEditWidth, tabIndex: tabIndex)
xEditWidget = new MHNumberEdit(currentXValue, theme, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex,
@ -90,7 +96,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyValueStrings[1], out double currentYValue);
yEditWidget = new MHNumberEdit(currentYValue, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYEditWidth, tabIndex: tabIndex)
yEditWidget = new MHNumberEdit(currentYValue, theme, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex + 1,

20
MatterControlLib/SlicerConfiguration/UIFields/Vector3Field.cs
View file

@ -40,6 +40,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private MHNumberEdit xEditWidget;
private MHNumberEdit yEditWidget;
private MHNumberEdit zEditWidget;
private ThemeConfig theme;
public Vector3Field(ThemeConfig theme)
{
this.theme = theme;
}
public Vector3 Vector3
{
@ -61,7 +67,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var container = new FlowLayoutWidget();
string[] xyzValueStrings = this.Value?.Split(',');
if (xyzValueStrings == null
if (xyzValueStrings == null
|| xyzValueStrings.Length != 3)
{
xyzValueStrings = new string[] { "0", "0", "0" };
@ -69,7 +75,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[0], out double currentXValue);
xEditWidget = new MHNumberEdit(currentXValue, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex)
xEditWidget = new MHNumberEdit(currentXValue, theme, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex,
@ -78,7 +84,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
xEditWidget.ActuallNumberEdit.EditComplete += (sender, e) =>
{
this.SetValue(
string.Format("{0},{1},{2}",
string.Format("{0},{1},{2}",
xEditWidget.ActuallNumberEdit.Value.ToString(),
yEditWidget.ActuallNumberEdit.Value.ToString(),
zEditWidget.ActuallNumberEdit.Value.ToString()),
@ -94,7 +100,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[1], out double currentYValue);
yEditWidget = new MHNumberEdit(currentYValue, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex)
yEditWidget = new MHNumberEdit(currentYValue, theme, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex + 1,
@ -103,7 +109,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
yEditWidget.ActuallNumberEdit.EditComplete += (sender, e) =>
{
this.SetValue(
string.Format("{0},{1},{2}",
string.Format("{0},{1},{2}",
xEditWidget.ActuallNumberEdit.Value.ToString(),
yEditWidget.ActuallNumberEdit.Value.ToString(),
zEditWidget.ActuallNumberEdit.Value.ToString()),
@ -119,7 +125,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyzValueStrings[2], out double currentZValue);
zEditWidget = new MHNumberEdit(currentZValue, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex)
zEditWidget = new MHNumberEdit(currentZValue, theme, allowNegatives: true, allowDecimals: true, pixelWidth: VectorXYZEditWidth, tabIndex: tabIndex)
{
ToolTipText = this.HelpText,
TabIndex = tabIndex + 1,
@ -128,7 +134,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
zEditWidget.ActuallNumberEdit.EditComplete += (sender, e) =>
{
this.SetValue(
string.Format("{0},{1},{2}",
string.Format("{0},{1},{2}",
xEditWidget.ActuallNumberEdit.Value.ToString(),
yEditWidget.ActuallNumberEdit.Value.ToString(),
zEditWidget.ActuallNumberEdit.Value.ToString()),