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

Upgrading to .net 4.5.

Browse source
This commit is contained in:
Lars Brubaker 2014-11-25 12:19:37 -08:00
parent abc6305702
commit e1fc6838a3
22 changed files with 63 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SlicerConfiguration/SlicePresetsWindow/SlicePresetDetailWidget.cs
View file

@ -429,7 +429,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.windowController.ActivePresetLayer.settingsDictionary[addRowSettingData.SlicerConfigName] = sliceSetting;
OnSettingsChanged();
HasUncommittedChanges = true;
}
addRowSettingData = null;
PopulateAddSettingRow(-1, -1, "-1");
@ -475,7 +474,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
});
}
bool HasUncommittedChanges;
public RootedObjectEventHandler CommitStatusChanged = new RootedObjectEventHandler();
public RootedObjectEventHandler SettingsChanged = new RootedObjectEventHandler();
@ -487,7 +485,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.windowController.ActivePresetLayer.settingsDictionary[keyName].Value = keyValue;
OnSettingsChanged();
HasUncommittedChanges = true;
}
else
{
@ -499,7 +496,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.windowController.ActivePresetLayer.settingsDictionary[keyName] = sliceSetting;
OnSettingsChanged();
HasUncommittedChanges = true;
}
}
@ -927,7 +923,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
LoadSettingsRows();
}
}
catch (Exception e)
catch (Exception)
{
// Error loading configuration
}

2
SlicerConfiguration/SlicePresetsWindow/SlicePresetListWidget.cs
View file

@ -207,7 +207,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
windowController.ChangeToSlicePresetList();
}
}
catch (Exception e)
catch (Exception)
{
// Error loading configuration
}