Merge pull request #411 from jlewin/1.4.0

Remove queue/history library providers and filter shared items provid…
This commit is contained in:
johnlewin 2015-09-24 16:30:41 -07:00
commit ba8420ebb0
4 changed files with 7 additions and 4 deletions

View file

@ -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);

View file

@ -47,6 +47,7 @@ using System.Threading.Tasks;
namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
/*
public class LibraryProviderHistoryCreator : ILibraryCreator
{
public virtual LibraryProvider CreateLibraryProvider(LibraryProvider parentLibraryProvider, Action<LibraryProvider> setCurrentLibraryProvider)
@ -61,7 +62,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
return LibraryProviderHistory.StaticProviderKey;
}
}
}
}*/
public class LibraryProviderHistory : LibraryProvider
{

View file

@ -46,6 +46,7 @@ using System.Threading.Tasks;
namespace MatterHackers.MatterControl.PrintLibrary.Provider
{
/*
public class LibraryProviderQueueCreator : ILibraryCreator
{
public virtual LibraryProvider CreateLibraryProvider(LibraryProvider parentLibraryProvider, Action<LibraryProvider> setCurrentLibraryProvider)
@ -60,7 +61,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider
return LibraryProviderQueue.StaticProviderKey;
}
}
}
} */
public class LibraryProviderQueue : LibraryProvider
{

View file

@ -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());