diff --git a/Library/Widgets/ListView/ListView.cs b/Library/Widgets/ListView/ListView.cs index 7b7ce5444..401ffa4ad 100644 --- a/Library/Widgets/ListView/ListView.cs +++ b/Library/Widgets/ListView/ListView.cs @@ -89,12 +89,12 @@ namespace MatterHackers.MatterControl.CustomWidgets context.ContainerReloaded += ActiveContainer_Reloaded; bool printerConnected = false; - PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent(async (s, e) => + PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent((s, e) => { bool isConnected = PrinterConnection.Instance.PrinterIsConnected; if (printerConnected != isConnected) { - await DisplayContainerContent(ActiveContainer); + DisplayContainerContent(ActiveContainer); printerConnected = isConnected; } }, ref unregisterEvents); @@ -142,24 +142,12 @@ namespace MatterHackers.MatterControl.CustomWidgets public IEnumerable Items => items; - /* -* bool isTraceable = listViewItem.Model is ILibraryPrintItem; -bool hasID = !string.IsNullOrEmpty(listViewItem.Model.ID); -List acquireItems, -if (hasID - && isTraceable - && thumbnail == null) -{ - // Schedule for collection, display default thumb until then - acquireItems.Add(listViewItem); -} -*/ /// /// Empties the list children and repopulates the list with the source container content /// /// The container to load /// Async Task - private async Task DisplayContainerContent(ILibraryContainer sourceContainer) + private void DisplayContainerContent(ILibraryContainer sourceContainer) { if (sourceContainer == null) { diff --git a/PartPreviewWindow/PlusTabPage.cs b/PartPreviewWindow/PlusTabPage.cs index fd9fe49e1..f46a7b53f 100644 --- a/PartPreviewWindow/PlusTabPage.cs +++ b/PartPreviewWindow/PlusTabPage.cs @@ -73,11 +73,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; createItems.AddChild(container); - var createPart = ApplicationController.Instance.Theme.BreadCrumbButtonFactory.Generate("Create Part"); + var createPart = ApplicationController.Instance.Theme.BreadCrumbButtonFactory.Generate("Create Part".Localize()); createPart.HAnchor = HAnchor.ParentLeft; container.AddChild(createPart); - var createPrinter = ApplicationController.Instance.Theme.BreadCrumbButtonFactory.Generate("Create Printer"); + var createPrinter = ApplicationController.Instance.Theme.BreadCrumbButtonFactory.Generate("Create Printer".Localize()); createPrinter.HAnchor = HAnchor.ParentLeft; container.AddChild(createPrinter); createPrinter.Click += (s, e) => @@ -100,6 +100,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } }; + var importButton = ApplicationController.Instance.Theme.BreadCrumbButtonFactory.Generate("Import".Localize()); + importButton.Click += (s, e) => + { + UiThread.RunOnIdle(() => WizardWindow.Show("ImportSettingsPage", "Import Settings Page")); + }; + container.AddChild(importButton); + var existingLabel = new TextWidget("Open Existing".Localize() + ":", textColor: ActiveTheme.Instance.PrimaryTextColor) { Margin = new BorderDouble(top: 15, bottom: 15) diff --git a/SlicerConfiguration/SliceSettingsDetailControl.cs b/SlicerConfiguration/SliceSettingsDetailControl.cs index 7be09ec26..0d12b6c73 100644 --- a/SlicerConfiguration/SliceSettingsDetailControl.cs +++ b/SlicerConfiguration/SliceSettingsDetailControl.cs @@ -79,13 +79,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration MenuItem menuItem; - menuItem = overflowDropdown.CreateMenuItem("Import".Localize()); - menuItem.Click += (s, e) => - { - UiThread.RunOnIdle(() => WizardWindow.Show("ImportSettingsPage", "Import Settings Page")); - }; - popupContainer.AddChild(menuItem); - menuItem = overflowDropdown.CreateMenuItem("Export".Localize()); menuItem.Click += (s, e) => {