mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Change source files dialog-account.* for spaces and tabs
This commit is contained in:
parent
27cab58bf2
commit
d195a87079
@ -202,7 +202,6 @@ gnc_account_commodity_from_type (AccountWindow * aw, gboolean update)
|
||||
gnc_general_select_set_selected (GNC_GENERAL_SELECT(aw->commodity_edit),
|
||||
NULL);
|
||||
}
|
||||
|
||||
aw->commodity_mode = new_mode;
|
||||
}
|
||||
|
||||
@ -229,7 +228,9 @@ gnc_account_opening_balance_button_update (AccountWindow *aw, gnc_commodity *com
|
||||
switch (aw->dialog_type)
|
||||
{
|
||||
case EDIT_ACCOUNT:
|
||||
gtk_widget_set_sensitive (aw->opening_balance_button, (ob_account == NULL || ob_account == account) && has_splits == 0);
|
||||
gtk_widget_set_sensitive (aw->opening_balance_button, (ob_account == NULL ||
|
||||
ob_account == account) &&
|
||||
has_splits == 0);
|
||||
break;
|
||||
case NEW_ACCOUNT:
|
||||
gtk_widget_set_sensitive (aw->opening_balance_button, ob_account == NULL);
|
||||
@ -257,11 +258,13 @@ gnc_account_to_ui(AccountWindow *aw)
|
||||
}
|
||||
|
||||
string = xaccAccountGetName (account);
|
||||
if (string == NULL) string = "";
|
||||
if (string == NULL)
|
||||
string = "";
|
||||
gtk_entry_set_text (GTK_ENTRY(aw->name_entry), string);
|
||||
|
||||
string = xaccAccountGetDescription (account);
|
||||
if (string == NULL) string = "";
|
||||
if (string == NULL)
|
||||
string = "";
|
||||
gtk_entry_set_text (GTK_ENTRY(aw->description_entry), string);
|
||||
|
||||
string = xaccAccountGetColor (account);
|
||||
@ -292,11 +295,13 @@ gnc_account_to_ui(AccountWindow *aw)
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX(aw->account_scu), index);
|
||||
|
||||
string = xaccAccountGetCode (account);
|
||||
if (string == NULL) string = "";
|
||||
if (string == NULL)
|
||||
string = "";
|
||||
gtk_entry_set_text (GTK_ENTRY(aw->code_entry), string);
|
||||
|
||||
string = xaccAccountGetNotes (account);
|
||||
if (string == NULL) string = "";
|
||||
if (string == NULL)
|
||||
string = "";
|
||||
|
||||
gtk_text_buffer_set_text (aw->notes_text_buffer, string, strlen(string));
|
||||
|
||||
@ -322,7 +327,6 @@ gnc_account_to_ui(AccountWindow *aw)
|
||||
LEAVE(" ");
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
gnc_account_create_transfer_balance (QofBook *book,
|
||||
Account *account,
|
||||
@ -472,28 +476,23 @@ gnc_ui_to_account(AccountWindow *aw)
|
||||
if (null_strcmp (string, old_string) != 0)
|
||||
xaccAccountSetNotes (account, string);
|
||||
|
||||
flag =
|
||||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->opening_balance_button));
|
||||
flag = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(aw->opening_balance_button));
|
||||
if (xaccAccountGetIsOpeningBalance (account) != flag)
|
||||
xaccAccountSetIsOpeningBalance (account, flag);
|
||||
|
||||
flag =
|
||||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->tax_related_button));
|
||||
flag = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(aw->tax_related_button));
|
||||
if (xaccAccountGetTaxRelated (account) != flag)
|
||||
xaccAccountSetTaxRelated (account, flag);
|
||||
|
||||
flag =
|
||||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->placeholder_button));
|
||||
flag = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(aw->placeholder_button));
|
||||
if (xaccAccountGetPlaceholder (account) != flag)
|
||||
xaccAccountSetPlaceholder (account, flag);
|
||||
|
||||
flag =
|
||||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->hidden_button));
|
||||
flag = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(aw->hidden_button));
|
||||
if (xaccAccountGetHidden (account) != flag)
|
||||
xaccAccountSetHidden (account, flag);
|
||||
|
||||
flag =
|
||||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (aw->auto_interest_button));
|
||||
flag = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(aw->auto_interest_button));
|
||||
if (xaccAccountGetAutoInterest (account) != flag)
|
||||
xaccAccountSetAutoInterest (account, flag);
|
||||
|
||||
@ -506,8 +505,7 @@ gnc_ui_to_account(AccountWindow *aw)
|
||||
|
||||
xaccAccountCommitEdit (account);
|
||||
|
||||
balance = gnc_amount_edit_get_amount
|
||||
(GNC_AMOUNT_EDIT (aw->opening_balance_edit));
|
||||
balance = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT(aw->opening_balance_edit));
|
||||
|
||||
if (gnc_numeric_zero_p (balance))
|
||||
{
|
||||
@ -518,11 +516,9 @@ gnc_ui_to_account(AccountWindow *aw)
|
||||
if (gnc_reverse_balance (account))
|
||||
balance = gnc_numeric_neg (balance);
|
||||
|
||||
date = gnc_date_edit_get_date (
|
||||
GNC_DATE_EDIT (aw->opening_balance_date_edit));
|
||||
date = gnc_date_edit_get_date (GNC_DATE_EDIT(aw->opening_balance_date_edit));
|
||||
|
||||
use_equity = gtk_toggle_button_get_active
|
||||
(GTK_TOGGLE_BUTTON (aw->opening_equity_radio));
|
||||
use_equity = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(aw->opening_equity_radio));
|
||||
|
||||
if (use_equity)
|
||||
{
|
||||
@ -548,7 +544,6 @@ gnc_ui_to_account(AccountWindow *aw)
|
||||
LEAVE(" ");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
set_children_types (Account *account, GNCAccountType type)
|
||||
{
|
||||
@ -595,7 +590,6 @@ make_children_compatible (AccountWindow *aw)
|
||||
set_children_types (account, aw->type);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gnc_finish_ok (AccountWindow *aw)
|
||||
{
|
||||
@ -645,8 +639,9 @@ gnc_finish_ok (AccountWindow *aw)
|
||||
commodity);
|
||||
gnc_account_commodity_from_type (aw, FALSE);
|
||||
|
||||
gnc_tree_view_account_set_selected_account (
|
||||
GNC_TREE_VIEW_ACCOUNT (aw->parent_tree), parent);
|
||||
gnc_tree_view_account_set_selected_account (GNC_TREE_VIEW_ACCOUNT(
|
||||
aw->parent_tree),
|
||||
parent);
|
||||
|
||||
gnc_resume_gui_refresh ();
|
||||
LEAVE("1");
|
||||
@ -663,7 +658,6 @@ gnc_finish_ok (AccountWindow *aw)
|
||||
LEAVE("2");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
add_children_to_expander (GObject *object, GParamSpec *param_spec, gpointer data)
|
||||
{
|
||||
@ -675,12 +669,12 @@ add_children_to_expander (GObject *object, GParamSpec *param_spec, gpointer data
|
||||
if (gtk_expander_get_expanded (expander) &&
|
||||
!gtk_bin_get_child (GTK_BIN(expander)))
|
||||
{
|
||||
|
||||
view = gnc_tree_view_account_new_with_root (account, FALSE);
|
||||
|
||||
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(scrolled_window),
|
||||
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
||||
GTK_POLICY_AUTOMATIC,
|
||||
GTK_POLICY_AUTOMATIC);
|
||||
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_window),
|
||||
GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER(scrolled_window), GTK_WIDGET(view));
|
||||
@ -730,10 +724,9 @@ verify_children_compatible (AccountWindow *aw)
|
||||
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
|
||||
gtk_box_set_homogeneous (GTK_BOX(vbox), FALSE);
|
||||
|
||||
gtk_box_pack_start (
|
||||
GTK_BOX (hbox),
|
||||
gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG),
|
||||
FALSE, FALSE, 0);
|
||||
gtk_box_pack_start (GTK_BOX(hbox),
|
||||
gtk_image_new_from_icon_name ("dialog-information",
|
||||
GTK_ICON_SIZE_DIALOG), FALSE, FALSE, 0);
|
||||
|
||||
/* primary label */
|
||||
label = gtk_label_new (_("Give the children the same type?"));
|
||||
@ -766,8 +759,8 @@ verify_children_compatible (AccountWindow *aw)
|
||||
|
||||
gtk_box_pack_start (GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox,
|
||||
TRUE, TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dialog))),
|
||||
hbox, TRUE, TRUE, 0);
|
||||
|
||||
/* spacings */
|
||||
gtk_container_set_border_width (GTK_CONTAINER(dialog), 5);
|
||||
@ -785,7 +778,6 @@ verify_children_compatible (AccountWindow *aw)
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
gnc_filter_parent_accounts (Account *account, gpointer data)
|
||||
{
|
||||
@ -810,7 +802,6 @@ gnc_filter_parent_accounts (Account *account, gpointer data)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
gnc_common_ok (AccountWindow *aw)
|
||||
{
|
||||
@ -933,7 +924,6 @@ gnc_edit_account_ok(AccountWindow *aw)
|
||||
LEAVE(" ");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gnc_new_account_ok (AccountWindow *aw)
|
||||
{
|
||||
@ -956,8 +946,7 @@ gnc_new_account_ok (AccountWindow *aw)
|
||||
return;
|
||||
}
|
||||
|
||||
balance = gnc_amount_edit_get_amount
|
||||
(GNC_AMOUNT_EDIT (aw->opening_balance_edit));
|
||||
balance = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT(aw->opening_balance_edit));
|
||||
|
||||
if (!gnc_numeric_zero_p (balance))
|
||||
{
|
||||
@ -970,7 +959,8 @@ gnc_new_account_ok (AccountWindow *aw)
|
||||
{
|
||||
Account *transfer = NULL;
|
||||
|
||||
transfer = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT (aw->transfer_tree));
|
||||
transfer = gnc_tree_view_account_get_selected_account (GNC_TREE_VIEW_ACCOUNT(
|
||||
aw->transfer_tree));
|
||||
if (!transfer)
|
||||
{
|
||||
const char *message = _("You must select a transfer account or choose"
|
||||
@ -1246,9 +1236,8 @@ gnc_account_type_view_create (AccountWindow *aw, guint32 compat_types)
|
||||
g_object_unref (G_OBJECT(model));
|
||||
|
||||
renderer = gtk_cell_renderer_text_new ();
|
||||
gtk_tree_view_insert_column_with_attributes (
|
||||
view, -1, NULL, renderer,
|
||||
"text", GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME,
|
||||
gtk_tree_view_insert_column_with_attributes (view, -1, NULL, renderer, "text",
|
||||
GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME,
|
||||
NULL);
|
||||
gtk_tree_view_set_search_column (view, GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME);
|
||||
|
||||
@ -1448,7 +1437,9 @@ gnc_account_window_create(GtkWindow *parent, AccountWindow *aw)
|
||||
aw->color_entry_button = GTK_WIDGET(gtk_builder_get_object (builder, "color_entry_button"));
|
||||
aw->color_default_button = GTK_WIDGET(gtk_builder_get_object (builder, "color_default_button"));
|
||||
aw->code_entry = GTK_WIDGET(gtk_builder_get_object (builder, "code_entry"));
|
||||
aw->notes_text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (GTK_WIDGET(gtk_builder_get_object (builder, "notes_text"))));
|
||||
aw->notes_text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(GTK_WIDGET(
|
||||
gtk_builder_get_object (builder,
|
||||
"notes_text"))));
|
||||
|
||||
box = GTK_WIDGET(gtk_builder_get_object (builder, "commodity_hbox"));
|
||||
aw->commodity_edit = gnc_general_select_new (GNC_GENERAL_SELECT_TYPE_SELECT,
|
||||
@ -1459,7 +1450,8 @@ gnc_account_window_create(GtkWindow *parent, AccountWindow *aw)
|
||||
// If the account has transactions, prevent changes by displaying a label and tooltip
|
||||
if (xaccAccountGetSplitList (aw_get_account (aw)) != NULL)
|
||||
{
|
||||
const gchar *sec_name = gnc_commodity_get_printname (xaccAccountGetCommodity(aw_get_account (aw)));
|
||||
const gchar *sec_name = gnc_commodity_get_printname (xaccAccountGetCommodity (
|
||||
aw_get_account (aw)));
|
||||
GtkWidget *label = gtk_label_new (sec_name);
|
||||
gtk_widget_set_tooltip_text (label, tt);
|
||||
gtk_box_pack_start (GTK_BOX(box), label, FALSE, FALSE, 0);
|
||||
@ -1485,6 +1477,7 @@ gnc_account_window_create(GtkWindow *parent, AccountWindow *aw)
|
||||
gtk_container_add (GTK_CONTAINER(aw->parent_scroll), GTK_WIDGET(aw->parent_tree));
|
||||
gtk_widget_show (GTK_WIDGET(aw->parent_tree));
|
||||
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(aw->parent_tree));
|
||||
|
||||
g_signal_connect (G_OBJECT(selection), "changed",
|
||||
G_CALLBACK(gnc_account_parent_changed_cb), aw);
|
||||
|
||||
@ -1563,7 +1556,6 @@ gnc_account_window_create(GtkWindow *parent, AccountWindow *aw)
|
||||
LEAVE(" ");
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
get_ui_fullname (AccountWindow *aw)
|
||||
{
|
||||
@ -1579,14 +1571,10 @@ get_ui_fullname (AccountWindow *aw)
|
||||
|
||||
if (parent_account && !gnc_account_is_root (parent_account))
|
||||
{
|
||||
char *parent_name;
|
||||
const gchar *separator;
|
||||
char *parent_name = gnc_account_get_full_name (parent_account);
|
||||
const gchar *separator = gnc_get_account_separator_string ();
|
||||
|
||||
parent_name = gnc_account_get_full_name (parent_account);
|
||||
|
||||
separator = gnc_get_account_separator_string ();
|
||||
fullname = g_strconcat (parent_name, separator, name, NULL);
|
||||
|
||||
g_free (parent_name);
|
||||
}
|
||||
else
|
||||
@ -1611,12 +1599,10 @@ gnc_account_window_set_name (AccountWindow *aw)
|
||||
else if (aw->next_name && (g_strv_length (aw->next_name) > 0))
|
||||
{
|
||||
const char *format = _("(%d) New Accounts");
|
||||
char *prefix;
|
||||
|
||||
prefix = g_strdup_printf (format, g_strv_length(aw->next_name) + 1);
|
||||
char *prefix = g_strdup_printf (format,
|
||||
g_strv_length (aw->next_name) + 1);
|
||||
|
||||
title = g_strconcat (prefix, " - ", fullname, " ...", NULL);
|
||||
|
||||
g_free (prefix);
|
||||
}
|
||||
else
|
||||
@ -1628,7 +1614,6 @@ gnc_account_window_set_name (AccountWindow *aw)
|
||||
g_free (title);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
close_handler (gpointer user_data)
|
||||
{
|
||||
@ -1641,7 +1626,6 @@ close_handler (gpointer user_data)
|
||||
LEAVE(" ");
|
||||
}
|
||||
|
||||
|
||||
/********************************************************************\
|
||||
* gnc_ui_refresh_account_window *
|
||||
* refreshes the edit window *
|
||||
@ -1660,12 +1644,10 @@ gnc_ui_refresh_account_window (AccountWindow *aw)
|
||||
gnc_account_window_set_name (aw);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
refresh_handler (GHashTable *changes, gpointer user_data)
|
||||
{
|
||||
AccountWindow *aw = user_data;
|
||||
const EventInfo *info;
|
||||
Account *account;
|
||||
|
||||
account = aw_get_account (aw);
|
||||
@ -1677,18 +1659,16 @@ refresh_handler (GHashTable *changes, gpointer user_data)
|
||||
|
||||
if (changes)
|
||||
{
|
||||
info = gnc_gui_get_entity_events (changes, &aw->account);
|
||||
const EventInfo *info = gnc_gui_get_entity_events (changes, &aw->account);
|
||||
if (info && (info->event_mask & QOF_EVENT_DESTROY))
|
||||
{
|
||||
gnc_close_gui_component (aw->component_id);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
gnc_ui_refresh_account_window (aw);
|
||||
}
|
||||
|
||||
|
||||
static AccountWindow *
|
||||
gnc_ui_new_account_window_internal (GtkWindow *parent,
|
||||
QofBook *book,
|
||||
@ -1772,8 +1752,9 @@ gnc_ui_new_account_window_internal (GtkWindow *parent,
|
||||
}
|
||||
|
||||
gtk_tree_view_collapse_all (aw->parent_tree);
|
||||
gnc_tree_view_account_set_selected_account (
|
||||
GNC_TREE_VIEW_ACCOUNT (aw->parent_tree), base_account);
|
||||
gnc_tree_view_account_set_selected_account (GNC_TREE_VIEW_ACCOUNT(
|
||||
aw->parent_tree),
|
||||
base_account);
|
||||
|
||||
gtk_widget_show (aw->dialog);
|
||||
|
||||
@ -1793,7 +1774,6 @@ gnc_ui_new_account_window_internal (GtkWindow *parent,
|
||||
return aw;
|
||||
}
|
||||
|
||||
|
||||
static gchar **
|
||||
gnc_split_account_name (QofBook *book, const char *in_name, Account **base_account)
|
||||
{
|
||||
@ -1839,7 +1819,6 @@ gnc_split_account_name (QofBook *book, const char *in_name, Account **base_accou
|
||||
return out_names;
|
||||
}
|
||||
|
||||
|
||||
/************************************************************
|
||||
* Entry points for a Modal Dialog *
|
||||
************************************************************/
|
||||
@ -1986,11 +1965,12 @@ gnc_ui_edit_account_window(GtkWindow *parent, Account *account)
|
||||
|
||||
parent_acct = gnc_account_get_parent (account);
|
||||
if (parent_acct == NULL)
|
||||
parent_acct = account; /* must be at the root */
|
||||
parent_acct = account; // must be at the root
|
||||
|
||||
gtk_tree_view_collapse_all (aw->parent_tree);
|
||||
gnc_tree_view_account_set_selected_account (
|
||||
GNC_TREE_VIEW_ACCOUNT(aw->parent_tree), parent_acct);
|
||||
gnc_tree_view_account_set_selected_account (GNC_TREE_VIEW_ACCOUNT(
|
||||
aw->parent_tree),
|
||||
parent_acct);
|
||||
|
||||
gnc_account_window_set_name (aw);
|
||||
|
||||
@ -2008,7 +1988,6 @@ gnc_ui_edit_account_window(GtkWindow *parent, Account *account)
|
||||
gtk_window_present (GTK_WINDOW(aw->dialog));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* opens up a window to create a new account
|
||||
*
|
||||
@ -2090,8 +2069,8 @@ gnc_account_renumber_update_examples (RenumberDialog *data)
|
||||
interval * data->num_children);
|
||||
|
||||
gtk_label_set_text (GTK_LABEL(data->example2), str);
|
||||
g_free(str);
|
||||
|
||||
g_free (str);
|
||||
g_free (prefix);
|
||||
}
|
||||
|
||||
@ -2115,7 +2094,6 @@ gnc_account_renumber_response_cb (GtkDialog *dialog,
|
||||
RenumberDialog *data)
|
||||
{
|
||||
GList *children = NULL, *tmp;
|
||||
gchar *str;
|
||||
gchar *prefix;
|
||||
gint interval;
|
||||
unsigned int num_digits, i;
|
||||
@ -2141,6 +2119,7 @@ gnc_account_renumber_response_cb (GtkDialog *dialog,
|
||||
gnc_set_busy_cursor (NULL, TRUE);
|
||||
for (tmp = children, i = 1; tmp; tmp = g_list_next(tmp), i += 1)
|
||||
{
|
||||
gchar *str;
|
||||
if (strlen (prefix))
|
||||
str = g_strdup_printf ("%s-%0*d", prefix,
|
||||
num_digits, interval * i);
|
||||
@ -2178,6 +2157,7 @@ gnc_account_renumber_create_dialog (GtkWidget *window, Account *account)
|
||||
gnc_builder_add_from_file (builder, "dialog-account.glade", "account_renumber_dialog");
|
||||
data->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "account_renumber_dialog"));
|
||||
gtk_window_set_transient_for (GTK_WINDOW(data->dialog), GTK_WINDOW(window));
|
||||
|
||||
g_object_set_data_full (G_OBJECT(data->dialog), "builder", builder,
|
||||
g_object_unref);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user