GNOME.org
 

[gthumb] merged pixbuf-savers and cairo_io extensions

commit 628e19117179ba6dc476f2300c65b9d36aa43302
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Aug 17 19:53:54 2012 +0200

    merged pixbuf-savers and cairo_io extensions

 configure.ac                                       |   11 ++--
 extensions/Makefile.am                             |    1 -
 extensions/cairo_io/Makefile.am                    |   41 +++++++++++-
 .../{pixbuf_savers => cairo_io}/data/Makefile.am   |    0
 .../data/ui/Makefile.am                            |    0
 .../data/ui/jpeg-options.ui                        |    0
 .../data/ui/png-options.ui                         |    0
 .../data/ui/save-options-preferences.ui            |    0
 .../data/ui/tga-options.ui                         |    0
 .../data/ui/tiff-options.ui                        |    0
 .../{pixbuf_savers => cairo_io}/gth-jpeg-saver.c   |    0
 .../{pixbuf_savers => cairo_io}/gth-jpeg-saver.h   |    0
 .../{pixbuf_savers => cairo_io}/gth-png-saver.c    |    0
 .../{pixbuf_savers => cairo_io}/gth-png-saver.h    |    0
 .../{pixbuf_savers => cairo_io}/gth-tga-saver.c    |    0
 .../{pixbuf_savers => cairo_io}/gth-tga-saver.h    |    0
 .../{pixbuf_savers => cairo_io}/gth-tiff-saver.c   |    0
 .../{pixbuf_savers => cairo_io}/gth-tiff-saver.h   |    0
 extensions/cairo_io/main.c                         |   18 +++++
 .../{pixbuf_savers => cairo_io}/preferences.c      |    4 +-
 .../{pixbuf_savers => cairo_io}/preferences.h      |    4 +-
 extensions/pixbuf_savers/Makefile.am               |   70 --------------------
 extensions/pixbuf_savers/main.c                    |   60 -----------------
 .../pixbuf_savers/pixbuf_savers.extension.in.in    |   13 ----
 gthumb/gth-main.c                                  |    1 -
 25 files changed, 66 insertions(+), 157 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e40886d..474c2ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,9 +5,9 @@ m4_define([gthumb_version],
           [gthumb_major_version.gthumb_minor_version.gthumb_micro_version])
 m4_define([gthumb_api_version],
           [gthumb_major_version.gthumb_minor_version])
-                    
+
 AC_PREREQ(2.63)
-AC_INIT([gthumb], [gthumb_version], 
+AC_INIT([gthumb], [gthumb_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb],
         [gthumb])
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
@@ -452,7 +452,7 @@ if test x$enable_librsvg = xyes ; then
 			  [enable_librsvg=no])
 	if test "x$enable_librsvg" = "xyes"; then
 		AC_DEFINE(HAVE_LIBRSVG, 1, [Define to 1 if librsvg support is included])
-	fi			  
+	fi
 fi
 AC_SUBST(LIBRSVG_LIBS)
 AC_SUBST(LIBRSVG_CFLAGS)
@@ -610,6 +610,8 @@ extensions/burn_disc/Makefile
 extensions/burn_disc/data/Makefile
 extensions/burn_disc/data/ui/Makefile
 extensions/cairo_io/Makefile
+extensions/cairo_io/data/Makefile
+extensions/cairo_io/data/ui/Makefile
 extensions/catalogs/Makefile
 extensions/catalogs/data/Makefile
 extensions/catalogs/data/ui/Makefile
@@ -680,9 +682,6 @@ extensions/photobucket/data/ui/Makefile
 extensions/picasaweb/Makefile
 extensions/picasaweb/data/Makefile
 extensions/picasaweb/data/ui/Makefile
-extensions/pixbuf_savers/Makefile
-extensions/pixbuf_savers/data/Makefile
-extensions/pixbuf_savers/data/ui/Makefile
 extensions/raw_files/Makefile
 extensions/red_eye_removal/Makefile
 extensions/red_eye_removal/data/Makefile
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index f3eeec4..050f5ed 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -51,7 +51,6 @@ SUBDIRS = 			\
 	list_tools		\
 	map_view		\
 	oauth			\
-	pixbuf_savers		\
 	raw_files		\
 	rename_series 		\
 	resize_images		\
diff --git a/extensions/cairo_io/Makefile.am b/extensions/cairo_io/Makefile.am
index d2f1bcc..84da265 100644
--- a/extensions/cairo_io/Makefile.am
+++ b/extensions/cairo_io/Makefile.am
@@ -1,15 +1,52 @@
+SUBDIRS = data
+
 extensiondir = $(pkglibdir)/extensions
 extension_LTLIBRARIES = libcairo_io.la
 
+ENUM_TYPES =                            \
+        enum-types.h                    \
+        enum-types.c
+
+HEADER_FILES =                          \
+        preferences.h
+
+enum-types.h: $(HEADER_FILES)
+	$(AM_V_GEN)( $(GLIB_MKENUMS) \
+		--fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+		--fprod "/* enumerations from \"@filename \" */\n" \
+		--vhead "GType @enum_name _get_type (void);\n#define GTH_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" \
+		--ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \
+		$^> xgen-$(@F) \
+	&& mv -f xgen-$(@F) enum-types.h )
+
+enum-types.c: $(HEADER_FILES)
+	$(AM_V_GEN)( $(GLIB_MKENUMS) \
+		--fhead "#include <glib-object.h>\n" \
+		--fprod "\n/* enumerations from \"@filename \" */\n#include \"@filename \"" \
+		--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {" \
+		--vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
+		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \
+		$^> xgen-$(@F) \
+	&& mv -f xgen-$(@F) enum-types.c )
+
 libcairo_io_la_SOURCES = 	\
 	cairo-io-png.c		\
 	cairo-io-png.h		\
+	gth-png-saver.c         \
+        gth-png-saver.h         \
+        gth-tga-saver.c         \
+        gth-tga-saver.h         \
+        gth-tiff-saver.c        \
+        gth-tiff-saver.h        \
+        preferences.c		\
 	main.c
 
 if ENABLE_JPEG_TOOLS
 libcairo_io_la_SOURCES +=	\
 	cairo-io-jpeg.c		\
-	cairo-io-jpeg.h
+	cairo-io-jpeg.h		\
+        gth-jpeg-saver.c        \
+        gth-jpeg-saver.h
 endif
 
 if ENABLE_LIBRSVG
@@ -20,7 +57,7 @@ endif
 
 libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
 libcairo_io_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBRSVG_LIBS)
+libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(LIBRSVG_LIBS)
 if ENABLE_JPEG_TOOLS
 libcairo_io_la_LIBADD += ../jpeg_utils/libjpeg_utils.la
 endif
diff --git a/extensions/pixbuf_savers/data/Makefile.am b/extensions/cairo_io/data/Makefile.am
similarity index 100%
rename from extensions/pixbuf_savers/data/Makefile.am
rename to extensions/cairo_io/data/Makefile.am
diff --git a/extensions/pixbuf_savers/data/ui/Makefile.am b/extensions/cairo_io/data/ui/Makefile.am
similarity index 100%
rename from extensions/pixbuf_savers/data/ui/Makefile.am
rename to extensions/cairo_io/data/ui/Makefile.am
diff --git a/extensions/pixbuf_savers/data/ui/jpeg-options.ui b/extensions/cairo_io/data/ui/jpeg-options.ui
similarity index 100%
rename from extensions/pixbuf_savers/data/ui/jpeg-options.ui
rename to extensions/cairo_io/data/ui/jpeg-options.ui
diff --git a/extensions/pixbuf_savers/data/ui/png-options.ui b/extensions/cairo_io/data/ui/png-options.ui
similarity index 100%
rename from extensions/pixbuf_savers/data/ui/png-options.ui
rename to extensions/cairo_io/data/ui/png-options.ui
diff --git a/extensions/pixbuf_savers/data/ui/save-options-preferences.ui b/extensions/cairo_io/data/ui/save-options-preferences.ui
similarity index 100%
rename from extensions/pixbuf_savers/data/ui/save-options-preferences.ui
rename to extensions/cairo_io/data/ui/save-options-preferences.ui
diff --git a/extensions/pixbuf_savers/data/ui/tga-options.ui b/extensions/cairo_io/data/ui/tga-options.ui
similarity index 100%
rename from extensions/pixbuf_savers/data/ui/tga-options.ui
rename to extensions/cairo_io/data/ui/tga-options.ui
diff --git a/extensions/pixbuf_savers/data/ui/tiff-options.ui b/extensions/cairo_io/data/ui/tiff-options.ui
similarity index 100%
rename from extensions/pixbuf_savers/data/ui/tiff-options.ui
rename to extensions/cairo_io/data/ui/tiff-options.ui
diff --git a/extensions/pixbuf_savers/gth-jpeg-saver.c b/extensions/cairo_io/gth-jpeg-saver.c
similarity index 100%
rename from extensions/pixbuf_savers/gth-jpeg-saver.c
rename to extensions/cairo_io/gth-jpeg-saver.c
diff --git a/extensions/pixbuf_savers/gth-jpeg-saver.h b/extensions/cairo_io/gth-jpeg-saver.h
similarity index 100%
rename from extensions/pixbuf_savers/gth-jpeg-saver.h
rename to extensions/cairo_io/gth-jpeg-saver.h
diff --git a/extensions/pixbuf_savers/gth-png-saver.c b/extensions/cairo_io/gth-png-saver.c
similarity index 100%
rename from extensions/pixbuf_savers/gth-png-saver.c
rename to extensions/cairo_io/gth-png-saver.c
diff --git a/extensions/pixbuf_savers/gth-png-saver.h b/extensions/cairo_io/gth-png-saver.h
similarity index 100%
rename from extensions/pixbuf_savers/gth-png-saver.h
rename to extensions/cairo_io/gth-png-saver.h
diff --git a/extensions/pixbuf_savers/gth-tga-saver.c b/extensions/cairo_io/gth-tga-saver.c
similarity index 100%
rename from extensions/pixbuf_savers/gth-tga-saver.c
rename to extensions/cairo_io/gth-tga-saver.c
diff --git a/extensions/pixbuf_savers/gth-tga-saver.h b/extensions/cairo_io/gth-tga-saver.h
similarity index 100%
rename from extensions/pixbuf_savers/gth-tga-saver.h
rename to extensions/cairo_io/gth-tga-saver.h
diff --git a/extensions/pixbuf_savers/gth-tiff-saver.c b/extensions/cairo_io/gth-tiff-saver.c
similarity index 100%
rename from extensions/pixbuf_savers/gth-tiff-saver.c
rename to extensions/cairo_io/gth-tiff-saver.c
diff --git a/extensions/pixbuf_savers/gth-tiff-saver.h b/extensions/cairo_io/gth-tiff-saver.h
similarity index 100%
rename from extensions/pixbuf_savers/gth-tiff-saver.h
rename to extensions/cairo_io/gth-tiff-saver.h
diff --git a/extensions/cairo_io/main.c b/extensions/cairo_io/main.c
index 7712eab..b38e665 100644
--- a/extensions/cairo_io/main.c
+++ b/extensions/cairo_io/main.c
@@ -25,27 +25,45 @@
 #include "cairo-io-jpeg.h"
 #include "cairo-io-png.h"
 #include "cairo-io-svg.h"
+#include "gth-jpeg-saver.h"
+#include "gth-png-saver.h"
+#include "gth-tga-saver.h"
+#include "gth-tiff-saver.h"
+#include "preferences.h"
 
 
 G_MODULE_EXPORT void
 gthumb_extension_activate (void)
 {
 #ifdef HAVE_LIBJPEG
+
 	gth_main_register_image_loader_func (_cairo_image_surface_create_from_jpeg,
 					     GTH_IMAGE_FORMAT_CAIRO_SURFACE,
 					     "image/jpeg",
 					     NULL);
+	gth_main_register_type ("pixbuf-saver", GTH_TYPE_JPEG_SAVER);
+
 #endif
+
 	gth_main_register_image_loader_func (_cairo_image_surface_create_from_png,
 					     GTH_IMAGE_FORMAT_CAIRO_SURFACE,
 					     "image/png",
 					     NULL);
+
 #ifdef HAVE_LIBRSVG
+
 	gth_main_register_image_loader_func (_cairo_image_surface_create_from_svg,
 					     GTH_IMAGE_FORMAT_CAIRO_SURFACE,
 					     "image/svg+xml",
 					     NULL);
+
 #endif
+
+	gth_main_register_type ("pixbuf-saver", GTH_TYPE_PNG_SAVER);
+	gth_main_register_type ("pixbuf-saver", GTH_TYPE_TGA_SAVER);
+	gth_main_register_type ("pixbuf-saver", GTH_TYPE_TIFF_SAVER);
+	gth_hook_add_callback ("dlg-preferences-construct", 30, G_CALLBACK (ci__dlg_preferences_construct_cb), NULL);
+	gth_hook_add_callback ("dlg-preferences-apply", 10, G_CALLBACK (ci__dlg_preferences_apply_cb), NULL);
 }
 
 
diff --git a/extensions/pixbuf_savers/preferences.c b/extensions/cairo_io/preferences.c
similarity index 97%
rename from extensions/pixbuf_savers/preferences.c
rename to extensions/cairo_io/preferences.c
index 10b0f98..58e7671 100644
--- a/extensions/pixbuf_savers/preferences.c
+++ b/extensions/cairo_io/preferences.c
@@ -79,7 +79,7 @@ treeselection_changed_cb (GtkTreeSelection *treeselection,
 
 
 void
-so__dlg_preferences_construct_cb (GtkWidget  *dialog,
+ci__dlg_preferences_construct_cb (GtkWidget  *dialog,
 				  GthBrowser *browser,
 				  GtkBuilder *dialog_builder)
 {
@@ -144,7 +144,7 @@ so__dlg_preferences_construct_cb (GtkWidget  *dialog,
 
 
 void
-so__dlg_preferences_apply_cb (GtkWidget  *dialog,
+ci__dlg_preferences_apply_cb (GtkWidget  *dialog,
 			      GthBrowser *browser,
 			      GtkBuilder *builder)
 {
diff --git a/extensions/pixbuf_savers/preferences.h b/extensions/cairo_io/preferences.h
similarity index 95%
rename from extensions/pixbuf_savers/preferences.h
rename to extensions/cairo_io/preferences.h
index 7987a1f..f4dddd2 100644
--- a/extensions/pixbuf_savers/preferences.h
+++ b/extensions/cairo_io/preferences.h
@@ -64,10 +64,10 @@ typedef enum {
 #define  PREF_TIFF_VERTICAL_RES           "vertical-resolution"
 
 
-void so__dlg_preferences_construct_cb (GtkWidget  *dialog,
+void ci__dlg_preferences_construct_cb (GtkWidget  *dialog,
 				       GthBrowser *browser,
 				       GtkBuilder *builder);
-void so__dlg_preferences_apply_cb     (GtkWidget  *dialog,
+void ci__dlg_preferences_apply_cb     (GtkWidget  *dialog,
 				       GthBrowser *browser,
 				       GtkBuilder *builder);
 
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index 87b2503..cd04c1e 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -1202,7 +1202,6 @@ gth_main_activate_extensions (void)
 						"photo_importer",
 						"photobucket",
 						"picasaweb",
-						"pixbuf_savers",
 						"raw_files",
 						"red_eye_removal",
 						"rename_series",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]