From b900841d74d59bbad8a1ce3fe4d278d7f810f80b Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 24 Sep 2015 16:28:51 -0700 Subject: [PATCH] Remove queue/history library providers and filter shared items provider from selector - Fixes #104131666, #104140048 --- CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs | 2 +- Library/Provider/LibraryProviderHistory.cs | 3 ++- Library/Provider/LibraryProviderQueue.cs | 3 ++- Library/Provider/LibraryProviderSelector.cs | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs index 38ea26f15..81d83321f 100644 --- a/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs +++ b/CustomWidgets/LibrarySelector/LibrarySelectorWidget.cs @@ -386,7 +386,7 @@ namespace MatterHackers.MatterControl.CustomWidgets.LibrarySelector for (int i = 0; i < provider.CollectionCount; i++) { PrintItemCollection item = provider.GetCollectionItem(i); - if (item.Key != "LibraryProviderPurchasedKey") + if (item.Key != "LibraryProviderPurchasedKey" && item.Key != "LibraryProviderSharedKey") { LibrarySelectorRowItem queueItem = new LibrarySelectorRowItem(item, i, this, null, GetThumbnailWidget(null, item, provider.GetCollectionFolderImage(i)), "Open".Localize()); AddListItemToTopToBottom(queueItem); diff --git a/Library/Provider/LibraryProviderHistory.cs b/Library/Provider/LibraryProviderHistory.cs index 3f73ef80f..c161c197d 100644 --- a/Library/Provider/LibraryProviderHistory.cs +++ b/Library/Provider/LibraryProviderHistory.cs @@ -47,6 +47,7 @@ using System.Threading.Tasks; namespace MatterHackers.MatterControl.PrintLibrary.Provider { + /* public class LibraryProviderHistoryCreator : ILibraryCreator { public virtual LibraryProvider CreateLibraryProvider(LibraryProvider parentLibraryProvider, Action setCurrentLibraryProvider) @@ -61,7 +62,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider return LibraryProviderHistory.StaticProviderKey; } } - } + }*/ public class LibraryProviderHistory : LibraryProvider { diff --git a/Library/Provider/LibraryProviderQueue.cs b/Library/Provider/LibraryProviderQueue.cs index 93757636a..98ea3500b 100644 --- a/Library/Provider/LibraryProviderQueue.cs +++ b/Library/Provider/LibraryProviderQueue.cs @@ -46,6 +46,7 @@ using System.Threading.Tasks; namespace MatterHackers.MatterControl.PrintLibrary.Provider { + /* public class LibraryProviderQueueCreator : ILibraryCreator { public virtual LibraryProvider CreateLibraryProvider(LibraryProvider parentLibraryProvider, Action setCurrentLibraryProvider) @@ -60,7 +61,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider return LibraryProviderQueue.StaticProviderKey; } } - } + } */ public class LibraryProviderQueue : LibraryProvider { diff --git a/Library/Provider/LibraryProviderSelector.cs b/Library/Provider/LibraryProviderSelector.cs index dcbe03999..248f6954d 100644 --- a/Library/Provider/LibraryProviderSelector.cs +++ b/Library/Provider/LibraryProviderSelector.cs @@ -92,6 +92,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider libraryCreators.Clear(); folderImagesForChildren.Clear(); + /* if (includeQueueLibraryProvider) { // put in the queue provider @@ -104,7 +105,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider // put in the history provider libraryCreators.Add(new LibraryProviderHistoryCreator()); AddFolderImage("queue_folder.png"); - } + } */ // put in the sqlite provider libraryCreators.Add(new LibraryProviderSQLiteCreator());