gnucash maint: Multiple changes pushed
Robert Fewell
bobit at code.gnucash.org
Tue Sep 29 06:26:19 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/29706167 (commit)
via https://github.com/Gnucash/gnucash/commit/7c7cd657 (commit)
via https://github.com/Gnucash/gnucash/commit/51120351 (commit)
via https://github.com/Gnucash/gnucash/commit/c89c677c (commit)
from https://github.com/Gnucash/gnucash/commit/06663271 (commit)
commit 2970616701fd24d84578c310e7a00585071fa202
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Sep 29 11:22:22 2020 +0100
Bug 797953 - Add 'Filter By...' to CoA right mouse menu
Add the menu option for 'Filter By...' on the Chart of Accounts page to
be consistent with register pages.
diff --git a/gnucash/ui/gnc-plugin-page-account-tree-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
index ecde1c84b..373768bdf 100644
--- a/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
@@ -43,6 +43,9 @@
</menubar>
<popup name="MainPopup" action="FakeToplevel">
+ <placeholder name="PopupPlaceholder1">
+ <menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
+ </placeholder>
<placeholder name="PopupPlaceholder2">
<menuitem name="AccountOpenAccount" action="FileOpenAccountAction"/>
<menuitem name="AccountOpenSubaccounts" action="FileOpenSubaccountsAction"/>
diff --git a/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
index b98cc55f5..4f85db120 100644
--- a/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
@@ -44,6 +44,9 @@
</menubar>
<popup name="MainPopup" action="FakeToplevel">
+ <placeholder name="PopupPlaceholder1">
+ <menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
+ </placeholder>
<placeholder name="PopupPlaceholder2">
<menuitem name="AccountOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="AccountOpenAccount" action="FileOpenAccountAction"/>
commit 7c7cd657582865c8de7f064bedbe58b6ef923d50
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Sep 29 11:04:35 2020 +0100
Select account if Tax Options dialog opened from Register
If the Tax options dialog is opened from a register the tax dialog will
preselect the account associated with the register.
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 3a50ab935..a3d73f0c1 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -193,6 +193,8 @@ static void gnc_plugin_page_register_cmd_find_account (GtkAction* action,
GncPluginPageRegister* plugin_page);
static void gnc_plugin_page_register_cmd_find_transactions (GtkAction* action,
GncPluginPageRegister* plugin_page);
+static void gnc_plugin_page_register_cmd_edit_tax_options (GtkAction* action,
+ GncPluginPageRegister* plugin_page);
static void gnc_plugin_page_register_cmd_cut_transaction (GtkAction* action,
GncPluginPageRegister* plugin_page);
static void gnc_plugin_page_register_cmd_copy_transaction (GtkAction* action,
@@ -363,6 +365,18 @@ static GtkActionEntry gnc_plugin_page_register_actions [] =
N_ ("Find transactions with a search"),
G_CALLBACK (gnc_plugin_page_register_cmd_find_transactions)
},
+ {
+ "EditTaxOptionsAction", NULL,
+ /* Translators: remember to reuse this *
+ * translation in dialog-account.glade */
+ N_("Ta_x Report Options"), NULL,
+ /* Translators: currently implemented are *
+ * US: income tax and *
+ * DE: VAT *
+ * So adjust this string */
+ N_("Setup relevant accounts for tax reports, e.g. US income tax"),
+ G_CALLBACK (gnc_plugin_page_register_cmd_edit_tax_options)
+ },
/* Transaction menu */
@@ -3810,7 +3824,6 @@ gnc_plugin_page_register_cmd_find_account (GtkAction* action,
}
-
static void
gnc_plugin_page_register_cmd_find_transactions (GtkAction* action,
GncPluginPageRegister* page)
@@ -3828,6 +3841,24 @@ gnc_plugin_page_register_cmd_find_transactions (GtkAction* action,
}
+static void
+gnc_plugin_page_register_cmd_edit_tax_options (GtkAction* action,
+ GncPluginPageRegister* page)
+{
+ GncPluginPageRegisterPrivate* priv;
+ GtkWidget *window;
+ Account* account;
+
+ g_return_if_fail (GNC_IS_PLUGIN_PAGE_REGISTER (page));
+
+ ENTER ("(action %p, page %p)", action, page);
+ priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE (page);
+ window = gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page));
+ account = gnc_plugin_page_register_get_account (page);
+ gnc_tax_info_dialog (window, account);
+ LEAVE (" ");
+}
+
static void
gnc_plugin_page_register_cmd_cut_transaction (GtkAction* action,
GncPluginPageRegister* plugin_page)
diff --git a/gnucash/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c
index 48853d0f0..5151b4a52 100644
--- a/gnucash/gnome/gnc-plugin-page-register2.c
+++ b/gnucash/gnome/gnc-plugin-page-register2.c
@@ -78,6 +78,7 @@
#include "gnc-icons.h"
#include "gnc-prefs.h"
#include "gnc-split-reg2.h"
+#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnc-window.h"
#include "gnc-main-window.h"
@@ -140,6 +141,7 @@ static void gnc_plugin_page_register2_cmd_paste (GtkAction *action, GncPluginPag
static void gnc_plugin_page_register2_cmd_edit_account (GtkAction *action, GncPluginPageRegister2 *plugin_page);
static void gnc_plugin_page_register2_cmd_find_account (GtkAction *action, GncPluginPageRegister2 *plugin_page);
static void gnc_plugin_page_register2_cmd_find_transactions (GtkAction *action, GncPluginPageRegister2 *plugin_page);
+static void gnc_plugin_page_register2_cmd_edit_tax_options (GtkAction *action, GncPluginPageRegister2 *plugin_page);
static void gnc_plugin_page_register2_cmd_cut_transaction (GtkAction *action, GncPluginPageRegister2 *plugin_page);
static void gnc_plugin_page_register2_cmd_copy_transaction (GtkAction *action, GncPluginPageRegister2 *plugin_page);
static void gnc_plugin_page_register2_cmd_paste_transaction (GtkAction *action, GncPluginPageRegister2 *plugin_page);
@@ -254,6 +256,18 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] =
N_("Find transactions with a search"),
G_CALLBACK (gnc_plugin_page_register2_cmd_find_transactions)
},
+ {
+ "EditTaxOptionsAction", NULL,
+ /* Translators: remember to reuse this *
+ * translation in dialog-account.glade */
+ N_("Ta_x Report Options"), NULL,
+ /* Translators: currently implemented are *
+ * US: income tax and *
+ * DE: VAT *
+ * So adjust this string */
+ N_("Setup relevant accounts for tax reports, e.g. US income tax"),
+ G_CALLBACK (gnc_plugin_page_register2_cmd_edit_tax_options)
+ },
/* Transaction menu */
@@ -2780,6 +2794,25 @@ gnc_plugin_page_register2_cmd_find_transactions (GtkAction *action,
LEAVE(" ");
}
+static void
+gnc_plugin_page_register2_cmd_edit_tax_options (GtkAction *action,
+ GncPluginPageRegister2 *page) // this works
+{
+ GncPluginPageRegister2Private *priv;
+ GtkWidget *window;
+ Account* account;
+
+ g_return_if_fail(GNC_IS_PLUGIN_PAGE_REGISTER2(page));
+
+ ENTER("(action %p, page %p)", action, page);
+ priv = GNC_PLUGIN_PAGE_REGISTER2_GET_PRIVATE(page);
+
+ window = gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page));
+ account = gnc_plugin_page_register2_get_account (page);
+ gnc_tax_info_dialog (window, account);
+ LEAVE(" ");
+}
+
static void
gnc_plugin_page_register2_cmd_cut_transaction (GtkAction *action,
GncPluginPageRegister2 *page) // this works
diff --git a/gnucash/ui/gnc-plugin-page-register-ui.xml b/gnucash/ui/gnc-plugin-page-register-ui.xml
index 8fae493a6..a32b3bd5a 100644
--- a/gnucash/ui/gnc-plugin-page-register-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-register-ui.xml
@@ -5,6 +5,7 @@
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
<menuitem name="EditFindAccount" action="EditFindAccountAction"/>
</placeholder>
+ <menuitem name="EditTaxOptions" action="EditTaxOptionsAction"/>
</menu>
<menu name="Transaction" action="TransactionAction">
diff --git a/gnucash/ui/gnc-plugin-page-register2-ui.xml b/gnucash/ui/gnc-plugin-page-register2-ui.xml
index 91b77b0a6..3d903d9ac 100644
--- a/gnucash/ui/gnc-plugin-page-register2-ui.xml
+++ b/gnucash/ui/gnc-plugin-page-register2-ui.xml
@@ -5,6 +5,7 @@
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
<menuitem name="EditFindAccount" action="EditFindAccountAction"/>
</placeholder>
+ <menuitem name="EditTaxOptions" action="EditTaxOptionsAction"/>
</menu>
<menu name="Transaction" action="TransactionAction">
commit 511203512a0a64f1292817cd20b48f6b97d9ce84
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Tue Sep 29 10:39:39 2020 +0100
Remove tabs and change spacing in dialog-sx-since-last-run.* files
diff --git a/gnucash/gnome/dialog-sx-since-last-run.c b/gnucash/gnome/dialog-sx-since-last-run.c
index 864ff5a1d..67c87ee6b 100644
--- a/gnucash/gnome/dialog-sx-since-last-run.c
+++ b/gnucash/gnome/dialog-sx-since-last-run.c
@@ -94,55 +94,66 @@ typedef struct _GncSxSlrTreeModelAdapterClass
GObjectClass parent;
} GncSxSlrTreeModelAdapterClass;
-GType gnc_sx_slr_tree_model_adapter_get_type(void);
-static void gnc_sx_slr_tree_model_adapter_class_init(GncSxSlrTreeModelAdapterClass *klass);
-static void gnc_sx_slr_tree_model_adapter_interface_init(gpointer g_iface, gpointer iface_data);
-static void gnc_sx_slr_tree_model_adapter_init(GTypeInstance *instance, gpointer klass);
-GncSxSlrTreeModelAdapter* gnc_sx_slr_tree_model_adapter_new(GncSxInstanceModel *instances);
-static void gnc_sx_slr_tree_model_adapter_dispose(GObject *obj);
-static void gnc_sx_slr_tree_model_adapter_finalize(GObject *obj);
-
-GncSxInstanceModel* gnc_sx_slr_tree_model_adapter_get_instance_model(GncSxSlrTreeModelAdapter *slr_model);
-GncSxInstances* gnc_sx_slr_tree_model_adapter_get_sx_instances(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter);
-static GncSxInstances* _gnc_sx_slr_tree_model_adapter_get_sx_instances(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, gboolean check_depth);
+GType gnc_sx_slr_tree_model_adapter_get_type (void);
+static void gnc_sx_slr_tree_model_adapter_class_init (GncSxSlrTreeModelAdapterClass *klass);
+static void gnc_sx_slr_tree_model_adapter_interface_init (gpointer g_iface, gpointer iface_data);
+static void gnc_sx_slr_tree_model_adapter_init (GTypeInstance *instance, gpointer klass);
+GncSxSlrTreeModelAdapter* gnc_sx_slr_tree_model_adapter_new (GncSxInstanceModel *instances);
+static void gnc_sx_slr_tree_model_adapter_dispose (GObject *obj);
+static void gnc_sx_slr_tree_model_adapter_finalize (GObject *obj);
+
+GncSxInstanceModel* gnc_sx_slr_tree_model_adapter_get_instance_model (GncSxSlrTreeModelAdapter *slr_model);
+GncSxInstances* gnc_sx_slr_tree_model_adapter_get_sx_instances (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter);
+static GncSxInstances* _gnc_sx_slr_tree_model_adapter_get_sx_instances (GncSxSlrTreeModelAdapter *model,
+ GtkTreeIter *iter,
+ gboolean check_depth);
/** @return null if the iter is not actually an GncSxInstance. **/
-GncSxInstance* gnc_sx_slr_model_get_instance(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter);
-static GncSxInstance* _gnc_sx_slr_model_get_instance(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, gboolean check_depth);
+GncSxInstance* gnc_sx_slr_model_get_instance (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter);
+static GncSxInstance* _gnc_sx_slr_model_get_instance (GncSxSlrTreeModelAdapter *model,
+ GtkTreeIter *iter,
+ gboolean check_depth);
+
/** @return false if the iter is not actually an GncSxInstance's variable. **/
-gboolean gnc_sx_slr_model_get_instance_and_variable(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, GncSxInstance **instance_loc, GncSxVariable **var_loc);
+gboolean gnc_sx_slr_model_get_instance_and_variable (GncSxSlrTreeModelAdapter *model,
+ GtkTreeIter *iter,
+ GncSxInstance **instance_loc,
+ GncSxVariable **var_loc);
-void gnc_sx_slr_model_effect_change(GncSxSlrTreeModelAdapter *model, gboolean auto_create_only, GList **created_transaction_guids, GList **creation_errors);
+void gnc_sx_slr_model_effect_change (GncSxSlrTreeModelAdapter *model,
+ gboolean auto_create_only,
+ GList **created_transaction_guids,
+ GList **creation_errors);
GtkTreeModel* gnc_sx_get_slr_state_model(void);
-#define GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER (gnc_sx_slr_tree_model_adapter_get_type ())
-#define GNC_SX_SLR_TREE_MODEL_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER, GncSxSlrTreeModelAdapter))
+#define GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER (gnc_sx_slr_tree_model_adapter_get_type ())
+#define GNC_SX_SLR_TREE_MODEL_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER, GncSxSlrTreeModelAdapter))
#define GNC_SX_SLR_TREE_MODEL_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER, GncSxSlrTreeModelAdapterClass))
-#define GNC_IS_SX_SLR_TREE_MODEL_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER))
+#define GNC_IS_SX_SLR_TREE_MODEL_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER))
#define GNC_IS_SX_SLR_TREE_MODEL_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER))
#define GNC_SX_SLR_TREE_MODEL_ADAPTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER, GncSxSlrTreeModelAdapterClass))
/* ------------------------------------------------------------ */
-static void _show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids);
+static void _show_created_transactions (GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids);
-static void close_handler(gpointer user_data);
-static void dialog_destroy_cb(GtkWidget *object, GncSxSinceLastRunDialog *app_dialog);
-static void dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog *app_dialog);
+static void close_handler (gpointer user_data);
+static void dialog_destroy_cb (GtkWidget *object, GncSxSinceLastRunDialog *app_dialog);
+static void dialog_response_cb (GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog *app_dialog);
/* ------------------------------------------------------------ */
static void
-_var_numeric_to_string(gnc_numeric *value, GString **str)
+_var_numeric_to_string (gnc_numeric *value, GString **str)
{
- *str = g_string_sized_new(5);
- g_string_printf(*str, "%0.2f", gnc_numeric_to_double(*value));
+ *str = g_string_sized_new (5);
+ g_string_printf (*str, "%0.2f", gnc_numeric_to_double (*value));
}
/* ------------------------------------------------------------ */
GType
-gnc_sx_slr_tree_model_adapter_get_type(void)
+gnc_sx_slr_tree_model_adapter_get_type (void)
{
static GType gsstma_type = 0;
if (gsstma_type == 0)
@@ -150,38 +161,38 @@ gnc_sx_slr_tree_model_adapter_get_type(void)
static const GTypeInfo info =
{
sizeof (GncSxSlrTreeModelAdapterClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
+ NULL, /* base_init */
+ NULL, /* base_finalize */
(GClassInitFunc)gnc_sx_slr_tree_model_adapter_class_init, /* class_init */
- NULL, /* class_finalize */
- NULL, /* class_data */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
sizeof (GncSxSlrTreeModelAdapter),
- 0, /* n_preallocs */
- (GInstanceInitFunc)gnc_sx_slr_tree_model_adapter_init /* instance_init */
+ 0, /* n_preallocs */
+ (GInstanceInitFunc)gnc_sx_slr_tree_model_adapter_init /* instance_init */
};
static const GInterfaceInfo itreeModel_info =
{
(GInterfaceInitFunc) gnc_sx_slr_tree_model_adapter_interface_init, /* interface_init */
- NULL, /* interface_finalize */
- NULL /* interface_data */
+ NULL, /* interface_finalize */
+ NULL /* interface_data */
};
gsstma_type = g_type_register_static (G_TYPE_OBJECT,
"GncSxSlrTreeModelAdapterType",
&info, 0);
- g_type_add_interface_static(gsstma_type,
- GTK_TYPE_TREE_MODEL,
- &itreeModel_info);
+ g_type_add_interface_static (gsstma_type,
+ GTK_TYPE_TREE_MODEL,
+ &itreeModel_info);
}
return gsstma_type;
}
static void
-gnc_sx_slr_tree_model_adapter_class_init(GncSxSlrTreeModelAdapterClass *klass)
+gnc_sx_slr_tree_model_adapter_class_init (GncSxSlrTreeModelAdapterClass *klass)
{
GObjectClass *obj_class;
- parent_class = g_type_class_peek_parent(klass);
+ parent_class = g_type_class_peek_parent (klass);
obj_class = G_OBJECT_CLASS(klass);
@@ -190,111 +201,112 @@ gnc_sx_slr_tree_model_adapter_class_init(GncSxSlrTreeModelAdapterClass *klass)
}
static GtkTreeModelFlags
-gsslrtma_get_flags(GtkTreeModel *tree_model)
+gsslrtma_get_flags (GtkTreeModel *tree_model)
{
- return gtk_tree_model_get_flags(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real));
+ return gtk_tree_model_get_flags (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real));
}
static gint
-gsslrtma_get_n_columns(GtkTreeModel *tree_model)
+gsslrtma_get_n_columns (GtkTreeModel *tree_model)
{
- return gtk_tree_model_get_n_columns(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real));
+ return gtk_tree_model_get_n_columns (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real));
}
static GType
-gsslrtma_get_column_type(GtkTreeModel *tree_model, gint index)
+gsslrtma_get_column_type (GtkTreeModel *tree_model, gint index)
{
- return gtk_tree_model_get_column_type(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), index);
+ return gtk_tree_model_get_column_type (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), index);
}
static gboolean
-gsslrtma_get_iter(GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreePath *path)
+gsslrtma_get_iter (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreePath *path)
{
- return gtk_tree_model_get_iter(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, path);
+ return gtk_tree_model_get_iter (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, path);
}
static GtkTreePath*
-gsslrtma_get_path(GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gsslrtma_get_path (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- return gtk_tree_model_get_path(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_get_path (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
}
static void
-gsslrtma_get_value(GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gint column,
- GValue *value)
+gsslrtma_get_value (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gint column,
+ GValue *value)
{
- gtk_tree_model_get_value(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, column, value);
+ gtk_tree_model_get_value (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, column, value);
}
static gboolean
-gsslrtma_iter_next(GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gsslrtma_iter_next (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- return gtk_tree_model_iter_next(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_iter_next (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
}
static gboolean
-gsslrtma_iter_children(GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *parent)
+gsslrtma_iter_children (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreeIter *parent)
{
- return gtk_tree_model_iter_children(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, parent);
+ return gtk_tree_model_iter_children (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, parent);
}
static gboolean
-gsslrtma_iter_has_child(GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gsslrtma_iter_has_child (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- return gtk_tree_model_iter_has_child(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_iter_has_child (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
}
static gint
-gsslrtma_iter_n_children(GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gsslrtma_iter_n_children (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- return gtk_tree_model_iter_n_children(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ return gtk_tree_model_iter_n_children (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
}
static gboolean
-gsslrtma_iter_nth_child(GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *parent,
- gint n)
+gsslrtma_iter_nth_child (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreeIter *parent,
+ gint n)
{
- return gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, parent, n);
+ return gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, parent, n);
}
static gboolean
-gsslrtma_iter_parent(GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *child)
+gsslrtma_iter_parent (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreeIter *child)
{
- return gtk_tree_model_iter_parent(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, child);
+ return gtk_tree_model_iter_parent (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter, child);
}
static void
-gsslrtma_ref_node(GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gsslrtma_ref_node (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- gtk_tree_model_ref_node(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ gtk_tree_model_ref_node (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
}
static void
-gsslrtma_unref_node(GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gsslrtma_unref_node (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
{
- gtk_tree_model_unref_node(GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
+ gtk_tree_model_unref_node (GTK_TREE_MODEL(GNC_SX_SLR_TREE_MODEL_ADAPTER(tree_model)->real), iter);
}
static void
-gnc_sx_slr_tree_model_adapter_interface_init(gpointer g_iface, gpointer iface_data)
+gnc_sx_slr_tree_model_adapter_interface_init (gpointer g_iface, gpointer iface_data)
{
GtkTreeModelIface *tree_model = (GtkTreeModelIface*)g_iface;
+
tree_model->get_flags = gsslrtma_get_flags;
tree_model->get_n_columns = gsslrtma_get_n_columns;
tree_model->get_column_type = gsslrtma_get_column_type;
@@ -312,48 +324,48 @@ gnc_sx_slr_tree_model_adapter_interface_init(gpointer g_iface, gpointer iface_da
}
static void
-gsslrtma_proxy_row_changed(GtkTreeModel *treemodel,
- GtkTreePath *arg1,
- GtkTreeIter *arg2,
- gpointer user_data)
+gsslrtma_proxy_row_changed (GtkTreeModel *treemodel,
+ GtkTreePath *arg1,
+ GtkTreeIter *arg2,
+ gpointer user_data)
{
- g_signal_emit_by_name(user_data, "row-changed", arg1, arg2);
+ g_signal_emit_by_name (user_data, "row-changed", arg1, arg2);
}
static void
-gsslrtma_proxy_row_deleted(GtkTreeModel *treemodel,
- GtkTreePath *arg1,
- gpointer user_data)
+gsslrtma_proxy_row_deleted (GtkTreeModel *treemodel,
+ GtkTreePath *arg1,
+ gpointer user_data)
{
- g_signal_emit_by_name(user_data, "row-deleted", arg1);
+ g_signal_emit_by_name (user_data, "row-deleted", arg1);
}
static void
-gsslrtma_proxy_row_has_child_toggled(GtkTreeModel *treemodel,
- GtkTreePath *arg1,
- GtkTreeIter *arg2,
- gpointer user_data)
+gsslrtma_proxy_row_has_child_toggled (GtkTreeModel *treemodel,
+ GtkTreePath *arg1,
+ GtkTreeIter *arg2,
+ gpointer user_data)
{
- g_signal_emit_by_name(user_data, "row-has-child-toggled", arg1, arg2);
+ g_signal_emit_by_name (user_data, "row-has-child-toggled", arg1, arg2);
}
static void
-gsslrtma_proxy_row_inserted(GtkTreeModel *treemodel,
- GtkTreePath *arg1,
- GtkTreeIter *arg2,
- gpointer user_data)
+gsslrtma_proxy_row_inserted (GtkTreeModel *treemodel,
+ GtkTreePath *arg1,
+ GtkTreeIter *arg2,
+ gpointer user_data)
{
- g_signal_emit_by_name(user_data, "row-inserted", arg1, arg2);
+ g_signal_emit_by_name (user_data, "row-inserted", arg1, arg2);
}
static void
-gsslrtma_proxy_rows_reordered(GtkTreeModel *treemodel,
- GtkTreePath *arg1,
- GtkTreeIter *arg2,
- gpointer arg3,
- gpointer user_data)
+gsslrtma_proxy_rows_reordered (GtkTreeModel *treemodel,
+ GtkTreePath *arg1,
+ GtkTreeIter *arg2,
+ gpointer arg3,
+ gpointer user_data)
{
- g_signal_emit_by_name(user_data, "rows-reordered", arg1, arg2, arg3);
+ g_signal_emit_by_name (user_data, "rows-reordered", arg1, arg2, arg3);
}
// model columns
@@ -368,20 +380,20 @@ enum
};
static void
-gnc_sx_slr_tree_model_adapter_init(GTypeInstance *instance, gpointer klass)
+gnc_sx_slr_tree_model_adapter_init (GTypeInstance *instance, gpointer klass)
{
GncSxSlrTreeModelAdapter *adapter = GNC_SX_SLR_TREE_MODEL_ADAPTER(instance);
// columns: thing-name, instance-state, variable-value, instance-visible, variable-visible, instance_state_sensitivity
// at depth=0: <sx>, N/A, N/A, N/A N/A, N/A
// at depth=1: <instance>, <state>, N/A, <valid>, N/A, <valid>
// at depth=2: <variable>, N/A, <value>, N/A, <valid>, N/A
- adapter->real = gtk_tree_store_new(6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+ adapter->real = gtk_tree_store_new (6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
- g_signal_connect(adapter->real, "row-changed", G_CALLBACK(gsslrtma_proxy_row_changed), adapter);
- g_signal_connect(adapter->real, "row-deleted", G_CALLBACK(gsslrtma_proxy_row_deleted), adapter);
- g_signal_connect(adapter->real, "row-has-child-toggled", G_CALLBACK(gsslrtma_proxy_row_has_child_toggled), adapter);
- g_signal_connect(adapter->real, "row-inserted", G_CALLBACK(gsslrtma_proxy_row_inserted), adapter);
- g_signal_connect(adapter->real, "rows-reordered", G_CALLBACK(gsslrtma_proxy_rows_reordered), adapter);
+ g_signal_connect (adapter->real, "row-changed", G_CALLBACK(gsslrtma_proxy_row_changed), adapter);
+ g_signal_connect (adapter->real, "row-deleted", G_CALLBACK(gsslrtma_proxy_row_deleted), adapter);
+ g_signal_connect (adapter->real, "row-has-child-toggled", G_CALLBACK(gsslrtma_proxy_row_has_child_toggled), adapter);
+ g_signal_connect (adapter->real, "row-inserted", G_CALLBACK(gsslrtma_proxy_row_inserted), adapter);
+ g_signal_connect (adapter->real, "rows-reordered", G_CALLBACK(gsslrtma_proxy_rows_reordered), adapter);
}
static char* gnc_sx_instance_state_names[] =
@@ -397,48 +409,48 @@ static char* gnc_sx_instance_state_names[] =
static GtkTreeModel* _singleton_slr_state_model = NULL;
GtkTreeModel*
-gnc_sx_get_slr_state_model(void)
+gnc_sx_get_slr_state_model (void)
{
if (_singleton_slr_state_model == NULL)
{
int i;
GtkTreeIter iter;
- _singleton_slr_state_model = GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING));
+ _singleton_slr_state_model = GTK_TREE_MODEL(gtk_list_store_new (1, G_TYPE_STRING));
for (i = 0; i != SX_INSTANCE_STATE_CREATED; i++)
{
- gtk_list_store_insert_with_values(GTK_LIST_STORE(_singleton_slr_state_model),
- &iter,
- SX_INSTANCE_STATE_MAX_STATE + 1,
- 0, _(gnc_sx_instance_state_names[i]), -1);
+ gtk_list_store_insert_with_values (GTK_LIST_STORE(_singleton_slr_state_model),
+ &iter,
+ SX_INSTANCE_STATE_MAX_STATE + 1,
+ 0, _(gnc_sx_instance_state_names[i]), -1);
}
}
return _singleton_slr_state_model;
}
static void
-_consume_excess_rows(GtkTreeStore *store, int last_index, GtkTreeIter *parent_iter, GtkTreeIter *maybe_invalid_iter)
+_consume_excess_rows (GtkTreeStore *store, int last_index, GtkTreeIter *parent_iter, GtkTreeIter *maybe_invalid_iter)
{
if (last_index == -1)
{
// try to get whatever was there beforehand, if it exists
- if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(store), maybe_invalid_iter, parent_iter))
+ if (!gtk_tree_model_iter_children (GTK_TREE_MODEL(store), maybe_invalid_iter, parent_iter))
return;
}
else
{
// increment the iter, or bail out.
- if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(store), maybe_invalid_iter))
+ if (!gtk_tree_model_iter_next (GTK_TREE_MODEL(store), maybe_invalid_iter))
return;
}
// consume until we're done.
- while (gtk_tree_store_remove(store, maybe_invalid_iter));
+ while (gtk_tree_store_remove (store, maybe_invalid_iter));
}
static void
-gsslrtma_populate_tree_store(GncSxSlrTreeModelAdapter *model)
+gsslrtma_populate_tree_store (GncSxSlrTreeModelAdapter *model)
{
GtkTreeIter sx_tree_iter;
GList *sx_iter;
@@ -450,32 +462,32 @@ gsslrtma_populate_tree_store(GncSxSlrTreeModelAdapter *model)
char last_occur_date_buf[MAX_DATE_LENGTH+1];
{
- const GDate *last_occur = xaccSchedXactionGetLastOccurDate(instances->sx);
- if (last_occur == NULL || !g_date_valid(last_occur))
+ const GDate *last_occur = xaccSchedXactionGetLastOccurDate (instances->sx);
+ if (last_occur == NULL || !g_date_valid (last_occur))
{
- g_stpcpy(last_occur_date_buf, _("Never"));
+ g_stpcpy (last_occur_date_buf, _("Never"));
}
else
{
- qof_print_gdate(last_occur_date_buf,
- MAX_DATE_LENGTH,
- last_occur);
+ qof_print_gdate (last_occur_date_buf,
+ MAX_DATE_LENGTH,
+ last_occur);
}
}
- if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(model->real), &sx_tree_iter, NULL, ++instances_index))
+ if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(model->real), &sx_tree_iter, NULL, ++instances_index))
{
- gtk_tree_store_append(model->real, &sx_tree_iter, NULL);
+ gtk_tree_store_append (model->real, &sx_tree_iter, NULL);
}
- gtk_tree_store_set(model->real, &sx_tree_iter,
- SLR_MODEL_COL_NAME, xaccSchedXactionGetName(instances->sx),
- SLR_MODEL_COL_INSTANCE_STATE, NULL,
- SLR_MODEL_COL_VARAIBLE_VALUE, NULL,
- SLR_MODEL_COL_INSTANCE_VISIBILITY, FALSE,
- SLR_MODEL_COL_VARIABLE_VISIBILITY, FALSE,
- SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, FALSE,
- -1);
+ gtk_tree_store_set (model->real, &sx_tree_iter,
+ SLR_MODEL_COL_NAME, xaccSchedXactionGetName (instances->sx),
+ SLR_MODEL_COL_INSTANCE_STATE, NULL,
+ SLR_MODEL_COL_VARAIBLE_VALUE, NULL,
+ SLR_MODEL_COL_INSTANCE_VISIBILITY, FALSE,
+ SLR_MODEL_COL_VARIABLE_VISIBILITY, FALSE,
+ SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, FALSE,
+ -1);
// Insert instance information
{
@@ -487,20 +499,20 @@ gsslrtma_populate_tree_store(GncSxSlrTreeModelAdapter *model)
for (inst_iter = instances->instance_list; inst_iter != NULL; inst_iter = inst_iter->next)
{
GncSxInstance *inst = (GncSxInstance*)inst_iter->data;
- qof_print_gdate(instance_date_buf, MAX_DATE_LENGTH, &inst->date);
+ qof_print_gdate (instance_date_buf, MAX_DATE_LENGTH, &inst->date);
- if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(model->real), &inst_tree_iter, &sx_tree_iter, ++instance_index))
+ if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(model->real), &inst_tree_iter, &sx_tree_iter, ++instance_index))
{
- gtk_tree_store_append(model->real, &inst_tree_iter, &sx_tree_iter);
+ gtk_tree_store_append (model->real, &inst_tree_iter, &sx_tree_iter);
}
- gtk_tree_store_set(model->real, &inst_tree_iter,
- SLR_MODEL_COL_NAME, instance_date_buf,
- SLR_MODEL_COL_INSTANCE_STATE, _(gnc_sx_instance_state_names[inst->state]),
- SLR_MODEL_COL_VARAIBLE_VALUE, NULL,
- SLR_MODEL_COL_INSTANCE_VISIBILITY, TRUE,
- SLR_MODEL_COL_VARIABLE_VISIBILITY, FALSE,
- SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, inst->state != SX_INSTANCE_STATE_CREATED,
- -1);
+ gtk_tree_store_set (model->real, &inst_tree_iter,
+ SLR_MODEL_COL_NAME, instance_date_buf,
+ SLR_MODEL_COL_INSTANCE_STATE, _(gnc_sx_instance_state_names[inst->state]),
+ SLR_MODEL_COL_VARAIBLE_VALUE, NULL,
+ SLR_MODEL_COL_INSTANCE_VISIBILITY, TRUE,
+ SLR_MODEL_COL_VARIABLE_VISIBILITY, FALSE,
+ SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, inst->state != SX_INSTANCE_STATE_CREATED,
+ -1);
// Insert variable information
{
@@ -508,7 +520,7 @@ gsslrtma_populate_tree_store(GncSxSlrTreeModelAdapter *model)
GtkTreeIter var_tree_iter;
gint visible_variable_index = -1;
- vars = gnc_sx_instance_get_variables(inst);
+ vars = gnc_sx_instance_get_variables (inst);
for (var_iter = vars; var_iter != NULL; var_iter = var_iter->next)
{
GncSxVariable *var = (GncSxVariable*)var_iter->data;
@@ -517,134 +529,134 @@ gsslrtma_populate_tree_store(GncSxSlrTreeModelAdapter *model)
if (!var->editable)
continue;
- if (gnc_numeric_check(var->value) == GNC_ERROR_OK)
+ if (gnc_numeric_check (var->value) == GNC_ERROR_OK)
{
- _var_numeric_to_string(&var->value, &tmp_str);
+ _var_numeric_to_string (&var->value, &tmp_str);
}
else
{
- tmp_str = g_string_new(_("(Need Value)"));
+ tmp_str = g_string_new (_("(Need Value)"));
}
- if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(model->real),
- &var_tree_iter, &inst_tree_iter,
- ++visible_variable_index))
+ if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(model->real),
+ &var_tree_iter, &inst_tree_iter,
+ ++visible_variable_index))
{
- gtk_tree_store_append(model->real, &var_tree_iter, &inst_tree_iter);
+ gtk_tree_store_append (model->real, &var_tree_iter, &inst_tree_iter);
}
- gtk_tree_store_set(model->real, &var_tree_iter,
- SLR_MODEL_COL_NAME, var->name,
- SLR_MODEL_COL_INSTANCE_STATE, NULL,
- SLR_MODEL_COL_VARAIBLE_VALUE, tmp_str->str,
- SLR_MODEL_COL_INSTANCE_VISIBILITY, FALSE,
- SLR_MODEL_COL_VARIABLE_VISIBILITY, TRUE,
- SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, FALSE,
- -1);
- g_string_free(tmp_str, TRUE);
+ gtk_tree_store_set (model->real, &var_tree_iter,
+ SLR_MODEL_COL_NAME, var->name,
+ SLR_MODEL_COL_INSTANCE_STATE, NULL,
+ SLR_MODEL_COL_VARAIBLE_VALUE, tmp_str->str,
+ SLR_MODEL_COL_INSTANCE_VISIBILITY, FALSE,
+ SLR_MODEL_COL_VARIABLE_VISIBILITY, TRUE,
+ SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, FALSE,
+ -1);
+ g_string_free (tmp_str, TRUE);
}
- g_list_free(vars);
+ g_list_free (vars);
- _consume_excess_rows(model->real, visible_variable_index, &inst_tree_iter, &var_tree_iter);
+ _consume_excess_rows (model->real, visible_variable_index, &inst_tree_iter, &var_tree_iter);
}
}
// if there are more instance iters, remove
- _consume_excess_rows(model->real, instance_index, &sx_tree_iter, &inst_tree_iter);
+ _consume_excess_rows (model->real, instance_index, &sx_tree_iter, &inst_tree_iter);
}
}
- _consume_excess_rows(model->real, instances_index, NULL, &sx_tree_iter);
+ _consume_excess_rows (model->real, instances_index, NULL, &sx_tree_iter);
}
GncSxInstanceModel*
-gnc_sx_slr_tree_model_adapter_get_instance_model(GncSxSlrTreeModelAdapter *slr_model)
+gnc_sx_slr_tree_model_adapter_get_instance_model (GncSxSlrTreeModelAdapter *slr_model)
{
return slr_model->instances;
}
GncSxInstances*
-gnc_sx_slr_tree_model_adapter_get_sx_instances(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter)
+gnc_sx_slr_tree_model_adapter_get_sx_instances (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter)
{
- return _gnc_sx_slr_tree_model_adapter_get_sx_instances(model, iter, TRUE);
+ return _gnc_sx_slr_tree_model_adapter_get_sx_instances (model, iter, TRUE);
}
static GncSxInstances*
-_gnc_sx_slr_tree_model_adapter_get_sx_instances(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, gboolean check_depth)
+_gnc_sx_slr_tree_model_adapter_get_sx_instances (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, gboolean check_depth)
{
GtkTreePath *path;
gint *indices, index;
- path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), iter);
- if (check_depth && gtk_tree_path_get_depth(path) != 1)
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL(model), iter);
+ if (check_depth && gtk_tree_path_get_depth (path) != 1)
{
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
return NULL;
}
- indices = gtk_tree_path_get_indices(path);
+ indices = gtk_tree_path_get_indices (path);
index = indices[0];
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
- return (GncSxInstances*)g_list_nth_data(model->instances->sx_instance_list, index);
+ return (GncSxInstances*)g_list_nth_data (model->instances->sx_instance_list, index);
}
GncSxInstance*
-gnc_sx_slr_model_get_instance(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter)
+gnc_sx_slr_model_get_instance (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter)
{
- return _gnc_sx_slr_model_get_instance(model, iter, TRUE);
+ return _gnc_sx_slr_model_get_instance (model, iter, TRUE);
}
static GncSxInstance*
-_gnc_sx_slr_model_get_instance(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, gboolean check_depth)
+_gnc_sx_slr_model_get_instance (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, gboolean check_depth)
{
GtkTreePath *path;
gint *indices, instances_index, instance_index;
GncSxInstances *instances;
- path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), iter);
- if (check_depth && gtk_tree_path_get_depth(path) != 2)
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL(model), iter);
+ if (check_depth && gtk_tree_path_get_depth (path) != 2)
{
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
return NULL;
}
- indices = gtk_tree_path_get_indices(path);
+ indices = gtk_tree_path_get_indices (path);
instances_index = indices[0];
instance_index = indices[1];
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
- instances = (GncSxInstances*)g_list_nth_data(model->instances->sx_instance_list, instances_index);
- if (instance_index < 0 || instance_index >= g_list_length(instances->instance_list))
+ instances = (GncSxInstances*)g_list_nth_data (model->instances->sx_instance_list, instances_index);
+ if (instance_index < 0 || instance_index >= g_list_length (instances->instance_list))
{
return NULL;
}
- return (GncSxInstance*)g_list_nth_data(instances->instance_list, instance_index);
+ return (GncSxInstance*)g_list_nth_data (instances->instance_list, instance_index);
}
gboolean
-gnc_sx_slr_model_get_instance_and_variable(GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, GncSxInstance **instance_loc, GncSxVariable **var_loc)
+gnc_sx_slr_model_get_instance_and_variable (GncSxSlrTreeModelAdapter *model, GtkTreeIter *iter, GncSxInstance **instance_loc, GncSxVariable **var_loc)
{
GtkTreePath *path;
gint *indices, variable_index;
GncSxInstance *instance;
GList *variables;
- instance = _gnc_sx_slr_model_get_instance(model, iter, FALSE);
+ instance = _gnc_sx_slr_model_get_instance (model, iter, FALSE);
if (instance == NULL)
{
return FALSE;
}
- variables = gnc_sx_instance_get_variables(instance);
+ variables = gnc_sx_instance_get_variables (instance);
- path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), iter);
- if (gtk_tree_path_get_depth(path) != 3)
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL(model), iter);
+ if (gtk_tree_path_get_depth (path) != 3)
{
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
return FALSE;
}
- indices = gtk_tree_path_get_indices(path);
+ indices = gtk_tree_path_get_indices (path);
variable_index = indices[2];
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
- if (variable_index < 0 || variable_index >= g_list_length(variables))
+ if (variable_index < 0 || variable_index >= g_list_length (variables))
{
- g_list_free(variables);
+ g_list_free (variables);
return FALSE;
}
@@ -670,7 +682,7 @@ gnc_sx_slr_model_get_instance_and_variable(GncSxSlrTreeModelAdapter *model, GtkT
}
}
- g_list_free(variables);
+ g_list_free (variables);
return TRUE;
}
@@ -678,7 +690,7 @@ gnc_sx_slr_model_get_instance_and_variable(GncSxSlrTreeModelAdapter *model, GtkT
* Special-case list indexing that only refers to "editable" variables. :(
**/
static gint
-_variable_list_index(GList *variables, GncSxVariable *variable)
+_variable_list_index (GList *variables, GncSxVariable *variable)
{
gint index = 0;
for (; variables != NULL; variables = variables->next)
@@ -694,45 +706,45 @@ _variable_list_index(GList *variables, GncSxVariable *variable)
}
static GtkTreePath*
-_get_path_for_variable(GncSxSlrTreeModelAdapter *model, GncSxInstance *instance, GncSxVariable *variable)
+_get_path_for_variable (GncSxSlrTreeModelAdapter *model, GncSxInstance *instance, GncSxVariable *variable)
{
GList *variables;
int indices[3];
GtkTreePath *path;
- indices[0] = g_list_index(model->instances->sx_instance_list, instance->parent);
+ indices[0] = g_list_index (model->instances->sx_instance_list, instance->parent);
if (indices[0] == -1)
return NULL;
- indices[1] = g_list_index(instance->parent->instance_list, instance);
+ indices[1] = g_list_index (instance->parent->instance_list, instance);
if (indices[1] == -1)
return NULL;
- variables = gnc_sx_instance_get_variables(instance);
- indices[2] = _variable_list_index(variables, variable);
- g_list_free(variables);
+ variables = gnc_sx_instance_get_variables (instance);
+ indices[2] = _variable_list_index (variables, variable);
+ g_list_free (variables);
if (indices[2] == -1)
return NULL;
- path = gtk_tree_path_new_from_indices(indices[0], indices[1], indices[2], -1);
+ path = gtk_tree_path_new_from_indices (indices[0], indices[1], indices[2], -1);
return path;
}
static void
-gsslrtma_added_cb(GncSxInstanceModel *instances, SchedXaction *added_sx, gpointer user_data)
+gsslrtma_added_cb (GncSxInstanceModel *instances, SchedXaction *added_sx, gpointer user_data)
{
GncSxSlrTreeModelAdapter *model = GNC_SX_SLR_TREE_MODEL_ADAPTER(user_data);
// this is wasteful, but fine.
- gsslrtma_populate_tree_store(model);
+ gsslrtma_populate_tree_store (model);
}
static void
-gsslrtma_updated_cb(GncSxInstanceModel *instances, SchedXaction *updated_sx, gpointer user_data)
+gsslrtma_updated_cb (GncSxInstanceModel *instances, SchedXaction *updated_sx, gpointer user_data)
{
GncSxSlrTreeModelAdapter *model = GNC_SX_SLR_TREE_MODEL_ADAPTER(user_data);
- gnc_sx_instance_model_update_sx_instances(instances, updated_sx);
- gsslrtma_populate_tree_store(model);
+ gnc_sx_instance_model_update_sx_instances (instances, updated_sx);
+ gsslrtma_populate_tree_store (model);
}
static void
-gsslrtma_removing_cb(GncSxInstanceModel *instances, SchedXaction *to_remove_sx, gpointer user_data)
+gsslrtma_removing_cb (GncSxInstanceModel *instances, SchedXaction *to_remove_sx, gpointer user_data)
{
GncSxSlrTreeModelAdapter *model = GNC_SX_SLR_TREE_MODEL_ADAPTER(user_data);
GtkTreeIter tree_iter;
@@ -747,48 +759,48 @@ gsslrtma_removing_cb(GncSxInstanceModel *instances, SchedXaction *to_remove_sx,
}
if (iter == NULL)
return; // couldn't find sx in our model, which is weird.
- if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(model->real), &tree_iter, NULL, index))
+ if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL(model->real), &tree_iter, NULL, index))
return; // perr(couldn't get something that should exist.
- gtk_tree_store_remove(model->real, &tree_iter);
+ gtk_tree_store_remove (model->real, &tree_iter);
- gnc_sx_instance_model_remove_sx_instances(instances, to_remove_sx);
+ gnc_sx_instance_model_remove_sx_instances (instances, to_remove_sx);
}
static void
-gnc_sx_slr_tree_model_adapter_dispose(GObject *obj)
+gnc_sx_slr_tree_model_adapter_dispose (GObject *obj)
{
GncSxSlrTreeModelAdapter *adapter;
- g_return_if_fail(obj != NULL);
+ g_return_if_fail (obj != NULL);
adapter = GNC_SX_SLR_TREE_MODEL_ADAPTER(obj);
- g_return_if_fail(!adapter->disposed);
+ g_return_if_fail (!adapter->disposed);
adapter->disposed = TRUE;
- g_object_unref(G_OBJECT(adapter->instances));
+ g_object_unref (G_OBJECT(adapter->instances));
adapter->instances = NULL;
- g_object_unref(G_OBJECT(adapter->real));
+ g_object_unref (G_OBJECT(adapter->real));
adapter->real = NULL;
- G_OBJECT_CLASS(parent_class)->dispose(obj);
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
}
static void
-gnc_sx_slr_tree_model_adapter_finalize(GObject *obj)
+gnc_sx_slr_tree_model_adapter_finalize (GObject *obj)
{
- g_return_if_fail(obj != NULL);
- G_OBJECT_CLASS(parent_class)->finalize(obj);
+ g_return_if_fail (obj != NULL);
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GncSxSlrTreeModelAdapter*
-gnc_sx_slr_tree_model_adapter_new(GncSxInstanceModel *instances)
+gnc_sx_slr_tree_model_adapter_new (GncSxInstanceModel *instances)
{
GncSxSlrTreeModelAdapter *rtn;
- rtn = GNC_SX_SLR_TREE_MODEL_ADAPTER(g_object_new(GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER, NULL));
+ rtn = GNC_SX_SLR_TREE_MODEL_ADAPTER(g_object_new (GNC_TYPE_SX_SLR_TREE_MODEL_ADAPTER, NULL));
rtn->instances = instances;
- g_object_ref(G_OBJECT(rtn->instances));
- gsslrtma_populate_tree_store(rtn);
- g_signal_connect(G_OBJECT(rtn->instances), "added", (GCallback)gsslrtma_added_cb, (gpointer)rtn);
- rtn->updated_cb_id = g_signal_connect(G_OBJECT(rtn->instances), "updated", (GCallback)gsslrtma_updated_cb, (gpointer)rtn);
- g_signal_connect(G_OBJECT(rtn->instances), "removing", (GCallback)gsslrtma_removing_cb, (gpointer)rtn);
+ g_object_ref (G_OBJECT(rtn->instances));
+ gsslrtma_populate_tree_store (rtn);
+ g_signal_connect (G_OBJECT(rtn->instances), "added", (GCallback)gsslrtma_added_cb, (gpointer)rtn);
+ rtn->updated_cb_id = g_signal_connect (G_OBJECT(rtn->instances), "updated", (GCallback)gsslrtma_updated_cb, (gpointer)rtn);
+ g_signal_connect (G_OBJECT(rtn->instances), "removing", (GCallback)gsslrtma_removing_cb, (gpointer)rtn);
return rtn;
}
@@ -805,10 +817,10 @@ creation_error_dialog (GList **creation_errors)
if (message == NULL)
new_msg = g_strdup_printf ("%s", (gchar*)(node->data));
else
- new_msg = g_strdup_printf("%s\n%s", message, (gchar*)(node->data));
+ new_msg = g_strdup_printf ("%s\n%s", message, (gchar*)(node->data));
g_free (message);
message = new_msg;
- g_free(node->data);
+ g_free (node->data);
}
g_list_free (*creation_errors);
creation_errors = NULL;
@@ -819,12 +831,12 @@ creation_error_dialog (GList **creation_errors)
"%s", message);
g_signal_connect_swapped (dialog, "response",
G_CALLBACK(gtk_widget_destroy), dialog);
- gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_dialog_run (GTK_DIALOG(dialog));
g_free (message);
}
void
-gnc_sx_sxsincelast_book_opened(void)
+gnc_sx_sxsincelast_book_opened (void)
{
GList *auto_created_txns = NULL;
GList *creation_errors = NULL;
@@ -834,17 +846,17 @@ gnc_sx_sxsincelast_book_opened(void)
if (!gnc_prefs_get_bool (GNC_PREFS_GROUP_STARTUP, GNC_PREF_RUN_AT_FOPEN))
return;
- if (qof_book_is_readonly(gnc_get_current_book()))
+ if (qof_book_is_readonly (gnc_get_current_book ()))
{
/* Is the book read-only? Then don't change anything here. */
return;
}
- inst_model = gnc_sx_get_current_instances();
- gnc_sx_instance_model_summarize(inst_model, &summary);
- gnc_sx_summary_print(&summary);
- gnc_sx_instance_model_effect_change(inst_model, TRUE, &auto_created_txns,
- &creation_errors);
+ inst_model = gnc_sx_get_current_instances ();
+ gnc_sx_instance_model_summarize (inst_model, &summary);
+ gnc_sx_summary_print (&summary);
+ gnc_sx_instance_model_effect_change (inst_model, TRUE, &auto_created_txns,
+ &creation_errors);
if (summary.need_dialog)
{
@@ -855,7 +867,7 @@ gnc_sx_sxsincelast_book_opened(void)
{
if (summary.num_auto_create_no_notify_instances != 0)
{
- if (!gnc_prefs_get_bool(GNC_PREFS_GROUP_STARTUP, GNC_PREF_SHOW_AT_FOPEN))
+ if (!gnc_prefs_get_bool (GNC_PREFS_GROUP_STARTUP, GNC_PREF_SHOW_AT_FOPEN))
return;
gnc_info_dialog
@@ -866,20 +878,20 @@ gnc_sx_sxsincelast_book_opened(void)
"There are no Scheduled Transactions to be entered at this time. "
"(%d transactions automatically created)",
summary.num_auto_create_no_notify_instances),
- summary.num_auto_create_no_notify_instances);
+ summary.num_auto_create_no_notify_instances);
}
}
- g_list_free(auto_created_txns);
- g_object_unref(G_OBJECT(inst_model));
+ g_list_free (auto_created_txns);
+ g_object_unref (G_OBJECT(inst_model));
if (creation_errors)
- creation_error_dialog(&creation_errors);
+ creation_error_dialog (&creation_errors);
}
static void
-instance_state_changed_cb(GtkCellRendererText *cell,
- const gchar *path,
- const gchar *value,
- GncSxSinceLastRunDialog *dialog)
+instance_state_changed_cb (GtkCellRendererText *cell,
+ const gchar *path,
+ const gchar *value,
+ GncSxSinceLastRunDialog *dialog)
{
GtkTreeIter tree_iter;
GncSxInstance *inst;
@@ -888,37 +900,37 @@ instance_state_changed_cb(GtkCellRendererText *cell,
for (i = 0; i < SX_INSTANCE_STATE_CREATED; i++)
{
- if (strcmp(value, _(gnc_sx_instance_state_names[i])) == 0)
+ if (strcmp (value, _(gnc_sx_instance_state_names[i])) == 0)
break;
}
if (i == SX_INSTANCE_STATE_CREATED)
{
- g_warning("unknown value [%s]", value);
+ g_warning ("unknown value [%s]", value);
return;
}
new_state = i;
- if (!gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(dialog->editing_model), &tree_iter, path))
+ if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL(dialog->editing_model), &tree_iter, path))
{
- g_warning("unknown path [%s]", path);
+ g_warning ("unknown path [%s]", path);
return;
}
- inst = gnc_sx_slr_model_get_instance(dialog->editing_model, &tree_iter);
+ inst = gnc_sx_slr_model_get_instance (dialog->editing_model, &tree_iter);
if (inst == NULL)
{
- g_warning("invalid path [%s]", path);
+ g_warning ("invalid path [%s]", path);
return;
}
- gnc_sx_instance_model_change_instance_state(dialog->editing_model->instances, inst, new_state);
+ gnc_sx_instance_model_change_instance_state (dialog->editing_model->instances, inst, new_state);
}
static void
-variable_value_changed_cb(GtkCellRendererText *cell,
- const gchar *path,
- const gchar *value,
- GncSxSinceLastRunDialog *dialog)
+variable_value_changed_cb (GtkCellRendererText *cell,
+ const gchar *path,
+ const gchar *value,
+ GncSxSinceLastRunDialog *dialog)
{
GncSxVariable *var = NULL;
GncSxInstance *inst;
@@ -926,37 +938,37 @@ variable_value_changed_cb(GtkCellRendererText *cell,
gnc_numeric parsed_num;
char *endStr = NULL;
- g_debug("variable to [%s] at path [%s]", value, path);
- if (!gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(dialog->editing_model), &tree_iter, path))
+ g_debug ("variable to [%s] at path [%s]", value, path);
+ if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL(dialog->editing_model), &tree_iter, path))
{
- g_warning("invalid path [%s]", path);
+ g_warning ("invalid path [%s]", path);
return;
}
- if (!gnc_sx_slr_model_get_instance_and_variable(dialog->editing_model, &tree_iter, &inst, &var))
+ if (!gnc_sx_slr_model_get_instance_and_variable (dialog->editing_model, &tree_iter, &inst, &var))
{
- g_critical("path [%s] doesn't correspond to a valid variable", path);
+ g_critical ("path [%s] doesn't correspond to a valid variable", path);
return;
}
- if (!xaccParseAmount(value, TRUE, &parsed_num, &endStr)
- || gnc_numeric_check(parsed_num) != GNC_ERROR_OK)
+ if (!xaccParseAmount (value, TRUE, &parsed_num, &endStr)
+ || gnc_numeric_check (parsed_num) != GNC_ERROR_OK)
{
- gchar *value_copy = g_strdup(value);
- g_debug("value=[%s] endStr[%s]", value, endStr);
- if (strlen(g_strstrip(value_copy)) == 0)
+ gchar *value_copy = g_strdup (value);
+ g_debug ("value=[%s] endStr[%s]", value, endStr);
+ if (strlen (g_strstrip (value_copy)) == 0)
{
- gnc_numeric invalid_num = gnc_numeric_error(GNC_ERROR_ARG);
- gnc_sx_instance_model_set_variable(dialog->editing_model->instances, inst, var, &invalid_num);
+ gnc_numeric invalid_num = gnc_numeric_error (GNC_ERROR_ARG);
+ gnc_sx_instance_model_set_variable (dialog->editing_model->instances, inst, var, &invalid_num);
}
else
{
- g_warning("error parsing value [%s]", value);
+ g_warning ("error parsing value [%s]", value);
}
- g_free(value_copy);
+ g_free (value_copy);
return;
}
- gnc_sx_instance_model_set_variable(dialog->editing_model->instances, inst, var, &parsed_num);
+ gnc_sx_instance_model_set_variable (dialog->editing_model->instances, inst, var, &parsed_num);
}
GncSxSinceLastRunDialog*
@@ -965,19 +977,19 @@ gnc_ui_sx_since_last_run_dialog (GtkWindow *parent, GncSxInstanceModel *sx_insta
GncSxSinceLastRunDialog *dialog;
GtkBuilder *builder;
- dialog = g_new0(GncSxSinceLastRunDialog, 1);
+ dialog = g_new0 (GncSxSinceLastRunDialog, 1);
- builder = gtk_builder_new();
+ builder = gtk_builder_new ();
gnc_builder_add_from_file (builder, "dialog-sx.glade", "since_last_run_dialog");
dialog->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "since_last_run_dialog"));
- gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), parent);
+ gtk_window_set_transient_for (GTK_WINDOW(dialog->dialog), parent);
// Set the name of this dialog so it can be easily manipulated with css
gtk_widget_set_name (GTK_WIDGET(dialog->dialog), "gnc-id-sx-since-last-run");
gnc_widget_style_context_add_class (GTK_WIDGET(dialog->dialog), "gnc-class-sx");
- dialog->editing_model = gnc_sx_slr_tree_model_adapter_new(sx_instances);
+ dialog->editing_model = gnc_sx_slr_tree_model_adapter_new (sx_instances);
dialog->review_created_txns_toggle = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "review_txn_toggle"));
dialog->created_txns = auto_created_txn_guids;
@@ -987,26 +999,26 @@ gnc_ui_sx_since_last_run_dialog (GtkWindow *parent, GncSxInstanceModel *sx_insta
GtkTreeViewColumn *col;
dialog->instance_view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "instance_view"));
- gtk_tree_view_set_model(dialog->instance_view, GTK_TREE_MODEL(dialog->editing_model));
+ gtk_tree_view_set_model (dialog->instance_view, GTK_TREE_MODEL(dialog->editing_model));
- renderer = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes(_("Transaction"), renderer,
+ renderer = gtk_cell_renderer_text_new ();
+ col = gtk_tree_view_column_new_with_attributes (_("Transaction"), renderer,
"text", SLR_MODEL_COL_NAME,
NULL);
- gtk_tree_view_append_column(dialog->instance_view, col);
-
- renderer = gtk_cell_renderer_combo_new();
- g_object_set(G_OBJECT(renderer),
- "model", gnc_sx_get_slr_state_model(),
- "text-column", 0,
- "has-entry", FALSE,
- "editable", TRUE,
- NULL);
- g_signal_connect(G_OBJECT(renderer),
- "edited",
- G_CALLBACK(instance_state_changed_cb),
- dialog);
- col = gtk_tree_view_column_new_with_attributes(_("Status"), renderer,
+ gtk_tree_view_append_column (dialog->instance_view, col);
+
+ renderer = gtk_cell_renderer_combo_new ();
+ g_object_set (G_OBJECT(renderer),
+ "model", gnc_sx_get_slr_state_model (),
+ "text-column", 0,
+ "has-entry", FALSE,
+ "editable", TRUE,
+ NULL);
+ g_signal_connect (G_OBJECT(renderer),
+ "edited",
+ G_CALLBACK(instance_state_changed_cb),
+ dialog);
+ col = gtk_tree_view_column_new_with_attributes (_("Status"), renderer,
"text", SLR_MODEL_COL_INSTANCE_STATE,
"visible", SLR_MODEL_COL_INSTANCE_VISIBILITY,
// you might think only "sensitive" is required to
@@ -1025,50 +1037,50 @@ gnc_ui_sx_since_last_run_dialog (GtkWindow *parent, GncSxInstanceModel *sx_insta
"visible", SLR_MODEL_COL_INSTANCE_VISIBILITY,
"sensitive", SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY,
NULL);
- gtk_tree_view_append_column(dialog->instance_view, col);
- gtk_tree_view_column_set_resizable(col, TRUE);
-
- renderer = gtk_cell_renderer_text_new();
- g_object_set(G_OBJECT(renderer),
- "editable", TRUE,
- NULL);
- g_signal_connect(G_OBJECT(renderer),
- "edited",
- G_CALLBACK(variable_value_changed_cb),
- dialog);
- col = gtk_tree_view_column_new_with_attributes(_("Value"), renderer,
+ gtk_tree_view_append_column (dialog->instance_view, col);
+ gtk_tree_view_column_set_resizable (col, TRUE);
+
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT(renderer),
+ "editable", TRUE,
+ NULL);
+ g_signal_connect (G_OBJECT(renderer),
+ "edited",
+ G_CALLBACK(variable_value_changed_cb),
+ dialog);
+ col = gtk_tree_view_column_new_with_attributes (_("Value"), renderer,
"text", SLR_MODEL_COL_VARAIBLE_VALUE,
"visible", SLR_MODEL_COL_VARIABLE_VISIBILITY,
NULL);
- gtk_tree_view_append_column(dialog->instance_view, col);
+ gtk_tree_view_append_column (dialog->instance_view, col);
- gtk_tree_view_expand_all(dialog->instance_view);
+ gtk_tree_view_expand_all (dialog->instance_view);
}
// Set grid lines option to preference
gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(dialog->instance_view), gnc_tree_view_get_grid_lines_pref ());
- g_signal_connect(G_OBJECT(dialog->dialog), "response", G_CALLBACK(dialog_response_cb), dialog);
- g_signal_connect(G_OBJECT(dialog->dialog), "destroy", G_CALLBACK(dialog_destroy_cb), dialog);
+ g_signal_connect (G_OBJECT(dialog->dialog), "response", G_CALLBACK(dialog_response_cb), dialog);
+ g_signal_connect (G_OBJECT(dialog->dialog), "destroy", G_CALLBACK(dialog_destroy_cb), dialog);
- gnc_restore_window_size(GNC_PREFS_GROUP_STARTUP, GTK_WINDOW(dialog->dialog), parent);
+ gnc_restore_window_size (GNC_PREFS_GROUP_STARTUP, GTK_WINDOW(dialog->dialog), parent);
- dialog->component_id = gnc_register_gui_component
- (DIALOG_SX_SINCE_LAST_RUN_CM_CLASS, NULL, close_handler, dialog);
- gnc_gui_component_set_session(dialog->component_id,
- gnc_get_current_session());
+ dialog->component_id = gnc_register_gui_component (DIALOG_SX_SINCE_LAST_RUN_CM_CLASS,
+ NULL, close_handler, dialog);
+ gnc_gui_component_set_session (dialog->component_id,
+ gnc_get_current_session ());
- gtk_widget_show_all(dialog->dialog);
+ gtk_widget_show_all (dialog->dialog);
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, dialog);
- g_object_unref(G_OBJECT(builder));
+ g_object_unref (G_OBJECT(builder));
return dialog;
}
static void
-_show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids)
+_show_created_transactions (GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids)
{
#ifdef REGISTER2_ENABLED
GNCLedgerDisplay2 *ledger;
@@ -1079,55 +1091,55 @@ _show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_t
Query *book_query, *guid_query, *query;
GList *guid_iter;
- book_query = qof_query_create_for(GNC_ID_SPLIT);
- guid_query = qof_query_create_for(GNC_ID_SPLIT);
- qof_query_set_book(book_query, gnc_get_current_book());
+ book_query = qof_query_create_for (GNC_ID_SPLIT);
+ guid_query = qof_query_create_for (GNC_ID_SPLIT);
+ qof_query_set_book (book_query, gnc_get_current_book ());
for (guid_iter = created_txn_guids; guid_iter != NULL; guid_iter = guid_iter->next)
{
- xaccQueryAddGUIDMatch(guid_query, (GncGUID*)guid_iter->data, GNC_ID_TRANS, QOF_QUERY_OR);
+ xaccQueryAddGUIDMatch (guid_query, (GncGUID*)guid_iter->data, GNC_ID_TRANS, QOF_QUERY_OR);
}
- query = qof_query_merge(book_query, guid_query, QOF_QUERY_AND);
+ query = qof_query_merge (book_query, guid_query, QOF_QUERY_AND);
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
// inspired by dialog-find-transactions:do_find_cb:
- ledger = gnc_ledger_display2_query(query, SEARCH_LEDGER2, REG2_STYLE_JOURNAL);
- gnc_ledger_display2_refresh(ledger);
- page = gnc_plugin_page_register2_new_ledger(ledger);
+ ledger = gnc_ledger_display2_query (query, SEARCH_LEDGER2, REG2_STYLE_JOURNAL);
+ gnc_ledger_display2_refresh (ledger);
+ page = gnc_plugin_page_register2_new_ledger (ledger);
/*################## Added for Reg2 #################*/
#else
// inspired by dialog-find-transactions:do_find_cb:
- ledger = gnc_ledger_display_query(query, SEARCH_LEDGER, REG_STYLE_JOURNAL);
- gnc_ledger_display_refresh(ledger);
- page = gnc_plugin_page_register_new_ledger(ledger);
+ ledger = gnc_ledger_display_query (query, SEARCH_LEDGER, REG_STYLE_JOURNAL);
+ gnc_ledger_display_refresh (ledger);
+ page = gnc_plugin_page_register_new_ledger (ledger);
#endif
- g_object_set(G_OBJECT(page), "page-name", _("Created Transactions"), NULL);
- gnc_main_window_open_page(NULL, page);
+ g_object_set (G_OBJECT(page), "page-name", _("Created Transactions"), NULL);
+ gnc_main_window_open_page (NULL, page);
- qof_query_destroy(query);
- qof_query_destroy(book_query);
- qof_query_destroy(guid_query);
+ qof_query_destroy (query);
+ qof_query_destroy (book_query);
+ qof_query_destroy (guid_query);
}
static void
-close_handler(gpointer user_data)
+close_handler (gpointer user_data)
{
GncSxSinceLastRunDialog *app_dialog = user_data;
- gnc_save_window_size(GNC_PREFS_GROUP_STARTUP, GTK_WINDOW(app_dialog->dialog));
- gtk_widget_destroy(app_dialog->dialog);
+ gnc_save_window_size (GNC_PREFS_GROUP_STARTUP, GTK_WINDOW(app_dialog->dialog));
+ gtk_widget_destroy (app_dialog->dialog);
}
static void
-dialog_destroy_cb(GtkWidget *object, GncSxSinceLastRunDialog *app_dialog)
+dialog_destroy_cb (GtkWidget *object, GncSxSinceLastRunDialog *app_dialog)
{
- gnc_unregister_gui_component(app_dialog->component_id);
+ gnc_unregister_gui_component (app_dialog->component_id);
- g_object_unref(G_OBJECT(app_dialog->editing_model));
+ g_object_unref (G_OBJECT(app_dialog->editing_model));
app_dialog->editing_model = NULL;
}
static void
-dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog *app_dialog)
+dialog_response_cb (GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog *app_dialog)
{
GList* creation_errors = NULL;
switch (response_id)
@@ -1139,9 +1151,9 @@ dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog
// - [?] ability to create transactions
{
GList *unbound_variables;
- unbound_variables = gnc_sx_instance_model_check_variables(app_dialog->editing_model->instances);
- g_message("%d variables unbound", g_list_length(unbound_variables));
- if (g_list_length(unbound_variables) > 0)
+ unbound_variables = gnc_sx_instance_model_check_variables (app_dialog->editing_model->instances);
+ g_message ("%d variables unbound", g_list_length (unbound_variables));
+ if (g_list_length (unbound_variables) > 0)
{
// focus first variable
GncSxVariableNeeded *first_unbound;
@@ -1151,39 +1163,39 @@ dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog
gboolean start_editing = TRUE;
first_unbound = (GncSxVariableNeeded*)unbound_variables->data;
- variable_path = _get_path_for_variable(app_dialog->editing_model, first_unbound->instance, first_unbound->variable);
- variable_col = gtk_tree_view_get_column(app_dialog->instance_view, variable_view_column);
+ variable_path = _get_path_for_variable (app_dialog->editing_model, first_unbound->instance, first_unbound->variable);
+ variable_col = gtk_tree_view_get_column (app_dialog->instance_view, variable_view_column);
- gtk_tree_view_set_cursor(app_dialog->instance_view, variable_path, variable_col, start_editing);
+ gtk_tree_view_set_cursor (app_dialog->instance_view, variable_path, variable_col, start_editing);
- gtk_tree_path_free(variable_path);
- g_list_foreach(unbound_variables, (GFunc)g_free, NULL);
- g_list_free(unbound_variables);
+ gtk_tree_path_free (variable_path);
+ g_list_foreach (unbound_variables, (GFunc)g_free, NULL);
+ g_list_free (unbound_variables);
return;
}
}
- gnc_suspend_gui_refresh();
- gnc_sx_slr_model_effect_change(app_dialog->editing_model, FALSE, &app_dialog->created_txns, &creation_errors);
- gnc_resume_gui_refresh();
+ gnc_suspend_gui_refresh ();
+ gnc_sx_slr_model_effect_change (app_dialog->editing_model, FALSE, &app_dialog->created_txns, &creation_errors);
+ gnc_resume_gui_refresh ();
gnc_gui_refresh_all (); // force a refresh of all registers
if (creation_errors)
- creation_error_dialog(&creation_errors);
+ creation_error_dialog (&creation_errors);
- if (gtk_toggle_button_get_active(app_dialog->review_created_txns_toggle)
- && g_list_length(app_dialog->created_txns) > 0)
+ if (gtk_toggle_button_get_active (app_dialog->review_created_txns_toggle)
+ && g_list_length (app_dialog->created_txns) > 0)
{
- _show_created_transactions(app_dialog, app_dialog->created_txns);
+ _show_created_transactions (app_dialog, app_dialog->created_txns);
}
- g_list_free(app_dialog->created_txns);
+ g_list_free (app_dialog->created_txns);
app_dialog->created_txns = NULL;
/* FALL THROUGH */
case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
- gnc_close_gui_component(app_dialog->component_id);
+ gnc_close_gui_component (app_dialog->component_id);
break;
default:
- g_error("unknown response id [%d]", response_id);
+ g_error ("unknown response id [%d]", response_id);
break;
}
}
@@ -1193,18 +1205,18 @@ dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog
* rest of the state will be left alone.
**/
void
-gnc_sx_slr_model_effect_change(GncSxSlrTreeModelAdapter *model,
- gboolean auto_create_only,
- GList **created_transaction_guids,
- GList **creation_errors)
+gnc_sx_slr_model_effect_change (GncSxSlrTreeModelAdapter *model,
+ gboolean auto_create_only,
+ GList **created_transaction_guids,
+ GList **creation_errors)
{
- if (qof_book_is_readonly(gnc_get_current_book()))
+ if (qof_book_is_readonly (gnc_get_current_book ()))
{
/* Is the book read-only? Then don't change anything here. */
return;
}
- g_signal_handler_block(model->instances, model->updated_cb_id);
- gnc_sx_instance_model_effect_change(model->instances, auto_create_only, created_transaction_guids, creation_errors);
- g_signal_handler_unblock(model->instances, model->updated_cb_id);
+ g_signal_handler_block (model->instances, model->updated_cb_id);
+ gnc_sx_instance_model_effect_change (model->instances, auto_create_only, created_transaction_guids, creation_errors);
+ g_signal_handler_unblock (model->instances, model->updated_cb_id);
}
diff --git a/gnucash/gnome/dialog-sx-since-last-run.h b/gnucash/gnome/dialog-sx-since-last-run.h
index e94a355c0..4d7d91294 100644
--- a/gnucash/gnome/dialog-sx-since-last-run.h
+++ b/gnucash/gnome/dialog-sx-since-last-run.h
@@ -42,12 +42,13 @@ typedef struct _GncSxSinceLastRunDialog GncSxSinceLastRunDialog;
* This encapsulates the "run when file opened" application logic. As such,
* it should probably move to a non-ui file.
**/
-void gnc_sx_sxsincelast_book_opened(void);
+void gnc_sx_sxsincelast_book_opened (void);
/**
* Create the since-last-run dialog.
**/
-GncSxSinceLastRunDialog* gnc_ui_sx_since_last_run_dialog (GtkWindow *parent, GncSxInstanceModel *sx_instances,
- GList *auto_created_txn_guids);
+GncSxSinceLastRunDialog* gnc_ui_sx_since_last_run_dialog (GtkWindow *parent,
+ GncSxInstanceModel *sx_instances,
+ GList *auto_created_txn_guids);
#endif
commit c89c677cdeb91af3877e6749164b256589f2a58e
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Mon Sep 28 16:17:27 2020 +0100
Bug 571697 - SLR Transaction Status needs to look clickable
Add a pixbuf cell renderer to the existing cell renderer for the status
column with the 'pan-down-symbolic" icon.
diff --git a/gnucash/gnome/dialog-sx-since-last-run.c b/gnucash/gnome/dialog-sx-since-last-run.c
index d07f4d1a2..864ff5a1d 100644
--- a/gnucash/gnome/dialog-sx-since-last-run.c
+++ b/gnucash/gnome/dialog-sx-since-last-run.c
@@ -1015,6 +1015,16 @@ gnc_ui_sx_since_last_run_dialog (GtkWindow *parent, GncSxInstanceModel *sx_insta
"editable", SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY,
"sensitive", SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY,
NULL);
+
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ g_object_set (G_OBJECT(renderer),
+ "icon-name", "pan-down-symbolic",
+ NULL);
+ gtk_tree_view_column_pack_end (col, renderer, FALSE);
+ gtk_tree_view_column_set_attributes (col, renderer,
+ "visible", SLR_MODEL_COL_INSTANCE_VISIBILITY,
+ "sensitive", SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY,
+ NULL);
gtk_tree_view_append_column(dialog->instance_view, col);
gtk_tree_view_column_set_resizable(col, TRUE);
Summary of changes:
gnucash/gnome/dialog-sx-since-last-run.c | 786 ++++++++++++------------
gnucash/gnome/dialog-sx-since-last-run.h | 7 +-
gnucash/gnome/gnc-plugin-page-register.c | 33 +-
gnucash/gnome/gnc-plugin-page-register2.c | 33 +
gnucash/ui/gnc-plugin-page-account-tree-ui.xml | 3 +
gnucash/ui/gnc-plugin-page-account-tree2-ui.xml | 3 +
gnucash/ui/gnc-plugin-page-register-ui.xml | 1 +
gnucash/ui/gnc-plugin-page-register2-ui.xml | 1 +
8 files changed, 481 insertions(+), 386 deletions(-)
More information about the gnucash-changes
mailing list