diff --git a/Library/Interfaces/ILibraryContainer.cs b/Library/Interfaces/ILibraryContainer.cs index 112c68cf3..9b7d91546 100644 --- a/Library/Interfaces/ILibraryContainer.cs +++ b/Library/Interfaces/ILibraryContainer.cs @@ -31,7 +31,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using MatterHackers.Agg.Image; -using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.Library { @@ -68,4 +67,12 @@ namespace MatterHackers.MatterControl.Library void SetThumbnail(ILibraryItem item, int width, int height, ImageBuffer imageBuffer); bool AllowAction(ContainerActions containerActions); } + + public enum ContainerActions + { + AddItems, + AddContainers, + RenameItems, + RemoveItems + } } diff --git a/Library/Providers/CreateFolderItem.cs b/Library/Providers/CreateFolderItem.cs new file mode 100644 index 000000000..eb3559199 --- /dev/null +++ b/Library/Providers/CreateFolderItem.cs @@ -0,0 +1,44 @@ +/* +Copyright (c) 2017, John Lewin +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project. +*/ + +using System; + +namespace MatterHackers.MatterControl.Library +{ + public class CreateFolderItem : ILibraryItem + { + public string ID { get; } = Guid.NewGuid().ToString(); + + public string Name { get; set; } + + public bool IsProtected => false; + + public bool IsVisible => true; + } +} diff --git a/Library/Providers/DynamicContainerLink.cs b/Library/Providers/DynamicContainerLink.cs index 1d045b24f..fd68baf4e 100644 --- a/Library/Providers/DynamicContainerLink.cs +++ b/Library/Providers/DynamicContainerLink.cs @@ -33,17 +33,6 @@ using MatterHackers.Agg.Image; namespace MatterHackers.MatterControl.Library { - public class CreateFolderItem : ILibraryItem - { - public string ID { get; } = Guid.NewGuid().ToString(); - - public string Name { get; set; } - - public bool IsProtected => false; - - public bool IsVisible => true; - } - public class DynamicContainerLink : ILibraryContainerLink, IThumbnail { public string ID { get; set; } diff --git a/Library/Providers/LibraryContainer.cs b/Library/Providers/LibraryContainer.cs index 70f8575b1..73d6beffe 100644 --- a/Library/Providers/LibraryContainer.cs +++ b/Library/Providers/LibraryContainer.cs @@ -34,42 +34,6 @@ using MatterHackers.Agg.Image; namespace MatterHackers.MatterControl.Library { - public enum ContainerActions - { - AddItems, - AddContainers, - RenameItems, - RemoveItems - } - - public abstract class WritableContainer : LibraryContainer, ILibraryWritableContainer - { - public virtual void Add(IEnumerable items) - { - } - - public virtual void Remove(IEnumerable items) - { - } - - public virtual void Rename(ILibraryItem item, string revisedName) - { - } - - public virtual void Move(IEnumerable items, ILibraryContainer targetContainer) - { - } - - public virtual void SetThumbnail(ILibraryItem item, int width, int height, ImageBuffer imageBuffer) - { - } - - public virtual bool AllowAction(ContainerActions containerActions) - { - return true; - } - } - public abstract class LibraryContainer : ILibraryContainer { public event EventHandler Reloaded; diff --git a/Library/Providers/WritableContainer.cs b/Library/Providers/WritableContainer.cs new file mode 100644 index 000000000..e48cac409 --- /dev/null +++ b/Library/Providers/WritableContainer.cs @@ -0,0 +1,62 @@ +/* +Copyright (c) 2017, John Lewin +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project. +*/ + +using System.Collections.Generic; +using MatterHackers.Agg.Image; + +namespace MatterHackers.MatterControl.Library +{ + public abstract class WritableContainer : LibraryContainer, ILibraryWritableContainer + { + public virtual void Add(IEnumerable items) + { + } + + public virtual void Remove(IEnumerable items) + { + } + + public virtual void Rename(ILibraryItem item, string revisedName) + { + } + + public virtual void Move(IEnumerable items, ILibraryContainer targetContainer) + { + } + + public virtual void SetThumbnail(ILibraryItem item, int width, int height, ImageBuffer imageBuffer) + { + } + + public virtual bool AllowAction(ContainerActions containerActions) + { + return true; + } + } +} diff --git a/MatterControl.csproj b/MatterControl.csproj index b8a7d6243..7378e9fea 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -147,6 +147,8 @@ + +