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

Merge pull request #744 from larsbrubaker/master

Browse source 
Make sure clicking the revert user settings button refreshes required…
This commit is contained in:
Lars Brubaker 2016-05-12 11:10:50 -07:00
commit 19c7e032db
5 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

38
ControlElements/ImageButtonFactory.cs
View file

@ -63,6 +63,11 @@ namespace MatterHackers.MatterControl
public Button Generate(string normalImageName, string hoverImageName, string pressedImageName = null, string disabledImageName = null)
{
if (hoverImageName == null)
{
hoverImageName = normalImageName;
}
if (pressedImageName == null)
{
pressedImageName = hoverImageName;
@ -78,37 +83,16 @@ namespace MatterHackers.MatterControl
ImageBuffer hoverImage = StaticData.Instance.LoadIcon(hoverImageName);
ImageBuffer disabledImage = StaticData.Instance.LoadIcon(disabledImageName);
if (!ActiveTheme.Instance.IsDarkTheme && InvertImageColor)
{
normalImage.InvertLightness();
pressedImage.InvertLightness();
hoverImage.InvertLightness();
disabledImage.InvertLightness();
}
if (ActiveTheme.Instance.IsTouchScreen)
{
//normalImage.NewGraphics2D().Line(0, 0, normalImage.Width, normalImage.Height, RGBA_Bytes.Violet);
RoundedRect rect = new RoundedRect(pressedImage.GetBounds(), 0);
pressedImage.NewGraphics2D().Render(new Stroke(rect, 3), ActiveTheme.Instance.PrimaryTextColor);
}
ButtonViewStates buttonViewWidget = new ButtonViewStates(
new ImageWidget(normalImage),
new ImageWidget(hoverImage),
new ImageWidget(pressedImage),
new ImageWidget(disabledImage)
);
//Create button based on view container widget
Button imageButton = new Button(0, 0, buttonViewWidget);
imageButton.Margin = new BorderDouble(0);
imageButton.Padding = new BorderDouble(0);
return imageButton;
return Generate(normalImage, pressedImage, hoverImage, disabledImage);
}
public Button Generate(ImageBuffer normalImage, ImageBuffer hoverImage, ImageBuffer pressedImage = null, ImageBuffer disabledImage = null)
{
if(hoverImage == null)
{
hoverImage = normalImage;
}
if (pressedImage == null)
{
pressedImage = hoverImage;

55
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -695,7 +695,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(intEditWidget);
unitsArea.AddChild(GetExtraSettingsWidget(settingData));
settingsRow.ValueChanged = (text) => intEditWidget.Text = text;
settingsRow.ValueChanged = (text) =>
{
intEditWidget.Text = text;
OnSettingsChanged(settingData);
};
}
break;
@ -724,6 +728,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double currentValue2 = 0;
double.TryParse(text, out currentValue2);
doubleEditWidget.ActuallNumberEdit.Value = currentValue2;
OnSettingsChanged(settingData);
};
}
break;
@ -808,6 +813,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double currentValue2 = 0;
double.TryParse(text, out currentValue2);
doubleEditWidget.ActuallNumberEdit.Value = currentValue2;
OnSettingsChanged(settingData);
};
}
break;
@ -836,6 +842,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double currentValue2;
double.TryParse(text, out currentValue2);
doubleEditWidget.ActuallNumberEdit.Value = currentValue2;
OnSettingsChanged(settingData);
};
}
break;
@ -896,7 +903,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(content);
}
settingsRow.ValueChanged = (text) => stringEdit.Text = text;
settingsRow.ValueChanged = (text) =>
{
stringEdit.Text = text;
OnSettingsChanged(settingData);
};
}
break;
@ -981,7 +992,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(content);
}
settingsRow.ValueChanged = (text) => stringEdit.Text = text;
settingsRow.ValueChanged = (text) =>
{
stringEdit.Text = text;
OnSettingsChanged(settingData);
};
}
break;
@ -1006,7 +1021,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(checkBoxWidget);
settingsRow.ValueChanged = (text) => checkBoxWidget.Checked = text == "1";
settingsRow.ValueChanged = (text) =>
{
checkBoxWidget.Checked = text == "1";
OnSettingsChanged(settingData);
};
}
break;
@ -1024,7 +1043,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(stringEdit);
settingsRow.ValueChanged = (text) => stringEdit.Text = text;
settingsRow.ValueChanged = (text) =>
{
stringEdit.Text = text;
OnSettingsChanged(settingData);
};
}
break;
@ -1049,7 +1072,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(stringEdit);
dataArea.HAnchor = HAnchor.ParentLeftRight;
settingsRow.ValueChanged = (text) => stringEdit.Text = text.Replace("\\n", "\n");
settingsRow.ValueChanged = (text) =>
{
stringEdit.Text = text.Replace("\\n", "\n");
OnSettingsChanged(settingData);
};
}
break;
@ -1078,6 +1105,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
// Lookup the machine specific comport value rather than the passed in text value
selectableOptions.SelectedLabel = ActiveSliceSettings.Instance.ComPort();
OnSettingsChanged(settingData);
};
}
break;
@ -1111,7 +1139,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(selectableOptions);
settingsRow.ValueChanged = (text) => selectableOptions.SelectedLabel = text;
settingsRow.ValueChanged = (text) =>
{
selectableOptions.SelectedLabel = text;
OnSettingsChanged(settingData);
};
}
break;
@ -1138,7 +1170,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
dataArea.AddChild(checkBoxWidget);
settingsRow.ValueChanged = (text) => checkBoxWidget.Checked = text == "1";
settingsRow.ValueChanged = (text) =>
{
checkBoxWidget.Checked = text == "1";
OnSettingsChanged(settingData);
};
}
break;
@ -1215,6 +1251,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double.TryParse(xyValueStrings2[1], out currentValue2);
yEditWidget.ActuallNumberEdit.Value = currentValue2;
OnSettingsChanged(settingData);
};
}
@ -1276,6 +1314,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Vector2 offset2 = ActiveSliceSettings.Instance.ExtruderOffset(extruderIndex);
xEditWidget.ActuallNumberEdit.Value = offset2.x;
yEditWidget.ActuallNumberEdit.Value = offset2.y;
OnSettingsChanged(settingData);
};
}

2
StaticData/PrinterSettings/config.ini
View file

@ -175,5 +175,5 @@ wipe = 0
wipe_shield_distance = 0
wipe_tower_size = 0
z_can_be_negative = 0
z_homes_to_max = 1
z_homes_to_max = 0
z_offset = 0

3
StaticData/Translations/Master.txt
View file

@ -4846,3 +4846,6 @@ Translated:Behavior
English:Connection Info
Translated:Connection Info
English:Camera Monitoring
Translated:Camera Monitoring

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 7400644203459c2b8708111470acaaf16079377e
Subproject commit 315d3afdb66855557e0ad603c2ed5ccb24b3d680