dia r4018 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sun May 11 13:02:34 2008
New Revision: 4018
URL: http://svn.gnome.org/viewvc/dia?rev=4018&view=rev

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

	* app/diapsft2renderer.[ch] app/diapsrenderer.[ch] app/render_eps.[ch] 
	  app/paginate_psprint.[ch] app/win32print.[ch] : ... remove ...
	  app/app_procs.c app/commands.c app/Makefile.am app/makefile.msc : 
	... postscript handling from core



Removed:
   trunk/app/diapsft2renderer.c
   trunk/app/diapsft2renderer.h
   trunk/app/diapsrenderer.c
   trunk/app/diapsrenderer.h
   trunk/app/paginate_psprint.c
   trunk/app/paginate_psprint.h
   trunk/app/render_eps.c
   trunk/app/render_eps.h
   trunk/app/win32print.c
   trunk/app/win32print.h
Modified:
   trunk/ChangeLog
   trunk/app/Makefile.am
   trunk/app/app_procs.c
   trunk/app/commands.c
   trunk/app/makefile.msc

Modified: trunk/app/Makefile.am
==============================================================================
--- trunk/app/Makefile.am	(original)
+++ trunk/app/Makefile.am	Sun May 11 13:02:34 2008
@@ -17,9 +17,6 @@
 	-DUIDATADIR=\"$(uidatadir)\"
 
 
-print_files = \
-	paginate_psprint.c \
-	paginate_psprint.h
 
 noinst_PROGRAMS = run_dia.sh
 
@@ -33,12 +30,6 @@
 dia_oafinfo =
 endif
 
-if WITH_FREETYPE
-freetype_files = diapsft2renderer.h diapsft2renderer.c
-else
-freetype_files = 
-endif
-
 bin_PROGRAMS = dia $(dia_embedd)
 
 ICON_PNG_PAIRS= \
@@ -104,8 +95,6 @@
 	    properties.h \
 	    defaults.c \
 	    defaults.h \
-	    render_eps.c \
-	    render_eps.h \
 	    render_libart.c \
 	    render_libart.h \
 	    undo.c \
@@ -200,9 +189,6 @@
 	    authors.h \
 	    dynamic_refresh.h \
 	    dynamic_refresh.c \
-	    diapsrenderer.h \
-	    diapsrenderer.c \
-	    $(freetype_files) \
 	    navigation.h \
 	    navigation.c \
 	    diacanvas.c \
@@ -213,8 +199,7 @@
 	    textedit.h \
 	    textedit_tool.c \
 	    textedit_tool.h \
-	    diagrid.h \
-	    $(print_files)
+	    diagrid.h
 
 dia_SOURCES = \
 	    $(dia_core_files) \
@@ -249,8 +234,6 @@
 	paginate_psprint.h \
 	paginate_gdiprint.cpp \
 	paginate_gdiprint.h \
-	win32print.c \
-	win32print.h \
 	winmain.c \
 	makefile.msc \
 	dia.def \

Modified: trunk/app/app_procs.c
==============================================================================
--- trunk/app/app_procs.c	(original)
+++ trunk/app/app_procs.c	Sun May 11 13:02:34 2008
@@ -1140,12 +1140,6 @@
   /* register export filters */
   /* Standard Dia format */
   filter_register_export(&dia_export_filter);
-  /* EPS with PS fonts */
-  filter_register_export(&eps_export_filter);
-#ifdef HAVE_FREETYPE
-  /* EPS with Pango rendering */
-  filter_register_export(&eps_ft2_export_filter);
-#endif
 #if defined(HAVE_LIBPNG) && defined(HAVE_LIBART)
   /* PNG with libart rendering */
   filter_register_export(&png_export_filter);

Modified: trunk/app/commands.c
==============================================================================
--- trunk/app/commands.c	(original)
+++ trunk/app/commands.c	Sun May 11 13:02:34 2008
@@ -57,10 +57,6 @@
                int         nShowCmd);
 #endif
 
-#include "paginate_psprint.h"
-#ifdef G_OS_WIN32
-#  include "paginate_gdiprint.h"
-#endif
 #include "intl.h"
 #include "commands.h"
 #include "app_procs.h"
@@ -114,6 +110,9 @@
 
   dia = ddisplay_active_diagram();
   if (!dia) return;
+#if 1
+  message_error ("No print plug-in here (yet)!");
+#else
 #ifdef G_OS_WIN32
   /* This option could be used with Gnome too. Does it make sense there ? */
   if (!prefs.prefer_psprint)
@@ -121,6 +120,7 @@
   else
 #endif
     diagram_print_ps(dia);
+#endif
 }
 
 void

Modified: trunk/app/makefile.msc
==============================================================================
--- trunk/app/makefile.msc	(original)
+++ trunk/app/makefile.msc	Sun May 11 13:02:34 2008
@@ -18,9 +18,6 @@
 	$(LIBXML2_LIBS) $(PNG_LIBS) \
 	$(PRJ_TOP)\lib\libdia.lib $(LIBART_LIBS) \
 	$(GDK_PIXBUF_LIBS) $(INTL_LIBS) \
-!IFDEF USEFT2
-	$(PANGOFT2_LIBS) $(FREETYPE2_LIBS) \
-!ENDIF
 
 OBJECTS = \
 	autosave.obj \
@@ -40,10 +37,6 @@
 	diagram_tree_window.obj \
 	dialogs.obj \
 	diapagelayout.obj \
-!IFDEF USEFT2
-	diapsft2renderer.obj \
-!ENDIF
-	diapsrenderer.obj \
 	dia-props.obj \
 	disp_callbacks.obj \
 	display.obj \
@@ -68,13 +61,10 @@
 	navigation.obj \
 	object_ops.obj \
 	pagesetup.obj \
-	paginate_gdiprint.obj \
-	paginate_psprint.obj \
 	plugin-manager.obj \
 	preferences.obj \
 	properties.obj \
 	recent_files.obj \
-	render_eps.obj \
 	render_gdk.obj \
 	render_libart.obj \
 	scroll_tool.obj \
@@ -86,8 +76,7 @@
 	textedit.obj \
 	textedit_tool.obj \
 	tool.obj \
-	undo.obj \
-	win32print.obj
+	undo.obj
 
 ICON_PNG_PAIRS = \
 	dia_connectable_icon pixmaps\connectable.png \
@@ -140,7 +129,7 @@
 
 $(PACKAGE)-app.dll : $(OBJECTS) $(PACKAGE).def
 	$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-app.dll $(OBJECTS) $(PKG_LINK) \
-	gdi32.lib comdlg32.lib user32.lib advapi32.lib shell32.lib wsock32.lib winspool.lib $(LDFLAGS) /def:$(PACKAGE).def
+	gdi32.lib user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
 
 $(PACKAGE).exe : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res main.obj $(PACKAGE)-app.dll
 	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(PACKAGE).res main.obj dia-app.lib $(PKG_LINK) \