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

Merge pull request #3425 from larsbrubaker/design_tools

Browse source 
Another bug in the eeprom writing
This commit is contained in:
Lars Brubaker 2018-06-15 11:29:03 -07:00 • committed by GitHub
commit 4069c00d41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/ApplicationController.cs
View file

@ -830,7 +830,7 @@ namespace MatterHackers.MatterControl
return Task.CompletedTask; return Task.CompletedTask;
}, },
(sceneItem) => true, (sceneItem) => true,
(sceneItem) => true); (sceneItem) => sceneItem.DescendantsAndSelf().Any((i) => i is IPathObject));
ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) => ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) =>
{ {

2
EeProm/EePromMarlinSettings.cs
View file

@ -493,7 +493,7 @@ namespace MatterHackers.MatterControl.EeProm
{ {
get get
{ {
return acc_travel_moves; return acc_retraction;
} }
set set

24
PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -287,29 +287,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
Icon = AggContext.StaticData.LoadIcon("memory_16x16.png", 16, 16, theme.InvertIcons), Icon = AggContext.StaticData.LoadIcon("memory_16x16.png", 16, 16, theme.InvertIcons),
Title = "Configure EEProm".Localize(), Title = "Configure EEProm".Localize(),
Action = configureEePromButton_Click Action = configureEePromButton_Click,
IsEnabled = () => printer.Connection.IsConnected
}, },
//new NamedAction()
//{
// Title = "Rename Printer".Localize(),
// Action = () =>
// {
// DialogWindow.Show(
// new InputBoxPage(
// "Rename Printer".Localize(),
// "Name".Localize(),
// printer.Settings.GetValue(SettingsKey.printer_name),
// "Enter New Name Here".Localize(),
// "Rename".Localize(),
// (newName) =>
// {
// if (!string.IsNullOrEmpty(newName))
// {
// printer.Settings.SetValue(SettingsKey.printer_name, newName);
// }
// }));
// }
//},
new NamedBoolAction() new NamedBoolAction()
{ {
Title = "Configure Printer".Localize(), Title = "Configure Printer".Localize(),

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit b0e86c1b34df07656eb44fe9dbd3bc4271bf0e57 Subproject commit f72f111824056c3c4dae9327326dc39b2eb85a1b