gnumeric r16434 - in trunk: . schemas src

[jody svn gnome org]

Author: jody
Date: Sat Mar  1 23:27:59 2008
New Revision: 16434
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16434&view=rev

Log:
2008-03-01  Jody Goldberg <jody gnome org>

	* src/Makefile.am : build ssconvert & ssindex with -mconsole and
	  without -mwindows

	* src/workbook-view.c (gnm_mailto_url_show) : Add a win32 version of
	  mailto support.

	* schemas/Makefile.am : Don't create a dir if built without gconf
	  autoconf macros.


Modified:
   trunk/BUGS
   trunk/ChangeLog
   trunk/configure.in
   trunk/schemas/Makefile.am
   trunk/src/Makefile.am
   trunk/src/workbook-view.c

Modified: trunk/BUGS
==============================================================================
--- trunk/BUGS	(original)
+++ trunk/BUGS	Sat Mar  1 23:27:59 2008
@@ -30,7 +30,6 @@
 Short term goals
 ----------------
     - .gnumeric I/O for PI:{error_display,comment_placement}
-    - replicate win32 print problems
     - Finish the Data -> Table dialog				(DONE)
     - Use go_glade_signal_connect (and friends)
     : http://bugzilla.gnome.org/show_bug.cgi?id=450444 (themeable icons)
@@ -964,11 +963,6 @@
 
 38) GtkPrint conversion
     - restore all of the dialog					  (DONE)
-    - win32 breakage
-	 - preview puts black background around glyphs
-	 - preview drops rotated text
-	 - printing kerns poorly
-	 - printing 'A' produces '$' ??
     - page breaks
     - col/row headings                                            (DONE)
     - cell text wraps differently when printing than displaying due to scaling
@@ -990,6 +984,16 @@
     40.1) Page Breaks
     40.2) PI:comment_placement
     40.3) PI:display_errors
+
+41) win32
+    41.1) Printing
+	41.1.1) preview puts black background around glyphs
+	41.1.2) preview drops rotated text
+    41.2) hhmap
+	41.2.1) how to generate
+	41.2.2) include in the installer
+    41.3) optionally add quicklaunch & desktop links
+
 -------------------------------------------------------------------------------
 Target Features
 ---------------

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar  1 23:27:59 2008
@@ -181,7 +181,7 @@
 	gmodule-2.0		>= 2.6.0
 	gthread-2.0		>= 2.6.0
 	pango			>= 1.8.1
-	pangoft2		>= 1.8.1
+	pangocairo		>= 1.8.1
 "
 libspreadsheet_gtk_reqs="
 	libglade-2.0		>= 2.3.6

Modified: trunk/schemas/Makefile.am
==============================================================================
--- trunk/schemas/Makefile.am	(original)
+++ trunk/schemas/Makefile.am	Sat Mar  1 23:27:59 2008
@@ -1,7 +1,7 @@
 schema_in_files = gnumeric-dialogs.schemas.in gnumeric-general.schemas.in gnumeric-plugins.schemas.in 
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
 if WITH_GNOME
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+schemadir   	= @GCONF_SCHEMA_FILE_DIR@
+schema_DATA 	= $(schema_in_files:.schemas.in=.schemas)
 endif
 
 EXTRA_DIST = $(schema_in_files)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Mar  1 23:27:59 2008
@@ -289,12 +289,33 @@
 gnumeric_LDADD =				\
 	libspreadsheet.la			\
 	$(INTLLIBS)
-
 gnumeric_LDFLAGS = -export-dynamic
 
+ssconvert_LDADD   = $(gnumeric_LDADD)
+ssconvert_LDFLAGS = -export-dynamic
+ssconvert_SOURCES =				\
+	ssconvert.c
+ssindex_LDADD   = $(gnumeric_LDADD)
+ssindex_LDFLAGS = -export-dynamic
+ssindex_SOURCES =				\
+	ssindex.c
+
+test_pango_LDADD   = $(gnumeric_LDADD)
+test_pango_LDFLAGS = -export-dynamic
+test_pango_SOURCES =				\
+	test-pango.c
+
+# A stub program for testing
+#bin_PROGRAMS += harness
+#harness_LDADD   = $(gnumeric_LDADD)
+#harness_LDFLAGS = -export-dynamic
+#harness_SOURCES = test-harness.c
+
 if WITH_WIN32
     gnumeric_LDADD += gnumeric_rc.o
-    gnumeric_LDFLAGS += -mwindows
+    gnumeric_LDFLAGS	+= -mwindows
+    ssconvert_LDFLAGS	+= -mconsole
+    ssindex_LDFLAGS	+= -mconsole
 
     libspreadsheet_la_DEPENDENCIES = libspreadsheet.def
     libspreadsheet_la_LDFLAGS += -no-undefined -export-symbols libspreadsheet.def
@@ -340,25 +361,6 @@
 	tools/solver/lp_solve/liblp_solve.la
 endif
 
-ssconvert_LDADD   = $(gnumeric_LDADD)
-ssconvert_LDFLAGS = -export-dynamic
-ssconvert_SOURCES =				\
-	ssconvert.c
-ssindex_LDADD   = $(gnumeric_LDADD)
-ssindex_LDFLAGS = -export-dynamic
-ssindex_SOURCES =				\
-	ssindex.c
-
-test_pango_LDADD   = $(gnumeric_LDADD)
-test_pango_LDFLAGS = -export-dynamic
-test_pango_SOURCES =				\
-	test-pango.c
-
-# A stub program for testing
-#bin_PROGRAMS += harness
-#harness_LDADD   = $(gnumeric_LDADD)
-#harness_LDFLAGS = -export-dynamic
-#harness_SOURCES = test-harness.c
 
 # Rules for the marshalers code:
 GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=gnm_

Modified: trunk/src/workbook-view.c
==============================================================================
--- trunk/src/workbook-view.c	(original)
+++ trunk/src/workbook-view.c	Sat Mar  1 23:27:59 2008
@@ -67,6 +67,13 @@
 #include <stdlib.h>
 #include "mathfunc.h"
 
+#ifdef G_OS_WIN32
+#include <windef.h>
+#include <shellapi.h>
+#include <wingdi.h>
+#include <winuser.h>
+#endif
+
 enum {
 	PROP_0,
 	PROP_AUTO_EXPR_FUNC,
@@ -981,6 +988,10 @@
 static void
 gnm_mailto_url_show (char const *url, char const *working_dir, GError **err)
 {
+#ifdef G_OS_WIN32
+	ShellExecute (NULL, "open", url, NULL, working_dir, SW_SHOWNORMAL);
+	return;
+#else
 	static struct {
 		char const *app;
 		char const *arg;
@@ -1018,6 +1029,7 @@
 	if (err)
 		*err = g_error_new (go_error_invalid (), 0,
 				    "Missing handler for mailto URLs.");
+#endif
 }
 #endif