diff options
| author | Alexander Larsson <alexl@redhat.com> | 2006-06-07 15:09:03 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2006-06-07 15:09:03 +0000 |
| commit | 9bea38595fcd9b4e9f55de3dcd5199dab930e713 (patch) | |
| tree | 1c5d2d561965a275c566abc8f1a083cc5cf46976 /gtk/gtkprintoperation.h | |
| parent | 36f7ed300ad786fc6ba88e9c7a7d771c689af06e (diff) | |
| download | gtk+-9bea38595fcd9b4e9f55de3dcd5199dab930e713.tar.gz | |
Clean up APIs: Make async a setting instead of separate calls. Combine
2006-06-07 Alexander Larsson <alexl@redhat.com>
* gtk/gtk.symbols:
* gtk/gtkprintoperation-private.h:
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintoperation.[ch]:
Clean up APIs:
Make async a setting instead of separate calls.
Combine settings like show_dialog, show_preview and pdf_target into
an action enum that you pass to gtk_print_dialog_run().
* tests/print-editor.c:
* tests/testnouiprint.c:
* tests/testprint.c:
* demos/gtk-demo/printing.c:
Update to new APIs
Diffstat (limited to 'gtk/gtkprintoperation.h')
| -rw-r--r-- | gtk/gtkprintoperation.h | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index 09ae769cb4..ac144f4ff3 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/gtkprintoperation.h @@ -56,6 +56,22 @@ typedef enum { GTK_PRINT_STATUS_FINISHED_ABORTED } GtkPrintStatus; +typedef enum { + GTK_PRINT_OPERATION_RESULT_ERROR, + GTK_PRINT_OPERATION_RESULT_APPLY, + GTK_PRINT_OPERATION_RESULT_CANCEL, + GTK_PRINT_OPERATION_RESULT_PREVIEW, + GTK_PRINT_OPERATION_RESULT_IN_PROGRESS +} GtkPrintOperationResult; + +typedef enum { + GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, + GTK_PRINT_OPERATION_ACTION_PRINT, + GTK_PRINT_OPERATION_ACTION_PREVIEW, + GTK_PRINT_OPERATION_ACTION_EXPORT, +} GtkPrintOperationAction; + + struct _GtkPrintOperation { GObject parent_instance; @@ -67,6 +83,8 @@ struct _GtkPrintOperationClass { GObjectClass parent_class; + void (*done) (GtkPrintOperation *operation, + GtkPrintOperationResult result); void (*begin_print) (GtkPrintOperation *operation, GtkPrintContext *context); gboolean (*paginate) (GtkPrintOperation *operation, @@ -102,13 +120,6 @@ struct _GtkPrintOperationClass void (*_gtk_reserved7) (void); }; -typedef enum { - GTK_PRINT_OPERATION_RESULT_ERROR, - GTK_PRINT_OPERATION_RESULT_APPLY, - GTK_PRINT_OPERATION_RESULT_CANCEL, - GTK_PRINT_OPERATION_RESULT_PREVIEW -} GtkPrintOperationResult; - #define GTK_PRINT_ERROR gtk_print_error_quark () typedef enum @@ -138,23 +149,21 @@ void gtk_print_operation_set_use_full_page (GtkPrintOper gboolean full_page); void gtk_print_operation_set_unit (GtkPrintOperation *op, GtkUnit unit); -void gtk_print_operation_set_show_dialog (GtkPrintOperation *op, - gboolean show_dialog); -void gtk_print_operation_set_show_preview (GtkPrintOperation *op, - gboolean show_preview); void gtk_print_operation_set_pdf_target (GtkPrintOperation *op, const gchar *filename); void gtk_print_operation_set_track_print_status (GtkPrintOperation *op, gboolean track_status); void gtk_print_operation_set_show_progress (GtkPrintOperation *op, gboolean show_progress); +void gtk_print_operation_set_allow_async (GtkPrintOperation *op, + gboolean allow_async); void gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op, const gchar *label); GtkPrintOperationResult gtk_print_operation_run (GtkPrintOperation *op, + GtkPrintOperationAction action, GtkWindow *parent, GError **error); -void gtk_print_operation_run_preview (GtkPrintOperation *op, - GtkWindow *parent); +GError * gtk_print_operation_get_error (GtkPrintOperation *op); GtkPrintStatus gtk_print_operation_get_status (GtkPrintOperation *op); G_CONST_RETURN gchar * gtk_print_operation_get_status_string (GtkPrintOperation *op); gboolean gtk_print_operation_is_finished (GtkPrintOperation *op); |