Commit d82807cb authored by Jody Goldberg's avatar Jody Goldberg

revert unintended commit

parent 96d09612
......@@ -27,7 +27,7 @@ Release Critical
6.2) Form import
6.3) Intersection, union and set export
6.4) unknown name export
6.5) non-ole import ?
6.5) non-ole import (Nick Lamb is working on this)
8) Notice mismatch between suffix and saver (eg .xls for gnumeric file)
9) Manual recalc
9.1) finish calculation ui in workbook attr dialog
......@@ -105,7 +105,6 @@ Misc stuff that should be fixed
* We should start with the expr entry set to either the current cell,
or by selecting the first named expression in scope that contains the
current cell.
* Should <ok> add the name ?
: Check xl import of unicode names
: Check scoping changes.
......@@ -140,9 +139,6 @@ Misc stuff that should be fixed
covered by 'General' ?
: format.c: we should resolve all the separators at gnumeric_setlocale time,
not every time we need them.
: the format classification should know about other currencies and currency
placements.
: The currency list in the format dialog needs to be sorted for the locale
: When applying a currency symbol we need to store the NON-localized id.
: hour month and year format strings need to be internationalized.
eg tt:ss instead of hh:ss for other locales.
......@@ -150,6 +146,7 @@ Misc stuff that should be fixed
: we should parse fractions
: We do not format fractional seconds correctly.
: Parsing should handle embedded strings
: It incorrectly accepts mmm:ss as some sort of minute spec.
- Inc/Dec precision should work. Try "44", click $, then add/remove decimals.
- While we're playing with those functions, let's add simple ones like inc/dec
......
2002-10-09 Jody Goldberg <jody@gnome.org>
* src/commands.c (cmd_define_name_redo) : fix ref counting.
(cmd_define_name_undo) : and here.
2002-10-08 Jody Goldberg <jody@gnome.org>
......
2002-10-09 Jody Goldberg <jody@gnome.org>
* src/commands.c (cmd_define_name_redo) : fix ref counting.
(cmd_define_name_undo) : and here.
2002-10-08 Jody Goldberg <jody@gnome.org>
......
2002-10-09 Jody Goldberg <jody@gnome.org>
* src/commands.c (cmd_define_name_redo) : fix ref counting.
(cmd_define_name_undo) : and here.
2002-10-08 Jody Goldberg <jody@gnome.org>
......
......@@ -62,14 +62,6 @@ to features that already work.
* Number formatting
+ FIXME : The formating is incomplete.
- It does not support seconds fractions.
- It incorrectly accepts mmm:ss as some sort of minute spec.
- Add/remove decimal buttons on the toolbar are screwed for
items with different formats for negatives.
- There is too much replicated code for generating formats
and recognizing them in the format dialog.
+ TODO :
- Too much parsing is taking place when formating. We should
have set all that up beforehand when the format was parsed.
......@@ -82,10 +74,6 @@ to features that already work.
Columns should have an "auto-grow-up-to-this-point" feature. Beyond that
size, it would truncate as it does now.
+ Cell comments
Cell comments should be wrapped - at least so that they do not run
off the screen.
* Auditing
+ Write the sheet auditing code.
......@@ -96,8 +84,6 @@ to features that already work.
If sheet->mode is OBJECT_SELECTED cut/copy/paste should operate on
the object.
+ Object properties
+ Objects
Load / save of Bonobo objects.
......@@ -105,7 +91,6 @@ to features that already work.
+ Support for popular formats.
I have the specs for the XS3 format. SC should be
trivial to support as well (from the guile sources)
+ Supply default extension to use with a write operation.
+ Improve handling of unknown fonts and functions when importing.
* Workbooks:
......@@ -173,7 +158,7 @@ under "1.0" are more important.
+ Most of the major elements are there to support in place
filters. All we'd need is a new Dependent type to manage the
filter results. ==> Fix SUBTOTAL().
filter results.
+ Implement `AutoFilter' tool.
+ Implement filter columns???
......
......@@ -5276,6 +5276,7 @@ cmd_define_name_undo (GnumericCommand *cmd, WorkbookControl *wbc)
if (me->create_name) {
expr_name_remove (me->nexpr);
expr_name_unref (me->nexpr);
me->nexpr = NULL;
} else
expr_name_set_expr (me->nexpr, me->expr, NULL);
......
......@@ -2465,7 +2465,7 @@ cb_fmt_dialog_dialog_buttons (GtkWidget *btn, FormatState *state)
}
/* Handler for destroy */
static gboolean
static void
cb_fmt_dialog_dialog_destroy (FormatState *state)
{
wbcg_edit_detach_guru (state->wbcg);
......@@ -2475,7 +2475,6 @@ cb_fmt_dialog_dialog_destroy (FormatState *state)
mstyle_unref (state->result);
g_object_unref (G_OBJECT (state->gui));
g_free (state);
return FALSE;
}
/* Handler for expr-entry's focus.
......
......@@ -423,7 +423,7 @@ name_guru_init_button (NameGuruState *state, char const *name)
return tmp;
}
static gboolean
static void
cb_name_guru_destroy (NameGuruState *state)
{
g_return_val_if_fail (state != NULL, FALSE);
......@@ -444,8 +444,6 @@ cb_name_guru_destroy (NameGuruState *state)
state->expr_names = NULL;
g_free (state);
return FALSE;
}
static void
......@@ -545,10 +543,9 @@ name_guru_init (NameGuruState *state, WorkbookControlGUI *wbcg)
name_guru_populate_list (state);
/* a candidate for merging into attach guru */
gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
DEFINE_NAMES_KEY);
/* a candidate for merging into attach guru */
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_name_guru_destroy);
gnumeric_non_modal_dialog (state->wbcg, GTK_WINDOW (state->dialog));
......
......@@ -45,10 +45,9 @@ typedef struct {
static GType last_link_type = 0;
static gboolean
dialog_hyperlink_close_destroy (GtkObject *w, HyperlinkState *state)
static void
dialog_hyperlink_close_destroy (HyperlinkState *state)
{
g_return_val_if_fail (w != NULL, FALSE);
g_return_val_if_fail (state != NULL, FALSE);
wbcg_edit_detach_guru (state->wbcg);
......@@ -63,8 +62,6 @@ dialog_hyperlink_close_destroy (GtkObject *w, HyperlinkState *state)
}
state->dialog = NULL;
g_free (state);
return FALSE;
}
static void
......@@ -201,11 +198,6 @@ dialog_hyperlink_init (HyperlinkState *state)
gnumeric_init_help_button (
glade_xml_get_widget (state->gui, "help_button"),
"hyperlink.html");
g_signal_connect (G_OBJECT (state->dialog),
"destroy",
G_CALLBACK (dialog_hyperlink_close_destroy), state);
wbcg_edit_attach_guru (state->wbcg, state->dialog);
menu = gtk_menu_new ();
for (i = 0 ; i < G_N_ELEMENTS (type); i++) {
......@@ -287,8 +279,12 @@ dialog_hyperlink (WorkbookControlGUI *wbcg, SheetControl *sc)
dialog_hyperlink_set_type (state, last_link_type);
/* a candidate for merging into attach guru */
gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
DIALOG_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) dialog_hyperlink_close_destroy);
gnumeric_non_modal_dialog (state->wbcg, GTK_WINDOW (state->dialog));
wbcg_edit_attach_guru (state->wbcg, state->dialog);
gtk_widget_show (state->dialog);
}
......@@ -126,13 +126,9 @@ cb_attr_dialog_dialog_ok (GtkWidget *button, AttrState *state)
cb_attr_dialog_dialog_close (button, state);
}
/* Handler for destroy */
static gboolean
cb_attr_dialog_dialog_destroy (GtkObject *w, AttrState *state)
static void
cb_attr_dialog_dialog_destroy (AttrState *state)
{
g_return_val_if_fail (w != NULL, FALSE);
g_return_val_if_fail (state != NULL, FALSE);
wbcg_edit_detach_guru (state->wbcg);
if (state->gui != NULL) {
......@@ -142,8 +138,6 @@ cb_attr_dialog_dialog_destroy (GtkObject *w, AttrState *state)
state->dialog = NULL;
g_free (state);
return FALSE;
}
/*****************************************************************************/
......@@ -239,17 +233,16 @@ attr_dialog_impl (AttrState *state)
g_signal_connect (G_OBJECT (glade_xml_get_widget (state->gui, "close_button")),
"clicked",
G_CALLBACK (cb_attr_dialog_dialog_close), state);
cb_toggled (NULL, state);
/* FIXME: Add correct helpfile address */
gnumeric_init_help_button (
glade_xml_get_widget (state->gui, "help_button"),
"workbook-attributes.html");
g_signal_connect (G_OBJECT (dialog),
"destroy",
G_CALLBACK (cb_attr_dialog_dialog_destroy), state);
cb_toggled (NULL, state);
/* a candidate for merging into attach guru */
g_object_set_data_full (G_OBJECT (dialog),
"state", state, (GDestroyNotify) cb_attr_dialog_dialog_destroy);
wbcg_edit_attach_guru (state->wbcg, state->dialog);
gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
WORKBOOK_ATTRIBUTE_KEY);
......
......@@ -62,20 +62,9 @@ static struct {
{ NULL, 0}
};
/**
* zoom_destroy:
* @window:
* @state:
*
* Destroy the dialog and associated data structures.
*
**/
static gboolean
zoom_destroy (GtkObject *w, ZoomState *state)
static void
cb_zoom_destroy (ZoomState *state)
{
g_return_val_if_fail (w != NULL, FALSE);
g_return_val_if_fail (state != NULL, FALSE);
wbcg_edit_detach_guru (state->wbcg);
if (state->gui != NULL) {
......@@ -85,8 +74,6 @@ zoom_destroy (GtkObject *w, ZoomState *state)
state->dialog = NULL;
g_free (state);
return FALSE;
}
static void
......@@ -231,19 +218,18 @@ dialog_zoom (WorkbookControlGUI *wbcg, Sheet *sheet)
"clicked",
G_CALLBACK (cb_zoom_cancel_clicked), state);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (&state->zoom->entry));
gnumeric_init_help_button (
glade_xml_get_widget (state->gui, "help_button"),
"zoom.html");
g_signal_connect (G_OBJECT (state->dialog),
"destroy",
G_CALLBACK (zoom_destroy), state);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (&state->zoom->entry));
wbcg_edit_attach_guru (state->wbcg, state->dialog);
gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
ZOOM_DIALOG_KEY);
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify) cb_zoom_destroy);
wbcg_edit_attach_guru (state->wbcg, state->dialog);
gtk_widget_show (state->dialog);
gtk_widget_grab_focus (focus_target);
}
......@@ -556,7 +556,7 @@ gnm_expr_extract_ref (CellRef *res, GnmExpr const *expr,
return TRUE;
}
static Value *
static inline Value *
handle_empty (Value *res, GnmExprEvalFlags flags)
{
if (res == NULL)
......
......@@ -51,6 +51,7 @@
#include <gal/util/e-xml-utils.h>
#include <libxml/parser.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <gtk/gtk.h>
#define DISABLE_DEBUG
#ifndef DISABLE_DEBUG
......
......@@ -165,6 +165,11 @@ x_clipboard_received (GtkClipboard *clipboard, GtkSelectionData *sel,
return;
}
#if 0
for (j = 0; j < atom_count ; j++)
puts (gdk_atom_name (targets [j]));
#endif
/* what do we like best */
for (i = 0 ; formats[i] != NULL ; i++) {
GdkAtom atom = gdk_atom_intern (formats[i], FALSE);
......
......@@ -613,7 +613,7 @@ kill_popup_menu (GtkWidget *widget, GtkMenu *menu)
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
gtk_object_destroy (GTK_OBJECT (menu));
g_object_unref (G_OBJECT (menu));
}
void
......
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