Fix account dialog buttons.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3069 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2000-10-23 10:16:48 +00:00
parent 43e14a3d2c
commit d26ff1a77b
3 changed files with 42 additions and 24 deletions

View File

@ -521,21 +521,23 @@ fill_helper(gpointer key, gpointer value, gpointer data)
g_strdup(gnc_ui_get_account_field_value_string(account, fs->field));
if(!account_field_value) account_field_value = g_strdup("");
switch (fs->field) {
case ACCOUNT_CURRENCY:
case ACCOUNT_SECURITY:
value_str = g_strdup(gnc_commodity_get_printname(value));
break;
case ACCOUNT_TYPE:
value_str = g_strdup(xaccAccountGetTypeStr(GPOINTER_TO_INT(value)));
break;
default:
g_warning("unexpected field type");
g_free(full_name);
g_free(account_field_name);
g_free(account_field_value);
return;
switch (fs->field)
{
case ACCOUNT_CURRENCY:
case ACCOUNT_SECURITY:
value_str = g_strdup(gnc_commodity_get_printname(value));
break;
case ACCOUNT_TYPE:
value_str = g_strdup(xaccAccountGetTypeStr(GPOINTER_TO_INT(value)));
break;
default:
g_warning("unexpected field type");
g_free(full_name);
g_free(account_field_name);
g_free(account_field_value);
return;
}
{
gchar *strings[5];
strings[0] = full_name;
@ -545,6 +547,7 @@ fill_helper(gpointer key, gpointer value, gpointer data)
strings[4] = NULL;
gtk_clist_append(fs->list, strings);
}
g_free(full_name);
g_free(account_field_name);
g_free(account_field_value);
@ -930,8 +933,6 @@ gnc_account_window_select_security_cb(GtkButton * button,
}
static void
gnc_account_window_ok_cb(GtkWidget * widget, gpointer data)
{

View File

@ -3848,7 +3848,8 @@ create_Account_Dialog (void)
GtkWidget *notes_text;
GtkWidget *dialog_action_area12;
GtkWidget *button63;
GtkWidget *close_button;
GtkWidget *cancel_button;
GtkWidget *button72;
Account_Dialog = gnome_dialog_new (_("New Account"), NULL);
gtk_object_set_data (GTK_OBJECT (Account_Dialog), "Account_Dialog", Account_Dialog);
@ -4127,13 +4128,21 @@ create_Account_Dialog (void)
gtk_widget_show (button63);
GTK_WIDGET_SET_FLAGS (button63, GTK_CAN_DEFAULT);
gnome_dialog_append_button (GNOME_DIALOG (Account_Dialog), GNOME_STOCK_BUTTON_HELP);
close_button = g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data;
gtk_widget_ref (close_button);
gtk_object_set_data_full (GTK_OBJECT (Account_Dialog), "close_button", close_button,
gnome_dialog_append_button (GNOME_DIALOG (Account_Dialog), GNOME_STOCK_BUTTON_CANCEL);
cancel_button = g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data;
gtk_widget_ref (cancel_button);
gtk_object_set_data_full (GTK_OBJECT (Account_Dialog), "cancel_button", cancel_button,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (close_button);
GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
gtk_widget_show (cancel_button);
GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT);
gnome_dialog_append_button (GNOME_DIALOG (Account_Dialog), GNOME_STOCK_BUTTON_HELP);
button72 = g_list_last (GNOME_DIALOG (Account_Dialog)->buttons)->data;
gtk_widget_ref (button72);
gtk_object_set_data_full (GTK_OBJECT (Account_Dialog), "button72", button72,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (button72);
GTK_WIDGET_SET_FLAGS (button72, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (currency_button), "clicked",
GTK_SIGNAL_FUNC (gnc_account_window_select_currency_cb),

View File

@ -5605,7 +5605,15 @@ Daily (365)
<widget>
<class>GtkButton</class>
<name>close_button</name>
<name>cancel_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
</widget>
<widget>
<class>GtkButton</class>
<name>button72</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<stock_button>GNOME_STOCK_BUTTON_HELP</stock_button>