Rename the widget template API
The macros and functions are inconsistently named, and are not tied to the "template" concept - to the point that it seems plausible to use them without setting the template. The new naming scheme is as follows: gtk_widget_class_bind_template_child_full gtk_widget_class_bind_template_callback_full With the convenience macros: gtk_widget_class_bind_template_child gtk_widget_class_bind_template_child_internal gtk_widget_class_bind_template_callback https://bugzilla.gnome.org/show_bug.cgi?id=700898 https://bugzilla.gnome.org/show_bug.cgi?id=700896
This commit is contained in:
Emmanuele Bassi
committed by
Matthias Clasen
Matthias Clasen
parent
62aa54f536
commit
89ae3524a3
@ -480,86 +480,86 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
|
||||
"/org/gtk/libgtk/gtkprintunixdialog.ui");
|
||||
|
||||
/* GtkTreeView / GtkTreeModel */
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_treeview);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_list);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_list_filter);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_setup_list);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, custom_paper_list);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_icon_column);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_name_column);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_location_column);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_status_column);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_icon_renderer);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_name_renderer);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_location_renderer);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, printer_status_renderer);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_treeview);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_list);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_list_filter);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_setup_list);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, custom_paper_list);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_icon_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_name_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_location_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_status_column);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_icon_renderer);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_name_renderer);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_location_renderer);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, printer_status_renderer);
|
||||
|
||||
/* General Widgetry */
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, notebook);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, current_page_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, selection_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, range_table);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_range_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_range_entry);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, copies_spin);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, collate_check);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, reverse_check);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, collate_image);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_layout_preview);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, scale_spin);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, page_set_combo);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_now_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_at_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_at_entry);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, print_hold_radio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, preview_button);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_size_combo);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_size_combo_label);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_size_renderer);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, orientation_combo);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, orientation_combo_label);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, conflicts_widget);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, job_page);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, finishing_table);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, finishing_page);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, image_quality_table);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, image_quality_page);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, color_table);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, color_page);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, advanced_vbox);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, advanced_page);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, extension_point);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, notebook);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, all_pages_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, current_page_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, selection_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, range_table);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_range_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_range_entry);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, copies_spin);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, collate_check);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, reverse_check);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, collate_image);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_layout_preview);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, scale_spin);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, page_set_combo);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_now_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_at_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_at_entry);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, print_hold_radio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, preview_button);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_size_combo);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_size_combo_label);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_size_renderer);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, orientation_combo);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, orientation_combo_label);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, conflicts_widget);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, job_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, finishing_table);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, finishing_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, image_quality_table);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, image_quality_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, color_table);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, color_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, advanced_vbox);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, advanced_page);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, extension_point);
|
||||
|
||||
/* GtkPrinterOptionWidgets... */
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, pages_per_sheet);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, duplex);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_type);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, paper_source);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, output_tray);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, job_prio);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, billing_info);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, cover_before);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, cover_after);
|
||||
gtk_widget_class_bind_child (widget_class, GtkPrintUnixDialog, number_up_layout);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, pages_per_sheet);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, duplex);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_type);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, paper_source);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, output_tray);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, job_prio);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, billing_info);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, cover_before);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, cover_after);
|
||||
gtk_widget_class_bind_template_child (widget_class, GtkPrintUnixDialog, number_up_layout);
|
||||
|
||||
/* Callbacks handled in the UI */
|
||||
gtk_widget_class_bind_callback (widget_class, gtk_print_unix_dialog_destroy);
|
||||
gtk_widget_class_bind_callback (widget_class, redraw_page_layout_preview);
|
||||
gtk_widget_class_bind_callback (widget_class, error_dialogs);
|
||||
gtk_widget_class_bind_callback (widget_class, emit_ok_response);
|
||||
gtk_widget_class_bind_callback (widget_class, selected_printer_changed);
|
||||
gtk_widget_class_bind_callback (widget_class, update_page_range_entry_sensitivity);
|
||||
gtk_widget_class_bind_callback (widget_class, update_print_at_entry_sensitivity);
|
||||
gtk_widget_class_bind_callback (widget_class, update_print_at_option);
|
||||
gtk_widget_class_bind_callback (widget_class, update_dialog_from_capabilities);
|
||||
gtk_widget_class_bind_callback (widget_class, update_collate_icon);
|
||||
gtk_widget_class_bind_callback (widget_class, draw_collate_cb);
|
||||
gtk_widget_class_bind_callback (widget_class, redraw_page_layout_preview);
|
||||
gtk_widget_class_bind_callback (widget_class, update_number_up_layout);
|
||||
gtk_widget_class_bind_callback (widget_class, redraw_page_layout_preview);
|
||||
gtk_widget_class_bind_callback (widget_class, draw_page_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, gtk_print_unix_dialog_destroy);
|
||||
gtk_widget_class_bind_template_callback (widget_class, redraw_page_layout_preview);
|
||||
gtk_widget_class_bind_template_callback (widget_class, error_dialogs);
|
||||
gtk_widget_class_bind_template_callback (widget_class, emit_ok_response);
|
||||
gtk_widget_class_bind_template_callback (widget_class, selected_printer_changed);
|
||||
gtk_widget_class_bind_template_callback (widget_class, update_page_range_entry_sensitivity);
|
||||
gtk_widget_class_bind_template_callback (widget_class, update_print_at_entry_sensitivity);
|
||||
gtk_widget_class_bind_template_callback (widget_class, update_print_at_option);
|
||||
gtk_widget_class_bind_template_callback (widget_class, update_dialog_from_capabilities);
|
||||
gtk_widget_class_bind_template_callback (widget_class, update_collate_icon);
|
||||
gtk_widget_class_bind_template_callback (widget_class, draw_collate_cb);
|
||||
gtk_widget_class_bind_template_callback (widget_class, redraw_page_layout_preview);
|
||||
gtk_widget_class_bind_template_callback (widget_class, update_number_up_layout);
|
||||
gtk_widget_class_bind_template_callback (widget_class, redraw_page_layout_preview);
|
||||
gtk_widget_class_bind_template_callback (widget_class, draw_page_cb);
|
||||
}
|
||||
|
||||
/* Returns a toplevel GtkWindow, or NULL if none */
|
||||
|
||||
Reference in New Issue
Block a user