[f-spot] Fix resource mapping.

[Ruben Vermeersch <rubenv src gnome org>]

commit 3d5300cd57f12a43b0166ae4fc945657c001635f
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Aug 9 10:31:15 2010 +0200

    Fix resource mapping.

 F-Spot.sln                         |    2 +-
 src/Clients/MainApp/MainApp.csproj |   88 +++++++++++++++++++++++++++---------
 src/Clients/MainApp/Makefile.am    |   26 +++++-----
 3 files changed, 80 insertions(+), 36 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index cfb6e26..93ffb83 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -142,7 +142,7 @@ Global
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
 		$1.DirectoryNamespaceAssociation = Flat
-		$1.ResourceNamePolicy = FileFormatDefault
+		$1.ResourceNamePolicy = FileName
 		version = 0.7.2
 		outputpath = .
 	EndGlobalSection
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 7e8d1ad..6216f2f 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -212,28 +212,72 @@
     <Compile Include="ThumbnailCommand.cs" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\..\COPYING" />
-    <EmbeddedResource Include="..\..\..\icons\f-spot-not.png" />
-    <EmbeddedResource Include="..\..\..\icons\f-spot-128.png" />
-    <EmbeddedResource Include="..\..\..\icons\flower.png" />
-    <EmbeddedResource Include="f-spot.glade" />
-    <EmbeddedResource Include="ui\import.ui" />
-    <EmbeddedResource Include="ui\mail_dialog.ui" />
-    <EmbeddedResource Include="ui\main_window.ui" />
-    <EmbeddedResource Include="ui\single_view.ui" />
-    <EmbeddedResource Include="ui\version_name_dialog.ui" />
-    <EmbeddedResource Include="ui\viewer_preferences.ui" />
-    <EmbeddedResource Include="ui\tag_selection_dialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\AdjustTimeDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\DateRangeDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagIconDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\PreferenceDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\RatingFilterDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\CreateTagDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\LastImportRollFilterDialog.ui" />
-    <EmbeddedResource Include="FSpot.UI.Dialog\ui\RepairDialog.ui" />
-    <EmbeddedResource Include="FSpot.addin.xml" />
+    <EmbeddedResource Include="..\..\..\COPYING">
+      <LogicalName>COPYING</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\..\icons\f-spot-not.png">
+      <LogicalName>f-spot-not.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\..\icons\f-spot-128.png">
+      <LogicalName>f-spot-128.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\..\..\icons\flower.png">
+      <LogicalName>flower.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="f-spot.glade">
+      <LogicalName>f-spot.glade</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\import.ui">
+      <LogicalName>import.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\mail_dialog.ui">
+      <LogicalName>mail_dialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\main_window.ui">
+      <LogicalName>main_window.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\single_view.ui">
+      <LogicalName>single_view.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\version_name_dialog.ui">
+      <LogicalName>version_name_dialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\viewer_preferences.ui">
+      <LogicalName>viewer_preferences.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ui\tag_selection_dialog.ui">
+      <LogicalName>tag_selection_dialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\AdjustTimeDialog.ui">
+      <LogicalName>AdjustTimeDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\DateRangeDialog.ui">
+      <LogicalName>DateRangeDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagDialog.ui">
+      <LogicalName>EditTagDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagIconDialog.ui">
+      <LogicalName>EditTagIconDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\PreferenceDialog.ui">
+      <LogicalName>PreferenceDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\RatingFilterDialog.ui">
+      <LogicalName>RatingFilterDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\CreateTagDialog.ui">
+      <LogicalName>CreateTagDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\LastImportRollFilterDialog.ui">
+      <LogicalName>LastImportRollFilterDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.UI.Dialog\ui\RepairDialog.ui">
+      <LogicalName>RepairDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FSpot.addin.xml">
+      <LogicalName>FSpot.addin.xml</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/src/Clients/MainApp/Makefile.am b/src/Clients/MainApp/Makefile.am
index 335b3cf..8854e05 100644
--- a/src/Clients/MainApp/Makefile.am
+++ b/src/Clients/MainApp/Makefile.am
@@ -181,29 +181,29 @@ SOURCES =  \
 	TagStore.cs \
 	ThumbnailCommand.cs
 
-RESOURCES = \
+RESOURCES =  \
 	$(top_srcdir)/COPYING \
-	$(top_srcdir)/icons/f-spot-not.png \
-	$(top_srcdir)/icons/f-spot-128.png \
 	$(top_srcdir)/icons/flower.png \
+	$(top_srcdir)/icons/f-spot-128.png \
+	$(top_srcdir)/icons/f-spot-not.png \
+	FSpot.addin.xml \
 	f-spot.glade \
-	ui/import.ui \
-	ui/mail_dialog.ui \
-	ui/main_window.ui \
-	ui/single_view.ui \
-	ui/version_name_dialog.ui \
-	ui/viewer_preferences.ui \
-	ui/tag_selection_dialog.ui \
 	FSpot.UI.Dialog/ui/AdjustTimeDialog.ui \
+	FSpot.UI.Dialog/ui/CreateTagDialog.ui \
 	FSpot.UI.Dialog/ui/DateRangeDialog.ui \
 	FSpot.UI.Dialog/ui/EditTagDialog.ui \
 	FSpot.UI.Dialog/ui/EditTagIconDialog.ui \
+	FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui \
 	FSpot.UI.Dialog/ui/PreferenceDialog.ui \
 	FSpot.UI.Dialog/ui/RatingFilterDialog.ui \
-	FSpot.UI.Dialog/ui/CreateTagDialog.ui \
-	FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui \
 	FSpot.UI.Dialog/ui/RepairDialog.ui \
-	FSpot.addin.xml
+	ui/import.ui \
+	ui/mail_dialog.ui \
+	ui/main_window.ui \
+	ui/single_view.ui \
+	ui/tag_selection_dialog.ui \
+	ui/version_name_dialog.ui \
+	ui/viewer_preferences.ui
 
 include $(top_srcdir)/build/build.mk