diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-15 17:34:34 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-15 17:34:34 +0000 |
| commit | 1eb96eadfc3349534617082f3bb5dd8be2f3a99a (patch) | |
| tree | 403051291907f22e24287d20189bd7ed8eb68002 /docs | |
| parent | 1ea43444be78b1c281dd888ff86eca838ec3c7c2 (diff) | |
| download | gdk-pixbuf-1eb96eadfc3349534617082f3bb5dd8be2f3a99a.tar.gz | |
Bug 384940 – handle rejecting jobs and authentication meaningfully
Patch by Marek Kasik, icons by Mike Langlie:
* gtk/gtk.symbols:
* gtk/gtkprintbackend.h:
* gtk/gtkprinter.[hc]: Add new paused and accepting-jobs properties
and getters/setters.
* gtk/gtkstock.h:
* gtk/gtkiconfactory.c:
* gtk/Makefile.am:
* gtk/stock-icons/{16,24}/gtk-print-paused.{png,svg}: New icon.
* modules/printbackends/cups/gtkprintbackendcups.c:
* gtk/gtkprintunixdialog.c: Handle paused and job-rejecting
printers.
svn path=/trunk/; revision=20838
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/ChangeLog | 7 | ||||
| -rw-r--r-- | docs/reference/gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkstock.sgml | 15 |
4 files changed, 22 insertions, 3 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index fffa719c5..ecbd7f0bc 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,10 @@ +2008-07-15 Matthias Clasen <mclasen@redhat.com> + + * gtk/Makefile.am: + * gtk/tmpl/gtkstock.sgml: Add new icon. + + * gtk/gtk-sections.txt: Add new GtkPrinter functions + 2008-07-14 Matthias Clasen <mclasen@redhat.com> * gtk/tmpl/gtklabel.sgml: Fix markup diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index fa75b4751..16155f4dc 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -242,6 +242,7 @@ HTML_IMAGES = \ $(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-print.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-print-error.png \ + $(top_srcdir)/gtk/stock-icons/24/gtk-print-paused.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-print-preview.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-print-report.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-print-warning.png \ diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 84638857f..6c5d9a1a4 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -6441,6 +6441,8 @@ gtk_printer_get_location gtk_printer_get_icon_name gtk_printer_get_job_count gtk_printer_is_active +gtk_printer_is_paused +gtk_printer_is_accepting_jobs gtk_printer_is_virtual gtk_printer_is_default gtk_printer_accepts_ps diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index c28735938..65e6a509b 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -755,13 +755,22 @@ The "Print" item. <!-- ##### MACRO GTK_STOCK_PRINT_ERROR ##### --> <para> -The "Print Error" item. +The "Print Error" icon. <inlinegraphic fileref="gtk-print-error.png" format="PNG"></inlinegraphic> </para> @Since: 2.14 +<!-- ##### MACRO GTK_STOCK_PRINT_PAUSED ##### --> +<para> +The "Print Paused" icon. +<inlinegraphic fileref="gtk-print-paused.png" format="PNG"></inlinegraphic> +</para> + +@Since: 2.14 + + <!-- ##### MACRO GTK_STOCK_PRINT_PREVIEW ##### --> <para> The "Print Preview" item. @@ -772,7 +781,7 @@ The "Print Preview" item. <!-- ##### MACRO GTK_STOCK_PRINT_REPORT ##### --> <para> -The "Print Report" item. +The "Print Report" icon. <inlinegraphic fileref="gtk-print-report.png" format="PNG"></inlinegraphic> </para> @@ -781,7 +790,7 @@ The "Print Report" item. <!-- ##### MACRO GTK_STOCK_PRINT_WARNING ##### --> <para> -The "Print Warning" item. +The "Print Warning" icon. <inlinegraphic fileref="gtk-print-warning.png" format="PNG"></inlinegraphic> </para> |