GNOME.org
 

f-spot r4371 - in trunk: . extensions/Editors/FlipEditor extensions/Editors/ResizeEditor extensions/Exporters extensions/Exporters/FacebookExport extensions/Exporters/ZipExport extensions/Tools/ZipExport

Author: sdelcroix
Date: Tue Sep 16 14:32:53 2008
New Revision: 4371
URL: http://svn.gnome.org/viewvc/f-spot?rev=4371&view=rev

Log:
move ZipExport in Exporters, include ZipExport and FacebookExport in the build, disabled by default


Added:
   trunk/extensions/Exporters/FacebookExport/Makefile.am
   trunk/extensions/Exporters/ZipExport/
   trunk/extensions/Exporters/ZipExport/.gitignore
      - copied, changed from r4370, /trunk/extensions/Tools/ZipExport/.gitignore
   trunk/extensions/Exporters/ZipExport/Makefile.am
   trunk/extensions/Exporters/ZipExport/ZipExport.addin.xml
      - copied, changed from r4370, /trunk/extensions/Tools/ZipExport/ZipExport.addin.xml
   trunk/extensions/Exporters/ZipExport/ZipExport.cs
      - copied, changed from r4370, /trunk/extensions/Tools/ZipExport/ZipExport.cs
   trunk/extensions/Exporters/ZipExport/ZipExport.glade
      - copied, changed from r4370, /trunk/extensions/Tools/ZipExport/ZipExport.glade
Removed:
   trunk/extensions/Exporters/FacebookExport/Makefile
   trunk/extensions/Tools/ZipExport/.gitignore
   trunk/extensions/Tools/ZipExport/Makefile
   trunk/extensions/Tools/ZipExport/ZipExport.addin.xml
   trunk/extensions/Tools/ZipExport/ZipExport.cs
   trunk/extensions/Tools/ZipExport/ZipExport.glade
Modified:
   trunk/configure.in
   trunk/extensions/Editors/FlipEditor/FlipEditor.addin.xml
   trunk/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml
   trunk/extensions/Editors/ResizeEditor/ResizeEditor.cs
   trunk/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
   trunk/extensions/Exporters/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Sep 16 14:32:53 2008
@@ -363,6 +363,7 @@
 extensions/Exporters/FlickrExport/Makefile
 extensions/Exporters/FlickrExport/FlickrNet/Makefile
 extensions/Exporters/GalleryExport/Makefile
+extensions/Exporters/FacebookExport/Makefile
 extensions/Exporters/FolderExport/Makefile
 extensions/Exporters/SmugMugExport/SmugMugNet/Makefile
 extensions/Exporters/SmugMugExport/Makefile
@@ -370,6 +371,7 @@
 extensions/Exporters/TabbloExport/Tabblo/Makefile
 extensions/Exporters/PicasaWebExport/Makefile
 extensions/Exporters/PicasaWebExport/google-sharp/Makefile
+extensions/Exporters/ZipExport/Makefile
 extensions/Services/Makefile
 extensions/Services/BeagleService/Makefile
 extensions/Services/DBusService/Makefile

Modified: trunk/extensions/Editors/FlipEditor/FlipEditor.addin.xml
==============================================================================
--- trunk/extensions/Editors/FlipEditor/FlipEditor.addin.xml	(original)
+++ trunk/extensions/Editors/FlipEditor/FlipEditor.addin.xml	Tue Sep 16 14:32:53 2008
@@ -1,13 +1,13 @@
 <Addin namespace="FSpot"
 	id="FlipEditor"
-	version="0.4.5.0"
+	version="0.5.0.0"
 	name="FlipEditor"
 	description="Flips the image horizontally."
 	author="Ruben Vermeersch"
 	url="http://f-spot.org/Extensions";
 	category="Editors">
 	<Dependencies>
-		<Addin id="Core" version="0.4.4.102"/>
+		<Addin id="Core" version="0.5.0.0"/>
 	</Dependencies>
 	<Extension path = "/FSpot/Editors">
 		<Editor editor_type = "FSpot.Addins.Editors.FlipEditor"/>

Modified: trunk/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml
==============================================================================
--- trunk/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml	(original)
+++ trunk/extensions/Editors/ResizeEditor/ResizeEditor.addin.xml	Tue Sep 16 14:32:53 2008
@@ -7,7 +7,7 @@
 	url="http://f-spot.org/Extensions";
 	category="Editors">
 	<Dependencies>
-		<Addin id="Core" version="0.4.4.102"/>
+		<Addin id="Core" version="0.5.0.0"/>
 	</Dependencies>
 	<Extension path = "/FSpot/Editors">
 		<Editor editor_type = "FSpot.Addins.Editors.ResizeEditor"/>

Modified: trunk/extensions/Editors/ResizeEditor/ResizeEditor.cs
==============================================================================
--- trunk/extensions/Editors/ResizeEditor/ResizeEditor.cs	(original)
+++ trunk/extensions/Editors/ResizeEditor/ResizeEditor.cs	Tue Sep 16 14:32:53 2008
@@ -33,8 +33,11 @@
 
 		public override Widget ConfigurationWidget ()
 		{
-//			int max = Math.Max (input.Width, input.Height);
-			int max = 2000;
+			int max;
+			using (ImageFile img = ImageFile.Create (State.Items[0].DefaultVersionUri))
+				using (Pixbuf p = img.Load ())
+					max = Math.Max (p.Width, p.Height);
+
 			size = new SpinButton (128, max, 10);
 			size.Value = max;
 			return size;

Modified: trunk/extensions/Exporters/FacebookExport/FacebookExport.addin.xml
==============================================================================
--- trunk/extensions/Exporters/FacebookExport/FacebookExport.addin.xml	(original)
+++ trunk/extensions/Exporters/FacebookExport/FacebookExport.addin.xml	Tue Sep 16 14:32:53 2008
@@ -5,7 +5,8 @@
 	description="Export pictures to facebook"
 	author="George Talusan"
 	url="http://f-spot.org/Extensions";
-	category="Export">
+	category="Export"
+	defaultEnabled="false">
 	<Dependencies>
 		<Addin id="Core" version="0.4.4.100"/>
 	</Dependencies>

Added: trunk/extensions/Exporters/FacebookExport/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/extensions/Exporters/FacebookExport/Makefile.am	Tue Sep 16 14:32:53 2008
@@ -0,0 +1,69 @@
+include $(top_srcdir)/Makefile.include
+
+PLUGIN_NAME = FacebookExport
+
+PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+
+PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+
+PLUGIN_SOURCES =			\
+	$(srcdir)/FacebookExport.cs			\
+	$(srcdir)/Mono.Facebook/Album.cs		\
+	$(srcdir)/Mono.Facebook/AssemblyInfo.cs		\
+	$(srcdir)/Mono.Facebook/Error.cs		\
+	$(srcdir)/Mono.Facebook/Event.cs		\
+	$(srcdir)/Mono.Facebook/FacebookException.cs	\
+	$(srcdir)/Mono.Facebook/FacebookParam.cs	\
+	$(srcdir)/Mono.Facebook/FacebookSession.cs	\
+	$(srcdir)/Mono.Facebook/Friend.cs		\
+	$(srcdir)/Mono.Facebook/FriendInfo.cs		\
+	$(srcdir)/Mono.Facebook/Group.cs		\
+	$(srcdir)/Mono.Facebook/Location.cs		\
+	$(srcdir)/Mono.Facebook/Notification.cs		\
+	$(srcdir)/Mono.Facebook/PeopleList.cs		\
+	$(srcdir)/Mono.Facebook/Photo.cs		\
+	$(srcdir)/Mono.Facebook/Responses.cs		\
+	$(srcdir)/Mono.Facebook/SessionWrapper.cs	\
+	$(srcdir)/Mono.Facebook/Tag.cs			\
+	$(srcdir)/Mono.Facebook/User.cs			\
+	$(srcdir)/Mono.Facebook/Util.cs
+
+REFS =					\
+	-r:$(top_builddir)/src/f-spot.exe		\
+	-r:$(top_builddir)/src/FSpot.Core.dll	\
+	-r:$(top_builddir)/src/FSpot.Utils.dll	\
+	-r:Mono.Posix
+
+PKGS =					\
+	-pkg:gtk-sharp-2.0		\
+	-pkg:glade-sharp-2.0
+
+RESOURCES =				\
+	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
+	-resource:$(srcdir)/$(PLUGIN_NAME).glade
+
+all: $(PLUGIN_ASSEMBLY)
+
+mpack: $(PLUGIN_ASSEMBLY)
+	mautil p $(PLUGIN_ASSEMBLY)
+
+$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+
+plugindir = $(pkglibdir)/extensions
+
+install-data-hook:
+	rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
+
+plugin_DATA =			\
+	$(PLUGIN_ASSEMBLY)
+
+EXTRA_DIST = 			\
+	$(PLUGIN_SOURCES)	\
+	$(PLUGIN_MANIFEST)	\
+	$(PLUGIN_NAME).glade
+
+CLEANFILES =			\
+	$(PLUGIN_ASSEMBLY)	\
+	$(PLUGIN_ASSEMBLY).mdb	\
+	*.mpack

Modified: trunk/extensions/Exporters/Makefile.am
==============================================================================
--- trunk/extensions/Exporters/Makefile.am	(original)
+++ trunk/extensions/Exporters/Makefile.am	Tue Sep 16 14:32:53 2008
@@ -2,8 +2,10 @@
 	CDExport		\
 	DefaultExporters	\
 	GalleryExport		\
+	FacebookExport		\
 	FlickrExport		\
 	FolderExport		\
 	PicasaWebExport		\
 	TabbloExport		\
-	SmugMugExport
+	SmugMugExport		\
+	ZipExport

Copied: trunk/extensions/Exporters/ZipExport/.gitignore (from r4370, /trunk/extensions/Tools/ZipExport/.gitignore)
==============================================================================

Added: trunk/extensions/Exporters/ZipExport/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/extensions/Exporters/ZipExport/Makefile.am	Tue Sep 16 14:32:53 2008
@@ -0,0 +1,51 @@
+include $(top_srcdir)/Makefile.include
+
+PLUGIN_NAME = ZipExport
+
+PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
+
+PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
+
+PLUGIN_SOURCES =			\
+	$(srcdir)/ZipExport.cs
+
+REFS =					\
+	-r:$(top_builddir)/src/f-spot.exe		\
+	-r:$(top_builddir)/src/FSpot.Core.dll	\
+	-r:$(top_builddir)/src/FSpot.Utils.dll	\
+	$(LINK_SEMWEB)			\
+	-r:System.Web			\
+	-r:ICSharpCode.SharpZipLib	\
+	-r:Mono.Posix
+
+PKGS =					\
+	-pkg:gnome-vfs-sharp-2.0	\
+	-pkg:gtk-sharp-2.0		\
+	-pkg:glade-sharp-2.0
+
+RESOURCES =				\
+	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
+	-resource:$(srcdir)/$(PLUGIN_NAME).glade
+
+all: $(PLUGIN_ASSEMBLY)
+
+mpack: $(PLUGIN_ASSEMBLY)
+	mautil p $(PLUGIN_ASSEMBLY)
+
+$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+	$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
+
+plugindir = $(pkglibdir)/extensions
+
+plugin_DATA =			\
+	$(PLUGIN_ASSEMBLY)
+
+EXTRA_DIST = 			\
+	$(PLUGIN_SOURCES)	\
+	$(PLUGIN_MANIFEST)	\
+	$(PLUGIN_NAME).glade
+
+CLEANFILES =			\
+	$(PLUGIN_ASSEMBLY)	\
+	$(PLUGIN_ASSEMBLY).mdb	\
+	*.mpack

Copied: trunk/extensions/Exporters/ZipExport/ZipExport.addin.xml (from r4370, /trunk/extensions/Tools/ZipExport/ZipExport.addin.xml)
==============================================================================
--- /trunk/extensions/Tools/ZipExport/ZipExport.addin.xml	(original)
+++ trunk/extensions/Exporters/ZipExport/ZipExport.addin.xml	Tue Sep 16 14:32:53 2008
@@ -5,7 +5,8 @@
 	description="Simple export to Zip file"
 	author="Lorenzo Milesi"
 	url="http://f-spot.org/Extensions";
-	category="Export">
+	category="Export"
+	defaultEnabled="false">
 	<Dependencies>
 		<Addin id="Core" version="0.4.4.100"/>
 	</Dependencies>

Copied: trunk/extensions/Exporters/ZipExport/ZipExport.cs (from r4370, /trunk/extensions/Tools/ZipExport/ZipExport.cs)
==============================================================================

Copied: trunk/extensions/Exporters/ZipExport/ZipExport.glade (from r4370, /trunk/extensions/Tools/ZipExport/ZipExport.glade)
==============================================================================
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]