gnucash stable: Multiple changes pushed
Robert Fewell
bobit at code.gnucash.org
Wed Nov 15 05:20:20 EST 2023
Updated via https://github.com/Gnucash/gnucash/commit/8466efc0 (commit)
via https://github.com/Gnucash/gnucash/commit/5df19f49 (commit)
via https://github.com/Gnucash/gnucash/commit/631ac2b3 (commit)
from https://github.com/Gnucash/gnucash/commit/c4ccde69 (commit)
commit 8466efc06d4253689bc008d7f078e6e137fd8270
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Wed Nov 15 10:12:20 2023 +0000
Change default column for SX list tree view
As the tree view is based on the GNC_TREE_VIEW, if the pref_name of a
column is "name" it should also be the default sort column. This is
because the default column for GNC_TREE_VIEW is "name" and when saving
state information, 'gnc_tree_view_save_state' will only save non
default values where possible.
In this case if the name column is selected to be default, no entries
are saved in the gcm file and hence the on next load 'next occurrence'
will be used as the default.
diff --git a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
index 19fd984344..a242d63540 100644
--- a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
+++ b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
@@ -459,7 +459,7 @@ gnc_sx_list_tree_model_adapter_init (GncSxListTreeModelAdapter *adapter)
_next_occur_comparator, adapter, NULL);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(adapter->real),
- SXLTMA_COL_NEXT_OCCUR, GTK_SORT_ASCENDING);
+ SXLTMA_COL_NAME, GTK_SORT_ASCENDING);
g_signal_connect (adapter->real, "row-changed",
G_CALLBACK(gsltma_proxy_row_changed), adapter);
commit 5df19f498505082d7bf7c85e521865a2ef47f288
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Wed Nov 15 10:10:14 2023 +0000
Realign source files gnc-tree-view-sx-list.*
diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.c b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
index 8e1f429815..32d17adb35 100644
--- a/gnucash/gnome-utils/gnc-tree-view-sx-list.c
+++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.c
@@ -4,19 +4,20 @@
**/
/********************************************************************
* This program is free software; you can redistribute it and/or *
- * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the *
+ * GNU General Public *
* License as published by the Free Software Foundation. *
- *
- * As a special exception, permission is granted to link the binary
- * module resultant from this code with the OpenSSL project's
- * "OpenSSL" library (or modified versions of it that use the same
- * license as the "OpenSSL" library), and distribute the linked
- * executable. You must obey the GNU General Public License in all
- * respects for all of the code used other than "OpenSSL". If you
- * modify this file, you may extend this exception to your version
- * of the file, but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version
- * of this file.
+ * *
+ * As a special exception, permission is granted to link the binary *
+ * module resultant from this code with the OpenSSL project's *
+ * "OpenSSL" library (or modified versions of it that use the same *
+ * license as the "OpenSSL" library), and distribute the linked *
+ * executable. You must obey the GNU General Public License in all *
+ * respects for all of the code used other than "OpenSSL". If you *
+ * modify this file, you may extend this exception to your version *
+ * of the file, but you are not obligated to do so. If you do not *
+ * wish to do so, delete this exception statement from your version *
+ * of this file. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@ -47,8 +48,8 @@ static QofLogModule log_module = LOG_MOD;
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN LOG_MOD
-static void gnc_tree_view_sx_list_dispose(GObject *object);
-static void gnc_tree_view_sx_list_finalize(GObject *object);
+static void gnc_tree_view_sx_list_dispose (GObject *object);
+static void gnc_tree_view_sx_list_finalize (GObject *object);
struct _GncTreeViewSxList
{
@@ -61,12 +62,9 @@ struct _GncTreeViewSxList
G_DEFINE_TYPE(GncTreeViewSxList, gnc_tree_view_sx_list, GNC_TYPE_TREE_VIEW)
static void
-gnc_tree_view_sx_list_class_init(GncTreeViewSxListClass *klass)
+gnc_tree_view_sx_list_class_init (GncTreeViewSxListClass *klass)
{
- GObjectClass *o_class;
-
-
- o_class = G_OBJECT_CLASS (klass);
+ GObjectClass *o_class = G_OBJECT_CLASS(klass);
o_class->dispose = gnc_tree_view_sx_list_dispose;
o_class->finalize = gnc_tree_view_sx_list_finalize;
@@ -79,81 +77,81 @@ gnc_tree_view_sx_list_init (GncTreeViewSxList *view)
}
static void
-gnc_tree_view_sx_list_dispose(GObject *object)
+gnc_tree_view_sx_list_dispose (GObject *object)
{
GncTreeViewSxList *view;
gnc_leave_return_if_fail (object != NULL);
- gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_SX_LIST (object));
+ gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_SX_LIST(object));
- view = GNC_TREE_VIEW_SX_LIST (object);
+ view = GNC_TREE_VIEW_SX_LIST(object);
if (view->disposed)
return;
view->disposed = TRUE;
- g_object_unref(G_OBJECT(view->tree_model));
+ g_object_unref (G_OBJECT(view->tree_model));
view->tree_model = NULL;
- G_OBJECT_CLASS (gnc_tree_view_sx_list_parent_class)->dispose (object);
+ G_OBJECT_CLASS(gnc_tree_view_sx_list_parent_class)->dispose (object);
}
static void
gnc_tree_view_sx_list_finalize(GObject *object)
{
- gnc_leave_return_if_fail(object != NULL);
- gnc_leave_return_if_fail(GNC_IS_TREE_VIEW_SX_LIST (object));
+ gnc_leave_return_if_fail (object != NULL);
+ gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_SX_LIST(object));
G_OBJECT_CLASS(gnc_tree_view_sx_list_parent_class)->finalize (object);
}
GtkTreeView*
-gnc_tree_view_sx_list_new(GncSxInstanceModel *sx_instances)
+gnc_tree_view_sx_list_new (GncSxInstanceModel *sx_instances)
{
- GncTreeViewSxList *view = (GncTreeViewSxList*)g_object_new(GNC_TYPE_TREE_VIEW_SX_LIST, NULL);
- g_object_set(view, "name", "gnc-id-sx-list-tree", NULL);
-
- view->tree_model = GTK_TREE_MODEL(gnc_sx_list_tree_model_adapter_new(sx_instances));
- gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL(view->tree_model));
-
- GtkTreeViewColumn *col = gnc_tree_view_add_text_column(GNC_TREE_VIEW(view), _("Name"), "name", NULL,
- "Semi-Monthly Paycheck",
- SXLTMA_COL_NAME, -1, NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
-
- col = gnc_tree_view_add_toggle_column(GNC_TREE_VIEW(view), _("Enabled"),
- C_("Single-character short column-title form of 'Enabled'", "E"),
- "enabled", SXLTMA_COL_ENABLED,
- GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
- NULL, NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
-
- col = gnc_tree_view_add_text_column(GNC_TREE_VIEW(view), _("Frequency"), "frequency", NULL,
- "Weekly (x3): -------",
- SXLTMA_COL_FREQUENCY, -1, NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
-
- col = gnc_tree_view_add_text_column(GNC_TREE_VIEW(view), _("Last Occur"), "last-occur", NULL,
- "2007-01-02",
- SXLTMA_COL_LAST_OCCUR, -1, NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
-
- col = gnc_tree_view_add_text_column(GNC_TREE_VIEW(view), _("Next Occur"), "next-occur", NULL,
- "2007-01-02",
- SXLTMA_COL_NEXT_OCCUR, -1, NULL);
- g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
-
- gnc_tree_view_configure_columns(GNC_TREE_VIEW(view));
-
- gtk_widget_show(GTK_WIDGET(view));
+ GncTreeViewSxList *view = (GncTreeViewSxList*)g_object_new (GNC_TYPE_TREE_VIEW_SX_LIST, NULL);
+ g_object_set (view, "name", "gnc-id-sx-list-tree", NULL);
+
+ view->tree_model = GTK_TREE_MODEL(gnc_sx_list_tree_model_adapter_new (sx_instances));
+ gtk_tree_view_set_model (GTK_TREE_VIEW(view), GTK_TREE_MODEL(view->tree_model));
+
+ GtkTreeViewColumn *col = gnc_tree_view_add_text_column (GNC_TREE_VIEW(view), _("Name"), "name", NULL,
+ "Semi-Monthly Paycheck",
+ SXLTMA_COL_NAME, -1, NULL);
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+
+ col = gnc_tree_view_add_toggle_column (GNC_TREE_VIEW(view), _("Enabled"),
+ C_("Single-character short column-title form of 'Enabled'", "E"),
+ "enabled", SXLTMA_COL_ENABLED,
+ GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+ NULL, NULL);
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+
+ col = gnc_tree_view_add_text_column (GNC_TREE_VIEW(view), _("Frequency"), "frequency", NULL,
+ "Weekly (x3): -------",
+ SXLTMA_COL_FREQUENCY, -1, NULL);
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+
+ col = gnc_tree_view_add_text_column (GNC_TREE_VIEW(view), _("Last Occur"), "last-occur", NULL,
+ "2007-01-02",
+ SXLTMA_COL_LAST_OCCUR, -1, NULL);
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+
+ col = gnc_tree_view_add_text_column (GNC_TREE_VIEW(view), _("Next Occur"), "next-occur", NULL,
+ "2007-01-02",
+ SXLTMA_COL_NEXT_OCCUR, -1, NULL);
+ g_object_set_data (G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+
+ gnc_tree_view_configure_columns (GNC_TREE_VIEW(view));
+
+ gtk_widget_show (GTK_WIDGET(view));
return GTK_TREE_VIEW(view);
}
SchedXaction*
-gnc_tree_view_sx_list_get_sx_from_path(GncTreeViewSxList *view, GtkTreePath *path)
+gnc_tree_view_sx_list_get_sx_from_path (GncTreeViewSxList *view, GtkTreePath *path)
{
GtkTreeIter iter;
- gtk_tree_model_get_iter(GTK_TREE_MODEL(view->tree_model), &iter, path);
+ gtk_tree_model_get_iter (GTK_TREE_MODEL(view->tree_model), &iter, path);
return gnc_sx_list_tree_model_adapter_get_sx_instances(
GNC_SX_LIST_TREE_MODEL_ADAPTER(view->tree_model), &iter)->sx;
}
diff --git a/gnucash/gnome-utils/gnc-tree-view-sx-list.h b/gnucash/gnome-utils/gnc-tree-view-sx-list.h
index 970b4c7098..60627ed038 100644
--- a/gnucash/gnome-utils/gnc-tree-view-sx-list.h
+++ b/gnucash/gnome-utils/gnc-tree-view-sx-list.h
@@ -7,7 +7,8 @@
**/
/********************************************************************
* This program is free software; you can redistribute it and/or *
- * modify it under the terms of version 2 and/or version 3 of the GNU General Public *
+ * modify it under the terms of version 2 and/or version 3 of the *
+ * GNU General Public *
* License as published by the Free Software Foundation. *
* *
* This program is distributed in the hope that it will be useful, *
@@ -37,12 +38,14 @@
G_BEGIN_DECLS
-#define GNC_TYPE_TREE_VIEW_SX_LIST (gnc_tree_view_sx_list_get_type ())
-G_DECLARE_FINAL_TYPE (GncTreeViewSxList, gnc_tree_view_sx_list, GNC, TREE_VIEW_SX_LIST, GncTreeView)
+#define GNC_TYPE_TREE_VIEW_SX_LIST (gnc_tree_view_sx_list_get_type ())
+G_DECLARE_FINAL_TYPE (GncTreeViewSxList, gnc_tree_view_sx_list,
+ GNC, TREE_VIEW_SX_LIST, GncTreeView)
-GtkTreeView* gnc_tree_view_sx_list_new(GncSxInstanceModel *sx_instances);
+GtkTreeView* gnc_tree_view_sx_list_new (GncSxInstanceModel *sx_instances);
-SchedXaction* gnc_tree_view_sx_list_get_sx_from_path(GncTreeViewSxList *view, GtkTreePath *path);
+SchedXaction* gnc_tree_view_sx_list_get_sx_from_path (GncTreeViewSxList *view,
+ GtkTreePath *path);
/** @} */
commit 631ac2b371138019dac325b3b71c88916176a004
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Wed Nov 15 10:09:15 2023 +0000
Realign source files gnc-sx-list-tree-model-adapter.*
diff --git a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
index a1245e8210..19fd984344 100644
--- a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
+++ b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
@@ -66,11 +66,12 @@ static void gnc_sx_list_tree_model_adapter_finalize (GObject *obj);
static guint gnc_sx_list_tree_model_adapter_signals[LAST_SIGNAL] = {0};
-static GncSxInstances* gsltma_get_sx_instances_from_orig_iter (GncSxListTreeModelAdapter *model, GtkTreeIter *orig_iter);
+static GncSxInstances* gsltma_get_sx_instances_from_orig_iter (GncSxListTreeModelAdapter *model,
+ GtkTreeIter *orig_iter);
-G_DEFINE_TYPE_WITH_CODE (GncSxListTreeModelAdapter, gnc_sx_list_tree_model_adapter, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, gsltma_tree_model_interface_init)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_SORTABLE, gsltma_tree_sortable_interface_init))
+G_DEFINE_TYPE_WITH_CODE(GncSxListTreeModelAdapter, gnc_sx_list_tree_model_adapter, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_TREE_MODEL, gsltma_tree_model_interface_init)
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_TREE_SORTABLE, gsltma_tree_sortable_interface_init))
static void
gnc_sx_list_tree_model_adapter_class_init (GncSxListTreeModelAdapterClass *klass)
@@ -81,13 +82,13 @@ gnc_sx_list_tree_model_adapter_class_init (GncSxListTreeModelAdapterClass *klass
obj_class->finalize = gnc_sx_list_tree_model_adapter_finalize;
gnc_sx_list_tree_model_adapter_signals[MODEL_POPULATED] =
- g_signal_new("model_populated",
- G_TYPE_FROM_CLASS(obj_class),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ g_signal_new ("model_populated",
+ G_TYPE_FROM_CLASS(obj_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
static GtkTreeModelFlags
@@ -105,91 +106,103 @@ gsltma_get_n_columns (GtkTreeModel *tree_model)
static GType
gsltma_get_column_type (GtkTreeModel *tree_model, gint index)
{
- return gtk_tree_model_get_column_type (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), index);
+ return gtk_tree_model_get_column_type (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ index);
}
static gboolean
gsltma_get_iter (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreePath *path)
+ GtkTreeIter *iter,
+ GtkTreePath *path)
{
- return gtk_tree_model_get_iter (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter, path);
+ return gtk_tree_model_get_iter (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter, path);
}
static GtkTreePath*
gsltma_get_path (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- return gtk_tree_model_get_path (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_get_path (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter);
}
static void
gsltma_get_value (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gint column,
- GValue *value)
+ GtkTreeIter *iter,
+ gint column,
+ GValue *value)
{
- gtk_tree_model_get_value (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter, column, value);
+ gtk_tree_model_get_value (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter, column, value);
}
static gboolean
gsltma_iter_next (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- return gtk_tree_model_iter_next (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_iter_next (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter);
}
static gboolean
gsltma_iter_children (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *parent)
+ GtkTreeIter *iter,
+ GtkTreeIter *parent)
{
- return gtk_tree_model_iter_children (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter, parent);
+ return gtk_tree_model_iter_children (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter, parent);
}
static gboolean
gsltma_iter_has_child (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- return gtk_tree_model_iter_has_child (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_iter_has_child (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter);
}
static gint
gsltma_iter_n_children (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- return gtk_tree_model_iter_n_children (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_iter_n_children (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter);
}
static gboolean
gsltma_iter_nth_child (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *parent,
- gint n)
+ GtkTreeIter *iter,
+ GtkTreeIter *parent,
+ gint n)
{
- return gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter, parent, n);
+ return gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter, parent, n);
}
static gboolean
gsltma_iter_parent (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *child)
+ GtkTreeIter *iter,
+ GtkTreeIter *child)
{
- return gtk_tree_model_iter_parent (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter, child);
+ return gtk_tree_model_iter_parent (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter, child);
}
static void
gsltma_ref_node (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- gtk_tree_model_ref_node (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ gtk_tree_model_ref_node (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter);
}
static void
gsltma_unref_node (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- gtk_tree_model_unref_node (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ gtk_tree_model_unref_node (GTK_TREE_MODEL(GNC_SX_LIST_TREE_MODEL_ADAPTER(tree_model)->real),
+ iter);
}
static void
@@ -434,20 +447,32 @@ gnc_sx_list_tree_model_adapter_init (GncSxListTreeModelAdapter *adapter)
adapter->real = GTK_TREE_MODEL_SORT(gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(adapter->orig)));
// setup sorting
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_NAME, _name_comparator, adapter, NULL);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_ENABLED, _enabled_comparator, adapter, NULL);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_FREQUENCY, _freq_comparator, adapter, NULL);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_LAST_OCCUR, _last_occur_comparator, adapter, NULL);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_NEXT_OCCUR, _next_occur_comparator, adapter, NULL);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_NEXT_OCCUR, GTK_SORT_ASCENDING);
-
- g_signal_connect (adapter->real, "row-changed", G_CALLBACK(gsltma_proxy_row_changed), adapter);
- g_signal_connect (adapter->real, "row-deleted", G_CALLBACK(gsltma_proxy_row_deleted), adapter);
- g_signal_connect (adapter->real, "row-has-child-toggled", G_CALLBACK(gsltma_proxy_row_has_child_toggled), adapter);
- g_signal_connect (adapter->real, "row-inserted", G_CALLBACK(gsltma_proxy_row_inserted), adapter);
- g_signal_connect (adapter->real, "rows-reordered", G_CALLBACK(gsltma_proxy_rows_reordered), adapter);
-
- g_signal_connect (adapter->real, "sort-column-changed", G_CALLBACK(gsltma_proxy_sort_column_changed), adapter);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_NAME,
+ _name_comparator, adapter, NULL);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_ENABLED,
+ _enabled_comparator, adapter, NULL);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_FREQUENCY,
+ _freq_comparator, adapter, NULL);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_LAST_OCCUR,
+ _last_occur_comparator, adapter, NULL);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(adapter->real), SXLTMA_COL_NEXT_OCCUR,
+ _next_occur_comparator, adapter, NULL);
+
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(adapter->real),
+ SXLTMA_COL_NEXT_OCCUR, GTK_SORT_ASCENDING);
+
+ g_signal_connect (adapter->real, "row-changed",
+ G_CALLBACK(gsltma_proxy_row_changed), adapter);
+ g_signal_connect (adapter->real, "row-deleted",
+ G_CALLBACK(gsltma_proxy_row_deleted), adapter);
+ g_signal_connect (adapter->real, "row-has-child-toggled",
+ G_CALLBACK(gsltma_proxy_row_has_child_toggled), adapter);
+ g_signal_connect (adapter->real, "row-inserted",
+ G_CALLBACK(gsltma_proxy_row_inserted), adapter);
+ g_signal_connect (adapter->real, "rows-reordered",
+ G_CALLBACK(gsltma_proxy_rows_reordered), adapter);
+ g_signal_connect (adapter->real, "sort-column-changed",
+ G_CALLBACK(gsltma_proxy_sort_column_changed), adapter);
}
static void
@@ -527,11 +552,14 @@ gnc_sx_list_tree_model_adapter_new (GncSxInstanceModel *instances)
rtn->instances = instances;
g_object_ref (G_OBJECT(rtn->instances));
- gsltma_populate_tree_store(rtn);
+ gsltma_populate_tree_store (rtn);
- g_signal_connect (G_OBJECT(rtn->instances), "added", (GCallback)gsltma_added_cb, (gpointer)rtn);
- g_signal_connect (G_OBJECT(rtn->instances), "updated", (GCallback)gsltma_updated_cb, (gpointer)rtn);
- g_signal_connect (G_OBJECT(rtn->instances), "removing", (GCallback)gsltma_removing_cb, (gpointer)rtn);
+ g_signal_connect (G_OBJECT(rtn->instances), "added",
+ (GCallback)gsltma_added_cb, (gpointer)rtn);
+ g_signal_connect (G_OBJECT(rtn->instances), "updated",
+ (GCallback)gsltma_updated_cb, (gpointer)rtn);
+ g_signal_connect (G_OBJECT(rtn->instances), "removing",
+ (GCallback)gsltma_removing_cb, (gpointer)rtn);
return rtn;
}
diff --git a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
index e24bfa5d42..3132424d82 100644
--- a/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
+++ b/gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.h
@@ -43,8 +43,9 @@
G_BEGIN_DECLS
-#define GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER (gnc_sx_list_tree_model_adapter_get_type ())
-G_DECLARE_FINAL_TYPE (GncSxListTreeModelAdapter, gnc_sx_list_tree_model_adapter, GNC, SX_LIST_TREE_MODEL_ADAPTER, GObject)
+#define GNC_TYPE_SX_LIST_TREE_MODEL_ADAPTER (gnc_sx_list_tree_model_adapter_get_type ())
+G_DECLARE_FINAL_TYPE (GncSxListTreeModelAdapter, gnc_sx_list_tree_model_adapter,
+ GNC, SX_LIST_TREE_MODEL_ADAPTER, GObject)
// model columns
enum
@@ -58,7 +59,8 @@ enum
GncSxListTreeModelAdapter* gnc_sx_list_tree_model_adapter_new (GncSxInstanceModel *instances);
-GncSxInstances* gnc_sx_list_tree_model_adapter_get_sx_instances (GncSxListTreeModelAdapter *model, GtkTreeIter *iter);
+GncSxInstances* gnc_sx_list_tree_model_adapter_get_sx_instances (GncSxListTreeModelAdapter *model,
+ GtkTreeIter *iter);
G_END_DECLS
Summary of changes:
.../gnome-utils/gnc-sx-list-tree-model-adapter.c | 146 ++++++++++++---------
.../gnome-utils/gnc-sx-list-tree-model-adapter.h | 8 +-
gnucash/gnome-utils/gnc-tree-view-sx-list.c | 128 +++++++++---------
gnucash/gnome-utils/gnc-tree-view-sx-list.h | 13 +-
4 files changed, 163 insertions(+), 132 deletions(-)
More information about the gnucash-changes
mailing list