diff --git a/gnucash/gnome-utils/gnc-query-view.c b/gnucash/gnome-utils/gnc-query-view.c index 03c3ac9c67..683b078fef 100644 --- a/gnucash/gnome-utils/gnc-query-view.c +++ b/gnucash/gnome-utils/gnc-query-view.c @@ -63,7 +63,8 @@ static guint query_view_signals[LAST_SIGNAL] = {0}; static void gnc_query_view_init (GNCQueryView *qview); static void gnc_query_view_init_view (GNCQueryView *qview); static void gnc_query_view_class_init (GNCQueryViewClass *klass); -static void gnc_query_view_select_row_cb (GtkTreeSelection *selection, gpointer user_data); +static void gnc_query_view_select_row_cb (GtkTreeSelection *selection, + gpointer user_data); static void gnc_query_view_toggled_cb (GtkCellRendererToggle *cell_renderer, gchar *path, gpointer user_data); static void gnc_query_view_double_click_cb (GtkTreeView *tree_view, @@ -73,7 +74,8 @@ static void gnc_query_view_double_click_cb (GtkTreeView *tree_view, static void gnc_query_view_destroy (GtkWidget *widget); static void gnc_query_view_fill (GNCQueryView *qview); -static void gnc_query_view_set_query_sort (GNCQueryView *qview, gboolean new_column); +static void gnc_query_view_set_query_sort (GNCQueryView *qview, + gboolean new_column); /********************************************************************\ @@ -99,9 +101,9 @@ gnc_query_view_construct (GNCQueryView *qview, GList *param_list, Query *query) qview->column_params = param_list; /* cache the function to get the guid of this query type */ - priv = GNC_QUERY_VIEW_GET_PRIVATE (qview); - priv->get_guid = - qof_class_get_parameter (qof_query_get_search_for (query), QOF_PARAM_GUID); + priv = GNC_QUERY_VIEW_GET_PRIVATE(qview); + priv->get_guid = qof_class_get_parameter (qof_query_get_search_for (query), + QOF_PARAM_GUID); /* Initialize the Tree View */ gnc_query_view_init_view (qview); @@ -125,10 +127,10 @@ gnc_query_view_new (GList *param_list, Query *query) /* Add 1 to param_list length for extra pointer column */ columns = g_list_length (param_list) + 1; - qview = GNC_QUERY_VIEW (g_object_new (gnc_query_view_get_type(), NULL)); + qview = GNC_QUERY_VIEW(g_object_new (gnc_query_view_get_type (), NULL)); - array_size = sizeof( GType ) * columns; - types = g_slice_alloc ( array_size ); + array_size = sizeof(GType) * columns; + types = g_slice_alloc (array_size); types[0] = G_TYPE_POINTER; @@ -138,7 +140,8 @@ gnc_query_view_new (GList *param_list, Query *query) GNCSearchParamSimple *param = node->data; const char *type; - g_assert (GNC_IS_SEARCH_PARAM_SIMPLE (param)); + g_assert (GNC_IS_SEARCH_PARAM_SIMPLE(param)); + type = gnc_search_param_get_param_type ((GNCSearchParam *) param); if (g_strcmp0 (type, QOF_TYPE_BOOLEAN) == 0) @@ -149,23 +152,22 @@ gnc_query_view_new (GList *param_list, Query *query) /* Create the list store and add to treeview */ liststore = gtk_list_store_newv (columns, types ); - gtk_tree_view_set_model (GTK_TREE_VIEW (qview), GTK_TREE_MODEL (liststore)); + gtk_tree_view_set_model (GTK_TREE_VIEW(qview), GTK_TREE_MODEL(liststore)); g_object_unref (liststore); /* Free array */ - g_slice_free1( array_size, types ); + g_slice_free1 (array_size, types); gnc_query_view_construct (qview, param_list, query); - return GTK_WIDGET (qview); + return GTK_WIDGET(qview); } - void gnc_query_view_reset_query (GNCQueryView *qview, Query *query) { g_return_if_fail (qview); g_return_if_fail (query); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); qof_query_destroy (qview->query); qview->query = qof_query_copy (query); @@ -173,13 +175,12 @@ void gnc_query_view_reset_query (GNCQueryView *qview, Query *query) gnc_query_view_set_query_sort (qview, TRUE); } - static void gnc_query_view_refresh_handler (GHashTable *changes, gpointer user_data) { GNCQueryView *qview = (GNCQueryView *)user_data; g_return_if_fail (qview); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); gnc_query_view_set_query_sort (qview, TRUE); } @@ -205,25 +206,22 @@ gnc_query_view_init (GNCQueryView *qview) qview->numeric_abs = FALSE; qview->numeric_inv_sort = FALSE; - priv = GNC_QUERY_VIEW_GET_PRIVATE (qview); - priv->component_id = - gnc_register_gui_component ("gnc-query-view-cm-class", - gnc_query_view_refresh_handler, - NULL, qview); + priv = GNC_QUERY_VIEW_GET_PRIVATE(qview); + priv->component_id = gnc_register_gui_component ("gnc-query-view-cm-class", + gnc_query_view_refresh_handler, + NULL, qview); } - static gint sort_iter_compare_func (GtkTreeModel *model, - GtkTreeIter *a, - GtkTreeIter *b, - gpointer userdata) + GtkTreeIter *a, + GtkTreeIter *b, + gpointer userdata) { /* This is really a dummy sort function, it leaves the list as is. */ return 0; } - /********************************************************************\ * gnc_query_sort_order * * allows the sort order to be specified * @@ -233,15 +231,15 @@ sort_iter_compare_func (GtkTreeModel *model, * order - GTK_SORT_ASCENDING or GTK_SORT_DESCENDING * \********************************************************************/ void -gnc_query_sort_order ( GNCQueryView *qview, gint column, GtkSortType order) +gnc_query_sort_order (GNCQueryView *qview, gint column, GtkSortType order) { GtkTreeSortable *sortable; gint sortcol; g_return_if_fail (qview != NULL); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); - sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (qview))); + sortable = GTK_TREE_SORTABLE(gtk_tree_view_get_model (GTK_TREE_VIEW(qview))); if((column > qview->num_columns) || (column == 0) ) sortcol = 1; @@ -251,17 +249,16 @@ gnc_query_sort_order ( GNCQueryView *qview, gint column, GtkSortType order) gtk_tree_sortable_set_sort_column_id (sortable, sortcol, order); } - static void gnc_query_sort_cb (GtkTreeSortable *sortable, gpointer user_data) { - GNCQueryView *qview = GNC_QUERY_VIEW (user_data); + GNCQueryView *qview = GNC_QUERY_VIEW(user_data); GtkSortType type; gint sortcol; gboolean new_column = FALSE; g_return_if_fail (qview != NULL); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); g_return_if_fail (qview->query != NULL); gtk_tree_sortable_get_sort_column_id (sortable, &sortcol, &type); @@ -284,11 +281,10 @@ gnc_query_sort_cb (GtkTreeSortable *sortable, gpointer user_data) gnc_query_view_set_query_sort (qview, new_column); } - static void gnc_query_view_init_view (GNCQueryView *qview) { - GtkTreeView *view = GTK_TREE_VIEW (qview); + GtkTreeView *view = GTK_TREE_VIEW(qview); GtkTreeSortable *sortable; GtkTreeSelection *selection; GtkTreeViewColumn *col; @@ -296,7 +292,7 @@ gnc_query_view_init_view (GNCQueryView *qview) GList *node; gint i; - sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (view))); + sortable = GTK_TREE_SORTABLE(gtk_tree_view_get_model (GTK_TREE_VIEW(view))); /* compute the number of columns and fill in the rest of the view */ qview->num_columns = g_list_length (qview->column_params); @@ -310,7 +306,7 @@ gnc_query_view_init_view (GNCQueryView *qview) gfloat algn = 0; GNCSearchParamSimple *param = node->data; - g_assert (GNC_IS_SEARCH_PARAM_SIMPLE (param)); + g_assert (GNC_IS_SEARCH_PARAM_SIMPLE(param)); col = gtk_tree_view_column_new (); @@ -351,8 +347,9 @@ gnc_query_view_init_view (GNCQueryView *qview) gtk_tree_view_column_set_clickable (col, TRUE); /* Add sortable columns */ gtk_tree_view_column_set_sort_column_id (col, i+1); - gtk_tree_sortable_set_sort_func (sortable, i+1, sort_iter_compare_func, - GINT_TO_POINTER (i+1), NULL); + gtk_tree_sortable_set_sort_func (sortable, i+1, + sort_iter_compare_func, + GINT_TO_POINTER(i+1), NULL); } type = gnc_search_param_get_param_type (((GNCSearchParam *) param)); @@ -364,9 +361,10 @@ gnc_query_view_init_view (GNCQueryView *qview) /* pack cell renderer toggle into tree view column */ gtk_tree_view_column_pack_start (col, renderer, TRUE); gtk_tree_view_column_add_attribute (col, renderer, "active", i+1); - g_object_set (renderer, "xalign", algn, NULL ); - g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i+1) ); - g_signal_connect (renderer, "toggled", G_CALLBACK (gnc_query_view_toggled_cb), view); + g_object_set (renderer, "xalign", algn, NULL); + g_object_set_data (G_OBJECT(renderer), "column", GINT_TO_POINTER(i+1)); + g_signal_connect (renderer, "toggled", + G_CALLBACK(gnc_query_view_toggled_cb), view); } else { @@ -375,8 +373,8 @@ gnc_query_view_init_view (GNCQueryView *qview) /* pack cell renderer text into tree view column */ gtk_tree_view_column_pack_start (col, renderer, TRUE); gtk_tree_view_column_add_attribute (col, renderer, "text", i+1); - g_object_set (renderer, "xalign", algn, NULL ); - g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (i+1) ); + g_object_set (renderer, "xalign", algn, NULL); + g_object_set_data (G_OBJECT(renderer), "column", GINT_TO_POINTER(i+1)); } } @@ -385,20 +383,19 @@ gnc_query_view_init_view (GNCQueryView *qview) gtk_tree_sortable_set_sort_column_id (sortable, 1, GTK_SORT_DESCENDING); g_signal_connect (sortable, "sort-column-changed", - G_CALLBACK (gnc_query_sort_cb), + G_CALLBACK(gnc_query_sort_cb), view); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view)); g_signal_connect (selection, "changed", - G_CALLBACK (gnc_query_view_select_row_cb), + G_CALLBACK(gnc_query_view_select_row_cb), NULL); g_signal_connect (view, "row-activated", - G_CALLBACK (gnc_query_view_double_click_cb), + G_CALLBACK(gnc_query_view_double_click_cb), NULL); } - static void gnc_query_view_class_init (GNCQueryViewClass *klass) { @@ -408,9 +405,9 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) query_view_signals[COLUMN_TOGGLED] = g_signal_new("column_toggled", - G_TYPE_FROM_CLASS (widget_class), + G_TYPE_FROM_CLASS(widget_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GNCQueryViewClass, column_toggled), + G_STRUCT_OFFSET(GNCQueryViewClass, column_toggled), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, @@ -419,9 +416,9 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) query_view_signals[ROW_SELECTED] = g_signal_new("row_selected", - G_TYPE_FROM_CLASS (widget_class), + G_TYPE_FROM_CLASS(widget_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GNCQueryViewClass, row_selected), + G_STRUCT_OFFSET(GNCQueryViewClass, row_selected), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, @@ -430,9 +427,9 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) query_view_signals[DOUBLE_CLICK_ENTRY] = g_signal_new("double_click_entry", - G_TYPE_FROM_CLASS (widget_class), + G_TYPE_FROM_CLASS(widget_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GNCQueryViewClass, double_click_entry), + G_STRUCT_OFFSET(GNCQueryViewClass, double_click_entry), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, @@ -446,18 +443,16 @@ gnc_query_view_class_init (GNCQueryViewClass *klass) klass->double_click_entry = NULL; } - static void gnc_query_view_select_row_cb (GtkTreeSelection *selection, gpointer user_data) { - GNCQueryView *qview = GNC_QUERY_VIEW (gtk_tree_selection_get_tree_view (selection)); + GNCQueryView *qview = GNC_QUERY_VIEW(gtk_tree_selection_get_tree_view (selection)); gint number_of_rows = gtk_tree_selection_count_selected_rows (selection); g_signal_emit (qview, query_view_signals[ROW_SELECTED], 0, GINT_TO_POINTER(number_of_rows)); } - static void gnc_query_view_double_click_cb (GtkTreeView *view, GtkTreePath *path, @@ -469,7 +464,7 @@ gnc_query_view_double_click_cb (GtkTreeView *view, GtkTreeIter iter; gpointer entry = NULL; - model = gtk_tree_view_get_model (GTK_TREE_VIEW (view)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(view)); if (gtk_tree_model_get_iter (model, &iter, path)) gtk_tree_model_get (model, &iter, 0, &entry, -1); @@ -477,13 +472,12 @@ gnc_query_view_double_click_cb (GtkTreeView *view, g_signal_emit (qview, query_view_signals[DOUBLE_CLICK_ENTRY], 0, entry); } - static void gnc_query_view_toggled_cb (GtkCellRendererToggle *cell_renderer, gchar *path, gpointer user_data) { - GNCQueryView *qview = GNC_QUERY_VIEW (user_data); + GNCQueryView *qview = GNC_QUERY_VIEW(user_data); GtkTreeModel *model; GtkTreeIter iter; GtkTreePath *treepath; @@ -492,15 +486,15 @@ gnc_query_view_toggled_cb (GtkCellRendererToggle *cell_renderer, gboolean toggled; gint column; - model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(qview)); - column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell_renderer),"column")); + column = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(cell_renderer), "column")); toggled = gtk_cell_renderer_toggle_get_active (cell_renderer); treepath = gtk_tree_path_new_from_string (path); - if (gtk_tree_model_get_iter(model, &iter, treepath)) + if (gtk_tree_model_get_iter (model, &iter, treepath)) { gtk_tree_model_get (model, &iter, 0, &entry, -1); indices = gtk_tree_path_get_indices (treepath); @@ -512,16 +506,16 @@ gnc_query_view_toggled_cb (GtkCellRendererToggle *cell_renderer, else g_signal_emit (qview, query_view_signals[COLUMN_TOGGLED], 0, GINT_TO_POINTER(1)); } + gtk_tree_path_free (treepath); } - static void gnc_query_view_destroy (GtkWidget *widget) { - GNCQueryView *qview = GNC_QUERY_VIEW (widget); + GNCQueryView *qview = GNC_QUERY_VIEW(widget); GNCQueryViewPrivate *priv; - priv = GNC_QUERY_VIEW_GET_PRIVATE (qview); + priv = GNC_QUERY_VIEW_GET_PRIVATE(qview); if (priv->component_id > 0) { gnc_unregister_gui_component (priv->component_id); @@ -534,24 +528,22 @@ gnc_query_view_destroy (GtkWidget *widget) qof_query_destroy (qview->query); qview->query = NULL; } - if (GTK_WIDGET_CLASS (parent_class)->destroy) - GTK_WIDGET_CLASS (parent_class)->destroy (widget); + if (GTK_WIDGET_CLASS(parent_class)->destroy) + GTK_WIDGET_CLASS(parent_class)->destroy (widget); } - gint gnc_query_view_get_num_entries (GNCQueryView *qview) { GtkTreeModel *model; g_return_val_if_fail (qview != NULL, 0); - g_return_val_if_fail (GNC_IS_QUERY_VIEW (qview), 0); + g_return_val_if_fail (GNC_IS_QUERY_VIEW(qview), 0); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(qview)); return gtk_tree_model_iter_n_children (model, NULL); } - gpointer gnc_query_view_get_selected_entry (GNCQueryView *qview) { @@ -560,7 +552,7 @@ gnc_query_view_get_selected_entry (GNCQueryView *qview) gint num_entries = 0; g_return_val_if_fail (qview != NULL, NULL); - g_return_val_if_fail (GNC_IS_QUERY_VIEW (qview), NULL); + g_return_val_if_fail (GNC_IS_QUERY_VIEW(qview), NULL); entries = gnc_query_view_get_selected_entry_list (qview); if (entries) @@ -602,17 +594,16 @@ gnc_query_view_get_selected_entry_list (GNCQueryView *qview) GList *entries = NULL; g_return_val_if_fail (qview != NULL, NULL); - g_return_val_if_fail (GNC_IS_QUERY_VIEW (qview), NULL); + g_return_val_if_fail (GNC_IS_QUERY_VIEW(qview), NULL); acc_entries.entries = NULL; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(qview)); gtk_tree_selection_selected_foreach (selection, accumulate_entries, &acc_entries); acc_entries.entries = g_list_reverse (acc_entries.entries); return acc_entries.entries; } - static void gnc_query_view_refresh_selected (GNCQueryView *qview, GList *old_entry) { @@ -623,15 +614,15 @@ gnc_query_view_refresh_selected (GNCQueryView *qview, GList *old_entry) gboolean valid; g_return_if_fail (qview != NULL); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(qview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(qview)); - if(g_list_length (old_entry) > 0) + if (g_list_length (old_entry) > 0) { /* Walk the list of old entries */ - for(node = old_entry; node; node = node->next) + for (node = old_entry; node; node = node->next) { gpointer pointer; @@ -642,7 +633,7 @@ gnc_query_view_refresh_selected (GNCQueryView *qview, GList *old_entry) // Walk through the liststore, reading each row gtk_tree_model_get (model, &iter, 0, &pointer, -1); - if(pointer == node->data) + if (pointer == node->data) { gtk_tree_selection_select_iter (selection, &iter); break; @@ -653,7 +644,6 @@ gnc_query_view_refresh_selected (GNCQueryView *qview, GList *old_entry) } } - /********************************************************************\ * gnc_query_view_refresh * * refreshes the view * @@ -668,18 +658,17 @@ gnc_query_view_refresh (GNCQueryView *qview) GList *selected_entries; g_return_if_fail (qview != NULL); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); selected_entries = gnc_query_view_get_selected_entry_list (qview); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview)); - gtk_list_store_clear (GTK_LIST_STORE (model)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(qview)); + gtk_list_store_clear (GTK_LIST_STORE(model)); gnc_query_view_fill (qview); gnc_query_view_refresh_selected (qview, selected_entries); g_list_free (selected_entries); } - /********************************************************************\ * gnc_query_view_set_query_sort * * sets the sorting order of entries in the view * @@ -692,14 +681,15 @@ gnc_query_view_refresh (GNCQueryView *qview) static void gnc_query_view_set_query_sort (GNCQueryView *qview, gboolean new_column) { - gboolean sort_order = qview->increasing; - GList *node; + gboolean sort_order = qview->increasing; + GList *node; GNCSearchParamSimple *param; /* Find the column parameter definition */ node = g_list_nth (qview->column_params, qview->sort_column); param = node->data; - g_assert (GNC_IS_SEARCH_PARAM_SIMPLE (param)); + + g_assert (GNC_IS_SEARCH_PARAM_SIMPLE(param)); /* If we're asked to invert numerics, and if this is a numeric or * debred column, then invert the sort order. @@ -730,7 +720,6 @@ gnc_query_view_set_query_sort (GNCQueryView *qview, gboolean new_column) gnc_query_view_refresh (qview); } - /********************************************************************\ * gnc_query_view_fill * * Add all items to the list store * @@ -742,19 +731,19 @@ static void gnc_query_view_fill (GNCQueryView *qview) { GNCQueryViewPrivate *priv; - GtkTreeModel *model; - GtkTreeIter iter; - GList *entries, *item; - const GncGUID *guid; - gint i; + GtkTreeModel *model; + GtkTreeIter iter; + GList *entries, *item; + const GncGUID *guid; + gint i; /* Clear all watches */ - priv = GNC_QUERY_VIEW_GET_PRIVATE (qview); + priv = GNC_QUERY_VIEW_GET_PRIVATE(qview); gnc_gui_component_clear_watches (priv->component_id); entries = qof_query_run (qview->query); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(qview)); for (item = entries; item; item = item->next) { @@ -764,9 +753,9 @@ gnc_query_view_fill (GNCQueryView *qview) QofParam *qp = NULL; /* Add a row to the list store */ - gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_append (GTK_LIST_STORE(model), &iter); /* Add a pointer to the data in the first column of the list store */ - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, item->data, -1); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, 0, item->data, -1); for (i = 0, node = qview->column_params; node; node = node->next) { @@ -777,14 +766,14 @@ gnc_query_view_fill (GNCQueryView *qview) gpointer res = item->data; gchar *qofstring; - g_assert (GNC_IS_SEARCH_PARAM_SIMPLE (param)); + g_assert (GNC_IS_SEARCH_PARAM_SIMPLE(param)); converters = gnc_search_param_get_converters (param); /* Test for boolean type */ if (g_strcmp0 (type, QOF_TYPE_BOOLEAN) == 0) { - result = (gboolean) GPOINTER_TO_INT (gnc_search_param_compute_value (param, res)); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, i + 1, result, -1); + result = (gboolean) GPOINTER_TO_INT(gnc_search_param_compute_value (param, res)); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, i + 1, result, -1); i++; continue; } @@ -798,23 +787,24 @@ gnc_query_view_fill (GNCQueryView *qview) } /* Now convert this to a text value for the row */ - if (qp && (g_strcmp0(type, QOF_TYPE_DEBCRED) == 0 || g_strcmp0(type, QOF_TYPE_NUMERIC) == 0)) + if (qp && (g_strcmp0 (type, QOF_TYPE_DEBCRED) == 0 || + g_strcmp0 (type, QOF_TYPE_NUMERIC) == 0)) { gnc_numeric (*nfcn)(gpointer, QofParam *) = (gnc_numeric(*)(gpointer, QofParam *))(qp->param_getfcn); - gnc_numeric value = nfcn(res, qp); + gnc_numeric value = nfcn (res, qp); if (qview->numeric_abs) value = gnc_numeric_abs (value); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, i + 1, + gtk_list_store_set (GTK_LIST_STORE(model), &iter, i + 1, xaccPrintAmount (value, gnc_default_print_info (FALSE)), -1); } else { qofstring = qof_query_core_to_string (type, res, qp); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, i + 1, qofstring , -1); - g_free(qofstring); + gtk_list_store_set (GTK_LIST_STORE(model), &iter, i + 1, qofstring , -1); + g_free (qofstring); } i++; } @@ -827,7 +817,6 @@ gnc_query_view_fill (GNCQueryView *qview) } } - /********************************************************************\ * gnc_query_view_unselect_all * * unselect all items in the view * @@ -841,13 +830,12 @@ gnc_query_view_unselect_all (GNCQueryView *qview) GtkTreeSelection *selection; g_return_if_fail (qview != NULL); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(qview)); gtk_tree_selection_unselect_all (selection); } - gboolean gnc_query_view_item_in_view (GNCQueryView *qview, gpointer item) { GtkTreeModel *model; @@ -857,9 +845,9 @@ gboolean gnc_query_view_item_in_view (GNCQueryView *qview, gpointer item) g_return_val_if_fail (qview, FALSE); g_return_val_if_fail (item, FALSE); - g_return_val_if_fail (GNC_IS_QUERY_VIEW (qview), FALSE); + g_return_val_if_fail (GNC_IS_QUERY_VIEW(qview), FALSE); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(qview)); valid = gtk_tree_model_get_iter_first (model, &iter); while (valid) @@ -867,7 +855,7 @@ gboolean gnc_query_view_item_in_view (GNCQueryView *qview, gpointer item) // Walk through the list, reading each row gtk_tree_model_get (model, &iter, 0, &pointer, -1); - if(pointer == item) + if (pointer == item) return TRUE; valid = gtk_tree_model_iter_next (model, &iter); @@ -875,12 +863,11 @@ gboolean gnc_query_view_item_in_view (GNCQueryView *qview, gpointer item) return FALSE; } - void gnc_query_view_set_numerics (GNCQueryView *qview, gboolean abs, gboolean inv_sort) { g_return_if_fail (qview); - g_return_if_fail (GNC_IS_QUERY_VIEW (qview)); + g_return_if_fail (GNC_IS_QUERY_VIEW(qview)); qview->numeric_abs = abs; qview->numeric_inv_sort = inv_sort; diff --git a/gnucash/gnome-utils/gnc-query-view.h b/gnucash/gnome-utils/gnc-query-view.h index 9798db0f01..2bf56fe1cc 100644 --- a/gnucash/gnome-utils/gnc-query-view.h +++ b/gnucash/gnome-utils/gnc-query-view.h @@ -29,8 +29,9 @@ #include "Query.h" #ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +extern "C" +{ +#endif /* __cplusplus */ #define GNC_TYPE_QUERY_VIEW (gnc_query_view_get_type ()) #define GNC_QUERY_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_QUERY_VIEW, GNCQueryView) @@ -38,84 +39,84 @@ extern "C" { #define GNC_IS_QUERY_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_QUERY_VIEW) #define GNC_IS_QUERY_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_QUERY_VIEW) - typedef struct _GNCQueryView GNCQueryView; - typedef struct _GNCQueryViewClass GNCQueryViewClass; +typedef struct _GNCQueryView GNCQueryView; +typedef struct _GNCQueryViewClass GNCQueryViewClass; - struct _GNCQueryView - { - GtkTreeView qview; +struct _GNCQueryView +{ + GtkTreeView qview; - /* Query information */ - Query *query; + /* Query information */ + Query *query; - /* Select information */ - gint toggled_row; - gint toggled_column; + /* Select information */ + gint toggled_row; + gint toggled_column; - /* Column information */ - gint num_columns; - GList *column_params; + /* Column information */ + gint num_columns; + GList *column_params; - /* numeric information */ - gboolean numeric_abs; - gboolean numeric_inv_sort; + /* numeric information */ + gboolean numeric_abs; + gboolean numeric_inv_sort; - /* Sorting info */ - gint sort_column; - gboolean increasing; - }; + /* Sorting info */ + gint sort_column; + gboolean increasing; +}; - struct _GNCQueryViewClass - { - GtkTreeViewClass view_class; +struct _GNCQueryViewClass +{ + GtkTreeViewClass view_class; - /* This signal is emitted when a toggle happens, the pointer has - an integer value for the active setting of the toggle */ - void (*column_toggled) (GNCQueryView *qview, gpointer item); + /* This signal is emitted when a toggle happens, the pointer has + an integer value for the active setting of the toggle */ + void (*column_toggled) (GNCQueryView *qview, gpointer item); - /* This signal is emitted when a row is selected, the pointer has - an integer value for the number of rows selected */ - void (*row_selected) (GNCQueryView *qview, gpointer item); + /* This signal is emitted when a row is selected, the pointer has + an integer value for the number of rows selected */ + void (*row_selected) (GNCQueryView *qview, gpointer item); - /* This signal is emitted when a row is double clicked, the pointer has - a pointer to the entry */ - void (*double_click_entry) (GNCQueryView *qview, gpointer entry); - }; + /* This signal is emitted when a row is double clicked, the pointer has + a pointer to the entry */ + void (*double_click_entry) (GNCQueryView *qview, gpointer entry); +}; - /*********************************************************** - * public functions * - ***********************************************************/ +/*********************************************************** + * public functions * + ***********************************************************/ - GType gnc_query_view_get_type (void); +GType gnc_query_view_get_type (void); - /* The param_list remains owned by the caller but is used by the - * query-view; do not destroy it until you destroy this query-view. - * The query will be copied by the query-view so the caller may do - * whatever they want. - */ - GtkWidget * gnc_query_view_new (GList *param_list, Query *query); +/* The param_list remains owned by the caller but is used by the + * query-view; do not destroy it until you destroy this query-view. + * The query will be copied by the query-view so the caller may do + * whatever they want. + */ +GtkWidget * gnc_query_view_new (GList *param_list, Query *query); - void gnc_query_view_construct (GNCQueryView *qview, GList *param_list, Query *query); +void gnc_query_view_construct (GNCQueryView *qview, GList *param_list, Query *query); - void gnc_query_view_reset_query (GNCQueryView *view, Query *query); +void gnc_query_view_reset_query (GNCQueryView *view, Query *query); - void gnc_query_view_set_numerics (GNCQueryView *qview, gboolean abs, gboolean inv_sort); +void gnc_query_view_set_numerics (GNCQueryView *qview, gboolean abs, gboolean inv_sort); - gint gnc_query_view_get_num_entries (GNCQueryView *qview); +gint gnc_query_view_get_num_entries (GNCQueryView *qview); - gpointer gnc_query_view_get_selected_entry (GNCQueryView *qview); +gpointer gnc_query_view_get_selected_entry (GNCQueryView *qview); - /** Returns a list of selected entries in the query view. - * The returned GList should be freed by the caller */ - GList * gnc_query_view_get_selected_entry_list (GNCQueryView *qview); +/** Returns a list of selected entries in the query view. + * The returned GList should be freed by the caller */ +GList * gnc_query_view_get_selected_entry_list (GNCQueryView *qview); - void gnc_query_view_refresh (GNCQueryView *qview); +void gnc_query_view_refresh (GNCQueryView *qview); - void gnc_query_view_unselect_all (GNCQueryView *qview); +void gnc_query_view_unselect_all (GNCQueryView *qview); - gboolean gnc_query_view_item_in_view (GNCQueryView *qview, gpointer item); +gboolean gnc_query_view_item_in_view (GNCQueryView *qview, gpointer item); - void gnc_query_sort_order (GNCQueryView *qview, gint column, GtkSortType order); +void gnc_query_sort_order (GNCQueryView *qview, gint column, GtkSortType order); #ifdef __cplusplus }