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

Complete rename to UIField

Browse source
This commit is contained in:
John Lewin 2017-09-13 06:59:30 -07:00
parent 334f64148b
commit acff39eee0
13 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControl.csproj
View file

@ -292,10 +292,11 @@
<Compile Include="SetupWizard\SetupWizardTroubleshooting.cs" />
<Compile Include="SetupWizard\SetupWizardWifi.cs" />
<Compile Include="SetupWizard\WizardWindow.cs" />
<Compile Include="SlicerConfiguration\UIFields\BasicField.cs" />
<Compile Include="SlicerConfiguration\UIFields\UIField.cs" />
<Compile Include="SlicerConfiguration\UIFields\DoubleField.cs" />
<Compile Include="SlicerConfiguration\UIFields\DoubleOrPercentField.cs" />
<Compile Include="SlicerConfiguration\UIFields\DropMenuWrappedField.cs" />
<Compile Include="SlicerConfiguration\UIFields\FieldChangedEventArgs.cs" />
<Compile Include="SlicerConfiguration\UIFields\IntField.cs" />
<Compile Include="SlicerConfiguration\UIFields\IntOrMmField.cs" />
<Compile Include="SlicerConfiguration\UIFields\CheckboxField.cs" />
@ -308,7 +309,6 @@
<Compile Include="SlicerConfiguration\UIFields\Vector2Field.cs" />
<Compile Include="SlicerConfiguration\UIFields\PositiveDoubleField.cs" />
<Compile Include="SlicerConfiguration\SettingsContext.cs" />
<Compile Include="SlicerConfiguration\UIFields\IUIField.cs" />
<Compile Include="SlicerConfiguration\Settings\GCodeMacro.cs" />
<Compile Include="SlicerConfiguration\Settings\ProfileMigrations.cs" />
<Compile Include="SlicerConfiguration\Settings\ProfileManager.cs" />

6
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private PrinterConnection printerConnection;
private Dictionary<string, BasicField> allUiFields = new Dictionary<string, BasicField>();
private Dictionary<string, UIField> allUiFields = new Dictionary<string, UIField>();
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;

4
SlicerConfiguration/UIFields/CheckboxField.cs
View file

@ -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;

2
SlicerConfiguration/UIFields/ComPortField.cs
View file

@ -36,7 +36,7 @@ using MatterHackers.SerialPortCommunication.FrostedSerial;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class ComPortField : BasicField
public class ComPortField : UIField
{
private DropDownList dropdownList;

4
SlicerConfiguration/UIFields/DropMenuWrappedField.cs
View file

@ -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;

2
SlicerConfiguration/UIFields/IUIField.cs → SlicerConfiguration/UIFields/FieldChangedEventArgs.cs
View file

@ -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
{

2
SlicerConfiguration/UIFields/ListField.cs
View file

@ -35,7 +35,7 @@ using MatterHackers.Localizations;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class ListField : BasicField
public class ListField : UIField
{
private DropDownList dropdownList;

2
SlicerConfiguration/UIFields/MultilineStringField.cs
View file

@ -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);

2
SlicerConfiguration/UIFields/NumberField.cs
View file

@ -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;

2
SlicerConfiguration/UIFields/TextField.cs
View file

@ -31,7 +31,7 @@ using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class TextField : BasicField
public class TextField : UIField
{
protected MHTextEditWidget textEditWidget;

2
SlicerConfiguration/UIFields/BasicField.cs → SlicerConfiguration/UIFields/UIField.cs
View file

@ -32,7 +32,7 @@ using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public abstract class BasicField
public abstract class UIField
{
public event EventHandler<FieldChangedEventArgs> ValueChanged;

2
SlicerConfiguration/UIFields/Vector2Field.cs
View file

@ -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);

9
StaticData/Translations/Master.txt
View file

@ -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