diff --git a/ChangeLog b/ChangeLog index e55bdb00a9..da923ace34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,206 @@ +2003-05-15 Jan Arne Petersen + + * TODO: Remove 15 th batch task + * configure.in: Add pkgconfig checks for libgnomeprintui, gal and setenv, putenv checks + * src/app-file/gnome/gnc-file-history.c: (gnc_history_update_menu): + * src/backend/file/sixtp.c: (sixtp_sax_get_entity_handler): replace CHAR with xmlChar + * src/backend/file/sixtp.h: replace CHAR with xmlChar + * src/gnome-search/Makefile.am: add GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS + + In the following: + - Fix wrong gtk_signal_new, gtk_signal_connect method-calls + - Replace GNOME_DOCK with BONOBO_DOCK + - Fix wrong gtk_toolbar_new calls + - Replace gtkhtml-1.0 with gtk-html 2.0 + - Replace some GTK_OBJECTs with G_OBJECTs + - Remove useless GOBJECT_DESTROYED calls + - Fix some GType declarations. + - Convert some *.glade files to glade 2.0. + * src/gnome-search/dialog-search.c: + (gnc_search_dialog_result_clicked), + (gnc_search_dialog_init_result_list), + (gnc_search_dialog_display_results), (remove_element), + (attach_element), (option_activate), (search_clear_criteria), + (get_element_widget), (gnc_search_dialog_add_criterion), + (gnc_search_dialog_init_widgets), + (gnc_search_dialog_connect_on_close): + * src/gnome-search/gnc-general-search.c: + (gnc_general_search_class_init), (create_children), + (gnc_general_search_set_selected): + * src/gnome-search/search-account.c: (gnc_search_account_get_type), + (gnc_search_account_class_init), (gnc_search_account_finalize), + (option_changed), (add_menu_item), (make_menu), (gncs_get_widget): + * src/gnome-search/search-boolean.c: (gnc_search_boolean_get_type), + (gnc_search_boolean_class_init), (gnc_search_boolean_finalize), + (option_changed), (add_menu_item), (make_menu), (gncs_get_widget): + * src/gnome-search/search-core-type.c: + (gnc_search_core_type_get_type), (gnc_search_core_type_class_init), + (gnc_search_core_type_init), (gnc_search_core_type_finalize), + (gnc_search_core_type_new), (gnc_search_core_type_editable_enters), + (gnc_search_core_type_grab_focus), (gnc_search_core_type_validate), + (gnc_search_core_type_clone), (gnc_search_core_type_get_widget), + (gnc_search_core_type_get_predicate), + (gnc_search_core_type_new_type_name), (validate), (grab_focus), + (editable_enters), (gnc_search_core_register_type), (init_table), + (gnc_search_core_initialize), (gnc_search_core_finalize): + * src/gnome-search/search-core-type.h: + * src/gnome-search/search-date.c: (gnc_search_date_get_type), + (gnc_search_date_class_init), (gnc_search_date_finalize), + (option_changed), (add_menu_item), (make_menu), (gncs_get_widget): + * src/gnome-search/search-double.c: (gnc_search_double_get_type), + (gnc_search_double_class_init), (gnc_search_double_finalize), + (option_changed), (add_menu_item), (make_menu), (gncs_get_widget): + * src/gnome-search/search-int64.c: (gnc_search_int64_get_type), + (gnc_search_int64_class_init), (gnc_search_int64_finalize), + (option_changed), (add_menu_item), (make_menu), (gncs_get_widget): + * src/gnome-search/search-numeric.c: (gnc_search_numeric_get_type), + (gnc_search_numeric_class_init), (gnc_search_numeric_finalize), + (how_option_changed), (option_changed), (add_menu_item), + (make_how_menu), (make_option_menu), (gncs_get_widget): + * src/gnome-search/search-reconciled.c: + (gnc_search_reconciled_get_type), + (gnc_search_reconciled_class_init), + (gnc_search_reconciled_finalize), (option_changed), + (toggle_changed), (add_menu_item), (make_menu), (make_toggle): + * src/gnome-search/search-string.c: (gnc_search_string_get_type), + (gnc_search_string_class_init), (gnc_search_string_finalize), + (option_changed), (add_menu_item), (make_menu), (gncs_get_widget): + * src/gnome-search/search.glade: + * src/gnome-utils/dialog-utils.c: (gnc_option_menu_set_one_item), + (gnc_option_menu_init_w_signal), (gnc_glade_autoconnect_full_func): + * src/gnome-utils/dialog-utils.h: + * src/gnome-utils/druid-utils.h: + * src/gnome-utils/gnc-account-sel.c: (gnc_account_sel_get_type), + (gnc_account_sel_class_init), (gnc_account_sel_init), + (gnc_account_sel_new), (gnc_account_sel_finalize), + (gnc_account_sel_dispose), + (gnc_account_sel_set_new_account_ability), + (gnc_account_sel_set_new_account_modal): + * src/gnome-utils/gnc-account-sel.h: + * src/gnome-utils/gnc-account-tree.c: (gnc_account_tree_get_type), + (gnc_account_tree_new), (gnc_account_tree_init), + (gnc_account_tree_class_init), (gnc_account_tree_set_view_info), + (gnc_account_tree_get_view_info), + (gnc_account_tree_expand_account), + (gnc_account_tree_toggle_account_expansion), + (gnc_account_tree_expand_all), (gnc_account_tree_set_view_filter), + (gnc_account_tree_set_selectable_filter), + (gnc_account_tree_finalize), (gnc_account_tree_dispose): + * src/gnome-utils/gnc-account-tree.h: + * src/gnome-utils/gnc-amount-edit.c: (gnc_amount_edit_get_type), + (gnc_amount_edit_class_init): + * src/gnome-utils/gnc-amount-edit.h: + * src/gnome-utils/gnc-currency-edit.c: + (gnc_currency_edit_get_type), (gnc_currency_edit_class_init), + (gnc_currency_edit_init): + * src/gnome-utils/gnc-currency-edit.h: + * src/gnome-utils/gnc-date-delta.c: (gnc_date_delta_get_type), + (gnc_date_delta_class_init): + * src/gnome-utils/gnc-date-delta.h: + * src/gnome-utils/gnc-frequency.c: (gnc_frequency_get_type), + (gnc_frequency_class_init): + * src/gnome-utils/gnc-frequency.h: + * src/gnome-utils/gnc-general-select.c: (create_children): + * src/gnome-utils/gnc-html-history.c: (gnc_html_history_append): + * src/gnome-utils/gnc-html.c: (gnc_html_parse_url), (http_allowed), + (https_allowed), (gnc_network_allowed), (gnc_html_http_request_cb), + (gnc_html_start_request), (gnc_html_load_to_stream), + (gnc_html_link_clicked_cb), (gnc_html_request_url_cb), + (gnc_html_object_requested_cb), (gnc_html_on_url_cb), + (gnc_html_set_base_cb), (gnc_html_submit_cb), (gnc_html_open_scm), + (gnc_html_show_data), (gnc_html_show_url), (gnc_html_reload), + (gnc_html_new), (html_cancel_helper), (gnc_html_cancel), + (gnc_html_destroy), (gnc_html_set_urltype_cb), + (gnc_html_set_load_cb), (gnc_html_set_flyover_cb), + (gnc_html_set_button_cb), (gnc_html_export), (gnc_html_print), + (gnc_html_get_history), (gnc_html_get_widget), + (gnc_html_register_object_handler), + (gnc_html_unregister_object_handler): + * src/gnome-utils/gnc-html.h: + * src/gnome-utils/gnc-mdi-utils.c: (gnc_mdi_show_progress), + (gnc_mdi_child_find_menu_item), (gnc_mdi_child_find_toolbar_item), + (gnc_mdi_child_changed_cb), (gnc_mdi_has_apps), + (gnc_mdi_create_child_toolbar): + * src/gnome-utils/gnc-menu-extensions.c: + (gnc_create_extension_info), (cleanup_extension_info), + (gnc_add_c_extension): + * src/gnome-utils/gtkselect.c: (gtk_select_get_pos): + * src/gnome-utils/gw-gnome-utils-spec.scm: + * src/gnome-utils/print-session.c: (gnc_print_session_create), + (gnc_print_session_print), (gnc_print_session_render), + (gnc_print_session_preview): + * src/gnome-utils/print-session.h: + * src/gnome-utils/search-param.c: (gnc_search_param_get_type), + (gnc_search_param_class_init), (gnc_search_param_finalize), + (gnc_search_param_clone), (gnc_search_param_set_param_path), + (gnc_search_param_override_param_type), + (gnc_search_param_get_param_path), + (gnc_search_param_get_converters), + (gnc_search_param_get_param_type), (gnc_search_param_set_title), + (gnc_search_param_set_justify), (gnc_search_param_type_match): + * src/gnome-utils/search-param.h: + * src/gnome-utils/window-help.c: + (gnc_help_window_search_button_cb): + * src/gnome/dialog-print-check.c: + (gnc_ui_print_check_dialog_create): + * src/gnome/dialog-scheduledxaction.c: (gnc_sxed_check_changed), + (gnc_sxed_check_consistent), (gnc_sxed_save_sx), + (gnc_sxed_get_widgets), (schedXact_editor_populate), + (gnc_sxed_update_cal): + * src/gnome/dialog-sxsincelast.c: (reminders_prep), (created_prep), + (obsolete_prep), (auto_create_prep), (to_create_prep), + (add_reminders_to_gui), (add_dead_list_to_gui): + * src/gnome/dialog-tax-info.c: + * src/gnome/druid-hierarchy.c: + * src/gnome/druid-loan.c: (gnc_loan_druid_get_widgets): + * src/gnome/glade/account.glade: + * src/gnome/glade/sched-xact.glade: + * src/gnome/gnc-splash.c: (gnc_show_splash_screen): + * src/gnome/gnc-split-reg.c: (gsr_create_popup_menu): + * src/gnome/mainwindow-account-tree.c: + (gnc_mainwin_account_tree_class_init), + (gnc_mainwin_account_tree_get_type): + * src/gnome/reconcile-list.c: (gnc_reconcile_list_init), + (gnc_reconcile_list_class_init), + (gnc_reconcile_list_get_needed_height): + * src/gnome/window-acct-tree.c: (gnc_acct_tree_view_new): + * src/gnome/window-main-summarybar.c: + (gnc_main_window_summary_new): + * src/gnome/window-main.c: (gnc_main_window_app_created_cb), + (gnc_main_window_flip_summary_bar_cb), (gnc_main_window_about_cb): + * src/network-utils/gnc-http.c: (gnc_http_new): + * src/register/register-gnome/combocell-gnome.c: + (combo_disconnect_signals), (combo_connect_signals): + * src/register/register-gnome/datecell-gnome.c: + (date_picker_disconnect_signals), (date_picker_connect_signals): + * src/register/register-gnome/gnucash-color.c: + (gnucash_color_alloc), (gnucash_color_alloc_gdk), + (gnucash_color_alloc_name), (gnucash_color_argb_to_gdk), + (gnucash_color_init): + * src/register/register-gnome/gnucash-date-picker.c: + (gnc_date_picker_class_init): + * src/register/register-gnome/gnucash-grid.c: + (gnucash_grid_update): + * src/register/register-gnome/gnucash-item-edit.c: + (item_edit_draw_info), (item_edit_destroy), + (item_edit_set_cursor_pos), (item_edit_claim_selection), + (item_edit_cut_copy_clipboard), (item_edit_selection_get), + (item_edit_selection_received): + * src/register/register-gnome/gnucash-item-edit.h: + * src/register/register-gnome/gnucash-item-list.c: + (gnc_item_list_class_init): + * src/register/register-gnome/gnucash-sheet.c: + (gnucash_sheet_modify_current_cell), (gnucash_sheet_insert_cb), + (gnucash_sheet_delete_cb), (gnucash_sheet_check_grab), + (gnucash_button_press_event), (gnucash_sheet_direct_event), + (gnucash_sheet_key_press_event): + * src/register/register-gnome/table-gnome.c: + (gnc_table_save_state): + * src/report/report-gnome/dialog-column-view.c: + (gnc_column_view_edit_options): + * src/report/report-gnome/window-report.c: + (gnc_report_window_view_new): + 2003-05-15 TomF changes for gnucash-gnome2-dev, 15th batch * src/gnome/druid-stock-split.c: gnc_stock_split_druid_create: diff --git a/TODO b/TODO index 78457d7ac8..fa266e35fd 100644 --- a/TODO +++ b/TODO @@ -28,7 +28,6 @@ gnucash-gnome2-dev Gnome2 port Delete typedef of GncHTMLObjectCB (FIXME) Replace deprecated functions - In batch 15, replace deprecated druid functions Make a table mapping deprecated functions in gdkfont.h to their Pango replacements. Replace all deprecated functions in gdkfont.h @@ -48,4 +47,4 @@ gnucash-gnome2-dev Gnome2 port Update *.glade files for GNOME_BUTTON changes Misc - \ No newline at end of file + diff --git a/configure.in b/configure.in index c54b20007d..e8e512d2e3 100644 --- a/configure.in +++ b/configure.in @@ -77,7 +77,7 @@ AC_PROG_MAKE_SET AC_HEADER_STDC AC_CHECK_HEADERS(limits.h) -AC_CHECK_FUNCS(stpcpy memcpy timegm towupper) +AC_CHECK_FUNCS(stpcpy memcpy timegm towupper setenv putenv) STRUCT_TM_GMTOFF_CHECK SCANF_LLD_CHECK @@ -791,7 +791,7 @@ then # Gnome-Print -- some people already have/need libgnomeprint-2.2 #PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.2) - PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.0) + PKG_CHECK_MODULES(GNOME_PRINT, libgnomeprint-2.0 libgnomeprintui-2.0) AS_SCRUB_INCLUDE(GNOME_PRINT_CFLAGS) AC_SUBST(GNOME_PRINT_CFLAGS) AC_SUBST(GNOME_PRINT_LIBS) @@ -819,9 +819,13 @@ then ### ---------------------------------------------------------------------- - AC_CHECK_LIB(gal, main, true, - [AC_MSG_ERROR([gal library not found. See the README and config.log for more info.])], - `$PKG_CONFIG --libs gal`) +PKG_CHECK_MODULES(GAL, gal) +AC_SUBST(GAL_CFLAGS) +AC_SUBST(GAL_LIBS) + +# AC_CHECK_LIB(gal, main, true, +# [AC_MSG_ERROR([gal library not found. See the README and config.log for more info.])], +# `$PKG_CONFIG --libs gal`) # 3/9/03 Disable gtkhtml check diff --git a/src/app-file/gnome/gnc-file-history.c b/src/app-file/gnome/gnc-file-history.c index 4e98400917..733d7a0f61 100644 --- a/src/app-file/gnome/gnc-file-history.c +++ b/src/app-file/gnome/gnc-file-history.c @@ -189,7 +189,7 @@ void gnc_history_update_menu (GtkWidget * app_w) { GnomeUIInfo *menu; - GnomeDockItem *di; + BonoboDockItem *di; GtkWidget *menushell; GnomeApp *app; gpointer data; @@ -213,7 +213,7 @@ gnc_history_update_menu (GtkWidget * app_w) if (di == NULL) return; - menushell = gnome_dock_item_get_child (di); + menushell = bonobo_dock_item_get_child (di); if (menushell == NULL) return; @@ -293,9 +293,6 @@ gnc_history_update_menu (GtkWidget * app_w) gtk_object_set_data (GTK_OBJECT (app), "gnc_num_history", GINT_TO_POINTER (num_menu_entries)); - for (i = 0; i < n; i++) - g_free ((menu+i)->label); - g_free (menu); g_free (path); } diff --git a/src/backend/file/sixtp.c b/src/backend/file/sixtp.c index 1c2a2d5524..e9466807d0 100644 --- a/src/backend/file/sixtp.c +++ b/src/backend/file/sixtp.c @@ -594,7 +594,7 @@ sixtp_sax_end_handler(void *user_data, const xmlChar *name) } xmlEntityPtr -sixtp_sax_get_entity_handler(void *user_data, const CHAR *name) +sixtp_sax_get_entity_handler(void *user_data, const xmlChar *name) { return xmlGetPredefinedEntity(name); } diff --git a/src/backend/file/sixtp.h b/src/backend/file/sixtp.h index fa3d7a207a..49633c4213 100644 --- a/src/backend/file/sixtp.h +++ b/src/backend/file/sixtp.h @@ -171,7 +171,7 @@ sixtp* sixtp_new(void); void sixtp_destroy(sixtp *sp); void sixtp_handle_catastrophe(sixtp_sax_data *sax_data); -xmlEntityPtr sixtp_sax_get_entity_handler(void *user_data, const CHAR *name); +xmlEntityPtr sixtp_sax_get_entity_handler(void *user_data, const xmlChar *name); gboolean sixtp_parse_file(sixtp *sixtp, const char *filename, gpointer data_for_top_level, gpointer global_data, diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am index 87478634b9..5699689de6 100644 --- a/src/gnome-search/Makefile.am +++ b/src/gnome-search/Makefile.am @@ -14,7 +14,8 @@ AM_CFLAGS = \ ${GDK_PIXBUF_CFLAGS} \ ${GLADE_CFLAGS} \ ${GNOME_INCLUDEDIR} \ - ${GLIB_CFLAGS} + ${GLIB_CFLAGS} \ + ${GNOME_PRINT_CFLAGS} libgncmod_gnome_search_la_SOURCES = \ gncmod-gnome-search.c \ @@ -56,7 +57,8 @@ libgncmod_gnome_search_la_LIBADD = \ ${GNOMEUI_LIBS} \ ${GTKHTML_LIBS} \ ${GLADE_LIBS} \ - ${GLIB_LIBS} + ${GLIB_LIBS} \ + ${GNOME_PRINT_LIBS} libgw_gnome_search_la_SOURCES = gw-gnome-search.c libgw_gnome_search_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS} diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c index b2e3f35e02..204813189c 100644 --- a/src/gnome-search/dialog-search.c +++ b/src/gnome-search/dialog-search.c @@ -114,7 +114,7 @@ gnc_search_dialog_result_clicked (GtkButton *button, GNCSearchWindow *sw) { GNCSearchCallbackButton *cb; - cb = gtk_object_get_data (GTK_OBJECT (button), "data"); + cb = g_object_get_data (G_OBJECT (button), "data"); gnc_search_callback_button_execute (cb, sw); } @@ -202,10 +202,10 @@ gnc_search_dialog_init_result_list (GNCSearchWindow *sw) } /* Setup the list callbacks */ - gtk_signal_connect (GTK_OBJECT (sw->result_list), "select-row", - gnc_search_dialog_select_row_cb, sw); - gtk_signal_connect (GTK_OBJECT (sw->result_list), "unselect-row", - gnc_search_dialog_unselect_row_cb, sw); + g_signal_connect (G_OBJECT (sw->result_list), "select-row", + G_CALLBACK (gnc_search_dialog_select_row_cb), sw); + g_signal_connect (G_OBJECT (sw->result_list), "unselect-row", + G_CALLBACK (gnc_search_dialog_unselect_row_cb), sw); } static void @@ -294,16 +294,16 @@ gnc_search_dialog_display_results (GNCSearchWindow *sw) int i; button = gtk_button_new_with_label (_("Select")); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - gnc_search_dialog_select_cb, sw); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (gnc_search_dialog_select_cb), sw); gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 3); sw->select_button = button; for (i = 0; sw->buttons[i].label; i++) { button = gtk_button_new_with_label (sw->buttons[i].label); - gtk_object_set_data (GTK_OBJECT (button), "data", &(sw->buttons[i])); - gtk_signal_connect (GTK_OBJECT (button), "clicked", - gnc_search_dialog_result_clicked, sw); + g_object_set_data (G_OBJECT (button), "data", &(sw->buttons[i])); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (gnc_search_dialog_result_clicked), sw); gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 3); } } @@ -599,8 +599,8 @@ remove_element (GtkWidget *button, GNCSearchWindow *sw) if (g_list_length (sw->crit_list) < 2) return; - element = gtk_object_get_data (GTK_OBJECT (button), "element"); - data = gtk_object_get_data (GTK_OBJECT (element), "data"); + element = g_object_get_data (G_OBJECT (button), "element"); + data = g_object_get_data (G_OBJECT (element), "data"); /* remove the element from the list */ sw->crit_list = g_list_remove (sw->crit_list, data); @@ -616,15 +616,15 @@ attach_element (GtkWidget *element, GNCSearchWindow *sw, int row) GtkWidget *remove; struct _crit_data *data; - data = gtk_object_get_data (GTK_OBJECT (element), "data"); + data = g_object_get_data (G_OBJECT (element), "data"); gtk_table_attach (GTK_TABLE (sw->criteria_table), element, 0, 1, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE); - gtk_object_set_data (GTK_OBJECT (remove), "element", element); - gtk_signal_connect (GTK_OBJECT (remove), "clicked", remove_element, sw); + g_object_set_data (G_OBJECT (remove), "element", element); + g_signal_connect (G_OBJECT (remove), "clicked", G_CALLBACK (remove_element), sw); gtk_table_attach (GTK_TABLE (sw->criteria_table), remove, 1, 2, row, row+1, 0, 0, 0, 0); gtk_widget_show (remove); @@ -634,7 +634,7 @@ attach_element (GtkWidget *element, GNCSearchWindow *sw, int row) static void option_activate (GtkMenuItem *item, struct _crit_data *data) { - GNCSearchParam *param = gtk_object_get_data (GTK_OBJECT (item), "param"); + GNCSearchParam *param = g_object_get_data (G_OBJECT (item), "param"); GNCSearchCoreType *newelem; if (gnc_search_param_type_match (param, data->param)) { @@ -680,7 +680,7 @@ search_clear_criteria (GNCSearchWindow *sw) for (node = sw->crit_list; node; ) { GList *tmp = node->next; struct _crit_data *data = node->data; - g_object_ref (GTK_OBJECT(data->button)); + g_object_ref (G_OBJECT(data->button)); remove_element (data->button, sw); node = tmp; } @@ -700,7 +700,7 @@ get_element_widget (GNCSearchWindow *sw, GNCSearchCoreType *element) hbox = gtk_hbox_new (FALSE, 0); /* only set to automaticaly clean up the memory */ - gtk_object_set_data_full (GTK_OBJECT (hbox), "data", data, g_free); + g_object_set_data_full (G_OBJECT (hbox), "data", data, g_free); p = gnc_search_core_type_get_widget (element); data->elemwidget = p; @@ -711,8 +711,8 @@ get_element_widget (GNCSearchWindow *sw, GNCSearchCoreType *element) for (l = sw->params_list; l; l = l->next) { GNCSearchParam *param = l->data; item = gtk_menu_item_new_with_label (_(param->title)); - gtk_object_set_data (GTK_OBJECT (item), "param", param); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data); + g_object_set_data (G_OBJECT (item), "param", param); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_activate), data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); @@ -758,7 +758,7 @@ gnc_search_dialog_add_criterion (GNCSearchWindow *sw) int rows; w = get_element_widget (sw, new); - data = gtk_object_get_data (GTK_OBJECT (w), "data"); + data = g_object_get_data (G_OBJECT (w), "data"); sw->crit_list = g_list_append (sw->crit_list, data); rows = GTK_TABLE (sw->criteria_table)->nrows; @@ -830,7 +830,7 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw) /* Grab the dialog, save the dialog info */ sw->dialog = glade_xml_get_widget (xml, "Search Dialog"); - gtk_object_set_data (GTK_OBJECT (sw->dialog), "dialog-info", sw); + g_object_set_data (G_OBJECT (sw->dialog), "dialog-info", sw); /* grab the result hbox */ sw->result_hbox = glade_xml_get_widget (xml, "result_hbox"); @@ -846,7 +846,7 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw) /* Set the 'add criterion' button */ add = gtk_button_new_from_stock (GTK_STOCK_ADD); - gtk_signal_connect (GTK_OBJECT (add), "clicked", add_criterion, sw); + g_signal_connect (G_OBJECT (add), "clicked", G_CALLBACK (add_criterion), sw); box = glade_xml_get_widget (xml, "add_button_box"); gtk_box_pack_start (GTK_BOX (box), add, FALSE, FALSE, 3); @@ -854,12 +854,12 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw) menu = gtk_menu_new (); item = gtk_menu_item_new_with_label (_("all criteria are met")); - gtk_signal_connect (GTK_OBJECT (item), "activate", match_all, sw); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (match_all), sw); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); item = gtk_menu_item_new_with_label (_("any criteria are met")); - gtk_signal_connect (GTK_OBJECT (item), "activate", match_any, sw); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (match_any), sw); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); @@ -943,8 +943,8 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw) close_handler, sw); /* And setup the close callback */ - gtk_signal_connect (GTK_OBJECT (sw->dialog), "close", - GTK_SIGNAL_FUNC (gnc_search_dialog_close_cb), sw); + g_signal_connect (G_OBJECT (sw->dialog), "close", + G_CALLBACK (gnc_search_dialog_close_cb), sw); gnc_search_dialog_reset_widgets (sw); gnc_search_dialog_show_close_cancel (sw); @@ -1015,15 +1015,15 @@ gnc_search_dialog_create (GNCIdTypeConst obj_type, GList *param_list, /* Register an on-close signal with the Search Dialog */ guint gnc_search_dialog_connect_on_close (GNCSearchWindow *sw, - GtkSignalFunc func, + GCallback func, gpointer user_data) { g_return_val_if_fail (sw, 0); g_return_val_if_fail (func, 0); g_return_val_if_fail (user_data, 0); - return gtk_signal_connect (GTK_OBJECT (sw->dialog), "close", - func, user_data); + return g_signal_connect (G_OBJECT (sw->dialog), "close", + func, user_data); } diff --git a/src/gnome-search/gnc-general-search.c b/src/gnome-search/gnc-general-search.c index ad08f3c9d0..a2fbaab381 100644 --- a/src/gnome-search/gnc-general-search.c +++ b/src/gnome-search/gnc-general-search.c @@ -138,12 +138,6 @@ gnc_general_search_class_init (GNCGeneralSearchClass *klass) gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); -#if 0 - gtk_object_class_add_signals(object_class, -#endif - general_search_signals, - LAST_SIGNAL); - container_class->forall = gnc_general_search_forall; object_class->destroy = gnc_general_search_destroy; @@ -278,8 +272,8 @@ create_children (GNCGeneralSearch *gsl, const char *label) gsl->button = gtk_button_new_with_label (label); gtk_box_pack_start (GTK_BOX (gsl), gsl->button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (gsl->button), "clicked", - search_cb, gsl); + g_signal_connect (G_OBJECT (gsl->button), "clicked", + G_CALLBACK (search_cb), gsl); gtk_widget_show (gsl->button); } @@ -337,7 +331,7 @@ gnc_general_search_set_selected (GNCGeneralSearch *gsl, gpointer selection) gsl->selected_item = selection; reset_selection_text (gsl); gtk_signal_emit(GTK_OBJECT(gsl), - general_search_signals[SELECTION_CHANGED]); + general_search_signals[SELECTION_CHANGED]); } gnc_gui_component_clear_watches (gsl->priv->component_id); diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c index 833773dd75..6224c311f3 100644 --- a/src/gnome-search/search-account.c +++ b/src/gnome-search/search-account.c @@ -40,7 +40,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_account_class_init (GNCSearchAccountClass *class); static void gnc_search_account_init (GNCSearchAccount *gspaper); -static void gnc_search_account_finalise (GtkObject *obj); +static void gnc_search_account_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchAccount *)(x))->priv) @@ -71,8 +71,8 @@ gnc_search_account_get_type (void) sizeof(GNCSearchAccountClass), (GtkClassInitFunc)gnc_search_account_class_init, (GtkObjectInitFunc)gnc_search_account_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -84,26 +84,19 @@ gnc_search_account_get_type (void) static void gnc_search_account_class_init (GNCSearchAccountClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_account_finalise; + object_class->finalize = gnc_search_account_finalize; /* override methods */ gnc_search_core_type->validate = gncs_validate; gnc_search_core_type->get_widget = gncs_get_widget; gnc_search_core_type->get_predicate = gncs_get_predicate; gnc_search_core_type->clone = gncs_clone; - -#if 0 - /* signals */ -#if LAST_SIGNAL > 0 - gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL); -#endif -#endif } static void @@ -114,14 +107,14 @@ gnc_search_account_init (GNCSearchAccount *o) } static void -gnc_search_account_finalise (GtkObject *obj) +gnc_search_account_finalize (GObject *obj) { GNCSearchAccount *o = (GNCSearchAccount *)obj; g_assert (IS_GNCSEARCH_ACCOUNT (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -177,7 +170,7 @@ static void option_changed (GtkWidget *widget, GNCSearchAccount *fe) { fe->how = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static GtkWidget * @@ -185,8 +178,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, query_compare_t option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -219,7 +212,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -323,7 +316,7 @@ gncs_get_widget (GNCSearchCoreType *fe) button = gtk_button_new (); gtk_container_add (GTK_CONTAINER (button), label); - gtk_signal_connect (GTK_OBJECT (button), "clicked", button_clicked, fe); + g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (button_clicked), fe); gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3); /* And return the box */ diff --git a/src/gnome-search/search-boolean.c b/src/gnome-search/search-boolean.c index 9c4878f533..62177cfa7b 100644 --- a/src/gnome-search/search-boolean.c +++ b/src/gnome-search/search-boolean.c @@ -37,7 +37,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_boolean_class_init (GNCSearchBooleanClass *class); static void gnc_search_boolean_init (GNCSearchBoolean *gspaper); -static void gnc_search_boolean_finalise (GtkObject *obj); +static void gnc_search_boolean_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchBoolean *)(x))->priv) @@ -66,8 +66,8 @@ gnc_search_boolean_get_type (void) sizeof(GNCSearchBooleanClass), (GtkClassInitFunc)gnc_search_boolean_class_init, (GtkObjectInitFunc)gnc_search_boolean_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -79,26 +79,19 @@ gnc_search_boolean_get_type (void) static void gnc_search_boolean_class_init (GNCSearchBooleanClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_boolean_finalise; + object_class->finalize = gnc_search_boolean_finalize; /* override methods */ gnc_search_core_type->validate = gncs_validate; gnc_search_core_type->get_widget = gncs_get_widget; gnc_search_core_type->get_predicate = gncs_get_predicate; gnc_search_core_type->clone = gncs_clone; - -#if 0 - /* signals */ -#if LAST_SIGNAL > 0 - gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL); -#endif -#endif } static void @@ -110,14 +103,14 @@ gnc_search_boolean_init (GNCSearchBoolean *o) } static void -gnc_search_boolean_finalise (GtkObject *obj) +gnc_search_boolean_finalize (GObject *obj) { GNCSearchBoolean *o = (GNCSearchBoolean *)obj; g_assert (IS_GNCSEARCH_BOOLEAN (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -169,7 +162,7 @@ static void option_changed (GtkWidget *widget, GNCSearchBoolean *fe) { fe->how = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -183,8 +176,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, query_compare_t option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -212,7 +205,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -236,7 +229,7 @@ gncs_get_widget (GNCSearchCoreType *fe) /* Build and connect the toggle */ toggle = gtk_toggle_button_new_with_label (_("set true")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), fi->value); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", toggle_changed, fe); + g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (toggle_changed), fe); gtk_box_pack_start (GTK_BOX (box), toggle, FALSE, FALSE, 3); /* And return the box */ diff --git a/src/gnome-search/search-core-type.c b/src/gnome-search/search-core-type.c index f90f7f68fb..1f8a96933c 100644 --- a/src/gnome-search/search-core-type.c +++ b/src/gnome-search/search-core-type.c @@ -45,7 +45,7 @@ static gboolean validate (GNCSearchCoreType *fe); static void gnc_search_core_type_class_init (GNCSearchCoreTypeClass *class); static void gnc_search_core_type_init (GNCSearchCoreType *gspaper); -static void gnc_search_core_type_finalise (GtkObject *obj); +static void gnc_search_core_type_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchCoreType *)(x))->priv) struct _GNCSearchCoreTypePrivate { @@ -63,63 +63,59 @@ static GHashTable *typeTable = NULL; static guint signals[LAST_SIGNAL] = { 0 }; #endif -guint +GType gnc_search_core_type_get_type (void) { - static guint type = 0; - - if (!type) { - GtkTypeInfo type_info = { - "GNCSearchCoreType", - sizeof(GNCSearchCoreType), - sizeof(GNCSearchCoreTypeClass), - (GtkClassInitFunc)gnc_search_core_type_class_init, - (GtkObjectInitFunc)gnc_search_core_type_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL - }; + static GType type = 0; + + if (type == 0) { + GTypeInfo type_info = { + sizeof (GNCSearchCoreTypeClass), + NULL, + NULL, + (GClassInitFunc)gnc_search_core_type_class_init, + NULL, + NULL, + sizeof (GNCSearchCoreType), + 0, + (GInstanceInitFunc)gnc_search_core_type_init + }; - type = gtk_type_unique(gtk_object_get_type (), &type_info); - } - - return type; + type = g_type_register_static (G_TYPE_OBJECT, "GNCSearchCoreType", &type_info, 0); + } + + return type; } static void -gnc_search_core_type_class_init (GNCSearchCoreTypeClass *class) +gnc_search_core_type_class_init (GNCSearchCoreTypeClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = (GtkObjectClass *)class; - parent_class = gtk_type_class (gtk_object_get_type ()); + object_class = G_OBJECT_CLASS (klass); + parent_class = g_type_class_peek_parent (klass); - object_class->finalize = gnc_search_core_type_finalise; + object_class->finalize = gnc_search_core_type_finalize; - /* override methods */ - class->validate = validate; - class->grab_focus = grab_focus; - class->editable_enters = editable_enters; - -#if 0 - /* signals */ -#if LAST_SIGNAL > 0 - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); -#endif -#endif + /* override methods */ + klass->validate = validate; + klass->grab_focus = grab_focus; + klass->editable_enters = editable_enters; } static void gnc_search_core_type_init (GNCSearchCoreType *o) { - o->priv = g_malloc0 (sizeof (*o->priv)); + o->priv = g_malloc0 (sizeof (*o->priv)); } static void -gnc_search_core_type_finalise (GtkObject *obj) +gnc_search_core_type_finalize (GObject *obj) { - GNCSearchCoreType *o = (GNCSearchCoreType *)obj; - g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + GNCSearchCoreType *o = (GNCSearchCoreType *)obj; + g_free(o->priv); + + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -132,27 +128,30 @@ gnc_search_core_type_finalise (GtkObject *obj) GNCSearchCoreType * gnc_search_core_type_new (void) { - GNCSearchCoreType *o = (GNCSearchCoreType *)gtk_type_new(gnc_search_core_type_get_type ()); - return o; + GNCSearchCoreType *o; + + o = g_object_new (GNC_TYPE_SEARCH_CORE_TYPE, NULL); + + return o; } void gnc_search_core_type_editable_enters (GNCSearchCoreType *fe, GnomeDialog *dialog) { - return ((GNCSearchCoreTypeClass *)((GtkObject *)fe)->klass)->editable_enters (fe, dialog); + GNC_SEARCH_CORE_TYPE_GET_CLASS (fe)->editable_enters (fe, dialog); } void gnc_search_core_type_grab_focus (GNCSearchCoreType *fe) { - return ((GNCSearchCoreTypeClass *)((GtkObject *)fe)->klass)->grab_focus (fe); + GNC_SEARCH_CORE_TYPE_GET_CLASS (fe)->grab_focus (fe); } gboolean gnc_search_core_type_validate (GNCSearchCoreType *fe) { - return ((GNCSearchCoreTypeClass *)((GtkObject *)fe)->klass)->validate (fe); + return GNC_SEARCH_CORE_TYPE_GET_CLASS (fe)->validate (fe); } /** @@ -166,7 +165,7 @@ gnc_search_core_type_validate (GNCSearchCoreType *fe) GNCSearchCoreType * gnc_search_core_type_clone (GNCSearchCoreType *fe) { - return ((GNCSearchCoreTypeClass *)((GtkObject *)fe)->klass)->clone(fe); + return GNC_SEARCH_CORE_TYPE_GET_CLASS (fe)->clone(fe); } /** @@ -181,7 +180,7 @@ gnc_search_core_type_clone (GNCSearchCoreType *fe) GtkWidget * gnc_search_core_type_get_widget (GNCSearchCoreType *fe) { - return ((GNCSearchCoreTypeClass *)((GtkObject *)fe)->klass)->get_widget(fe); + return GNC_SEARCH_CORE_TYPE_GET_CLASS (fe)->get_widget(fe); } /** @@ -195,7 +194,7 @@ gnc_search_core_type_get_widget (GNCSearchCoreType *fe) QueryPredData_t gnc_search_core_type_get_predicate (GNCSearchCoreType *fe) { - return ((GNCSearchCoreTypeClass *)((GtkObject *)fe)->klass)->get_predicate(fe); + return GNC_SEARCH_CORE_TYPE_GET_CLASS (fe)->get_predicate(fe); } /** @@ -209,89 +208,89 @@ gnc_search_core_type_get_predicate (GNCSearchCoreType *fe) GNCSearchCoreType * gnc_search_core_type_new_type_name (const char *type) { - GNCSearchCoreNew fcn; + GNCSearchCoreNew fcn; - g_return_val_if_fail (typeTable, NULL); + g_return_val_if_fail (typeTable != NULL, NULL); - if (type == NULL) - return NULL; + if (type == NULL) + return NULL; - fcn = g_hash_table_lookup (typeTable, type); - if (fcn) { - return ((fcn)()); - } else { - g_warning("Unknown search type '%s'", type); - return NULL; - } + fcn = g_hash_table_lookup (typeTable, type); + if (fcn) { + return ((fcn)()); + } else { + g_warning("Unknown search type '%s'", type); + return NULL; + } } /* default implementations */ static gboolean validate (GNCSearchCoreType *fe) { - return TRUE; + return TRUE; } static void grab_focus (GNCSearchCoreType *fe) { - return; + return; } static void editable_enters (GNCSearchCoreType *fe, GnomeDialog *dialog) { - return; + return; } void gnc_search_core_register_type (const char *type_name, GNCSearchCoreNew fcn) { - g_return_if_fail (type_name || *type_name || fcn); - g_return_if_fail (typeTable); - g_hash_table_insert (typeTable, (char *) type_name, (gpointer) fcn); + g_return_if_fail (type_name || *type_name || fcn); + g_return_if_fail (typeTable); + + g_hash_table_insert (typeTable, (char *) type_name, (gpointer) fcn); } static void init_table (void) { - gnc_search_core_register_type (QUERYCORE_STRING, - (GNCSearchCoreNew) gnc_search_string_new); - gnc_search_core_register_type (QUERYCORE_DATE, - (GNCSearchCoreNew) gnc_search_date_new); - gnc_search_core_register_type (QUERYCORE_INT64, - (GNCSearchCoreNew) gnc_search_int64_new); - gnc_search_core_register_type (QUERYCORE_DOUBLE, - (GNCSearchCoreNew) gnc_search_double_new); - gnc_search_core_register_type (QUERYCORE_NUMERIC, - (GNCSearchCoreNew) gnc_search_numeric_new); - gnc_search_core_register_type (QUERYCORE_DEBCRED, - (GNCSearchCoreNew) - gnc_search_numeric_debcred_new); - gnc_search_core_register_type (QUERYCORE_BOOLEAN, - (GNCSearchCoreNew) gnc_search_boolean_new); - gnc_search_core_register_type (GNC_ID_ACCOUNT, - (GNCSearchCoreNew) gnc_search_account_new); - gnc_search_core_register_type (ACCOUNT_MATCH_ALL_TYPE, - (GNCSearchCoreNew) - gnc_search_account_matchall_new); - gnc_search_core_register_type (RECONCILED_MATCH_TYPE, - (GNCSearchCoreNew) gnc_search_reconciled_new); - + gnc_search_core_register_type (QUERYCORE_STRING, + (GNCSearchCoreNew) gnc_search_string_new); + gnc_search_core_register_type (QUERYCORE_DATE, + (GNCSearchCoreNew) gnc_search_date_new); + gnc_search_core_register_type (QUERYCORE_INT64, + (GNCSearchCoreNew) gnc_search_int64_new); + gnc_search_core_register_type (QUERYCORE_DOUBLE, + (GNCSearchCoreNew) gnc_search_double_new); + gnc_search_core_register_type (QUERYCORE_NUMERIC, + (GNCSearchCoreNew) gnc_search_numeric_new); + gnc_search_core_register_type (QUERYCORE_DEBCRED, + (GNCSearchCoreNew) gnc_search_numeric_debcred_new); + gnc_search_core_register_type (QUERYCORE_BOOLEAN, + (GNCSearchCoreNew) gnc_search_boolean_new); + gnc_search_core_register_type (GNC_ID_ACCOUNT, + (GNCSearchCoreNew) gnc_search_account_new); + gnc_search_core_register_type (ACCOUNT_MATCH_ALL_TYPE, + (GNCSearchCoreNew) gnc_search_account_matchall_new); + gnc_search_core_register_type (RECONCILED_MATCH_TYPE, + (GNCSearchCoreNew) gnc_search_reconciled_new); } void gnc_search_core_initialize (void) { - g_return_if_fail (typeTable == NULL); - typeTable = g_hash_table_new (g_str_hash, g_str_equal); - init_table (); + g_return_if_fail (typeTable == NULL); + + typeTable = g_hash_table_new (g_str_hash, g_str_equal); + init_table (); } void gnc_search_core_finalize (void) { - g_return_if_fail (typeTable); - g_hash_table_destroy (typeTable); - typeTable = NULL; + g_return_if_fail (typeTable != NULL); + + g_hash_table_destroy (typeTable); + typeTable = NULL; } diff --git a/src/gnome-search/search-core-type.h b/src/gnome-search/search-core-type.h index 6f94f1233e..b11325102c 100644 --- a/src/gnome-search/search-core-type.h +++ b/src/gnome-search/search-core-type.h @@ -25,22 +25,21 @@ #include "QueryNew.h" #include "search-param.h" -#define GNCSEARCH_CORE_TYPE(obj) GTK_CHECK_CAST (obj, gnc_search_core_type_get_type (), GNCSearchCoreType) -#define GNCSEARCH_CORE_TYPE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gnc_search_core_type_get_type (), GNCSearchCoreTypeClass) -#define IS_GNCSEARCH_CORE_TYPE(obj) GTK_CHECK_TYPE (obj, gnc_search_core_type_get_type ()) +#define GNC_TYPE_SEARCH_CORE_TYPE (gnc_search_core_type_get_type ()) +#define GNC_SEARCH_CORE_TYPE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_SEARCH_CORE_TYPE, GNCSearchCoreType)) +#define GNC_SEARCH_CORE_TYPE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNC_TYPE_SEARCH_CORE_TYPE, GNCSearchCoreTypeClass)) +#define GNC_IS_SEARCH_CORE_TYPE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_SEARCH_CORE_TYPE) +#define GNC_SEARCH_CORE_TYPE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GNC_TYPE_SEARCH_CORE_TYPE, GNCSearchCoreTypeClass)) -typedef struct _GNCSearchCoreType GNCSearchCoreType; -typedef struct _GNCSearchCoreTypeClass GNCSearchCoreTypeClass; - -struct _GNCSearchCoreType { +typedef struct { GtkObject parent; struct _GNCSearchCoreTypePrivate *priv; GNCSearchParam * param; -}; +} GNCSearchCoreType; -struct _GNCSearchCoreTypeClass { - GtkObjectClass parent_class; +typedef struct { + GObjectClass parent_class; /* virtual methods */ void (*grab_focus) (GNCSearchCoreType *fe); @@ -52,10 +51,10 @@ struct _GNCSearchCoreTypeClass { QueryPredData_t (*get_predicate) (GNCSearchCoreType *); /* signals */ -}; +} GNCSearchCoreTypeClass; /* These are internal functions */ -guint gnc_search_core_type_get_type (void); +GType gnc_search_core_type_get_type (void); GNCSearchCoreType * gnc_search_core_type_new (void); /* Create a new search core_type */ diff --git a/src/gnome-search/search-date.c b/src/gnome-search/search-date.c index 37c6280c43..f379ee6521 100644 --- a/src/gnome-search/search-date.c +++ b/src/gnome-search/search-date.c @@ -41,7 +41,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_date_class_init (GNCSearchDateClass *class); static void gnc_search_date_init (GNCSearchDate *gspaper); -static void gnc_search_date_finalise (GtkObject *obj); +static void gnc_search_date_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchDate *)(x))->priv) @@ -71,8 +71,8 @@ gnc_search_date_get_type (void) sizeof(GNCSearchDateClass), (GtkClassInitFunc)gnc_search_date_class_init, (GtkObjectInitFunc)gnc_search_date_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -84,13 +84,13 @@ gnc_search_date_get_type (void) static void gnc_search_date_class_init (GNCSearchDateClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_date_finalise; + object_class->finalize = gnc_search_date_finalize; /* override methods */ gnc_search_core_type->editable_enters = editable_enters; @@ -117,14 +117,14 @@ gnc_search_date_init (GNCSearchDate *o) } static void -gnc_search_date_finalise (GtkObject *obj) +gnc_search_date_finalize (GObject *obj) { GNCSearchDate *o = (GNCSearchDate *)obj; g_assert (IS_GNCSEARCH_DATE (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -176,7 +176,7 @@ static void option_changed (GtkWidget *widget, GNCSearchDate *fe) { fe->how = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -190,8 +190,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, query_compare_t option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK(option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -223,7 +223,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -271,7 +271,7 @@ gncs_get_widget (GNCSearchCoreType *fe) /* Build and connect the date entry window */ entry = gnc_date_edit_new_ts (fi->ts, FALSE, FALSE); - gtk_signal_connect (GTK_OBJECT (entry), "date_changed", date_changed, fe); + g_signal_connect (G_OBJECT (entry), "date_changed", G_CALLBACK (date_changed), fe); gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 3); fi->priv->entry = entry; diff --git a/src/gnome-search/search-double.c b/src/gnome-search/search-double.c index 6b666b9c75..e38ffb8941 100644 --- a/src/gnome-search/search-double.c +++ b/src/gnome-search/search-double.c @@ -40,7 +40,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_double_class_init (GNCSearchDoubleClass *class); static void gnc_search_double_init (GNCSearchDouble *gspaper); -static void gnc_search_double_finalise (GtkObject *obj); +static void gnc_search_double_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchDouble *)(x))->priv) @@ -51,14 +51,6 @@ struct _GNCSearchDoublePrivate { static GNCSearchCoreTypeClass *parent_class; -enum { - LAST_SIGNAL -}; - -#if LAST_SIGNAL > 0 -static guint signals[LAST_SIGNAL] = { 0 }; -#endif - guint gnc_search_double_get_type (void) { @@ -71,8 +63,8 @@ gnc_search_double_get_type (void) sizeof(GNCSearchDoubleClass), (GtkClassInitFunc)gnc_search_double_class_init, (GtkObjectInitFunc)gnc_search_double_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -84,13 +76,13 @@ gnc_search_double_get_type (void) static void gnc_search_double_class_init (GNCSearchDoubleClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_double_finalise; + object_class->finalize = gnc_search_double_finalize; /* override methods */ gnc_search_core_type->editable_enters = editable_enters; @@ -116,14 +108,14 @@ gnc_search_double_init (GNCSearchDouble *o) } static void -gnc_search_double_finalise (GtkObject *obj) +gnc_search_double_finalize (GObject *obj) { GNCSearchDouble *o = (GNCSearchDouble *)obj; g_assert (IS_GNCSEARCH_DOUBLE (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -175,7 +167,7 @@ static void option_changed (GtkWidget *widget, GNCSearchDouble *fe) { fe->how = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -189,8 +181,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, query_compare_t option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -222,7 +214,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -272,7 +264,7 @@ gncs_get_widget (GNCSearchCoreType *fe) entry = gnc_amount_edit_new (); if (fi->value) gnc_amount_edit_set_damount (GNC_AMOUNT_EDIT (entry), fi->value); - gtk_signal_connect (GTK_OBJECT (entry), "amount_changed", entry_changed, fe); + g_signal_connect (G_OBJECT (entry), "amount_changed", G_CALLBACK (entry_changed), fe); gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 3); fi->priv->entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (entry)); fi->priv->gae = GNC_AMOUNT_EDIT (entry); diff --git a/src/gnome-search/search-int64.c b/src/gnome-search/search-int64.c index 8d9cb7aff4..c6686e0dd3 100644 --- a/src/gnome-search/search-int64.c +++ b/src/gnome-search/search-int64.c @@ -40,7 +40,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_int64_class_init (GNCSearchInt64Class *class); static void gnc_search_int64_init (GNCSearchInt64 *gspaper); -static void gnc_search_int64_finalise (GtkObject *obj); +static void gnc_search_int64_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchInt64 *)(x))->priv) @@ -51,14 +51,6 @@ struct _GNCSearchInt64Private { static GNCSearchCoreTypeClass *parent_class; -enum { - LAST_SIGNAL -}; - -#if LAST_SIGNAL > 0 -static guint signals[LAST_SIGNAL] = { 0 }; -#endif - guint gnc_search_int64_get_type (void) { @@ -71,8 +63,8 @@ gnc_search_int64_get_type (void) sizeof(GNCSearchInt64Class), (GtkClassInitFunc)gnc_search_int64_class_init, (GtkObjectInitFunc)gnc_search_int64_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -84,13 +76,13 @@ gnc_search_int64_get_type (void) static void gnc_search_int64_class_init (GNCSearchInt64Class *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_int64_finalise; + object_class->finalize = gnc_search_int64_finalize; /* override methods */ gnc_search_core_type->editable_enters = editable_enters; @@ -116,14 +108,14 @@ gnc_search_int64_init (GNCSearchInt64 *o) } static void -gnc_search_int64_finalise (GtkObject *obj) +gnc_search_int64_finalize (GObject *obj) { GNCSearchInt64 *o = (GNCSearchInt64 *)obj; g_assert (IS_GNCSEARCH_INT64 (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -175,7 +167,7 @@ static void option_changed (GtkWidget *widget, GNCSearchInt64 *fe) { fe->how = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -191,8 +183,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, query_compare_t option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -224,7 +216,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -278,7 +270,7 @@ gncs_get_widget (GNCSearchCoreType *fe) gnc_numeric value = gnc_numeric_create (fi->value, 1); gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (entry), value); } - gtk_signal_connect (GTK_OBJECT (entry), "amount_changed", entry_changed, fe); + g_signal_connect (G_OBJECT (entry), "amount_changed", G_CALLBACK (entry_changed), fe); gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 3); fi->priv->entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (entry)); fi->priv->gae = GNC_AMOUNT_EDIT (entry); diff --git a/src/gnome-search/search-numeric.c b/src/gnome-search/search-numeric.c index 9500349312..a91f1ba449 100644 --- a/src/gnome-search/search-numeric.c +++ b/src/gnome-search/search-numeric.c @@ -40,7 +40,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_numeric_class_init (GNCSearchNumericClass *class); static void gnc_search_numeric_init (GNCSearchNumeric *gspaper); -static void gnc_search_numeric_finalise (GtkObject *obj); +static void gnc_search_numeric_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchNumeric *)(x))->priv) @@ -52,14 +52,6 @@ struct _GNCSearchNumericPrivate { static GNCSearchCoreTypeClass *parent_class; -enum { - LAST_SIGNAL -}; - -#if LAST_SIGNAL > 0 -static guint signals[LAST_SIGNAL] = { 0 }; -#endif - guint gnc_search_numeric_get_type (void) { @@ -72,8 +64,8 @@ gnc_search_numeric_get_type (void) sizeof(GNCSearchNumericClass), (GtkClassInitFunc)gnc_search_numeric_class_init, (GtkObjectInitFunc)gnc_search_numeric_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -85,13 +77,13 @@ gnc_search_numeric_get_type (void) static void gnc_search_numeric_class_init (GNCSearchNumericClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_numeric_finalise; + object_class->finalize = gnc_search_numeric_finalize; /* override methods */ gnc_search_core_type->editable_enters = editable_enters; @@ -119,14 +111,14 @@ gnc_search_numeric_init (GNCSearchNumeric *o) } static void -gnc_search_numeric_finalise (GtkObject *obj) +gnc_search_numeric_finalize (GObject *obj) { GNCSearchNumeric *o = (GNCSearchNumeric *)obj; g_assert (IS_GNCSEARCH_NUMERIC (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -201,14 +193,14 @@ static void how_option_changed (GtkWidget *widget, GNCSearchNumeric *fe) { fe->how = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void option_changed (GtkWidget *widget, GNCSearchNumeric *fe) { fe->option = (query_compare_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -219,11 +211,11 @@ entry_changed (GNCAmountEdit *entry, GNCSearchNumeric *fe) static GtkWidget * add_menu_item (GtkWidget *menu, gpointer user_data, char *label, - query_compare_t option, GtkSignalFunc fcn) + query_compare_t option, GCallback fcn) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", fcn, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", fcn, user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -246,30 +238,30 @@ make_how_menu (GNCSearchCoreType *fe) ADD_MENU_ITEM (fi->how, (fi->priv->is_debcred ? _("less than") : _("is less than")), - COMPARE_LT, how_option_changed); + COMPARE_LT, G_CALLBACK (how_option_changed)); first = item; /* Force one */ ADD_MENU_ITEM (fi->how, (fi->priv->is_debcred ? _("less than or equal to") : _("is less than or equal to")), - COMPARE_LTE, how_option_changed); + COMPARE_LTE, G_CALLBACK (how_option_changed)); ADD_MENU_ITEM (fi->how, (fi->priv->is_debcred ? _("equal to") : _("equals")), - COMPARE_EQUAL, how_option_changed); + COMPARE_EQUAL, G_CALLBACK (how_option_changed)); ADD_MENU_ITEM (fi->how, (fi->priv->is_debcred ? _("not equal to") : _("does not equal")), - COMPARE_NEQ, how_option_changed); + COMPARE_NEQ, G_CALLBACK (how_option_changed)); ADD_MENU_ITEM (fi->how, (fi->priv->is_debcred ? _("greater than") : _("is greater than")), - COMPARE_GT, how_option_changed); + COMPARE_GT, G_CALLBACK (how_option_changed)); ADD_MENU_ITEM (fi->how, (fi->priv->is_debcred ? _("greater than or equal to") : _("is greater than or equal to")), - COMPARE_GTE, how_option_changed); + COMPARE_GTE, G_CALLBACK (how_option_changed)); opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -285,17 +277,17 @@ make_option_menu (GNCSearchCoreType *fe) menu = gtk_menu_new (); ADD_MENU_ITEM (fi->option, _("has credits or debits"), NUMERIC_MATCH_ANY, - option_changed); + G_CALLBACK (option_changed)); first = item; /* Force one */ ADD_MENU_ITEM (fi->option, _("has debits"), NUMERIC_MATCH_DEBIT, - option_changed); + G_CALLBACK (option_changed)); ADD_MENU_ITEM (fi->option, _("has credits"), NUMERIC_MATCH_CREDIT, - option_changed); + G_CALLBACK (option_changed)); opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -349,7 +341,7 @@ gncs_get_widget (GNCSearchCoreType *fe) /* Build and connect the entry window */ entry = gnc_amount_edit_new (); gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (entry), fi->value); - gtk_signal_connect (GTK_OBJECT (entry), "amount_changed", entry_changed, fe); + g_signal_connect (G_OBJECT (entry), "amount_changed", G_CALLBACK (entry_changed), fe); gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 3); fi->priv->gae = GNC_AMOUNT_EDIT (entry); fi->priv->entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (entry)); diff --git a/src/gnome-search/search-reconciled.c b/src/gnome-search/search-reconciled.c index ba5dea85bb..33015dba39 100644 --- a/src/gnome-search/search-reconciled.c +++ b/src/gnome-search/search-reconciled.c @@ -38,7 +38,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_reconciled_class_init (GNCSearchReconciledClass *class); static void gnc_search_reconciled_init (GNCSearchReconciled *gspaper); -static void gnc_search_reconciled_finalise (GtkObject *obj); +static void gnc_search_reconciled_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchReconciled *)(x))->priv) @@ -47,14 +47,6 @@ struct _GNCSearchReconciledPrivate { static GNCSearchCoreTypeClass *parent_class; -enum { - LAST_SIGNAL -}; - -#if LAST_SIGNAL > 0 -static guint signals[LAST_SIGNAL] = { 0 }; -#endif - guint gnc_search_reconciled_get_type (void) { @@ -67,8 +59,8 @@ gnc_search_reconciled_get_type (void) sizeof(GNCSearchReconciledClass), (GtkClassInitFunc)gnc_search_reconciled_class_init, (GtkObjectInitFunc)gnc_search_reconciled_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -80,13 +72,13 @@ gnc_search_reconciled_get_type (void) static void gnc_search_reconciled_class_init (GNCSearchReconciledClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_reconciled_finalise; + object_class->finalize = gnc_search_reconciled_finalize; /* override methods */ gnc_search_core_type->validate = gncs_validate; @@ -109,14 +101,14 @@ gnc_search_reconciled_init (GNCSearchReconciled *o) } static void -gnc_search_reconciled_finalise (GtkObject *obj) +gnc_search_reconciled_finalize (GObject *obj) { GNCSearchReconciled *o = (GNCSearchReconciled *)obj; g_assert (IS_GNCSEARCH_RECONCILED (o)); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -168,7 +160,7 @@ static void option_changed (GtkWidget *widget, GNCSearchReconciled *fe) { fe->how = (char_match_t) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -176,7 +168,7 @@ toggle_changed (GtkToggleButton *button, GNCSearchReconciled *fe) { gboolean is_on = gtk_toggle_button_get_active (button); cleared_match_t value = - (cleared_match_t) gtk_object_get_data (GTK_OBJECT (button), "button-value"); + (cleared_match_t) g_object_get_data (G_OBJECT (button), "button-value"); if (is_on) fe->value |= value; @@ -189,8 +181,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, char_match_t option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -218,7 +210,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -231,8 +223,8 @@ make_toggle (GNCSearchReconciled *fi, char *label, char_match_t option) toggle = gtk_toggle_button_new_with_label (label); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), (fi->value & option)); - gtk_object_set_data (GTK_OBJECT (toggle), "button-value", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (toggle), "toggled", toggle_changed, fi); + g_object_set_data (G_OBJECT (toggle), "button-value", (gpointer) option); + g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (toggle_changed), fi); return toggle; } diff --git a/src/gnome-search/search-string.c b/src/gnome-search/search-string.c index 8473f2f542..7b66b17094 100644 --- a/src/gnome-search/search-string.c +++ b/src/gnome-search/search-string.c @@ -41,7 +41,7 @@ static QueryPredData_t gncs_get_predicate (GNCSearchCoreType *fe); static void gnc_search_string_class_init (GNCSearchStringClass *class); static void gnc_search_string_init (GNCSearchString *gspaper); -static void gnc_search_string_finalise (GtkObject *obj); +static void gnc_search_string_finalize (GObject *obj); #define _PRIVATE(x) (((GNCSearchString *)(x))->priv) @@ -51,14 +51,6 @@ struct _GNCSearchStringPrivate { static GNCSearchCoreTypeClass *parent_class; -enum { - LAST_SIGNAL -}; - -#if LAST_SIGNAL > 0 -static guint signals[LAST_SIGNAL] = { 0 }; -#endif - guint gnc_search_string_get_type (void) { @@ -71,8 +63,8 @@ gnc_search_string_get_type (void) sizeof(GNCSearchStringClass), (GtkClassInitFunc)gnc_search_string_class_init, (GtkObjectInitFunc)gnc_search_string_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL + NULL, + NULL }; type = gtk_type_unique(gnc_search_core_type_get_type (), &type_info); @@ -84,13 +76,13 @@ gnc_search_string_get_type (void) static void gnc_search_string_class_init (GNCSearchStringClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; GNCSearchCoreTypeClass *gnc_search_core_type = (GNCSearchCoreTypeClass *)class; - object_class = (GtkObjectClass *)class; + object_class = G_OBJECT_CLASS (class); parent_class = gtk_type_class(gnc_search_core_type_get_type ()); - object_class->finalize = gnc_search_string_finalise; + object_class->finalize = gnc_search_string_finalize; /* override methods */ gnc_search_core_type->editable_enters = editable_enters; @@ -118,7 +110,7 @@ gnc_search_string_init (GNCSearchString *o) } static void -gnc_search_string_finalise (GtkObject *obj) +gnc_search_string_finalize (GObject *obj) { GNCSearchString *o = (GNCSearchString *)obj; g_assert (IS_GNCSEARCH_STRING (o)); @@ -126,7 +118,7 @@ gnc_search_string_finalise (GtkObject *obj) g_free (o->value); g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -236,7 +228,7 @@ static void option_changed (GtkWidget *widget, GNCSearchString *fe) { fe->how = (GNCSearchString_Type) - gtk_object_get_data (GTK_OBJECT (widget), "option"); + g_object_get_data (G_OBJECT (widget), "option"); } static void @@ -253,8 +245,8 @@ add_menu_item (GtkWidget *menu, gpointer user_data, char *label, GNCSearchString_Type option) { GtkWidget *item = gtk_menu_item_new_with_label (label); - gtk_object_set_data (GTK_OBJECT (item), "option", (gpointer) option); - gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, user_data); + g_object_set_data (G_OBJECT (item), "option", (gpointer) option); + g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (option_changed), user_data); gtk_menu_append (GTK_MENU (menu), item); gtk_widget_show (item); return item; @@ -288,7 +280,7 @@ make_menu (GNCSearchCoreType *fe) opmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (opmenu), menu); - gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe); + g_signal_emit_by_name (G_OBJECT (first), "activate", fe); gtk_option_menu_set_history (GTK_OPTION_MENU (opmenu), current); return opmenu; @@ -338,14 +330,14 @@ gncs_get_widget (GNCSearchCoreType *fe) entry = gtk_entry_new (); if (fi->value) gtk_entry_set_text (GTK_ENTRY (entry), fi->value); - gtk_signal_connect (GTK_OBJECT (entry), "changed", entry_changed, fe); + g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (entry_changed), fe); gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 3); fi->priv->entry = entry; /* Build and connect the toggle button */ toggle = gtk_toggle_button_new_with_label (_("Case Insensitive?")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), fi->ign_case); - gtk_signal_connect (GTK_OBJECT(toggle), "toggled", toggle_changed, fe); + g_signal_connect (G_OBJECT(toggle), "toggled", G_CALLBACK (toggle_changed), fe); gtk_box_pack_start (GTK_BOX (box), toggle, FALSE, FALSE, 3); /* And return the box */ diff --git a/src/gnome-search/search.glade b/src/gnome-search/search.glade index dde049e3af..8222a412ef 100644 --- a/src/gnome-search/search.glade +++ b/src/gnome-search/search.glade @@ -1,485 +1,564 @@ - - + + - - Glade - glade - - - - C - True - True - False - False - False - False - + - - GnomeDialog - Search Dialog - False - Search for... - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - False - False - False + + Search for... + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True - - GtkVBox - GnomeDialog:vbox - dialog-vbox1 - False - 8 - - 4 - True - True - + + + True + False + 8 - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area1 - GTK_BUTTONBOX_SPREAD - 8 - 85 - 27 - 7 - 0 - - 0 - False - False - GTK_PACK_END - + + + True + GTK_BUTTONBOX_END - - GtkButton - button33 - True - True - True - - clicked - gnc_ui_search_find_cb - Search Dialog - Thu, 07 Feb 2002 02:21:36 GMT - - - GNOME_STOCK_PIXMAP_SEARCH - - - - GtkButton - cancel_button - True - True - - clicked - gnc_ui_search_cancel_cb - Search Dialog - Thu, 07 Feb 2002 02:22:27 GMT - - GNOME_STOCK_BUTTON_CANCEL - - - - GtkButton - close_button - True - True - - clicked - gnc_ui_search_cancel_cb - Search Dialog - Thu, 07 Feb 2002 02:22:27 GMT - - GNOME_STOCK_BUTTON_CLOSE - - - - GtkButton - new_item_button - True - True - - clicked - gnc_ui_search_new_cb - Search Dialog - Mon, 18 Feb 2002 05:35:22 GMT - - - - - - GtkButton - button36 - True - True - - clicked - gnc_ui_search_help_cb - Search Dialog - Thu, 07 Feb 2002 02:23:16 GMT - - GNOME_STOCK_BUTTON_HELP - - - - - GtkVBox - vbox89 - False - 0 - - 0 - True - True - - - - GtkHBox - hbox71 - False - 0 - - 0 - True - True - - - - GtkHBox - hbox72 - False - 0 - 0 - False - False + + True + True + True + GTK_RELIEF_NORMAL + 0 + + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-new + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _New item ... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + - - GtkLabel - type_label - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label844 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkFrame - search_frame - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkVBox - vbox88 - 3 - False - 0 - - - GtkHBox - hbox73 - 3 - False - 0 - - 0 - False - False - - - - GtkHBox - add_button_box - False - 0 - - 0 - False - False - - - - Placeholder - - - - - GtkHBox - type_menu_box - False - 0 - - 0 - False - False - GTK_PACK_END - - - - Placeholder - - - - - GtkLabel - label846 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - GTK_PACK_END - - - - - - GtkScrolledWindow - scrolledwindow1 - 100 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - False - False - - - - GtkViewport - viewport1 - GTK_SHADOW_IN - - - GtkTable - criteria_table - 3 - 1 - 2 - False - 0 - 0 - - - - - - - - GtkHBox - result_hbox - False - 0 - - 0 - True - True - - - - GtkHBox - hboxXXX - False - 0 - 0 - False - False + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + -7 + + - - GtkFrame - frame12 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkVBox - vbox24 - 3 - False - 0 - - - GtkRadioButton - new_search_radiobutton - True - - toggled - gnc_ui_search_type_cb - Search Dialog - Thu, 07 Feb 2002 01:25:13 GMT - - - False - True - search_type - - 0 - False - False - - - - - GtkRadioButton - narrow_search_radiobutton - True - - toggled - gnc_ui_search_type_cb - Search Dialog - Wed, 05 Apr 2000 14:20:05 GMT - - - False - True - search_type - - 0 - False - False - - - - - GtkRadioButton - add_search_radiobutton - True - - toggled - gnc_ui_search_type_cb - Search Dialog - Wed, 05 Apr 2000 14:20:17 GMT - - - False - True - search_type - - 0 - False - False - - - - - GtkRadioButton - delete_search_radiobutton - True - - toggled - gnc_ui_search_type_cb - Search Dialog - Wed, 05 Apr 2000 14:20:26 GMT - - - False - True - search_type - - 0 - False - False - - - - - GtkHSeparator - hseparator1 - - 0 - True - True - - - - - GtkCheckButton - active_only_check - Choose whether to search all your data or only that marked as "active" - True - - toggled - gnc_ui_search_active_cb - Search Dialog - Wed, 15 Jan 2003 03:21:35 GMT - - - True - True - - 0 - False - False - - + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + -11 + - + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + + True + True + True + gtk-find + True + GTK_RELIEF_NORMAL + 0 + + + - + + 0 + False + False + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + False + 0 + + + + True + () + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Search + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + 6 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + False + 0 + + + + 3 + True + False + 0 + + + + True + False + 0 + + + + + + + 0 + False + False + + + + + + True + False + 0 + + + + + + + 0 + False + False + GTK_PACK_END + + + + + + True + Search for items where + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + GTK_PACK_END + + + + + 0 + False + False + + + + + + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + GTK_SHADOW_IN + + + + 3 + True + 1 + 1 + False + 0 + 0 + + + + + + + 0 + False + False + + + + + + + + True + Search Criteria + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + 6 + True + False + 0 + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + False + 0 + + + + True + True + New search + True + GTK_RELIEF_NORMAL + False + False + True + + + + 0 + False + False + + + + + + True + True + Refine current search + True + GTK_RELIEF_NORMAL + False + False + True + new_search_radiobutton + + + + 0 + False + False + + + + + + True + True + Add results to current search + True + GTK_RELIEF_NORMAL + False + False + True + new_search_radiobutton + + + + 0 + False + False + + + + + + True + True + Delete results from current search + True + GTK_RELIEF_NORMAL + False + False + True + new_search_radiobutton + + + + 0 + False + False + + + + + + True + + + 0 + True + True + + + + + + True + Choose whether to search all your data or only that marked as "active" + True + Search only active data + True + GTK_RELIEF_NORMAL + True + False + True + + + + 0 + False + False + + + + + + + + True + Type of search + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + - + - + diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c index 2d7cac5939..da77a1edd4 100644 --- a/src/gnome-utils/dialog-utils.c +++ b/src/gnome-utils/dialog-utils.c @@ -511,23 +511,23 @@ gnc_option_menu_init(GtkWidget * w) typedef struct { int i; - GtkSignalFunc f; + GCallback f; gpointer cb_data; } menu_init_data; static void gnc_option_menu_set_one_item (gpointer loop_data, gpointer user_data) { - GtkObject *item = GTK_OBJECT(loop_data); + GObject *item = G_OBJECT(loop_data); menu_init_data *args = (menu_init_data *) user_data; - gtk_object_set_data(item, "option_index", GINT_TO_POINTER(args->i++)); - gtk_signal_connect(item, "activate", args->f, args->cb_data); + g_object_set_data(item, "option_index", GINT_TO_POINTER(args->i++)); + g_signal_connect(item, "activate", args->f, args->cb_data); } void -gnc_option_menu_init_w_signal(GtkWidget * w, GtkSignalFunc f, gpointer cb_data) +gnc_option_menu_init_w_signal(GtkWidget * w, GCallback f, gpointer cb_data) { GtkWidget * menu; menu_init_data foo; @@ -1084,14 +1084,14 @@ GModule *allsymbols = NULL; void gnc_glade_autoconnect_full_func(const gchar *handler_name, - GtkObject *signal_object, + GObject *signal_object, const gchar *signal_name, const gchar *signal_data, - GtkObject *other_object, + GObject *other_object, gboolean signal_after, gpointer user_data) { - GtkSignalFunc func; + GCallback func; if (allsymbols == NULL) { /* get a handle on the main executable -- use this to find symbols */ @@ -1105,16 +1105,16 @@ gnc_glade_autoconnect_full_func(const gchar *handler_name, if (other_object) { if (signal_after) - gtk_signal_connect_object_after(signal_object, signal_name, func, - other_object); + g_signal_connect_object (signal_object, signal_name, func, + other_object, G_CONNECT_AFTER); else - gtk_signal_connect_object(signal_object, signal_name, func, - other_object); + g_signal_connect_object(signal_object, signal_name, func, + other_object, 0); } else { if (signal_after) - gtk_signal_connect_after(signal_object, signal_name, func, user_data); + g_signal_connect_after(signal_object, signal_name, func, user_data); else - gtk_signal_connect(signal_object, signal_name, func, user_data); + g_signal_connect(signal_object, signal_name, func, user_data); } } diff --git a/src/gnome-utils/dialog-utils.h b/src/gnome-utils/dialog-utils.h index f7bcf22837..313fdc8807 100644 --- a/src/gnome-utils/dialog-utils.h +++ b/src/gnome-utils/dialog-utils.h @@ -116,7 +116,7 @@ void gnc_fill_menu_with_data (GnomeUIInfo *info, gpointer data); void gnc_option_menu_init (GtkWidget * option_menu); void gnc_option_menu_init_w_signal(GtkWidget * w, - GtkSignalFunc f, + GCallback f, gpointer cb_data); int gnc_option_menu_get_active (GtkWidget * option_menu); @@ -155,10 +155,10 @@ void gnc_clist_columns_autosize (GtkCList *list); GladeXML * gnc_glade_xml_new (const char *filename, const char *root); GtkWidget * gnc_glade_lookup_widget (GtkWidget *widget, const char *name); void gnc_glade_autoconnect_full_func(const gchar *handler_name, - GtkObject *signal_object, + GObject *signal_object, const gchar *signal_name, const gchar *signal_data, - GtkObject *connect_object, + GObject *connect_object, gboolean after, gpointer user_data); diff --git a/src/gnome-utils/druid-utils.h b/src/gnome-utils/druid-utils.h index 104776f047..089e027601 100644 --- a/src/gnome-utils/druid-utils.h +++ b/src/gnome-utils/druid-utils.h @@ -24,7 +24,7 @@ #ifndef DRUID_UTILS_H #define DRUID_UTILS_H -#include +#include void gnc_druid_set_colors (GnomeDruid *druid); diff --git a/src/gnome-utils/gnc-account-sel.c b/src/gnome-utils/gnc-account-sel.c index ccc62544bf..8fcd30a4cf 100644 --- a/src/gnome-utils/gnc-account-sel.c +++ b/src/gnome-utils/gnc-account-sel.c @@ -43,19 +43,20 @@ enum static gint account_sel_signals [LAST_SIGNAL] = { 0 }; -static void gnc_account_sel_init (GNCAccountSel *gas); -static void gnc_account_sel_class_init (GNCAccountSelClass *class); -static void gas_accounts_to_names( gpointer data, gpointer user_data ); +static void gnc_account_sel_init (GNCAccountSel *gas); +static void gnc_account_sel_class_init (GNCAccountSelClass *klass); +static void gnc_account_sel_finalize (GObject *object); +static void gnc_account_sel_dispose (GObject *object); -static void gas_populate_list( GNCAccountSel *gas ); -static void gas_strcmp_adapter( gpointer a, gpointer b ); -static void gnc_account_sel_event_cb( GUID *entity, +static void gas_accounts_to_names (gpointer data, gpointer user_data); + +static void gas_populate_list (GNCAccountSel *gas); +static void gas_strcmp_adapter (gpointer a, gpointer b); +static void gnc_account_sel_event_cb (GUID *entity, GNCEngineEventType event_type, - gpointer user_data ); + gpointer user_data); -static void gas_new_account_click( GtkButton *b, gpointer ud ); - -static void gas_destroy( GtkObject *o, gpointer user_data ); +static void gas_new_account_click (GtkButton *b, gpointer ud); #if 0 /* completion not implemented */ static void gnc_account_sel_changed( GtkEditable *entry, gpointer ud ); @@ -66,24 +67,27 @@ static gint gnc_account_sel_key_press( GtkWidget *widget, static GtkHBox *parent_class; -guint +GType gnc_account_sel_get_type (void) { - static guint account_sel_type = 0; + static GType account_sel_type = 0; - if (!account_sel_type){ - GtkTypeInfo account_sel_info = { - "GNCAccountSel", - sizeof (GNCAccountSel), + if (account_sel_type == 0) { + GTypeInfo account_sel_info = { sizeof (GNCAccountSelClass), - (GtkClassInitFunc) gnc_account_sel_class_init, - (GtkObjectInitFunc) gnc_account_sel_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, + NULL, + NULL, + (GClassInitFunc) gnc_account_sel_class_init, + NULL, + NULL, + sizeof (GNCAccountSel), + 0, + (GInstanceInitFunc) gnc_account_sel_init }; - account_sel_type = gtk_type_unique (GTK_TYPE_HBOX, &account_sel_info); + account_sel_type = g_type_register_static (GTK_TYPE_HBOX, + "GNCAccountSel", + &account_sel_info, 0); } return account_sel_type; @@ -108,34 +112,25 @@ gnc_account_sel_event_cb( GUID *entity, static void -gnc_account_sel_class_init (GNCAccountSelClass *class) +gnc_account_sel_class_init (GNCAccountSelClass *klass) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkHBoxClass *hbox_class; + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - hbox_class = (GtkHBoxClass*) class; + parent_class = g_type_class_peek_parent (klass); - parent_class = gtk_type_class (gtk_entry_get_type ()); + object_class->finalize = gnc_account_sel_finalize; + object_class->dispose = gnc_account_sel_dispose; account_sel_signals [ACCOUNT_SEL_CHANGED] = - gtk_signal_new ("account_sel_changed", - GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET (GNCAccountSelClass, - account_sel_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - -#if 0 - gtk_object_class_add_signals (object_class, - account_sel_signals, - LAST_SIGNAL); - -#endif - - class->account_sel_changed = NULL; + g_signal_new ("account_sel_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCAccountSelClass, account_sel_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } static void @@ -151,9 +146,6 @@ gnc_account_sel_init (GNCAccountSel *gas) /* This is only because completion cannot be implemented. */ gtk_editable_set_editable( GTK_EDITABLE(gas->combo->entry), FALSE ); - gtk_signal_connect( GTK_OBJECT(gas), "destroy", - GTK_SIGNAL_FUNC( gas_destroy ), - gas ); #if 0 /* completion not implemented. */ gtk_signal_connect( GTK_OBJECT(gas->combo->entry), "changed", @@ -361,7 +353,7 @@ gnc_account_sel_new (void) { GNCAccountSel *gas; - gas = gtk_type_new (gnc_account_sel_get_type ()); + gas = g_object_new (GNC_TYPE_ACCOUNT_SEL, NULL); return GTK_WIDGET (gas); } @@ -428,22 +420,44 @@ gnc_account_sel_set_acct_filters( GNCAccountSel *gas, GList *filters ) gas_populate_list( gas ); } -static -void -gas_destroy( GtkObject *o, gpointer user_data ) +static void +gnc_account_sel_finalize (GObject *object) { - GNCAccountSel *gas = (GNCAccountSel*)user_data; - if ( gas->acctTypeFilters ) { - g_list_free( gas->acctTypeFilters ); + GNCAccountSel *gas; + + g_return_if_fail (object != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_SEL (object)); + + gas = GNC_ACCOUNT_SEL (object); + + if (gas->acctTypeFilters) { + g_list_free (gas->acctTypeFilters); } - gnc_engine_unregister_event_handler( gas->eventHandlerId ); + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +gnc_account_sel_dispose (GObject *object) +{ + GNCAccountSel *gas; + + g_return_if_fail (object != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_SEL (object)); + + gas = GNC_ACCOUNT_SEL (object); + + gnc_engine_unregister_event_handler (gas->eventHandlerId); + + G_OBJECT_CLASS (parent_class)->dispose (object); } void gnc_account_sel_set_new_account_ability( GNCAccountSel *gas, gboolean state ) { - g_assert( gas ); + g_return_if_fail (gas != NULL); + if ( state == (gas->newAccountButton != NULL) ) { /* We're already in that state; don't do anything. */ return; @@ -473,12 +487,11 @@ void gnc_account_sel_set_new_account_modal( GNCAccountSel *gas, gboolean state ) { - g_assert ( gas ); + g_return_if_fail (gas != NULL); gas->isModal = state; } -static -void +static void gas_new_account_click( GtkButton *b, gpointer ud ) { GNCAccountSel *gas = (GNCAccountSel*)ud; diff --git a/src/gnome-utils/gnc-account-sel.h b/src/gnome-utils/gnc-account-sel.h index 1c5542d7e7..8e7de5baa0 100644 --- a/src/gnome-utils/gnc-account-sel.h +++ b/src/gnome-utils/gnc-account-sel.h @@ -33,9 +33,10 @@ #include #include "Account.h" -#define GNC_ACCOUNT_SEL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_account_sel_get_type(), GNCAccountSel) -#define GNC_ACCOUNT_SEL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gnc_account_sel_get_type(), GNCAccountSelClass) -#define GNC_IS_ACCOUNT_SEL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gnc_account_sel_get_type ()) +#define GNC_TYPE_ACCOUNT_SEL (gnc_account_sel_get_type()) +#define GNC_ACCOUNT_SEL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_ACCOUNT_SEL, GNCAccountSel) +#define GNC_ACCOUNT_SEL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_ACCOUNT_SEL, GNCAccountSelClass) +#define GNC_IS_ACCOUNT_SEL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_ACCOUNT_SEL) typedef struct { @@ -62,9 +63,9 @@ typedef struct void (*account_sel_changed) (GNCAccountSel *gas); } GNCAccountSelClass; -guint gnc_account_sel_get_type(void); -GtkWidget* gnc_account_sel_new(void); -GtkWidget* gnc_account_sel_gtk_entry(GNCAccountSel *gas); +GType gnc_account_sel_get_type (void); +GtkWidget* gnc_account_sel_new (void); +GtkWidget* gnc_account_sel_gtk_entry (GNCAccountSel *gas); /** * Sets the GAS to the given account. If the account doesn't exist in the * list, then it doesn't change the state of the GAS. If the account is diff --git a/src/gnome-utils/gnc-account-tree.c b/src/gnome-utils/gnc-account-tree.c index c35e0dd543..4a7136fa6b 100644 --- a/src/gnome-utils/gnc-account-tree.c +++ b/src/gnome-utils/gnc-account-tree.c @@ -57,54 +57,56 @@ static short module = MOD_GUI; /** Static function declarations **************************************/ -static void gnc_account_tree_init(GNCAccountTree *tree); -static void gnc_account_tree_class_init(GNCAccountTreeClass *klass); -static gint gnc_account_tree_key_press(GtkWidget *widget, GdkEventKey *event); -static gint gnc_account_tree_button_press(GtkWidget *widget, - GdkEventButton *event); -static void gnc_account_tree_select_row(GtkCTree *ctree, - GtkCTreeNode *row, - gint column); -static void gnc_account_tree_unselect_row(GtkCTree *ctree, - GtkCTreeNode *row, - gint column); -static GtkCTreeNode * gnc_account_tree_insert_row(GNCAccountTree *tree, - GtkCTreeNode *parent, - GtkCTreeNode *sibling, - Account *acc); -static void gnc_account_tree_fill(GNCAccountTree *tree, - GHashTable *expanded_accounts, - GtkCTreeNode *parent, - AccountGroup *accts); -static void gnc_account_tree_set_view_info_real(GNCAccountTree *tree); +static void gnc_account_tree_init (GNCAccountTree *tree); +static void gnc_account_tree_class_init (GNCAccountTreeClass *klass); +static void gnc_account_tree_finalize (GObject *object); +static void gnc_account_tree_dispose (GObject *object); + +static gint gnc_account_tree_key_press (GtkWidget *widget, GdkEventKey *event); +static gint gnc_account_tree_button_press (GtkWidget *widget, + GdkEventButton *event); +static void gnc_account_tree_select_row (GtkCTree *ctree, + GtkCTreeNode *row, + gint column); +static void gnc_account_tree_unselect_row (GtkCTree *ctree, + GtkCTreeNode *row, + gint column); +static GtkCTreeNode * gnc_account_tree_insert_row (GNCAccountTree *tree, + GtkCTreeNode *parent, + GtkCTreeNode *sibling, + Account *acc); +static void gnc_account_tree_fill (GNCAccountTree *tree, + GHashTable *expanded_accounts, + GtkCTreeNode *parent, + AccountGroup *accts); +static void gnc_account_tree_set_view_info_real (GNCAccountTree *tree); static void gnc_account_tree_update_column_visibility (GNCAccountTree *tree); -static void gnc_account_tree_destroy(GtkObject *object); -GtkType +GType gnc_account_tree_get_type (void) { - static GtkType gnc_account_tree_type = 0; + static GType gnc_account_tree_type = 0; - if (!gnc_account_tree_type) - { - static const GtkTypeInfo gnc_account_tree_info = - { - "GNCAccountTree", - sizeof (GNCAccountTree), - sizeof (GNCAccountTreeClass), - (GtkClassInitFunc) gnc_account_tree_class_init, - (GtkObjectInitFunc) gnc_account_tree_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL - }; - - gnc_account_tree_type = gtk_type_unique (GTK_TYPE_CTREE, - &gnc_account_tree_info); - } - - return gnc_account_tree_type; + if (gnc_account_tree_type == 0) { + static const GTypeInfo gnc_account_tree_info = { + sizeof (GNCAccountTreeClass), + NULL, + NULL, + (GClassInitFunc) gnc_account_tree_class_init, + NULL, + NULL, + sizeof (GNCAccountTree), + 0, + (GInstanceInitFunc) gnc_account_tree_init + }; + + gnc_account_tree_type = g_type_register_static (GTK_TYPE_CTREE, + "GNCAccountTree", + &gnc_account_tree_info, 0); + } + + return gnc_account_tree_type; } @@ -125,20 +127,23 @@ refresh_handler (GHashTable *changes, gpointer user_data) GtkWidget * gnc_account_tree_new (void) { - GtkWidget *tree; - gint component_id; + GNCAccountTree *tree; + gint component_id; - tree = GTK_WIDGET(gtk_type_new(gnc_account_tree_get_type())); + tree = g_object_new (GNC_TYPE_ACCOUNT_TREE, + "n-columns", 12, + "tree-column", 0, + NULL); - component_id = gnc_register_gui_component (ACCOUNT_TREE_CM_CLASS, - refresh_handler, NULL, - tree); + component_id = gnc_register_gui_component (ACCOUNT_TREE_CM_CLASS, + refresh_handler, NULL, + GTK_WIDGET (tree)); - gnc_gui_component_watch_entity_type (component_id, - GNC_ID_ACCOUNT, - GNC_EVENT_MODIFY | GNC_EVENT_DESTROY); - - return tree; + gnc_gui_component_watch_entity_type (component_id, + GNC_ID_ACCOUNT, + GNC_EVENT_MODIFY | GNC_EVENT_DESTROY); + + return GTK_WIDGET (tree); } @@ -168,6 +173,8 @@ gnc_account_tree_new_with_root (Account * root) static void gnc_account_tree_init (GNCAccountTree *tree) { + guint i = 0; + tree->root_account = *xaccGUIDNULL (); tree->current_accounts = NULL; tree->ignore_unselect = FALSE; @@ -180,9 +187,9 @@ gnc_account_tree_init (GNCAccountTree *tree) gnc_account_tree_set_view_info_real(tree); - gtk_ctree_construct(GTK_CTREE(tree), - tree->num_columns, 0, - (gchar **) tree->column_headings); + for (i = 0; i < tree->num_columns; i++) { + gtk_clist_set_column_title (GTK_CLIST (tree), i, tree->column_headings[i]); + } gtk_clist_set_shadow_type(GTK_CLIST(tree), GTK_SHADOW_IN); gtk_clist_column_titles_passive(GTK_CLIST(tree)); @@ -203,23 +210,6 @@ gnc_account_tree_init (GNCAccountTree *tree) tree->total_column + 1, GTK_JUSTIFY_RIGHT); - { - GtkStyle *style = gtk_widget_get_style(GTK_WIDGET(tree)); - GdkFont *font = NULL; - gint width; - gint i; - - if (style != NULL) - font = style->font; - - if (font != NULL) - for (i = 0; i < tree->num_columns; i++) - { - width = gdk_string_width(font, tree->column_headings[i]); - gtk_clist_set_column_min_width(GTK_CLIST(tree), i, width + 5); - } - } - tree->deficit_style = NULL; if (gnc_color_deficits()) @@ -237,68 +227,62 @@ gnc_account_tree_init (GNCAccountTree *tree) } static void -gnc_account_tree_class_init(GNCAccountTreeClass *klass) +gnc_account_tree_class_init (GNCAccountTreeClass *klass) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; - GtkCListClass *clist_class; - GtkCTreeClass *ctree_class; + GObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkCTreeClass *ctree_class; + + object_class = G_OBJECT_CLASS (klass); + widget_class = GTK_WIDGET_CLASS (klass); + ctree_class = GTK_CTREE_CLASS (klass); - object_class = (GtkObjectClass*) klass; - widget_class = (GtkWidgetClass*) klass; - container_class = (GtkContainerClass*) klass; - clist_class = (GtkCListClass*) klass; - ctree_class = (GtkCTreeClass*) klass; + parent_class = g_type_class_peek_parent (klass); - parent_class = gtk_type_class(GTK_TYPE_CTREE); + account_tree_signals[SELECT_ACCOUNT] = + g_signal_new ("select_account", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GNCAccountTreeClass, select_account), + NULL, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); - account_tree_signals[SELECT_ACCOUNT] = - gtk_signal_new("select_account", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GNCAccountTreeClass, - select_account), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); + account_tree_signals[UNSELECT_ACCOUNT] = + g_signal_new ("unselect_account", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GNCAccountTreeClass, unselect_account), + NULL, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); - account_tree_signals[UNSELECT_ACCOUNT] = - gtk_signal_new("unselect_account", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GNCAccountTreeClass, - unselect_account), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); + account_tree_signals[ACTIVATE_ACCOUNT] = + g_signal_new ("activate_account", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(GNCAccountTreeClass, activate_account), + NULL, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); - account_tree_signals[ACTIVATE_ACCOUNT] = - gtk_signal_new("activate_account", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET(GNCAccountTreeClass, - activate_account), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, - GTK_TYPE_POINTER); -#if 0 - gtk_object_class_add_signals(object_class, - account_tree_signals, - LAST_SIGNAL); -#endif + object_class->finalize = gnc_account_tree_finalize; + object_class->dispose = gnc_account_tree_dispose; - object_class->destroy = gnc_account_tree_destroy; + widget_class->key_press_event = gnc_account_tree_key_press; + widget_class->button_press_event = gnc_account_tree_button_press; - widget_class->key_press_event = gnc_account_tree_key_press; - widget_class->button_press_event = gnc_account_tree_button_press; - - ctree_class->tree_select_row = gnc_account_tree_select_row; - ctree_class->tree_unselect_row = gnc_account_tree_unselect_row; - - klass->select_account = NULL; - klass->unselect_account = NULL; - klass->activate_account = NULL; + ctree_class->tree_select_row = gnc_account_tree_select_row; + ctree_class->tree_unselect_row = gnc_account_tree_unselect_row; } /********************************************************************\ @@ -407,12 +391,12 @@ gnc_account_tree_refresh(GNCAccountTree * tree) void gnc_account_tree_set_view_info(GNCAccountTree *tree, AccountViewInfo *info) { - g_return_if_fail(IS_GNC_ACCOUNT_TREE(tree)); - g_return_if_fail(info != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); + g_return_if_fail (info != NULL); - tree->avi = *info; + tree->avi = *info; - gnc_account_tree_refresh(tree); + gnc_account_tree_refresh (tree); } @@ -427,10 +411,10 @@ gnc_account_tree_set_view_info(GNCAccountTree *tree, AccountViewInfo *info) void gnc_account_tree_get_view_info(GNCAccountTree *tree, AccountViewInfo *info) { - g_return_if_fail(IS_GNC_ACCOUNT_TREE(tree)); - g_return_if_fail(info != NULL); - - *info = tree->avi; + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); + g_return_if_fail(info != NULL); + + *info = tree->avi; } @@ -445,20 +429,20 @@ gnc_account_tree_get_view_info(GNCAccountTree *tree, AccountViewInfo *info) void gnc_account_tree_expand_account(GNCAccountTree *tree, Account *account) { - GtkCTree *ctree; - GtkCTreeNode *node; + GtkCTree *ctree; + GtkCTreeNode *node; - g_return_if_fail(tree != NULL); - g_return_if_fail(IS_GNC_ACCOUNT_TREE(tree)); + g_return_if_fail (tree != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); - ctree = GTK_CTREE(tree); + ctree = GTK_CTREE (tree); - /* Get the node with the account */ - node = gtk_ctree_find_by_row_data(ctree, NULL, account); - if (node == NULL) - return; + /* Get the node with the account */ + node = gtk_ctree_find_by_row_data (ctree, NULL, account); + if (node == NULL) + return; - gtk_ctree_expand(ctree, node); + gtk_ctree_expand (ctree, node); } @@ -474,20 +458,20 @@ void gnc_account_tree_toggle_account_expansion (GNCAccountTree *tree, Account *account) { - GtkCTree *ctree; - GtkCTreeNode *node; + GtkCTree *ctree; + GtkCTreeNode *node; - g_return_if_fail(tree != NULL); - g_return_if_fail(IS_GNC_ACCOUNT_TREE(tree)); + g_return_if_fail (tree != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); - ctree = GTK_CTREE(tree); + ctree = GTK_CTREE (tree); - /* Get the node with the account */ - node = gtk_ctree_find_by_row_data(ctree, NULL, account); - if (node == NULL) - return; + /* Get the node with the account */ + node = gtk_ctree_find_by_row_data (ctree, NULL, account); + if (node == NULL) + return; - gtk_ctree_toggle_expansion(ctree, node); + gtk_ctree_toggle_expansion(ctree, node); } @@ -501,14 +485,14 @@ gnc_account_tree_toggle_account_expansion (GNCAccountTree *tree, void gnc_account_tree_expand_all (GNCAccountTree *tree) { - GtkCTree *ctree; + GtkCTree *ctree; - g_return_if_fail (tree != NULL); - g_return_if_fail (IS_GNC_ACCOUNT_TREE(tree)); + g_return_if_fail (tree != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); - ctree = GTK_CTREE(tree); + ctree = GTK_CTREE (tree); - gtk_ctree_expand_recursive (ctree, NULL); + gtk_ctree_expand_recursive (ctree, NULL); } @@ -909,11 +893,11 @@ gnc_account_tree_set_view_filter(GNCAccountTree *tree, AccountFilter filter, gpointer user_data) { - g_return_if_fail(tree != NULL); - g_return_if_fail(IS_GNC_ACCOUNT_TREE(tree)); + g_return_if_fail (tree != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); - tree->view_filter = filter; - tree->view_filter_data = user_data; + tree->view_filter = filter; + tree->view_filter_data = user_data; } /********************************************************************\ @@ -930,11 +914,11 @@ gnc_account_tree_set_selectable_filter (GNCAccountTree *tree, AccountFilter filter, gpointer user_data) { - g_return_if_fail(tree != NULL); - g_return_if_fail(IS_GNC_ACCOUNT_TREE(tree)); + g_return_if_fail (tree != NULL); + g_return_if_fail (GNC_IS_ACCOUNT_TREE (tree)); - tree->selectable_filter = filter; - tree->selectable_filter_data = user_data; + tree->selectable_filter = filter; + tree->selectable_filter_data = user_data; } static void @@ -1224,21 +1208,27 @@ gnc_account_tree_insert_row(GNCAccountTree *tree, } static void -gnc_account_tree_destroy(GtkObject *object) +gnc_account_tree_finalize (GObject *object) { - GNCAccountTree *tree = GNC_ACCOUNT_TREE(object); + GNCAccountTree *tree = GNC_ACCOUNT_TREE(object); - gnc_unregister_gui_component_by_data (ACCOUNT_TREE_CM_CLASS, tree); + g_list_free(tree->current_accounts); + tree->current_accounts = NULL; - if (tree->deficit_style != NULL) - { - g_object_unref(tree->deficit_style); - tree->deficit_style = NULL; - } - - g_list_free(tree->current_accounts); - tree->current_accounts = NULL; - - if (GTK_OBJECT_CLASS(parent_class)->destroy) - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object); + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +gnc_account_tree_dispose (GObject *object) +{ + GNCAccountTree *tree = GNC_ACCOUNT_TREE(object); + + gnc_unregister_gui_component_by_data (ACCOUNT_TREE_CM_CLASS, tree); + + if (tree->deficit_style != NULL) { + g_object_unref(tree->deficit_style); + tree->deficit_style = NULL; + } + + G_OBJECT_CLASS (parent_class)->dispose (object); } diff --git a/src/gnome-utils/gnc-account-tree.h b/src/gnome-utils/gnc-account-tree.h index fdf38533c9..4d09ff884a 100644 --- a/src/gnome-utils/gnc-account-tree.h +++ b/src/gnome-utils/gnc-account-tree.h @@ -29,77 +29,71 @@ #include "Group.h" #include "gnc-ui-util.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS -#define GTK_TYPE_GNC_ACCOUNT_TREE (gnc_account_tree_get_type ()) -#define GNC_ACCOUNT_TREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_GNC_ACCOUNT_TREE, GNCAccountTree)) -#define GNC_ACCOUNT_TREE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_GNC_ACCOUNT_TREE, GNCAccountTreeClass)) -#define IS_GNC_ACCOUNT_TREE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_GNC_ACCOUNT_TREE)) -#define IS_GNC_ACCOUNT_TREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_GNC_ACCOUNT_TREE)) - -typedef struct GNCAccountTree_s GNCAccountTree; -typedef struct GNCAccountTreeClass_s GNCAccountTreeClass; -typedef struct AccountViewInfo_s AccountViewInfo; +#define GNC_TYPE_ACCOUNT_TREE (gnc_account_tree_get_type ()) +#define GNC_ACCOUNT_TREE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_ACCOUNT_TREE, GNCAccountTree)) +#define GNC_ACCOUNT_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNC_TYPE_ACCOUNT_TREE, GNCAccountTreeClass)) +#define GNC_IS_ACCOUNT_TREE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_ACCOUNT_TREE)) +#define GNC_IS_ACCOUNT_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GNC_TYPE_ACCOUNT_TREE)) typedef gboolean (*AccountFilter) (Account *account, gpointer user_data); -struct AccountViewInfo_s +typedef struct { - gboolean include_type[NUM_ACCOUNT_TYPES]; + gboolean include_type[NUM_ACCOUNT_TYPES]; - gboolean show_field[NUM_ACCOUNT_FIELDS]; -}; + gboolean show_field[NUM_ACCOUNT_FIELDS]; +} AccountViewInfo; -struct GNCAccountTree_s +typedef struct GNCAccountTree_s { - GtkCTree ctree; + GtkCTree ctree; - AccountFilter view_filter; - gpointer view_filter_data; + AccountFilter view_filter; + gpointer view_filter_data; - AccountFilter selectable_filter; - gpointer selectable_filter_data; + AccountFilter selectable_filter; + gpointer selectable_filter_data; - AccountViewInfo avi; + AccountViewInfo avi; - gint num_columns; - gint description_column; - gint balance_column; - gint total_column; - AccountFieldCode column_fields[NUM_ACCOUNT_FIELDS]; + gint num_columns; + gint description_column; + gint balance_column; + gint total_column; + AccountFieldCode column_fields[NUM_ACCOUNT_FIELDS]; - const gchar * column_headings[NUM_ACCOUNT_FIELDS + 1]; + const gchar * column_headings[NUM_ACCOUNT_FIELDS + 1]; - GtkStyle *deficit_style; + GtkStyle *deficit_style; - GUID root_account; + GUID root_account; - GList * current_accounts; + GList *current_accounts; - gboolean ignore_unselect; -}; + gboolean ignore_unselect; +} GNCAccountTree; -struct GNCAccountTreeClass_s +typedef struct { - GtkCTreeClass parent_class; + GtkCTreeClass parent_class; - void (*select_account) (GNCAccountTree *tree, - Account *account); + void (*select_account) (GNCAccountTree *tree, + Account *account); - void (*unselect_account) (GNCAccountTree *tree, - Account *account); + void (*unselect_account) (GNCAccountTree *tree, + Account *account); - void (*activate_account) (GNCAccountTree *tree, - Account *account); -}; + void (*activate_account) (GNCAccountTree *tree, + Account *account); +} GNCAccountTreeClass; /*********************************************************** * public functions * ***********************************************************/ -GtkType gnc_account_tree_get_type (void); +GType gnc_account_tree_get_type (void); GtkWidget * gnc_account_tree_new (void); @@ -165,8 +159,6 @@ void gnc_account_tree_set_selectable_filter (GNCAccountTree *tree, AccountFilter filter, gpointer user_data); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* GNC_ACCOUNT_TREE_H */ diff --git a/src/gnome-utils/gnc-amount-edit.c b/src/gnome-utils/gnc-amount-edit.c index 4249b5bdfd..0b8bbddfea 100644 --- a/src/gnome-utils/gnc-amount-edit.c +++ b/src/gnome-utils/gnc-amount-edit.c @@ -66,60 +66,60 @@ static GtkEntryClass *parent_class; * * Returns the GtkType for the GNCAmountEdit widget */ -guint +GType gnc_amount_edit_get_type (void) { - static guint amount_edit_type = 0; + static GType amount_edit_type = 0; - if (!amount_edit_type){ - GtkTypeInfo amount_edit_info = { - "GNCAmountEdit", - sizeof (GNCAmountEdit), - sizeof (GNCAmountEditClass), - (GtkClassInitFunc) gnc_amount_edit_class_init, - (GtkObjectInitFunc) gnc_amount_edit_init, - NULL, - NULL, - (GtkClassInitFunc) NULL, - }; + if (amount_edit_type == 0) { + GTypeInfo amount_edit_info = { + sizeof (GNCAmountEditClass), + NULL, + NULL, + (GClassInitFunc) gnc_amount_edit_class_init, + NULL, + NULL, + sizeof (GNCAmountEdit), + 0, + (GInstanceInitFunc) gnc_amount_edit_init + }; + + amount_edit_type = g_type_register_static (GTK_TYPE_ENTRY, + "GNCAmountEdit", + &amount_edit_info, + 0); + } - amount_edit_type = gtk_type_unique (GTK_TYPE_ENTRY, &amount_edit_info); - } - - return amount_edit_type; + return amount_edit_type; } static void -gnc_amount_edit_class_init (GNCAmountEditClass *class) +gnc_amount_edit_class_init (GNCAmountEditClass *klass) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkEditableClass *editable_class; + GObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkEditableClass *editable_class; - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - editable_class = (GtkEditableClass*) class; + object_class = G_OBJECT_CLASS (klass); + widget_class = GTK_WIDGET_CLASS (klass); + editable_class = GTK_EDITABLE_CLASS (klass); - parent_class = gtk_type_class (gtk_entry_get_type ()); + parent_class = g_type_class_peek_parent (klass); - amount_edit_signals [AMOUNT_CHANGED] = - gtk_signal_new ("amount_changed", - GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET (GNCAmountEditClass, - amount_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + amount_edit_signals [AMOUNT_CHANGED] = + g_signal_new ("amount_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCAmountEditClass, amount_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); -#if 0 - gtk_object_class_add_signals (object_class, amount_edit_signals, - LAST_SIGNAL); -#endif + widget_class->key_press_event = gnc_amount_edit_key_press; - widget_class->key_press_event = gnc_amount_edit_key_press; - - editable_class->changed = gnc_amount_edit_changed; - - class->amount_changed = NULL; + editable_class->changed = gnc_amount_edit_changed; } static void diff --git a/src/gnome-utils/gnc-amount-edit.h b/src/gnome-utils/gnc-amount-edit.h index efafd42169..eabe6de159 100644 --- a/src/gnome-utils/gnc-amount-edit.h +++ b/src/gnome-utils/gnc-amount-edit.h @@ -34,9 +34,10 @@ #include "gnc-numeric.h" #include "gnc-ui-util.h" -#define GNC_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_amount_edit_get_type(), GNCAmountEdit) -#define GNC_AMOUNT_EDIT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gnc_amount_edit_get_type(), GNCAmountEditClass) -#define GNC_IS_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gnc_amount_edit_get_type ()) +#define GNC_TYPE_AMOUNT_EDIT (gnc_amount_edit_get_type()) +#define GNC_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_AMOUNT_EDIT, GNCAmountEdit) +#define GNC_AMOUNT_EDIT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_AMOUNT_EDIT, GNCAmountEditClass) +#define GNC_IS_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_AMOUNT_EDIT) typedef struct { @@ -62,7 +63,7 @@ typedef struct void (*amount_changed) (GNCAmountEdit *gae); } GNCAmountEditClass; -guint gnc_amount_edit_get_type (void); +GType gnc_amount_edit_get_type (void); GtkWidget *gnc_amount_edit_new (void); diff --git a/src/gnome-utils/gnc-currency-edit.c b/src/gnome-utils/gnc-currency-edit.c index c610da3857..3499940bc4 100644 --- a/src/gnome-utils/gnc-currency-edit.c +++ b/src/gnome-utils/gnc-currency-edit.c @@ -47,48 +47,44 @@ static void gnc_currency_edit_init (GNCCurrencyEdit *gce); static void gnc_currency_edit_class_init (GNCCurrencyEditClass *class); -static void gnc_currency_edit_destroy (GtkObject *object); static GtkComboClass *parent_class; /** * gnc_currency_edit_get_type: * - * Returns the GtkType for the GNCCurrencyEdit widget + * Returns the GType for the GNCCurrencyEdit widget */ -guint +GType gnc_currency_edit_get_type (void) { - static guint currency_edit_type = 0; + static GType currency_edit_type = 0; - if (!currency_edit_type){ - GtkTypeInfo currency_edit_info = { - "GNCCurrencyEdit", - sizeof (GNCCurrencyEdit), + if (currency_edit_type == 0) { + static GTypeInfo currency_edit_info = { sizeof (GNCCurrencyEditClass), - (GtkClassInitFunc) gnc_currency_edit_class_init, - (GtkObjectInitFunc) gnc_currency_edit_init, NULL, NULL, + (GClassInitFunc) gnc_currency_edit_class_init, + NULL, + NULL, + sizeof (GNCCurrencyEdit), + 0, + (GInstanceInitFunc) gnc_currency_edit_init }; - currency_edit_type = gtk_type_unique (gtk_combo_get_type (), - ¤cy_edit_info); + currency_edit_type = g_type_register_static (GTK_TYPE_COMBO, + "GNCCurrencyEdit", + ¤cy_edit_info, 0); } return currency_edit_type; } static void -gnc_currency_edit_class_init (GNCCurrencyEditClass *class) +gnc_currency_edit_class_init (GNCCurrencyEditClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass *) class; - - object_class = (GtkObjectClass*) class; - - parent_class = gtk_type_class (gtk_combo_get_type ()); - - object_class->destroy = gnc_currency_edit_destroy; + parent_class = g_type_class_peek_parent (klass); } static void @@ -99,16 +95,6 @@ gnc_currency_edit_init (GNCCurrencyEdit *gce) gtk_combo_disable_activate(GTK_COMBO(gce)); } -static void -gnc_currency_edit_destroy (GtkObject *object) -{ - g_return_if_fail (object != NULL); - g_return_if_fail (GNC_IS_CURRENCY_EDIT (object)); - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - static void add_item(GNCCurrencyEdit *gce, gnc_commodity *commodity) { diff --git a/src/gnome-utils/gnc-currency-edit.h b/src/gnome-utils/gnc-currency-edit.h index a839a747a8..23107bb49c 100644 --- a/src/gnome-utils/gnc-currency-edit.h +++ b/src/gnome-utils/gnc-currency-edit.h @@ -35,9 +35,10 @@ #include "gnc-commodity.h" -#define GNC_CURRENCY_EDIT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_currency_edit_get_type(), GNCCurrencyEdit) -#define GNC_CURRENCY_EDIT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gnc_currency_edit_get_type(), GNCCurrencyEditClass) -#define GNC_IS_CURRENCY_EDIT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gnc_currency_edit_get_type ()) +#define GNC_TYPE_CURRENCY_EDIT (gnc_currency_edit_get_type()) +#define GNC_CURRENCY_EDIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_CURRENCY_EDIT, GNCCurrencyEdit)) +#define GNC_CURRENCY_EDIT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNC_TYPE_CURRENCY_EDIT, GNCCurrencyEditClass)) +#define GNC_IS_CURRENCY_EDIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_CURRENCY_EDIT)) typedef struct { GtkCombo combo; @@ -47,14 +48,14 @@ typedef struct { GtkComboClass parent_class; } GNCCurrencyEditClass; -guint gnc_currency_edit_get_type (void); +GType gnc_currency_edit_get_type (void); -GtkWidget *gnc_currency_edit_new (void); +GtkWidget *gnc_currency_edit_new (void); -void gnc_currency_edit_set_currency (GNCCurrencyEdit *gce, - const gnc_commodity *currency); +void gnc_currency_edit_set_currency (GNCCurrencyEdit *gce, + const gnc_commodity *currency); -gnc_commodity * gnc_currency_edit_get_currency (GNCCurrencyEdit *gce); +gnc_commodity *gnc_currency_edit_get_currency (GNCCurrencyEdit *gce); #endif diff --git a/src/gnome-utils/gnc-date-delta.c b/src/gnome-utils/gnc-date-delta.c index 596a4b0179..1e9be5018d 100644 --- a/src/gnome-utils/gnc-date-delta.c +++ b/src/gnome-utils/gnc-date-delta.c @@ -70,82 +70,86 @@ static GtkHBoxClass *parent_class; * * Returns the GtkType for the GNCDateDelta widget */ -guint +GType gnc_date_delta_get_type (void) { - static guint date_delta_type = 0; - - if (!date_delta_type){ - GtkTypeInfo date_delta_info = { - "GNCDateDelta", - sizeof (GNCDateDelta), - sizeof (GNCDateDeltaClass), - (GtkClassInitFunc) gnc_date_delta_class_init, - (GtkObjectInitFunc) gnc_date_delta_init, - NULL, - NULL, - }; - - date_delta_type = gtk_type_unique (gtk_hbox_get_type (), - &date_delta_info); - } + static GType date_delta_type = 0; - return date_delta_type; + if (date_delta_type == 0) { + GTypeInfo date_delta_info = { + sizeof (GNCDateDeltaClass), + NULL, + NULL, + (GClassInitFunc) gnc_date_delta_class_init, + NULL, + NULL, + sizeof (GNCDateDelta), + 0, + (GInstanceInitFunc) gnc_date_delta_init + }; + + date_delta_type = g_type_register_static (gtk_hbox_get_type (), + "GNCDateDelta", + &date_delta_info, + 0); + } + + return date_delta_type; } static void -gnc_date_delta_class_init (GNCDateDeltaClass *class) +gnc_date_delta_class_init (GNCDateDeltaClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass *) class; - GtkContainerClass *container_class = (GtkContainerClass *) class; + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass); - object_class = (GtkObjectClass*) class; + parent_class = g_type_class_peek_parent (klass); - parent_class = gtk_type_class (gtk_hbox_get_type ()); + date_delta_signals [VALUE_CHANGED] = + g_signal_new ("value_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCDateDeltaClass, value_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); - date_delta_signals [VALUE_CHANGED] = - gtk_signal_new ("value_changed", - GTK_RUN_FIRST, GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GNCDateDeltaClass, - value_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + date_delta_signals [UNITS_CHANGED] = + g_signal_new ("units_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCDateDeltaClass, units_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); - date_delta_signals [UNITS_CHANGED] = - gtk_signal_new ("units_changed", - GTK_RUN_FIRST, GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET (GNCDateDeltaClass, - units_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); + date_delta_signals [POLARITY_CHANGED] = + g_signal_new ("polarity_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCDateDeltaClass, polarity_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + date_delta_signals [DELTA_CHANGED] = + g_signal_new ("delta_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCDateDeltaClass, delta_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); - date_delta_signals [POLARITY_CHANGED] = - gtk_signal_new ("polarity_changed", - GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET (GNCDateDeltaClass, - polarity_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - - date_delta_signals [DELTA_CHANGED] = - gtk_signal_new ("delta_changed", - GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET (GNCDateDeltaClass, - delta_changed), - gtk_signal_default_marshaller, - GTK_TYPE_NONE, 0); - -#if 0 - gtk_object_class_add_signals (object_class, date_delta_signals, - LAST_SIGNAL); -#endif - - container_class->forall = gnc_date_delta_forall; - - class->value_changed = NULL; - class->units_changed = NULL; - class->polarity_changed = NULL; - class->delta_changed = NULL; + container_class->forall = gnc_date_delta_forall; } static void diff --git a/src/gnome-utils/gnc-date-delta.h b/src/gnome-utils/gnc-date-delta.h index a8280282f4..28486ba575 100644 --- a/src/gnome-utils/gnc-date-delta.h +++ b/src/gnome-utils/gnc-date-delta.h @@ -47,15 +47,10 @@ typedef enum { GNC_DATE_DELTA_NUM_POLARITY } GNCDateDeltaPolarity; -#define GNC_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_amount_edit_get_type(), GNCAmountEdit) -#define GNC_AMOUNT_EDIT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gnc_amount_edit_get_type(), GNCAmountEditClass) -#define GNC_IS_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gnc_amount_edit_get_type ()) - - - -#define GNC_DATE_DELTA(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_date_delta_get_type(), GNCDateDelta) -#define GNC_DATE_DELTA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gnc_date_delta_get_type(), GNCDateDeltaClass) -#define GNC_IS_DATE_DELTA(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gnc_date_delta_get_type ()) +#define GNC_TYPE_DATE_DELTA (gnc_date_delta_get_type()) +#define GNC_DATE_DELTA(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_DATE_DELTA , GNCDateDelta) +#define GNC_DATE_DELTA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_DATE_DELTA, GNCDateDeltaClass) +#define GNC_IS_DATE_DELTA(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_DATE_DELTA) typedef struct { GtkHBox hbox; @@ -78,7 +73,7 @@ typedef struct { void (*delta_changed) (GNCDateDelta *gdd); } GNCDateDeltaClass; -guint gnc_date_delta_get_type (void); +GType gnc_date_delta_get_type (void); GtkWidget *gnc_date_delta_new (gboolean show_polarity); diff --git a/src/gnome-utils/gnc-frequency.c b/src/gnome-utils/gnc-frequency.c index 51dc1faa6f..2f54db7a4d 100644 --- a/src/gnome-utils/gnc-frequency.c +++ b/src/gnome-utils/gnc-frequency.c @@ -102,48 +102,48 @@ static const char *CHECKBOX_NAMES[] = { /** Implementations ********************/ -guint +GType gnc_frequency_get_type() { - static guint gncfreq_type = 0; - if ( ! gncfreq_type ) { - GtkTypeInfo gncfreq_info = - { - "GNCFrequency", - sizeof(GNCFrequency), - sizeof(GNCFrequencyClass), - (GtkClassInitFunc)gnc_frequency_class_init, - (GtkObjectInitFunc)gnc_frequency_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL - }; - - gncfreq_type = gtk_type_unique( gtk_vbox_get_type(), &gncfreq_info ); + static GType gncfreq_type = 0; + if (gncfreq_type == 0) { + static GTypeInfo gncfreq_info = { + sizeof(GNCFrequencyClass), + NULL, + NULL, + (GClassInitFunc)gnc_frequency_class_init, + NULL, + NULL, + sizeof(GNCFrequency), + 0, + (GInstanceInitFunc)gnc_frequency_init + }; + + gncfreq_type = g_type_register_static (GTK_TYPE_VBOX, + "GNCFrequency", + &gncfreq_info, 0); } - return gncfreq_type; + + return gncfreq_type; } static void gnc_frequency_class_init( GNCFrequencyClass *klass ) { - GtkObjectClass *object_class; + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (klass); - - objectClass = (GtkObjectClass*)klass; gnc_frequency_signals[GNCFREQ_CHANGED] = - gtk_signal_new( "changed", - GTK_RUN_FIRST, - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET( GNCFrequencyClass, changed ), - gtk_signal_default_marshaller, GTK_TYPE_NONE, 0 ); - -#if 0 - gtk_object_class_add_signals( objectClass, - gnc_frequency_signals, - LAST_SIGNAL ); -#endif - - klass->changed = NULL; + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GNCFrequencyClass, changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } void diff --git a/src/gnome-utils/gnc-frequency.h b/src/gnome-utils/gnc-frequency.h index 2c9a32f6d6..ecfb246456 100644 --- a/src/gnome-utils/gnc-frequency.h +++ b/src/gnome-utils/gnc-frequency.h @@ -29,9 +29,10 @@ #include "FreqSpec.h" #include "dialog-utils.h" -#define GNC_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gnc_frequency_get_type(), GNCFrequency) -#define GNC_FREQENCY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gnc_frequency_get_type(), GNCFrequency) -#define GNC_IS_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gnc_frequency_get_type()) +#define GNC_TYPE_FREQUENCY (gnc_frequency_get_type()) +#define GNC_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_FREQUENCY, GNCFrequency) +#define GNC_FREQENCY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_FREQUENCY, GNCFrequency) +#define GNC_IS_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_FREQUENCY) /** * A GNCFrequency is a VBox containing a scrollable GtkNotebook [and other @@ -50,8 +51,9 @@ typedef struct _GNCFrequency { } GNCFrequency; typedef struct _GNCFrequencyClass { - GtkVBoxClass parent_class; - void (*changed) (GNCFrequency *gf); + GtkVBoxClass parent_class; + + void (*changed) (GNCFrequency *gf); } GNCFrequencyClass; struct pageDataTuple { @@ -60,7 +62,7 @@ struct pageDataTuple { char *name; }; -guint gnc_frequency_get_type( void ); +GType gnc_frequency_get_type( void ); /** * For the default freq spec widget, use 'NULL'. diff --git a/src/gnome-utils/gnc-general-select.c b/src/gnome-utils/gnc-general-select.c index 82a9f52016..e7095811a3 100644 --- a/src/gnome-utils/gnc-general-select.c +++ b/src/gnome-utils/gnc-general-select.c @@ -191,8 +191,8 @@ create_children (GNCGeneralSelect *gsl, GNCGeneralSelectType type) gsl->button = gtk_button_new_with_label (_("View...")); gtk_box_pack_start (GTK_BOX (gsl), gsl->button, FALSE, FALSE, 0); - gtk_signal_connect (GTK_OBJECT (gsl->button), "clicked", - select_cb, gsl); + g_signal_connect (G_OBJECT (gsl->button), "clicked", + G_CALLBACK (select_cb), gsl); gtk_widget_show (gsl->button); } diff --git a/src/gnome-utils/gnc-html-history.c b/src/gnome-utils/gnc-html-history.c index a5c74649df..1a92d7db38 100644 --- a/src/gnome-utils/gnc-html-history.c +++ b/src/gnome-utils/gnc-html-history.c @@ -153,7 +153,7 @@ gnc_html_history_append(gnc_html_history * hist, else { /* this is the first entry in the list */ if(hist->nodes) { - printf("???? hist->nodes non-NULL, but no last_node \n"); + g_print ("???? hist->nodes non-NULL, but no last_node \n"); } hist->nodes = n; hist->last_node = n; diff --git a/src/gnome-utils/gnc-html.c b/src/gnome-utils/gnc-html.c index bcc76e3bb9..e68b00a234 100644 --- a/src/gnome-utils/gnc-html.c +++ b/src/gnome-utils/gnc-html.c @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #ifdef USE_GUPPI #include #endif @@ -59,27 +59,27 @@ struct gnc_html_struct { - GtkWidget * container; /* parent of the gtkhtml widget */ - GtkWidget * html; /* gtkhtml widget itself */ - gchar * current_link; /* link under mouse pointer */ + GtkWidget *container; /* parent of the gtkhtml widget */ + HtmlView *view; + gchar *current_link; /* link under mouse pointer */ - URLType base_type; /* base of URL (path - filename) */ - gchar * base_location; + URLType base_type; /* base of URL (path - filename) */ + gchar *base_location; - gnc_http * http; /* handles HTTP requests */ - GHashTable * request_info; /* hash uri to GList of GtkHTMLStream * */ + gnc_http *http; /* documents HTTP requests */ + GHashTable *request_info; /* hash uri to GList of HtmlDocument * */ - /* callbacks */ - GncHTMLUrltypeCB urltype_cb; /* is this type OK for this instance? */ - GncHTMLLoadCB load_cb; - GncHTMLFlyoverCB flyover_cb; - GncHTMLButtonCB button_cb; + /* callbacks */ + GncHTMLUrltypeCB urltype_cb; /* is this type OK for this instance? */ + GncHTMLLoadCB load_cb; + GncHTMLFlyoverCB flyover_cb; + GncHTMLButtonCB button_cb; - gpointer flyover_cb_data; - gpointer load_cb_data; - gpointer button_cb_data; + gpointer flyover_cb_data; + gpointer load_cb_data; + gpointer button_cb_data; - gnc_html_history * history; + gnc_html_history * history; }; @@ -215,7 +215,7 @@ gnc_html_parse_url(gnc_html * html, const gchar * url, if(found_protocol) { retval = g_hash_table_lookup (gnc_html_proto_to_type_hash, protocol); if (!retval) { - PWARN("unhandled URL type for '%s'", url ? url : "(null)"); + PWARN("undocumentd URL type for '%s'", url ? url : "(null)"); retval = URL_TYPE_OTHER; } } @@ -408,7 +408,7 @@ gnc_build_url (URLType type, const gchar * location, const gchar * label) static gboolean http_allowed() { - return TRUE; + return TRUE; //return gnc_lookup_boolean_option("Network", "Allow http network access", // TRUE); } @@ -416,7 +416,7 @@ http_allowed() static gboolean https_allowed() { - return TRUE; + return TRUE; //return gnc_lookup_boolean_option("Network", "Allow https network access using OpenSSL", // TRUE); } @@ -424,7 +424,7 @@ https_allowed() static gboolean gnc_network_allowed() { - return FALSE; + return FALSE; //return gnc_lookup_boolean_option("Network", "Enable GnuCash Network", // TRUE); } @@ -433,7 +433,7 @@ gnc_network_allowed() /************************************************************ * gnc_html_http_request_cb: fires when an HTTP request is completed. - * this is when it's time to load the data into the GtkHTML widget. + * this is when it's time to load the data into the HtmlView widget. ************************************************************/ static void @@ -441,83 +441,81 @@ gnc_html_http_request_cb(const gchar * uri, int completed_ok, const gchar * body, gint body_len, gpointer user_data) { - gnc_html * html = user_data; - URLType type; - char * location = NULL; - char * label = NULL; - GList * handles = NULL; - GList * current; + gnc_html *html = user_data; + URLType type; + char *location = NULL; + char *label = NULL; + GList *documents = NULL; + GList *current; - DEBUG("uri %s, ok %d, body %10.10s, body len %d", uri, completed_ok, body, body_len); - g_hash_table_lookup_extended(html->request_info, uri, - (gpointer *)&location, - (gpointer *)&handles); - - /* handles will be NULL for an HTTP POST transaction, where we are - * displaying the reply data. */ - if(!handles) { - GtkHTMLStream * handle = gtk_html_begin(GTK_HTML(html->html)); - if(completed_ok) { - gtk_html_write(GTK_HTML(html->html), handle, body, body_len); - } - else { - char *data; + DEBUG("uri %s, ok %d, body %10.10s, body len %d", uri, completed_ok, body, body_len); + g_hash_table_lookup_extended (html->request_info, uri, + (gpointer *)&location, + (gpointer *)&documents); - data = g_strdup_printf(error_format, - _(error_title), _(error_body1), _(error_body2)); - gtk_html_write(GTK_HTML(html->html), handle, data, strlen (data)); - g_free (data); - gtk_html_write(GTK_HTML(html->html), handle, body, body_len); - gtk_html_write(GTK_HTML(html->html), handle, - error_end, strlen(error_end)); - gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_OK); - } - } - /* otherwise, it's a normal SUBMIT transaction */ - else { - /* before writing to the handles, make sure any new traffic won't - * see them while we're working */ - g_hash_table_remove(html->request_info, uri); - g_free(location); - location = NULL; + /* documents will be NULL for an HTTP POST transaction, where we are + * displaying the reply data. */ + if (documents == NULL) { + HtmlDocument *document = html->view->document; - for(current = handles; current; current = current->next) { - /* request completed OK... write the HTML to the handles that - * asked for that URI. */ - if(completed_ok) { - gtk_html_write(GTK_HTML(html->html), (GtkHTMLStream *)(current->data), - body, body_len); - gtk_html_end(GTK_HTML(html->html), (GtkHTMLStream *)(current->data), - GTK_HTML_STREAM_OK); - type = gnc_html_parse_url(html, uri, &location, &label); - if(label) { - gtk_html_jump_to_anchor(GTK_HTML(html->html), label); - } - g_free(location); - g_free(label); - location = label = NULL; - } - /* request failed... body is the ghttp error text. */ - else { - char *data; + html_document_open_stream (document, "text/html"); + if (completed_ok) { + html_document_write_stream (document, body, body_len); + } else { + char *data; - data = g_strdup_printf(error_format, - _(error_title), _(error_body1), _(error_body2)); - gtk_html_write(GTK_HTML(html->html), (GtkHTMLStream *)(current->data), - data, strlen(data)); - g_free (data); - gtk_html_write(GTK_HTML(html->html), (GtkHTMLStream *)(current->data), - body, body_len); - gtk_html_write(GTK_HTML(html->html), (GtkHTMLStream *)(current->data), - error_end, strlen(error_end)); - gtk_html_end(GTK_HTML(html->html), (GtkHTMLStream *)(current->data), - GTK_HTML_STREAM_ERROR); - } - } - g_list_free(handles); - } + data = g_strdup_printf(error_format, + _(error_title), _(error_body1), _(error_body2)); + html_document_write_stream (document, data, strlen (data)); + g_free (data); + html_document_write_stream (document, body, body_len); + html_document_write_stream (document, + error_end, strlen(error_end)); + html_document_close_stream (document); + } + } /* otherwise, it's a normal SUBMIT transaction */ + else { + /* before writing to the documents, make sure any new traffic won't + * see them while we're working */ + g_hash_table_remove(html->request_info, uri); + g_free(location); + location = NULL; - gnc_unset_busy_cursor (html->html); + for(current = documents; current; current = current->next) { + /* request completed OK... write the HTML to the documents that + * asked for that URI. */ + if (completed_ok) { + html_document_write_stream (HTML_DOCUMENT (current->data), + body, body_len); + html_document_close_stream (HTML_DOCUMENT (current->data)); + type = gnc_html_parse_url(html, uri, &location, &label); + if (label) { + html_view_jump_to_anchor(html->view, label); + } + g_free(location); + g_free(label); + location = label = NULL; + } + /* request failed... body is the ghttp error text. */ + else { + char *data; + + data = g_strdup_printf(error_format, + _(error_title), _(error_body1), _(error_body2)); + html_document_write_stream (HTML_DOCUMENT (current->data), + data, strlen(data)); + g_free (data); + html_document_write_stream (HTML_DOCUMENT (current->data), + body, body_len); + html_document_write_stream (HTML_DOCUMENT (current->data), + error_end, strlen(error_end)); + html_document_close_stream (HTML_DOCUMENT (current->data)); + } + } + g_list_free(documents); + } + + gnc_unset_busy_cursor (GTK_WIDGET (html->view)); } @@ -527,163 +525,164 @@ gnc_html_http_request_cb(const gchar * uri, int completed_ok, ************************************************************/ static void -gnc_html_start_request(gnc_html * html, gchar * uri, GtkHTMLStream * handle) +gnc_html_start_request(gnc_html *html, gchar *uri, HtmlDocument *document) { - GList * handles = NULL; - gint need_request = FALSE; + GList *documents = NULL; + gint need_request = FALSE; - /* we want to make a list of handles to fill with this URI. - * multiple handles with the same URI will all get filled when the - * request comes in. */ - DEBUG("requesting %s", uri); - handles = g_hash_table_lookup(html->request_info, uri); - if(!handles) { - need_request = TRUE; - } + /* we want to make a list of documents to fill with this URI. + * multiple documents with the same URI will all get filled when the + * request comes in. */ + DEBUG ("requesting %s", uri); + + documents = g_hash_table_lookup (html->request_info, uri); + if (documents == NULL) { + need_request = TRUE; + } - handles = g_list_append(handles, handle); - g_hash_table_insert(html->request_info, uri, handles); + documents = g_list_append (documents, document); + g_hash_table_insert (html->request_info, uri, documents); - if(need_request) { - gnc_set_busy_cursor (html->html, FALSE); - gnc_http_start_request(html->http, uri, gnc_html_http_request_cb, - (gpointer)html); - } + if (need_request) { + gnc_set_busy_cursor (GTK_WIDGET (html->view), FALSE); + gnc_http_start_request (html->http, uri, gnc_html_http_request_cb, + (gpointer)html); + } } /******************************************************************** * gnc_html_load_to_stream : actually do the work of loading the HTML - * or binary data referenced by a URL and feeding it into the GtkHTML + * or binary data referenced by a URL and feeding it into the HtmlView * widget. ********************************************************************/ static void -gnc_html_load_to_stream(gnc_html * html, GtkHTMLStream * handle, - URLType type, const gchar * location, - const gchar * label) +gnc_html_load_to_stream(gnc_html *html, HtmlDocument *document, + URLType type, const gchar *location, + const gchar *label) { - char * fdata = NULL; - int fdata_len = 0; + char *fdata = NULL; + int fdata_len = 0; - DEBUG("type %s, location %s, label %s", type, location, label); - if(!html) { - return; - } + DEBUG ("type %s, location %s, label %s", type, location, label); - if (gnc_html_stream_handlers) { - GncHTMLStreamCB stream_handler; - - stream_handler = g_hash_table_lookup (gnc_html_stream_handlers, type); - if (stream_handler) { - gboolean ok = stream_handler (location, &fdata, &fdata_len); - - if(ok) { - fdata = fdata ? fdata : g_strdup (""); - gtk_html_write(GTK_HTML(html->html), handle, fdata, fdata_len); - gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_OK); - } - else { - fdata = fdata ? fdata : - g_strdup_printf (error_404_format, - _(error_404_title), _(error_404_body)); - gtk_html_write(GTK_HTML(html->html), handle, fdata, strlen (fdata)); - gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_ERROR); - } - - g_free(fdata); - - if(label) { - while (gtk_events_pending ()) - gtk_main_iteration (); - gtk_html_jump_to_anchor(GTK_HTML(html->html), label); - } - - return; - } - } - - do { - if (!safe_strcmp (type, URL_TYPE_SECURE) || - !safe_strcmp (type, URL_TYPE_HTTP)) { - - if (!safe_strcmp (type, URL_TYPE_SECURE)) { - if(!https_allowed()) { - gnc_error_dialog(_("Secure HTTP access is disabled.\n" - "You can enable it in the Network section of\n" - "the Preferences dialog.")); - break; + if (html == NULL) { + return; } - } - if(!http_allowed()) { - gnc_error_dialog(_("Network HTTP access is disabled.\n" - "You can enable it in the Network section of\n" - "the Preferences dialog.")); - } else { - char *fullurl; + if (gnc_html_stream_handlers) { + GncHTMLStreamCB stream_handler; + + stream_handler = g_hash_table_lookup (gnc_html_stream_handlers, type); + if (stream_handler) { + gboolean ok = stream_handler (location, &fdata, &fdata_len); + + if (ok) { + fdata = fdata ? fdata : g_strdup (""); + html_document_write_stream (document, fdata, fdata_len); + html_document_close_stream (document); + } else { + fdata = fdata ? fdata : + g_strdup_printf (error_404_format, + _(error_404_title), _(error_404_body)); + html_document_write_stream (document, fdata, fdata_len); + html_document_close_stream (document); + } + + g_free (fdata); + + if (label) { + while (gtk_events_pending ()) + gtk_main_iteration (); + html_view_jump_to_anchor(html->view, label); + } + + return; + } + } + + do { + if (!safe_strcmp (type, URL_TYPE_SECURE) || + !safe_strcmp (type, URL_TYPE_HTTP)) { + if (!safe_strcmp (type, URL_TYPE_SECURE)) { + if (!https_allowed()) { + gnc_error_dialog (_("Secure HTTP access is disabled.\n" + "You can enable it in the Network section of\n" + "the Preferences dialog.")); + break; + } + } + + if (!http_allowed()) { + gnc_error_dialog(_("Network HTTP access is disabled.\n" + "You can enable it in the Network section of\n" + "the Preferences dialog.")); + } else { + char *fullurl; - fullurl = gnc_build_url(type, location, label); - gnc_html_start_request(html, fullurl, handle); - } - - } else { - PWARN("load_to_stream for inappropriate type\n" - "\turl = '%s#%s'\n", - location ? location : "(null)", - label ? label : "(null)"); - fdata = g_strdup_printf (error_404_format, - _(error_404_title), _(error_404_body)); - gtk_html_write(GTK_HTML(html->html), handle, fdata, strlen (fdata)); - gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_ERROR); - g_free (fdata); - } - - } while (FALSE); - + fullurl = gnc_build_url(type, location, label); + gnc_html_start_request(html, fullurl, document); + } + } else { + PWARN ("load_to_stream for inappropriate type\n" + "\turl = '%s#%s'\n", + location ? location : "(null)", + label ? label : "(null)"); + + fdata = g_strdup_printf (error_404_format, + _(error_404_title), _(error_404_body)); + html_document_write_stream (document, fdata, fdata_len); + html_document_close_stream (document); + g_free (fdata); + } + } while (FALSE); } - /******************************************************************** * gnc_html_link_clicked_cb - called when user left-clicks on html * anchor. ********************************************************************/ static void -gnc_html_link_clicked_cb(GtkHTML * html, const gchar * url, gpointer data) +gnc_html_link_clicked_cb (HtmlDocument *document, const gchar *url, gpointer data) { - URLType type; - char * location = NULL; - char * label = NULL; - gnc_html * gnchtml = (gnc_html *)data; + URLType type; + char *location = NULL; + char *label = NULL; + gnc_html *gnchtml = (gnc_html *)data; - DEBUG("Clicked %s", url); - type = gnc_html_parse_url(gnchtml, url, &location, &label); - gnc_html_show_url(gnchtml, type, location, label, 0); - g_free(location); - g_free(label); + DEBUG ("Clicked %s", url); + + type = gnc_html_parse_url(gnchtml, url, &location, &label); + gnc_html_show_url(gnchtml, type, location, label, 0); + + g_free(location); + g_free(label); } /******************************************************************** - * gnc_html_url_requested_cb - called when a URL needs to be + * gnc_html_request_url_cb - called when a URL needs to be * loaded within the loading of a page (embedded image). ********************************************************************/ static void -gnc_html_url_requested_cb(GtkHTML * html, char * url, - GtkHTMLStream * handle, gpointer data) +gnc_html_request_url_cb (HtmlDocument *document, const gchar *url, + HtmlStream *stream, gpointer data) { - URLType type; - char * location=NULL; - char * label=NULL; - gnc_html * gnchtml = (gnc_html *)data; + URLType type; + char *location = NULL; + char *label = NULL; + gnc_html *gnchtml = (gnc_html *)data; - DEBUG("requesting %s", url); - type = gnc_html_parse_url(gnchtml, url, &location, &label); - gnc_html_load_to_stream(gnchtml, handle, type, location, label); - g_free(location); - g_free(label); + DEBUG ("requesting %s", url); + + type = gnc_html_parse_url (gnchtml, url, &location, &label); + gnc_html_load_to_stream (gnchtml, document, type, location, label); + + g_free(location); + g_free(label); } @@ -693,22 +692,30 @@ gnc_html_url_requested_cb(GtkHTML * html, char * url, ********************************************************************/ static int -gnc_html_object_requested_cb(GtkHTML * html, GtkHTMLEmbedded * eb, - gpointer data) +gnc_html_object_requested_cb (HtmlView *view, HtmlEmbedded *widget, + gpointer data) { - gnc_html * gnchtml = data; - GncHTMLObjectCB h; + gnc_html *gnchtml = data; + DomNamedNodeMap *attributes; + DomAttr *classid; + GncHTMLObjectCB h; - DEBUG(" "); - if(!eb || !(eb->classid) || !gnc_html_object_handlers) return FALSE; - - h = g_hash_table_lookup(gnc_html_object_handlers, eb->classid); - if(h) { - return h(gnchtml, eb, data); - } - else { - return FALSE; - } + DEBUG (" "); + + g_return_val_if_fail (widget != NULL && widget->node != NULL, FALSE); + g_return_val_if_fail (gnc_html_object_handlers != NULL, FALSE); + + attributes = dom_Node__get_attributes (widget->node); + classid = DOM_ATTR (dom_NamedNodeMap_getNamedItem (attributes, "classid")); + + g_return_val_if_fail (classid != NULL, FALSE); + + h = g_hash_table_lookup(gnc_html_object_handlers, dom_Attr__get_value (classid)); + if (h != NULL) { + return h (gnchtml, widget, data); + } else { + return FALSE; + } } @@ -717,16 +724,17 @@ gnc_html_object_requested_cb(GtkHTML * html, GtkHTMLEmbedded * eb, ********************************************************************/ static void -gnc_html_on_url_cb(GtkHTML * html, const gchar * url, gpointer data) +gnc_html_on_url_cb (HtmlView *html_view, const gchar *url, gpointer data) { - gnc_html * gnchtml = (gnc_html *) data; + gnc_html * gnchtml = (gnc_html *) data; - DEBUG("Rollover %s", url); - g_free(gnchtml->current_link); - gnchtml->current_link = g_strdup(url); - if(gnchtml->flyover_cb) { - (gnchtml->flyover_cb)(gnchtml, url, gnchtml->flyover_cb_data); - } + DEBUG ("Rollover %s", url); + + g_free (gnchtml->current_link); + gnchtml->current_link = g_strdup (url); + if (gnchtml->flyover_cb) { + (gnchtml->flyover_cb)(gnchtml, url, gnchtml->flyover_cb_data); + } } @@ -735,22 +743,23 @@ gnc_html_on_url_cb(GtkHTML * html, const gchar * url, gpointer data) ********************************************************************/ static void -gnc_html_set_base_cb(GtkHTML * gtkhtml, const gchar * base, - gpointer data) +gnc_html_set_base_cb (HtmlDocument *document, const gchar *url, + gpointer data) { - gnc_html * html = (gnc_html *)data; - URLType type; - char * location = NULL; - char * label = NULL; + gnc_html *html = (gnc_html *)data; + URLType type; + char *location = NULL; + char *label = NULL; - DEBUG("Setting base location to %s", base); - type = gnc_html_parse_url(html, base, &location, &label); + DEBUG ("Setting base location to %s", url); + + type = gnc_html_parse_url(html, url, &location, &label); - g_free(html->base_location); - g_free(label); + g_free(html->base_location); + g_free(label); - html->base_type = type; - html->base_location = location; + html->base_type = type; + html->base_location = location; } @@ -885,9 +894,9 @@ gnc_html_pack_form_data(GHashTable * form_data) ********************************************************************/ static int -gnc_html_submit_cb(GtkHTML * html, const gchar * method, - const gchar * action, const gchar * encoded_form_data, - gpointer user_data) +gnc_html_submit_cb (HtmlDocument *document, const gchar *method, + const gchar *action, const gchar *encoded_form_data, + gpointer user_data) { gnc_html * gnchtml = user_data; char * location = NULL; @@ -955,7 +964,7 @@ static void gnc_html_open_scm(gnc_html * html, const gchar * location, const gchar * label, int newwin) { - PINFO("location='%s'", location ? location : "(null)"); + PINFO ("location='%s'", location ? location : "(null)"); } @@ -966,15 +975,17 @@ gnc_html_open_scm(gnc_html * html, const gchar * location, ********************************************************************/ void -gnc_html_show_data(gnc_html * html, const char * data, - int datalen) +gnc_html_show_data (gnc_html * html, const char * data, + int datalen) { - GtkHTMLStream * handle; + HtmlDocument *document; - DEBUG("datalen %d, data %20.20s", datalen, data); - handle = gtk_html_begin(GTK_HTML(html->html)); - gtk_html_write(GTK_HTML(html->html), handle, data, datalen); - gtk_html_end(GTK_HTML(html->html), handle, GTK_HTML_STREAM_OK); + DEBUG ("datalen %d, data %20.20s", datalen, data); + + document = html->view->document; + + html_document_write_stream (document, data, datalen); + html_document_close_stream (document); } @@ -987,71 +998,71 @@ gnc_html_show_data(gnc_html * html, const char * data, ********************************************************************/ void -gnc_html_show_url(gnc_html * html, URLType type, - const gchar * location, const gchar * label, +gnc_html_show_url(gnc_html *html, URLType type, + const gchar *location, const gchar *label, gboolean new_window_hint) { - GncHTMLUrlCB url_handler; - GtkHTMLStream * handle; - gboolean new_window; + GncHTMLUrlCB url_handler; + HtmlDocument *document; + gboolean new_window; - DEBUG(" "); - if (!html) return; - if (!location) return; + DEBUG (" "); - /* make sure it's OK to show this URL type in this window */ - if(new_window_hint == 0) { - if (html->urltype_cb) - new_window = !((html->urltype_cb)(type)); - else - new_window = FALSE; - } - else { - new_window = TRUE; - } + g_return_if_fail (html != NULL); + g_return_if_fail (location != NULL); - if(!new_window) { - gnc_html_cancel(html); - } + /* make sure it's OK to show this URL type in this window */ + if (new_window_hint == 0) { + if (html->urltype_cb) { + new_window = !((html->urltype_cb)(type)); + } else { + new_window = FALSE; + } + } else { + new_window = TRUE; + } - if (gnc_html_url_handlers) - url_handler = g_hash_table_lookup (gnc_html_url_handlers, type); - else - url_handler = NULL; + if (!new_window) { + gnc_html_cancel(html); + } - if (url_handler) - { - GNCURLResult result; - gboolean ok; + if (gnc_html_url_handlers) { + url_handler = g_hash_table_lookup (gnc_html_url_handlers, type); + } else { + url_handler = NULL; + } - result.load_to_stream = FALSE; - result.url_type = type; - result.location = NULL; - result.label = NULL; - result.base_type = URL_TYPE_FILE; - result.base_location = NULL; - result.error_message = NULL; + if (url_handler) { + GNCURLResult result; + gboolean ok; - ok = url_handler (location, label, new_window, &result); - if (!ok) - { - if (result.error_message) - gnc_error_dialog(result.error_message); - else - /* %s is a URL (some location somewhere). */ - gnc_error_dialog(_("There was an error accessing %s."), location); + result.load_to_stream = FALSE; + result.url_type = type; + result.location = NULL; + result.label = NULL; + result.base_type = URL_TYPE_FILE; + result.base_location = NULL; + result.error_message = NULL; - if (html->load_cb) - html->load_cb (html, result.url_type, - location, label, - html->load_cb_data); - } - else if (result.load_to_stream) - { + ok = url_handler (location, label, new_window, &result); + if (!ok) { + if (result.error_message) { + gnc_error_dialog(result.error_message); + } else { + /* %s is a URL (some location somewhere). */ + gnc_error_dialog(_("There was an error accessing %s."), location); + } + + if (html->load_cb) { + html->load_cb (html, result.url_type, + location, label, + html->load_cb_data); + } + } else if (result.load_to_stream) { gnc_html_history_node *hnode; const char *new_location; const char *new_label; - GtkHTMLStream * stream; + HtmlDocument *document; new_location = result.location ? result.location : location; new_label = result.label ? result.label : label; @@ -1066,8 +1077,8 @@ gnc_html_show_url(gnc_html * html, URLType type, g_strdup (extract_base_name(result.base_type, new_location)); DEBUG("resetting base location to %s", html->base_location); - stream = gtk_html_begin (GTK_HTML(html->html)); - gnc_html_load_to_stream (html, stream, result.url_type, + document = html->view->document; + gnc_html_load_to_stream (html, document, result.url_type, new_location, new_label); if (html->load_cb) @@ -1088,7 +1099,7 @@ gnc_html_show_url(gnc_html * html, URLType type, gnc_html_open_scm(html, location, label, new_window); } else if (!safe_strcmp (type, URL_TYPE_JUMP)) { - gtk_html_jump_to_anchor(GTK_HTML(html->html), label); + html_view_jump_to_anchor(html->view, label); } else if (!safe_strcmp (type, URL_TYPE_SECURE) || !safe_strcmp (type, URL_TYPE_HTTP) || @@ -1118,18 +1129,18 @@ gnc_html_show_url(gnc_html * html, URLType type, if(html->base_location) g_free(html->base_location); html->base_location = extract_base_name(type, location); - /* FIXME : handle new_window = 1 */ + /* FIXME : document new_window = 1 */ gnc_html_history_append(html->history, gnc_html_history_node_new(type, location, label)); - handle = gtk_html_begin(GTK_HTML(html->html)); - gnc_html_load_to_stream(html, handle, type, location, label); + document = html->view->document; + gnc_html_load_to_stream(html, document, type, location, label); } while (FALSE); } else if (!safe_strcmp (type, URL_TYPE_ACTION)) { gnc_html_history_append(html->history, gnc_html_history_node_new(type, location, label)); - gnc_html_submit_cb(GTK_HTML(html->html), "get", + gnc_html_submit_cb(html->view->document, "get", gnc_build_url(type, location, label), NULL, (gpointer)html); @@ -1149,15 +1160,16 @@ gnc_html_show_url(gnc_html * html, URLType type, ********************************************************************/ void -gnc_html_reload(gnc_html * html) +gnc_html_reload (gnc_html *html) { - gnc_html_history_node * n; + gnc_html_history_node * n; - DEBUG(" "); - n = gnc_html_history_get_current(html->history); - if(n) { - gnc_html_show_url(html, n->type, n->location, n->label, 0); - } + DEBUG (" "); + + n = gnc_html_history_get_current (html->history); + if (n != NULL) { + gnc_html_show_url (html, n->type, n->location, n->label, 0); + } } @@ -1169,56 +1181,56 @@ gnc_html_reload(gnc_html * html) gnc_html * gnc_html_new(void) { - gnc_html * retval = g_new0(gnc_html, 1); + gnc_html *html = g_new0(gnc_html, 1); - retval->container = gtk_scrolled_window_new(NULL, NULL); - retval->html = gtk_html_new(); + html->container = gtk_scrolled_window_new (NULL, NULL); + html->view = HTML_VIEW (html_view_new()); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(retval->container), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(html->container), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(retval->container), - GTK_WIDGET(retval->html)); + gtk_container_add(GTK_CONTAINER(html->container), + GTK_WIDGET(html->view)); - retval->request_info = g_hash_table_new(g_str_hash, g_str_equal); - retval->http = gnc_http_new(); - retval->history = gnc_html_history_new(); + html->request_info = g_hash_table_new (g_str_hash, g_str_equal); + html->http = gnc_http_new(); + html->history = gnc_html_history_new(); - g_object_ref (retval->container); - gtk_object_sink (GTK_OBJECT (retval->container)); + g_object_ref (html->container); + gtk_object_sink (GTK_OBJECT (html->container)); - /* signals */ - gtk_signal_connect(GTK_OBJECT(retval->html), "url_requested", - GTK_SIGNAL_FUNC(gnc_html_url_requested_cb), - (gpointer)retval); - - gtk_signal_connect(GTK_OBJECT(retval->html), "on_url", - GTK_SIGNAL_FUNC(gnc_html_on_url_cb), - (gpointer)retval); - - gtk_signal_connect(GTK_OBJECT(retval->html), "set_base", - GTK_SIGNAL_FUNC(gnc_html_set_base_cb), - (gpointer)retval); - - gtk_signal_connect(GTK_OBJECT(retval->html), "link_clicked", - GTK_SIGNAL_FUNC(gnc_html_link_clicked_cb), - (gpointer)retval); - - gtk_signal_connect (GTK_OBJECT (retval->html), "object_requested", - GTK_SIGNAL_FUNC (gnc_html_object_requested_cb), - (gpointer)retval); + /* signals */ + g_signal_connect (G_OBJECT (html->view->document), "request_url", + G_CALLBACK (gnc_html_request_url_cb), + (gpointer)html); - gtk_signal_connect (GTK_OBJECT (retval->html), "button_press_event", - GTK_SIGNAL_FUNC (gnc_html_button_press_cb), - (gpointer)retval); + g_signal_connect (G_OBJECT (html->view), "on_url", + G_CALLBACK (gnc_html_on_url_cb), + (gpointer)html); - gtk_signal_connect (GTK_OBJECT(retval->html), "submit", - GTK_SIGNAL_FUNC(gnc_html_submit_cb), (gpointer)retval); - - gtk_html_load_empty(GTK_HTML(retval->html)); - - return retval; + g_signal_connect (G_OBJECT (html->view->document), "set_base", + G_CALLBACK (gnc_html_set_base_cb), + (gpointer)html); + + g_signal_connect (G_OBJECT(html->view->document), "link_clicked", + G_CALLBACK (gnc_html_link_clicked_cb), + (gpointer)html); + + g_signal_connect (G_OBJECT (html->view), "object_requested", + G_CALLBACK (gnc_html_object_requested_cb), + (gpointer)html); + + g_signal_connect (G_OBJECT (html->view), "button_press_event", + G_CALLBACK (gnc_html_button_press_cb), + (gpointer)html); + + g_signal_connect (G_OBJECT(html->view->document), "submit", + G_CALLBACK (gnc_html_submit_cb), (gpointer)html); + + /* html_view_set_document (html->view, html_document_new ()); */ + + return html; } @@ -1230,18 +1242,19 @@ gnc_html_new(void) static gboolean html_cancel_helper(gpointer key, gpointer value, gpointer user_data) { - g_free(key); - g_list_free((GList *)value); - return TRUE; + g_free(key); + g_list_free((GList *)value); + + return TRUE; } void gnc_html_cancel(gnc_html * html) { - /* remove our own references to requests */ - gnc_http_cancel_requests(html->http); - - g_hash_table_foreach_remove(html->request_info, html_cancel_helper, NULL); + /* remove our own references to requests */ + gnc_http_cancel_requests(html->http); + + g_hash_table_foreach_remove(html->request_info, html_cancel_helper, NULL); } @@ -1253,150 +1266,161 @@ gnc_html_cancel(gnc_html * html) void gnc_html_destroy(gnc_html * html) { + g_return_if_fail (html != NULL); + + /* cancel any outstanding HTTP requests */ + gnc_html_cancel(html); - if(!html) return; + gnc_html_history_destroy(html->history); - /* cancel any outstanding HTTP requests */ - gnc_html_cancel(html); - - gnc_html_history_destroy(html->history); + gtk_widget_destroy(html->container); + g_object_unref(html->container); - gtk_widget_destroy(html->container); - g_object_unref(html->container); + g_free(html->current_link); + g_free(html->base_location); - g_free(html->current_link); - g_free(html->base_location); + html->container = NULL; + html->view = NULL; + html->history = NULL; + html->current_link = NULL; + html->base_location = NULL; - html->container = NULL; - html->html = NULL; - html->history = NULL; - html->current_link = NULL; - html->base_location = NULL; - - g_free(html); + g_free(html); } void -gnc_html_set_urltype_cb(gnc_html * html, GncHTMLUrltypeCB urltype_cb) +gnc_html_set_urltype_cb (gnc_html * html, GncHTMLUrltypeCB urltype_cb) { - html->urltype_cb = urltype_cb; + html->urltype_cb = urltype_cb; } void -gnc_html_set_load_cb(gnc_html * html, GncHTMLLoadCB load_cb, - gpointer data) +gnc_html_set_load_cb (gnc_html * html, GncHTMLLoadCB load_cb, + gpointer data) { - html->load_cb = load_cb; - html->load_cb_data = data; + html->load_cb = load_cb; + html->load_cb_data = data; } void -gnc_html_set_flyover_cb(gnc_html * html, GncHTMLFlyoverCB flyover_cb, +gnc_html_set_flyover_cb (gnc_html * html, GncHTMLFlyoverCB flyover_cb, + gpointer data) +{ + html->flyover_cb = flyover_cb; + html->flyover_cb_data = data; +} + +void +gnc_html_set_button_cb (gnc_html * html, GncHTMLButtonCB button_cb, gpointer data) { - html->flyover_cb = flyover_cb; - html->flyover_cb_data = data; -} - -void -gnc_html_set_button_cb(gnc_html * html, GncHTMLButtonCB button_cb, - gpointer data) -{ - html->button_cb = button_cb; - html->button_cb_data = data; + html->button_cb = button_cb; + html->button_cb_data = data; } /************************************************************** * gnc_html_export : wrapper around the builtin function in gtkhtml **************************************************************/ - +/* static gboolean raw_html_receiver (gpointer engine, const gchar *data, guint len, gpointer user_data) { - FILE *fh = (FILE *) user_data; - fwrite (data, len, 1, fh); - return TRUE; -} + FILE *fh = (FILE *) user_data; + + fwrite (data, len, 1, fh); + + return TRUE; +}*/ gboolean -gnc_html_export(gnc_html * html, const char *filepath) +gnc_html_export(gnc_html *html, const char *filepath) { - FILE *fh; + /* Export need to be added to gtkhtml 2.0 */ - g_return_val_if_fail (html != NULL, FALSE); - g_return_val_if_fail (filepath != NULL, FALSE); + /* + FILE *fh; - fh = fopen (filepath, "w"); - if (!fh) - return FALSE; + g_return_val_if_fail (html != NULL, FALSE); + g_return_val_if_fail (filepath != NULL, FALSE); - gtk_html_save (GTK_HTML(html->html), raw_html_receiver, fh); + fh = fopen (filepath, "w"); + if (!fh) + return FALSE; - fclose (fh); + gtk_html_save (GTK_HTML(html->html), raw_html_receiver, fh); - return TRUE; + fclose (fh); + + return TRUE; + */ + + return FALSE; } void gnc_html_print(gnc_html * html) { - PrintSession * ps = gnc_print_session_create(FALSE); - - gtk_html_print(GTK_HTML(html->html), - GNOME_PRINT_CONTEXT(ps->meta)); - gnc_print_session_done(ps, FALSE); - gnc_print_session_print(ps); + /* Printing need to be added to gtkhtml 2.0 */ + + /*PrintSession * ps = gnc_print_session_create(FALSE); + + gtk_html_print(GTK_HTML(html->html), + GNOME_PRINT_CONTEXT(ps->meta)); + gnc_print_session_done(ps, FALSE); + gnc_print_session_print(ps);*/ } gnc_html_history * gnc_html_get_history(gnc_html * html) { - if (!html) return NULL; - return html->history; + g_return_val_if_fail (html != NULL, NULL); + + return html->history; } GtkWidget * gnc_html_get_widget(gnc_html * html) { - if (!html) return NULL; - return html->container; + g_return_val_if_fail (html != NULL, NULL); + + return html->container; } void -gnc_html_register_object_handler(const char * classid, - GncHTMLObjectCB hand) +gnc_html_register_object_handler (const char * classid, + GncHTMLObjectCB hand) { - g_return_if_fail (classid != NULL); + g_return_if_fail (classid != NULL); + g_return_if_fail (hand != NULL); - if(!gnc_html_object_handlers) { - gnc_html_object_handlers = g_hash_table_new(g_str_hash, g_str_equal); - } + if(gnc_html_object_handlers == NULL) { + gnc_html_object_handlers = g_hash_table_new (g_str_hash, g_str_equal); + } - gnc_html_unregister_object_handler (classid); - if (!hand) - return; + gnc_html_unregister_object_handler (classid); - g_hash_table_insert(gnc_html_object_handlers, g_strdup(classid), hand); + g_hash_table_insert(gnc_html_object_handlers, g_strdup (classid), hand); } void -gnc_html_unregister_object_handler(const char * classid) +gnc_html_unregister_object_handler (const char * classid) { - gchar * keyptr=NULL; - gchar * valptr=NULL; + gchar *keyptr = NULL; + gchar *valptr = NULL; - if (!g_hash_table_lookup_extended(gnc_html_object_handlers, - classid, - (gpointer *)&keyptr, - (gpointer *)&valptr)) - return; + if (!g_hash_table_lookup_extended (gnc_html_object_handlers, + classid, + (gpointer *) &keyptr, + (gpointer *) &valptr)) { + return; + } - g_hash_table_remove(gnc_html_object_handlers, classid); - g_free(keyptr); + g_hash_table_remove(gnc_html_object_handlers, classid); + g_free(keyptr); } void diff --git a/src/gnome-utils/gnc-html.h b/src/gnome-utils/gnc-html.h index c0117ffbf0..6916d351b4 100644 --- a/src/gnome-utils/gnc-html.h +++ b/src/gnome-utils/gnc-html.h @@ -24,10 +24,11 @@ #define GNC_HTML_H #include -#include #include #include +#include + typedef char * URLType; #define URL_TYPE_FILE "file" @@ -81,10 +82,8 @@ typedef void (* GncHTMLLoadCB)(gnc_html * html, URLType type, gpointer data); typedef int (* GncHTMLButtonCB)(gnc_html * html, GdkEventButton * event, gpointer data); -#if 0 -typedef int (* GncHTMLObjectCB)(gnc_html * html, GtkHTMLEmbedded * eb, +typedef int (* GncHTMLObjectCB)(gnc_html * html, HtmlEmbedded * widget, gpointer data); -#endif typedef int (* GncHTMLActionCB)(gnc_html * html, const char * method, const char * action, GHashTable * form_data); typedef gboolean (* GncHTMLStreamCB)(const char *location, char **data, int *datalen); @@ -118,10 +117,9 @@ gboolean gnc_html_register_urltype (URLType type, const char *protocol); /* object handlers deal with objects in HTML. * the handlers are looked up at object load time. */ -#if 0 + void gnc_html_register_object_handler(const char * classid, GncHTMLObjectCB hand); -#endif void gnc_html_unregister_object_handler(const char * classid); /* action handlers deal with submitting forms of the type diff --git a/src/gnome-utils/gnc-mdi-utils.c b/src/gnome-utils/gnc-mdi-utils.c index 7f8ec4ecdc..58ab5d27b6 100644 --- a/src/gnome-utils/gnc-mdi-utils.c +++ b/src/gnome-utils/gnc-mdi-utils.c @@ -24,6 +24,7 @@ #include "config.h" #include +#include #include "dialog-utils.h" #include "global-options.h" @@ -115,11 +116,11 @@ gnc_mdi_show_progress (const char *message, double percentage) if (percentage < 0) { gnome_appbar_refresh(appbar); - gnome_appbar_set_progress(appbar, 0.0); + gnome_appbar_set_progress_percentage(appbar, 0.0); } else { if (message) gnome_appbar_set_status(appbar, message); - gnome_appbar_set_progress(appbar, percentage/100); + gnome_appbar_set_progress_percentage(appbar, percentage/100); } /* make sure new text is up */ @@ -277,7 +278,7 @@ gnc_mdi_update_widgets(GNCMDIChildInfo *mc, gboolean topmost) GtkWidget * gnc_mdi_child_find_menu_item(GNCMDIChildInfo *mc, gchar *path) { - GnomeDockItem *di; + BonoboDockItem *di; GtkWidget *menubar; GtkWidget *menu; GtkWidget *menuitem; @@ -290,7 +291,7 @@ gnc_mdi_child_find_menu_item(GNCMDIChildInfo *mc, gchar *path) if (di == NULL) return(NULL); - menubar = gnome_dock_item_get_child (di); + menubar = bonobo_dock_item_get_child (di); if (menubar == NULL) return(NULL); @@ -330,7 +331,7 @@ gnc_mdi_child_find_toolbar_item(GNCMDIChildInfo *mc, gchar *name) g_return_val_if_fail(mc != NULL, NULL); g_return_val_if_fail(mc->toolbar != NULL, NULL); - transl = L_(name); + transl = g_strdup(L_(name)); toolbar = GTK_TOOLBAR(mc->toolbar); for (pos = 0; pos < toolbar->num_children; pos++) { child = g_list_nth_data(toolbar->children, pos); @@ -340,6 +341,7 @@ gnc_mdi_child_find_toolbar_item(GNCMDIChildInfo *mc, gchar *name) if (strcasecmp(label, transl) == 0) return(child->widget); } + g_free (transl); return(NULL); } @@ -665,7 +667,8 @@ gnc_mdi_child_changed_cb (GnomeMDI * mdi, GnomeMDIChild * prev_child, GnomeUIInfo * hintinfo; GtkWidget * oldbar; GnomeApp * new_app = NULL; - GnomeDockItemBehavior behavior; + BonoboDockItemBehavior behavior; + GConfClient * client; if (prev_child) { @@ -680,9 +683,10 @@ gnc_mdi_child_changed_cb (GnomeMDI * mdi, GnomeMDIChild * prev_child, new_app = gnome_mdi_get_app_from_view (childwin->contents); } - behavior = GNOME_DOCK_ITEM_BEH_EXCLUSIVE; - if (!gnome_preferences_get_toolbar_detachable ()) - behavior |= GNOME_DOCK_ITEM_BEH_LOCKED; + behavior = BONOBO_DOCK_ITEM_BEH_EXCLUSIVE; + client = gconf_client_get_default (); + if (!gconf_client_get_bool (client, "/desktop/gnome/interface/toolbar_detachable", NULL)) + behavior |= BONOBO_DOCK_ITEM_BEH_LOCKED; if (childwin && childwin->toolbar) { @@ -716,7 +720,7 @@ gnc_mdi_child_changed_cb (GnomeMDI * mdi, GnomeMDIChild * prev_child, gnome_app_add_toolbar (GNOME_APP(childwin->app), GTK_TOOLBAR(childwin->toolbar), "Toolbar", behavior, - GNOME_DOCK_TOP, 1, 0, 0); + BONOBO_DOCK_TOP, 1, 0, 0); gtk_toolbar_set_style (GTK_TOOLBAR(childwin->toolbar), gnc_get_toolbar_style ()); @@ -732,7 +736,7 @@ gnc_mdi_child_changed_cb (GnomeMDI * mdi, GnomeMDIChild * prev_child, gnome_app_add_toolbar (GNOME_APP(childwin->app), GTK_TOOLBAR(childwin->toolbar), "Toolbar", behavior, - GNOME_DOCK_TOP, 1, 0, 0); + BONOBO_DOCK_TOP, 1, 0, 0); gtk_toolbar_set_style (GTK_TOOLBAR(childwin->toolbar), gnc_get_toolbar_style ()); @@ -994,8 +998,10 @@ gnc_mdi_has_apps (void) if (!GNOME_IS_APP (toplevels->data)) continue; +#if 0 if (GTK_OBJECT_DESTROYED (toplevels->data)) continue; +#endif gnc_mdi = gtk_object_get_data (GTK_OBJECT (toplevels->data), "gnc_mdi"); if (!gnc_mdi) @@ -1147,8 +1153,7 @@ gnc_mdi_create_child_toolbar (GNCMDIInfo * mi, GNCMDIChildInfo * child) g_free (child->toolbar_info); child->toolbar_info = tbinfo; - tb = GTK_TOOLBAR (gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, - GTK_TOOLBAR_BOTH)); + tb = GTK_TOOLBAR (gtk_toolbar_new ()); child->toolbar = GTK_WIDGET (tb); diff --git a/src/gnome-utils/gnc-menu-extensions.c b/src/gnome-utils/gnc-menu-extensions.c index 8a4ab63ff5..963955ea75 100644 --- a/src/gnome-utils/gnc-menu-extensions.c +++ b/src/gnome-utils/gnc-menu-extensions.c @@ -243,12 +243,12 @@ gnc_create_extension_info(SCM extension) ext_info->info[0].moreinfo = gnc_extension_cb; string = gnc_extension_documentation(ext_info); - ext_info->info[0].hint = g_strdup(string); + ext_info->info[0].hint = string; if (string != NULL) free(string); string = gnc_extension_name(ext_info); - ext_info->info[0].label = g_strdup(string); + ext_info->info[0].label = string; if (string != NULL) free(string); @@ -261,7 +261,7 @@ gnc_create_extension_info(SCM extension) ext_info->extra_info = info; string = gnc_extension_name(ext_info); - ext_info->info[0].label = g_strdup(string); + ext_info->info[0].label = string; if (string != NULL) free(string); @@ -298,8 +298,6 @@ cleanup_extension_info(gpointer extension_info, gpointer not_used) if (ext_info->extension) scm_unprotect_object(ext_info->extension); - g_free(ext_info->info[0].label); - g_free(ext_info->info[0].hint); g_free(ext_info->extra_info); g_free(ext_info->path); g_free(ext_info); @@ -335,8 +333,8 @@ gnc_add_c_extension(GnomeUIInfo *info, gchar *path) } ext_info->info[0] = *info; - ext_info->info[0].label = g_strdup(info->label); - ext_info->info[0].hint = g_strdup(info->hint); + ext_info->info[0].label = info->label; + ext_info->info[0].hint = info->hint; ext_info->info[1].type = GNOME_APP_UI_ENDOFINFO; /* need to append so we can run them in order */ diff --git a/src/gnome-utils/gtkselect.c b/src/gnome-utils/gtkselect.c index 5b596182d1..b6742c25ea 100644 --- a/src/gnome-utils/gtkselect.c +++ b/src/gnome-utils/gtkselect.c @@ -178,6 +178,7 @@ gtk_select_get_pos (GtkSelect * select, gint * x, gint * y, gint * height, gint gint work_height; gint old_height; gint old_width; + gint scrollbar_spacing; widget = GTK_WIDGET(select); popup = GTK_SCROLLED_WINDOW (select->popup); @@ -196,17 +197,17 @@ gtk_select_get_pos (GtkSelect * select, gint * x, gint * y, gint * height, gint list_requisition.height += EMPTY_LIST_HEIGHT; alloc_width = (widget->allocation.width - - 2 * popwin->child->style->klass->xthickness - + 2 * popwin->child->style->xthickness - 2 * GTK_CONTAINER (popwin->child)->border_width - 2 * GTK_CONTAINER (select->popup)->border_width - 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width - - 2 * GTK_BIN (popup)->child->style->klass->xthickness); + 2 * GTK_BIN (popup)->child->style->xthickness); - work_height = (2 * popwin->child->style->klass->ythickness + + work_height = (2 * popwin->child->style->ythickness + 2 * GTK_CONTAINER (popwin->child)->border_width + 2 * GTK_CONTAINER (select->popup)->border_width + 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width + - 2 * GTK_BIN (popup)->child->style->klass->xthickness); + 2 * GTK_BIN (popup)->child->style->xthickness); do { @@ -216,9 +217,10 @@ gtk_select_get_pos (GtkSelect * select, gint * x, gint * y, gint * height, gint if (!show_hscroll && alloc_width < list_requisition.width) { - work_height += popup->hscrollbar->requisition.height + - GTK_SCROLLED_WINDOW_CLASS - (GTK_OBJECT (select->popup)->klass)->scrollbar_spacing; + g_object_get (G_OBJECT (select->popup), + "scrollbar_spacing", &scrollbar_spacing, + NULL); + work_height += popup->hscrollbar->requisition.height + scrollbar_spacing; show_hscroll = TRUE; } if (!show_vscroll && @@ -230,10 +232,11 @@ gtk_select_get_pos (GtkSelect * select, gint * x, gint * y, gint * height, gint *y -= (work_height + list_requisition.height + real_height); break; } + g_object_get (G_OBJECT (select->popup), + "scrollbar_spacing", &scrollbar_spacing, + NULL); alloc_width -= - popup->vscrollbar->requisition.width + - GTK_SCROLLED_WINDOW_CLASS - (GTK_OBJECT (select->popup)->klass)->scrollbar_spacing; + popup->vscrollbar->requisition.width + scrollbar_spacing; show_vscroll = TRUE; } } while (old_width != alloc_width || old_height != work_height); diff --git a/src/gnome-utils/gw-gnome-utils-spec.scm b/src/gnome-utils/gw-gnome-utils-spec.scm index dc30777f90..3ec8290ccd 100644 --- a/src/gnome-utils/gw-gnome-utils-spec.scm +++ b/src/gnome-utils/gw-gnome-utils-spec.scm @@ -402,34 +402,7 @@ be left empty") ;; druid-utils.h (gw:wrap-as-wct ws ' "GnomeDruid*" "const GnomeDruid*") - (gw:wrap-function - ws - 'gnc:druid-set-title-image - ' - "gnc_druid_set_title_image" - '(( druid) - (( caller-owned) image-path)) - "Set the title image of a druid.") - - (gw:wrap-function - ws - 'gnc:druid-set-logo-image - ' - "gnc_druid_set_logo_image" - '(( druid) - (( caller-owned) logo-path)) - "Set the logo image of a druid.") - - (gw:wrap-function - ws - 'gnc:druid-set-watermark-image - ' - "gnc_druid_set_watermark_image" - '(( druid) - (( caller-owned) watermark-path)) - "Set the watermark image of a druid.") - - (gw:wrap-function + (gw:wrap-function ws 'gnc:druid-set-colors ' diff --git a/src/gnome-utils/print-session.c b/src/gnome-utils/print-session.c index 4fe59b7cfe..d13e760004 100644 --- a/src/gnome-utils/print-session.c +++ b/src/gnome-utils/print-session.c @@ -25,6 +25,8 @@ #include "config.h" #include +#include +#include #include #include "gnc-ui.h" @@ -36,11 +38,13 @@ PrintSession * gnc_print_session_create(gboolean hand_built_pages) { PrintSession * ps = g_new0(PrintSession, 1); + GnomePrintConfig *config; /* this is about the most basic we can get */ ps->master = gnome_print_master_new(); - ps->meta = gnome_print_meta_new(); - ps->default_font = gnome_font_new("Courier", 12); + config = gnome_print_master_get_config(ps->master); + ps->meta = gnome_print_context_new(config); + ps->default_font = gnome_font_find("Courier", 12); if (hand_built_pages) { gnome_print_beginpage(GNOME_PRINT_CONTEXT(ps->meta), ""); @@ -88,6 +92,7 @@ gnc_print_session_print(PrintSession * ps) { GtkWidget * dialog = gnome_print_dialog_new(_("Print GnuCash Document"), 0); int button = gnome_dialog_run(GNOME_DIALOG(dialog)); + GnomePrintConfig *config; switch(button) { case 0: @@ -96,8 +101,8 @@ gnc_print_session_print(PrintSession * ps) { g_object_unref(GTK_OBJECT(ps->master)); ps->master = NULL; } - ps->master = - gnome_print_master_new_from_dialog(GNOME_PRINT_DIALOG(dialog)); + config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog)); + ps->master = gnome_print_master_new_from_config (config); gnome_dialog_close(GNOME_DIALOG(dialog)); gnc_print_session_render(ps); break; @@ -107,8 +112,8 @@ gnc_print_session_print(PrintSession * ps) { g_object_unref(GTK_OBJECT(ps->master)); ps->master = NULL; } - ps->master = - gnome_print_master_new_from_dialog(GNOME_PRINT_DIALOG(dialog)); + config = gnome_print_dialog_get_config (GNOME_PRINT_DIALOG (dialog)); + ps->master = gnome_print_master_new_from_config (config); gnome_dialog_close(GNOME_DIALOG(dialog)); gnc_print_session_preview(ps); break; @@ -122,23 +127,17 @@ gnc_print_session_print(PrintSession * ps) { void gnc_print_session_render(PrintSession * ps) { - GnomePrintContext * pc = gnome_print_master_get_context(ps->master); - - gnome_print_meta_render_from_object(GNOME_PRINT_CONTEXT(pc), - GNOME_PRINT_META(ps->meta)); - gnome_print_context_close(pc); + gnome_print_master_render (ps->master, ps->meta); + gnome_print_master_close (ps->master); gnome_print_master_print(ps->master); } void gnc_print_session_preview(PrintSession * ps) { - GnomePrintContext * pc = gnome_print_master_get_context(ps->master); - GnomePrintMasterPreview * preview; + GtkWidget * preview; - gnome_print_meta_render_from_object(GNOME_PRINT_CONTEXT(pc), - GNOME_PRINT_META(ps->meta)); - gnome_print_context_close(pc); - + gnome_print_master_render (ps->master, ps->meta); + gnome_print_master_close (ps->master); preview = gnome_print_master_preview_new(ps->master, _("Print Preview")); - gtk_widget_show_all(GTK_WIDGET(preview)); + gtk_widget_show_all(preview); } diff --git a/src/gnome-utils/print-session.h b/src/gnome-utils/print-session.h index dd9b65c370..bc8c2c2952 100644 --- a/src/gnome-utils/print-session.h +++ b/src/gnome-utils/print-session.h @@ -27,46 +27,40 @@ #include "config.h" #include -#include #include -#include -#include -#include -#include #include -#include -/* #include */ -#include + +#include +#include typedef struct { - GnomePrintMaster * master; - GnomePrintMeta * meta; - GnomeFont * default_font; - char * paper; + GnomePrintMaster *master; + GnomePrintContext *meta; + GnomeFont *default_font; + GnomePrintPaper *paper; } PrintSession; typedef struct { - GtkWidget * toplevel; - GtkWidget * canvas; - GnomePrintContext * pc; - PrintSession * session; + GtkWidget *toplevel; + GtkWidget *canvas; + GnomePrintContext *meta; + PrintSession *session; } PrintPreviewDialog; typedef struct { - GtkWidget * toplevel; - GtkWidget * printer_entry; - GtkWidget * paper_entry; - PrintSession * session; + GtkWidget *toplevel; + GtkWidget *printer_entry; + GtkWidget *paper_entry; + PrintSession *session; } PrintDialog; typedef struct { - GtkWidget * toplevel; - GtkWidget * papersel; - GtkWidget * entry; - PrintSession * session; + GtkWidget *toplevel; + GtkWidget *papersel; + GtkWidget *entry; + PrintSession *session; } PaperDialog; - /* paper selector dialog */ PaperDialog * gnc_ui_paper_dialog_create(PrintSession * ps, GtkWidget * entry); void gnc_ui_paper_dialog_destroy(PaperDialog * psd); diff --git a/src/gnome-utils/search-param.c b/src/gnome-utils/search-param.c index 9b7618e40b..58a54bc70c 100644 --- a/src/gnome-utils/search-param.c +++ b/src/gnome-utils/search-param.c @@ -19,16 +19,15 @@ static void gnc_search_param_class_init (GNCSearchParamClass *class); static void gnc_search_param_init (GNCSearchParam *gspaper); -static void gnc_search_param_finalise (GtkObject *obj); +static void gnc_search_param_finalize (GObject *obj); -#define _PRIVATE(x) (((GNCSearchParam *)(x))->priv) struct _GNCSearchParamPrivate { GSList * converters; GSList * param_path; GNCIdTypeConst type; }; -static GtkObjectClass *parent_class; +static GObjectClass *parent_class; enum { LAST_SIGNAL @@ -38,46 +37,39 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; #endif -guint +GType gnc_search_param_get_type (void) { - static guint type = 0; - - if (!type) { - GtkTypeInfo type_info = { - "GNCSearchParam", - sizeof(GNCSearchParam), - sizeof(GNCSearchParamClass), - (GtkClassInitFunc)gnc_search_param_class_init, - (GtkObjectInitFunc)gnc_search_param_init, - (GtkArgSetFunc)NULL, - (GtkArgGetFunc)NULL - }; - - type = gtk_type_unique(gtk_object_get_type (), &type_info); - } - - return type; + static GType type = 0; + + if (type == 0) { + static GTypeInfo type_info = { + sizeof(GNCSearchParamClass), + NULL, + NULL, + (GClassInitFunc)gnc_search_param_class_init, + NULL, + NULL, + sizeof(GNCSearchParam), + 0, + (GInstanceInitFunc)gnc_search_param_init + }; + + type = g_type_register_static (G_TYPE_OBJECT, "GNCSearchParam", + &type_info, 0); + } + + return type; } static void -gnc_search_param_class_init (GNCSearchParamClass *class) +gnc_search_param_class_init (GNCSearchParamClass *klass) { - GtkObjectClass *object_class; - - object_class = (GtkObjectClass *)class; - parent_class = gtk_type_class (gtk_object_get_type ()); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gnc_search_param_finalise; + parent_class = g_type_class_peek_parent (klass); - /* override methods */ - -#if 0 - /* signals */ -#if LAST_SIGNAL > 0 - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); -#endif -#endif + object_class->finalize = gnc_search_param_finalize; } static void @@ -87,15 +79,24 @@ gnc_search_param_init (GNCSearchParam *o) } static void -gnc_search_param_finalise (GtkObject *obj) +gnc_search_param_finalize (GObject *obj) { - GNCSearchParam *o = (GNCSearchParam *)obj; - g_slist_free (o->priv->param_path); - o->priv->param_path = NULL; - g_slist_free (o->priv->converters); - o->priv->converters = NULL; - g_free(o->priv); - ((GtkObjectClass *)(parent_class))->finalize(obj); + GNCSearchParam *o; + + g_return_if_fail (obj != NULL); + g_return_if_fail (GNC_IS_SEARCH_PARAM (obj)); + + o = GNC_SEARCH_PARAM (obj); + + g_return_if_fail (o->priv != NULL); + + g_slist_free (o->priv->param_path); + o->priv->param_path = NULL; + g_slist_free (o->priv->converters); + o->priv->converters = NULL; + g_free(o->priv); + + G_OBJECT_CLASS (parent_class)->finalize(obj); } /** @@ -115,16 +116,16 @@ gnc_search_param_new (void) GNCSearchParam * gnc_search_param_clone (GNCSearchParam *param) { - GNCSearchParam *n; + GNCSearchParam *n; - g_assert (IS_GNCSEARCH_PARAM (param)); + g_return_val_if_fail (GNC_IS_SEARCH_PARAM (param), NULL); - n = gnc_search_param_new (); - n->title = param->title; - n->priv->param_path = g_slist_copy (param->priv->param_path); - n->priv->type = param->priv->type; + n = gnc_search_param_new (); + n->title = param->title; + n->priv->param_path = g_slist_copy (param->priv->param_path); + n->priv->type = param->priv->type; - return n; + return n; } void @@ -132,102 +133,105 @@ gnc_search_param_set_param_path (GNCSearchParam *param, GNCIdTypeConst search_type, GSList *param_path) { - GNCIdTypeConst type = NULL; - GSList *converters = NULL; + GNCIdTypeConst type = NULL; + GSList *converters = NULL; - g_assert (IS_GNCSEARCH_PARAM (param)); + g_return_if_fail (GNC_IS_SEARCH_PARAM (param)); - if (param->priv->param_path) - g_slist_free (param->priv->param_path); - param->priv->param_path = g_slist_copy (param_path); + if (param->priv->param_path) { + g_slist_free (param->priv->param_path); + } + param->priv->param_path = g_slist_copy (param_path); - /* Compute the parameter type */ - for (; param_path; param_path = param_path->next) { - GNCIdType param_name = param_path->data; - const QueryObjectDef *objDef = - gncQueryObjectGetParameter (search_type, param_name); + /* Compute the parameter type */ + for (; param_path; param_path = param_path->next) { + GNCIdType param_name = param_path->data; + const QueryObjectDef *objDef = + gncQueryObjectGetParameter (search_type, param_name); - /* If it doesn't exist, then we've reached the end */ - if (!objDef) - break; + /* If it doesn't exist, then we've reached the end */ + if (objDef == NULL) + break; + + /* Save the converter */ + converters = g_slist_prepend (converters, objDef->param_getfcn); - /* Save the converter */ - converters = g_slist_prepend (converters, objDef->param_getfcn); + /* And reset for the next parameter */ + type = search_type = objDef->param_type; + } - /* And reset for the next parameter */ - type = search_type = objDef->param_type; - } + /* Save the type */ + param->priv->type = type; - /* Save the type */ - param->priv->type = type; - - /* Save the converters */ - if (param->priv->converters) - g_slist_free (param->priv->converters); - param->priv->converters = g_slist_reverse (converters); + /* Save the converters */ + if (param->priv->converters) { + g_slist_free (param->priv->converters); + } + param->priv->converters = g_slist_reverse (converters); } void gnc_search_param_override_param_type (GNCSearchParam *param, GNCIdTypeConst param_type) { - g_assert (IS_GNCSEARCH_PARAM (param)); - g_assert (param_type != NULL && *param_type != '\0'); - param->priv->type = param_type; - /* XXX: What about the converters? */ + g_return_if_fail (GNC_IS_SEARCH_PARAM (param)); + g_return_if_fail (param_type != NULL && *param_type != '\0'); + + param->priv->type = param_type; + /* XXX: What about the converters? */ } GSList * gnc_search_param_get_param_path (GNCSearchParam *param) { - g_assert (IS_GNCSEARCH_PARAM (param)); - - return g_slist_copy (param->priv->param_path); + g_return_val_if_fail (GNC_IS_SEARCH_PARAM (param), NULL); + + return g_slist_copy (param->priv->param_path); } GSList * gnc_search_param_get_converters (GNCSearchParam *param) { - g_assert (IS_GNCSEARCH_PARAM (param)); + g_return_val_if_fail (GNC_IS_SEARCH_PARAM (param), NULL); - return param->priv->converters; + return param->priv->converters; } GNCIdTypeConst gnc_search_param_get_param_type (GNCSearchParam *param) { - g_assert (IS_GNCSEARCH_PARAM (param)); + g_return_val_if_fail (GNC_IS_SEARCH_PARAM (param), NULL); - return param->priv->type; + return param->priv->type; } void gnc_search_param_set_title (GNCSearchParam *param, const char *title) { - g_assert (IS_GNCSEARCH_PARAM (param)); + g_return_if_fail (GNC_IS_SEARCH_PARAM (param)); - param->title = title; + param->title = title; } void gnc_search_param_set_justify (GNCSearchParam *param, GtkJustification justify) { - g_assert (IS_GNCSEARCH_PARAM (param)); + g_return_if_fail (GNC_IS_SEARCH_PARAM (param)); - param->justify = justify; + param->justify = justify; } gboolean gnc_search_param_type_match (GNCSearchParam *a, GNCSearchParam *b) { - g_assert (IS_GNCSEARCH_PARAM (a)); - g_assert (IS_GNCSEARCH_PARAM (b)); + g_return_val_if_fail (GNC_IS_SEARCH_PARAM (a), FALSE); + g_return_val_if_fail (GNC_IS_SEARCH_PARAM (b), FALSE); - if (a->priv->type == b->priv->type || - !safe_strcmp (a->priv->type, b->priv->type)) - return TRUE; + if (a->priv->type == b->priv->type || + !safe_strcmp (a->priv->type, b->priv->type)) + return TRUE; - return FALSE; + return FALSE; } static GList * diff --git a/src/gnome-utils/search-param.h b/src/gnome-utils/search-param.h index 164142dd32..690fe55ed1 100644 --- a/src/gnome-utils/search-param.h +++ b/src/gnome-utils/search-param.h @@ -8,15 +8,16 @@ #include "GNCId.h" -#define GNCSEARCH_PARAM(obj) GTK_CHECK_CAST (obj, gnc_search_param_get_type (), GNCSearchParam) -#define GNCSEARCH_PARAM_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gnc_search_param_get_type (), GNCSearchParamClass) -#define IS_GNCSEARCH_PARAM(obj) GTK_CHECK_TYPE (obj, gnc_search_param_get_type ()) +#define GNC_TYPE_SEARCH_PARAM (gnc_search_param_get_type ()) +#define GNC_SEARCH_PARAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_SEARCH_PARAM, GNCSearchParam)) +#define GNCSEARCH_PARAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNC_TYPE_SEARCH_PARAM, GNCSearchParamClass) +#define GNC_IS_SEARCH_PARAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_SEARCH_PARAM)) typedef struct _GNCSearchParam GNCSearchParam; typedef struct _GNCSearchParamClass GNCSearchParamClass; struct _GNCSearchParam { - GtkObject parent; + GObject parent; struct _GNCSearchParamPrivate *priv; const char * title; @@ -24,7 +25,7 @@ struct _GNCSearchParam { }; struct _GNCSearchParamClass { - GtkObjectClass parent_class; + GObjectClass parent_class; /* virtual methods */ @@ -32,13 +33,13 @@ struct _GNCSearchParamClass { }; /* These are internal functions */ -guint gnc_search_param_get_type (void); +GType gnc_search_param_get_type (void); /* Create a new search param */ GNCSearchParam * gnc_search_param_new (void); GNCSearchParam * gnc_search_param_clone (GNCSearchParam *param); -void gnc_search_param_set_param_path (GNCSearchParam *param, +void gnc_search_param_set_param_path (GNCSearchParam *param, GNCIdTypeConst search_type, GSList *param_path); /* List is property of the caller */ @@ -61,7 +62,7 @@ GSList * gnc_search_param_get_converters (GNCSearchParam *param); * it could result in an invalid Query Term, where the path and the predicate * don't match types properly. */ -void gnc_search_param_override_param_type (GNCSearchParam *param, +void gnc_search_param_override_param_type (GNCSearchParam *param, GNCIdTypeConst param_type); /************************************************************* @@ -69,13 +70,13 @@ void gnc_search_param_override_param_type (GNCSearchParam *param, */ /* Create a paramter and prepend it to a GSList */ -GList * gnc_search_param_prepend (GList *list, char const *title, +GList * gnc_search_param_prepend (GList *list, char const *title, GNCIdTypeConst type_override, GNCIdTypeConst search_type, const char *param, ...); -GList * gnc_search_param_prepend_with_justify (GList *list, char const *title, +GList * gnc_search_param_prepend_with_justify (GList *list, char const *title, GtkJustification justify, GNCIdTypeConst type_override, GNCIdTypeConst search_type, diff --git a/src/gnome-utils/window-help.c b/src/gnome-utils/window-help.c index 6c250e9923..8302b56b0d 100644 --- a/src/gnome-utils/window-help.c +++ b/src/gnome-utils/window-help.c @@ -555,7 +555,7 @@ gnc_help_window_search_button_cb(GtkButton * button, gpointer data) memset(&key, 0, sizeof(DBT)); memset(&value, 0, sizeof(DBT)); - key.data = search_string; + key.data = g_strdup (search_string); key.size = strlen(search_string); /* do the search */ @@ -563,6 +563,8 @@ gnc_help_window_search_button_cb(GtkButton * button, gpointer data) err = help->index_db->get(help->index_db, &key, &value, 0); } + g_free (key.data); + if(err == 0) { /* the data in the DB is a newline-separated list of filenames */ show_search_results(help, value.data, value.size); diff --git a/src/gnome/dialog-print-check.c b/src/gnome/dialog-print-check.c index 9800e6c38f..821c7a147f 100644 --- a/src/gnome/dialog-print-check.c +++ b/src/gnome/dialog-print-check.c @@ -255,7 +255,8 @@ gnc_ui_print_check_dialog_create(RegWindow *reg_data, gnc_option_menu_init(pcd->format_picker); gnc_option_menu_init(pcd->position_picker); gnc_option_menu_init_w_signal(pcd->dformat_picker, - gnc_ui_print_check_format_changed_cb, pcd); + G_CALLBACK(gnc_ui_print_check_format_changed_cb), + pcd); gnc_option_menu_init(pcd->units_picker); /* Set initial format to gnucash default */ diff --git a/src/gnome/dialog-scheduledxaction.c b/src/gnome/dialog-scheduledxaction.c index 832a88dc9b..b5ab63f892 100644 --- a/src/gnome/dialog-scheduledxaction.c +++ b/src/gnome/dialog-scheduledxaction.c @@ -145,8 +145,8 @@ struct _SchedXactionEditorDialog GtkToggleButton *optEndDate; GtkToggleButton *optEndNone; GtkToggleButton *optEndCount; - GnomeNumberEntry *endCountEntry; - GnomeNumberEntry *endRemainEntry; + GtkEntry *endCountEntry; + GtkEntry *endRemainEntry; GNCDateEdit *endDateEntry; char *sxGUIDstr; @@ -432,15 +432,21 @@ gnc_sxed_check_changed( SchedXactionEditorDialog *sxed ) /* dialog says... num occur */ if ( gtk_toggle_button_get_active( sxed->optEndCount ) ) { gint sxNumOccur, sxNumRem, dlgNumOccur, dlgNumRem; + gchar *text; if ( ! xaccSchedXactionGetNumOccur( sxed->sx ) ) { return TRUE; } - dlgNumOccur = (gint)gnome_number_entry_get_number( sxed-> - endCountEntry ); - dlgNumRem = (gint)gnome_number_entry_get_number( sxed-> - endRemainEntry ); + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endCountEntry), + 0, -1 ); + sscanf (text, "%d", &dlgNumOccur); + g_free (text); + + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endRemainEntry), + 0, -1 ); + sscanf (text, "%d", &dlgNumRem); + g_free (text); sxNumOccur = xaccSchedXactionGetNumOccur( sxed->sx ); sxNumRem = xaccSchedXactionGetRemOccur( sxed->sx ); @@ -853,12 +859,17 @@ gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed ) if ( gtk_toggle_button_get_active(sxed->optEndCount)) { gint occur, rem; + gchar *text; - occur = (gint)gnome_number_entry_get_number( sxed->endCountEntry ); - xaccSchedXactionSetNumOccur( sxed->sx, occur ); + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endCountEntry), + 0, -1 ); + sscanf (text, "%d", &occur); + g_free (text); - rem = (gint)gnome_number_entry_get_number( sxed->endRemainEntry ); - xaccSchedXactionSetRemOccur( sxed->sx, rem ); + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endRemainEntry), + 0, -1 ); + sscanf (text, "%d", &rem); + g_free (text); if ( occur == 0 ) { const char *sx_occur_count_zero_msg = @@ -948,10 +959,19 @@ gnc_sxed_save_sx( SchedXactionEditorDialog *sxed ) xaccSchedXactionSetNumOccur( sxed->sx, 0 ); } else if ( gtk_toggle_button_get_active(sxed->optEndCount) ) { gint num; + gchar *text; + /* get the occurances data */ - num = (gint)gnome_number_entry_get_number( sxed->endCountEntry ); + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endCountEntry), + 0, -1 ); + sscanf (text, "%d", &num); + g_free (text); xaccSchedXactionSetNumOccur( sxed->sx, num ); - num = (gint)gnome_number_entry_get_number( sxed->endRemainEntry ); + + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endRemainEntry), + 0, -1 ); + sscanf (text, "%d", &num); + g_free (text); xaccSchedXactionSetRemOccur( sxed->sx, num ); g_date_clear( &gdate, 1 ); @@ -1280,10 +1300,10 @@ gnc_sxed_get_widgets( SchedXactionEditorDialog *sxed ) sxed->optEndCount = GTK_TOGGLE_BUTTON(w); w = glade_xml_get_widget( sxed->gxml, END_GNOME_NUMENTRY ); - sxed->endCountEntry = GNOME_NUMBER_ENTRY(w); + sxed->endCountEntry = GTK_ENTRY(w); w = glade_xml_get_widget( sxed->gxml, REMAIN_GNOME_NUMENTRY ); - sxed->endRemainEntry = GNOME_NUMBER_ENTRY(w); + sxed->endRemainEntry = GTK_ENTRY(w); } @@ -1521,7 +1541,6 @@ schedXact_editor_populate( SchedXactionEditorDialog *sxed ) char *name; time_t tmpDate; SplitRegister *splitReg; - GtkWidget *w; GString *tmpgStr; struct tm *tmpTm; GDate *gd; @@ -1561,16 +1580,14 @@ schedXact_editor_populate( SchedXactionEditorDialog *sxed ) gtk_toggle_button_set_active( sxed->optEndCount, TRUE ); - w = gnome_number_entry_gtk_entry( sxed->endCountEntry ); tmpgStr = g_string_sized_new(5); g_string_sprintf( tmpgStr, "%d", numOccur ); - gtk_entry_set_text( GTK_ENTRY(w), tmpgStr->str ); + gtk_entry_set_text( sxed->endCountEntry, tmpgStr->str ); g_string_free( tmpgStr, TRUE ); - w = gnome_number_entry_gtk_entry( sxed->endRemainEntry ); tmpgStr = g_string_sized_new(5); g_string_sprintf( tmpgStr, "%d", numRemain ); - gtk_entry_set_text( GTK_ENTRY(w), tmpgStr->str ); + gtk_entry_set_text( sxed->endRemainEntry, tmpgStr->str ); g_string_free( tmpgStr, TRUE ); set_endgroup_toggle_states( sxed, END_OCCUR ); @@ -2214,6 +2231,7 @@ gnc_sxed_update_cal( SchedXactionEditorDialog *sxed ) END_TYPE endType; GDate endDate; int numRemain; + gchar *text; endType = NO_END; numRemain = -1; @@ -2233,9 +2251,10 @@ gnc_sxed_update_cal( SchedXactionEditorDialog *sxed ) endType = NO_END; } else if ( gtk_toggle_button_get_active( sxed->optEndCount ) ) { endType = COUNT_END; - numRemain = - (gint)gnome_number_entry_get_number( - sxed->endRemainEntry ); + text = gtk_editable_get_chars( GTK_EDITABLE (sxed->endRemainEntry), + 0, -1 ); + sscanf (text, "%d", &numRemain); + g_free (text); } else { g_assert( FALSE ); } diff --git a/src/gnome/dialog-sxsincelast.c b/src/gnome/dialog-sxsincelast.c index d1048f22d4..5faa464fb2 100644 --- a/src/gnome/dialog-sxsincelast.c +++ b/src/gnome/dialog-sxsincelast.c @@ -701,7 +701,7 @@ reminders_prep( GnomeDruidPage *druid_page, druid_page, BACK ) != NULL ), - TRUE, TRUE ); + TRUE, TRUE, TRUE ); /* FIXME: this isn't quite right; see the comment in * sxsld_remind_row_toggle */ gnome_druid_set_show_finish( sxsld->sincelast_druid, @@ -830,7 +830,7 @@ created_prep( GnomeDruidPage *druid_page, druid_page, BACK ) != NULL ), - TRUE, TRUE ); + TRUE, TRUE, TRUE ); if ( !gnc_sxsld_get_appropriate_page( sxsld, druid_page, @@ -852,7 +852,7 @@ obsolete_prep( GnomeDruidPage *druid_page, druid_page, BACK ) != NULL ), - TRUE, TRUE ); + TRUE, TRUE, TRUE ); /* This is always the last/finish page. */ gnome_druid_set_show_finish( sxsld->sincelast_druid, TRUE ); @@ -943,7 +943,7 @@ auto_create_prep( GnomeDruidPage *druid_page, druid_page, BACK ) != NULL ), - TRUE, TRUE ); + TRUE, TRUE, TRUE ); if ( !gnc_sxsld_get_appropriate_page( sxsld, druid_page, @@ -975,7 +975,7 @@ to_create_prep( GnomeDruidPage *druid_page, druid_page, BACK ) != NULL ), - TRUE, TRUE ); + TRUE, TRUE, TRUE ); /* Setup next/finish button based on the number of ready-to-go * to-create transactions */ gnome_druid_set_show_finish( @@ -1886,15 +1886,15 @@ add_reminders_to_gui( GList *reminderList, sxSinceLastData *sxsld ) gtk_ctree_node_set_row_data( ctree, instNode, (gpointer)rit ); - gtk_signal_handler_block_by_func( GTK_OBJECT(ctree), - sxsld_remind_row_toggle, - sxsld ); + g_signal_handlers_block_by_func( G_OBJECT(ctree), + sxsld_remind_row_toggle, + sxsld ); if ( rit->isSelected ) { gtk_ctree_select( ctree, instNode ); } - gtk_signal_handler_unblock_by_func( GTK_OBJECT(ctree), - sxsld_remind_row_toggle, - sxsld ); + g_signal_handlers_unblock_by_func( G_OBJECT(ctree), + sxsld_remind_row_toggle, + sxsld ); g_free( rowText[0] ); g_free( rowText[2] ); } @@ -1918,9 +1918,9 @@ add_dead_list_to_gui(GList *removeList, sxSinceLastData *sxsld) gtk_clist_freeze( cl ); gtk_clist_clear( cl ); - gtk_signal_handler_block_by_func( GTK_OBJECT(cl), - sxsld_obsolete_row_toggle, - sxsld ); + g_signal_handlers_block_by_func( G_OBJECT(cl), + sxsld_obsolete_row_toggle, + sxsld ); for ( row = 0; removeList; row++, removeList = removeList->next ) { @@ -1940,9 +1940,9 @@ add_dead_list_to_gui(GList *removeList, sxSinceLastData *sxsld) gtk_clist_select_row( cl, row, 0 ); } } - gtk_signal_handler_unblock_by_func( GTK_OBJECT(cl), - sxsld_obsolete_row_toggle, - sxsld ); + g_signal_handlers_unblock_by_func( G_OBJECT(cl), + sxsld_obsolete_row_toggle, + sxsld ); gtk_clist_thaw( cl ); g_string_free(tmp_str, TRUE); diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c index 4c542632a4..f74934b2a0 100644 --- a/src/gnome/dialog-tax-info.c +++ b/src/gnome/dialog-tax-info.c @@ -23,6 +23,9 @@ #include "config.h" +/* GNOME 2 Port (Replace GtkText) */ +#define GTK_ENABLE_BROKEN + #include #include diff --git a/src/gnome/druid-hierarchy.c b/src/gnome/druid-hierarchy.c index c149344dd9..6473aca7a5 100644 --- a/src/gnome/druid-hierarchy.c +++ b/src/gnome/druid-hierarchy.c @@ -22,6 +22,9 @@ #include "config.h" +/* GNOME 2 Port (Replace GtkTree) */ +#define GTK_ENABLE_BROKEN + #include #include #include diff --git a/src/gnome/druid-loan.c b/src/gnome/druid-loan.c index ec800d4079..cae0b27351 100644 --- a/src/gnome/druid-loan.c +++ b/src/gnome/druid-loan.c @@ -278,7 +278,7 @@ typedef struct LoanDruidData_ { /* pay = payment[s] */ GtkEntry *payTxnName; - GnomeNumberEntry *payAmtGNE; + GtkEntry *payAmtGNE; GtkEntry *payAmtEntry; GNCAccountSel *payAcctFromGAS; GNCAccountSel *payAcctEscToGAS; @@ -859,7 +859,7 @@ gnc_loan_druid_get_widgets( LoanDruidData *ldd ) ldd->payTxnName = GET_CASTED_WIDGET( GTK_ENTRY, PAY_TXN_TITLE ); ldd->payAmtGNE = - GET_CASTED_WIDGET( GNOME_NUMBER_ENTRY, PAY_AMT_GNE ); + GET_CASTED_WIDGET( GTK_ENTRY, PAY_AMT_GNE ); ldd->payAmtEntry = GET_CASTED_WIDGET( GTK_ENTRY, PAY_AMT_ENTRY ); ldd->payTable = diff --git a/src/gnome/glade/account.glade b/src/gnome/glade/account.glade index 0d757c7015..bea5f5c6a5 100644 --- a/src/gnome/glade/account.glade +++ b/src/gnome/glade/account.glade @@ -1,1620 +1,1903 @@ - - + + - - Glade - glade - - - - C - True - True - False - False - False - False - + + - - GnomeDialog - Account Dialog - New Account - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - False - False - False + + True + New Account + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True - - GtkVBox - GnomeDialog:vbox - dialog-vbox12 - False - 8 - - 4 - True - True - + + + True + False + 8 - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area12 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + -11 + + + + + 0 + False + True + GTK_PACK_END + - - GtkButton - button63 - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - cancel_button - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - GtkButton - button72 - True - True - GNOME_STOCK_BUTTON_HELP - - - - - GtkNotebook - account_notebook - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - 0 - True - True + + True + True + True + True + GTK_POS_TOP + False + False + + + + True + False + 0 + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + 3 + True + True + 0 + + + + True + Account Name: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Account Code: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Description: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Commodity: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Smallest Fraction: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + 3 + True + True + 0 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + False + 0 + + + + + + + 0 + True + True + + + + + + True + Smallest fraction of this commodity that can be referenced. + True + 0 + + + + True + + + + True + Use Commodity Value + True + + + + + + True + 1 + True + + + + + + True + 1/10 + True + + + + + + True + 1/100 + True + + + + + + True + 1/1000 + True + + + + + + True + 1/10000 + True + + + + + + True + 1/100000 + True + + + + + + True + 1/1000000 + True + + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + True + Account Information + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + True + + + + + + 3 + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + + + + True + Account Type + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + + + + + True + Parent Account + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + False + 3 + + + + True + True + Get Online Quotes + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + False + 2 + + + + True + True + 0 + + + + True + The source for price quotes: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Timezone for these quotes: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + True + 0 + + + + True + False + 0 + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + Warning: Finance::Quote not installed properly. + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + True + Price Quote Source + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + True + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + True + Notes + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + True + 0 + + + + 3 + True + True + Tax Related + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + + + + + 3 + True + This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account. + True + Placeholder + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + General Information + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + False + 2 + + + + True + True + 0 + + + + True + Balance: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Date: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + True + 0 + + + + True + False + 0 + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + True + Balance Information + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + + 3 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + False + 0 + + + + True + True + Use Opening Balances Equity account + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Select Transfer Account + True + GTK_RELIEF_NORMAL + False + False + True + opening_equity_radio + + + 0 + False + False + + + + + + + + True + Transfer Type + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + + 3 + True + False + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + + + + + True + Transfer Account + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + False + True + + + + + + True + Opening Balance + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + True + True + - - - GtkVBox - vbox75 - False - 0 - - - GtkFrame - frame28 - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - True - - - - GtkHBox - hbox62 - False - 0 - - - GtkVBox - vbox76 - 3 - True - 0 - - 0 - True - True - - - - GtkLabel - label807 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label811 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label808 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label809 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label8477389 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkVBox - vbox77 - 3 - True - 0 - - 0 - True - True - - - - GtkEntry - name_entry - True - True - True - 0 - - - 0 - False - False - - - - - GtkEntry - code_entry - True - True - True - 0 - - - 0 - False - False - - - - - GtkEntry - description_entry - True - True - True - 0 - - - 0 - False - False - - - - - GtkHBox - commodity_hbox - False - 0 - - 0 - True - True - - - - Placeholder - - - - - GtkOptionMenu - account_scu - Smallest fraction of this commodity that can be referenced. - True - Use Commodity Value -1 -1/10 -1/100 -1/1000 -1/10000 -1/100000 -1/1000000 - - 0 - - 0 - False - False - - - - - - - - GtkHBox - hbox65 - 3 - False - 0 - - 0 - True - True - - - - GtkFrame - frame29 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkScrolledWindow - scrolledwindow7 - 3 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - GtkCList - type_list - True - 1 - 80 - GTK_SELECTION_SINGLE - False - GTK_SHADOW_IN - - - GtkLabel - CList:title - label812 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - - GtkFrame - frame30 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkScrolledWindow - parent_scroll - 3 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - Placeholder - - - - - - - GtkFrame - price_quote_frame - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - True - - - - GtkVBox - vbox129 - 3 - False - 3 - - - GtkCheckButton - get_quote_check - True - - False - True - - 0 - False - False - - - - - GtkHBox - hbox103 - False - 2 - - 0 - True - True - - - - GtkVBox - vbox116 - True - 0 - - 0 - False - False - - - - GtkLabel - source_label - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - quote_tz_label - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkVBox - vbox117 - True - 0 - - 0 - True - True - - - - GtkHBox - source_box - False - 0 - - 0 - True - True - - - - Placeholder - - - - - GtkHBox - quote_tz_box - False - 0 - - 0 - True - True - - - - Placeholder - - - - - - - GtkLabel - finance_quote_warning - False - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkFrame - frame32 - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow9 - 3 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - GtkText - notes_text - True - True - - - - - - - GtkHBox - hbox104 - True - 0 - - 0 - False - False - - - - GtkCheckButton - tax_related_button - 3 - True - - False - True - - 0 - False - False - - - - - Placeholder - - - - GtkCheckButton - placeholder_button - 3 - This account is present solely as a placeholder in the hierarchy. Transactions may not be posted to this account, only to sub-accounts of this account. - True - - False - True - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label8477388 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox118 - False - 0 - - - GtkFrame - opening_balance_frame - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkHBox - hbox101 - 3 - False - 2 - - - GtkVBox - vbox114 - True - 0 - - 0 - False - False - - - - GtkLabel - label847737 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkLabel - label847738 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkVBox - vbox115 - True - 0 - - 0 - True - True - - - - GtkHBox - opening_balance_box - False - 0 - - 0 - True - True - - - - Placeholder - - - - - GtkHBox - opening_balance_date_box - False - 0 - - 0 - True - True - - - - Placeholder - - - - - - - - GtkFrame - frame49 - 3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkVBox - vbox120 - 3 - False - 0 - - - GtkRadioButton - opening_equity_radio - True - - False - True - transfer_type_group - - 0 - False - False - - - - - GtkRadioButton - radiobutton8 - True - - False - True - transfer_type_group - - 0 - False - False - - - - - - - GtkFrame - transfer_account_frame - 3 - False - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkScrolledWindow - transfer_account_scroll - 3 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - Placeholder - - - - - - - GtkLabel - Notebook:tab - label847739 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - + - - GtkWindow - Hierarchy Druid - 540 - 370 - New Account Hierarchy Setup - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_MOUSE - False - 640 - 480 - False - True - False + + True + New Account Hierarchy Setup + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 640 + 480 + True + False - - GnomeDruid - hierarchy_druid - - cancel - on_cancel - Sat, 16 Jun 2001 23:54:54 GMT - + + + 4 + True + False + - - GnomeDruidPageStart - start_page - New Account Hierarchy Setup - This druid will help you create a set of GnuCash + + + True + GNOME_EDGE_START + New Account Hierarchy Setup + This druid will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have. Click 'Cancel' if you do not wish to create any -new accounts now. - 255,255,255 - 0,0,0 - 25,25,112 - 255,255,255 - 255,255,255 - +new accounts now. + #ffffffffffff + #000000000000 + #191919197070 + #ffffffffffff + #ffffffffffff + + - - GnomeDruidPageStandard - currency_choose_page - - prepare - on_choose_currency_prepare - Sat, 16 Jun 2001 23:27:41 GMT - - Choose Currency - 255,255,255 - 25,25,112 - 255,255,255 + + + True + Choose Currency + #8aa0081e5b2b + #8aa0081ec918 + #888c407fc908 + - - GtkVBox - GnomeDruidPageStandard:vbox - vbox2 - 20 - False - 5 - - 0 - True - True - + + + 20 + True + False + 5 - - GtkLabel - newUserChooseCurrencyDescrip - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False + + + True + Please choose the currency to use for new accounts. + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + + + + 0 + False + False + + + + - - GtkVBox - currency_chooser_vbox - False - 0 - - 0 - False - False - + + + True + Choose accounts to create + #8aa0081e5b2b + #8aa0081ec918 + #888c407fc908 + - - Placeholder - - - - + + + 5 + True + False + 5 - - GnomeDruidPageStandard - choose_account_types_page - - prepare - on_choose_account_types_prepare - Sat, 16 Jun 2001 23:59:57 GMT - - Choose accounts to create - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox1 - 5 - False - 5 - - 0 - True - True - - - - GtkLabel - pickAccountsDescriptionLabel - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkFrame - frame5 - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkVBox - vbox7 - False - 0 - - - GtkScrolledWindow - scrolledwindow1 - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True +additional accounts by hand later. + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + - - GtkCList - account_types_clist - True - - select_row - on_account_types_list_select_row - Sun, 17 Jun 2001 00:18:23 GMT - - - unselect_row - on_account_types_list_unselect_row - Sun, 17 Jun 2001 00:23:46 GMT - - 2 - 144,80 - GTK_SELECTION_MULTIPLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - newAccountTypesList_TypeLabel - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - newAccountTypesList_DescriptionLabel - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkHBox - hbox3 - 5 - False - 0 - 0 - False - False + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + + + 0 + True + True + + + + + + 5 + True + False + 0 + + + + True + True + Select All + True + GTK_RELIEF_NORMAL + + + + 0 + True + False + + + + + + True + True + Clear All + True + GTK_RELIEF_NORMAL + + + + 0 + True + False + + + + + 0 + False + False + + + + + + + 0 + True + True + - - GtkButton - select_all_button - True - - clicked - select_all_clicked - Sun, 17 Jun 2001 00:25:54 GMT - - - GTK_RELIEF_NORMAL - - 0 - True - False - - + + + True + False + 2 - - GtkButton - clear_all_button - True - - clicked - clear_all_clicked - Sun, 17 Jun 2001 00:28:18 GMT - - - GTK_RELIEF_NORMAL - - 0 - True - False - - + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + GTK_SHADOW_IN + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + True + Detailed Description + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + GTK_POLICY_NEVER + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + GTK_SHADOW_IN + + + + True + True + False + False + True + + + + + + + + + + True + Accounts + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + - - - - - GtkHBox - hbox1 - False - 2 - - 0 - True - True - - - GtkFrame - frame1 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow2 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - GtkViewport - viewport2 - GTK_SHADOW_IN - - - GtkLabel - account_types_description_entry - - GTK_JUSTIFY_LEFT - True - 0.5 - 0.5 - 0 - 0 - - - - - - - GtkFrame - frame2 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow3 - GTK_POLICY_NEVER - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - GtkViewport - viewport1 - GTK_SHADOW_IN - - - GtkTree - account_type_tree - GTK_SELECTION_SINGLE - GTK_TREE_VIEW_LINE - True - - - - - - + - - GnomeDruidPageStandard - final_account_page - - prepare - on_final_account_prepare - Sun, 17 Jun 2001 00:30:49 GMT - - - next - on_final_account_next - Sun, 17 Jun 2001 05:40:45 GMT - - Enter opening balances - 255,255,255 - 25,25,112 - 255,255,255 + + + True + Enter opening balances + #8aa0081e5b2b + #8aa0081ec918 + #888c407fc908 + + - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox3 - 5 - False - 10 - - 0 - True - True - + + + 5 + True + False + 10 - - GtkLabel - finalAccountLabel - - GTK_JUSTIFY_LEFT - False - 0.5 - 0.5 - 1 - 1 - - 5 - False - False - - - - - GtkHBox - hbox4 - False - 2 - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow4 - GTK_POLICY_AUTOMATIC - GTK_POLICY_ALWAYS - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCTree - final_account_ctree - True - - tree_select_row - on_final_account_tree_select_row - Sun, 17 Jun 2001 05:30:25 GMT - - - tree_unselect_row - on_final_account_tree_unselect_row - Sun, 17 Jun 2001 05:38:44 GMT - - 3 - 80,80,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CTree:title - cTreeAccountNameLabel - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CTree:title - cTreeTypeLabel - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CTree:title - cTreeOpeningBalanceLabel - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkVBox - vbox5 - False - 0 - - 0 - False - True - - - - GtkCheckButton - placeholder - 2 - True - - toggled - on_final_account_tree_placeholder_toggled - Fri, 05 Apr 2002 23:41:25 GMT - - - False - True - - 0 - False - False - - - - - GtkFrame - frame3 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkVBox - start_balance_box - 3 - False - 0 - - - Placeholder +and placeholder accounts may have an opening balance. + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 1 + 1 - - + + 5 + False + False + + - - Placeholder + + + True + False + 2 + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + 2 + True + True + Placeholder + True + GTK_RELIEF_NORMAL + False + False + True + + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 3 + True + False + 0 + + + + + + + + + + True + Opening Balance + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + + + + + 0 + False + True + + + + + 0 + True + True + + - + - - + - - GnomeDruidPageFinish - newUserDruidFinishPage - - finish - on_finish - Sat, 16 Jun 2001 23:41:40 GMT - - Finish Account Setup - Press `Finish' to create your new accounts. + + + True + GNOME_EDGE_FINISH + Finish Account Setup + Press `Finish' to create your new accounts. Press `Back' to review your selections. -Press `Cancel' to close this dialog without creating any new accounts. - 25,25,112 - 255,255,255 - 255,255,255 - 0,0,0 - 255,255,255 - - - - - - GnomeDialog - Account Picker - Select Account - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 300 - 400 - True - True - True - False - False - - - GtkVBox - GnomeDialog:vbox - vbox1 - False - 8 - - 1 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox1 - GTK_BUTTONBOX_SPREAD - 8 - 85 - 27 - 7 - 0 - - 0 - False - False - GTK_PACK_END - - - - GtkButton - button1 - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button2 - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox2 - False - 0 - - 0 - True - True - - - - GtkFrame - frame1 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow24 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - - GtkCTree - account_tree - True - 2 - 214,48 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CTree:title - label847711 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CTree:title - label847712 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - +Press `Cancel' to close this dialog without creating any new accounts. + #ffffffffffff + #000000000000 + #191919197070 + #ffffffffffff + #ffffffffffff + - - - - - GtkButton - new_account_button - True - - clicked - gnc_ui_qif_account_picker_new_cb - QIF_Import_Account_Picker - Sat, 10 Feb 2001 21:26:10 GMT - - - GTK_RELIEF_NORMAL - - 0 - False - False - + - + + True + Select Account + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 300 + 400 + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + False + GTK_PACK_END + + + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + + + + True + Select or add a GnuCash account + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + True + New Account (not implemented) + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + + diff --git a/src/gnome/glade/sched-xact.glade b/src/gnome/glade/sched-xact.glade index f633a0dd0a..5188497cb6 100644 --- a/src/gnome/glade/sched-xact.glade +++ b/src/gnome/glade/sched-xact.glade @@ -1,5840 +1,8296 @@ - - + + - - Glade - glade - - - pixmaps - C - True - True - False - False - False - False - sched-xact_strings.c - + + - - GnomeDialog - Scheduled Transaction Editor - False - Edit Scheduled Transaction - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - False - True - True - False - False + + Edit Scheduled Transaction + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True - - GtkVBox - GnomeDialog:vbox - dialog-vbox17 - False - 8 - - 4 - True - True - + + + True + False + 8 - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area17 - GTK_BUTTONBOX_DEFAULT_STYLE - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - + + + True + GTK_BUTTONBOX_DEFAULT_STYLE - - GtkButton - ok_button - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - help_button - True - True - GNOME_STOCK_BUTTON_HELP - - - - GtkButton - cancel_button - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox105 - False - 0 - - 0 - True - True - - - - GtkHBox - hbox95 - False - 3 - - 0 - False - False - - - - GtkVBox - vbox106 - False - 0 - 0 - False - False + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + - - GtkHBox - hbox96 - False - 0 - - 2 - False - False - + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 3 - - GtkLabel - label847707 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - 0 - False - False - - + + True + False + 0 - - GtkEntry - sxe_name - True - True - True - 0 - - - 0 - True - True - - - + + + True + False + 0 - - GtkHBox - hbox172 - False - 0 - - 0 - True - True - + + + True + Name: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + - - GtkLabel - label847964 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkLabel - last_occur_label - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkFrame - frame73 - - 0.05 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkVBox - vbox133 - 2 - False - 0 - - - GtkCheckButton - autocreate_opt - Conditional on splits not having variables - True - - False - True - - 0 - False - False - - - - - GtkAlignment - alignment2 - 1 - 0.5 - 0.66 - 1 - - 0 - False - False - - - - GtkCheckButton - notify_opt - False - True - - False - True - - - - - GtkCheckButton - advance_opt - True - False - True - - 0 - False - False - - - - GtkHBox - hbox150 - False - 0 - - - GtkLabel - label847807 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - advance_days - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 0 - 0 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847808 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkCheckButton - remind_opt - True - False - True - - 0 - False - False - - - - GtkHBox - hbox151 - False - 0 - - - GtkLabel - label847809 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - remind_days - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 0 - 0 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847810 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - - - GtkFrame - frame77 - - 0.05 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkVBox - vbox144 - 2 - False - 0 - - - GtkRadioButton - rb_noend - True - - True - True - sx_end_opt - - 2 - False - False - - - - - GtkRadioButton - rb_enddate - True - False - True - sx_end_opt - - 2 - False - False - - - - GtkHBox - end_date_hbox - False - 0 - - - GtkLabel - label847840 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - Placeholder - - - - - - GtkRadioButton - rb_num_occur - True - False - True - sx_end_opt - - 2 - False - False - - - - GtkVBox - vbox145 - False - 0 - - - GtkLabel - label847841 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GnomeNumberEntry - end_gnome_nentry - False - Number of Occurrences - 10 - - 0 - False - False - - - - GtkEntry - GnomeEntry:entry - end_nentry - True - True - True - 5 - + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + - + + 2 + False + False + + - - GtkLabel - label847876 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - False - False - - + + + True + False + 0 - - GnomeNumberEntry - remain_gnome_nentry - False - Remaining Number of Occurrences - 10 - - 0 - False - False - + + + True + Last Occurred: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + - - GtkEntry - GnomeEntry:entry - remain_nentry - True - True - True - 5 - + + + True + YYYY-MM-DD + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + + 0 + True + True + + + + + + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 2 + True + False + 0 + + + + True + Conditional on splits not having variables + True + Create Automatically + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + 1 + 0.5 + 0.66 + 1 + + + + True + False + True + Notify me when created + True + GTK_RELIEF_NORMAL + False + False + True + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + + + + True + False + 0 + + + + True + Create + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 0 0 100 1 10 10 + + + 0 + False + False + + + + + + True + days in advance + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + + + + True + False + 0 + + + + True + Remind me + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 0 0 100 1 10 10 + + + 0 + False + False + + + + + + True + days in advance + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + 0 + False + False + + + + + + + + True + Options + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 2 + True + False + 0 + + + + True + True + No End + True + GTK_RELIEF_NORMAL + True + False + True + + + 2 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + rb_noend + + + + True + False + 0 + + + + True + End Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 2 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + rb_noend + + + + True + False + 3 + + + + True + Number of Occurrences: + False + False + GTK_JUSTIFY_LEFT + False + False + 7.45058e-09 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + Remaining Occurrences: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + + 2 + False + False + + + + + + + + True + End + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + - - - - - - - GtkFrame - recur_frame - - 0.05 - GTK_SHADOW_ETCHED_IN - - 2 - True - True - - - - GtkVBox - recur_box - False - 0 - - - GtkFrame - gncfreq_frame - 0 - GTK_SHADOW_NONE - - 0 - False - False + + 0 + False + False + - - Placeholder - - - - - GtkFrame - example_cal_frame - 0 - GTK_SHADOW_NONE - 0 - True - True - - - - Placeholder - - - - - - - - GtkVBox - vbox108 - False - 0 - - 0 - True - True - - - - GtkFrame - tempxaction_frame - - 0.05 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkVBox - register_vbox - False - 0 - - - Placeholder - - - - Placeholder - - - - - - GtkStatusbar - ledger_status - - 0 - False - False - - - - - - - - - GtkWindow - GNCFrequency widget - False - This window should never be realized. - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - - - GtkVBox - gncfreq_vbox - False - 0 - - - GtkTable - gncfreq_table - 2 - 2 - False - 0 - 0 - - 0 - False - False - - - - GtkLabel - label847774 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847775 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkOptionMenu - freq_option - True - None -Once -Daily -Daily [M-F] -Weekly -Bi-Weekly -Semi-Monthly -Monthly -Quarterly -Tri-Yearly -Semi-Yearly -Yearly - - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - - GtkNotebook - gncfreq_nb - False - True - GTK_POS_TOP - True - 2 - 2 - False - - 0 - False - False - - - - GtkLabel - label847767 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - Notebook:tab - label847753 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox114 - True - 0 - - - GtkLabel - label847776 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label847735 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox108 - True - 0 - - - GtkHBox - hbox115 - False - 0 - - 0 - False - False - - - - GtkLabel - label847746 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 4 - 0 - - 0 - False - False - - - - - GtkSpinButton - daily_spin - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 - 1 - 365 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847747 - - GTK_JUSTIFY_CENTER - False - 7.45058e-09 - 0.5 - 5 - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label847736 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox138 - True - 0 - - - GtkHBox - hbox139 - False - 0 - - 0 - False - False - - - - GtkLabel - label847772 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 4 - 0 - - 0 - False - False - - - - - GtkSpinButton - dailymf_spin - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 - 1 - 365 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847773 - - GTK_JUSTIFY_CENTER - False - 7.45058e-09 - 0.5 - 5 - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - daily_mf - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox113 - False - 0 - - - GtkHBox - hbox110 - True - 0 - - 5 - False - False - - - - GtkLabel - label847748 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - True - True - - - - - GtkSpinButton - weekly_spin - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 - 1 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847749 - - GTK_JUSTIFY_FILL - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - True - True - - - - - - GtkFrame - frame51 - 2 - - 0.05 - GTK_SHADOW_ETCHED_IN - - 0 - False - False - - - - GtkHBox - hbox122 - False - 0 - - - GtkVBox - vbox114 - False - 0 - - 0 - False - False - - - - GtkCheckButton - wd_check_sun - True - - False - True - - 0 - False - False - - - - - GtkCheckButton - wd_check_mon - True - - False - True - - 0 - False - False - - - - - GtkCheckButton - wd_check_tue - True - - False - True - - 0 - False - False - - - - - - GtkVBox - vbox117 - False - 0 - - 0 - False - False - - - - GtkCheckButton - wd_check_wed - True - - False - True - - 0 - False - False - - - - - GtkCheckButton - wd_check_thu - True - - False - True - - 0 - False - False - - - - - GtkCheckButton - wd_check_fri - True - - False - True - - 0 - False - False - - - - - - GtkVBox - vbox162 - False - 0 - - 0 - False - False - - - - GtkCheckButton - wd_check_sat - True - - False - True - - 0 - False - False - - - - - - - - - GtkLabel - Notebook:tab - label847738 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox111 - True - 0 - - - GtkLabel - label847777 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - GtkLabel - Notebook:tab - label847739 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox112 - False - 0 - - - GtkVBox - vbox119 - 5 - False - 0 - - 0 - False - False - - - - GtkHBox - hbox126 - True - 0 - - 5 - False - False - - - - GtkLabel - label847757 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - semimonthly_spin - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - True - False - 1 - 1 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847758 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - True - - - - - - GtkHBox - hbox127 - False - 0 - - 3 - False - False - - - - GtkLabel - label847759 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - True - - - - - GtkOptionMenu - semimonthly_first - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - GtkHBox - hbox128 - False - 0 - - 3 - False - False - - - - GtkLabel - label847760 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkOptionMenu - semimonthly_second - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - - - GtkLabel - Notebook:tab - label847740 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkHBox - hbox113 - False - 0 - - - GtkVBox - vbox118 - False - 0 - - 5 - True - True - - - - GtkHBox - hbox124 - True - 0 - - 5 - False - False - - - - GtkLabel - label847754 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - True - True - - - - - GtkSpinButton - monthly_spin - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - True - 1 - 1 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847755 - - GTK_JUSTIFY_CENTER - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - True - True - - - - - - GtkHBox - hbox125 - False - 0 - - 5 - False - True - - - - GtkLabel - label847756 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 2 - False - True - - - - - GtkOptionMenu - monthly_day - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - - - GtkLabel - Notebook:tab - label847741 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox120 - False - 0 - - - GtkHBox - hbox134 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847766 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - False - True - - - - - GtkOptionMenu - quarterly_occur - True - Jan, Apr, Jul, Oct -Feb, May, Aug, Nov -Mar, Jun, Sep, Dec - - 0 - - 0 - False - False - - - - - - GtkHBox - hbox129 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847761 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkOptionMenu - quarterly_day - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label847742 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox121 - False - 0 - - - GtkHBox - hbox133 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847765 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkOptionMenu - triyearly_occur - True - Jan, May, Sep -Feb, Apr, Oct -Mar, Jun, Nov -Apr, Jul, Dec - - 0 - - 0 - False - False - - - - - - GtkHBox - hbox130 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847762 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkOptionMenu - triyearly_day - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label847743 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox122 - False - 0 - - - GtkHBox - hbox131 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847763 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkOptionMenu - semiyearly_occur - True - Jan, Jul -Feb, Aug -Mar, Sep -Apr, Oct -May, Nov -Jun, Dec - - 0 - - 0 - False - False - - - - - - GtkHBox - hbox132 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847764 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkOptionMenu - semiyearly_day - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label847744 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox123 - False - 0 - - - GtkHBox - hbox135 - 5 - True - 0 - - 0 - False - False - - - - GtkLabel - label847768 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - False - True - - - - - GtkSpinButton - yearly_spin - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 1 - 1 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847769 - - GTK_JUSTIFY_CENTER - False - 7.45058e-09 - 0.5 - 5 - 0 - - 0 - False - True - - - - - - GtkHBox - hbox136 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847770 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - False - True - - - - - GtkOptionMenu - yearly_month - True - January -February -March -April -May -June -July -August -September -October -November -December - - 1 - - 0 - False - False - - - - - - GtkHBox - hbox137 - 3 - False - 0 - - 0 - False - False - - - - GtkLabel - label847771 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 5 - 0 - - 0 - False - True - - - - - GtkOptionMenu - yearly_day - True - 1st -2nd -3rd -4th -5th -6th -7th -8th -9th -10th -11th -12th -13th -14th -15th -16th -17th -18th -19th -20th -21st -22nd -23rd -24th -25th -26th -27th -28th -[29th/last] -[30th/last] -[31st/last] - - 0 - - 0 - False - False - - - - - - - GtkLabel - Notebook:tab - label847745 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - - GnomeDialog - Scheduled Transaction List - 640 - 480 - Scheduled Transactions - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - 640 - 480 - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox18 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area18 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - close_button - True - True - GNOME_STOCK_BUTTON_CLOSE - - - - - GtkHBox - hbox123 - False - 0 - - 0 - False - True - - - - GtkScrolledWindow - scrolledwindow1 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - sched_xact_list - True - 3 - 127,140,80 - GTK_SELECTION_EXTENDED - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label847750 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label847751 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label847752 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkVButtonBox - vbuttonbox1 - GTK_BUTTONBOX_START - 10 - 85 - 27 - 7 - 0 - - 0 - False - True - - - - GtkButton - new_button - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - edit_button - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - delete_button - True - True - - GTK_RELIEF_NORMAL - - - - - - GtkFrame - upcoming_cal_frame - 2 - - 0.05 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - Placeholder - - - - - - - GnomeDialog - Scheduled Transaction Editor, Take 2 - Edit Scheduled Transaction - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox21 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area21 - GTK_BUTTONBOX_DEFAULT_STYLE - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - ok_button - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - cancel_button - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox136 - False - 5 - - 0 - True - True - - - - GtkHBox - hbox153 - False - 0 - - 0 - True - True - - - - GtkLabel - label847827 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 5 - 0 - - 0 - False - False - - - - - GtkEntry - sxe_name - True - True - True - 0 - - - 0 - True - True - - - - - - GtkNotebook - notebook1 - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - - 0 - True - True - - - - GtkVBox - vbox137 - 2 - False - 0 - - - GtkCheckButton - autocreate_opt - Conditional on splits not having variables - True - - False - True - - 0 - False - False - - - - - GtkAlignment - alignment3 - 1 - 0.5 - 0.66 - 1 - - 0 - False - False - - - - GtkCheckButton - notify_opt - False - True - - False - True - - - - - GtkCheckButton - advance_opt - True - False - True - - 0 - False - False - - - - GtkHBox - hbox154 - False - 0 - - - GtkLabel - label847828 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - advance_days - False - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 0 - 0 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847829 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkCheckButton - remind_opt - True - False - True - - 0 - False - False - - - - GtkHBox - hbox155 - False - 0 - - - GtkLabel - label847830 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkSpinButton - remind_days - False - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - True - False - 0 - 0 - 100 - 1 - 10 - 10 - - 0 - False - False - - - - - GtkLabel - label847831 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - - GtkLabel - Notebook:tab - label847823 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox138 - 2 - False - 0 - - - GtkRadioButton - rb_noend - True - - True - True - sx_end_opt - - 2 - False - False - - - - - GtkRadioButton - rb_enddate - True - False - True - sx_end_opt - - 2 - False - False - - - - GtkHBox - hbox156 - False - 0 - - - GtkLabel - label847832 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GnomeDateEdit - sxe_end_date - False - True - False - 7 - 19 - - 0 - False - False - - - - - - - GtkRadioButton - rb_num_occur - True - False - True - sx_end_opt - - 2 - False - False - - - - GtkVBox - vbox139 - False - 0 - - - GtkLabel - label847833 - - GTK_JUSTIFY_LEFT - False - 7.45058e-09 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GnomeNumberEntry - end_nentry - 10 - - 0 - False - False - - - - GtkEntry - GnomeEntry:entry - entry2 - True - True - True - 0 - + + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + 0 + True + True + + + + + + + + True + Recurrence Frequency + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + - - - - - - - GtkLabel - Notebook:tab - label847824 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkFrame - recur_frame - - 0.1 - GTK_SHADOW_ETCHED_IN - - - Placeholder - - - - - GtkLabel - Notebook:tab - label847825 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox140 - False - 0 - - - GtkHBox - hbox157 - False - 0 - - 0 - False - False - - - - GtkButton - rec_button - True - True - - GTK_RELIEF_NORMAL - - 0 - False - False + + 2 + True + True + - - - GtkLabel - label847834 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - True - True - - - - - - Placeholder - - - - - GtkLabel - Notebook:tab - label847826 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkStatusbar - ledger_status - - 0 - False - False - - - - - - - GnomeDialog - sx_from_real_trans - Make Scheduled transaction - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox23 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area23 - GTK_BUTTONBOX_DEFAULT_STYLE - 8 - 0 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - ok_button - True - True - GNOME_STOCK_BUTTON_OK - - - - GtkButton - advanced_button - True - True - - - - - GtkButton - cancel_button - True - True - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkHBox - hbox171 - False - 0 - - 0 - True - True - - - - GtkVBox - vbox146 - False - 0 - - 0 - False - False - - - - GtkTable - param_table - 3 - 2 - False - 0 - 0 - - 0 - False - False + + 0 + False + False + - - GtkLabel - label847842 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 3 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847843 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 3 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847875 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 3 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkEntry - name_entry - True - True - True - 0 - - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkOptionMenu - freq_option_menu - True - Daily -Weekly -Bi-Weekly -Monthly -Quarterly -Yearly - - 0 - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - - GtkFrame - frame78 - 2 - - 0.05 - GTK_SHADOW_ETCHED_IN - 0 - False - False - + + True + False + 0 - - GtkVBox - vbox147 - False - 0 - - - GtkRadioButton - never_end_button - True - - False - True - end_group - 0 - False - False - - + + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN - - GtkHBox - end_date_hbox - False - 0 - - 0 - False - False - + + + True + False + 0 - - GtkRadioButton - end_on_date_button - True - - False - True - end_group - - 0 - False - False - - + + + - - Placeholder - - + + + + + - - GtkHBox - hbox164 - False - 0 - - 0 - False - False - - - - GtkRadioButton - n_occurrences_button - True - - False - True - end_group - - 0 - False - False - - - - - GnomeEntry - entry5 - 152 - 10 - - 0 - True - False - - - - GtkEntry - GnomeEntry:entry - n_occurrences_entry - True - True - True - 0 - + + + True + Template Transaction + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + - + + 0 + True + True + + + + + + True + True + + + 0 + False + False + + - + + 0 + True + True + + - - - - GtkFrame - ex_cal_frame - 0 - GTK_SHADOW_NONE - - 0 - True - True - - - - Placeholder - - + + 0 + True + True + + - + - - GtkWindow - Since Last Run Druid - Since Last Run - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - True - True + + This window should never be realized. + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False - - GnomeDruid - sincelast_druid + + + True + False + 0 - - GnomeDruidPageStandard - what_to_do - What to do, what to do? - 255,255,255 - 25,25,112 - 255,255,255 + + + True + 2 + 2 + False + 0 + 0 - - GtkVBox - GnomeDruidPageStandard:vbox - what_to_do_vbox - False - 0 - - 0 - True - True - - - - GtkFrame - frame82 - 38 - - 0.05 - GTK_SHADOW_ETCHED_IN - 0 - True - False + + True + Frequency: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + 1 + 0 + 1 + fill + + - - GtkProgressBar - creation_progress - 0 - 0 - 100 - GTK_PROGRESS_CONTINUOUS - GTK_PROGRESS_LEFT_TO_RIGHT - False - True - %v/%u (%p%%) - 0.5 - 0.5 - + + + True + Start Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + 0 + + + + True + + + + True + None + True + + + + + + True + Once + True + + + + + + True + Daily + True + + + + + + True + Daily [M-F] + True + + + + + + True + Weekly + True + + + + + + True + Bi-Weekly + True + + + + + + True + Semi-Monthly + True + + + + + + True + Monthly + True + + + + + + True + Quarterly + True + + + + + + True + Tri-Yearly + True + + + + + + True + Semi-Yearly + True + + + + + + True + Yearly + True + + + + + + + 1 + 2 + 0 + 1 + fill + + + - + + 0 + False + False + + + + + + True + False + True + GTK_POS_TOP + True + False + + + + True + Not scheduled + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + False + True + + + + + + True + None + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + 0 + + + + True + Select occurrence date above. + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + False + True + + + + + + True + Once + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + 0 + + + + True + False + 0 + + + + True + Every + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 4 + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 1 1 365 1 10 10 + + + 0 + False + False + + + + + + True + days. + False + False + GTK_JUSTIFY_CENTER + False + False + 7.45058e-09 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Daily + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + 0 + + + + True + False + 0 + + + + True + Every + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 4 + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 1 1 365 1 10 10 + + + 0 + False + False + + + + + + True + weeks. + False + False + GTK_JUSTIFY_CENTER + False + False + 7.45058e-09 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Daily [M-F] + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + True + True + 0 + + + + True + Every + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 1 100 1 10 10 + + + 0 + False + False + + + + + + True + weeks. + False + False + GTK_JUSTIFY_FILL + False + False + 7.45058e-09 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 5 + False + False + + + + + + 2 + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + False + 0 + + + + True + True + Sunday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Monday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Tuesday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + Wednesday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Thursday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Friday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + Saturday + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + False + False + + + + + + + + True + Days + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + False + True + + + + + + True + Weekly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + 0 + + + + True + Select initial date, above. + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + False + True + + + + + + True + Bi-Weekly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 5 + True + False + 0 + + + + True + True + 0 + + + + True + Every + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + True + False + 1 1 100 1 10 10 + + + 0 + False + False + + + + + + True + months. + False + False + GTK_JUSTIFY_LEFT + False + False + 7.45058e-09 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + 5 + False + False + + + + + + True + False + 0 + + + + True + First on the: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 3 + False + False + + + + + + True + False + 0 + + + + True + then on the: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 3 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Semi-Monthly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + True + 0 + + + + True + Every + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + True + 1 1 100 1 10 10 + + + 0 + False + False + + + + + + True + months. + False + False + GTK_JUSTIFY_CENTER + False + False + 7.45058e-09 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 5 + False + False + + + + + + True + False + 0 + + + + True + On the + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 2 + False + True + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 5 + False + True + + + + + 5 + True + True + + + + + False + True + + + + + + True + Monthly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 3 + True + False + 0 + + + + True + Occuring in + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + True + + + + + + True + True + 0 + + + + True + + + + True + Jan, Apr, Jul, Oct + True + + + + + + True + Feb, May, Aug, Nov + True + + + + + + True + Mar, Jun, Sep, Dec + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + 3 + True + False + 0 + + + + True + On the + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Quarterly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 3 + True + False + 0 + + + + True + Occuring in + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + Jan, May, Sep + True + + + + + + True + Feb, Apr, Oct + True + + + + + + True + Mar, Jun, Nov + True + + + + + + True + Apr, Jul, Dec + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + 3 + True + False + 0 + + + + True + On the + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Tri-Yearly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 3 + True + False + 0 + + + + True + Occuring in + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + Jan, Jul + True + + + + + + True + Feb, Aug + True + + + + + + True + Mar, Sep + True + + + + + + True + Apr, Oct + True + + + + + + True + May, Nov + True + + + + + + True + Jun, Dec + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + 3 + True + False + 0 + + + + True + On the + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Semi-Yearly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + 5 + True + True + 0 + + + + True + Every + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + True + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 1 1 100 1 10 10 + + + 0 + False + False + + + + + + True + year(s). + False + False + GTK_JUSTIFY_CENTER + False + False + 7.45058e-09 + 0.5 + 5 + 0 + + + 0 + False + True + + + + + 0 + False + False + + + + + + 3 + True + False + 0 + + + + True + Month + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + True + + + + + + True + True + 0 + + + + True + + + + True + January + True + + + + + + True + February + True + + + + + + True + March + True + + + + + + True + April + True + + + + + + True + May + True + + + + + + True + June + True + + + + + + True + July + True + + + + + + True + August + True + + + + + + True + September + True + + + + + + True + October + True + + + + + + True + November + True + + + + + + True + December + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + 3 + True + False + 0 + + + + True + Day + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 5 + 0 + + + 0 + False + True + + + + + + True + True + 0 + + + + True + + + + True + 1st + True + + + + + + True + 2nd + True + + + + + + True + 3rd + True + + + + + + True + 4th + True + + + + + + True + 5th + True + + + + + + True + 6th + True + + + + + + True + 7th + True + + + + + + True + 8th + True + + + + + + True + 9th + True + + + + + + True + 10th + True + + + + + + True + 11th + True + + + + + + True + 12th + True + + + + + + True + 13th + True + + + + + + True + 14th + True + + + + + + True + 15th + True + + + + + + True + 16th + True + + + + + + True + 17th + True + + + + + + True + 18th + True + + + + + + True + 19th + True + + + + + + True + 20th + True + + + + + + True + 21st + True + + + + + + True + 22nd + True + + + + + + True + 23rd + True + + + + + + True + 24th + True + + + + + + True + 25th + True + + + + + + True + 26th + True + + + + + + True + 27th + True + + + + + + True + 28th + True + + + + + + True + [29th/last] + True + + + + + + True + [30th/last] + True + + + + + + True + [31st/last] + True + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + False + True + + + + + + True + Yearly + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + False + False + + + + - - GnomeDruidPageStandard - reminders_page - Transaction Reminders - 255,255,255 - 25,25,112 - 255,255,255 + + True + Scheduled Transactions + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 640 + 480 + True + False + True - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox5 - False - 0 - - 0 - True - True - + + + True + False + 8 - - GtkLabel - label847862 - + + + + + True + Edit Scheduled Transaction + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 5 + + + + True + False + 0 + + + + True + Name: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 5 + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + True + True + True + GTK_POS_TOP + False + False + + + + 2 + True + False + 0 + + + + True + Conditional on splits not having variables + True + Create Automatically + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + 1 + 0.5 + 0.66 + 1 + + + + True + False + True + Notify me when created + True + GTK_RELIEF_NORMAL + False + False + True + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + + + + True + False + 0 + + + + True + Create + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 0 0 100 1 10 10 + + + 0 + False + False + + + + + + True + days in advance + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + + + + True + False + 0 + + + + True + Remind me + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + True + False + 0 0 100 1 10 10 + + + 0 + False + False + + + + + + True + days in advance + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + 0 + False + False + + + + + False + True + + + + + + True + Creation Options + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 2 + True + False + 0 + + + + True + True + No End + True + GTK_RELIEF_NORMAL + True + False + True + + + 2 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + rb_noend + + + + True + False + 0 + + + + True + End Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + GNOME_DATE_EDIT_24_HR + 7 + 19 + + + 0 + False + False + + + + + + + 2 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + False + False + True + rb_noend + + + + True + False + 0 + + + + True + Number of Occurences: + False + False + GTK_JUSTIFY_LEFT + False + False + 7.45058e-09 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + 2 + False + False + + + + + False + True + + + + + + True + End + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + 0.1 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + + True + Recurrence Frequency + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + False + True + + + + + + True + Recurrence Frequency + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + True + True + Record + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + REPLACEME with the Register control box + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + False + False + + + + + + + + + False + True + + + + + + True + Template Transactions + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + True + + + 0 + False + False + + + + + + + + True + Make Scheduled transaction + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 8 + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + Advanced... + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + False + 0 + + + + True + 3 + 2 + False + 0 + 0 + + + + True + Name: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 3 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Frequency: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 3 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Start Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 3 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + True + 0 + + + + True + + + + True + Daily + True + + + + + + True + Weekly + True + + + + + + True + Bi-Weekly + True + + + + + + True + Monthly + True + + + + + + True + Quarterly + True + + + + + + True + Yearly + True + + + + + + + 1 + 2 + 1 + 2 + fill + + + + + + 0 + False + False + + + + + + 2 + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + True + Never End + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + End Date: + True + GTK_RELIEF_NORMAL + False + False + True + never_end_button + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + Number of Occurrences: + True + GTK_RELIEF_NORMAL + False + False + True + never_end_button + + + 0 + False + False + + + + + + True + 10 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + True + False + + + + + 0 + False + False + + + + + + + + True + End + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + True + Since Last Run + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + + + + 4 + True + False + + + + True + What to do, what to do? + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + 38 + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.1 + + + + + + True + Creating transactions... + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + False + + + + + + + + + + True + Transaction Reminders + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + True + The listed Scheduled Transactions are to-be created soon. Select any which you would like to create now, and click -"Next" to create them. - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 11 - - 0 - False - False - - - - - GtkScrolledWindow - scrolledwindow19 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCTree - reminders_list - True - 3 - 153,121,80 - GTK_SELECTION_EXTENDED - True - GTK_SHADOW_IN - - - GtkLabel - CTree:title - label847882 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CTree:title - label847883 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CTree:title - label847884 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - - - GnomeDruidPageStandard - auto_create_notify_page - Auto-Created Transactions Notification - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - ac_vbox - False - 0 - - 0 - True - True - - - - Placeholder - - - - Placeholder - - - - - - GnomeDruidPageStandard - to_create_page - To-Create Transaction Preparation - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox7 - False - 0 - - 0 - True - True - - - - GtkHPaned - to_create_hpaned - 10 - 10 - 600 - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow16 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - True - False - - - - GtkCTree - to_create_list - True - 2 - 177,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CTree:title - label847893 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CTree:title - label847894 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkVBox - vbox176 - False - 0 - - True - True - - - - GtkHBox - hbox173 - False - 0 - - 0 - False - False +"Next" to create them. + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 11 + + + 0 + False + False + - - GtkLabel - label847965 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 3 - 0 - - 0 - False - False - - - - - GtkOptionMenu - disposition_opt - 3 - True - Create as scheduled -Ignore -Postpone - - 0 - - 0 - True - True - - - - - - GtkFrame - frame81 - 3 - - 0.1 - GTK_SHADOW_ETCHED_IN - 0 - True - True - + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - - GtkVBox - vbox176 - False - 0 - - - GtkScrolledWindow - scrolledwindow17 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - 0 - True - True - - - - GtkViewport - viewport2 - 2 - GTK_SHADOW_IN - - - GtkTable - variables_table - 2 - 2 - False - 2 - 2 - - - GtkLabel - label847869 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - label847870 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - + + True + True + True + False + False + True - + + + 0 + True + True + + + + + + + + + + True + Auto-Created Transactions Notification + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + + + + + + + + + + + + + True + To-Create Transaction Preparation + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + True + 600 - - GtkHBox - hbox175 - False - 0 - 0 - False - False + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + True + False + - - GtkLabel - label847967 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 3 - 3 - - 0 - False - False - - + + + True + False + 0 - - GtkStatusbar - to_create_status - 3 - - 0 - True - True - - + + + True + False + 0 + + + + True + Disposition? + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 3 + 0 + + + 0 + False + False + + + + + + 3 + True + True + 0 + + + + True + + + + True + Create as scheduled + True + + + + + + True + Ignore + True + + + + + + True + Postpone + True + + + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + 3 + True + 0.1 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + 2 + True + GTK_SHADOW_IN + + + + True + 1 + 2 + False + 2 + 2 + + + + True + Value + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 1 + 2 + 0 + 1 + + + + + + + True + Variable + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + + + + + + + + + + 0 + True + True + + + + + + True + False + 0 + + + + True + Value: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 3 + 3 + + + 0 + False + False + + + + + + 3 + True + True + + + 0 + True + True + + + + + 0 + False + False + + + + + + + + True + Variables + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + + + + True + True + + - + + 0 + True + True + + + + + + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + + True + Template Transaction (Read-Only) + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + True + True + + - - - - - GtkFrame - to_create_txn_reg_frame - - 0.05 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - Placeholder - - + + + + + True + Created Transaction Review + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + + + + + + + + + + + + + True + Obsolete Scheduled Transactions + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + True + The following scheduled transactions have expired. +Select those you wish to delete. + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 11 + + + 0 + False + False + + + + + + 3 + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_SPREAD + 8 + + + + True + True + True + Select All + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + Unselect All + True + GTK_RELIEF_NORMAL + + + + + 0 + False + False + + + + + + - - - GnomeDruidPageStandard - created_page - Created Transaction Review - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - created_vbox - False - 0 - - 0 - True - True - - - - Placeholder - - - - Placeholder - - - - - - GnomeDruidPageStandard - obsolete_page - Obsolete Scheduled Transactions - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox9 - False - 0 - - 0 - True - True - - - - GtkLabel - label847871 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 11 - - 0 - False - False - - - - - GtkScrolledWindow - scrolledwindow18 - 3 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - sx_obsolete_clist - True - 3 - 80,80,80 - GTK_SELECTION_EXTENDED - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label847872 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label847873 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label847874 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkHButtonBox - hbuttonbox8 - GTK_BUTTONBOX_SPREAD - 8 - 85 - 27 - 7 - 0 - - 0 - False - False - - - - GtkButton - select_all_button - True - True - - GTK_RELIEF_NORMAL - - - - GtkButton - unselect_all_button - True - True - - GTK_RELIEF_NORMAL - - - - - + - - GtkWindow - loan_druid_win - Mortgage/Loan Druid - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - False - True - True + + True + Mortgage/Loan Druid + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False - - GnomeDruid - loan_druid + + + 4 + True + False - - GnomeDruidPageStart - loan_intro_pg - Mortgage/Loan Repayment Setup - This is a step-by-step method of creating a loan repayment setup + + + True + GNOME_EDGE_START + Mortgage/Loan Repayment Setup + This is a step-by-step method of creating a loan repayment setup within GnuCash. In this Druid, you can input the parameters of your loan and its repayment and give the details of its payback. Using that information, the appropriate Scheduled Transactions will be created. If you make a mistake or want to make changes later, you can edit -the created Scheduled Transactions directly. - 255,255,255 - 0,0,0 - 25,25,112 - 255,255,255 - 255,255,255 - - - - GnomeDruidPageStandard - loan_info_pg - Loan Information - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox10 - 5 - False - 0 - - 0 - True - False - - - - GtkTable - param_table - 5 - 6 - 4 - False - 5 - 5 - - 0 - True - True - - - - GtkLabel - label847897 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847899 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847900 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 5 - 6 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847895 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - - GtkLabel - label847920 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkSpinButton - rem_spin - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 - 0 - 100 - 1 - 10 - 10 - - 3 - 4 - 5 - 6 - 0 - 0 - True - False - False - False - True - False - - - - - GtkHBox - hbox167 - False - 0 - - 1 - 2 - 5 - 6 - 0 - 0 - True - False - False - False - True - False - - - - GtkSpinButton - len_spin - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 - 0 - 100 - 1 - 10 - 10 - - 0 - True - True - - - - - GtkOptionMenu - len_opt - True - months -years - - 0 - - 0 - False - False - - - - - - GtkAlignment - alignment11 - 0 - 0.5 - 0.25 - 1 - - 1 - 4 - 4 - 5 - 0 - 0 - True - False - False - False - True - False - - - - Placeholder - - - - - GtkAlignment - alignment12 - 0 - 0.5 - 0.5 - 1 - - 1 - 2 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - GtkHBox - hbox170 - False - 0 - - - GtkSpinButton - irate_spin - True - 1 - 3 - True - GTK_UPDATE_ALWAYS - True - False - 1 - 0 - 100 - 1 - 10 - 10 - - 0 - True - True - - - - - GtkLabel - label847921 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - - - GtkLabel - label847898 - - GTK_JUSTIFY_CENTER - False - 1 - 7.45058e-09 - 0 - 0 - - 2 - 3 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - label847901 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 2 - 3 - 5 - 6 - 0 - 0 - True - False - False - False - True - False - - - - - GtkAlignment - alignment23 - 0.5 - 0.5 - 0.5 - 0.75 - - 1 - 4 - 3 - 4 - 0 - 0 - True - True - True - True - True - True - - - - GtkFrame - type_freq_frame - 3 - - 0.05 - GTK_SHADOW_ETCHED_IN - - - Placeholder - - - +the created Scheduled Transactions directly. + #ffffffffffff + #000000000000 + #191919197070 + #ffffffffffff + #ffffffffffff - - + - - GnomeDruidPageStandard - loan_opts_pg - Options - 255,255,255 - 25,25,112 - 255,255,255 + + + True + Loan Information + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 - - GtkVBox - GnomeDruidPageStandard:vbox - opt_vbox - False - 0 - - 0 - True - True - + + + 5 + True + False + 0 - - GtkLabel - label847903 - - GTK_JUSTIFY_CENTER - False - 0.05 - 0.5 - 0 - 10 - - 0 - False - False - - - - - GtkAlignment - alignment18 - 0.5 - 0.5 - 0.75 - 1 - - 0 - False - False - - - - GtkVBox - vbox174 - False - 0 - - - GtkCheckButton - opt_escrow_cb - True - - False - True - 0 - False - False - - + + 5 + True + 6 + 4 + False + 5 + 5 - - GtkAlignment - alignment19 - 0.5 - 0.5 - 0.75 - 1 - - 0 - False - False - - - - GtkHBox - opt_escrow_hbox - False - 0 - - - GtkLabel - label847963 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - 0 - False - False - - - - - Placeholder - - - - - - - - GtkAlignment - alignment20 - 0.5 - 0.5 - 0.9 - 1 - - 5 - False - False - - - - GtkHSeparator - hseparator1 - - - - - - - GnomeDruidPageStandard - repayment_pg - Repayment - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox12 - False - 0 - - 0 - True - True - - - - GtkTable - repay_table - 5 - 5 - 4 - False - 5 - 5 - - 5 - True - True - - - - GtkLabel - label847910 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847911 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847918 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847909 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847912 - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 2 - 3 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment13 - 0 - 0.5 - 1 - 1 - - 1 - 4 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - txn_title - True - True - True - 0 - - - - - - GtkAlignment - alignment14 - 0 - 0.5 - 1 - 1 - - 1 - 4 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - GtkEntry - amount_ent - True - True - True - 0 - - - - - - GtkAlignment - alignment21 - 0.5 - 0.5 - 0.5 - 0.9 - - 0 - 4 - 4 - 5 - 0 - 0 - False - True - True - True - True - True - - - - GtkFrame - freq_frame - 3 - - 0.05 - GTK_SHADOW_ETCHED_IN - - - Placeholder - - - - - - - - - GnomeDruidPageStandard - payment_pg - <repayment type> - 255,255,255 - 25,25,112 - 255,255,255 - - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox13 - False - 0 - - 0 - True - False - - - - GtkEventBox - eventbox1 - - 0 - True - True - - - - GtkVBox - vbox158 - False - 0 - - - GtkTable - pay_table - 5 - 6 - 4 - False - 5 - 5 - - 0 - False - True - - - - GtkLabel - label847916 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - pay_from_account_label - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847919 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - pay_escrow_to_label - - GTK_JUSTIFY_RIGHT - False - 1 - 0.5 - 0 - 0 - - 2 - 3 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkAlignment - alignment16 - 0 - 0.5 - 1 - 1 - - 1 - 4 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - pay_txn_title - True - True - True - 0 - - - - - - GtkAlignment - alignment17 - 0 - 0.5 - 1 - 1 - - 1 - 4 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - GnomeNumberEntry - pay_amt_gne - 10 - - - GtkEntry - GnomeEntry:entry - pay_amt_ent - True - True - True - 0 - - - - - - - GtkLabel - pay_escrow_from_label - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 5 - 6 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847975 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 2 - 3 - 5 - 6 - 0 - 0 - False - False - False - False - True - False - - - - - GtkCheckButton - pay_specify_source - True - - False - True - - 1 - 4 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkCheckButton - pay_use_escrow - True - - False - True - - 1 - 4 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - - GtkAlignment - alignment22 - 0.5 - 0.5 - 0.5 - 0.75 - - 0 - False - False - - - - GtkFrame - frame92 - 5 - - 0.05 - GTK_SHADOW_ETCHED_IN - - - GtkVBox - vbox159 - False - 0 - - - GtkRadioButton - pay_txn_part_rb - True - - False - True - rep_freq_opt - - 0 - False - False - - - - - GtkVBox - vbox160 - False - 0 - - 0 - False - False - - - - GtkRadioButton - pay_uniq_freq_rb - True - - False - True - rep_freq_opt - - 0 - False - False - + + True + Interest Rate: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Start Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + Length: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + fill + + + + + + + True + Amount: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + Loan Account: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 3 + 4 + 5 + 6 + + + + + + + True + False + 0 - - GtkAlignment - pay_freq_align - 1 - 0.5 - 0.95 - 1 - 0 - False - False + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 0 + True + True + - - Placeholder - + + + True + True + 0 + + + + True + + + + True + months + True + + + + + + True + years + True + + + + + + + 0 + False + False + + - + + 1 + 2 + 5 + 6 + + + + + + + True + 0 + 0.5 + 0.25 + 1 + + + + + + + 1 + 4 + 4 + 5 + + + + + + + True + 0 + 0.5 + 0.5 + 1 + + + + True + False + 0 + + + + True + True + 1 + 3 + True + GTK_UPDATE_ALWAYS + True + False + 1 0 100 1 10 10 + + + 0 + True + True + + + + + + True + % + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + 1 + 2 + 2 + 3 + + + + + + + True + Type: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 7.45058e-09 + 0 + 0 + + + 2 + 3 + 2 + 3 + + + + + + + True + Months Remaining: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 2 + 3 + 5 + 6 + + + + + + + True + 0.5 + 0.5 + 0.5 + 0.75 + + + + 3 + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + + True + Interest Rate Change Frequency + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + + + 1 + 4 + 3 + 4 + expand|shrink|fill + expand|shrink|fill + + - + + 0 + True + True + + - + - + + + + + True + Options + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + True + Do you... + False + False + GTK_JUSTIFY_CENTER + False + False + 0.05 + 0.5 + 0 + 10 + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 0.75 + 1 + + + + True + False + 0 + + + + True + True + ... utilize an escrow account for payments? + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 0.75 + 1 + + + + True + False + 0 + + + + True + Escrow Account: + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + False + + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 0.9 + 1 + + + + True + + + + + 5 + False + False + + + + + + + + + + True + Repayment + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + 5 + True + 5 + 4 + False + 5 + 5 + + + + True + Payment From: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Principal To: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + Name: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Amount: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Interest To: + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + 0 + 0.5 + 1 + 1 + + + + True + True + True + True + 0 + + True + * + False + + + + + 1 + 4 + 0 + 1 + + + + + + + True + 0 + 0.5 + 1 + 1 + + + + True + True + True + True + 0 + + True + * + False + + + + + 1 + 4 + 1 + 2 + fill + + + + + + + True + 0.5 + 0.5 + 0.5 + 0.9 + + + + 3 + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + + + + + True + Repayment Frequency + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + + + 0 + 4 + 4 + 5 + shrink|fill + expand|shrink|fill + + + + + 5 + True + True + + + + + + + + + + True + <repayment type> + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + True + + + + True + False + 0 + + + + 5 + True + 6 + 4 + False + 5 + 5 + + + + True + Amount: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Payment From: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + Name: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Payment To (Escrow): + False + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + + + 2 + 3 + 4 + 5 + fill + + + + + + + True + 0 + 0.5 + 1 + 1 + + + + True + True + True + True + 0 + + True + * + False + + + + + 1 + 4 + 0 + 1 + + + + + + + True + 0 + 0.5 + 1 + 1 + + + 1 + 4 + 1 + 2 + + + + + + + True + Payment From (Escrow): + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + fill + + + + + + + True + Payment To: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 2 + 3 + 5 + 6 + fill + + + + + + + True + True + Specify Source Account + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 4 + 3 + 4 + fill + + + + + + + True + True + Use Escrow Account + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 4 + 2 + 3 + fill + + + + + + 0 + False + True + + + + + + True + 0.5 + 0.5 + 0.5 + 0.75 + + + + 5 + True + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + False + 0 + + + + True + True + Part of Payment Transaction + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + Other + True + GTK_RELIEF_NORMAL + False + False + True + pay_txn_part_rb + + + 0 + False + False + + + + + + True + 1 + 0.5 + 0.95 + 1 + + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + + + True + Payment Frequency + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + + + 0 + False + False + + + + + + + 0 + True + True + + + + + + + + + + True + Review + #8a80081e5b2b + #8a80081ed718 + #888c407fd708 + + + + 16 + True + False + 0 + + + + True + False + 0 + + + + True + False + 0 + + + + True + False + 0 + + + + True + Range: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 5 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + True + 0 + + + + True + + + + True + Current Year + True + + + + + + True + Now + 1 Year + True + + + + + + True + Whole Loan + True + + + + + + True + Custom + True + + + + + + + 0 + True + False + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + 2 + True + False + 0.05 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 2 + 1 + False + 0 + 0 + + + + True + Start Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 5 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + End Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 5 + 5 + + + 0 + 1 + 1 + 2 + fill + + + + + + + + + True + Date Range + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 2 + True + True + + + + + 0 + False + False + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + - - GnomeDruidPageStandard - review_pg - Review - 255,255,255 - 25,25,112 - 255,255,255 + + True - - GtkVBox - GnomeDruidPageStandard:vbox - druid-vbox14 - False - 0 - - 0 - True - True - + + + True + Creation State + True + + + + True - - GtkVBox - vbox177 - False - 0 - 0 - True - True + + True + Ignore + True + + + + + True + gtk-stop + 4 + 0.5 + 0.5 + 0 + 0 + + + - - GtkHBox - hbox176 - False - 0 - - 0 - False - False - + + + True + Postpone + True + - - GtkHBox - hbox178 - False - 0 - - 0 - False - False + + + True + gnome-stock-timer-stop + 4 + 0.5 + 0.5 + 0 + 0 + - - - GtkLabel - label847973 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 5 - - 0 - False - False - - - - - GtkVBox - vbox178 - False - 0 - - 0 - True - True - - - - GtkOptionMenu - rev_range_opt - True - Current Year -Now + 1 Year -Whole Loan -Custom - - 0 - - 0 - True - False - - - + - - GtkFrame - rev_date_frame - 2 - False - - 0.05 - GTK_SHADOW_ETCHED_IN - - 2 - True - True + + + True + Create + True + + + + + True + gnome-stock-timer + 4 + 0.5 + 0.5 + 0 + 0 + - - - GtkTable - rev_date_range_table - 2 - 2 - False - 0 - 0 - - - GtkLabel - label847971 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 5 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label847972 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 5 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - - - GtkScrolledWindow - rev_scrollwin - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - Placeholder - - + - + - + - - GtkMenu - Since Last Run popup - - - GtkMenuItem - creation_state - - False - - - GtkMenu - creation_state_menu - - - GtkPixmapMenuItem - ignore - - activate - on_ignore_activate - Fri, 23 Aug 2002 22:16:45 GMT - - - False - GNOME_STOCK_MENU_STOP - - - - GtkPixmapMenuItem - postpone - - activate - on_postpone_activate - Fri, 23 Aug 2002 22:16:45 GMT - - - False - GNOME_STOCK_MENU_TIMER_STOP - - - - GtkPixmapMenuItem - create - - activate - on_create_activate - Fri, 23 Aug 2002 22:16:45 GMT - - - False - GNOME_STOCK_MENU_TIMER - - - - - - + diff --git a/src/gnome/gnc-splash.c b/src/gnome/gnc-splash.c index 9f7855c8f4..c042b4d75c 100644 --- a/src/gnome/gnc-splash.c +++ b/src/gnome/gnc-splash.c @@ -51,7 +51,7 @@ gnc_show_splash_screen (void) if (splash) return; - splash = gtk_window_new (GTK_WINDOW_DIALOG); + splash = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_signal_connect (GTK_OBJECT (splash), "destroy", GTK_SIGNAL_FUNC (splash_destroy_cb), NULL); diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c index f68c97d8cc..2b04e99dd3 100644 --- a/src/gnome/gnc-split-reg.c +++ b/src/gnome/gnc-split-reg.c @@ -31,6 +31,7 @@ #include #include +#include #include "gnc-split-reg.h" @@ -942,10 +943,6 @@ gnc_split_reg_paste_trans_cb (GtkWidget *w, gpointer data) gsr_emit_simple_signal( gsr, "paste_txn" ); } -/* Remove when porting to gtk2.0 */ -#define GTK_STOCK_CANCEL GNOME_STOCK_BUTTON_CANCEL -#define GTK_STOCK_DELETE "Delete" - void gsr_default_reinit_handler( GNCSplitReg *gsr, gpointer data ) { @@ -1890,6 +1887,7 @@ gsr_create_popup_menu( GNCSplitReg *gsr ) { GtkWidget *popup, *menuitem; GladeXML *xml; + GConfClient *client; xml = gnc_glade_xml_new( "register.glade", "register_popup" ); popup = glade_xml_get_widget( xml, "register_popup" ); @@ -1897,8 +1895,9 @@ gsr_create_popup_menu( GNCSplitReg *gsr ) gnc_glade_autoconnect_full_func, gsr ); + client = gconf_client_get_default (); /* Glade insists on making this a tearoff menu. */ - if (gnome_preferences_get_menus_have_tearoff()) { + if (gconf_client_get_string (client, "/desktop/gnome/interface/menus_have_tearoff", NULL)) { GtkMenuShell *ms = GTK_MENU_SHELL(popup); GtkWidget *tearoff; diff --git a/src/gnome/mainwindow-account-tree.c b/src/gnome/mainwindow-account-tree.c index d8ba39acd1..9031c24f9a 100644 --- a/src/gnome/mainwindow-account-tree.c +++ b/src/gnome/mainwindow-account-tree.c @@ -123,17 +123,8 @@ gnc_mainwin_account_tree_class_init (GNCMainWinAccountTreeClass *klass) gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); -#if 0 - gtk_object_class_add_signals(object_class, -#endif - - mainwinaccounttree_signals, - LAST_SIGNAL); - - klass->select_account = NULL; - klass->unselect_account = NULL; - klass->activate_account = NULL; } + static void gnc_mainwin_account_tree_init(GNCMainWinAccountTree *mwac_tree) { @@ -174,8 +165,8 @@ gnc_mainwin_account_tree_get_type () sizeof (GNCMainWinAccountTreeClass), (GtkClassInitFunc) gnc_mainwin_account_tree_class_init, (GtkObjectInitFunc) gnc_mainwin_account_tree_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL, + NULL, + NULL, (GtkClassInitFunc) NULL }; diff --git a/src/gnome/reconcile-list.c b/src/gnome/reconcile-list.c index 1a7d5d5e6f..af2f535867 100644 --- a/src/gnome/reconcile-list.c +++ b/src/gnome/reconcile-list.c @@ -215,10 +215,11 @@ gnc_reconcile_list_init (GNCReconcileList *list) list->first_fill = TRUE; list->query = NULL; - while (titles[list->num_columns] != NULL) + /* GNOME 2 Port (move that to clist creation and use GtkTreeView */ + /* while (titles[list->num_columns] != NULL) list->num_columns++; - gtk_clist_construct (clist, list->num_columns, titles); + gtk_clist_construct (clist, list->num_columns, titles); */ gtk_clist_set_shadow_type (clist, GTK_SHADOW_IN); gnc_reconcile_list_column_title(list, 0, titles[0]); @@ -300,12 +301,6 @@ gnc_reconcile_list_class_init (GNCReconcileListClass *klass) GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); -#if 0 - gtk_object_class_add_signals(object_class, -#endif - reconcile_list_signals, - LAST_SIGNAL); - object_class->destroy = gnc_reconcile_list_destroy; clist_class->select_row = gnc_reconcile_list_select_row; @@ -518,7 +513,7 @@ gnc_reconcile_list_get_needed_height (GNCReconcileList *list, gint num_rows) /* sync with gtkclist.c */ title_height = (clist->column_title_area.height + - (GTK_WIDGET(list)->style->klass->ythickness + + (GTK_WIDGET(list)->style->ythickness + GTK_CONTAINER(list)->border_width) * 2); list_height = (clist->row_height * num_rows) + (num_rows + 1); diff --git a/src/gnome/window-acct-tree.c b/src/gnome/window-acct-tree.c index c2637a85fa..e6b58f1143 100644 --- a/src/gnome/window-acct-tree.c +++ b/src/gnome/window-acct-tree.c @@ -253,8 +253,8 @@ gnc_acct_tree_view_new(GnomeMDIChild * child, gpointer user_data) g_free (name_id); g_free (name); - gtk_signal_connect(GTK_OBJECT(child), "destroy", - gnc_acct_tree_view_destroy, mc); + g_signal_connect(G_OBJECT(child), "destroy", + G_CALLBACK (gnc_acct_tree_view_destroy), mc); gnc_mdi_add_child (maininfo, mc); diff --git a/src/gnome/window-main-summarybar.c b/src/gnome/window-main-summarybar.c index a116637d45..6494c011a2 100644 --- a/src/gnome/window-main-summarybar.c +++ b/src/gnome/window-main-summarybar.c @@ -497,8 +497,8 @@ gnc_main_window_summary_new (void) { gtk_widget_show (retval->totals_combo); gtk_widget_show (retval->hbox); - gtk_signal_connect(GTK_OBJECT(retval->hbox), "destroy", - gnc_main_window_summary_destroy_cb, retval); + g_signal_connect(G_OBJECT(retval->hbox), "destroy", + G_CALLBACK(gnc_main_window_summary_destroy_cb), retval); gnc_main_window_summary_refresh(retval); diff --git a/src/gnome/window-main.c b/src/gnome/window-main.c index 4e05b46915..20998e8978 100644 --- a/src/gnome/window-main.c +++ b/src/gnome/window-main.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -138,12 +139,13 @@ gnc_main_window_app_created_cb(GnomeMDI * mdi, GnomeApp * app, gpointer data) { GtkWidget * summarybar; GtkWidget * statusbar; + GConfClient * client; /* add the summarybar */ summarybar = gnc_main_window_summary_new(); { - GnomeDockItemBehavior behavior; + BonoboDockItemBehavior behavior; GtkWidget *item; /* This is essentially gnome_app_add_docked, but without using @@ -152,24 +154,25 @@ gnc_main_window_app_created_cb(GnomeMDI * mdi, GnomeApp * app, * layout config before we've had a chance to read it. */ - behavior = (GNOME_DOCK_ITEM_BEH_EXCLUSIVE | - GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL); - if (!gnome_preferences_get_toolbar_detachable ()) - behavior |= GNOME_DOCK_ITEM_BEH_LOCKED; + behavior = (BONOBO_DOCK_ITEM_BEH_EXCLUSIVE | + BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL); + client = gconf_client_get_default (); + if (!gconf_client_get_bool (client, "/desktop/gnome/interface/toolbar_detachable", NULL)) + behavior |= BONOBO_DOCK_ITEM_BEH_LOCKED; - item = gnome_dock_item_new("Summary Bar", behavior); + item = bonobo_dock_item_new("Summary Bar", behavior); gtk_container_add( GTK_CONTAINER (item), summarybar ); if (app->layout) { - gnome_dock_layout_add_item( app->layout, - GNOME_DOCK_ITEM(item), - GNOME_DOCK_TOP, + bonobo_dock_layout_add_item( app->layout, + BONOBO_DOCK_ITEM(item), + BONOBO_DOCK_TOP, 2, 0, 0 ); } else { - gnome_dock_add_item( GNOME_DOCK(app->dock), - GNOME_DOCK_ITEM(item), - GNOME_DOCK_TOP, + bonobo_dock_add_item( BONOBO_DOCK(app->dock), + BONOBO_DOCK_ITEM(item), + BONOBO_DOCK_TOP, 2, 0, 0, FALSE ); } } @@ -380,7 +383,7 @@ static void gnc_main_window_flip_summary_bar_cb(GtkWidget * widget, gpointer data) { GNCMDIChildInfo * mc; - GnomeDockItem *summarybar; + BonoboDockItem *summarybar; guint dc1, dc2, dc3, dc4; static gboolean in_sync = FALSE; @@ -399,7 +402,7 @@ gnc_main_window_flip_summary_bar_cb(GtkWidget * widget, gpointer data) if (!mc || !mc->app) return; - summarybar = gnome_dock_get_item_by_name(GNOME_DOCK(mc->app->dock), + summarybar = bonobo_dock_get_item_by_name(BONOBO_DOCK(mc->app->dock), "Summary Bar", &dc1, &dc2, &dc3, &dc4); if (!summarybar) return; @@ -722,8 +725,9 @@ gnc_main_window_about_cb (GtkWidget *widget, gpointer data) } else { ver_string = strdup(VERSION); } - about = gnome_about_new ("GnuCash", ver_string, copyright, - authors, message, NULL); + /* GNOME 2 Port (Add Documenters and Translators) */ + about = gnome_about_new ("GnuCash", ver_string, copyright, message, + authors, NULL, NULL, NULL); g_free(ver_string); gnome_dialog_set_parent (GNOME_DIALOG(about), diff --git a/src/network-utils/gnc-http.c b/src/network-utils/gnc-http.c index 557f3fb6cd..027156f906 100644 --- a/src/network-utils/gnc-http.c +++ b/src/network-utils/gnc-http.c @@ -69,10 +69,17 @@ struct request_info { GncHTTPRequestCB callback; gpointer callback_data; }; +#endif gnc_http * gnc_http_new(void) { - gnc_http * ret = g_new0(struct _gnc_http, 1); + return NULL; +} + +#if 0 +gnc_http * +gnc_http_new(void) { + gnc_http * ret = g_new0(struct _gnc_http, 1); ret->requests = NULL; ret->callback_tag = 0; ret->callback_enabled = FALSE; diff --git a/src/register/register-gnome/combocell-gnome.c b/src/register/register-gnome/combocell-gnome.c index 2eb24df701..e7f2cff713 100644 --- a/src/register/register-gnome/combocell-gnome.c +++ b/src/register/register-gnome/combocell-gnome.c @@ -199,9 +199,6 @@ combo_disconnect_signals (ComboCell *cell) if (!box->signals_connected) return; - if (GTK_OBJECT_DESTROYED (GTK_OBJECT(box->item_list))) - return; - gtk_signal_disconnect_by_data (GTK_OBJECT(box->item_list), cell); box->signals_connected = FALSE; @@ -215,9 +212,6 @@ combo_connect_signals (ComboCell *cell) if (box->signals_connected) return; - if (GTK_OBJECT_DESTROYED(GTK_OBJECT(box->item_list))) - return; - gtk_signal_connect (GTK_OBJECT(box->item_list), "select_item", GTK_SIGNAL_FUNC(select_item_cb), cell); diff --git a/src/register/register-gnome/datecell-gnome.c b/src/register/register-gnome/datecell-gnome.c index 1885746a1d..68ae9e6746 100644 --- a/src/register/register-gnome/datecell-gnome.c +++ b/src/register/register-gnome/datecell-gnome.c @@ -250,9 +250,6 @@ date_picker_disconnect_signals (DateCell *cell) if (!box->signals_connected) return; - if (GTK_OBJECT_DESTROYED (GTK_OBJECT (box->date_picker))) - return; - gtk_signal_disconnect_by_data (GTK_OBJECT (box->date_picker), cell); box->signals_connected = FALSE; @@ -266,9 +263,6 @@ date_picker_connect_signals (DateCell *cell) if (box->signals_connected) return; - if (GTK_OBJECT_DESTROYED (GTK_OBJECT (box->date_picker))) - return; - gtk_signal_connect (GTK_OBJECT(box->date_picker), "date_selected", GTK_SIGNAL_FUNC(date_selected_cb), cell); diff --git a/src/register/register-gnome/gnucash-color.c b/src/register/register-gnome/gnucash-color.c index 33b59a97d3..fc9ac11503 100644 --- a/src/register/register-gnome/gnucash-color.c +++ b/src/register/register-gnome/gnucash-color.c @@ -43,7 +43,6 @@ #include "gnucash-color.h" static int color_inited; -static GdkColorContext *gnucash_color_context; /* Public Colors */ GdkColor gn_white, gn_black, gn_light_gray; @@ -73,40 +72,47 @@ color_equal (gconstpointer v, gconstpointer w) gulong gnucash_color_alloc (gushort red, gushort green, gushort blue) { - int failed; - + GdkColormap *colormap = gtk_widget_get_default_colormap (); + GdkColor *c; + if (!color_inited) gnucash_color_init (); - return gdk_color_context_get_pixel (gnucash_color_context, - red, green, blue, &failed); + c = g_new0 (GdkColor, 1); + c->red = red; + c->green = green; + c->blue = blue; + + g_return_val_if_fail (gdk_colormap_alloc_color (colormap, c, FALSE, TRUE), 0); + + return c->pixel; } void gnucash_color_alloc_gdk (GdkColor *c) { - int failed; + GdkColormap *colormap = gtk_widget_get_default_colormap (); g_return_if_fail (c != NULL); - c->pixel = gdk_color_context_get_pixel (gnucash_color_context, c->red, - c->green, c->blue, &failed); + g_assert (gdk_colormap_alloc_color (colormap, c, + FALSE, TRUE)); } void gnucash_color_alloc_name (const char *name, GdkColor *c) { - int failed; + GdkColormap *colormap = gtk_widget_get_default_colormap (); g_return_if_fail (name != NULL); g_return_if_fail (c != NULL); gdk_color_parse (name, c); c->pixel = 0; - c->pixel = gdk_color_context_get_pixel (gnucash_color_context, c->red, - c->green, c->blue, &failed); + g_assert (gdk_colormap_alloc_color (colormap, c, + FALSE, TRUE)); } @@ -135,9 +141,7 @@ gnucash_color_argb_to_gdk (guint32 argb) color->green = argb & 0xff00; color->blue = (argb & 0xff) << 8; - color->pixel = gnucash_color_alloc(color->red, - color->green, - color->blue); + gnucash_color_alloc_gdk(color); g_hash_table_insert (color_hash_table, newkey, color); @@ -150,11 +154,6 @@ gnucash_color_init (void) { GdkColormap *colormap = gtk_widget_get_default_colormap (); - /* Initialize the color context */ - gnucash_color_context = - gdk_color_context_new (gtk_widget_get_default_visual (), - colormap); - /* Allocate the default colors */ gdk_color_white (colormap, &gn_white); gdk_color_black (colormap, &gn_black); diff --git a/src/register/register-gnome/gnucash-date-picker.c b/src/register/register-gnome/gnucash-date-picker.c index 20899baa15..f748ce81c3 100644 --- a/src/register/register-gnome/gnucash-date-picker.c +++ b/src/register/register-gnome/gnucash-date-picker.c @@ -141,7 +141,7 @@ gnc_date_picker_class_init (GNCDatePickerClass *date_picker_class) gnc_date_picker_signals[DATE_PICKED] = gtk_signal_new("date_picked", GTK_RUN_LAST, - object_class->type, + GTK_CLASS_TYPE(object_class), GTK_SIGNAL_OFFSET(GNCDatePickerClass, date_picked), gtk_signal_default_marshaller, @@ -155,13 +155,7 @@ gnc_date_picker_class_init (GNCDatePickerClass *date_picker_class) key_press_event), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, - GTK_TYPE_GDK_EVENT); - -#if 0 - gtk_object_class_add_signals (object_class, - gnc_date_picker_signals, - LAST_SIGNAL); -#endif + GDK_TYPE_EVENT); date_picker_class->date_selected = NULL; date_picker_class->date_picked = NULL; diff --git a/src/register/register-gnome/gnucash-grid.c b/src/register/register-gnome/gnucash-grid.c index 5419765570..b43bc156d2 100644 --- a/src/register/register-gnome/gnucash-grid.c +++ b/src/register/register-gnome/gnucash-grid.c @@ -116,8 +116,10 @@ gnucash_grid_update (GnomeCanvasItem *item, double *affine, item->x2 = INT_MAX/2 -1; item->y2 = INT_MAX/2 -1; - gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), - item); + /* GNOME 2 Port (Maybe there is some special handling needed) */ + /*gnome_canvas_group_child_bounds (GNOME_CANVAS_GROUP (item->parent), + item);*/ + gnome_canvas_item_request_update (item); } diff --git a/src/register/register-gnome/gnucash-item-edit.c b/src/register/register-gnome/gnucash-item-edit.c index 3510137e7e..623e653c41 100644 --- a/src/register/register-gnome/gnucash-item-edit.c +++ b/src/register/register-gnome/gnucash-item-edit.c @@ -153,7 +153,7 @@ item_edit_draw_info (ItemEdit *item_edit, int x, int y, TextDrawInfo *info) int start_pos, end_pos; int toggle_space, cursor_pos; int xoffset; - char *text; + const gchar *text; style = item_edit->style; table = item_edit->sheet->table; @@ -173,11 +173,8 @@ item_edit_draw_info (ItemEdit *item_edit, int x, int y, TextDrawInfo *info) info->fg_color2 = &gn_white; editable = GTK_EDITABLE (item_edit->editor); - cursor_pos = editable->current_pos; - start_pos = MIN (editable->selection_start_pos, - editable->selection_end_pos); - end_pos = MAX (editable->selection_start_pos, - editable->selection_end_pos); + cursor_pos = gtk_editable_get_position (editable); + gtk_editable_get_selection_bounds (editable, &start_pos, &end_pos); text = gtk_entry_get_text (GTK_ENTRY (item_edit->editor)); text_len = strlen (text); @@ -735,8 +732,7 @@ item_edit_destroy (GtkObject *object) g_free(item_edit->clipboard); item_edit->clipboard = NULL; - if (!GTK_OBJECT_DESTROYED(edit_obj)) - gtk_signal_disconnect_by_data (edit_obj, item_edit); + gtk_signal_disconnect_by_data (edit_obj, item_edit); gdk_gc_destroy (item_edit->gc); @@ -828,11 +824,8 @@ item_edit_set_cursor_pos (ItemEdit *item_edit, { gint current_pos, start_sel, end_sel; - current_pos = editable->current_pos; - start_sel = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX(editable->selection_start_pos, - editable->selection_end_pos); + current_pos = gtk_editable_get_position (editable); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); if (start_sel == end_sel) { @@ -968,10 +961,7 @@ item_edit_claim_selection (ItemEdit *item_edit, guint32 time) editable = GTK_EDITABLE (item_edit->editor); - start_sel = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX(editable->selection_start_pos, - editable->selection_end_pos); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); if (start_sel != end_sel) { @@ -1004,13 +994,8 @@ item_edit_cut_copy_clipboard (ItemEdit *item_edit, guint32 time, gboolean cut) editable = GTK_EDITABLE (item_edit->editor); - start_sel = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX(editable->selection_start_pos, - editable->selection_end_pos); - - if (start_sel == end_sel) - return; + if (!gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel)) + return; g_free(item_edit->clipboard); @@ -1631,10 +1616,7 @@ item_edit_selection_get (ItemEdit *item_edit, if (selection_data->selection == GDK_SELECTION_PRIMARY) { - start_pos = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_pos = MAX(editable->selection_start_pos, - editable->selection_end_pos); + gtk_editable_get_selection_bounds (editable, &start_pos, &end_pos); str = gtk_editable_get_chars(editable, start_pos, end_pos); } @@ -1689,6 +1671,7 @@ item_edit_selection_received (ItemEdit *item_edit, gboolean reselect; gint old_pos; gint tmp_pos; + gint start_sel, end_sel; enum {INVALID, STRING, CTEXT} type; g_return_if_fail(item_edit != NULL); @@ -1717,20 +1700,16 @@ item_edit_selection_received (ItemEdit *item_edit, reselect = FALSE; - if ((editable->selection_start_pos != editable->selection_end_pos) && + if (gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel) && (!item_edit->has_selection || (selection_data->selection == clipboard_atom))) { reselect = TRUE; - gtk_editable_delete_text(editable, - MIN(editable->selection_start_pos, - editable->selection_end_pos), - MAX(editable->selection_start_pos, - editable->selection_end_pos)); + gtk_editable_delete_text(editable, start_sel, end_sel); } - tmp_pos = old_pos = editable->current_pos; + tmp_pos = old_pos = gtk_editable_get_position (editable); switch (type) { @@ -1775,7 +1754,7 @@ item_edit_selection_received (ItemEdit *item_edit, if (!reselect) return; - gtk_editable_select_region(editable, old_pos, editable->current_pos); + gtk_editable_select_region(editable, old_pos, gtk_editable_get_position (editable)); } diff --git a/src/register/register-gnome/gnucash-item-edit.h b/src/register/register-gnome/gnucash-item-edit.h index 8bdf41734a..1ea909dbd8 100644 --- a/src/register/register-gnome/gnucash-item-edit.h +++ b/src/register/register-gnome/gnucash-item-edit.h @@ -26,6 +26,8 @@ #include "gnucash-item-list.h" #include "gnucash-sheet.h" +/* Need GNOME 2 port */ +#undef USE_XIM #define ITEM_EDIT(obj) (GTK_CHECK_CAST((obj), item_edit_get_type (), ItemEdit)) #define ITEM_EDIT_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), item_edit_get_type (), ItemEditClass)) diff --git a/src/register/register-gnome/gnucash-item-list.c b/src/register/register-gnome/gnucash-item-list.c index a4b7328f04..87e26d2dd6 100644 --- a/src/register/register-gnome/gnucash-item-list.c +++ b/src/register/register-gnome/gnucash-item-list.c @@ -292,7 +292,7 @@ gnc_item_list_class_init(GNCItemListClass *item_list_class) key_press_event), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, - GTK_TYPE_GDK_EVENT); + GDK_TYPE_EVENT); #if 0 gtk_object_class_add_signals(object_class, diff --git a/src/register/register-gnome/gnucash-sheet.c b/src/register/register-gnome/gnucash-sheet.c index 8723c0888a..7c6415e6d2 100644 --- a/src/register/register-gnome/gnucash-sheet.c +++ b/src/register/register-gnome/gnucash-sheet.c @@ -720,11 +720,8 @@ gnucash_sheet_modify_current_cell (GnucashSheet *sheet, const gchar *new_text) editable = GTK_EDITABLE(sheet->entry); - cursor_position = editable->current_pos; - start_sel = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX(editable->selection_start_pos, - editable->selection_end_pos); + cursor_position = gtk_editable_get_position (editable); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); new_text_len = gnc_mbstowcs (&new_text_wc, new_text); if (new_text_len < 0) @@ -868,10 +865,7 @@ gnucash_sheet_insert_cb (GtkWidget *widget, editable = GTK_EDITABLE (sheet->entry); - start_sel = MIN (editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX (editable->selection_start_pos, - editable->selection_end_pos); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); retval = gnc_table_modify_update (table, virt_loc, change_text_w, change_text_len, @@ -979,10 +973,7 @@ gnucash_sheet_delete_cb (GtkWidget *widget, editable = GTK_EDITABLE (sheet->entry); - start_sel = MIN (editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX (editable->selection_start_pos, - editable->selection_end_pos); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); retval = gnc_table_modify_update (table, virt_loc, NULL, 0, @@ -1219,13 +1210,15 @@ static void gnucash_sheet_check_grab (GnucashSheet *sheet) { GdkModifierType mods; + GdkDevice *device; if (!sheet->grabbed) return; - gdk_input_window_get_pointer(GTK_WIDGET(sheet)->window, - GDK_CORE_POINTER, NULL, NULL, - NULL, NULL, NULL, &mods); + device = gdk_device_get_core_pointer (); + + gdk_device_get_state (device, GTK_WIDGET(sheet)->window, + 0, &mods); if (!(mods & GDK_BUTTON1_MASK)) { @@ -1346,7 +1339,7 @@ gnucash_button_press_event (GtkWidget *widget, GdkEventButton *event) if (do_popup) gnome_popup_menu_do_popup_modal (sheet->popup, NULL, NULL, event, - sheet->popup_data); + sheet->popup_data, widget); return TRUE; } @@ -1375,7 +1368,7 @@ gnucash_button_press_event (GtkWidget *widget, GdkEventButton *event) if (do_popup) gnome_popup_menu_do_popup_modal - (sheet->popup, NULL, NULL, event, sheet->popup_data); + (sheet->popup, NULL, NULL, event, sheet->popup_data, widget); return TRUE; } @@ -1501,11 +1494,8 @@ gnucash_sheet_direct_event(GnucashSheet *sheet, GdkEvent *event) editable = GTK_EDITABLE(sheet->entry); - cursor_position = editable->current_pos; - start_sel = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX(editable->selection_start_pos, - editable->selection_end_pos); + cursor_position = gtk_editable_get_position (editable); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); new_position = cursor_position; new_start = start_sel; @@ -1705,15 +1695,12 @@ gnucash_sheet_key_press_event (GtkWidget *widget, GdkEventKey *event) editable = GTK_EDITABLE(sheet->entry); - current_pos = editable->current_pos; + current_pos = gtk_editable_get_position (editable); extend_selection = event->state & GDK_SHIFT_MASK; if (extend_selection && set_selection) { - start_sel = MIN(editable->selection_start_pos, - editable->selection_end_pos); - end_sel = MAX(editable->selection_start_pos, - editable->selection_end_pos); + gtk_editable_get_selection_bounds (editable, &start_sel, &end_sel); } else { @@ -1727,7 +1714,7 @@ gnucash_sheet_key_press_event (GtkWidget *widget, GdkEventKey *event) sheet->input_cancelled = FALSE; - new_pos = editable->current_pos; + new_pos = gtk_editable_get_position (editable); if (extend_selection && set_selection) { diff --git a/src/register/register-gnome/table-gnome.c b/src/register/register-gnome/table-gnome.c index b44cdf8c00..8a16317eda 100644 --- a/src/register/register-gnome/table-gnome.c +++ b/src/register/register-gnome/table-gnome.c @@ -69,8 +69,7 @@ gnc_table_save_state (Table *table) widths = gnc_header_widths_new (); - if (!GTK_OBJECT_DESTROYED(GTK_OBJECT(sheet))) - gnucash_sheet_get_header_widths (sheet, widths); + gnucash_sheet_get_header_widths (sheet, widths); alist = SCM_EOL; if (gnc_lookup_boolean_option("_+Advanced", "Save Window Geometry", TRUE)) diff --git a/src/report/report-gnome/dialog-column-view.c b/src/report/report-gnome/dialog-column-view.c index 1aa31ab1ab..70dfb449ca 100644 --- a/src/report/report-gnome/dialog-column-view.c +++ b/src/report/report-gnome/dialog-column-view.c @@ -275,10 +275,10 @@ gnc_column_view_edit_options(SCM options, SCM view) { scm_protect_object(r->available_list); scm_protect_object(r->contents_list); - gtk_signal_connect(GTK_OBJECT(r->available), "select_row", - gnc_column_view_select_avail_cb, (gpointer)r); - gtk_signal_connect(GTK_OBJECT(r->contents), "select_row", - gnc_column_view_select_contents_cb, (gpointer)r); + g_signal_connect(G_OBJECT(r->available), "select_row", + G_CALLBACK (gnc_column_view_select_avail_cb), (gpointer)r); + g_signal_connect(G_OBJECT(r->contents), "select_row", + G_CALLBACK (gnc_column_view_select_contents_cb), (gpointer)r); update_display_lists(r); diff --git a/src/report/report-gnome/window-report.c b/src/report/report-gnome/window-report.c index 15822a0958..7d0e07bd67 100644 --- a/src/report/report-gnome/window-report.c +++ b/src/report/report-gnome/window-report.c @@ -183,8 +183,8 @@ gnc_report_window_view_new(GnomeMDIChild * child, gpointer user_data) /* make sure menu entry and label get refreshed */ gnome_mdi_child_set_name(child, child->name); - gtk_signal_connect(GTK_OBJECT(child), "destroy", - gnc_report_window_view_destroy, mc); + g_signal_connect(G_OBJECT(child), "destroy", + G_CALLBACK (gnc_report_window_view_destroy), mc); gnc_report_window_create_menu(win, mc); gnc_report_window_create_toolbar(win, mc);