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

Merge pull request #666 from jlewin/1.5.2

Browse source 
Guard LoadHistoryItems with WidgetHasBeenClosed
This commit is contained in:
johnlewin 2016-04-11 13:13:11 -07:00
commit ef6daf0487
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ApplicationView/MenuRow/MenuOptionSettings.cs
View file

@ -25,14 +25,14 @@ namespace MatterHackers.MatterControl
override protected TupleList<string, Func<bool>> GetMenuItems()
{
return new TupleList<string, Func<bool>>
{
{LocalizedString.Get("Settings"), openPrintingPannel_Click},
{LocalizedString.Get("Controls"), openControlsPannel_Click},
{LocalizedString.Get("Terminal"), openTermanialPannel_Click},
};
{
{"Settings".Localize(), openPrintingPanel_Click},
{"Controls".Localize(), openControlsPanel_Click},
{"Terminal".Localize(), openTerminalPanel_Click},
};
}
private bool openPrintingPannel_Click()
private bool openPrintingPanel_Click()
{
UiThread.RunOnIdle(() =>
{
@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl
return true;
}
private bool openControlsPannel_Click()
private bool openControlsPanel_Click()
{
UiThread.RunOnIdle(() =>
{
@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl
return true;
}
private bool openTermanialPannel_Click()
private bool openTerminalPanel_Click()
{
UiThread.RunOnIdle(TerminalWindow.Show);
return true;

5
History/PrintHistoryDataView.cs
View file

@ -146,7 +146,10 @@ namespace MatterHackers.MatterControl.PrintHistory
{
UiThread.RunOnIdle(() =>
{
LoadHistoryItems(Count);
if(!this.WidgetHasBeenClosed)
{
LoadHistoryItems(Count);
}
});
}

2
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
editToolBar.VAnchor |= Agg.UI.VAnchor.ParentCenter;
processingProgressControl.Visible = false;
// If the window is embeded (in the center pannel) and there is no item loaded then don't show the add button
// If the window is embedded (in the center panel) and there is no item loaded then don't show the add button
enterEditButtonsContainer = new FlowLayoutWidget();
{
Button addButton = textImageButtonFactory.Generate("Insert".Localize(), "icon_insert_32x32.png");

2
SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
View file

@ -924,7 +924,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
windowController.functionToCallOnSave(this, null);
windowController.ChangeToSlicePresetList();
ActiveSliceSettings.Instance.LoadAllSettings();
// Dissabled this as the pannel is already reloaded from LoadAllSettings LBB 2015 01 03.
// Disabled this as the panel is already reloaded from LoadAllSettings LBB 2015 01 03.
//ApplicationController.Instance.ReloadAdvancedControlsPanel();
}
});

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 7378b394c4f6e3071fe7c12458fc08646df22bd0
Subproject commit f7775a5a669e5bbaaf4b2a2510fd730320b42b54