diff --git a/MatterControl.csproj b/MatterControl.csproj index 818915de9..ad22ed680 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -292,10 +292,11 @@ - + + @@ -308,7 +309,6 @@ - diff --git a/SlicerConfiguration/SliceSettingsWidget.cs b/SlicerConfiguration/SliceSettingsWidget.cs index 671bc7a65..241928947 100644 --- a/SlicerConfiguration/SliceSettingsWidget.cs +++ b/SlicerConfiguration/SliceSettingsWidget.cs @@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration private PrinterConnection printerConnection; - private Dictionary allUiFields = new Dictionary(); + private Dictionary allUiFields = new Dictionary(); private EventHandler unregisterEvents; @@ -123,7 +123,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (e is StringEventArgs stringEvent) { string settingsKey = stringEvent.Data; - if (allUiFields.TryGetValue(settingsKey, out BasicField field2)) + if (allUiFields.TryGetValue(settingsKey, out UIField field2)) { string currentValue = settingsContext.GetValue(settingsKey); if (field2.Value != currentValue @@ -891,7 +891,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { string sliceSettingValue = settingsContext.GetValue(settingData.SlicerConfigName); - BasicField uiField = null; + UIField uiField = null; bool useDefaultSavePattern = true; bool placeFieldInDedicatedRow = false; diff --git a/SlicerConfiguration/UIFields/CheckboxField.cs b/SlicerConfiguration/UIFields/CheckboxField.cs index 1488e430c..715f8fd0f 100644 --- a/SlicerConfiguration/UIFields/CheckboxField.cs +++ b/SlicerConfiguration/UIFields/CheckboxField.cs @@ -33,7 +33,7 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class CheckboxField : BasicField + public class CheckboxField : UIField { private CheckBox checkBoxWidget; @@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } - public class ToggleboxField : BasicField + public class ToggleboxField : UIField { private CheckBox checkBoxWidget; diff --git a/SlicerConfiguration/UIFields/ComPortField.cs b/SlicerConfiguration/UIFields/ComPortField.cs index 775cf0379..694dc4785 100644 --- a/SlicerConfiguration/UIFields/ComPortField.cs +++ b/SlicerConfiguration/UIFields/ComPortField.cs @@ -36,7 +36,7 @@ using MatterHackers.SerialPortCommunication.FrostedSerial; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class ComPortField : BasicField + public class ComPortField : UIField { private DropDownList dropdownList; diff --git a/SlicerConfiguration/UIFields/DropMenuWrappedField.cs b/SlicerConfiguration/UIFields/DropMenuWrappedField.cs index 3a79e07c8..df81be8b2 100644 --- a/SlicerConfiguration/UIFields/DropMenuWrappedField.cs +++ b/SlicerConfiguration/UIFields/DropMenuWrappedField.cs @@ -35,10 +35,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { public class DropMenuWrappedField { - private BasicField uiField; + private UIField uiField; private SliceSettingData settingData; - public DropMenuWrappedField(BasicField uiField, SliceSettingData settingData) + public DropMenuWrappedField(UIField uiField, SliceSettingData settingData) { this.settingData = settingData; this.uiField = uiField; diff --git a/SlicerConfiguration/UIFields/IUIField.cs b/SlicerConfiguration/UIFields/FieldChangedEventArgs.cs similarity index 97% rename from SlicerConfiguration/UIFields/IUIField.cs rename to SlicerConfiguration/UIFields/FieldChangedEventArgs.cs index 0bf62d5ef..3ed72d5db 100644 --- a/SlicerConfiguration/UIFields/IUIField.cs +++ b/SlicerConfiguration/UIFields/FieldChangedEventArgs.cs @@ -27,8 +27,6 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using System; -using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { diff --git a/SlicerConfiguration/UIFields/ListField.cs b/SlicerConfiguration/UIFields/ListField.cs index 221b019fa..4b32ffe94 100644 --- a/SlicerConfiguration/UIFields/ListField.cs +++ b/SlicerConfiguration/UIFields/ListField.cs @@ -35,7 +35,7 @@ using MatterHackers.Localizations; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class ListField : BasicField + public class ListField : UIField { private DropDownList dropdownList; diff --git a/SlicerConfiguration/UIFields/MultilineStringField.cs b/SlicerConfiguration/UIFields/MultilineStringField.cs index 0b9169bbe..f163ae1ad 100644 --- a/SlicerConfiguration/UIFields/MultilineStringField.cs +++ b/SlicerConfiguration/UIFields/MultilineStringField.cs @@ -32,7 +32,7 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class MultilineStringField : BasicField + public class MultilineStringField : UIField { private readonly int multiLineEditHeight = (int)(120 * GuiWidget.DeviceScale + .5); diff --git a/SlicerConfiguration/UIFields/NumberField.cs b/SlicerConfiguration/UIFields/NumberField.cs index d92b997a7..e1c4c69f4 100644 --- a/SlicerConfiguration/UIFields/NumberField.cs +++ b/SlicerConfiguration/UIFields/NumberField.cs @@ -31,7 +31,7 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public abstract class NumberField : BasicField + public abstract class NumberField : UIField { protected MHNumberEdit numberEdit; diff --git a/SlicerConfiguration/UIFields/TextField.cs b/SlicerConfiguration/UIFields/TextField.cs index 3b00bd116..7c48edbbb 100644 --- a/SlicerConfiguration/UIFields/TextField.cs +++ b/SlicerConfiguration/UIFields/TextField.cs @@ -31,7 +31,7 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class TextField : BasicField + public class TextField : UIField { protected MHTextEditWidget textEditWidget; diff --git a/SlicerConfiguration/UIFields/BasicField.cs b/SlicerConfiguration/UIFields/UIField.cs similarity index 98% rename from SlicerConfiguration/UIFields/BasicField.cs rename to SlicerConfiguration/UIFields/UIField.cs index 7d4f72d39..671033f6e 100644 --- a/SlicerConfiguration/UIFields/BasicField.cs +++ b/SlicerConfiguration/UIFields/UIField.cs @@ -32,7 +32,7 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public abstract class BasicField + public abstract class UIField { public event EventHandler ValueChanged; diff --git a/SlicerConfiguration/UIFields/Vector2Field.cs b/SlicerConfiguration/UIFields/Vector2Field.cs index 4eb20227a..57874a8a0 100644 --- a/SlicerConfiguration/UIFields/Vector2Field.cs +++ b/SlicerConfiguration/UIFields/Vector2Field.cs @@ -32,7 +32,7 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class Vector2Field : BasicField + public class Vector2Field : UIField { public static readonly int VectorXYEditWidth = (int)(60 * GuiWidget.DeviceScale + .5); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 02e173cca..d630b84c3 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4537,3 +4537,12 @@ Translated:Preset Name: English:Fillament Translated:Fillament +English:Write Filter +Translated:Write Filter + +English:Read Filter +Translated:Read Filter + +English:Filters +Translated:Filters +