Commit ddd4516a authored by Arturo Espinosa's avatar Arturo Espinosa

1. Got the thing to compile and run without libglade. 2. Simplified the



1. Got the thing to compile and run without libglade.
2. Simplified the library detection code.
3. Optimized the number of libraries we link with (due to excesive bloatedness
of the previous code).  Should reduce link time.
4. Compile with new gnome-libs.
5. Renamed horiz/vert in the printer dialog box.

Miguel
parent 10559d7d
1999-07-07 Miguel de Icaza <miguel@gnu.org>
* configure.in (EXTRA_GNOME_CFLAGS): Assemble all the flags we
will be linking with here.X
* src/Gnumeric.idl: Small typo fixes.
* Killed liblgade from here, it is now a requirement.
......
1999-07-07 Miguel de Icaza <miguel@gnu.org>
* configure.in (EXTRA_GNOME_CFLAGS): Assemble all the flags we
will be linking with here.X
* src/Gnumeric.idl: Small typo fixes.
* Killed liblgade from here, it is now a requirement.
......
1999-07-07 Miguel de Icaza <miguel@gnu.org>
* configure.in (EXTRA_GNOME_CFLAGS): Assemble all the flags we
will be linking with here.X
* src/Gnumeric.idl: Small typo fixes.
* Killed liblgade from here, it is now a requirement.
......
1999-07-07 Miguel de Icaza <miguel@gnu.org>
* configure.in (EXTRA_GNOME_CFLAGS): Assemble all the flags we
will be linking with here.X
* src/Gnumeric.idl: Small typo fixes.
* Killed liblgade from here, it is now a requirement.
......
......@@ -20,6 +20,19 @@ probably will want to read the doc/Design file. I have scribbled my
ideas on how Gnumeric should be developed in the future in the file
doc/Future-Roadmap.
Requirements
------------
You need:
gnome-libs-1.0
gnome-print-0.1.2
libxml-1.0
libglade-0.2
Optionally:
bonobo-0.1
Notes regarding plugins
-----------------------
......
......@@ -125,20 +125,38 @@ dnl ******************************
AM_PATH_BONOBO(0.1.0, [
AC_DEFINE(ENABLE_BONOBO)
have_bonobo=true
bonobo=bonobo
],[
have_bonobo=false
bonobo=
])
AM_CONDITIONAL(BONOBO, $have_bonobo)
dnl ******************************
dnl GnomePrint checking
dnl ******************************
GNOME_PRINT_LIBS=`gnome-config --libs print`
GNOME_PRINT_CFLAGS=`gnome-config --cflags print`
AC_SUBST(GNOME_PRINT_LIBS)
AC_SUBST(GNOME_PRINT_CFLAGS)
AC_MSG_CHECKING(For GnomePrint libraries)
if gnome-config --libs print >& /dev/null; then
AC_MSG_RESULT(found)
else
AC_MSG_ERROR(Did not find GnomePrint installed)
fi
dnl ******************************
dnl LibGlade checking
dnl ******************************
AC_MSG_CHECKING(For Glade libraries)
if gnome-config --libs libglade >& /dev/null; then
AC_MSG_RESULT(found)
else
AC_MSG_ERROR(Did not find libGlade installed)
fi
EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo`
EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo`
AC_SUBST(EXTRA_GNOME_LIBS)
AC_SUBST(EXTRA_GNOME_CFLAGS)
AM_PATH_LIBGLADE
AC_OUTPUT([
gnumeric.spec
......
......@@ -133,7 +133,7 @@ html_write_cell40 (FILE *fp, Cell *cell)
r, g, b);
if (style->font->is_bold)
fprintf (fp, "<B>");
if (style->font->italic)
if (style->font->is_italic)
fprintf (fp, "<I>");
html_fprintf (fp, cell->text->str);
if (style->font->is_bold)
......@@ -156,7 +156,6 @@ html_write_wb_html32 (Workbook *wb, const char *filename)
Sheet *sheet;
Cell *cell;
int row, col;
unsigned char r,g,b;
g_return_val_if_fail (wb != NULL, -1);
g_return_val_if_fail (filename != NULL, -1);
......@@ -284,64 +283,6 @@ html_get_string (char *s, int *flags)
return buf;
}
/*
* change the font of a cell to bold
*/
static void
html_cell_bold (Cell *cell)
{
char *old_name, *new_name;
Style *style;
char *name[] = { "bold", "demibold", "extrabold", "heavy", NULL };
int i;
StyleFont *sf;
if (!cell)
return;
style = cell->style;
if (!style)
return;
for (i = 0; name[i]; i++) {
old_name = style->font->font_name;
new_name = font_change_component (old_name, 2, name[i]);
sf = style_font_new_simple (new_name, style->font->units);
g_free (new_name);
if (sf) {
cell_set_font_from_style (cell, sf);
break;
}
}
}
/*
* change the font of a cell to italic
*/
static void
html_cell_italic (Cell *cell)
{
char *old_name, *new_name;
Style *style;
char *name[] = { "i", "o", NULL };
int i;
StyleFont *sf;
if (!cell)
return;
style = cell->style;
if (!style)
return;
for (i = 0; name[i]; i++) {
old_name = style->font->font_name;
new_name = font_change_component (old_name, 3, name[i]);
sf = style_font_new_simple (new_name, style->font->units);
g_free (new_name);
if (sf) {
cell_set_font_from_style (cell, sf);
break;
}
}
}
/*
* try at least to read back what we have written before..
*/
......@@ -428,10 +369,10 @@ html_read (const char *filename)
*/
if (cell->style && cell->style->font && flags) {
if (flags & HTML_BOLD) {
html_cell_bold (cell);
/* html_cell_bold (cell); */
}
if (flags & HTML_ITALIC) {
html_cell_italic (cell);
/* html_cell_italic (cell); */
}
if (flags & HTML_RIGHT) {
cell_set_halign (cell, HALIGN_RIGHT);
......
......@@ -133,7 +133,7 @@ html_write_cell40 (FILE *fp, Cell *cell)
r, g, b);
if (style->font->is_bold)
fprintf (fp, "<B>");
if (style->font->italic)
if (style->font->is_italic)
fprintf (fp, "<I>");
html_fprintf (fp, cell->text->str);
if (style->font->is_bold)
......@@ -156,7 +156,6 @@ html_write_wb_html32 (Workbook *wb, const char *filename)
Sheet *sheet;
Cell *cell;
int row, col;
unsigned char r,g,b;
g_return_val_if_fail (wb != NULL, -1);
g_return_val_if_fail (filename != NULL, -1);
......@@ -284,64 +283,6 @@ html_get_string (char *s, int *flags)
return buf;
}
/*
* change the font of a cell to bold
*/
static void
html_cell_bold (Cell *cell)
{
char *old_name, *new_name;
Style *style;
char *name[] = { "bold", "demibold", "extrabold", "heavy", NULL };
int i;
StyleFont *sf;
if (!cell)
return;
style = cell->style;
if (!style)
return;
for (i = 0; name[i]; i++) {
old_name = style->font->font_name;
new_name = font_change_component (old_name, 2, name[i]);
sf = style_font_new_simple (new_name, style->font->units);
g_free (new_name);
if (sf) {
cell_set_font_from_style (cell, sf);
break;
}
}
}
/*
* change the font of a cell to italic
*/
static void
html_cell_italic (Cell *cell)
{
char *old_name, *new_name;
Style *style;
char *name[] = { "i", "o", NULL };
int i;
StyleFont *sf;
if (!cell)
return;
style = cell->style;
if (!style)
return;
for (i = 0; name[i]; i++) {
old_name = style->font->font_name;
new_name = font_change_component (old_name, 3, name[i]);
sf = style_font_new_simple (new_name, style->font->units);
g_free (new_name);
if (sf) {
cell_set_font_from_style (cell, sf);
break;
}
}
}
/*
* try at least to read back what we have written before..
*/
......@@ -428,10 +369,10 @@ html_read (const char *filename)
*/
if (cell->style && cell->style->font && flags) {
if (flags & HTML_BOLD) {
html_cell_bold (cell);
/* html_cell_bold (cell); */
}
if (flags & HTML_ITALIC) {
html_cell_italic (cell);
/* html_cell_italic (cell); */
}
if (flags & HTML_RIGHT) {
cell_set_halign (cell, HALIGN_RIGHT);
......
......@@ -118,14 +118,14 @@ html_write_wb_latex (Workbook *wb, const char *filename)
fprintf (fp, "\\centering "); /* doesn't work */
if (style->valign & VALIGN_TOP)
;
if (style->font->hint_is_bold)
if (style->font->is_bold)
fprintf (fp, "{\\bf ");
if (style->font->hint_is_italic)
if (style->font->is_italic)
fprintf (fp, "{\\em ");
latex_fprintf (fp, cell->text->str);
if (style->font->hint_is_bold)
if (style->font->is_bold)
fprintf (fp, "}");
if (style->font->hint_is_italic)
if (style->font->is_italic)
fprintf (fp, "}");
/* if (style->halign & HALIGN_CENTER) */
/* fprintf (fp, "\\hfill"); */
......
......@@ -46,9 +46,7 @@ INCLUDES = \
-DGNUMERIC_GLADEDIR=\""$(gladedir)"\" \
-DGNUMERIC_ICONDIR=\""$(iconsdir)"\" \
-I$(includedir) \
-I$(top_srcdir)/libglade \
$(GNOME_PRINT_CFLAGS) \
$(GNOME_INCLUDEDIR) \
$(EXTRA_GNOME_CFLAGS) \
$(GUILE_INCS)
GNUMERIC_BASE_SOURCES = \
......@@ -214,12 +212,9 @@ gnumeric_bonobo_SOURCES = \
gnumeric_LDFLAGS = -export-dynamic
gnumeric_LDADD = \
$(GNOME_PRINT_LIBS) \
../plugins/excel/libexcel.a \
../plugins/excel/libole2/libole2.a \
../libglade/glade/libglade.a \
$(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
$(INTLLIBS)
......@@ -227,9 +222,7 @@ gnumeric_LDADD = \
gnumeric_bonobo_LDADD = \
../plugins/excel/libexcel.a \
../plugins/excel/libole2/libole2.a \
../libglade/glade/libglade.a \
$(BONOBO_LIBS) \
$(GNOME_PRINT_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
$(INTLLIBS)
......
......@@ -162,7 +162,7 @@ Workbook_corba_class_init ()
gnome_gnumeric_workbook_vepv.GNOME_Gnumeric_Workbook_epv =
&gnome_gnumeric_workbook_epv;
gnome_gnumeric_workbook_vepv.GNOME_obj_epv =
gnome_gnumeric_workbook_vepv.GNOME_Unknown_epv =
&gnome_object_epv;
gnome_gnumeric_workbook_epv.sheet_new = Workbook_sheet_new;
......
......@@ -147,7 +147,7 @@
<yfill>False</yfill>
</child>
<can_focus>True</can_focus>
<label>Vertical</label>
<label>Portrait</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>orient-group</group>
......@@ -171,7 +171,7 @@
<yfill>False</yfill>
</child>
<can_focus>True</can_focus>
<label>Horizontal</label>
<label>Landscape</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>orient-group</group>
......@@ -1069,22 +1069,61 @@
</widget>
<widget>
<class>GtkEntry</class>
<name>header-entry</name>
<class>GtkHBox</class>
<name>hbox19</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkCombo</class>
<name>header-combo</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
</widget>
<widget>
<class>GtkButton</class>
<name>custom-header-button</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<visible>False</visible>
<can_focus>True</can_focus>
<label>Custom... </label>
</widget>
</widget>
<widget>
<class>Placeholder</class>
<class>GtkLabel</class>
<name>label33</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
......@@ -1105,18 +1144,44 @@
</widget>
<widget>
<class>GtkEntry</class>
<name>footer-entry</name>
<class>GtkHBox</class>
<name>hbox18</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkCombo</class>
<name>footer-combo</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
</widget>
<widget>
<class>GtkButton</class>
<name>custom-footer-combo</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<visible>False</visible>
<can_focus>True</can_focus>
<label>Custom...</label>
</widget>
</widget>
<widget>
......
......@@ -147,7 +147,7 @@
<yfill>False</yfill>
</child>
<can_focus>True</can_focus>
<label>Vertical</label>
<label>Portrait</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>orient-group</group>
......@@ -171,7 +171,7 @@
<yfill>False</yfill>
</child>
<can_focus>True</can_focus>
<label>Horizontal</label>
<label>Landscape</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>orient-group</group>
......@@ -1069,22 +1069,61 @@
</widget>
<widget>
<class>GtkEntry</class>
<name>header-entry</name>
<class>GtkHBox</class>
<name>hbox19</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkCombo</class>
<name>header-combo</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
</widget>
<widget>
<class>GtkButton</class>
<name>custom-header-button</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<visible>False</visible>
<can_focus>True</can_focus>
<label>Custom... </label>
</widget>
</widget>
<widget>
<class>Placeholder</class>
<class>GtkLabel</class>
<name>label33</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
......@@ -1105,18 +1144,44 @@
</widget>
<widget>
<class>GtkEntry</class>
<name>footer-entry</name>
<class>GtkHBox</class>
<name>hbox18</name>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkCombo</class>
<name>footer-combo</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
</widget>
<widget>
<class>GtkButton</class>
<name>custom-footer-combo</name>
<border_width>2</border_width>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<visible>False</visible>
<can_focus>True</can_focus>
<label>Custom...</label>
</widget>
</widget>
<widget>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment