diff --git a/src/gnome-utils/dialog-commodity.c b/src/gnome-utils/dialog-commodity.c index cc67f7cf5a..4fd30bf6ea 100644 --- a/src/gnome-utils/dialog-commodity.c +++ b/src/gnome-utils/dialog-commodity.c @@ -255,11 +255,11 @@ gnc_ui_select_commodity_create(const gnc_commodity * orig_sel, builder = gtk_builder_new(); gnc_builder_add_from_file (builder, "dialog-commodity.glade", "liststore1"); gnc_builder_add_from_file (builder, "dialog-commodity.glade", "liststore2"); - gnc_builder_add_from_file (builder, "dialog-commodity.glade", "Security Selector Dialog"); + gnc_builder_add_from_file (builder, "dialog-commodity.glade", "security_selector_dialog"); gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval); - retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Security Selector Dialog")); + retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "security_selector_dialog")); retval->namespace_combo = GTK_WIDGET(gtk_builder_get_object (builder, "ss_namespace_cbwe")); retval->commodity_combo = GTK_WIDGET(gtk_builder_get_object (builder, "ss_commodity_cbwe")); retval->select_user_prompt = GTK_WIDGET(gtk_builder_get_object (builder, "select_user_prompt")); @@ -961,11 +961,11 @@ gnc_ui_build_commodity_dialog(const char * selected_namespace, builder = gtk_builder_new(); gnc_builder_add_from_file (builder, "dialog-commodity.glade", "liststore2"); gnc_builder_add_from_file (builder, "dialog-commodity.glade", "adjustment1"); - gnc_builder_add_from_file (builder, "dialog-commodity.glade", "Security Dialog"); + gnc_builder_add_from_file (builder, "dialog-commodity.glade", "security_dialog"); gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval); - retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Security Dialog")); + retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "security_dialog")); if (parent != NULL) gtk_window_set_transient_for (GTK_WINDOW (retval->dialog), GTK_WINDOW (parent)); retval->edit_commodity = NULL; @@ -1034,7 +1034,6 @@ gnc_ui_build_commodity_dialog(const char * selected_namespace, widget = GTK_WIDGET(gtk_builder_get_object (builder, "unknown_source_alignment")); gtk_container_child_get(GTK_CONTAINER(retval->table), widget, "top-attach", &row, NULL); - gtk_table_set_row_spacing(GTK_TABLE(retval->table), row, 0); gtk_widget_destroy(widget); widget = GTK_WIDGET(gtk_builder_get_object (builder, "unknown_source_box")); gtk_widget_destroy(widget); diff --git a/src/gnome-utils/gtkbuilder/dialog-commodity.glade b/src/gnome-utils/gtkbuilder/dialog-commodity.glade index e72bc06814..9cd4939c87 100644 --- a/src/gnome-utils/gtkbuilder/dialog-commodity.glade +++ b/src/gnome-utils/gtkbuilder/dialog-commodity.glade @@ -1,211 +1,7 @@ + - - - False - 6 - Select security/currency - False - dialog - - - True - False - 12 - - - True - False - end - - - gtk-new - False - True - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - False - True - True - True - True - True - False - True - - - False - False - 1 - - - - - gtk-ok - False - True - True - True - True - False - True - - - False - False - 2 - - - - - False - True - end - 0 - - - - - True - False - 3 - 3 - 12 - 6 - - - True - False - 0 - Select user information here... - center - - - 3 - GTK_FILL - - - - - - True - False - 12 - - - True - False - 0 - _Type: - True - center - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 12 - - - True - False - 0 - _Security/currency: - True - center - - - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - False - liststore2 - True - 0 - - - - True - True - - - - - 1 - 3 - 1 - 2 - GTK_FILL - - - - - True - False - liststore1 - True - 0 - - - - True - True - - - - - 1 - 3 - 2 - 3 - GTK_FILL - - - - - True - True - 1 - - - - - - ss_new_button - ss_cancel_button - ss_ok_button - - + 1 100000000 @@ -213,33 +9,54 @@ 1 10 - + + + + + + + + Dummy commodity Line + + + + + + + + + + + Dummy namespace Line + + + + False 6 New Security True dialog - + True False + vertical 12 - + True False end - gtk-cancel - False + _Cancel True True True True True - False - True + True False @@ -249,15 +66,13 @@ - gtk-ok - False + _OK True True True True True - False - True + True False @@ -267,14 +82,12 @@ - gtk-help - False + _Help True True True True - False - True + True False @@ -291,75 +104,19 @@ - + True False - 16 - 3 - 12 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 12 True False - 0 + 0 7 - 8 - GTK_FILL - @@ -371,17 +128,13 @@ Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple Computer, Inc. ● True - True False False 1 - 2 1 - 2 - @@ -393,17 +146,13 @@ Enter the ticker symbol for the commodity (e.g. CSCO or AAPL). If you are retrieving quotes online, this field must exactly match the ticker symbol used by the quote source (including case). ● True - True False False 1 - 2 2 - 3 - @@ -415,20 +164,16 @@ Enter a unique code used to identify the commodity. Or, you may safely leave this field blank. ● True - True False False 1 - 2 5 - 6 - - + True False @@ -453,7 +198,6 @@ Enter the smallest fraction of the commodity which can be traded. For stocks which can only be traded in whole numbers, enter 1. Enter the smallest fraction of the commodity which can be traded. For stocks which can only be traded in whole numbers, enter 1. ● - True False False adjustment1 @@ -468,45 +212,37 @@ 1 - 2 6 - 7 - GTK_FILL - GTK_FILL True False - 0 + start <b>Quote Source Information</b> True - 2 + 0 8 - 9 - GTK_FILL - True False - 0 + start <b>Security Information</b> True - 2 - GTK_FILL - + 0 + 0 - + True False @@ -515,15 +251,11 @@ 1 - 2 12 - 13 - GTK_FILL - GTK_FILL - + True False @@ -532,15 +264,11 @@ 1 - 2 13 - 14 - GTK_FILL - GTK_FILL - + True False @@ -549,15 +277,11 @@ 1 - 2 14 - 15 - GTK_FILL - GTK_FILL - + True False @@ -566,11 +290,7 @@ 1 - 2 15 - 16 - GTK_FILL - GTK_FILL @@ -582,18 +302,15 @@ True False - 0 + start Type of quote source: right - 2 + 0 11 - 12 - GTK_FILL - GTK_FILL @@ -605,7 +322,7 @@ True False - 0 + start _Full name: True center @@ -614,10 +331,8 @@ + 0 1 - 2 - GTK_FILL - GTK_FILL @@ -629,7 +344,7 @@ True False - 0 + start _Symbol/abbreviation: True center @@ -638,10 +353,8 @@ + 0 2 - 3 - GTK_FILL - GTK_FILL @@ -653,7 +366,7 @@ True False - 0 + start _Type: True center @@ -661,10 +374,8 @@ + 0 4 - 5 - GTK_FILL - GTK_FILL @@ -676,7 +387,7 @@ True False - 0 + start ISIN, CUSI_P or other code: True center @@ -685,10 +396,8 @@ + 0 5 - 6 - GTK_FILL - GTK_FILL @@ -700,7 +409,7 @@ True False - 0 + start F_raction traded: True center @@ -708,10 +417,8 @@ + 0 6 - 7 - GTK_FILL - GTK_FILL @@ -720,7 +427,7 @@ False 12 - + True False @@ -738,6 +445,7 @@ True False + start Warning: Finance::Quote not installed properly. center @@ -763,11 +471,9 @@ - 2 + 0 9 - 10 - GTK_FILL - GTK_FILL + 2 @@ -778,11 +484,10 @@ _Get Online Quotes - False True True False - False + start True True @@ -790,11 +495,8 @@ - 2 + 0 10 - 11 - GTK_FILL - GTK_FILL @@ -805,14 +507,13 @@ Si_ngle: - False True True False True These are F::Q quote sources that retrieve information from a single site on the internet. If that site is unavailable, you will not be able to retrieve quotes. These are F::Q quote sources that retrieve information from a single site on the internet. If that site is unavailable, you will not be able to retrieve quotes. - False + start True True True @@ -821,10 +522,8 @@ + 0 12 - 13 - GTK_FILL - GTK_FILL @@ -835,14 +534,13 @@ _Multiple: - False True True False True These are F::Q quote sources that retrieve information from multiple sites on the internet. If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site. These are F::Q quote sources that retrieve information from multiple sites on the internet. If one of the sites is unavailable, F::Q will attempt to retrieve the information from another site. - False + start True True single_source_button @@ -851,10 +549,8 @@ + 0 13 - 14 - GTK_FILL - GTK_FILL @@ -865,14 +561,13 @@ _Unknown: - False True True False True These are quote sources that were recently added to F::Q. GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet. These are quote sources that were recently added to F::Q. GnuCash does not know if these sources retrieve information from a single site or from multiple sites on the internet. - False + start True True single_source_button @@ -881,10 +576,8 @@ + 0 14 - 15 - GTK_FILL - GTK_FILL @@ -896,7 +589,7 @@ True False - 0 + start Time_zone: True right @@ -904,10 +597,8 @@ + 0 15 - 16 - GTK_FILL - GTK_FILL @@ -927,35 +618,27 @@ 1 - 2 4 - 5 - GTK_FILL True True - ● - True - False - False - True - True True Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used. Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used. + ● + False + False 1 - 2 3 - 4 - + True False 12 @@ -963,7 +646,7 @@ True False - 0 + start _Display symbol True center @@ -971,10 +654,25 @@ + 0 3 - 4 + + + + + + + + + + + + + + + True @@ -990,26 +688,191 @@ help_button - - - - - - - - Dummy commodity Line - - - - - - - - - - - Dummy namespace Line - - + + False + 6 + Select security/currency + False + dialog + + + True + False + vertical + 12 + + + True + False + end + + + _New + True + True + True + True + True + + + False + False + 0 + + + + + _Cancel + True + True + True + True + True + True + + + False + False + 1 + + + + + _OK + True + True + True + True + True + + + False + False + 2 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + Select user information here... + center + + + 0 + 0 + 2 + + + + + True + False + 12 + + + True + False + start + _Type: + True + center + + + + + 0 + 1 + + + + + True + False + 12 + + + True + False + start + _Security/currency: + True + center + + + + + 0 + 2 + + + + + True + False + liststore2 + True + 0 + + + + True + True + + + + + 1 + 1 + + + + + True + False + liststore1 + True + 0 + + + + True + True + + + + + 1 + 2 + + + + + True + True + 1 + + + + + + ss_new_button + ss_cancel_button + ss_ok_button +