Commit 936d042c authored by Michael Meeks's avatar Michael Meeks Committed by Michael Meeks

render the cell value if we have display_formulas even if we arn't

2000-10-03  Michael Meeks  <michael@helixcode.com>

	* src/cell-draw.c (cell_draw): render the cell value if we have
	display_formulas even if we arn't supposed to render '0' values
	and the value is 0.

	* src/print-cell.c (print_cell): ditto.

	* src/gnumeric.xml: move built menu items up.

	* src/workbook.c: add HelpAbout verb.
	(workbook_new): update to use nicer helper, adding help support.

2000-09-30  Michael Meeks  <michael@helixcode.com>

	* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
	freeze / thaw to force GUI re-build.

	* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.

2000-09-24  Michael Meeks  <michael@helixcode.com>

	* src/workbook-private.h: update to item container.

2000-09-21  Michael Meeks  <michael@helixcode.com>

	* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
	pointer.
parent b9dd12cc
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
2000-10-03 Michael Meeks <michael@helixcode.com>
* src/cell-draw.c (cell_draw): render the cell value if we have
display_formulas even if we arn't supposed to render '0' values
and the value is 0.
* src/print-cell.c (print_cell): ditto.
* src/gnumeric.xml: move built menu items up.
* src/workbook.c: add HelpAbout verb.
(workbook_new): update to use nicer helper, adding help support.
2000-09-30 Michael Meeks <michael@helixcode.com>
* src/gnumeric-util.c (gnumeric_inject_widget_into_bonoboui): add a
freeze / thaw to force GUI re-build.
* src/workbook.c: add debug verb. (verb_debug_dump_xml): impl.
2000-09-24 Michael Meeks <michael@helixcode.com>
* src/workbook-private.h: update to item container.
2000-09-21 Michael Meeks <michael@helixcode.com>
* src/sheet-object.c (sheet_object_destroy): fix uninitialized sheet
pointer.
2000-10-02 Almer S. Tigelaar <almer1@dds.nl>
* src/file-autoft.c:
......
......@@ -340,11 +340,11 @@
<submenu name="Help" _label="_Help">
<placeholder name="BuiltMenuItems"/>
<menuitem name="HelpAbout" verb="" _label="_About..." _descr="About this application"
pixtype="stock" pixname="Menu_About"/>
<placeholder name="BuiltMenuItems"/>
</submenu>
</menu>
......
......@@ -162,7 +162,9 @@ cell_draw (Cell const *cell, MStyle *mstyle, CellSpanInfo const * const spaninfo
* Don't print zeros if they should be ignored.
*/
if (sheet && (cell == sheet->workbook->editing_cell ||
(!sheet->display_zero && cell_is_zero (cell))))
(!sheet->display_formulas &&
!sheet->display_zero &&
cell_is_zero (cell))))
return;
g_return_if_fail (cell->rendered_value);
......
......@@ -750,12 +750,13 @@ void
gnumeric_inject_widget_into_bonoboui (Workbook *wb, GtkWidget *widget, char const *path)
{
BonoboControl *control;
Bonobo_UIContainer container = bonobo_ui_compat_get_container (wb->priv->uih);
gtk_widget_show_all (widget);
control = bonobo_control_new (widget);
bonobo_ui_container_object_set (bonobo_ui_compat_get_container (wb->priv->uih),
path,
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
bonobo_ui_container_object_set (
container, path,
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
}
#endif
......@@ -340,11 +340,11 @@
<submenu name="Help" _label="_Help">
<placeholder name="BuiltMenuItems"/>
<menuitem name="HelpAbout" verb="" _label="_About..." _descr="About this application"
pixtype="stock" pixname="Menu_About"/>
<placeholder name="BuiltMenuItems"/>
</submenu>
</menu>
......
......@@ -750,12 +750,13 @@ void
gnumeric_inject_widget_into_bonoboui (Workbook *wb, GtkWidget *widget, char const *path)
{
BonoboControl *control;
Bonobo_UIContainer container = bonobo_ui_compat_get_container (wb->priv->uih);
gtk_widget_show_all (widget);
control = bonobo_control_new (widget);
bonobo_ui_container_object_set (bonobo_ui_compat_get_container (wb->priv->uih),
path,
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
bonobo_ui_container_object_set (
container, path,
bonobo_object_corba_objref (BONOBO_OBJECT (control)),
NULL);
}
#endif
......@@ -311,7 +311,9 @@ print_cell (Cell const *cell, MStyle *mstyle, CellSpanInfo const * const spaninf
/* Don't print zeros if they should be ignored. */
if (/* No need to check for the edit cell */
!sheet->display_zero && cell_is_zero (cell))
!sheet->display_formulas &&
!sheet->display_zero &&
cell_is_zero (cell))
return;
g_return_if_fail (cell->rendered_value);
......
......@@ -231,6 +231,15 @@ verb_insert_shaped_component (GtkWidget *widget, Workbook *wb)
select_component_id (wb->current_sheet,
"IDL:Bonobo/Canvas/Item:1.0");
}
#ifdef ENABLE_BONOBO
static void
verb_debug_dump_xml (GtkWidget *widget, Workbook *wb)
{
bonobo_win_dump (BONOBO_WIN (wb->toplevel), "on demand");
}
#endif
static void
create_bonobo_object (GtkWidget *widget, Workbook *wb)
{
......@@ -1228,6 +1237,10 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("InsertComponent", verb_insert_component),
BONOBO_UI_VERB ("InsertShapedComponent", verb_insert_shaped_component),
BONOBO_UI_VERB ("HelpAbout", about_cmd),
BONOBO_UI_VERB ("DebugDumpXml", verb_debug_dump_xml),
BONOBO_UI_VERB_END
};
......@@ -2770,8 +2783,6 @@ workbook_new (void)
bonobo_ui_handler_set_app (wb->priv->uih, BONOBO_WIN (wb->toplevel));
{
char *fname;
BonoboUINode *ui;
BonoboUIComponent *component =
bonobo_ui_compat_get_component (wb->priv->uih);
Bonobo_UIContainer container =
......@@ -2780,16 +2791,9 @@ workbook_new (void)
bonobo_ui_component_add_verb_list_with_data (
component, verbs, wb);
fname = bonobo_ui_util_get_ui_fname (
GNOME_DATADIR, "gnumeric.xml");
ui = bonobo_ui_util_new_ui (component, fname, "gnumeric");
bonobo_ui_component_set_tree (
component, container, "/", ui, NULL);
g_free (fname);
bonobo_ui_node_free (ui);
bonobo_ui_util_set_ui (
component, container, GNOME_DATADIR,
"gnumeric.xml", "gnumeric");
}
#endif
/* Create before registering verbs so that we can merge some extra. */
......
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