GNOME.org
 

[f-spot] Cleanup namespaces etc in Editors.

commit 4179cf9879f8d4a153ed411d3bea0c44a3caa90b
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Aug 9 11:44:39 2010 +0200

    Cleanup namespaces etc in Editors.

 F-Spot.sln                                         |    8 ++++----
 .../FSpot.Addins.Editors}/BWEditor.cs              |    2 +-
 .../FSpot.Editors.BWEditor.csproj}                 |   10 +++++++---
 .../Makefile.am                                    |    4 ++--
 .../Resources}/BWEditor.addin.xml                  |    2 +-
 .../FSpot.Addins.Editors}/FlipEditor.cs            |    0
 .../FSpot.Editors.FlipEditor.csproj}               |   10 +++++++---
 .../Makefile.am                                    |    4 ++--
 .../Resources}/FlipEditor.addin.xml                |    0
 .../FSpot.Addins.Editors}/PixelateEditor.cs        |    0
 .../FSpot.Editors.PixelateEditor.csproj}           |   10 +++++++---
 .../Makefile.am                                    |    4 ++--
 .../Resources}/PixelateEditor.addin.xml            |    0
 .../FSpot.Addins.Editors}/ResizeEditor.cs          |    0
 .../FSpot.Editors.ResizeEditor.csproj}             |   10 +++++++---
 .../Makefile.am                                    |    4 ++--
 .../Resources}/ResizeEditor.addin.xml              |    0
 src/Extensions/Editors/Makefile.am                 |   12 ++++++------
 18 files changed, 48 insertions(+), 32 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index f8d14be..66eeb85 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -41,13 +41,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Editors", "Editors", "{416E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Editors.BlackoutEditor", "src\Extensions\Editors\FSpot.Editors.BlackoutEditor\FSpot.Editors.BlackoutEditor.csproj", "{7011154B-87B0-4C54-98DD-B5FF1E60B75F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BWEditor", "src\Extensions\Editors\BWEditor\BWEditor.csproj", "{61DAD6B1-E866-485B-819E-A9E86B793F5E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Editors.BWEditor", "src\Extensions\Editors\FSpot.Editors.BWEditor\FSpot.Editors.BWEditor.csproj", "{61DAD6B1-E866-485B-819E-A9E86B793F5E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlipEditor", "src\Extensions\Editors\FlipEditor\FlipEditor.csproj", "{53DAC12F-0421-4F5E-A746-17A701D2BDDA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Editors.FlipEditor", "src\Extensions\Editors\FSpot.Editors.FlipEditor\FSpot.Editors.FlipEditor.csproj", "{53DAC12F-0421-4F5E-A746-17A701D2BDDA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixelateEditor", "src\Extensions\Editors\PixelateEditor\PixelateEditor.csproj", "{8EB3933F-A089-43A3-B662-617DC71A2173}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Editors.PixelateEditor", "src\Extensions\Editors\FSpot.Editors.PixelateEditor\FSpot.Editors.PixelateEditor.csproj", "{8EB3933F-A089-43A3-B662-617DC71A2173}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResizeEditor", "src\Extensions\Editors\ResizeEditor\ResizeEditor.csproj", "{1F610540-D2ED-4F58-87CE-9092A43DBD4A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Editors.ResizeEditor", "src\Extensions\Editors\FSpot.Editors.ResizeEditor\FSpot.Editors.ResizeEditor.csproj", "{1F610540-D2ED-4F58-87CE-9092A43DBD4A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Extensions/Editors/BWEditor/BWEditor.cs b/src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Addins.Editors/BWEditor.cs
similarity index 99%
rename from src/Extensions/Editors/BWEditor/BWEditor.cs
rename to src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Addins.Editors/BWEditor.cs
index a9ae826..27f44d2 100644
--- a/src/Extensions/Editors/BWEditor/BWEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Addins.Editors/BWEditor.cs
@@ -18,7 +18,7 @@ using Mono.Unix;
 using Mono.Simd;
 using Hyena;
 
-namespace BWEditor {
+namespace FSpot.Addins.Editors {
 	class BWEditor : Editor {
 		public BWEditor () : base (Catalog.GetString ("Convert to B/W"), null) {
 			CanHandleMultiple = false;
diff --git a/src/Extensions/Editors/BWEditor/BWEditor.csproj b/src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Editors.BWEditor.csproj
similarity index 92%
rename from src/Extensions/Editors/BWEditor/BWEditor.csproj
rename to src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Editors.BWEditor.csproj
index ae2570c..8e6c61c 100644
--- a/src/Extensions/Editors/BWEditor/BWEditor.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.BWEditor/FSpot.Editors.BWEditor.csproj
@@ -7,7 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{61DAD6B1-E866-485B-819E-A9E86B793F5E}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>BWEditor</RootNamespace>
+    <RootNamespace>FSpot.Addins.Editors</RootNamespace>
     <AssemblyName>FSpot.Editors.BWEditor</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="BWEditor.cs" />
+    <Compile Include="FSpot.Addins.Editors\BWEditor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="BWEditor.addin.xml">
+    <EmbeddedResource Include="Resources\BWEditor.addin.xml">
       <LogicalName>BWEditor.addin.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
@@ -81,4 +81,8 @@
     <Reference Include="Mono.Simd" />
     <Reference Include="System.Core" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FSpot.Addins.Editors\" />
+    <Folder Include="Resources\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/BWEditor/Makefile.am b/src/Extensions/Editors/FSpot.Editors.BWEditor/Makefile.am
similarity index 70%
rename from src/Extensions/Editors/BWEditor/Makefile.am
rename to src/Extensions/Editors/FSpot.Editors.BWEditor/Makefile.am
index 521695c..10e5b5f 100644
--- a/src/Extensions/Editors/BWEditor/Makefile.am
+++ b/src/Extensions/Editors/FSpot.Editors.BWEditor/Makefile.am
@@ -4,8 +4,8 @@ TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_BWEDITOR)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = BWEditor.cs
+SOURCES = FSpot.Addins.Editors/BWEditor.cs
 
-RESOURCES = BWEditor.addin.xml
+RESOURCES = Resources/BWEditor.addin.xml
 
 include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Editors/BWEditor/BWEditor.addin.xml b/src/Extensions/Editors/FSpot.Editors.BWEditor/Resources/BWEditor.addin.xml
similarity index 86%
rename from src/Extensions/Editors/BWEditor/BWEditor.addin.xml
rename to src/Extensions/Editors/FSpot.Editors.BWEditor/Resources/BWEditor.addin.xml
index 3fa2c91..218f759 100644
--- a/src/Extensions/Editors/BWEditor/BWEditor.addin.xml
+++ b/src/Extensions/Editors/FSpot.Editors.BWEditor/Resources/BWEditor.addin.xml
@@ -11,6 +11,6 @@
 		<Addin id="Core" version="0.7"/>
 	</Dependencies>
 	<Extension path = "/FSpot/Editors">
-		<Editor editor_type = "BWEditor.BWEditor"/>
+		<Editor editor_type = "FSpot.Addins.Editors.BWEditor"/>
 	</Extension>
 </Addin>
diff --git a/src/Extensions/Editors/FlipEditor/FlipEditor.cs b/src/Extensions/Editors/FSpot.Editors.FlipEditor/FSpot.Addins.Editors/FlipEditor.cs
similarity index 100%
rename from src/Extensions/Editors/FlipEditor/FlipEditor.cs
rename to src/Extensions/Editors/FSpot.Editors.FlipEditor/FSpot.Addins.Editors/FlipEditor.cs
diff --git a/src/Extensions/Editors/FlipEditor/FlipEditor.csproj b/src/Extensions/Editors/FSpot.Editors.FlipEditor/FSpot.Editors.FlipEditor.csproj
similarity index 90%
rename from src/Extensions/Editors/FlipEditor/FlipEditor.csproj
rename to src/Extensions/Editors/FSpot.Editors.FlipEditor/FSpot.Editors.FlipEditor.csproj
index 60761db..8efdef9 100644
--- a/src/Extensions/Editors/FlipEditor/FlipEditor.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.FlipEditor/FSpot.Editors.FlipEditor.csproj
@@ -7,7 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{53DAC12F-0421-4F5E-A746-17A701D2BDDA}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>FlipEditor</RootNamespace>
+    <RootNamespace>FSpot.Addins.Editors</RootNamespace>
     <AssemblyName>FSpot.Editors.FlipEditor</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="FlipEditor.cs" />
+    <Compile Include="FSpot.Addins.Editors\FlipEditor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="FlipEditor.addin.xml">
+    <EmbeddedResource Include="Resources\FlipEditor.addin.xml">
       <LogicalName>FlipEditor.addin.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
@@ -68,4 +68,8 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FSpot.Addins.Editors\" />
+    <Folder Include="Resources\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/FlipEditor/Makefile.am b/src/Extensions/Editors/FSpot.Editors.FlipEditor/Makefile.am
similarity index 66%
rename from src/Extensions/Editors/FlipEditor/Makefile.am
rename to src/Extensions/Editors/FSpot.Editors.FlipEditor/Makefile.am
index 45b9f2f..a5cbd51 100644
--- a/src/Extensions/Editors/FlipEditor/Makefile.am
+++ b/src/Extensions/Editors/FSpot.Editors.FlipEditor/Makefile.am
@@ -3,8 +3,8 @@ TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_FLIPEDITOR)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = FlipEditor.cs
+SOURCES = FSpot.Addins.Editors/FlipEditor.cs
 
-RESOURCES = FlipEditor.addin.xml
+RESOURCES = Resources/FlipEditor.addin.xml
 
 include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Editors/FlipEditor/FlipEditor.addin.xml b/src/Extensions/Editors/FSpot.Editors.FlipEditor/Resources/FlipEditor.addin.xml
similarity index 100%
rename from src/Extensions/Editors/FlipEditor/FlipEditor.addin.xml
rename to src/Extensions/Editors/FSpot.Editors.FlipEditor/Resources/FlipEditor.addin.xml
diff --git a/src/Extensions/Editors/PixelateEditor/PixelateEditor.cs b/src/Extensions/Editors/FSpot.Editors.PixelateEditor/FSpot.Addins.Editors/PixelateEditor.cs
similarity index 100%
rename from src/Extensions/Editors/PixelateEditor/PixelateEditor.cs
rename to src/Extensions/Editors/FSpot.Editors.PixelateEditor/FSpot.Addins.Editors/PixelateEditor.cs
diff --git a/src/Extensions/Editors/PixelateEditor/PixelateEditor.csproj b/src/Extensions/Editors/FSpot.Editors.PixelateEditor/FSpot.Editors.PixelateEditor.csproj
similarity index 90%
rename from src/Extensions/Editors/PixelateEditor/PixelateEditor.csproj
rename to src/Extensions/Editors/FSpot.Editors.PixelateEditor/FSpot.Editors.PixelateEditor.csproj
index cd9a7d6..92d04a2 100644
--- a/src/Extensions/Editors/PixelateEditor/PixelateEditor.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.PixelateEditor/FSpot.Editors.PixelateEditor.csproj
@@ -7,7 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8EB3933F-A089-43A3-B662-617DC71A2173}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>PixelateEditor</RootNamespace>
+    <RootNamespace>FSpot.Addins.Editors</RootNamespace>
     <AssemblyName>FSpot.Editors.PixelateEditor</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="PixelateEditor.cs" />
+    <Compile Include="FSpot.Addins.Editors\PixelateEditor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="PixelateEditor.addin.xml">
+    <EmbeddedResource Include="Resources\PixelateEditor.addin.xml">
       <LogicalName>PixelateEditor.addin.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
@@ -69,4 +69,8 @@
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FSpot.Addins.Editors\" />
+    <Folder Include="Resources\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/PixelateEditor/Makefile.am b/src/Extensions/Editors/FSpot.Editors.PixelateEditor/Makefile.am
similarity index 65%
rename from src/Extensions/Editors/PixelateEditor/Makefile.am
rename to src/Extensions/Editors/FSpot.Editors.PixelateEditor/Makefile.am
index d6ead24..d66d724 100644
--- a/src/Extensions/Editors/PixelateEditor/Makefile.am
+++ b/src/Extensions/Editors/FSpot.Editors.PixelateEditor/Makefile.am
@@ -3,8 +3,8 @@ TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_PIXELATEEDITOR)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = PixelateEditor.cs
+SOURCES = FSpot.Addins.Editors/PixelateEditor.cs
 
-RESOURCES = PixelateEditor.addin.xml
+RESOURCES = Resources/PixelateEditor.addin.xml
 
 include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Editors/PixelateEditor/PixelateEditor.addin.xml b/src/Extensions/Editors/FSpot.Editors.PixelateEditor/Resources/PixelateEditor.addin.xml
similarity index 100%
rename from src/Extensions/Editors/PixelateEditor/PixelateEditor.addin.xml
rename to src/Extensions/Editors/FSpot.Editors.PixelateEditor/Resources/PixelateEditor.addin.xml
diff --git a/src/Extensions/Editors/ResizeEditor/ResizeEditor.cs b/src/Extensions/Editors/FSpot.Editors.ResizeEditor/FSpot.Addins.Editors/ResizeEditor.cs
similarity index 100%
rename from src/Extensions/Editors/ResizeEditor/ResizeEditor.cs
rename to src/Extensions/Editors/FSpot.Editors.ResizeEditor/FSpot.Addins.Editors/ResizeEditor.cs
diff --git a/src/Extensions/Editors/ResizeEditor/ResizeEditor.csproj b/src/Extensions/Editors/FSpot.Editors.ResizeEditor/FSpot.Editors.ResizeEditor.csproj
similarity index 90%
rename from src/Extensions/Editors/ResizeEditor/ResizeEditor.csproj
rename to src/Extensions/Editors/FSpot.Editors.ResizeEditor/FSpot.Editors.ResizeEditor.csproj
index e202ab9..93122e0 100644
--- a/src/Extensions/Editors/ResizeEditor/ResizeEditor.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.ResizeEditor/FSpot.Editors.ResizeEditor.csproj
@@ -7,7 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1F610540-D2ED-4F58-87CE-9092A43DBD4A}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>ResizeEditor</RootNamespace>
+    <RootNamespace>FSpot.Addins.Editors</RootNamespace>
     <AssemblyName>FSpot.Editors.ResizeEditor</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Compile Include="ResizeEditor.cs" />
+    <Compile Include="FSpot.Addins.Editors\ResizeEditor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="ResizeEditor.addin.xml">
+    <EmbeddedResource Include="Resources\ResizeEditor.addin.xml">
       <LogicalName>ResizeEditor.addin.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
@@ -69,4 +69,8 @@
       <Name>FSpot.Cms</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FSpot.Addins.Editors\" />
+    <Folder Include="Resources\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/ResizeEditor/Makefile.am b/src/Extensions/Editors/FSpot.Editors.ResizeEditor/Makefile.am
similarity index 65%
rename from src/Extensions/Editors/ResizeEditor/Makefile.am
rename to src/Extensions/Editors/FSpot.Editors.ResizeEditor/Makefile.am
index 77785a9..bf14989 100644
--- a/src/Extensions/Editors/ResizeEditor/Makefile.am
+++ b/src/Extensions/Editors/FSpot.Editors.ResizeEditor/Makefile.am
@@ -3,8 +3,8 @@ TARGET = library
 LINK = $(REF_FSPOT_EXTENSION_RESIZEEDITOR)
 INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
-SOURCES = ResizeEditor.cs
+SOURCES = FSpot.Addins.Editors/ResizeEditor.cs
 
-RESOURCES = ResizeEditor.addin.xml
+RESOURCES = Resources/ResizeEditor.addin.xml
 
 include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Editors/ResizeEditor/ResizeEditor.addin.xml b/src/Extensions/Editors/FSpot.Editors.ResizeEditor/Resources/ResizeEditor.addin.xml
similarity index 100%
rename from src/Extensions/Editors/ResizeEditor/ResizeEditor.addin.xml
rename to src/Extensions/Editors/FSpot.Editors.ResizeEditor/Resources/ResizeEditor.addin.xml
diff --git a/src/Extensions/Editors/Makefile.am b/src/Extensions/Editors/Makefile.am
index 01be4ed..da1fe5d 100644
--- a/src/Extensions/Editors/Makefile.am
+++ b/src/Extensions/Editors/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS =		\
-	BlackoutEditor	\
-	BWEditor	\
-	FlipEditor	\
-	PixelateEditor	\
-	ResizeEditor
+SUBDIRS = \
+	FSpot.Editors.BlackoutEditor \
+	FSpot.Editors.BWEditor \
+	FSpot.Editors.FlipEditor \
+	FSpot.Editors.PixelateEditor \
+	FSpot.Editors.ResizeEditor
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]