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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source
This commit is contained in:
larsbrubaker 2014-02-24 11:00:03 -08:00
commit 04b7da0a59
4 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ActionBar/PrintStatusRow.cs
View file

@ -125,6 +125,12 @@ namespace MatterHackers.MatterControl.ActionBar
notifyButton.MouseLeaveBounds += (sender, mouseEvent) => { HelpTextWidget.Instance.HideHoverText(); };
notifyButton.Visible = ActivePrinterProfile.Instance.DoPrintLeveling;
ActivePrinterProfile.Instance.ActivePrinterChanged.RegisterEvent((sender, e) =>
{
notifyButton.Visible = ActivePrinterProfile.Instance.DoPrintLeveling;
}, ref unregisterEvents);
ActivePrinterProfile.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) =>
{
notifyButton.Visible = ActivePrinterProfile.Instance.DoPrintLeveling;

7
PrinterControls/EditMacrosWindow.cs
View file

@ -335,7 +335,12 @@ namespace MatterHackers.MatterControl
addMacroButton.Click += new ButtonBase.ButtonEventHandler(addMacro_Click);
Button cancelPresetsButton = textImageButtonFactory.Generate(new LocalizedString("Close").Translated);
cancelPresetsButton.Click += (sender, e) => { this.windowController.Close(); };
cancelPresetsButton.Click += (sender, e) => {
UiThread.RunOnIdle((state) =>
{
this.windowController.Close();
});
};
FlowLayoutWidget buttonRow = new FlowLayoutWidget();
buttonRow.HAnchor = HAnchor.ParentLeftRight;

7
PrinterControls/EditManualMovementSpeedsWindow.cs
View file

@ -173,7 +173,12 @@ namespace MatterHackers.MatterControl
savePresetsButton.Click += new ButtonBase.ButtonEventHandler(save_Click);
Button cancelPresetsButton = textImageButtonFactory.Generate(new LocalizedString("Cancel").Translated);
cancelPresetsButton.Click += (sender, e) => { Close(); };
cancelPresetsButton.Click += (sender, e) => {
UiThread.RunOnIdle((state) =>
{
Close();
});
};
FlowLayoutWidget buttonRow = new FlowLayoutWidget();
buttonRow.HAnchor = HAnchor.ParentLeftRight;

14
PrinterControls/XYZJogControls.cs
View file

@ -97,7 +97,8 @@ namespace MatterHackers.MatterControl
{
TextImageButtonFactory buttonFactory = new TextImageButtonFactory();
buttonFactory.FixedHeight = 20;
buttonFactory.FixedWidth = 35;
buttonFactory.FixedWidth = 30;
buttonFactory.fontSize = 10;
buttonFactory.Margin = new BorderDouble(0);
FlowLayoutWidget moveRadioButtons = new FlowLayoutWidget();
@ -123,11 +124,11 @@ namespace MatterHackers.MatterControl
moveRadioButtons.AddChild(oneHundredButton);
tenButton.Checked = true;
moveRadioButtons.Margin = new BorderDouble(3);
moveRadioButtons.Margin = new BorderDouble(0,3);
setMoveDistanceControl.AddChild(moveRadioButtons);
}
TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White);
TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White, pointSize:10);
mmLabel.VAnchor = Agg.UI.VAnchor.ParentCenter;
setMoveDistanceControl.AddChild(mmLabel);
setMoveDistanceControl.HAnchor = Agg.UI.HAnchor.ParentLeft;
@ -227,7 +228,8 @@ namespace MatterHackers.MatterControl
{
TextImageButtonFactory buttonFactory = new TextImageButtonFactory();
buttonFactory.FixedHeight = 20;
buttonFactory.FixedWidth = 35;
buttonFactory.FixedWidth = 30;
buttonFactory.fontSize = 10;
buttonFactory.Margin = new BorderDouble(0);
FlowLayoutWidget moveRadioButtons = new FlowLayoutWidget();
@ -244,11 +246,11 @@ namespace MatterHackers.MatterControl
oneHundredButton.CheckedStateChanged += (sender, e) => { if (((RadioButton)sender).Checked) SetEMoveAmount(100); };
moveRadioButtons.AddChild(oneHundredButton);
tenButton.Checked = true;
moveRadioButtons.Margin = new BorderDouble(3);
moveRadioButtons.Margin = new BorderDouble(0,3);
setMoveDistanceControl.AddChild(moveRadioButtons);
}
TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White);
TextWidget mmLabel = new TextWidget("mm", textColor: RGBA_Bytes.White, pointSize:10);
mmLabel.VAnchor = Agg.UI.VAnchor.ParentCenter;
setMoveDistanceControl.AddChild(mmLabel);
setMoveDistanceControl.HAnchor = Agg.UI.HAnchor.ParentLeft;