gnucash maint: [dialog-sx-editor] fix whitespace
Christopher Lam
clam at code.gnucash.org
Tue Apr 6 19:14:20 EDT 2021
Updated via https://github.com/Gnucash/gnucash/commit/4a3473d9 (commit)
from https://github.com/Gnucash/gnucash/commit/39a0fa3a (commit)
commit 4a3473d991e3de62b53c2fa4f2cd1aad79064a6c
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Wed Apr 7 07:09:27 2021 +0800
[dialog-sx-editor] fix whitespace
diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
index e19b5ef8e..4432f43b7 100644
--- a/gnucash/gnome/dialog-sx-editor.c
+++ b/gnucash/gnome/dialog-sx-editor.c
@@ -97,8 +97,6 @@ typedef enum _EndTypeEnum
END_OCCUR,
} EndType;
-typedef enum { NO_END, DATE_END, COUNT_END } END_TYPE;
-
struct _GncSxEditorDialog
{
GtkWidget *dialog;
@@ -142,25 +140,25 @@ struct _GncSxEditorDialog
/** Prototypes **********************************************************/
-static void schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed );
-static void schedXact_editor_create_ledger( GncSxEditorDialog *sxed );
-static void schedXact_editor_populate( GncSxEditorDialog * );
-static void endgroup_rb_toggled_cb( GtkButton *b, gpointer d );
-static void set_endgroup_toggle_states( GncSxEditorDialog *sxed, EndType t );
-static void advance_toggled_cb( GtkButton *b, GncSxEditorDialog *sxed );
-static void remind_toggled_cb( GtkButton *b, GncSxEditorDialog *sxed );
-static gboolean gnc_sxed_check_consistent( GncSxEditorDialog *sxed );
-static gboolean gnc_sxed_check_changed( GncSxEditorDialog *sxed );
-static void gnc_sxed_save_sx( GncSxEditorDialog *sxed );
-static void gnc_sxed_freq_changed( GncFrequency *gf, gpointer ud );
-static void sxed_excal_update_adapt_cb( GtkWidget *o, gpointer ud );
-static void gnc_sxed_update_cal(GncSxEditorDialog *sxed);
+static void schedXact_editor_create_freq_sel (GncSxEditorDialog *sxed);
+static void schedXact_editor_create_ledger (GncSxEditorDialog *sxed);
+static void schedXact_editor_populate (GncSxEditorDialog *);
+static void endgroup_rb_toggled_cb (GtkButton *b, gpointer d);
+static void set_endgroup_toggle_states (GncSxEditorDialog *sxed, EndType t);
+static void advance_toggled_cb (GtkButton *b, GncSxEditorDialog *sxed);
+static void remind_toggled_cb (GtkButton *b, GncSxEditorDialog *sxed);
+static gboolean gnc_sxed_check_consistent (GncSxEditorDialog *sxed);
+static gboolean gnc_sxed_check_changed (GncSxEditorDialog *sxed);
+static void gnc_sxed_save_sx (GncSxEditorDialog *sxed);
+static void gnc_sxed_freq_changed (GncFrequency *gf, gpointer ud);
+static void sxed_excal_update_adapt_cb (GtkWidget *o, gpointer ud);
+static void gnc_sxed_update_cal (GncSxEditorDialog *sxed);
void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
-static void gnc_sxed_reg_check_close(GncSxEditorDialog *sxed);
-static gboolean sxed_delete_event( GtkWidget *widget, GdkEvent *event, gpointer ud );
-static gboolean sxed_confirmed_cancel( GncSxEditorDialog *sxed );
-static gboolean editor_component_sx_equality( gpointer find_data,
- gpointer user_data );
+static void gnc_sxed_reg_check_close (GncSxEditorDialog *sxed);
+static gboolean sxed_delete_event (GtkWidget *widget, GdkEvent *event, gpointer ud);
+static gboolean sxed_confirmed_cancel (GncSxEditorDialog *sxed);
+static gboolean editor_component_sx_equality (gpointer find_data,
+ gpointer user_data);
static GtkActionEntry gnc_sxed_menu_entries [] =
{
@@ -174,13 +172,13 @@ static guint gnc_sxed_menu_n_entries = G_N_ELEMENTS (gnc_sxed_menu_entries);
/** Implementations *****************************************************/
static void
-sxed_close_handler(gpointer user_data)
+sxed_close_handler (gpointer user_data)
{
GncSxEditorDialog *sxed = user_data;
- gnc_sxed_reg_check_close(sxed);
- gnc_save_window_size( GNC_PREFS_GROUP_SXED, GTK_WINDOW(sxed->dialog) );
- gtk_widget_destroy(sxed->dialog);
+ gnc_sxed_reg_check_close (sxed);
+ gnc_save_window_size (GNC_PREFS_GROUP_SXED, GTK_WINDOW (sxed->dialog));
+ gtk_widget_destroy (sxed->dialog);
/* The data will be cleaned up in the destroy handler. */
}
@@ -190,24 +188,24 @@ sxed_close_handler(gpointer user_data)
* returned, the register's changes have been cancelled.
**/
static gboolean
-sxed_confirmed_cancel(GncSxEditorDialog *sxed)
+sxed_confirmed_cancel (GncSxEditorDialog *sxed)
{
SplitRegister *reg;
- reg = gnc_ledger_display_get_split_register( sxed->ledger );
+ reg = gnc_ledger_display_get_split_register (sxed->ledger);
/* check for changes */
- if ( gnc_sxed_check_changed( sxed ) )
+ if (gnc_sxed_check_changed (sxed))
{
const char *sx_changed_msg =
- _( "This Scheduled Transaction has changed; are you "
- "sure you want to cancel?" );
+ _("This Scheduled Transaction has changed; are you "
+ "sure you want to cancel?");
if (!gnc_verify_dialog (GTK_WINDOW (sxed->dialog), FALSE, "%s", sx_changed_msg))
{
return FALSE;
}
}
/* cancel ledger changes */
- gnc_split_register_cancel_cursor_trans_changes( reg );
+ gnc_split_register_cancel_cursor_trans_changes (reg);
return TRUE;
}
@@ -216,61 +214,61 @@ sxed_confirmed_cancel(GncSxEditorDialog *sxed)
* Dialog Action Button functions *
*********************************/
static void
-editor_cancel_button_clicked_cb( GtkButton *b, GncSxEditorDialog *sxed )
+editor_cancel_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
{
/* close */
- if (!sxed_confirmed_cancel(sxed))
+ if (!sxed_confirmed_cancel (sxed))
return;
- gnc_close_gui_component_by_data( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- sxed );
+ gnc_close_gui_component_by_data (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
+ sxed);
}
static void
-editor_help_button_clicked_cb(GtkButton *b, GncSxEditorDialog *sxed)
+editor_help_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
{
- gnc_gnome_help (GTK_WINDOW(sxed->dialog), HF_HELP, HL_SXEDITOR);
+ gnc_gnome_help (GTK_WINDOW (sxed->dialog), HF_HELP, HL_SXEDITOR);
}
static void
-editor_ok_button_clicked_cb( GtkButton *b, GncSxEditorDialog *sxed )
+editor_ok_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
{
QofBook *book;
SchedXactions *sxes;
- if ( !gnc_sxed_check_consistent( sxed ) )
+ if (!gnc_sxed_check_consistent (sxed))
return;
- gnc_sxed_save_sx( sxed );
+ gnc_sxed_save_sx (sxed);
/* add to list */
// @@fixme -- forget 'new'-flag: check for existence of the SX [?]
- if ( sxed->newsxP )
+ if (sxed->newsxP)
{
book = gnc_get_current_book ();
- sxes = gnc_book_get_schedxactions(book);
- gnc_sxes_add_sx(sxes, sxed->sx);
+ sxes = gnc_book_get_schedxactions (book);
+ gnc_sxes_add_sx (sxes, sxed->sx);
sxed->newsxP = FALSE;
}
/* cleanup */
- gnc_close_gui_component_by_data( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- sxed );
+ gnc_close_gui_component_by_data (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
+ sxed);
}
static gboolean
gnc_sxed_check_name_changed (GncSxEditorDialog *sxed)
{
- char *name = gtk_editable_get_chars (GTK_EDITABLE(sxed->nameEntry), 0, -1);
+ char *name = gtk_editable_get_chars (GTK_EDITABLE (sxed->nameEntry), 0, -1);
- if (strlen(name) == 0)
+ if (strlen (name) == 0)
return TRUE;
- if (xaccSchedXactionGetName(sxed->sx) == NULL ||
- strcmp(xaccSchedXactionGetName(sxed->sx), name) != 0)
+ if (xaccSchedXactionGetName (sxed->sx) == NULL ||
+ strcmp (xaccSchedXactionGetName (sxed->sx), name) != 0)
return TRUE;
return FALSE;
@@ -281,7 +279,7 @@ gnc_sxed_check_end_date_changed (GncSxEditorDialog *sxed)
{
GDate sxEndDate, dlgEndDate;
- if (! xaccSchedXactionHasEndDate (sxed->sx))
+ if (!xaccSchedXactionHasEndDate (sxed->sx))
return TRUE;
sxEndDate = *xaccSchedXactionGetEndDate (sxed->sx);
@@ -295,16 +293,16 @@ gnc_sxed_check_end_date_changed (GncSxEditorDialog *sxed)
}
static gboolean
-gnc_sxed_check_num_occurs_changed(GncSxEditorDialog *sxed)
+gnc_sxed_check_num_occurs_changed (GncSxEditorDialog *sxed)
{
gint sxNumOccur, sxNumRem, dlgNumOccur, dlgNumRem;
- if (! xaccSchedXactionGetNumOccur(sxed->sx))
+ if (!xaccSchedXactionGetNumOccur (sxed->sx))
return TRUE;
dlgNumOccur =
- gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endCountSpin));
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endCountSpin));
dlgNumRem =
- gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endRemainSpin));
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endRemainSpin));
sxNumOccur = xaccSchedXactionGetNumOccur (sxed->sx);
sxNumRem = xaccSchedXactionGetRemOccur (sxed->sx);
@@ -322,11 +320,11 @@ gnc_sxed_check_creation_changed (GncSxEditorDialog *sxed)
gint dlgRemind = 0;
gboolean dlgEnabled =
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->enabledOpt) );
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->enabledOpt));
gboolean dlgAutoCreate =
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->autocreateOpt) );
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->autocreateOpt));
gboolean dlgNotify =
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->notifyOpt) );
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->notifyOpt));
if (dlgEnabled != xaccSchedXactionGetEnabled (sxed->sx))
return TRUE;
@@ -335,13 +333,13 @@ gnc_sxed_check_creation_changed (GncSxEditorDialog *sxed)
if (dlgAutoCreate != sxAutoCreate || dlgNotify != sxNotify)
return TRUE;
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(sxed->advanceOpt)))
- dlgAdvance = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->advanceSpin));
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->advanceOpt)))
+ dlgAdvance = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->advanceSpin));
if (dlgAdvance != xaccSchedXactionGetAdvanceCreation (sxed->sx))
return TRUE;
- if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(sxed->remindOpt)))
- dlgRemind = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->remindSpin));
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->remindOpt)))
+ dlgRemind = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->remindSpin));
if (dlgRemind != xaccSchedXactionGetAdvanceReminder (sxed->sx))
return TRUE;
@@ -356,24 +354,24 @@ gnc_sxed_check_dates_changed (GncSxEditorDialog *sxed)
gchar *dialog_schedule_str, *sx_schedule_str;
gboolean schedules_are_the_same, start_dates_are_the_same;
- g_date_clear(&dialog_start_date, 1);
+ g_date_clear (&dialog_start_date, 1);
gnc_frequency_save_to_recurrence (sxed->gncfreq, &dialog_schedule,
&dialog_start_date);
- dialog_schedule_str = recurrenceListToString(dialog_schedule);
- recurrenceListFree(&dialog_schedule);
+ dialog_schedule_str = recurrenceListToString (dialog_schedule);
+ recurrenceListFree (&dialog_schedule);
sx_start_date = *xaccSchedXactionGetStartDate (sxed->sx);
- sx_schedule_str = recurrenceListToString (gnc_sx_get_schedule(sxed->sx));
+ sx_schedule_str = recurrenceListToString (gnc_sx_get_schedule (sxed->sx));
g_debug ("dialog schedule [%s], sx schedule [%s]",
dialog_schedule_str, sx_schedule_str);
- schedules_are_the_same = (strcmp(dialog_schedule_str,
+ schedules_are_the_same = (strcmp (dialog_schedule_str,
sx_schedule_str) == 0);
- g_free(dialog_schedule_str);
- g_free(sx_schedule_str);
+ g_free (dialog_schedule_str);
+ g_free (sx_schedule_str);
- start_dates_are_the_same = (g_date_compare(&dialog_start_date,
+ start_dates_are_the_same = (g_date_compare (&dialog_start_date,
&sx_start_date) == 0);
if (schedules_are_the_same && start_dates_are_the_same)
@@ -395,7 +393,7 @@ gnc_sxed_check_changed (GncSxEditorDialog *sxed)
return TRUE;
/* name */
- if (gnc_sxed_check_name_changed(sxed))
+ if (gnc_sxed_check_name_changed (sxed))
return TRUE;
/* end options */
/* dialog says... no end */
@@ -405,8 +403,8 @@ gnc_sxed_check_changed (GncSxEditorDialog *sxed)
return TRUE;
/* dialog says... end date */
- if (gtk_toggle_button_get_active( sxed->optEndDate ) &&
- gnc_sxed_check_end_date_changed(sxed))
+ if (gtk_toggle_button_get_active (sxed->optEndDate) &&
+ gnc_sxed_check_end_date_changed (sxed))
return TRUE;
/* dialog says... num occur */
@@ -421,8 +419,8 @@ gnc_sxed_check_changed (GncSxEditorDialog *sxed)
return TRUE;
/* template transactions */
- sr = gnc_ledger_display_get_split_register( sxed->ledger );
- if ( gnc_split_register_changed( sr ) )
+ sr = gnc_ledger_display_get_split_register (sxed->ledger);
+ if (gnc_split_register_changed (sr))
return TRUE;
return FALSE;
@@ -443,19 +441,18 @@ static txnCreditDebitSums *
tcds_new (void)
{
txnCreditDebitSums *tcds = g_new0 (txnCreditDebitSums, 1);
- tcds->creditSum = tcds->debitSum = gnc_numeric_zero();
+ tcds->creditSum = tcds->debitSum = gnc_numeric_zero ();
return tcds;
}
-static
-void
-set_sums_to_zero( gpointer key,
+static void
+set_sums_to_zero (gpointer key,
gpointer val,
- gpointer ud )
+ gpointer ud)
{
txnCreditDebitSums *tcds = (txnCreditDebitSums*)val;
- tcds->creditSum = gnc_numeric_zero();
- tcds->debitSum = gnc_numeric_zero();
+ tcds->creditSum = gnc_numeric_zero ();
+ tcds->debitSum = gnc_numeric_zero ();
}
inline static gnc_numeric
@@ -471,7 +468,7 @@ check_credit_debit_balance (gpointer key, gpointer val, gpointer ud)
gboolean *unbalanced = (gboolean*)ud;
gnc_numeric diff = tcds_difference (tcds);
const char *result = gnc_numeric_zero_p (diff) ? "true" : "false";
- *unbalanced |= !(gnc_numeric_zero_p(diff));
+ *unbalanced |= !(gnc_numeric_zero_p (diff));
DEBUG ("%p | %s [%s - %s = %s]", key, result,
gnc_numeric_to_string (tcds->debitSum),
@@ -486,30 +483,30 @@ gnc_sxed_check_names (GncSxEditorDialog *sxed)
gboolean nameExists, nameHasChanged;
GList *sxList;
- name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
- if ( strlen(name) == 0 )
+ name = gtk_editable_get_chars (GTK_EDITABLE (sxed->nameEntry), 0, -1);
+ if (strlen (name) == 0)
{
const char *sx_has_no_name_msg =
- _( "Please name the Scheduled Transaction." );
- gnc_error_dialog (GTK_WINDOW (sxed->dialog), "%s", sx_has_no_name_msg );
- g_free( name );
+ _("Please name the Scheduled Transaction.");
+ gnc_error_dialog (GTK_WINDOW (sxed->dialog), "%s", sx_has_no_name_msg);
+ g_free (name);
return FALSE;
}
nameExists = FALSE;
- nameKey = g_utf8_collate_key(name, -1);
+ nameKey = g_utf8_collate_key (name, -1);
nameHasChanged =
- (xaccSchedXactionGetName(sxed->sx) == NULL)
- || (strcmp (xaccSchedXactionGetName(sxed->sx), name) != 0);
- for (sxList = gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
+ (xaccSchedXactionGetName (sxed->sx) == NULL)
+ || (strcmp (xaccSchedXactionGetName (sxed->sx), name) != 0);
+ for (sxList = gnc_book_get_schedxactions (gnc_get_current_book ())->sx_list;
nameHasChanged && !nameExists && sxList;
sxList = sxList->next)
{
char *existingName, *existingNameKey;
existingName = xaccSchedXactionGetName ((SchedXaction*)sxList->data);
- existingNameKey = g_utf8_collate_key(existingName, -1);
- nameExists |= (strcmp(nameKey, existingNameKey) == 0 );
+ existingNameKey = g_utf8_collate_key (existingName, -1);
+ nameExists |= (strcmp (nameKey, existingNameKey) == 0);
g_free (existingNameKey);
}
g_free (nameKey);
@@ -535,9 +532,9 @@ gnc_sxed_check_endpoint (GncSxEditorDialog *sxed)
GDate startDate, endDate, nextDate;
GList *schedule = NULL;
- if ( !gtk_toggle_button_get_active(sxed->optEndDate)
- && !gtk_toggle_button_get_active(sxed->optEndCount)
- && !gtk_toggle_button_get_active(sxed->optEndNone) )
+ if (!gtk_toggle_button_get_active (sxed->optEndDate)
+ && !gtk_toggle_button_get_active (sxed->optEndCount)
+ && !gtk_toggle_button_get_active (sxed->optEndNone))
{
const char *sx_end_spec_msg =
_("Please provide a valid end selection.");
@@ -548,9 +545,9 @@ gnc_sxed_check_endpoint (GncSxEditorDialog *sxed)
if (gtk_toggle_button_get_active (sxed->optEndCount))
{
gint occur =
- gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endCountSpin));
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endCountSpin));
gint rem =
- gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(sxed->endRemainSpin));
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endRemainSpin));
if (occur == 0)
{
@@ -581,15 +578,15 @@ gnc_sxed_check_endpoint (GncSxEditorDialog *sxed)
g_date_clear (&nextDate, 1);
gnc_frequency_save_to_recurrence (sxed->gncfreq, &schedule, &startDate);
- if (g_list_length(schedule) > 0)
+ if (g_list_length (schedule) > 0)
{
g_date_subtract_days (&startDate, 1);
recurrenceListNextInstance (schedule, &startDate, &nextDate);
}
recurrenceListFree (&schedule);
- if (!g_date_valid(&nextDate) ||
- (g_date_valid(&endDate) && (g_date_compare(&nextDate, &endDate) > 0)))
+ if (!g_date_valid (&nextDate) ||
+ (g_date_valid (&endDate) && (g_date_compare (&nextDate, &endDate) > 0)))
{
const char *invalid_sx_check_msg =
_("You have attempted to create a Scheduled Transaction which "
@@ -609,11 +606,11 @@ gnc_sxed_check_autocreate (GncSxEditorDialog *sxed, int ttVarCount,
autocreateState =
gtk_toggle_button_get_active (
- GTK_TOGGLE_BUTTON(sxed->autocreateOpt));
+ GTK_TOGGLE_BUTTON (sxed->autocreateOpt));
if (((ttVarCount > 0) || multi_commodity) && autocreateState)
{
- gnc_warning_dialog(GTK_WINDOW (sxed->dialog), "%s",
+ gnc_warning_dialog (GTK_WINDOW (sxed->dialog), "%s",
_("Scheduled Transactions with variables "
"or involving more than one commodity "
"cannot be automatically created."));
@@ -624,9 +621,9 @@ gnc_sxed_check_autocreate (GncSxEditorDialog *sxed, int ttVarCount,
* only valid if there's actually a transaction to create. */
if (autocreateState && splitCount == 0)
{
- gnc_warning_dialog(GTK_WINDOW (sxed->dialog), "%s",
+ gnc_warning_dialog (GTK_WINDOW (sxed->dialog), "%s",
_("Scheduled Transactions without a template "
- "transaction cannot be automatically created.") );
+ "transaction cannot be automatically created."));
return FALSE;
}
return TRUE;
@@ -634,7 +631,7 @@ gnc_sxed_check_autocreate (GncSxEditorDialog *sxed, int ttVarCount,
static gboolean
gnc_sxed_split_check_account (GncSxEditorDialog *sxed, Split *s,
- gnc_commodity *base_cmdty, gboolean *multi_cmdty)
+ gnc_commodity *base_cmdty, gboolean *multi_cmdty)
{
gnc_commodity *split_cmdty = NULL;
gnc_numeric split_amount;
@@ -646,16 +643,16 @@ gnc_sxed_split_check_account (GncSxEditorDialog *sxed, Split *s,
acct = xaccAccountLookup (acct_guid, gnc_get_current_book ());
guid_free (acct_guid);
// If the split is being destroyed always return TRUE.
- if (acct == NULL && !qof_instance_get_destroying(s))
+ if (acct == NULL && !qof_instance_get_destroying (s))
return FALSE;
- split_cmdty = xaccAccountGetCommodity(acct);
- split_amount = xaccSplitGetAmount(s);
- if (!gnc_numeric_zero_p(split_amount) && base_cmdty == NULL)
+ split_cmdty = xaccAccountGetCommodity (acct);
+ split_amount = xaccSplitGetAmount (s);
+ if (!gnc_numeric_zero_p (split_amount) && base_cmdty == NULL)
{
base_cmdty = split_cmdty;
}
- *multi_cmdty |= (!gnc_numeric_zero_p(split_amount) &&
- !gnc_commodity_equal(split_cmdty, base_cmdty));
+ *multi_cmdty |= (!gnc_numeric_zero_p (split_amount) &&
+ !gnc_commodity_equal (split_cmdty, base_cmdty));
return TRUE;
}
@@ -669,7 +666,7 @@ gnc_sxed_split_calculate_formula (GncSxEditorDialog *sxed, Split *s,
qof_instance_get (QOF_INSTANCE (s),
key, &str,
NULL);
- if (str == NULL || strlen(str) == 0)
+ if (str == NULL || strlen (str) == 0)
return TRUE; /* No formula no foul */
if (gnc_sx_parse_vars_from_formula (str, vars, &tmp) < 0)
{
@@ -681,7 +678,7 @@ gnc_sxed_split_calculate_formula (GncSxEditorDialog *sxed, Split *s,
return FALSE;
}
if (g_strcmp0 (key, "sx-credit-formula") == 0)
- tcds->creditSum = gnc_numeric_add(tcds->creditSum, tmp, 100,
+ tcds->creditSum = gnc_numeric_add (tcds->creditSum, tmp, 100,
GNC_DENOM_AUTO | GNC_HOW_DENOM_LCD);
else
tcds->debitSum = gnc_numeric_add (tcds->debitSum, tmp, 100,
@@ -711,17 +708,18 @@ split_error_warning_dialog (GtkWidget *parent, const gchar *title,
"%s", message);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
g_signal_connect_swapped (dialog, "response",
- G_CALLBACK(gtk_widget_destroy), dialog);
+ G_CALLBACK (gtk_widget_destroy), dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
}
+
static gboolean
check_transaction_splits (Transaction *txn, gpointer data)
{
GList *splitList = xaccTransGetSplitList (txn);
CheckTxnSplitData *sd = (CheckTxnSplitData*)data;
- for ( ; splitList; splitList = splitList->next )
+ for (; splitList; splitList = splitList->next)
{
gnc_commodity *base_cmdty = NULL;
Split *s = (Split*)splitList->data;
@@ -785,7 +783,7 @@ check_transaction_splits (Transaction *txn, gpointer data)
* @return true if checks out okay, false otherwise.
******************************************************************************/
static gboolean
-gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
+gnc_sxed_check_consistent (GncSxEditorDialog *sxed)
{
/* Do checks on validity and such, interrupting the user if
@@ -831,7 +829,7 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
/* FIXME: This is probably superfluous. */
gnc_split_register_save (
- gnc_ledger_display_get_split_register(sxed->ledger), FALSE);
+ gnc_ledger_display_get_split_register (sxed->ledger), FALSE);
/* numeric-formulas-get-balanced determination */
gnc_sx_get_variables (sxed->sx, vars);
@@ -844,16 +842,16 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
numIters = NUM_ITERS_WITH_VARS;
}
- for ( i = 0; i < numIters && !unbalanceable; i++ )
+ for (i = 0; i < numIters && !unbalanceable; i++)
{
GList *splitList = xaccSchedXactionGetSplits (sxed->sx);
Account *tmpl_acct = gnc_sx_get_template_transaction_account (sxed->sx);
- gnc_sx_randomize_variables(vars);
- g_hash_table_foreach( txns, set_sums_to_zero, NULL );
+ gnc_sx_randomize_variables (vars);
+ g_hash_table_foreach (txns, set_sums_to_zero, NULL);
- splitCount += g_list_length( splitList );
+ splitCount += g_list_length (splitList);
- xaccAccountForEachTransaction(tmpl_acct, check_transaction_splits, &sd);
+ xaccAccountForEachTransaction (tmpl_acct, check_transaction_splits, &sd);
if (sd.err)
return FALSE;
@@ -862,11 +860,11 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
}
/* Subtract out pre-defined vars */
- if (g_hash_table_lookup_extended(vars, "i", &unusedKey, &unusedValue))
+ if (g_hash_table_lookup_extended (vars, "i", &unusedKey, &unusedValue))
ttVarCount -= 1;
- g_hash_table_destroy(vars);
- g_hash_table_destroy(txns);
+ g_hash_table_destroy (vars);
+ g_hash_table_destroy (txns);
if (unbalanceable)
{
@@ -895,58 +893,58 @@ gnc_sxed_check_consistent( GncSxEditorDialog *sxed )
* has returned true.
*****************************************************************************/
static void
-gnc_sxed_save_sx( GncSxEditorDialog *sxed )
+gnc_sxed_save_sx (GncSxEditorDialog *sxed)
{
- gnc_sx_begin_edit( sxed->sx );
+ gnc_sx_begin_edit (sxed->sx);
/* name */
{
char *name;
- name = gtk_editable_get_chars( sxed->nameEntry, 0, -1 );
- xaccSchedXactionSetName( sxed->sx, name );
- g_free( name );
+ name = gtk_editable_get_chars (sxed->nameEntry, 0, -1);
+ xaccSchedXactionSetName (sxed->sx, name);
+ g_free (name);
}
/* date */
{
GDate gdate;
- if ( gtk_toggle_button_get_active(sxed->optEndDate) )
+ if (gtk_toggle_button_get_active (sxed->optEndDate))
{
/* get the end date data */
- gnc_gdate_set_time64( &gdate,
- gnc_date_edit_get_date(
- sxed->endDateEntry ) );
- xaccSchedXactionSetEndDate( sxed->sx, &gdate );
+ gnc_gdate_set_time64(&gdate,
+ gnc_date_edit_get_date (
+ sxed->endDateEntry));
+ xaccSchedXactionSetEndDate (sxed->sx, &gdate);
/* set the num occurrences data */
- xaccSchedXactionSetNumOccur( sxed->sx, 0 );
+ xaccSchedXactionSetNumOccur (sxed->sx, 0);
}
- else if ( gtk_toggle_button_get_active(sxed->optEndCount) )
+ else if (gtk_toggle_button_get_active (sxed->optEndCount))
{
gint num;
/* get the occurrences data */
num =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endCountSpin) );
- xaccSchedXactionSetNumOccur( sxed->sx, num );
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endCountSpin));
+ xaccSchedXactionSetNumOccur (sxed->sx, num);
num =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
- xaccSchedXactionSetRemOccur( sxed->sx, num );
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endRemainSpin));
+ xaccSchedXactionSetRemOccur (sxed->sx, num);
- g_date_clear( &gdate, 1 );
- xaccSchedXactionSetEndDate( sxed->sx, &gdate );
+ g_date_clear (&gdate, 1);
+ xaccSchedXactionSetEndDate (sxed->sx, &gdate);
}
- else if ( gtk_toggle_button_get_active( sxed->optEndNone ) )
+ else if (gtk_toggle_button_get_active (sxed->optEndNone))
{
- xaccSchedXactionSetNumOccur( sxed->sx, 0 );
- g_date_clear( &gdate, 1 );
- xaccSchedXactionSetEndDate( sxed->sx, &gdate );
+ xaccSchedXactionSetNumOccur (sxed->sx, 0);
+ g_date_clear (&gdate, 1);
+ xaccSchedXactionSetEndDate (sxed->sx, &gdate);
}
else
{
- g_critical("no valid end specified\n");
+ g_critical ("no valid end specified\n");
}
}
@@ -954,21 +952,21 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
{
gboolean enabledState;
- enabledState = gtk_toggle_button_get_active( sxed->enabledOpt );
- xaccSchedXactionSetEnabled( sxed->sx, enabledState );
+ enabledState = gtk_toggle_button_get_active (sxed->enabledOpt);
+ xaccSchedXactionSetEnabled (sxed->sx, enabledState);
}
/* Auto-create/notification states */
{
gboolean autocreateState, notifyState;
- autocreateState = gtk_toggle_button_get_active( sxed->autocreateOpt );
- notifyState = gtk_toggle_button_get_active( sxed->notifyOpt );
+ autocreateState = gtk_toggle_button_get_active (sxed->autocreateOpt);
+ notifyState = gtk_toggle_button_get_active (sxed->notifyOpt);
/* "Notify" only makes sense if AutoCreate is activated;
* enforce that here. */
- xaccSchedXactionSetAutoCreate( sxed->sx,
+ xaccSchedXactionSetAutoCreate (sxed->sx,
autocreateState,
- (autocreateState & notifyState) );
+ (autocreateState & notifyState));
}
/* days in advance */
@@ -976,20 +974,20 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
int daysInAdvance;
daysInAdvance = 0;
- if ( gtk_toggle_button_get_active( sxed->advanceOpt ) )
+ if (gtk_toggle_button_get_active (sxed->advanceOpt))
{
daysInAdvance =
- gtk_spin_button_get_value_as_int( sxed->advanceSpin );
+ gtk_spin_button_get_value_as_int (sxed->advanceSpin);
}
- xaccSchedXactionSetAdvanceCreation( sxed->sx, daysInAdvance );
+ xaccSchedXactionSetAdvanceCreation (sxed->sx, daysInAdvance);
daysInAdvance = 0;
- if ( gtk_toggle_button_get_active( sxed->remindOpt ) )
+ if (gtk_toggle_button_get_active (sxed->remindOpt))
{
daysInAdvance =
- gtk_spin_button_get_value_as_int( sxed->remindSpin );
+ gtk_spin_button_get_value_as_int (sxed->remindSpin);
}
- xaccSchedXactionSetAdvanceReminder( sxed->sx, daysInAdvance );
+ xaccSchedXactionSetAdvanceReminder (sxed->sx, daysInAdvance);
}
/* start date and freq spec */
@@ -997,64 +995,64 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
GDate gdate;
GList *schedule = NULL;
- gnc_frequency_save_to_recurrence(sxed->gncfreq, &schedule, &gdate);
- gnc_sx_set_schedule(sxed->sx, schedule);
+ gnc_frequency_save_to_recurrence (sxed->gncfreq, &schedule, &gdate);
+ gnc_sx_set_schedule (sxed->sx, schedule);
{
- gchar *recurrence_str = recurrenceListToCompactString(schedule);
- g_debug("recurrences parsed [%s]", recurrence_str);
- g_free(recurrence_str);
+ gchar *recurrence_str = recurrenceListToCompactString (schedule);
+ g_debug ("recurrences parsed [%s]", recurrence_str);
+ g_free (recurrence_str);
}
/* now that we have it, set the start date */
- xaccSchedXactionSetStartDate( sxed->sx, &gdate );
+ xaccSchedXactionSetStartDate (sxed->sx, &gdate);
}
- gnc_sx_commit_edit( sxed->sx );
+ gnc_sx_commit_edit (sxed->sx);
}
static void
-enabled_toggled_cb( GtkToggleButton *o, GncSxEditorDialog *sxed )
+enabled_toggled_cb (GtkToggleButton *o, GncSxEditorDialog *sxed)
{
return;
}
static void
-autocreate_toggled_cb( GtkToggleButton *o, GncSxEditorDialog *sxed )
+autocreate_toggled_cb (GtkToggleButton *o, GncSxEditorDialog *sxed)
{
- if ( !gtk_toggle_button_get_active (o) )
+ if (!gtk_toggle_button_get_active (o))
{
- gtk_toggle_button_set_active( sxed->notifyOpt, FALSE );
+ gtk_toggle_button_set_active (sxed->notifyOpt, FALSE);
}
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->notifyOpt),
- gtk_toggle_button_get_active (o) );
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->notifyOpt),
+ gtk_toggle_button_get_active (o));
}
static void
-advance_toggled_cb( GtkButton *o, GncSxEditorDialog *sxed )
+advance_toggled_cb (GtkButton *o, GncSxEditorDialog *sxed)
{
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->advanceSpin),
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->advanceOpt) ) );
- gtk_editable_set_editable( GTK_EDITABLE(sxed->advanceSpin), TRUE );
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->advanceSpin),
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->advanceOpt)));
+ gtk_editable_set_editable (GTK_EDITABLE (sxed->advanceSpin), TRUE);
}
static void
-remind_toggled_cb( GtkButton *o, GncSxEditorDialog *sxed )
+remind_toggled_cb (GtkButton *o, GncSxEditorDialog *sxed)
{
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->remindSpin),
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->remindOpt) ) );
- gtk_editable_set_editable( GTK_EDITABLE(sxed->remindSpin), TRUE );
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->remindSpin),
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sxed->remindOpt)));
+ gtk_editable_set_editable (GTK_EDITABLE (sxed->remindSpin), TRUE);
}
/* Local destruction of dialog */
static void
-scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
+scheduledxaction_editor_dialog_destroy (GtkWidget *object, gpointer data)
{
GncSxEditorDialog *sxed = data;
@@ -1064,8 +1062,8 @@ scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
gnc_unregister_gui_component_by_data
(DIALOG_SCHEDXACTION_EDITOR_CM_CLASS, sxed);
- gnc_embedded_window_close_page(sxed->embed_window, sxed->plugin_page);
- gtk_widget_destroy(GTK_WIDGET(sxed->embed_window));
+ gnc_embedded_window_close_page (sxed->embed_window, sxed->plugin_page);
+ gtk_widget_destroy (GTK_WIDGET (sxed->embed_window));
sxed->embed_window = NULL;
sxed->plugin_page = NULL;
sxed->ledger = NULL;
@@ -1073,7 +1071,7 @@ scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
g_free (sxed->sxGUIDstr);
sxed->sxGUIDstr = NULL;
- if ( sxed->newsxP )
+ if (sxed->newsxP)
{
/* FIXME: WTF???
*
@@ -1083,8 +1081,8 @@ scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
* "Cancel" is clicked, the flag will still be true, and this
* SX will be cleaned, here. -- jsled
*/
- gnc_sx_begin_edit( sxed->sx );
- xaccSchedXactionDestroy( sxed->sx );
+ gnc_sx_begin_edit (sxed->sx);
+ xaccSchedXactionDestroy (sxed->sx);
}
sxed->sx = NULL;
@@ -1094,18 +1092,18 @@ scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
static
gboolean
-sxed_delete_event( GtkWidget *widget, GdkEvent *event, gpointer ud )
+sxed_delete_event (GtkWidget *widget, GdkEvent *event, gpointer ud)
{
GncSxEditorDialog *sxed = (GncSxEditorDialog*)ud;
/* We've already processed the SX, likely because of "ok" being
* clicked. */
- if ( sxed->sx == NULL )
+ if (sxed->sx == NULL)
{
return FALSE;
}
- if ( ! sxed_confirmed_cancel( sxed ) )
+ if (!sxed_confirmed_cancel (sxed))
{
return TRUE;
}
@@ -1117,8 +1115,8 @@ sxed_delete_event( GtkWidget *widget, GdkEvent *event, gpointer ud )
* Create the Schedule Editor Dialog *
************************************/
GncSxEditorDialog *
-gnc_ui_scheduled_xaction_editor_dialog_create (GtkWindow *parent,
- SchedXaction *sx, gboolean newSX)
+gnc_ui_scheduled_xaction_editor_dialog_create (GtkWindow *parent,
+ SchedXaction *sx, gboolean newSX)
{
GncSxEditorDialog *sxed;
GtkBuilder *builder;
@@ -1138,9 +1136,9 @@ gnc_ui_scheduled_xaction_editor_dialog_create (GtkWindow *parent,
{ "ok_button", "clicked", editor_ok_button_clicked_cb, NULL },
{ "cancel_button", "clicked", editor_cancel_button_clicked_cb, NULL },
{ "help_button", "clicked", editor_help_button_clicked_cb, NULL },
- { "rb_noend", "toggled", endgroup_rb_toggled_cb, GINT_TO_POINTER(END_NEVER_OPTION) },
- { "rb_enddate", "toggled", endgroup_rb_toggled_cb, GINT_TO_POINTER(END_DATE_OPTION) },
- { "rb_num_occur", "toggled", endgroup_rb_toggled_cb, GINT_TO_POINTER(NUM_OCCUR_OPTION) },
+ { "rb_noend", "toggled", endgroup_rb_toggled_cb, GINT_TO_POINTER (END_NEVER_OPTION) },
+ { "rb_enddate", "toggled", endgroup_rb_toggled_cb, GINT_TO_POINTER (END_DATE_OPTION) },
+ { "rb_num_occur", "toggled", endgroup_rb_toggled_cb, GINT_TO_POINTER (NUM_OCCUR_OPTION) },
{ "remain_spin" , "value-changed", sxed_excal_update_adapt_cb, NULL },
{ "enabled_opt", "toggled", enabled_toggled_cb, NULL },
{ "autocreate_opt", "toggled", autocreate_toggled_cb, NULL },
@@ -1149,25 +1147,25 @@ gnc_ui_scheduled_xaction_editor_dialog_create (GtkWindow *parent,
{ NULL, NULL, NULL, NULL }
};
- dlgExists = gnc_find_gui_components( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
+ dlgExists = gnc_find_gui_components (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
editor_component_sx_equality,
- sx );
- if ( dlgExists != NULL )
+ sx);
+ if (dlgExists)
{
- g_debug( "dialog already exists; using that one." );
+ g_debug ("dialog already exists; using that one.");
sxed = (GncSxEditorDialog*)dlgExists->data;
- gtk_window_present( GTK_WINDOW(sxed->dialog) );
- g_list_free( dlgExists );
+ gtk_window_present (GTK_WINDOW (sxed->dialog));
+ g_list_free (dlgExists);
return sxed;
}
- sxed = g_new0( GncSxEditorDialog, 1 );
+ sxed = g_new0(GncSxEditorDialog, 1);
sxed->sx = sx;
sxed->newsxP = newSX;
/* Load up Glade file */
- builder = gtk_builder_new();
+ builder = gtk_builder_new ();
gnc_builder_add_from_file (builder, "dialog-sx.glade", "advance_days_adj");
gnc_builder_add_from_file (builder, "dialog-sx.glade", "remind_days_adj");
gnc_builder_add_from_file (builder, "dialog-sx.glade", "end_spin_adj");
@@ -1177,167 +1175,165 @@ gnc_ui_scheduled_xaction_editor_dialog_create (GtkWindow *parent,
sxed->builder = builder;
/* Connect the Widgets */
- sxed->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "scheduled_transaction_editor_dialog"));
- sxed->notebook = GTK_NOTEBOOK(gtk_builder_get_object (builder, "editor_notebook"));
- sxed->nameEntry = GTK_EDITABLE(gtk_builder_get_object (builder, "sxe_name"));
- sxed->enabledOpt = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "enabled_opt"));
- sxed->autocreateOpt = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "autocreate_opt"));
- sxed->notifyOpt = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "notify_opt"));
- sxed->advanceOpt = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "advance_opt"));
- sxed->advanceSpin = GTK_SPIN_BUTTON(gtk_builder_get_object (builder, "advance_days"));
- sxed->remindOpt = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "remind_opt"));
- sxed->remindSpin = GTK_SPIN_BUTTON(gtk_builder_get_object (builder, "remind_days"));
- sxed->lastOccurLabel = GTK_LABEL(gtk_builder_get_object (builder, "last_occur_label"));
- sxed->optEndNone = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "rb_noend"));
- sxed->optEndDate = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "rb_enddate"));
- sxed->optEndCount = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "rb_num_occur"));
- sxed->endCountSpin = GTK_ENTRY(gtk_builder_get_object (builder, "end_spin"));
- sxed->endRemainSpin = GTK_ENTRY(gtk_builder_get_object (builder, "remain_spin"));
+ sxed->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "scheduled_transaction_editor_dialog"));
+ sxed->notebook = GTK_NOTEBOOK (gtk_builder_get_object (builder, "editor_notebook"));
+ sxed->nameEntry = GTK_EDITABLE (gtk_builder_get_object (builder, "sxe_name"));
+ sxed->enabledOpt = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "enabled_opt"));
+ sxed->autocreateOpt = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "autocreate_opt"));
+ sxed->notifyOpt = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "notify_opt"));
+ sxed->advanceOpt = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "advance_opt"));
+ sxed->advanceSpin = GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "advance_days"));
+ sxed->remindOpt = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "remind_opt"));
+ sxed->remindSpin = GTK_SPIN_BUTTON (gtk_builder_get_object (builder, "remind_days"));
+ sxed->lastOccurLabel = GTK_LABEL (gtk_builder_get_object (builder, "last_occur_label"));
+ sxed->optEndNone = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "rb_noend"));
+ sxed->optEndDate = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "rb_enddate"));
+ sxed->optEndCount = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "rb_num_occur"));
+ sxed->endCountSpin = GTK_ENTRY (gtk_builder_get_object (builder, "end_spin"));
+ sxed->endRemainSpin = GTK_ENTRY (gtk_builder_get_object (builder, "remain_spin"));
// Set the name of this dialog so it can be easily manipulated with css
- gtk_widget_set_name (GTK_WIDGET(sxed->dialog), "gnc-id-sx-editor");
- gnc_widget_style_context_add_class (GTK_WIDGET(sxed->dialog), "gnc-class-sx");
-
+ gtk_widget_set_name (GTK_WIDGET (sxed->dialog), "gnc-id-sx-editor");
+ gnc_widget_style_context_add_class (GTK_WIDGET (sxed->dialog), "gnc-class-sx");
+
gtk_window_set_transient_for (GTK_WINDOW (sxed->dialog), parent);
/* Setup the end-date GNC widget */
{
- GtkWidget *endDateBox = GTK_WIDGET(gtk_builder_get_object (builder, "editor_end_date_box"));
- sxed->endDateEntry = GNC_DATE_EDIT(gnc_date_edit_new (gnc_time (NULL), FALSE, FALSE));
- gtk_widget_show(GTK_WIDGET(sxed->endDateEntry));
- g_signal_connect( sxed->endDateEntry, "date-changed",
- G_CALLBACK( sxed_excal_update_adapt_cb ), sxed );
- gtk_box_pack_start( GTK_BOX(endDateBox), GTK_WIDGET(sxed->endDateEntry),
- TRUE, TRUE, 0 );
+ GtkWidget *endDateBox = GTK_WIDGET (gtk_builder_get_object (builder, "editor_end_date_box"));
+ sxed->endDateEntry = GNC_DATE_EDIT (gnc_date_edit_new (gnc_time (NULL), FALSE, FALSE));
+ gtk_widget_show (GTK_WIDGET (sxed->endDateEntry));
+ g_signal_connect (sxed->endDateEntry, "date-changed",
+ G_CALLBACK (sxed_excal_update_adapt_cb), sxed);
+ gtk_box_pack_start (GTK_BOX (endDateBox), GTK_WIDGET (sxed->endDateEntry),
+ TRUE, TRUE, 0);
}
- id = gnc_register_gui_component( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
+ id = gnc_register_gui_component (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
NULL, /* no refresh handler */
sxed_close_handler,
- sxed );
+ sxed);
// This ensure this dialog is closed when the session is closed.
- gnc_gui_component_set_session (id, gnc_get_current_session());
+ gnc_gui_component_set_session (id, gnc_get_current_session ());
- g_signal_connect( sxed->dialog, "delete_event",
- G_CALLBACK(sxed_delete_event), sxed );
- g_signal_connect( sxed->dialog, "destroy",
- G_CALLBACK(scheduledxaction_editor_dialog_destroy),
- sxed );
+ g_signal_connect (sxed->dialog, "delete_event",
+ G_CALLBACK (sxed_delete_event), sxed);
+ g_signal_connect (sxed->dialog, "destroy",
+ G_CALLBACK (scheduledxaction_editor_dialog_destroy),
+ sxed);
- for ( i = 0; widgets[i].name != NULL; i++ )
+ for (i = 0; widgets[i].name; i++)
{
- button = GTK_WIDGET(gtk_builder_get_object (builder, widgets[i].name ));
- if ( widgets[i].objectData != NULL )
+ button = GTK_WIDGET (gtk_builder_get_object (builder, widgets[i].name));
+ if (widgets[i].objectData)
{
- g_object_set_data( G_OBJECT(button), "whichOneAmI",
- widgets[i].objectData );
+ g_object_set_data (G_OBJECT (button), "whichOneAmI",
+ widgets[i].objectData);
}
- g_signal_connect( button, widgets[i].signal,
- G_CALLBACK( widgets[i].fn ), sxed );
+ g_signal_connect (button, widgets[i].signal,
+ G_CALLBACK (widgets[i].fn), sxed);
}
/* Set sensitivity settings */
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->notifyOpt), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->advanceSpin), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->remindSpin), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endCountSpin), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endRemainSpin), FALSE );
- gtk_editable_set_editable( GTK_EDITABLE(sxed->advanceSpin), TRUE );
- gtk_editable_set_editable( GTK_EDITABLE(sxed->remindSpin), TRUE );
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->notifyOpt), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->advanceSpin), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->remindSpin), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->endCountSpin), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->endRemainSpin), FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (sxed->advanceSpin), TRUE);
+ gtk_editable_set_editable (GTK_EDITABLE (sxed->remindSpin), TRUE);
/* Allow resize */
- gtk_window_set_resizable (GTK_WINDOW(sxed->dialog), TRUE);
- gnc_restore_window_size(GNC_PREFS_GROUP_SXED, GTK_WINDOW(sxed->dialog), parent);
+ gtk_window_set_resizable (GTK_WINDOW (sxed->dialog), TRUE);
+ gnc_restore_window_size (GNC_PREFS_GROUP_SXED, GTK_WINDOW (sxed->dialog), parent);
/* create the frequency-selection widget and example [dense-]calendar. */
- schedXact_editor_create_freq_sel( sxed );
+ schedXact_editor_create_freq_sel (sxed);
/* create the template-transaction ledger window */
- schedXact_editor_create_ledger( sxed );
+ schedXact_editor_create_ledger (sxed);
/* populate */
- schedXact_editor_populate( sxed );
+ schedXact_editor_populate (sxed);
/* Do not call show_all here. Screws up the gtkuimanager code */
- gtk_widget_show(sxed->dialog);
- gtk_notebook_set_current_page(GTK_NOTEBOOK(sxed->notebook), 0);
+ gtk_widget_show (sxed->dialog);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (sxed->notebook), 0);
/* Refresh the cal and the ledger */
- gtk_widget_queue_resize( GTK_WIDGET( sxed->example_cal ) );
+ gtk_widget_queue_resize (GTK_WIDGET (sxed->example_cal));
- gnc_ledger_display_refresh( sxed->ledger );
+ gnc_ledger_display_refresh (sxed->ledger);
/* Move keyboard focus to the name entry */
- gtk_widget_grab_focus(GTK_WIDGET(sxed->nameEntry));
+ gtk_widget_grab_focus (GTK_WIDGET (sxed->nameEntry));
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, sxed);
- g_object_unref(G_OBJECT(builder));
+ g_object_unref (G_OBJECT (builder));
return sxed;
}
-static
-void
-schedXact_editor_create_freq_sel( GncSxEditorDialog *sxed )
+static void
+schedXact_editor_create_freq_sel (GncSxEditorDialog *sxed)
{
GtkBox *b;
GtkWidget *example_cal_scrolled_win = NULL;
- b = GTK_BOX(gtk_builder_get_object (sxed->builder, "gncfreq_hbox"));
+ b = GTK_BOX (gtk_builder_get_object (sxed->builder, "gncfreq_hbox"));
sxed->gncfreq =
- GNC_FREQUENCY(gnc_frequency_new_from_recurrence(gnc_sx_get_schedule(sxed->sx),
- xaccSchedXactionGetStartDate(sxed->sx)));
- g_assert(sxed->gncfreq);
- g_signal_connect( sxed->gncfreq, "changed",
- G_CALLBACK(gnc_sxed_freq_changed),
- sxed );
+ GNC_FREQUENCY (gnc_frequency_new_from_recurrence (gnc_sx_get_schedule (sxed->sx),
+ xaccSchedXactionGetStartDate (sxed->sx)));
+ g_assert (sxed->gncfreq);
+ g_signal_connect (sxed->gncfreq, "changed",
+ G_CALLBACK (gnc_sxed_freq_changed),
+ sxed);
- gtk_box_pack_start(GTK_BOX(b), GTK_WIDGET(sxed->gncfreq), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (b), GTK_WIDGET (sxed->gncfreq), TRUE, TRUE, 0);
- b = GTK_BOX(gtk_builder_get_object (sxed->builder, "example_cal_hbox" ));
+ b = GTK_BOX (gtk_builder_get_object (sxed->builder, "example_cal_hbox"));
- example_cal_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(example_cal_scrolled_win),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX(b), example_cal_scrolled_win, TRUE, TRUE, 0);
+ example_cal_scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (example_cal_scrolled_win),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_box_pack_start (GTK_BOX (b), example_cal_scrolled_win, TRUE, TRUE, 0);
- sxed->dense_cal_model = gnc_dense_cal_store_new(EX_CAL_NUM_MONTHS * 31);
- sxed->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new_with_model(GNC_DENSE_CAL_MODEL(sxed->dense_cal_model)));
- g_assert(sxed->example_cal);
- gnc_dense_cal_set_num_months( sxed->example_cal, EX_CAL_NUM_MONTHS );
- gnc_dense_cal_set_months_per_col( sxed->example_cal, EX_CAL_MO_PER_COL );
- gtk_container_add (GTK_CONTAINER(example_cal_scrolled_win), GTK_WIDGET(sxed->example_cal));
+ sxed->dense_cal_model = gnc_dense_cal_store_new (EX_CAL_NUM_MONTHS * 31);
+ sxed->example_cal = GNC_DENSE_CAL (gnc_dense_cal_new_with_model (GNC_DENSE_CAL_MODEL (sxed->dense_cal_model)));
+ g_assert (sxed->example_cal);
+ gnc_dense_cal_set_num_months (sxed->example_cal, EX_CAL_NUM_MONTHS);
+ gnc_dense_cal_set_months_per_col (sxed->example_cal, EX_CAL_MO_PER_COL);
+ gtk_container_add (GTK_CONTAINER (example_cal_scrolled_win), GTK_WIDGET (sxed->example_cal));
- gtk_widget_show_all( example_cal_scrolled_win );
+ gtk_widget_show_all (example_cal_scrolled_win);
}
-static
-void
-schedXact_editor_create_ledger( GncSxEditorDialog *sxed )
+static void
+schedXact_editor_create_ledger (GncSxEditorDialog *sxed)
{
SplitRegister *splitreg;
GtkWidget *main_vbox;
/* Create the ledger */
- sxed->sxGUIDstr = guid_to_string( xaccSchedXactionGetGUID(sxed->sx) );
- sxed->ledger = gnc_ledger_display_template_gl( sxed->sxGUIDstr );
- splitreg = gnc_ledger_display_get_split_register( sxed->ledger );
+ sxed->sxGUIDstr = guid_to_string (xaccSchedXactionGetGUID (sxed->sx));
+ sxed->ledger = gnc_ledger_display_template_gl (sxed->sxGUIDstr);
+ splitreg = gnc_ledger_display_get_split_register (sxed->ledger);
/* First the embedded window */
- main_vbox = GTK_WIDGET(gtk_builder_get_object (sxed->builder, "register_vbox" ));
+ main_vbox = GTK_WIDGET (gtk_builder_get_object (sxed->builder, "register_vbox"));
sxed->embed_window =
- gnc_embedded_window_new("SXWindowActions",
- gnc_sxed_menu_entries,
- gnc_sxed_menu_n_entries,
- "gnc-sxed-window-ui.xml",
- sxed->dialog,
- FALSE, /* no accelerators */
- sxed);
- gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET(sxed->embed_window),
+ gnc_embedded_window_new ("SXWindowActions",
+ gnc_sxed_menu_entries,
+ gnc_sxed_menu_n_entries,
+ "gnc-sxed-window-ui.xml",
+ sxed->dialog,
+ FALSE, /* no accelerators */
+ sxed);
+ gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (sxed->embed_window),
TRUE, TRUE, 0);
/* Now create the register plugin page. */
@@ -1345,24 +1341,23 @@ schedXact_editor_create_ledger( GncSxEditorDialog *sxed )
gnc_plugin_page_set_ui_description (sxed->plugin_page,
"gnc-sxed-window-ui-full.xml");
gnc_plugin_page_register_set_options (sxed->plugin_page,
- NUM_LEDGER_LINES_DEFAULT, FALSE );
+ NUM_LEDGER_LINES_DEFAULT, FALSE);
gnc_embedded_window_open_page (sxed->embed_window, sxed->plugin_page);
/* configure... */
/* use double-line, so scheduled transaction Notes can be edited */
- gnc_split_register_config(splitreg,
+ gnc_split_register_config (splitreg,
splitreg->type, splitreg->style,
TRUE);
- gnc_split_register_set_auto_complete(splitreg, FALSE);
+ gnc_split_register_set_auto_complete (splitreg, FALSE);
/* don't show present/future divider [by definition, not necessary] */
- gnc_split_register_show_present_divider( splitreg, FALSE );
+ gnc_split_register_show_present_divider (splitreg, FALSE);
}
-static
-void
-schedXact_editor_populate( GncSxEditorDialog *sxed )
+static void
+schedXact_editor_populate (GncSxEditorDialog *sxed)
{
char *name;
time64 tmpDate;
@@ -1371,58 +1366,58 @@ schedXact_editor_populate( GncSxEditorDialog *sxed )
gint daysInAdvance;
gboolean enabledState, autoCreateState, notifyState;
- name = xaccSchedXactionGetName(sxed->sx);
- if ( name != NULL )
+ name = xaccSchedXactionGetName (sxed->sx);
+ if (name)
{
- gtk_entry_set_text( GTK_ENTRY(sxed->nameEntry), name );
+ gtk_entry_set_text (GTK_ENTRY (sxed->nameEntry), name );
}
{
- gd = xaccSchedXactionGetLastOccurDate( sxed->sx );
- if ( g_date_valid( gd ) )
+ gd = xaccSchedXactionGetLastOccurDate (sxed->sx);
+ if (g_date_valid (gd))
{
- gchar dateBuf[ MAX_DATE_LENGTH+1 ];
- qof_print_gdate( dateBuf, MAX_DATE_LENGTH, gd );
- gtk_label_set_text( sxed->lastOccurLabel, dateBuf );
+ gchar dateBuf [MAX_DATE_LENGTH+1];
+ qof_print_gdate (dateBuf, MAX_DATE_LENGTH, gd);
+ gtk_label_set_text (sxed->lastOccurLabel, dateBuf);
}
else
{
- gtk_label_set_text( sxed->lastOccurLabel, _( "(never)" ) );
+ gtk_label_set_text (sxed->lastOccurLabel, _("(never)"));
}
gd = NULL;
}
- gd = xaccSchedXactionGetEndDate( sxed->sx );
- if ( g_date_valid( gd ) )
+ gd = xaccSchedXactionGetEndDate (sxed->sx);
+ if (g_date_valid (gd))
{
- gtk_toggle_button_set_active( sxed->optEndDate, TRUE );
+ gtk_toggle_button_set_active (sxed->optEndDate, TRUE);
tmpDate = gnc_time64_get_day_start_gdate (gd);
- gnc_date_edit_set_time( sxed->endDateEntry, tmpDate );
+ gnc_date_edit_set_time (sxed->endDateEntry, tmpDate);
- set_endgroup_toggle_states( sxed, END_DATE );
+ set_endgroup_toggle_states (sxed, END_DATE);
}
- else if ( xaccSchedXactionHasOccurDef( sxed->sx ) )
+ else if (xaccSchedXactionHasOccurDef (sxed->sx))
{
- gint numOccur = xaccSchedXactionGetNumOccur( sxed->sx );
- gint numRemain = xaccSchedXactionGetRemOccur( sxed->sx );
+ gint numOccur = xaccSchedXactionGetNumOccur (sxed->sx);
+ gint numRemain = xaccSchedXactionGetRemOccur (sxed->sx);
- gtk_toggle_button_set_active( sxed->optEndCount, TRUE );
+ gtk_toggle_button_set_active (sxed->optEndCount, TRUE);
- gtk_spin_button_set_value ( GTK_SPIN_BUTTON(sxed->endCountSpin), numOccur );
- gtk_spin_button_set_value ( GTK_SPIN_BUTTON(sxed->endRemainSpin), numRemain );
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (sxed->endCountSpin), numOccur);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (sxed->endRemainSpin), numRemain);
- set_endgroup_toggle_states( sxed, END_OCCUR );
+ set_endgroup_toggle_states (sxed, END_OCCUR);
}
else
{
- gtk_toggle_button_set_active( sxed->optEndNone, TRUE );
- set_endgroup_toggle_states( sxed, END_NEVER );
+ gtk_toggle_button_set_active (sxed->optEndNone, TRUE);
+ set_endgroup_toggle_states (sxed, END_NEVER);
}
- enabledState = xaccSchedXactionGetEnabled( sxed->sx );
- gtk_toggle_button_set_active( sxed->enabledOpt, enabledState );
+ enabledState = xaccSchedXactionGetEnabled (sxed->sx);
+ gtk_toggle_button_set_active (sxed->enabledOpt, enabledState);
/* Do auto-create/notify setup */
- if ( sxed->newsxP )
+ if (sxed->newsxP)
{
autoCreateState =
gnc_prefs_get_bool (GNC_PREFS_GROUP_SXED, GNC_PREF_CREATE_AUTO);
@@ -1431,19 +1426,19 @@ schedXact_editor_populate( GncSxEditorDialog *sxed )
}
else
{
- xaccSchedXactionGetAutoCreate( sxed->sx,
+ xaccSchedXactionGetAutoCreate (sxed->sx,
&autoCreateState,
- ¬ifyState );
+ ¬ifyState);
}
- gtk_toggle_button_set_active( sxed->autocreateOpt, autoCreateState );
- if ( ! autoCreateState )
+ gtk_toggle_button_set_active (sxed->autocreateOpt, autoCreateState);
+ if (!autoCreateState)
{
notifyState = FALSE;
}
- gtk_toggle_button_set_active( sxed->notifyOpt, notifyState );
+ gtk_toggle_button_set_active (sxed->notifyOpt, notifyState);
/* Do days-in-advance-to-create widget[s] setup. */
- if ( sxed->newsxP )
+ if (sxed->newsxP)
{
daysInAdvance =
gnc_prefs_get_float (GNC_PREFS_GROUP_SXED, GNC_PREF_CREATE_DAYS);
@@ -1451,17 +1446,17 @@ schedXact_editor_populate( GncSxEditorDialog *sxed )
else
{
daysInAdvance =
- xaccSchedXactionGetAdvanceCreation( sxed->sx );
+ xaccSchedXactionGetAdvanceCreation (sxed->sx);
}
- if ( daysInAdvance != 0 )
+ if (daysInAdvance != 0)
{
- gtk_toggle_button_set_active( sxed->advanceOpt, TRUE );
- gtk_spin_button_set_value( sxed->advanceSpin,
- (gfloat)daysInAdvance );
+ gtk_toggle_button_set_active (sxed->advanceOpt, TRUE);
+ gtk_spin_button_set_value (sxed->advanceSpin,
+ (gfloat)daysInAdvance);
}
/* Do days-in-advance-to-remind widget[s] setup. */
- if ( sxed->newsxP )
+ if (sxed->newsxP)
{
daysInAdvance =
gnc_prefs_get_float (GNC_PREFS_GROUP_SXED, GNC_PREF_REMIND_DAYS);
@@ -1469,76 +1464,71 @@ schedXact_editor_populate( GncSxEditorDialog *sxed )
else
{
daysInAdvance =
- xaccSchedXactionGetAdvanceReminder( sxed->sx );
+ xaccSchedXactionGetAdvanceReminder (sxed->sx);
}
- if ( daysInAdvance != 0 )
+ if (daysInAdvance != 0)
{
- gtk_toggle_button_set_active( sxed->remindOpt, TRUE );
- gtk_spin_button_set_value( sxed->remindSpin,
- (gfloat)daysInAdvance );
+ gtk_toggle_button_set_active (sxed->remindOpt, TRUE);
+ gtk_spin_button_set_value (sxed->remindSpin,
+ (gfloat)daysInAdvance);
}
- if ( sxed->newsxP )
+ if (sxed->newsxP)
{
- gnc_sx_set_instance_count( sxed->sx, 1 );
+ gnc_sx_set_instance_count (sxed->sx, 1);
}
/* populate the ledger */
{
/* create the split list */
- GList *splitList;
-
- splitList = xaccSchedXactionGetSplits( sxed->sx );
- if ( splitList != NULL )
+ GList *splitList = xaccSchedXactionGetSplits (sxed->sx);
+ if (splitList)
{
- splitReg = gnc_ledger_display_get_split_register
- ( sxed->ledger );
- gnc_split_register_load(splitReg, splitList, NULL );
+ splitReg = gnc_ledger_display_get_split_register (sxed->ledger);
+ gnc_split_register_load (splitReg, splitList, NULL);
} /* otherwise, use the existing stuff. */
}
/* Update the example cal */
- gnc_sxed_update_cal(sxed);
+ gnc_sxed_update_cal (sxed);
}
-static
-void
-set_endgroup_toggle_states( GncSxEditorDialog *sxed, EndType type )
+static void
+set_endgroup_toggle_states (GncSxEditorDialog *sxed, EndType type)
{
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endDateEntry), (type == END_DATE) );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endCountSpin), (type == END_OCCUR) );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endRemainSpin), (type == END_OCCUR) );
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->endDateEntry), (type == END_DATE));
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->endCountSpin), (type == END_OCCUR));
+ gtk_widget_set_sensitive (GTK_WIDGET (sxed->endRemainSpin), (type == END_OCCUR));
}
-static
-void
-endgroup_rb_toggled_cb( GtkButton *b, gpointer d )
+static void
+endgroup_rb_toggled_cb (GtkButton *b, gpointer d)
{
/* figure out which one */
GncSxEditorDialog *sxed;
gint id;
sxed = (GncSxEditorDialog*)d;
- id = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(b), "whichOneAmI" ));
+ id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "whichOneAmI"));
switch (id)
{
case END_NEVER_OPTION:
- set_endgroup_toggle_states( sxed, END_NEVER );
+ set_endgroup_toggle_states (sxed, END_NEVER);
break;
case END_DATE_OPTION:
- set_endgroup_toggle_states( sxed, END_DATE );
+ set_endgroup_toggle_states (sxed, END_DATE);
break;
case NUM_OCCUR_OPTION:
- set_endgroup_toggle_states( sxed, END_OCCUR );
+ set_endgroup_toggle_states (sxed, END_OCCUR);
break;
default:
- g_critical( "Unknown id %d", id );
+ g_critical ("Unknown id %d", id);
break;
}
- gnc_sxed_update_cal(sxed);
+ gnc_sxed_update_cal (sxed);
}
@@ -1549,7 +1539,7 @@ endgroup_rb_toggled_cb( GtkButton *b, gpointer d )
* Return: none *
\********************************************************************/
static void
-gnc_sxed_reg_check_close(GncSxEditorDialog *sxed)
+gnc_sxed_reg_check_close (GncSxEditorDialog *sxed)
{
gboolean pending_changes;
SplitRegister *reg;
@@ -1567,10 +1557,10 @@ gnc_sxed_reg_check_close(GncSxEditorDialog *sxed)
if (gnc_verify_dialog (GTK_WINDOW (sxed->dialog), TRUE, "%s", message))
{
- if ( !gnc_split_register_save( reg, TRUE ) )
+ if (!gnc_split_register_save (reg, TRUE))
return;
- gnc_split_register_redraw( reg );
+ gnc_split_register_redraw (reg);
}
else
{
@@ -1580,104 +1570,101 @@ gnc_sxed_reg_check_close(GncSxEditorDialog *sxed)
static gboolean
-editor_component_sx_equality( gpointer find_data,
- gpointer user_data )
+editor_component_sx_equality (gpointer find_data,
+ gpointer user_data)
{
- return ( (SchedXaction*)find_data
- == ((GncSxEditorDialog*)user_data)->sx );
+ return ((SchedXaction*)find_data
+ == ((GncSxEditorDialog*)user_data)->sx);
}
-/*
- typedef enum { NO_END, DATE_END, COUNT_END } END_TYPE;
-*/
static void
-gnc_sxed_update_cal(GncSxEditorDialog *sxed)
+gnc_sxed_update_cal (GncSxEditorDialog *sxed)
{
GList *recurrences = NULL;
GDate start_date, first_date;
- g_date_clear(&start_date, 1);
+ g_date_clear (&start_date, 1);
- gnc_frequency_save_to_recurrence(sxed->gncfreq, &recurrences, &start_date);
- recurrenceListNextInstance(recurrences, &start_date, &first_date);
+ gnc_frequency_save_to_recurrence (sxed->gncfreq, &recurrences, &start_date);
+ recurrenceListNextInstance (recurrences, &start_date, &first_date);
/* Deal with the fact that this SX may have been run before [the
* calendar should only show upcoming instances]... */
{
const GDate *last_sx_inst;
- last_sx_inst = xaccSchedXactionGetLastOccurDate(sxed->sx);
- if (g_date_valid(last_sx_inst)
- && g_date_valid(&first_date)
- && g_date_compare(last_sx_inst, &first_date) > 0)
+ last_sx_inst = xaccSchedXactionGetLastOccurDate (sxed->sx);
+ if (g_date_valid (last_sx_inst)
+ && g_date_valid (&first_date)
+ && g_date_compare (last_sx_inst, &first_date) > 0)
{
/* last occurrence will be passed as initial date to update store
* later on as well, but only if it's past first_date */
start_date = *last_sx_inst;
- recurrenceListNextInstance(recurrences, &start_date, &first_date);
+ recurrenceListNextInstance (recurrences, &start_date, &first_date);
}
else
/* move one day back so the store can get the proper first recurrence. */
- g_date_subtract_days(&start_date, 1);
+ g_date_subtract_days (&start_date, 1);
}
- if (!g_date_valid(&first_date))
+ if (!g_date_valid (&first_date))
{
/* Nothing to do. */
- gnc_dense_cal_store_clear(sxed->dense_cal_model);
+ gnc_dense_cal_store_clear (sxed->dense_cal_model);
goto cleanup;
}
- gnc_dense_cal_store_update_name(sxed->dense_cal_model, xaccSchedXactionGetName(sxed->sx));
+ gnc_dense_cal_store_update_name (sxed->dense_cal_model, xaccSchedXactionGetName (sxed->sx));
{
- gchar *schedule_desc = recurrenceListToCompactString(recurrences);
- gnc_dense_cal_store_update_info(sxed->dense_cal_model, schedule_desc);
- g_free(schedule_desc);
+ gchar *schedule_desc = recurrenceListToCompactString (recurrences);
+ gnc_dense_cal_store_update_info (sxed->dense_cal_model, schedule_desc);
+ g_free (schedule_desc);
}
- //gnc_dense_cal_set_month(sxed->example_cal, g_date_get_month(&first_date));
- //gnc_dense_cal_set_year(sxed->example_cal, g_date_get_year(&first_date));
+ //gnc_dense_cal_set_month (sxed->example_cal, g_date_get_month (&first_date));
+ //gnc_dense_cal_set_year (sxed->example_cal, g_date_get_year (&first_date));
/* figure out the end restriction */
- if (gtk_toggle_button_get_active(sxed->optEndDate))
+ if (gtk_toggle_button_get_active (sxed->optEndDate))
{
GDate end_date;
g_date_clear (&end_date, 1);
- gnc_gdate_set_time64 (&end_date, gnc_date_edit_get_date(sxed->endDateEntry));
- gnc_dense_cal_store_update_recurrences_date_end(sxed->dense_cal_model, &start_date, recurrences, &end_date);
+ gnc_gdate_set_time64 (&end_date, gnc_date_edit_get_date (sxed->endDateEntry));
+ gnc_dense_cal_store_update_recurrences_date_end (sxed->dense_cal_model, &start_date, recurrences, &end_date);
}
- else if (gtk_toggle_button_get_active(sxed->optEndNone))
+ else if (gtk_toggle_button_get_active (sxed->optEndNone))
{
- gnc_dense_cal_store_update_recurrences_no_end(sxed->dense_cal_model, &start_date, recurrences);
+ gnc_dense_cal_store_update_recurrences_no_end (sxed->dense_cal_model, &start_date, recurrences);
}
- else if (gtk_toggle_button_get_active(sxed->optEndCount))
+ else if (gtk_toggle_button_get_active (sxed->optEndCount))
{
gint num_remain
- = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(sxed->endRemainSpin));
- gnc_dense_cal_store_update_recurrences_count_end(sxed->dense_cal_model, &start_date, recurrences, num_remain);
+ = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sxed->endRemainSpin));
+ gnc_dense_cal_store_update_recurrences_count_end (sxed->dense_cal_model, &start_date, recurrences, num_remain);
}
else
{
- g_error("unknown end condition");
+ g_error ("unknown end condition");
}
-cleanup:
- recurrenceListFree(&recurrences);
+ cleanup:
+ recurrenceListFree (&recurrences);
}
static void
-gnc_sxed_freq_changed(GncFrequency *gf, gpointer ud)
+gnc_sxed_freq_changed (GncFrequency *gf, gpointer ud)
{
- gnc_sxed_update_cal((GncSxEditorDialog*)ud);
+ gnc_sxed_update_cal ((GncSxEditorDialog*)ud);
}
static void
-sxed_excal_update_adapt_cb(GtkWidget *o, gpointer ud)
+sxed_excal_update_adapt_cb (GtkWidget *o, gpointer ud)
{
- gnc_sxed_update_cal((GncSxEditorDialog*)ud);
+ gnc_sxed_update_cal ((GncSxEditorDialog*)ud);
}
@@ -1688,29 +1675,29 @@ on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data)
GtkWidget *widget_notify;
GHashTable *table;
- PINFO("Togglebutton is %p and user_data is %p", togglebutton, user_data);
- PINFO("Togglebutton builder name is %s", gtk_buildable_get_name(GTK_BUILDABLE(togglebutton)));
+ PINFO ("Togglebutton is %p and user_data is %p", togglebutton, user_data);
+ PINFO ("Togglebutton builder name is %s", gtk_buildable_get_name (GTK_BUILDABLE (togglebutton)));
/* We need to use the hash table to find the required widget to activate. */
- table = g_object_get_data(G_OBJECT(user_data), "prefs_widget_hash");
+ table = g_object_get_data (G_OBJECT (user_data), "prefs_widget_hash");
/* "Auto-create" enables "notify before creation" setting */
- widget_auto = g_hash_table_lookup(table, "pref/" GNC_PREFS_GROUP_SXED "/" GNC_PREF_CREATE_AUTO);
- widget_notify = g_hash_table_lookup(table, "pref/" GNC_PREFS_GROUP_SXED "/" GNC_PREF_NOTIFY);
+ widget_auto = g_hash_table_lookup (table, "pref/" GNC_PREFS_GROUP_SXED "/" GNC_PREF_CREATE_AUTO);
+ widget_notify = g_hash_table_lookup (table, "pref/" GNC_PREFS_GROUP_SXED "/" GNC_PREF_NOTIFY);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget_auto)))
- gtk_widget_set_sensitive(widget_notify, TRUE);
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget_auto)))
+ gtk_widget_set_sensitive (widget_notify, TRUE);
else
- gtk_widget_set_sensitive(widget_notify, FALSE);
+ gtk_widget_set_sensitive (widget_notify, FALSE);
/* "Run when opened" enables "show notification window" setting */
- widget_auto = g_hash_table_lookup(table, "pref/" GNC_PREFS_GROUP_STARTUP "/" GNC_PREF_RUN_AT_FOPEN);
- widget_notify = g_hash_table_lookup(table, "pref/" GNC_PREFS_GROUP_STARTUP "/" GNC_PREF_SHOW_AT_FOPEN);
+ widget_auto = g_hash_table_lookup (table, "pref/" GNC_PREFS_GROUP_STARTUP "/" GNC_PREF_RUN_AT_FOPEN);
+ widget_notify = g_hash_table_lookup (table, "pref/" GNC_PREFS_GROUP_STARTUP "/" GNC_PREF_SHOW_AT_FOPEN);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget_auto)))
- gtk_widget_set_sensitive(widget_notify, TRUE);
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget_auto)))
+ gtk_widget_set_sensitive (widget_notify, TRUE);
else
- gtk_widget_set_sensitive(widget_notify, FALSE);
+ gtk_widget_set_sensitive (widget_notify, FALSE);
}
@@ -1726,26 +1713,26 @@ typedef struct _acct_deletion_handler_data
static void
-_open_editors(GtkDialog *dialog, gint response_code, gpointer data)
+_open_editors (GtkDialog *dialog, gint response_code, gpointer data)
{
acct_deletion_handler_data *adhd = (acct_deletion_handler_data *)data;
- gtk_widget_hide(adhd->dialog);
+ gtk_widget_hide (adhd->dialog);
{
GList *sx_iter;
for (sx_iter = adhd->affected_sxes; sx_iter; sx_iter = sx_iter->next)
{
- gnc_ui_scheduled_xaction_editor_dialog_create(GTK_WINDOW(adhd->parent),
+ gnc_ui_scheduled_xaction_editor_dialog_create (GTK_WINDOW (adhd->parent),
(SchedXaction*)sx_iter->data, FALSE);
}
}
- g_list_free(adhd->affected_sxes);
- gtk_widget_destroy(GTK_WIDGET(adhd->dialog));
- g_free(adhd);
+ g_list_free (adhd->affected_sxes);
+ gtk_widget_destroy (GTK_WIDGET (adhd->dialog));
+ g_free (adhd);
}
static void
-_sx_engine_event_handler(QofInstance *ent, QofEventId event_type, gpointer user_data, gpointer evt_data)
+_sx_engine_event_handler (QofInstance *ent, QofEventId event_type, gpointer user_data, gpointer evt_data)
{
Account *acct;
QofBook *book;
@@ -1753,13 +1740,13 @@ _sx_engine_event_handler(QofInstance *ent, QofEventId event_type, gpointer user_
if (!(event_type & QOF_EVENT_DESTROY))
return;
- if (!GNC_IS_ACCOUNT(ent))
+ if (!GNC_IS_ACCOUNT (ent))
return;
- acct = GNC_ACCOUNT(ent);
- book = qof_instance_get_book(QOF_INSTANCE(acct));
- affected_sxes = gnc_sx_get_sxes_referencing_account(book, acct);
+ acct = GNC_ACCOUNT (ent);
+ book = qof_instance_get_book (QOF_INSTANCE (acct));
+ affected_sxes = gnc_sx_get_sxes_referencing_account (book, acct);
- if (g_list_length(affected_sxes) == 0)
+ if (g_list_length (affected_sxes) == 0)
return;
{
@@ -1773,50 +1760,50 @@ _sx_engine_event_handler(QofInstance *ent, QofEventId event_type, gpointer user_
GtkTreeViewColumn *name_column;
GtkCellRenderer *renderer;
- builder = gtk_builder_new();
+ builder = gtk_builder_new ();
gnc_builder_add_from_file (builder, "dialog-sx.glade", "account_deletion_dialog");
- dialog = GTK_WIDGET(gtk_builder_get_object (builder, "account_deletion_dialog"));
+ dialog = GTK_WIDGET (gtk_builder_get_object (builder, "account_deletion_dialog"));
parent = gnc_ui_get_main_window (NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
- list = GTK_TREE_VIEW(gtk_builder_get_object (builder, "sx_list"));
+ list = GTK_TREE_VIEW (gtk_builder_get_object (builder, "sx_list"));
// Set grid lines option to preference
- gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(list), gnc_tree_view_get_grid_lines_pref ());
+ gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (list), gnc_tree_view_get_grid_lines_pref ());
data = (acct_deletion_handler_data*)g_new0(acct_deletion_handler_data, 1);
data->dialog = dialog;
data->parent = parent;
data->affected_sxes = affected_sxes;
- name_list = gtk_list_store_new(1, G_TYPE_STRING);
- for (sx_iter = affected_sxes; sx_iter != NULL; sx_iter = sx_iter->next)
+ name_list = gtk_list_store_new (1, G_TYPE_STRING);
+ for (sx_iter = affected_sxes; sx_iter; sx_iter = sx_iter->next)
{
SchedXaction *sx;
GtkTreeIter iter;
gchar *sx_name;
sx = (SchedXaction*)sx_iter->data;
- sx_name = xaccSchedXactionGetName(sx);
- gtk_list_store_append(name_list, &iter);
- gtk_list_store_set(name_list, &iter, 0, sx_name, -1);
+ sx_name = xaccSchedXactionGetName (sx);
+ gtk_list_store_append (name_list, &iter);
+ gtk_list_store_set (name_list, &iter, 0, sx_name, -1);
}
- gtk_tree_view_set_model(list, GTK_TREE_MODEL(name_list));
- g_object_unref(G_OBJECT(name_list));
+ gtk_tree_view_set_model (list, GTK_TREE_MODEL (name_list));
+ g_object_unref (G_OBJECT (name_list));
- renderer = gtk_cell_renderer_text_new();
- name_column = gtk_tree_view_column_new_with_attributes(_("Name"),
- renderer,
- "text", 0, NULL);
- gtk_tree_view_append_column(list, name_column);
+ renderer = gtk_cell_renderer_text_new ();
+ name_column = gtk_tree_view_column_new_with_attributes (_("Name"),
+ renderer,
+ "text", 0, NULL);
+ gtk_tree_view_append_column (list, name_column);
- g_signal_connect(G_OBJECT(dialog), "response",
- G_CALLBACK(_open_editors), data);
+ g_signal_connect (G_OBJECT (dialog), "response",
+ G_CALLBACK (_open_editors), data);
- gtk_widget_show_all(GTK_WIDGET(dialog));
+ gtk_widget_show_all (GTK_WIDGET (dialog));
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, data);
- g_object_unref(G_OBJECT(builder));
+ g_object_unref (G_OBJECT (builder));
}
}
@@ -1824,10 +1811,10 @@ _sx_engine_event_handler(QofInstance *ent, QofEventId event_type, gpointer user_
void
gnc_ui_sx_initialize (void)
{
- _sx_engine_event_handler_id = qof_event_register_handler(_sx_engine_event_handler, NULL);
+ _sx_engine_event_handler_id = qof_event_register_handler (_sx_engine_event_handler, NULL);
- gnc_hook_add_dangler(HOOK_BOOK_OPENED,
- (GFunc)gnc_sx_sxsincelast_book_opened, NULL, NULL);
+ gnc_hook_add_dangler (HOOK_BOOK_OPENED,
+ (GFunc)gnc_sx_sxsincelast_book_opened, NULL, NULL);
/* Add page to preferences page for Scheduled Transactions */
/* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
Summary of changes:
gnucash/gnome/dialog-sx-editor.c | 919 +++++++++++++++++++--------------------
1 file changed, 453 insertions(+), 466 deletions(-)
More information about the gnucash-changes
mailing list