Commit e68b6388 authored by Arturo Espinosa's avatar Arturo Espinosa

Integrate libglade into gnumeric compilation process.



Integrate libglade into gnumeric compilation process.

Add wizard for graphics creation (using beautiful Glade/libglade combo
to cook up the dialog box in 30 minutes).

Miguel.
parent caddee7c
SUBDIRS = intl po macros plugins src doc
SUBDIRS = intl po macros libglade plugins src doc
EXTRA_DIST = \
gnumeric.desktop README HACKING gnumeric.spec.in \
......
......@@ -11,3 +11,14 @@
#undef HAVE_GUILE
#undef ENABLE_BONOBO
#undef HAVE_IEEEFP_H
#undef ENABLE_GNOME
@BOTTOM@
/* This is from libglade */
#ifdef DEBUG
# define debug(stmnt) stmnt
#else
# define debug(stmnt) /* nothing */
#endif
......@@ -6,6 +6,13 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="Gnumeric"
if test -d libglade; then
> libglade/NO-AUTO-GEN
else
echo you need to checkout gnumeric again
exit 1
fi
(test -f $srcdir/configure.in \
&& test -d $srcdir/src \
&& test -f $srcdir/src/gnumeric.h) || {
......
......@@ -129,11 +129,32 @@ AM_PATH_BONOBO(0.1.0, [
])
AM_CONDITIONAL(BONOBO, $have_bonobo)
dnl ******************************************
dnl LibGlade tests:
dnl These duplicate the things
dnl that are in libglade's configure.in
dnl so that we can include it in gnumeric.
dnl ******************************************
AC_PROG_AWK
GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h"
AC_SUBST(GDK_KEYSYMS)
AC_DEFINE(ENABLE_GNOME)
AM_CONDITIONAL(GNOME_SUPPORT, true)
AM_CONDITIONAL(LIBGLADE_FULLDIST, false)
XML_LIBS=`gnome-config --libs xml`
XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
AC_OUTPUT([
gnumeric.spec
Makefile
src/Makefile
wizards/graphics
wizards/Makefile
wizards/graphics/Makefile
libglade/Makefile
libglade/glade/Makefile
doc/Makefile
doc/C/Makefile
doc/es/Makefile
......
Makefile
Makefile.in
SUBDIRS = graphics
\ No newline at end of file
Makefile
Makefile.in
*~
#
# Gnumeric's Graphics Wizard Makefile
#
# Author: Miguel de Icaza (miguel@kernel.org)
#
noinst_PROGRAMS = graphics-wizard
graphics_wizard_SOURCES = \
chooser.c
main.c
graphics_wizard_LDADD = \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(INTLLIBS)
<?xml version="1.0"?>
<GTK-Interface>
<project>
<name>project2</name>
<directory></directory>
<source_directory></source_directory>
<pixmaps_directory>pixmaps</pixmaps_directory>
<language>C</language>
<gettext_support>False</gettext_support>
<use_widget_names>False</use_widget_names>
<main_source_file>gladesrc.c</main_source_file>
<main_header_file>gladesrc.h</main_header_file>
<handler_source_file>gladesig.c</handler_source_file>
<handler_header_file>gladesig.h</handler_header_file>
</project>
<widget>
<class>GtkDialog</class>
<name>dialog3</name>
<title>dialog3</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<widget>
<class>GtkVBox</class>
<child_name>Dialog:vbox</child_name>
<name>dialog-vbox3</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkNotebook</class>
<name>notebook4</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<can_focus>True</can_focus>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
<tab_pos>GTK_POS_TOP</tab_pos>
<scrollable>False</scrollable>
<tab_hborder>2</tab_hborder>
<tab_vborder>2</tab_vborder>
<popup_enable>False</popup_enable>
<num_pages>3</num_pages>
<widget>
<class>GtkNotebook</class>
<name>notebook6</name>
<can_focus>True</can_focus>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
<tab_pos>GTK_POS_TOP</tab_pos>
<scrollable>False</scrollable>
<tab_hborder>2</tab_hborder>
<tab_vborder>2</tab_vborder>
<popup_enable>False</popup_enable>
<num_pages>2</num_pages>
<widget>
<class>GtkTable</class>
<name>table2</name>
<rows>4</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkLabel</class>
<name>label13</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Graphic type:</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<xalign>0.0500002</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>2</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<name>label14</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Graphic subtype:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.0500002</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>2</ypad>
</widget>
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow1</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
<class>GtkTable</class>
<name>subtype-table</name>
<rows>3</rows>
<columns>3</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
</widget>
</widget>
<widget>
<class>GtkButton</class>
<name>show-sample</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>False</xfill>
<yfill>False</yfill>
</child>
<can_focus>True</can_focus>
<label>Show sample</label>
</widget>
<widget>
<class>GtkFrame</class>
<name>frame1</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>2</xpad>
<ypad>2</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_IN</shadow_type>
<widget>
<class>GtkLabel</class>
<name>graph-description</name>
<label>Plot description.</label>
<justify>GTK_JUSTIFY_LEFT</justify>
<xalign>1.93715e-07</xalign>
<yalign>1.93715e-07</yalign>
<xpad>2</xpad>
<ypad>2</ypad>
</widget>
</widget>
<widget>
<class>GtkCList</class>
<name>graphic-type-clist</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>1</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<can_focus>True</can_focus>
<columns>2</columns>
<column_widths>80,80</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>False</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label15</name>
<label>label15</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label16</name>
<label>label16</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
</widget>
</widget>
<widget>
<class>GtkTable</class>
<name>table1</name>
<rows>4</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label11</name>
<label>Standard Types</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label12</name>
<label>Custom types</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
</widget>
<widget>
<class>GtkNotebook</class>
<name>notebook7</name>
<can_focus>True</can_focus>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
<tab_pos>GTK_POS_TOP</tab_pos>
<scrollable>False</scrollable>
<tab_hborder>2</tab_hborder>
<tab_vborder>2</tab_vborder>
<popup_enable>False</popup_enable>
<num_pages>2</num_pages>
<widget>
<class>GtkTable</class>
<name>table4</name>
<rows>2</rows>
<columns>1</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkTable</class>
<name>table6</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<rows>2</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkLabel</class>
<name>label20</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Data range:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.9</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkEntry</class>
<name>entry1</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
<widget>
<class>GtkLabel</class>
<name>label21</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Series in:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.9</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkVBox</class>
<name>vbox1</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkRadioButton</class>
<name>radiobutton1</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<can_focus>True</can_focus>
<label>Rows</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>radiobutton2</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<can_focus>True</can_focus>
<label>Columns</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GtkTable</class>
<name>table7</name>
<rows>2</rows>
<columns>1</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkTable</class>
<name>table12</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<rows>7</rows>
<columns>3</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkAccelLabel</class>
<name>accellabel1</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Serie:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.1</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkAccelLabel</class>
<name>accellabel2</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Name:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0.9</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkAccelLabel</class>
<name>accellabel3</name>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>