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

Merge pull request #4128 from larsbrubaker/master

Browse source 
Adding Tyler's printer name confirmation code to delete printer
This commit is contained in:
johnlewin 2018-12-29 12:31:43 -08:00 • committed by GitHub
commit 19a9520be9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
MatterControlLib/Library/Widgets/HardwarePage/HardwareTabPage.cs
View file

@ -143,22 +143,22 @@ namespace MatterHackers.MatterControl.PrintLibrary
var deleteMenuItem = menu.CreateMenuItem("Delete".Localize()); var deleteMenuItem = menu.CreateMenuItem("Delete".Localize());
deleteMenuItem.Click += (s2, e2) => deleteMenuItem.Click += (s2, e2) =>
{ {
if (treeView.SelectedNode.Tag is PrinterInfo printerInfo)
{
// Delete printer // Delete printer
StyledMessageBox.ShowMessageBox( StyledMessageBox.ShowMessageBox(
(deletePrinter) => (deletePrinter) =>
{
if (deletePrinter)
{ {
if (deletePrinter) ProfileManager.Instance.DeletePrinter(printerInfo.ID);
{ }
if (treeView.SelectedNode.Tag is PrinterInfo printerInfo) },
{ "Are you sure you want to delete printer '{0}'?".Localize().FormatWith(printerInfo.Name),
ProfileManager.Instance.DeletePrinter(printerInfo.ID); "Delete Printer?".Localize(),
} StyledMessageBox.MessageType.YES_NO,
} "Delete Printer".Localize());
}, }
"Are you sure you want to delete your currently selected printer?".Localize(),
"Delete Printer?".Localize(),
StyledMessageBox.MessageType.YES_NO,
"Delete Printer".Localize());
}; };

2
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -394,7 +394,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ProfileManager.Instance.DeletePrinter(printer.Settings.ID); ProfileManager.Instance.DeletePrinter(printer.Settings.ID);
} }
}, },
"Are you sure you want to delete your currently selected printer?".Localize(), "Are you sure you want to delete printer '{0}'?".Localize().FormatWith(printer.Settings.GetValue(SettingsKey.printer_name)),
"Delete Printer?".Localize(), "Delete Printer?".Localize(),
StyledMessageBox.MessageType.YES_NO, StyledMessageBox.MessageType.YES_NO,
"Delete Printer".Localize()); "Delete Printer".Localize());

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 90d7436006c9b52bcdae38cb1d8714d976a90e5e Subproject commit f41ca0ff7c45c6d8a397565ca62ba97927075c45