IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint'

Browse Source
This commit is contained in:
Christopher Lam 2019-11-19 23:07:10 +08:00
commit 21f053398f
34 changed files with 1023 additions and 894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
gnucash/gnome-utils/gnc-cell-renderer-date.c
View File

@ -87,6 +87,7 @@ static void gcrd_show (GncCellRendererPopup *cell,
gint y1, gint y1,
gint x2, gint x2,
gint y2); gint y2);
static void gcrd_hide (GncCellRendererPopup *cell); static void gcrd_hide (GncCellRendererPopup *cell);
@ -136,49 +137,49 @@ gcrd_init (GncCellRendererDate *date)
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *button; GtkWidget *button;
popup = GNC_CELL_RENDERER_POPUP (date); popup = GNC_CELL_RENDERER_POPUP(date);
frame = gtk_frame_new (NULL); frame = gtk_frame_new (NULL);
gtk_container_add (GTK_CONTAINER (popup->popup_window), frame); gtk_container_add (GTK_CONTAINER(popup->popup_window), frame);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_OUT);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_box_set_homogeneous (GTK_BOX(vbox), FALSE);
gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_add (GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_container_set_border_width (GTK_CONTAINER(vbox), 6);
date->calendar = gtk_calendar_new (); date->calendar = gtk_calendar_new ();
popup->focus_window = date->calendar; popup->focus_window = date->calendar;
gtk_box_pack_start (GTK_BOX (vbox), date->calendar, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(vbox), date->calendar, TRUE, TRUE, 0);
date->button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); date->button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (date->button_box), 6); gtk_box_set_spacing (GTK_BOX(date->button_box), 6);
gtk_box_pack_start (GTK_BOX (vbox), date->button_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(vbox), date->button_box, FALSE, FALSE, 0);
button = gtk_button_new_with_label (_("Cancel")); button = gtk_button_new_with_label (_("Cancel"));
gtk_container_add (GTK_CONTAINER (date->button_box), button); gtk_container_add (GTK_CONTAINER(date->button_box), button);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (gcrd_cancel_clicked), G_CALLBACK(gcrd_cancel_clicked),
date); date);
date->today_button = gtk_button_new_with_label (_("Today")); date->today_button = gtk_button_new_with_label (_("Today"));
gtk_container_add (GTK_CONTAINER (date->button_box), date->today_button); gtk_container_add (GTK_CONTAINER(date->button_box), date->today_button);
g_signal_connect (date->today_button, "clicked", g_signal_connect (date->today_button, "clicked",
G_CALLBACK (gcrd_today_clicked), G_CALLBACK(gcrd_today_clicked),
date); date);
button = gtk_button_new_with_label (_("Select")); button = gtk_button_new_with_label (_("Select"));
gtk_container_add (GTK_CONTAINER (date->button_box), button); gtk_container_add (GTK_CONTAINER(date->button_box), button);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (gcrd_ok_clicked), G_CALLBACK(gcrd_ok_clicked),
date); date);
g_signal_connect (date->calendar, "day-selected", g_signal_connect (date->calendar, "day-selected",
G_CALLBACK (gcrd_day_selected), G_CALLBACK(gcrd_day_selected),
date); date);
g_signal_connect (date->calendar, "day-selected-double-click", g_signal_connect (date->calendar, "day-selected-double-click",
G_CALLBACK (gcrd_selected_double_click), G_CALLBACK(gcrd_selected_double_click),
date); date);
//Set calendar to show current date when displayed //Set calendar to show current date when displayed
@ -194,10 +195,10 @@ gcrd_class_init (GncCellRendererDateClass *klass)
GtkCellRendererClass *cell_class; GtkCellRendererClass *cell_class;
GObjectClass *gobject_class; GObjectClass *gobject_class;
popup_class = GNC_CELL_RENDERER_POPUP_CLASS (klass); popup_class = GNC_CELL_RENDERER_POPUP_CLASS(klass);
cell_class = GTK_CELL_RENDERER_CLASS (klass); cell_class = GTK_CELL_RENDERER_CLASS(klass);
parent_class = GNC_CELL_RENDERER_POPUP_CLASS (g_type_class_peek_parent (klass)); parent_class = GNC_CELL_RENDERER_POPUP_CLASS(g_type_class_peek_parent (klass));
gobject_class = G_OBJECT_CLASS (klass); gobject_class = G_OBJECT_CLASS(klass);
gobject_class->set_property = gcrd_set_property; gobject_class->set_property = gcrd_set_property;
gobject_class->get_property = gcrd_get_property; gobject_class->get_property = gcrd_get_property;
@ -215,7 +216,6 @@ gcrd_class_init (GncCellRendererDateClass *klass)
NULL, NULL,
TRUE, TRUE,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
} }
static void static void
@ -224,11 +224,10 @@ gcrd_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GncCellRendererDate *date; GncCellRendererDate *date = GNC_CELL_RENDERER_DATE(object);
date = GNC_CELL_RENDERER_DATE (object); switch (param_id)
{
switch (param_id) {
case PROP_USE_BUTTONS: case PROP_USE_BUTTONS:
date->use_buttons = g_value_get_boolean (value); date->use_buttons = g_value_get_boolean (value);
@ -239,7 +238,7 @@ gcrd_set_property (GObject *object,
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
break; break;
} }
} }
@ -250,17 +249,16 @@ gcrd_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GncCellRendererDate *date; GncCellRendererDate *date = GNC_CELL_RENDERER_DATE (object);
date = GNC_CELL_RENDERER_DATE (object); switch (param_id)
{
switch (param_id) {
case PROP_USE_BUTTONS: case PROP_USE_BUTTONS:
g_value_set_boolean (value, date->use_buttons); g_value_set_boolean (value, date->use_buttons);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
break; break;
} }
} }
@ -274,10 +272,10 @@ gcrd_start_editing (GtkCellRenderer *cell,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
GNC_CELL_RENDERER_POPUP (cell)->editing_canceled = FALSE; GNC_CELL_RENDERER_POPUP(cell)->editing_canceled = FALSE;
if (GTK_CELL_RENDERER_CLASS (parent_class)->start_editing) { if (GTK_CELL_RENDERER_CLASS(parent_class)->start_editing) {
return GTK_CELL_RENDERER_CLASS (parent_class)->start_editing ( return GTK_CELL_RENDERER_CLASS(parent_class)->start_editing (
cell, cell,
event, event,
widget, widget,
@ -307,7 +305,7 @@ gcrd_show (GncCellRendererPopup *cell,
gint x2, gint x2,
gint y2) gint y2)
{ {
GncCellRendererDate *date; GncCellRendererDate *date = GNC_CELL_RENDERER_DATE (cell);
gint year = 0; gint year = 0;
gint month = 0; gint month = 0;
gint day = 0; gint day = 0;
@ -320,26 +318,24 @@ gcrd_show (GncCellRendererPopup *cell,
x2, y2); x2, y2);
} }
date = GNC_CELL_RENDERER_DATE (cell);
text = gnc_popup_entry_get_text (GNC_POPUP_ENTRY (GNC_CELL_RENDERER_POPUP (cell)->editable)); text = gnc_popup_entry_get_text (GNC_POPUP_ENTRY (GNC_CELL_RENDERER_POPUP (cell)->editable));
if (!(g_strcmp0(text, ""))) if (!(g_strcmp0(text, "")))
{ {
date->time = gnc_time (NULL); date->time = gnc_time (NULL);
gcrd_time2dmy ( date->time, &day, &month, &year); gcrd_time2dmy (date->time, &day, &month, &year);
} }
else else
{ {
date->time = gcrd_string_dmy2time (text); date->time = gcrd_string_dmy2time (text);
gcrd_time2dmy ( date->time, &day, &month, &year); gcrd_time2dmy (date->time, &day, &month, &year);
} }
gtk_calendar_clear_marks (GTK_CALENDAR (date->calendar)); gtk_calendar_clear_marks (GTK_CALENDAR(date->calendar));
gtk_calendar_select_month (GTK_CALENDAR (date->calendar), month - 1, year); gtk_calendar_select_month (GTK_CALENDAR(date->calendar), month - 1, year);
gtk_calendar_select_day (GTK_CALENDAR (date->calendar), day); gtk_calendar_select_day (GTK_CALENDAR(date->calendar), day);
gtk_calendar_mark_day (GTK_CALENDAR (date->calendar), day); gtk_calendar_mark_day (GTK_CALENDAR(date->calendar), day);
} }
GtkCellRenderer * GtkCellRenderer *
@ -351,7 +347,7 @@ gnc_cell_renderer_date_new (gboolean use_buttons)
"use-buttons", use_buttons, "use-buttons", use_buttons,
NULL); NULL);
return GTK_CELL_RENDERER (cell); return GTK_CELL_RENDERER(cell);
} }
static void static void
@ -362,20 +358,18 @@ gcrd_today_clicked (GtkWidget *button, GncCellRendererDate *cell)
today = gnc_time (NULL); today = gnc_time (NULL);
gcrd_time2dmy ( today, &day, &month, &year); gcrd_time2dmy (today, &day, &month, &year);
gtk_calendar_clear_marks (GTK_CALENDAR (cell->calendar)); gtk_calendar_clear_marks (GTK_CALENDAR(cell->calendar));
gtk_calendar_select_month (GTK_CALENDAR (cell->calendar), month - 1, year); gtk_calendar_select_month (GTK_CALENDAR(cell->calendar), month - 1, year);
gtk_calendar_select_day (GTK_CALENDAR (cell->calendar), day); gtk_calendar_select_day (GTK_CALENDAR(cell->calendar), day);
gtk_calendar_mark_day (GTK_CALENDAR (cell->calendar), day); gtk_calendar_mark_day (GTK_CALENDAR(cell->calendar), day);
} }
static void static void
gcrd_selected_double_click (GtkWidget *calendar, GncCellRendererDate *cell) gcrd_selected_double_click (GtkWidget *calendar, GncCellRendererDate *cell)
{ {
GncCellRendererPopup *popup; GncCellRendererPopup *popup = GNC_CELL_RENDERER_POPUP(cell);
popup = GNC_CELL_RENDERER_POPUP (cell);
gcrd_ok_clicked (popup->popup_window, cell); gcrd_ok_clicked (popup->popup_window, cell);
} }
@ -383,9 +377,7 @@ gcrd_selected_double_click (GtkWidget *calendar, GncCellRendererDate *cell)
static void static void
gcrd_cancel_clicked (GtkWidget *popup_window, GncCellRendererDate *cell) gcrd_cancel_clicked (GtkWidget *popup_window, GncCellRendererDate *cell)
{ {
GncCellRendererPopup *popup; GncCellRendererPopup *popup = GNC_CELL_RENDERER_POPUP(cell);
popup = GNC_CELL_RENDERER_POPUP (cell);
popup->editing_canceled = TRUE; popup->editing_canceled = TRUE;
gnc_cell_renderer_popup_hide (popup); gnc_cell_renderer_popup_hide (popup);
@ -394,9 +386,7 @@ gcrd_cancel_clicked (GtkWidget *popup_window, GncCellRendererDate *cell)
static void static void
gcrd_ok_clicked (GtkWidget *popup_window, GncCellRendererDate *cell) gcrd_ok_clicked (GtkWidget *popup_window, GncCellRendererDate *cell)
{ {
GncCellRendererPopup *popup; GncCellRendererPopup *popup = GNC_CELL_RENDERER_POPUP(cell);
popup = GNC_CELL_RENDERER_POPUP (cell);
gcrd_day_selected (popup_window, cell); gcrd_day_selected (popup_window, cell);
@ -413,19 +403,19 @@ gcrd_day_selected (GtkWidget *popup_window, GncCellRendererDate *cell)
time64 t; time64 t;
gchar *str; gchar *str;
gtk_calendar_get_date (GTK_CALENDAR (cell->calendar), gtk_calendar_get_date (GTK_CALENDAR(cell->calendar),
&year, &year,
&month, &month,
&day); &day);
t = gcrd_dmy2time ( day, month + 1, year); t = gcrd_dmy2time (day, month + 1, year);
cell->time = t; cell->time = t;
str = gcrd_time2dmy_string (t); str = gcrd_time2dmy_string (t);
gnc_popup_entry_set_text ( gnc_popup_entry_set_text (
GNC_POPUP_ENTRY (GNC_CELL_RENDERER_POPUP (cell)->editable), str); GNC_POPUP_ENTRY(GNC_CELL_RENDERER_POPUP(cell)->editable), str);
g_free (str); g_free (str);
} }
@ -460,7 +450,6 @@ gcrd_dmy2time (gint day, gint month, gint year)
return gnc_mktime (&when); return gnc_mktime (&when);
} }
/* This function converts a time64 value date to a string */ /* This function converts a time64 value date to a string */
static gchar * static gchar *
gcrd_time2dmy_string (time64 raw_time) gcrd_time2dmy_string (time64 raw_time)
@ -468,7 +457,6 @@ gcrd_time2dmy_string (time64 raw_time)
return qof_print_date (raw_time); return qof_print_date (raw_time);
} }
/* This function converts a string date to a time64 value */ /* This function converts a string date to a time64 value */
static time64 static time64
gcrd_string_dmy2time (const gchar *date_string) gcrd_string_dmy2time (const gchar *date_string)

138
gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
View File

@ -43,12 +43,28 @@ static void gpw_cell_editable_init (GtkCellEditableIface *iface);
static gboolean gpw_key_press_event (GtkWidget *box, static gboolean gpw_key_press_event (GtkWidget *box,
GdkEventKey *key_event); GdkEventKey *key_event);
static void gpw_set_property (GObject *object,
guint param_id,
const GValue *value,
GParamSpec *pspec);
static void gpw_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec);
enum enum
{ {
ARROW_CLICKED, ARROW_CLICKED,
LAST_SIGNAL LAST_SIGNAL
}; };
enum
{
PROP_0,
PROP_EDITING_CANCELED,
};
static GtkEventBoxClass *parent_class; static GtkEventBoxClass *parent_class;
static guint signals[LAST_SIGNAL]; static guint signals[LAST_SIGNAL];
@ -97,12 +113,14 @@ gnc_popup_entry_init (GncPopupEntry *widget)
{ {
GtkWidget *arrow; GtkWidget *arrow;
widget->editing_canceled = FALSE;
widget->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); widget->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (widget->hbox), FALSE); gtk_box_set_homogeneous (GTK_BOX(widget->hbox), FALSE);
gtk_widget_show (widget->hbox); gtk_widget_show (widget->hbox);
widget->entry = g_object_new (GTK_TYPE_ENTRY, "has_frame", FALSE, NULL); widget->entry = g_object_new (GTK_TYPE_ENTRY, "has_frame", FALSE, NULL);
gtk_entry_set_visibility (GTK_ENTRY (widget->entry), TRUE); gtk_entry_set_visibility (GTK_ENTRY(widget->entry), TRUE);
gtk_widget_show (widget->entry); gtk_widget_show (widget->entry);
widget->button = gtk_button_new (); widget->button = gtk_button_new ();
@ -111,30 +129,38 @@ gnc_popup_entry_init (GncPopupEntry *widget)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON); arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
gtk_widget_show (arrow); gtk_widget_show (arrow);
g_signal_connect (G_OBJECT (arrow), "draw", g_signal_connect (G_OBJECT(arrow), "draw",
G_CALLBACK (gnc_draw_arrow_cb), GINT_TO_POINTER(1)); G_CALLBACK(gnc_draw_arrow_cb), GINT_TO_POINTER(1));
gtk_container_add (GTK_CONTAINER (widget->button), arrow); gtk_container_add (GTK_CONTAINER(widget->button), arrow);
gtk_box_pack_start (GTK_BOX (widget->hbox), widget->entry, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(widget->hbox), widget->entry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (widget->hbox), widget->button, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX(widget->hbox), widget->button, FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (widget), widget->hbox); gtk_container_add (GTK_CONTAINER(widget), widget->hbox);
gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE); gtk_widget_set_can_focus (GTK_WIDGET(widget), TRUE);
gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_PRESS_MASK); gtk_widget_add_events (GTK_WIDGET(widget), GDK_KEY_PRESS_MASK);
gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_RELEASE_MASK); gtk_widget_add_events (GTK_WIDGET(widget), GDK_KEY_RELEASE_MASK);
} }
static void static void
gnc_popup_entry_class_init (GncPopupEntryClass *klass) gnc_popup_entry_class_init (GncPopupEntryClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
widget_class->key_press_event = gpw_key_press_event; widget_class->key_press_event = gpw_key_press_event;
gobject_class->set_property = gpw_set_property;
gobject_class->get_property = gpw_get_property;
parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass)); parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass));
g_object_class_override_property (gobject_class,
PROP_EDITING_CANCELED,
"editing-canceled");
signals[ARROW_CLICKED] = g_signal_new signals[ARROW_CLICKED] = g_signal_new
("arrow-clicked", ("arrow-clicked",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
@ -146,6 +172,42 @@ gnc_popup_entry_class_init (GncPopupEntryClass *klass)
} }
static void
gpw_set_property (GObject *object, guint param_id,
const GValue *value, GParamSpec *pspec)
{
GncPopupEntry *pe = GNC_POPUP_ENTRY(object);
switch (param_id)
{
case PROP_EDITING_CANCELED:
pe->editing_canceled = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
break;
}
}
static void
gpw_get_property (GObject *object, guint param_id,
GValue *value, GParamSpec *pspec)
{
GncPopupEntry *pe = GNC_POPUP_ENTRY(object);
switch (param_id)
{
case PROP_EDITING_CANCELED:
g_value_set_boolean (value, pe->editing_canceled);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);
break;
}
}
static void static void
gpw_arrow_clicked (GtkWidget *button, GncPopupEntry *widget) gpw_arrow_clicked (GtkWidget *button, GncPopupEntry *widget)
{ {
@ -157,8 +219,8 @@ gpw_arrow_clicked (GtkWidget *button, GncPopupEntry *widget)
static void static void
gtk_cell_editable_entry_activated (GtkEntry *entry, GncPopupEntry *widget) gtk_cell_editable_entry_activated (GtkEntry *entry, GncPopupEntry *widget)
{ {
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget)); gtk_cell_editable_editing_done (GTK_CELL_EDITABLE(widget));
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE(widget));
} }
static gboolean static gboolean
@ -174,8 +236,8 @@ gtk_cell_editable_key_press_event (GtkEntry *entry,
{ {
widget->editing_canceled = TRUE; widget->editing_canceled = TRUE;
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget)); gtk_cell_editable_editing_done (GTK_CELL_EDITABLE(widget));
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE(widget));
return TRUE; return TRUE;
} }
@ -194,7 +256,7 @@ gtk_cell_editable_key_press_event (GtkEntry *entry,
return FALSE; return FALSE;
gtk_entry_set_text (entry, qof_print_date (gnc_mktime (&when))); gtk_entry_set_text (entry, qof_print_date (gnc_mktime (&when)));
gtk_widget_grab_focus (GTK_WIDGET (entry)); gtk_widget_grab_focus (GTK_WIDGET(entry));
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -204,7 +266,7 @@ static gboolean
gpw_key_press_event (GtkWidget *box, gpw_key_press_event (GtkWidget *box,
GdkEventKey *key_event) GdkEventKey *key_event)
{ {
GncPopupEntry *widget = GNC_POPUP_ENTRY (box); GncPopupEntry *widget = GNC_POPUP_ENTRY(box);
GdkEvent tmp_event; GdkEvent tmp_event;
gtk_widget_grab_focus (widget->entry); gtk_widget_grab_focus (widget->entry);
@ -213,21 +275,21 @@ gpw_key_press_event (GtkWidget *box,
{ {
widget->editing_canceled = TRUE; widget->editing_canceled = TRUE;
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget)); gtk_cell_editable_editing_done (GTK_CELL_EDITABLE(widget));
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE(widget));
return TRUE; return TRUE;
} }
if (key_event->keyval == GDK_KEY_Left) if (key_event->keyval == GDK_KEY_Left)
{ {
gtk_editable_set_position (GTK_EDITABLE (widget->entry), 0); gtk_editable_set_position (GTK_EDITABLE(widget->entry), 0);
return TRUE; return TRUE;
} }
if (key_event->keyval == GDK_KEY_Right) if (key_event->keyval == GDK_KEY_Right)
{ {
gtk_editable_set_position (GTK_EDITABLE (widget->entry), -1); gtk_editable_set_position (GTK_EDITABLE(widget->entry), -1);
return TRUE; return TRUE;
} }
@ -239,7 +301,7 @@ gpw_key_press_event (GtkWidget *box,
gtk_widget_event (widget->entry, &tmp_event); gtk_widget_event (widget->entry, &tmp_event);
return GTK_WIDGET_CLASS (parent_class)->key_press_event (GTK_WIDGET (widget), return GTK_WIDGET_CLASS (parent_class)->key_press_event (GTK_WIDGET(widget),
key_event); key_event);
} }
@ -247,21 +309,21 @@ static void
gpw_start_editing (GtkCellEditable *cell_editable, gpw_start_editing (GtkCellEditable *cell_editable,
GdkEvent *event) GdkEvent *event)
{ {
GncPopupEntry *widget = GNC_POPUP_ENTRY (cell_editable); GncPopupEntry *widget = GNC_POPUP_ENTRY(cell_editable);
gtk_editable_select_region (GTK_EDITABLE (widget->entry), 0, -1); gtk_editable_select_region (GTK_EDITABLE(widget->entry), 0, -1);
g_signal_connect (G_OBJECT (widget->entry), g_signal_connect (G_OBJECT(widget->entry),
"activate", "activate",
G_CALLBACK (gtk_cell_editable_entry_activated), G_CALLBACK(gtk_cell_editable_entry_activated),
widget); widget);
g_signal_connect (G_OBJECT (widget->entry), g_signal_connect (G_OBJECT(widget->entry),
"key_press_event", "key_press_event",
G_CALLBACK (gtk_cell_editable_key_press_event), G_CALLBACK(gtk_cell_editable_key_press_event),
widget); widget);
g_signal_connect (G_OBJECT (widget->button), g_signal_connect (G_OBJECT(widget->button),
"clicked", "clicked",
(GCallback) gpw_arrow_clicked, (GCallback)gpw_arrow_clicked,
widget); widget);
} }
@ -274,17 +336,17 @@ gpw_cell_editable_init (GtkCellEditableIface *iface)
void void
gnc_popup_entry_set_text (GncPopupEntry *popup, const gchar *text) gnc_popup_entry_set_text (GncPopupEntry *popup, const gchar *text)
{ {
g_return_if_fail (GNC_IS_POPUP_ENTRY (popup)); g_return_if_fail (GNC_IS_POPUP_ENTRY(popup));
gtk_entry_set_text (GTK_ENTRY (popup->entry), text ? text : ""); gtk_entry_set_text (GTK_ENTRY(popup->entry), text ? text : "");
} }
const gchar * const gchar *
gnc_popup_entry_get_text (GncPopupEntry *popup) gnc_popup_entry_get_text (GncPopupEntry *popup)
{ {
g_return_val_if_fail (GNC_IS_POPUP_ENTRY (popup), NULL); g_return_val_if_fail (GNC_IS_POPUP_ENTRY(popup), NULL);
return gtk_entry_get_text (GTK_ENTRY (popup->entry)); return gtk_entry_get_text (GTK_ENTRY(popup->entry));
} }
gint gint
@ -299,14 +361,14 @@ gnc_popup_get_button_width (void)
button = gtk_button_new (); button = gtk_button_new ();
gtk_widget_show (button); gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (window), button); gtk_container_add (GTK_CONTAINER(window), button);
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON); arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
gtk_widget_show (arrow); gtk_widget_show (arrow);
gtk_container_add (GTK_CONTAINER (button), arrow); gtk_container_add (GTK_CONTAINER(button), arrow);
gtk_window_move (GTK_WINDOW (window), -500, -500); gtk_window_move (GTK_WINDOW(window), -500, -500);
gtk_widget_show (window); gtk_widget_show (window);
gtk_widget_get_preferred_size (window, &req, NULL); gtk_widget_get_preferred_size (window, &req, NULL);

121
gnucash/gnome-utils/gnc-cell-renderer-popup.c
View File

@ -44,21 +44,23 @@ enum {
static void gcrp_init (GncCellRendererPopup *popup); static void gcrp_init (GncCellRendererPopup *popup);
static void gcrp_class_init (GncCellRendererPopupClass *klass); static void gcrp_class_init (GncCellRendererPopupClass *klass);
static GtkCellEditable * static GtkCellEditable *gcrp_start_editing (GtkCellRenderer *cell,
gcrp_start_editing (GtkCellRenderer *cell,
GdkEvent *event, GdkEvent *event,
GtkWidget *widget, GtkWidget *widget,
const gchar *path, const gchar *path,
const GdkRectangle *background_area, const GdkRectangle *background_area,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags); GtkCellRendererState flags);
static void gcrp_show_popup (GncCellRendererPopup *cell, static void gcrp_show_popup (GncCellRendererPopup *cell,
const gchar *path, const gchar *path,
gint x1, gint x1,
gint y1, gint y1,
gint x2, gint x2,
gint y2); gint y2);
static void gcrp_hide_popup (GncCellRendererPopup *cell); static void gcrp_hide_popup (GncCellRendererPopup *cell);
static void gcrp_get_size (GtkCellRenderer *cell, static void gcrp_get_size (GtkCellRenderer *cell,
GtkWidget *widget, GtkWidget *widget,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
@ -66,17 +68,19 @@ static void gcrp_get_size (GtkCellRenderer *cell,
gint *y_offset, gint *y_offset,
gint *width, gint *width,
gint *height); gint *height);
static void gcrp_style_set (GtkWidget *widget, static void gcrp_style_set (GtkWidget *widget,
GtkStyle *old_style, GtkStyle *old_style,
GncCellRendererPopup *popup); GncCellRendererPopup *popup);
static gboolean gcrp_key_press_event (GtkWidget *popup_window, static gboolean gcrp_key_press_event (GtkWidget *popup_window,
GdkEventKey *event, GdkEventKey *event,
GncCellRendererPopup *cell); GncCellRendererPopup *cell);
static gboolean gcrp_button_press_event (GtkWidget *widget, static gboolean gcrp_button_press_event (GtkWidget *widget,
GdkEventButton *event, GdkEventButton *event,
GncCellRendererPopup *popup); GncCellRendererPopup *popup);
void gnc_marshal_VOID__STRING_INT_INT_INT_INT (GClosure *closure, void gnc_marshal_VOID__STRING_INT_INT_INT_INT (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
@ -126,26 +130,26 @@ gcrp_init (GncCellRendererPopup *popup)
g_signal_connect (popup->popup_window, g_signal_connect (popup->popup_window,
"button-press-event", "button-press-event",
G_CALLBACK (gcrp_button_press_event), G_CALLBACK(gcrp_button_press_event),
popup); popup);
g_signal_connect (popup->popup_window, g_signal_connect (popup->popup_window,
"key-press-event", "key-press-event",
G_CALLBACK (gcrp_key_press_event), G_CALLBACK(gcrp_key_press_event),
popup); popup);
g_signal_connect (popup->popup_window, g_signal_connect (popup->popup_window,
"style-set", "style-set",
G_CALLBACK (gcrp_style_set), G_CALLBACK(gcrp_style_set),
popup); popup);
} }
static void static void
gcrp_class_init (GncCellRendererPopupClass *klass) gcrp_class_init (GncCellRendererPopupClass *klass)
{ {
GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(klass);
parent_class = GTK_CELL_RENDERER_TEXT_CLASS (g_type_class_peek_parent (klass)); parent_class = GTK_CELL_RENDERER_TEXT_CLASS(g_type_class_peek_parent (klass));
cell_class->start_editing = gcrp_start_editing; cell_class->start_editing = gcrp_start_editing;
cell_class->get_size = gcrp_get_size; cell_class->get_size = gcrp_get_size;
@ -184,22 +188,20 @@ gcrp_editing_done (GtkCellEditable *editable,
gchar *path; gchar *path;
const gchar *new_text; const gchar *new_text;
if (GNC_POPUP_ENTRY (editable)->editing_canceled || if (GNC_POPUP_ENTRY(editable)->editing_canceled ||
cell->editing_canceled) { cell->editing_canceled) {
gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (cell), TRUE); gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER(cell), TRUE);
return; return;
} }
path = g_object_get_data (G_OBJECT (editable), path = g_object_get_data (G_OBJECT(editable),
GNC_CELL_RENDERER_POPUP_PATH); GNC_CELL_RENDERER_POPUP_PATH);
new_text = gnc_popup_entry_get_text (GNC_POPUP_ENTRY (editable));
gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (cell), FALSE); new_text = gnc_popup_entry_get_text (GNC_POPUP_ENTRY(editable));
g_signal_emit_by_name (cell, gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER(cell), FALSE);
"edited",
path, g_signal_emit_by_name (cell, "edited", path, new_text);
new_text);
} }
static void static void
@ -298,7 +300,7 @@ gcrp_show_popup (GncCellRendererPopup *cell,
button_height = y2 - y1; button_height = y2 - y1;
#if GTK_CHECK_VERSION(3,22,0) #if GTK_CHECK_VERSION(3,22,0)
win = gdk_screen_get_root_window (gtk_window_get_screen (GTK_WINDOW (cell->popup_window))); win = gdk_screen_get_root_window (gtk_window_get_screen (GTK_WINDOW(cell->popup_window)));
mon = gdk_display_get_monitor_at_window (gtk_widget_get_display (GTK_WIDGET(cell->popup_window)), win); mon = gdk_display_get_monitor_at_window (gtk_widget_get_display (GTK_WIDGET(cell->popup_window)), win);
gdk_monitor_get_geometry (mon, &monitor_size); gdk_monitor_get_geometry (mon, &monitor_size);
@ -310,9 +312,11 @@ gcrp_show_popup (GncCellRendererPopup *cell,
#endif #endif
/* Check if it fits in the available height. */ /* Check if it fits in the available height. */
if (alloc.height > screen_height) { if (alloc.height > screen_height)
{
/* It doesn't fit, so we see if we have the minimum space needed. */ /* It doesn't fit, so we see if we have the minimum space needed. */
if (alloc.height > screen_height && y - button_height > screen_height) { if (alloc.height > screen_height && y - button_height > screen_height)
{
/* We don't, so we show the popup above the cell /* We don't, so we show the popup above the cell
instead of below it. */ instead of below it. */
y -= (alloc.height + button_height); y -= (alloc.height + button_height);
@ -325,18 +329,17 @@ gcrp_show_popup (GncCellRendererPopup *cell,
/* We try to line it up with the right edge of the column, but we don't /* We try to line it up with the right edge of the column, but we don't
* want it to go off the edges of the screen. * want it to go off the edges of the screen.
*/ */
if (x > screen_width) { if (x > screen_width)
x = screen_width; x = screen_width;
}
x -= alloc.width; x -= alloc.width;
if (x < 0) {
if (x < 0)
x = 0; x = 0;
}
gtk_grab_add (cell->popup_window); gtk_grab_add (cell->popup_window);
gtk_window_move (GTK_WINDOW (cell->popup_window), x, y); gtk_window_move (GTK_WINDOW(cell->popup_window), x, y);
gtk_widget_show (cell->popup_window); gtk_widget_show (cell->popup_window);
gtk_widget_grab_focus (cell->focus_window); gtk_widget_grab_focus (cell->focus_window);
@ -351,16 +354,14 @@ gcrp_hide_popup (GncCellRendererPopup *cell)
gtk_grab_remove (cell->popup_window); gtk_grab_remove (cell->popup_window);
gtk_widget_hide (cell->popup_window); gtk_widget_hide (cell->popup_window);
if (cell->editable) { if (cell->editable)
gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (cell->editable)); gtk_cell_editable_editing_done (GTK_CELL_EDITABLE(cell->editable));
}
/* This may look weird (the test), but the weak pointer will actually be /* This may look weird (the test), but the weak pointer will actually be
* nulled out for some cells, like the date cell. * nulled out for some cells, like the date cell.
*/ */
if (cell->editable) { if (cell->editable)
gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (cell->editable)); gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE(cell->editable));
}
cell->shown = FALSE; cell->shown = FALSE;
cell->editing_canceled = FALSE; cell->editing_canceled = FALSE;
@ -374,13 +375,14 @@ gcrp_arrow_clicked (GtkCellEditable *entry,
gint x, y; gint x, y;
const gchar *path; const gchar *path;
if (cell->shown) { if (cell->shown)
{
cell->editing_canceled = TRUE; cell->editing_canceled = TRUE;
gnc_cell_renderer_popup_hide (cell); gnc_cell_renderer_popup_hide (cell);
return; return;
} }
path = g_object_get_data (G_OBJECT (entry), path = g_object_get_data (G_OBJECT(entry),
GNC_CELL_RENDERER_POPUP_PATH); GNC_CELL_RENDERER_POPUP_PATH);
/* Temporarily grab pointer and keyboard on a window we know exists; we /* Temporarily grab pointer and keyboard on a window we know exists; we
@ -388,16 +390,16 @@ gcrp_arrow_clicked (GtkCellEditable *entry,
* events generated when the window is mapped, such as enter * events generated when the window is mapped, such as enter
* notify events on subwidgets. If the grab fails, bail out. * notify events on subwidgets. If the grab fails, bail out.
*/ */
if (!gcrp_grab_on_window (gtk_widget_get_window (GTK_WIDGET (entry)), if (!gcrp_grab_on_window (gtk_widget_get_window (GTK_WIDGET(entry)),
gtk_get_current_event_time ())) { gtk_get_current_event_time ())) {
return; return;
} }
gtk_editable_select_region (GTK_EDITABLE (GNC_POPUP_ENTRY (entry)->entry), 0, 0); gtk_editable_select_region (GTK_EDITABLE(GNC_POPUP_ENTRY(entry)->entry), 0, 0);
gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (entry)), &x, &y); gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET(entry)), &x, &y);
gtk_widget_get_allocation (GTK_WIDGET (entry), &alloc); gtk_widget_get_allocation (GTK_WIDGET(entry), &alloc);
g_signal_emit (cell, signals[SHOW_POPUP], 0, g_signal_emit (cell, signals[SHOW_POPUP], 0,
path, path,
@ -416,27 +418,25 @@ gcrp_start_editing (GtkCellRenderer *cell,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
GtkCellRendererState flags) GtkCellRendererState flags)
{ {
GncCellRendererPopup *popup; GncCellRendererPopup *popup = GNC_CELL_RENDERER_POPUP(cell);
GtkWidget *editable; GtkWidget *editable;
gchar *text; gchar *text;
gboolean iseditable; gboolean iseditable;
popup = GNC_CELL_RENDERER_POPUP (cell);
g_object_get (G_OBJECT (popup), "editable", &iseditable, NULL); g_object_get (G_OBJECT (popup), "editable", &iseditable, NULL);
/* If the cell isn't editable we return NULL. */ /* If the cell isn't editable we return NULL. */
if (iseditable == FALSE) { if (iseditable == FALSE)
return NULL; return NULL;
}
editable = g_object_new (GNC_TYPE_POPUP_ENTRY, NULL); editable = g_object_new (GNC_TYPE_POPUP_ENTRY, NULL);
g_object_get (G_OBJECT (cell), "text", &text, NULL); g_object_get (G_OBJECT(cell), "text", &text, NULL);
popup->cell_text = text; popup->cell_text = text;
gnc_popup_entry_set_text (GNC_POPUP_ENTRY (editable), text ? text : ""); gnc_popup_entry_set_text (GNC_POPUP_ENTRY(editable), text ? text : "");
g_object_set_data_full (G_OBJECT (editable), g_object_set_data_full (G_OBJECT(editable),
GNC_CELL_RENDERER_POPUP_PATH, GNC_CELL_RENDERER_POPUP_PATH,
g_strdup (path), g_strdup (path),
g_free); g_free);
@ -445,33 +445,33 @@ gcrp_start_editing (GtkCellRenderer *cell,
g_signal_connect (editable, g_signal_connect (editable,
"editing-done", "editing-done",
G_CALLBACK (gcrp_editing_done), G_CALLBACK(gcrp_editing_done),
popup); popup);
g_signal_connect (editable, g_signal_connect (editable,
"arrow-clicked", "arrow-clicked",
G_CALLBACK (gcrp_arrow_clicked), G_CALLBACK(gcrp_arrow_clicked),
popup); popup);
popup->editable = editable; popup->editable = editable;
g_object_add_weak_pointer (G_OBJECT (popup->editable), g_object_add_weak_pointer (G_OBJECT(popup->editable),
(gpointer) &popup->editable); (gpointer) &popup->editable);
return GTK_CELL_EDITABLE (editable); return GTK_CELL_EDITABLE(editable);
} }
GtkCellRenderer * GtkCellRenderer *
gnc_cell_renderer_popup_new (void) gnc_cell_renderer_popup_new (void)
{ {
return GTK_CELL_RENDERER ( return GTK_CELL_RENDERER(
g_object_new (gnc_cell_renderer_popup_get_type (), NULL)); g_object_new (gnc_cell_renderer_popup_get_type (), NULL));
} }
void void
gnc_cell_renderer_popup_hide (GncCellRendererPopup *cell) gnc_cell_renderer_popup_hide (GncCellRendererPopup *cell)
{ {
g_return_if_fail (GNC_IS_CELL_RENDERER_POPUP (cell)); g_return_if_fail (GNC_IS_CELL_RENDERER_POPUP(cell));
g_signal_emit (cell, signals[HIDE_POPUP], 0); g_signal_emit (cell, signals[HIDE_POPUP], 0);
} }
@ -485,12 +485,10 @@ gcrp_get_size (GtkCellRenderer *cell,
gint *width, gint *width,
gint *height) gint *height)
{ {
GncCellRendererPopup *popup; GncCellRendererPopup *popup = GNC_CELL_RENDERER_POPUP (cell);
popup = GNC_CELL_RENDERER_POPUP (cell); if (GTK_CELL_RENDERER_CLASS(parent_class)->get_size) {
(* GTK_CELL_RENDERER_CLASS(parent_class)->get_size) (cell,
if (GTK_CELL_RENDERER_CLASS (parent_class)->get_size) {
(* GTK_CELL_RENDERER_CLASS (parent_class)->get_size) (cell,
widget, widget,
cell_area, cell_area,
x_offset, x_offset,
@ -500,9 +498,8 @@ gcrp_get_size (GtkCellRenderer *cell,
} }
/* We cache this because it takes really long to get the width. */ /* We cache this because it takes really long to get the width. */
if (popup->button_width == -1) { if (popup->button_width == -1)
popup->button_width = gnc_popup_get_button_width (); popup->button_width = gnc_popup_get_button_width ();
}
*width += popup->button_width; *width += popup->button_width;
} }
@ -540,9 +537,8 @@ gcrp_button_press_event (GtkWidget *widget,
gint x1, y1; gint x1, y1;
gint x2, y2; gint x2, y2;
if (event->button != 1) { if (event->button != 1)
return FALSE; return FALSE;
}
/* If the event happened outside the popup, cancel editing. /* If the event happened outside the popup, cancel editing.
*/ */
@ -565,9 +561,8 @@ gcrp_button_press_event (GtkWidget *widget,
x2 = x1 + alloc.width; x2 = x1 + alloc.width;
y2 = y1 + alloc.height; y2 = y1 + alloc.height;
if (x > x1 && x < x2 && y > y1 && y < y2) { if (x > x1 && x < x2 && y > y1 && y < y2)
return FALSE; return FALSE;
}
popup->editing_canceled = TRUE; popup->editing_canceled = TRUE;
gnc_cell_renderer_popup_hide (popup); gnc_cell_renderer_popup_hide (popup);
@ -594,6 +589,7 @@ gnc_marshal_VOID__STRING_INT_INT_INT_INT (GClosure *closure,
gint arg_4, gint arg_4,
gint arg_5, gint arg_5,
gpointer data2); gpointer data2);
register GMarshalFunc_VOID__STRING_INT_INT_INT_INT callback; register GMarshalFunc_VOID__STRING_INT_INT_INT_INT callback;
register GCClosure *cc = (GCClosure*) closure; register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2; register gpointer data1, data2;
@ -620,4 +616,3 @@ gnc_marshal_VOID__STRING_INT_INT_INT_INT (GClosure *closure,
g_marshal_value_peek_int (param_values + 5), g_marshal_value_peek_int (param_values + 5),
data2); data2);
} }

69
gnucash/gnome/dialog-find-account.c
View File

@ -59,6 +59,8 @@ typedef struct
GtkWidget *sub_label; GtkWidget *sub_label;
gboolean jump_close; gboolean jump_close;
gchar *saved_filter_text;
gint event_handler_id;
}FindAccountDialog; }FindAccountDialog;
@ -194,7 +196,7 @@ fill_model (GtkTreeModel *model, Account *account)
} }
static void static void
get_account_info (FindAccountDialog *facc_dialog) get_account_info (FindAccountDialog *facc_dialog, gboolean use_saved_filter)
{ {
Account *root; Account *root;
GList *accts; GList *accts;
@ -214,6 +216,9 @@ get_account_info (FindAccountDialog *facc_dialog)
accts = gnc_account_get_descendants_sorted (root); accts = gnc_account_get_descendants_sorted (root);
if (use_saved_filter)
filter_text = g_ascii_strdown (facc_dialog->saved_filter_text, -1);
else
filter_text = g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY(facc_dialog->filter_text_entry)), -1); filter_text = g_ascii_strdown (gtk_entry_get_text (GTK_ENTRY(facc_dialog->filter_text_entry)), -1);
/* disconnect the model from the treeview */ /* disconnect the model from the treeview */
@ -250,12 +255,55 @@ get_account_info (FindAccountDialog *facc_dialog)
static void static void
filter_button_cb (GtkButton *button, FindAccountDialog *facc_dialog) filter_button_cb (GtkButton *button, FindAccountDialog *facc_dialog)
{ {
get_account_info (facc_dialog); get_account_info (facc_dialog, FALSE);
if (facc_dialog->saved_filter_text)
g_free (facc_dialog->saved_filter_text);
// save the filter incase of an account event
facc_dialog->saved_filter_text = g_strdup (gtk_entry_get_text
(GTK_ENTRY(facc_dialog->filter_text_entry)));
// Clear the filter // Clear the filter
gtk_entry_set_text (GTK_ENTRY(facc_dialog->filter_text_entry), ""); gtk_entry_set_text (GTK_ENTRY(facc_dialog->filter_text_entry), "");
} }
static void
gnc_find_account_event_handler (QofInstance *entity,
QofEventId event_type,
FindAccountDialog *facc_dialog,
gpointer evt_data)
{
Account *account = NULL;
g_return_if_fail (facc_dialog); /* Required */
if (!GNC_IS_ACCOUNT(entity))
return;
ENTER("entity %p of type %d, dialog %p, event_data %p",
entity, event_type, facc_dialog, evt_data);
account = GNC_ACCOUNT(entity);
switch (event_type)
{
case QOF_EVENT_ADD:
case QOF_EVENT_REMOVE:
case QOF_EVENT_MODIFY:
DEBUG("account change on %p (%s)", account, xaccAccountGetName (account));
get_account_info (facc_dialog, TRUE);
LEAVE(" ");
break;
default:
LEAVE("unknown event type");
return;
}
LEAVE(" ");
return;
}
static void static void
gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialog) gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialog)
{ {
@ -280,6 +328,7 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo
facc_dialog->session = gnc_get_current_session(); facc_dialog->session = gnc_get_current_session();
facc_dialog->parent = parent; facc_dialog->parent = parent;
facc_dialog->saved_filter_text = g_strdup ("");
gtk_window_set_title (GTK_WINDOW(facc_dialog->window), _("Find Account")); gtk_window_set_title (GTK_WINDOW(facc_dialog->window), _("Find Account"));
@ -400,7 +449,11 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo
// Set the filter to Wildcard // Set the filter to Wildcard
gtk_entry_set_text (GTK_ENTRY(facc_dialog->filter_text_entry), ""); gtk_entry_set_text (GTK_ENTRY(facc_dialog->filter_text_entry), "");
get_account_info (facc_dialog); // add a handler to listen for account events
facc_dialog->event_handler_id = qof_event_register_handler
((QofEventHandler)gnc_find_account_event_handler, facc_dialog);
get_account_info (facc_dialog, FALSE);
LEAVE(" "); LEAVE(" ");
} }
@ -410,6 +463,16 @@ close_handler (gpointer user_data)
FindAccountDialog *facc_dialog = user_data; FindAccountDialog *facc_dialog = user_data;
ENTER(" "); ENTER(" ");
if (facc_dialog->event_handler_id)
{
qof_event_unregister_handler (facc_dialog->event_handler_id);
facc_dialog->event_handler_id = 0;
}
if (facc_dialog->saved_filter_text)
g_free (facc_dialog->saved_filter_text);
gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(facc_dialog->window)); gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(facc_dialog->window));
gtk_widget_destroy (GTK_WIDGET(facc_dialog->window)); gtk_widget_destroy (GTK_WIDGET(facc_dialog->window));
LEAVE(" "); LEAVE(" ");

4
gnucash/report/html-document.scm
View File

@ -107,7 +107,8 @@
(define (gnc:html-document-tree-collapse . tree) (define (gnc:html-document-tree-collapse . tree)
(let lp ((e tree) (accum '())) (let lp ((e tree) (accum '()))
(cond ((list? e) (fold lp accum e)) (cond ((null? e) accum)
((pair? e) (fold lp accum e))
((string? e) (cons e accum)) ((string? e) (cons e accum))
(else (cons (object->string e) accum))))) (else (cons (object->string e) accum)))))
@ -142,6 +143,7 @@
;;<guile-sitedir>/gnucash/reports/data/balsheet-eg.eguile.scm:<html> ;;<guile-sitedir>/gnucash/reports/data/balsheet-eg.eguile.scm:<html>
;;<guile-sitedir>/gnucash/reports/data/receipt.eguile.scm:<html> ;;<guile-sitedir>/gnucash/reports/data/receipt.eguile.scm:<html>
(push "<!DOCTYPE html>\n")
(push "<html dir='auto'>\n") (push "<html dir='auto'>\n")
(push "<head>\n") (push "<head>\n")
(push "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n") (push "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n")

82
gnucash/report/html-fonts.scm
View File

@ -60,12 +60,9 @@
;; Registers font options ;; Registers font options
(define (register-font-options options) (define (register-font-options options)
(let* (define (opt-register opt)
( (gnc:register-option options opt))
(opt-register (let ((font-family (gnc-get-default-report-font-family)))
(lambda (opt) (gnc:register-option options opt)))
(font-family (gnc-get-default-report-font-family))
)
(opt-register (opt-register
(gnc:make-font-option (gnc:make-font-option
(N_ "Fonts") (N_ "Fonts")
@ -99,65 +96,60 @@
(opt-register (opt-register
(gnc:make-font-option (gnc:make-font-option
(N_ "Fonts") (N_ "Fonts")
(N_ "Total number cell") "g" (N_ "Font info for number cells containing a total.") (N_ "Total number cell") "g"
(N_ "Font info for number cells containing a total.")
(string-append font-family " Bold 12"))) (string-append font-family " Bold 12")))
(opt-register (opt-register
(gnc:make-font-option (gnc:make-font-option
(N_ "Fonts") (N_ "Fonts")
(N_ "Total label cell") "h" (N_ "Font info for cells containing total labels.") (N_ "Total label cell") "h"
(N_ "Font info for cells containing total labels.")
(string-append font-family " Bold 12"))) (string-append font-family " Bold 12")))
(opt-register (opt-register
(gnc:make-font-option (gnc:make-font-option
(N_ "Fonts") (N_ "Fonts")
(N_ "Centered label cell") "i" (N_ "Font info for centered label cells.") (N_ "Centered label cell") "i" (N_ "Font info for centered label cells.")
(string-append font-family " Bold 12"))) (string-append font-family " Bold 12")))))
)
)
;; Adds CSS style information to an html document ;; Adds CSS style information to an html document
(define (add-css-information-to-doc options ssdoc doc) (define (add-css-information-to-doc options ssdoc doc)
(let* (define (opt-font-val name)
((opt-val (gnc:option-value (gnc:lookup-option options "Fonts" name)))
(lambda (section name) (define (opt-style-info name) (font-name-to-style-info (opt-font-val name)))
(gnc:option-value (gnc:lookup-option options section name)))) (let* ((negative-red? (opt-font-val "Negative Values in Red"))
(negative-red? (opt-val "Fonts" "Negative Values in Red"))
(alternate-row-color (alternate-row-color
(gnc:color-option->html (gnc:color-option->html
(gnc:lookup-option options (gnc:lookup-option options "Colors" "Alternate Table Cell Color")))
"Colors" (title-info (opt-style-info "Title"))
"Alternate Table Cell Color"))) (account-link-info (opt-style-info "Account link"))
(title-font-info (font-name-to-style-info (opt-val "Fonts" "Title"))) (number-cell-info (opt-style-info "Number cell"))
(account-link-font-info (font-name-to-style-info (opt-val "Fonts" "Account link"))) (number-header-info (opt-style-info "Number header"))
(number-cell-font-info (font-name-to-style-info (opt-val "Fonts" "Number cell"))) (text-cell-info (opt-style-info "Text cell"))
(number-header-font-info (font-name-to-style-info (opt-val "Fonts" "Number header"))) (total-number-cell-info (opt-style-info "Total number cell"))
(text-cell-font-info (font-name-to-style-info (opt-val "Fonts" "Text cell"))) (total-label-cell-info (opt-style-info "Total label cell"))
(total-number-cell-font-info (font-name-to-style-info (opt-val "Fonts" "Total number cell"))) (centered-label-cell-info (opt-style-info "Centered label cell")))
(total-label-cell-font-info (font-name-to-style-info (opt-val "Fonts" "Total label cell")))
(centered-label-cell-font-info (font-name-to-style-info (opt-val "Fonts" "Centered label cell"))))
(gnc:html-document-set-style-text! (gnc:html-document-set-style-text!
ssdoc ssdoc
(string-append (string-append
"h3 { " title-font-info " }\n" "h3 { " title-info " }\n"
"a { " account-link-font-info " }\n" "a { " account-link-info " }\n"
"body, p, table, tr, td { vertical-align: top; " text-cell-font-info " }\n" "body, p, table, tr, td { vertical-align: top; " text-cell-info " }\n"
"tr.alternate-row { background: " alternate-row-color " }\n" "tr.alternate-row { background: " alternate-row-color " }\n"
"tr { page-break-inside: avoid !important;}\n" "tr { page-break-inside: avoid !important;}\n"
"th.column-heading-left { text-align: left; " number-header-font-info " }\n" "html, body { height: 100vh; margin: 0; }\n"
"th.column-heading-center { text-align: center; " number-header-font-info " }\n" "td, th { border-color: grey }\n"
"th.column-heading-right { text-align: right; " number-header-font-info " }\n" "th.column-heading-left { text-align: left; " number-header-info " }\n"
"th.column-heading-center { text-align: center; " number-header-info " }\n"
"th.column-heading-right { text-align: right; " number-header-info " }\n"
"td.neg { " (if negative-red? "color: red; " "") " }\n" "td.neg { " (if negative-red? "color: red; " "") " }\n"
"td.number-cell, td.total-number-cell { text-align: right; white-space: nowrap; }\n" "td.number-cell, td.total-number-cell { text-align: right; white-space: nowrap; }\n"
"td.date-cell { white-space: nowrap; }\n" "td.date-cell { white-space: nowrap; }\n"
"td.anchor-cell { white-space: nowrap; " text-cell-font-info " }\n" "td.anchor-cell { white-space: nowrap; " text-cell-info " }\n"
"td.number-cell { " number-cell-font-info " }\n" "td.number-cell { " number-cell-info " }\n"
"td.number-header { text-align: right; " number-header-font-info " }\n" "td.number-header { text-align: right; " number-header-info " }\n"
"td.text-cell { " text-cell-font-info " }\n" "td.text-cell { " text-cell-info " }\n"
"td.total-number-cell { " total-number-cell-font-info " }\n" "td.total-number-cell { " total-number-cell-info " }\n"
"td.total-label-cell { " total-label-cell-font-info " }\n" "td.total-label-cell { " total-label-cell-info " }\n"
"td.centered-label-cell { text-align: center; " centered-label-cell-font-info " }\n" "td.centered-label-cell { text-align: center; " centered-label-cell-info " }\n"
(or (gnc:html-document-style-text doc) "") (or (gnc:html-document-style-text doc) "")))))
)
)
)
)

11
gnucash/report/reports/standard/new-owner-report.scm
View File

@ -247,6 +247,8 @@
(define (add-owner-table table splits acc start-date end-date date-type (define (add-owner-table table splits acc start-date end-date date-type
used-columns payable? link-option) used-columns payable? link-option)
(define (AP-negate num)
(if payable? (- num) num))
(define currency (xaccAccountGetCommodity acc)) (define currency (xaccAccountGetCommodity acc))
(define link-cols (assq-ref '((none . 0) (simple . 1) (detailed . 3)) link-option)) (define link-cols (assq-ref '((none . 0) (simple . 1) (detailed . 3)) link-option))
(define (print-totals total debit credit tax sale) (define (print-totals total debit credit tax sale)
@ -313,8 +315,9 @@
(cons (list (gnc:make-html-table-cell/size 1 2 (_ "Outstanding")) (cons (list (gnc:make-html-table-cell/size 1 2 (_ "Outstanding"))
(make-cell (make-cell
(gnc:make-gnc-monetary (gnc:make-gnc-monetary
currency (gnc-lot-get-balance currency
(gncInvoiceGetPostedLot invoice))))) (AP-negate (gnc-lot-get-balance
(gncInvoiceGetPostedLot invoice))))))
result)))) result))))
(else (else
(let* ((lot-split (car invoice-splits)) (let* ((lot-split (car invoice-splits))
@ -328,7 +331,7 @@
(let* ((tfr-split (car tfr-splits)) (let* ((tfr-split (car tfr-splits))
(tfr-acct (xaccSplitGetAccount tfr-split)) (tfr-acct (xaccSplitGetAccount tfr-split))
(tfr-curr (xaccAccountGetCommodity tfr-acct)) (tfr-curr (xaccAccountGetCommodity tfr-acct))
(tfr-amt (xaccSplitGetAmount tfr-split))) (tfr-amt (AP-negate (xaccSplitGetAmount tfr-split))))
(lp1 (cdr tfr-splits) (lp1 (cdr tfr-splits)
(cons (list (cons (list
(qof-print-date (xaccTransGetDate lot-txn)) (qof-print-date (xaccTransGetDate lot-txn))
@ -371,7 +374,7 @@
(let* ((payment-split (car payment-splits)) (let* ((payment-split (car payment-splits))
(inv (car payment-split)) (inv (car payment-split))
(inv-split (cadr payment-split)) (inv-split (cadr payment-split))
(inv-amount (xaccSplitGetAmount inv-split))) (inv-amount (AP-negate (xaccSplitGetAmount inv-split))))
(lp (cdr payment-splits) (lp (cdr payment-splits)
(- amount inv-amount) (- amount inv-amount)
(cons (list (cons (list

6
gnucash/report/reports/standard/test/test-transaction.scm
View File

@ -349,6 +349,12 @@
'("-$23.00") '("-$23.00")
(get-row-col sxml -1 -1))) (get-row-col sxml -1 -1)))
(set-option! options "Filter" "Transaction Filter excludes matched strings" #t)
(let ((sxml (options->sxml options "negate transaction filter not.s?")))
(test-equal "transaction filter in bank to 'not.s?' and switch regex, sum = -$23.00"
'("$24.00")
(get-row-col sxml -1 -1)))
;; Test Reconcile Status Filters ;; Test Reconcile Status Filters
(set! options (default-testing-options)) (set! options (default-testing-options))
(set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969))) (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))

2
gnucash/report/stylesheets/plain.scm
View File

@ -213,7 +213,7 @@
(let ((headline (or (gnc:html-document-headline doc) (let ((headline (or (gnc:html-document-headline doc)
(gnc:html-document-title doc)))) (gnc:html-document-title doc))))
(if headline (if (and headline (not (equal? headline "")))
(gnc:html-document-add-object! (gnc:html-document-add-object!
ssdoc ssdoc
(gnc:make-html-text (gnc:make-html-text

6
gnucash/report/test/test-report-html.scm
View File

@ -45,7 +45,8 @@
) )
(define html-doc-header-no-title (define html-doc-header-no-title
"<html dir='auto'>\n\ "<!DOCTYPE html>
<html dir='auto'>\n\
<head>\n\ <head>\n\
<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n\ <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n\
</head><body>") </head><body>")
@ -87,7 +88,8 @@
(gnc:html-document-set-title! test-doc "HTML Document Title") (gnc:html-document-set-title! test-doc "HTML Document Title")
(test-equal "HTML Document - Render with title" (test-equal "HTML Document - Render with title"
"<html dir='auto'>\n\ "<!DOCTYPE html>
<html dir='auto'>\n\
<head>\n\ <head>\n\
<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n\ <meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />\n\
<title>\n\ <title>\n\

22
gnucash/report/trep-engine.scm
View File

@ -89,6 +89,8 @@
(define optname-transaction-matcher (N_ "Transaction Filter")) (define optname-transaction-matcher (N_ "Transaction Filter"))
(define optname-transaction-matcher-regex (define optname-transaction-matcher-regex
(N_ "Use regular expressions for transaction filter")) (N_ "Use regular expressions for transaction filter"))
(define optname-transaction-matcher-exclude
(N_ "Transaction Filter excludes matched strings"))
(define optname-reconcile-status (N_ "Reconcile Status")) (define optname-reconcile-status (N_ "Reconcile Status"))
(define optname-void-transactions (N_ "Void Transactions")) (define optname-void-transactions (N_ "Void Transactions"))
(define optname-closing-transactions (N_ "Closing transactions")) (define optname-closing-transactions (N_ "Closing transactions"))
@ -604,6 +606,13 @@ enable full POSIX regular expressions capabilities. '#work|#family' will match b
tags within description, notes or memo. ") tags within description, notes or memo. ")
#f)) #f))
(gnc:register-trep-option
(gnc:make-simple-boolean-option
pagename-filter optname-transaction-matcher-exclude
"i3"
(_ "If this option is selected, transactions matching filter are excluded.")
#f))
(gnc:register-trep-option (gnc:register-trep-option
(gnc:make-multichoice-option (gnc:make-multichoice-option
pagename-filter optname-reconcile-status pagename-filter optname-reconcile-status
@ -1969,6 +1978,8 @@ be excluded from periodic reporting.")
(lambda () (make-regexp transaction-matcher)) (lambda () (make-regexp transaction-matcher))
(const 'invalid-transaction-regex)) (const 'invalid-transaction-regex))
'no-guile-regex-support))) 'no-guile-regex-support)))
(transaction-filter-exclude?
(opt-val pagename-filter optname-transaction-matcher-exclude))
(reconcile-status-filter (reconcile-status-filter
(keylist-get-info reconcile-status-list (keylist-get-info reconcile-status-list
(opt-val pagename-filter optname-reconcile-status) (opt-val pagename-filter optname-reconcile-status)
@ -2044,6 +2055,11 @@ be excluded from periodic reporting.")
(define (date-comparator? X Y) (define (date-comparator? X Y)
(generic-less? X Y 'date 'none #t)) (generic-less? X Y 'date 'none #t))
(define (transaction-filter-match split)
(or (match? (xaccTransGetDescription (xaccSplitGetParent split)))
(match? (xaccTransGetNotes (xaccSplitGetParent split)))
(match? (xaccSplitGetMemo split))))
(cond (cond
((or (null? c_account_1) ((or (null? c_account_1)
(symbol? account-matcher-regexp) (symbol? account-matcher-regexp)
@ -2129,9 +2145,9 @@ be excluded from periodic reporting.")
((include) (is-filter-member split c_account_2)) ((include) (is-filter-member split c_account_2))
((exclude) (not (is-filter-member split c_account_2)))) ((exclude) (not (is-filter-member split c_account_2))))
(or (string-null? transaction-matcher) (or (string-null? transaction-matcher)
(match? (xaccTransGetDescription trans)) (if transaction-filter-exclude?
(match? (xaccTransGetNotes trans)) (not (transaction-filter-match split))
(match? (xaccSplitGetMemo split))) (transaction-filter-match split)))
(or (not custom-split-filter) (or (not custom-split-filter)
(custom-split-filter split))))) (custom-split-filter split)))))
splits)) splits))

4
libgnucash/backend/xml/gnc-account-xml-v2.cpp
View File

@ -207,7 +207,7 @@ account_id_handler (xmlNodePtr node, gpointer act_pdata)
xaccAccountSetGUID (pdata->account, guid); xaccAccountSetGUID (pdata->account, guid);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -384,7 +384,7 @@ account_parent_handler (xmlNodePtr node, gpointer act_pdata)
gnc_account_append_child (parent, pdata->account); gnc_account_append_child (parent, pdata->account);
g_free (gid); guid_free (gid);
return TRUE; return TRUE;
} }

4
libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp
View File

@ -279,7 +279,7 @@ set_parent_child (xmlNodePtr node, struct billterm_pdata* pdata,
gncBillTermSetGUID (term, guid); gncBillTermSetGUID (term, guid);
gncBillTermCommitEdit (term); gncBillTermCommitEdit (term);
} }
g_free (guid); guid_free (guid);
g_return_val_if_fail (term, FALSE); g_return_val_if_fail (term, FALSE);
func (pdata->term, term); func (pdata->term, term);
@ -318,7 +318,7 @@ billterm_guid_handler (xmlNodePtr node, gpointer billterm_pdata)
gncBillTermSetGUID (pdata->term, guid); gncBillTermSetGUID (pdata->term, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

2
libgnucash/backend/xml/gnc-book-xml-v2.cpp
View File

@ -121,7 +121,7 @@ book_id_handler (xmlNodePtr node, gpointer book_pdata)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
qof_instance_set_guid (QOF_INSTANCE (book), guid); qof_instance_set_guid (QOF_INSTANCE (book), guid);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

2
libgnucash/backend/xml/gnc-budget-xml-v2.cpp
View File

@ -109,7 +109,7 @@ budget_id_handler (xmlNodePtr node, gpointer bgt)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
qof_instance_set_guid (QOF_INSTANCE (bgt), guid); qof_instance_set_guid (QOF_INSTANCE (bgt), guid);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

6
libgnucash/backend/xml/gnc-customer-xml-v2.cpp
View File

@ -205,7 +205,7 @@ customer_guid_handler (xmlNodePtr node, gpointer cust_pdata)
gncCustomerSetGUID (pdata->customer, guid); gncCustomerSetGUID (pdata->customer, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -237,7 +237,7 @@ customer_terms_handler (xmlNodePtr node, gpointer cust_pdata)
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
term = gnc_billterm_xml_find_or_create (pdata->book, guid); term = gnc_billterm_xml_find_or_create (pdata->book, guid);
g_assert (term); g_assert (term);
g_free (guid); guid_free (guid);
gncCustomerSetTerms (pdata->customer, term); gncCustomerSetTerms (pdata->customer, term);
return TRUE; return TRUE;
@ -353,7 +353,7 @@ customer_taxtable_handler (xmlNodePtr node, gpointer cust_pdata)
gncTaxTableDecRef (taxtable); gncTaxTableDecRef (taxtable);
gncCustomerSetTaxTable (pdata->customer, taxtable); gncCustomerSetTaxTable (pdata->customer, taxtable);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

4
libgnucash/backend/xml/gnc-employee-xml-v2.cpp
View File

@ -178,7 +178,7 @@ employee_guid_handler (xmlNodePtr node, gpointer employee_pdata)
gncEmployeeSetGUID (pdata->employee, guid); gncEmployeeSetGUID (pdata->employee, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -282,7 +282,7 @@ employee_ccard_handler (xmlNodePtr node, gpointer employee_pdata)
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
ccard_acc = xaccAccountLookup (guid, pdata->book); ccard_acc = xaccAccountLookup (guid, pdata->book);
g_free (guid); guid_free (guid);
g_return_val_if_fail (ccard_acc, FALSE); g_return_val_if_fail (ccard_acc, FALSE);
gncEmployeeSetCCard (pdata->employee, ccard_acc); gncEmployeeSetCCard (pdata->employee, ccard_acc);

12
libgnucash/backend/xml/gnc-entry-xml-v2.cpp
View File

@ -283,7 +283,7 @@ set_account (xmlNodePtr node, struct entry_pdata* pdata,
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
acc = xaccAccountLookup (guid, pdata->book); acc = xaccAccountLookup (guid, pdata->book);
g_free (guid); guid_free (guid);
g_return_val_if_fail (acc, FALSE); g_return_val_if_fail (acc, FALSE);
if (func) if (func)
@ -314,7 +314,7 @@ set_taxtable (xmlNodePtr node, struct entry_pdata* pdata,
gncTaxTableDecRef (taxtable); gncTaxTableDecRef (taxtable);
func (pdata->entry, taxtable); func (pdata->entry, taxtable);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -339,7 +339,7 @@ entry_guid_handler (xmlNodePtr node, gpointer entry_pdata)
gncEntrySetGUID (pdata->entry, guid); gncEntrySetGUID (pdata->entry, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -579,7 +579,7 @@ entry_order_handler (xmlNodePtr node, gpointer entry_pdata)
gncOrderAddEntry (order, pdata->entry); gncOrderAddEntry (order, pdata->entry);
gncOrderCommitEdit (order); gncOrderCommitEdit (order);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -604,7 +604,7 @@ entry_invoice_handler (xmlNodePtr node, gpointer entry_pdata)
gncInvoiceAddEntry (invoice, pdata->entry); gncInvoiceAddEntry (invoice, pdata->entry);
gncInvoiceCommitEdit (invoice); gncInvoiceCommitEdit (invoice);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -629,7 +629,7 @@ entry_bill_handler (xmlNodePtr node, gpointer entry_pdata)
gncBillAddEntry (invoice, pdata->entry); gncBillAddEntry (invoice, pdata->entry);
gncInvoiceCommitEdit (invoice); gncInvoiceCommitEdit (invoice);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

10
libgnucash/backend/xml/gnc-invoice-xml-v2.cpp
View File

@ -214,7 +214,7 @@ invoice_guid_handler (xmlNodePtr node, gpointer invoice_pdata)
gncInvoiceSetGUID (pdata->invoice, guid); gncInvoiceSetGUID (pdata->invoice, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -296,7 +296,7 @@ invoice_terms_handler (xmlNodePtr node, gpointer invoice_pdata)
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
term = gnc_billterm_xml_find_or_create (pdata->book, guid); term = gnc_billterm_xml_find_or_create (pdata->book, guid);
g_assert (term); g_assert (term);
g_free (guid); guid_free (guid);
gncInvoiceSetTerms (pdata->invoice, term); gncInvoiceSetTerms (pdata->invoice, term);
return TRUE; return TRUE;
@ -312,7 +312,7 @@ invoice_posttxn_handler (xmlNodePtr node, gpointer invoice_pdata)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
txn = xaccTransLookup (guid, pdata->book); txn = xaccTransLookup (guid, pdata->book);
g_free (guid); guid_free (guid);
g_return_val_if_fail (txn, FALSE); g_return_val_if_fail (txn, FALSE);
gncInvoiceSetPostedTxn (pdata->invoice, txn); gncInvoiceSetPostedTxn (pdata->invoice, txn);
@ -329,7 +329,7 @@ invoice_postlot_handler (xmlNodePtr node, gpointer invoice_pdata)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
lot = gnc_lot_lookup (guid, pdata->book); lot = gnc_lot_lookup (guid, pdata->book);
g_free (guid); guid_free (guid);
g_return_val_if_fail (lot, FALSE); g_return_val_if_fail (lot, FALSE);
gncInvoiceSetPostedLot (pdata->invoice, lot); gncInvoiceSetPostedLot (pdata->invoice, lot);
@ -346,7 +346,7 @@ invoice_postacc_handler (xmlNodePtr node, gpointer invoice_pdata)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
acc = xaccAccountLookup (guid, pdata->book); acc = xaccAccountLookup (guid, pdata->book);
g_free (guid); guid_free (guid);
g_return_val_if_fail (acc, FALSE); g_return_val_if_fail (acc, FALSE);
gncInvoiceSetPostedAcc (pdata->invoice, acc); gncInvoiceSetPostedAcc (pdata->invoice, acc);

2
libgnucash/backend/xml/gnc-job-xml-v2.cpp
View File

@ -146,7 +146,7 @@ job_guid_handler (xmlNodePtr node, gpointer job_pdata)
gncJobSetGUID (pdata->job, guid); gncJobSetGUID (pdata->job, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

2
libgnucash/backend/xml/gnc-lot-xml-v2.cpp
View File

@ -91,7 +91,7 @@ lot_id_handler (xmlNodePtr node, gpointer p)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
gnc_lot_set_guid (pdata->lot, *guid); gnc_lot_set_guid (pdata->lot, *guid);
g_free (guid); guid_free (guid);
LEAVE (""); LEAVE ("");
return TRUE; return TRUE;

2
libgnucash/backend/xml/gnc-order-xml-v2.cpp
View File

@ -161,7 +161,7 @@ order_guid_handler (xmlNodePtr node, gpointer order_pdata)
gncOrderSetGUID (pdata->order, guid); gncOrderSetGUID (pdata->order, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

4
libgnucash/backend/xml/gnc-owner-xml-v2.cpp
View File

@ -182,11 +182,11 @@ owner_id_handler (xmlNodePtr node, gpointer owner_pdata)
} }
default: default:
PWARN ("Invalid owner type: %d\n", gncOwnerGetType (pdata->owner)); PWARN ("Invalid owner type: %d\n", gncOwnerGetType (pdata->owner));
g_free (guid); guid_free (guid);
return FALSE; return FALSE;
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

2
libgnucash/backend/xml/gnc-pricedb-xml-v2.cpp
View File

@ -97,7 +97,7 @@ price_parse_xml_sub_node (GNCPrice* p, xmlNodePtr sub_node, QofBook* book)
GncGUID* c = dom_tree_to_guid (sub_node); GncGUID* c = dom_tree_to_guid (sub_node);
if (!c) return FALSE; if (!c) return FALSE;
gnc_price_set_guid (p, c); gnc_price_set_guid (p, c);
g_free (c); guid_free (c);
} }
else if (g_strcmp0 ("price:commodity", (char*)sub_node->name) == 0) else if (g_strcmp0 ("price:commodity", (char*)sub_node->name) == 0)
{ {

2
libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp
View File

@ -593,7 +593,7 @@ sx_templ_acct_handler (xmlNodePtr node, gpointer sx_pdata)
account = xaccAccountLookup (templ_acct_guid, pdata->book); account = xaccAccountLookup (templ_acct_guid, pdata->book);
sx_set_template_account (sx, account); sx_set_template_account (sx, account);
g_free (templ_acct_guid); guid_free (templ_acct_guid);
return TRUE; return TRUE;
} }

6
libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp
View File

@ -155,7 +155,7 @@ ttentry_acct_handler (xmlNodePtr node, gpointer ttentry_pdata)
guid = dom_tree_to_guid (node); guid = dom_tree_to_guid (node);
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
acc = xaccAccountLookup (guid, pdata->book); acc = xaccAccountLookup (guid, pdata->book);
g_free (guid); guid_free (guid);
g_return_val_if_fail (acc, FALSE); g_return_val_if_fail (acc, FALSE);
gncTaxTableEntrySetAccount (pdata->ttentry, acc); gncTaxTableEntrySetAccount (pdata->ttentry, acc);
@ -257,7 +257,7 @@ set_parent_child (xmlNodePtr node, struct taxtable_pdata* pdata,
gncTaxTableSetGUID (table, guid); gncTaxTableSetGUID (table, guid);
gncTaxTableCommitEdit (table); gncTaxTableCommitEdit (table);
} }
g_free (guid); guid_free (guid);
g_return_val_if_fail (table, FALSE); g_return_val_if_fail (table, FALSE);
func (pdata->table, table); func (pdata->table, table);
@ -285,7 +285,7 @@ taxtable_guid_handler (xmlNodePtr node, gpointer taxtable_pdata)
gncTaxTableSetGUID (pdata->table, guid); gncTaxTableSetGUID (pdata->table, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

8
libgnucash/backend/xml/gnc-transaction-xml-v2.cpp
View File

@ -237,7 +237,7 @@ spl_id_handler (xmlNodePtr node, gpointer data)
xaccSplitSetGUID (pdata->split, tmp); xaccSplitSetGUID (pdata->split, tmp);
g_free (tmp); guid_free (tmp);
return TRUE; return TRUE;
} }
@ -316,7 +316,7 @@ spl_account_handler (xmlNodePtr node, gpointer data)
xaccAccountInsertSplit (account, pdata->split); xaccAccountInsertSplit (account, pdata->split);
g_free (id); guid_free (id);
return TRUE; return TRUE;
} }
@ -340,7 +340,7 @@ spl_lot_handler (xmlNodePtr node, gpointer data)
gnc_lot_add_split (lot, pdata->split); gnc_lot_add_split (lot, pdata->split);
g_free (id); guid_free (id);
return TRUE; return TRUE;
} }
@ -455,7 +455,7 @@ trn_id_handler (xmlNodePtr node, gpointer trans_pdata)
xaccTransSetGUID ((Transaction*)trn, tmp); xaccTransSetGUID ((Transaction*)trn, tmp);
g_free (tmp); guid_free (tmp);
return TRUE; return TRUE;
} }

6
libgnucash/backend/xml/gnc-vendor-xml-v2.cpp
View File

@ -190,7 +190,7 @@ vendor_guid_handler (xmlNodePtr node, gpointer vendor_pdata)
gncVendorSetGUID (pdata->vendor, guid); gncVendorSetGUID (pdata->vendor, guid);
} }
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }
@ -222,7 +222,7 @@ vendor_terms_handler (xmlNodePtr node, gpointer vendor_pdata)
g_return_val_if_fail (guid, FALSE); g_return_val_if_fail (guid, FALSE);
term = gnc_billterm_xml_find_or_create (pdata->book, guid); term = gnc_billterm_xml_find_or_create (pdata->book, guid);
g_assert (term); g_assert (term);
g_free (guid); guid_free (guid);
gncVendorSetTerms (pdata->vendor, term); gncVendorSetTerms (pdata->vendor, term);
return TRUE; return TRUE;
@ -298,7 +298,7 @@ vendor_taxtable_handler (xmlNodePtr node, gpointer vendor_pdata)
gncTaxTableDecRef (taxtable); gncTaxTableDecRef (taxtable);
gncVendorSetTaxTable (pdata->vendor, taxtable); gncVendorSetTaxTable (pdata->vendor, taxtable);
g_free (guid); guid_free (guid);
return TRUE; return TRUE;
} }

2
libgnucash/backend/xml/test/test-dom-converters1.cpp
View File

@ -251,7 +251,7 @@ test_dom_tree_to_guid (void)
xmlFreeNode (test_node); xmlFreeNode (test_node);
g_free (test_guid1); g_free (test_guid1);
g_free (test_guid2); guid_free (test_guid2);
} }
} }

4
libgnucash/backend/xml/test/test-file-stuff.cpp
View File

@ -209,12 +209,12 @@ equals_node_val_vs_guid (xmlNodePtr node, const GncGUID* id)
if (guid_compare (cmpid, id) == 0) if (guid_compare (cmpid, id) == 0)
{ {
g_free (cmpid); guid_free (cmpid);
return TRUE; return TRUE;
} }
else else
{ {
g_free (cmpid); guid_free (cmpid);
return FALSE; return FALSE;
} }
} }

10
libgnucash/backend/xml/test/test-xml-transaction.cpp
View File

@ -90,7 +90,7 @@ find_appropriate_node (xmlNodePtr node, Split* spl)
{ {
account_guid_good = TRUE; account_guid_good = TRUE;
} }
g_free (accid); guid_free (accid);
} }
if (account_guid_good && amount_good) if (account_guid_good && amount_good)
@ -116,10 +116,10 @@ equals_node_val_vs_split_internal (xmlNodePtr node, Split* spl)
if (!guid_equal (id, xaccSplitGetGUID (spl))) if (!guid_equal (id, xaccSplitGetGUID (spl)))
{ {
g_free (id); guid_free (id);
return "ids differ"; return "ids differ";
} }
g_free (id); guid_free (id);
} }
else if (g_strcmp0 ((char*)mark->name, "split:memo") == 0) else if (g_strcmp0 ((char*)mark->name, "split:memo") == 0)
{ {
@ -191,10 +191,10 @@ equals_node_val_vs_split_internal (xmlNodePtr node, Split* spl)
if (!guid_equal (id, xaccAccountGetGUID (account))) if (!guid_equal (id, xaccAccountGetGUID (account)))
{ {
g_free (id); guid_free (id);
return "accounts differ"; return "accounts differ";
} }
g_free (id); guid_free (id);
} }
} }
return NULL; return NULL;

12
libgnucash/scm/utilities.scm
View File

@ -211,14 +211,14 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; flattens an arbitrary deep nested list into simple list. this is ;; flattens an arbitrary deep nested list into simple list. this is
;; probably the most efficient algorithm available. '(1 2 (3 4)) --> ;; probably the most efficient algorithm available. '(1 2 (3 4)) -->
;; '(1 2 3 4) ;; '(1 2 3 4) thanks to manumanumanu on #guile
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (gnc:list-flatten . lst) (define (gnc:list-flatten . lst)
(reverse (let loop ((lst lst) (acc '()))
(let lp ((e lst) (accum '())) (cond
(if (list? e) ((null? lst) acc)
(fold lp accum e) ((pair? lst) (loop (car lst) (loop (cdr lst) acc)))
(cons e accum))))) (else (cons lst acc)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; compatibility hack for fixing guile-2.0 string handling. this code ;; compatibility hack for fixing guile-2.0 string handling. this code