dia r4058 - in trunk: . lib plug-ins po

[hans svn gnome org]

Author: hans
Date: Fri May 30 14:35:11 2008
New Revision: 4058
URL: http://svn.gnome.org/viewvc/dia?rev=4058&view=rev

Log:
2008-05-30  Hans Breuer  <hans breuer org>

	[ 
	  Moved libart rendering and it's PNG export to a plug-in.
	  So it can be switched off before being deprecated in favour of cairo. 
	]
	* plug-ins/libart/dialibartrenderer.[hc] : from lib/*
	* plug-ins/libart/export_png.c : moved from app/*
	* plug-ins/libart/render_libart.[hc] : moved from app/*
	* lib/dialogs.[hc] : moved from app/*
	* app/app_procs.[hc] : parse_size moved to plug-in
	* app/display.c : dynamically create the aa renderer like it is done 
	for the cairo renderer

	* app/Makefile.am app/makefile.msc plug-ins/makefile.msc
	  lib/libdia.def lib/Makefile.am lib/makefile.msc
	  plug-ins/Makefile.am configure.in po/POTFILES: adapted
	* plug-ins/libart/Makefile.am : build it on Linux (untested)

	app/menus.c : View/Antialiased currently always enabled







Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/lib/Makefile.am
   trunk/plug-ins/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May 30 14:35:11 2008
@@ -144,10 +144,10 @@
 
 dnl Look for Cairo
 AC_ARG_WITH(cairo,
-[  --with-cairo           compile *experimental* cairo plug-in],,with_cairo=no)
+[  --with-cairo           compile cairo plug-in],,with_cairo=yes)
 if test "x$with_cairo" != "xno"; then
-  PKG_CHECK_MODULES(CAIROVERSION, cairo >= 0.6.0, , 
-                    AC_MSG_ERROR([Need Cairo version 0.6.0 or higher]))
+  PKG_CHECK_MODULES(CAIROVERSION, cairo >= 1.0.0, , 
+                    AC_MSG_ERROR([Need Cairo version 1.0.0 or higher]))
   PKG_CHECK_MODULES(CAIRO, cairo,have_cairo=yes,have_cairo=no)
   AC_SUBST(CAIRO_LIBS)
   AC_SUBST(CAIRO_CFLAGS)
@@ -542,6 +542,7 @@
 plug-ins/dxf/Makefile
 plug-ins/gprint/Makefile
 plug-ins/hpgl/Makefile
+plug-ins/libart/Makefile
 plug-ins/metapost/Makefile
 plug-ins/pixbuf/Makefile
 plug-ins/postscript/Makefile
@@ -589,7 +590,7 @@
 	Gnome support:				${GNOME}
 	Python support:				${with_python}
 	Libart support (PNG export):		${have_libart}
-	Cairo support (experimental):		${with_cairo}
+	Cairo support (PNG, PDF, print):	${with_cairo}
 	Gnome Print support (experimental):	${with_gnomeprint}
 	Dia Python bindings with SWIG		${with_swig}
 	WMF plug-in with libEMF:                ${emf_ok}

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Fri May 30 14:35:11 2008
@@ -138,8 +138,6 @@
 		diagdkrenderer.c \
 		diasvgrenderer.h \
 		diasvgrenderer.c \
-		dialibartrenderer.h \
-		dialibartrenderer.c \
 		dia_svg.h \
 		dia_svg.c \
 		diagtkfontsel.c \

Modified: trunk/plug-ins/Makefile.am
==============================================================================
--- trunk/plug-ins/Makefile.am	(original)
+++ trunk/plug-ins/Makefile.am	Fri May 30 14:35:11 2008
@@ -1,6 +1,6 @@
 # Remember to also add subdirs in configure.in
 SUBDIRS = cgm cairo pstricks hpgl wpg svg shape dxf python xfig \
-	  wmf metapost xslt pixbuf gprint pgf vdx postscript
+	  wmf libart metapost xslt pixbuf gprint pgf vdx postscript
 
 EXTRA_DIST = \
 	makefile.msc objects.def

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri May 30 14:35:11 2008
@@ -12,12 +12,10 @@
 app/diagram_tree.c
 app/diagram_tree_menu.c
 app/diagram_tree_window.c
-app/dialogs.c
 app/diapagelayout.c
 app/disp_callbacks.c
 app/display.c
 app/exit_dialog.c
-app/export_png.c
 app/filedlg.c
 app/find-and-replace.c
 app/interface.c
@@ -31,7 +29,6 @@
 app/preferences.c
 app/properties.c
 app/recent_files.c
-app/render_libart.c
 app/sheets.c
 app/sheets_dialog.c
 app/sheets_dialog_callbacks.c
@@ -47,8 +44,8 @@
 lib/diaarrowchooser.c
 lib/diagramdata.c
 lib/diagtkfontsel.c
-lib/dialibartrenderer.c
 lib/dialinechooser.c
+lib/dialogs.c
 lib/filter.c
 lib/font.c
 lib/message.c
@@ -188,6 +185,9 @@
 plug-ins/gprint/diagnomeprint.c
 plug-ins/gprint/diagnomeprintrenderer.c
 plug-ins/hpgl/hpgl.c
+plug-ins/libart/export_png.c
+plug-ins/libart/render_libart.c
+plug-ins/libart/dialibartrenderer.c
 plug-ins/metapost/metapost.c
 plug-ins/metapost/render_metapost.c
 plug-ins/pgf/pgf.c