[f-spot/icon-view-cleanup] Move PhotoList to Core



commit 2b146bbadd09eb9d2ccefb5499e9742b506aa992
Author: Mike Gemünde <mike gemuende de>
Date:   Wed Sep 8 09:16:01 2010 +0200

    Move PhotoList to Core

 .../MainApp/FSpot.Extensions/ExportMenuItemNode.cs |    2 ++
 src/Clients/MainApp/FSpot.Import/ImportSource.cs   |    3 +++
 src/Clients/MainApp/MainApp.csproj                 |    1 -
 src/Clients/MainApp/Makefile.am                    |    1 -
 src/Core/FSpot.Core/FSpot.Core.csproj              |    1 -
 .../FSpot.Core/FSpot.Core}/PhotoList.cs            |    3 +--
 src/Core/FSpot.Core/Makefile.am                    |    1 +
 7 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
index f6981c6..b8e279c 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
@@ -11,6 +11,8 @@
 using Mono.Addins;
 using System;
 
+using FSpot.Core;
+
 namespace FSpot.Extensions
 {
 	public delegate PhotoList SelectedImages ();
diff --git a/src/Clients/MainApp/FSpot.Import/ImportSource.cs b/src/Clients/MainApp/FSpot.Import/ImportSource.cs
index 8b8d2cc..1561a84 100644
--- a/src/Clients/MainApp/FSpot.Import/ImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/ImportSource.cs
@@ -1,6 +1,9 @@
 using Hyena;
 using System;
 
+using FSpot.Core;
+
+
 namespace FSpot.Import
 {
     public interface ImportSource {
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 9b8641b..71999c8 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -196,7 +196,6 @@
     <Compile Include="FSpot\TagStore.cs" />
     <Compile Include="FSpot.Database\DbException.cs" />
     <Compile Include="FSpot.Database\DbStore.cs" />
-    <Compile Include="FSpot\PhotoList.cs" />
     <Compile Include="FSpot.Widgets\ThumbnailCaptionRenderer.cs" />
     <Compile Include="FSpot.Widgets\ThumbnailDateCaptionRenderer.cs" />
     <Compile Include="FSpot.Widgets\ThumbnailDecorationRenderer.cs" />
diff --git a/src/Clients/MainApp/Makefile.am b/src/Clients/MainApp/Makefile.am
index 8a53311..95df244 100644
--- a/src/Clients/MainApp/Makefile.am
+++ b/src/Clients/MainApp/Makefile.am
@@ -143,7 +143,6 @@ SOURCES =  \
 	FSpot/MetaStore.cs \
 	FSpot/Photo.cs \
 	FSpot/PhotoEventArgs.cs \
-	FSpot/PhotoList.cs \
 	FSpot/PhotoLoader.cs \
 	FSpot/PhotoPopup.cs \
 	FSpot/PhotoQuery.cs \
diff --git a/src/Core/FSpot.Core/FSpot.Core.csproj b/src/Core/FSpot.Core/FSpot.Core.csproj
index a2f248a..eed713e 100644
--- a/src/Core/FSpot.Core/FSpot.Core.csproj
+++ b/src/Core/FSpot.Core/FSpot.Core.csproj
@@ -43,7 +43,6 @@
     <Compile Include="FSpot.Core\IPhotoVersion.cs" />
     <Compile Include="FSpot.Core\IPhotoVersionable.cs" />
     <Compile Include="FSpot.Core\FilePhoto.cs" />
-    <Compile Include="FSpot.Core\PhotoSelection.cs" />
     <Compile Include="FSpot.Core\PhotoList.cs" />
   </ItemGroup>
   <ProjectExtensions>
diff --git a/src/Clients/MainApp/FSpot/PhotoList.cs b/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
similarity index 98%
rename from src/Clients/MainApp/FSpot/PhotoList.cs
rename to src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
index d9f7792..7a597d9 100644
--- a/src/Clients/MainApp/FSpot/PhotoList.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
@@ -9,9 +9,8 @@
 
 using System.Collections.Generic;
 
-using FSpot.Core;
+namespace FSpot.Core {
 
-namespace FSpot {
 	public class PhotoList : IBrowsableCollection {
 		protected List<IPhoto> list;
 		IPhoto [] cache;
diff --git a/src/Core/FSpot.Core/Makefile.am b/src/Core/FSpot.Core/Makefile.am
index 4b03208..4f96f15 100644
--- a/src/Core/FSpot.Core/Makefile.am
+++ b/src/Core/FSpot.Core/Makefile.am
@@ -21,6 +21,7 @@ SOURCES =  \
 	FSpot.Core/IPhotoVersion.cs \
 	FSpot.Core/IPhotoVersionable.cs \
 	FSpot.Core/PhotoChanges.cs \
+	FSpot.Core/PhotoList.cs \
 	FSpot.Core/PhotosChanges.cs \
 	FSpot.Core/Roll.cs \
 	FSpot.Core/Tag.cs



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]