AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use gtk_dialog_run for the error dialog, and improve the dialog in

Browse Source 
2006-05-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprintoperation-unix.c (unix_finish_send): Don't
	use gtk_dialog_run for the error dialog, and improve the
	dialog in other ways.  (#340510, Christian Persch)
This commit is contained in:
Matthias Clasen 2006-05-03 17:34:55 +00:00 committed by Matthias Clasen
parent 66af313a0f
commit d428b288ca
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2006-05-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c (unix_finish_send): Don't
use gtk_dialog_run for the error dialog, and improve the
dialog in other ways. (#340510, Christian Persch)
* gtk/gtkpagesetupunixdialog.c: Beautify the custom
paper size dialog. (#339590, patch by Christian Persch)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2006-05-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c (unix_finish_send): Don't
use gtk_dialog_run for the error dialog, and improve the
dialog in other ways. (#340510, Christian Persch)
* gtk/gtkpagesetupunixdialog.c: Beautify the custom
paper size dialog. (#339590, patch by Christian Persch)

20
gtk/gtkprintoperation-unix.c
View File

@ -36,6 +36,7 @@
#include "gtkprinter.h"
#include "gtkprintjob.h"
#include "gtkalias.h"
#include "gtkintl.h"
typedef struct {
GtkPrintJob *job; /* the job we are sending to the printer */
@ -90,11 +91,14 @@ unix_finish_send (GtkPrintJob *job,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"Error printing: %s",
error->message);
_("Error printing") /* FIXME better text */);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (edialog),
"%s", error->message);
gtk_window_set_modal (GTK_WINDOW (edialog), TRUE);
g_signal_connect (edialog, "response",
G_CALLBACK (gtk_widget_destroy), NULL);
gtk_dialog_run (GTK_DIALOG (edialog));
gtk_widget_destroy (edialog);
gtk_window_present (GTK_WINDOW (edialog));
}
}
@ -305,10 +309,10 @@ _gtk_print_operation_platform_backend_run_dialog (GtkPrintOperation *op,
typedef struct {
GtkPageSetup *page_setup;
GFunc done_cb;
gpointer data;
GDestroyNotify destroy;
GtkPageSetup *page_setup;
GtkPageSetupDoneFunc done_cb;
gpointer data;
GDestroyNotify destroy;
} PageSetupResponseData;
static void

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2006-05-03 Matthias Clasen <mclasen@redhat.com>
* POTFILES.in: Add gtkprintoperation-unix.c
2006-05-03 Ankit Patel <ankit644@yahoo.com>
* gu.po: Updated Gujarati Translation.

1
po/POTFILES.in
View File

@ -143,6 +143,7 @@ gtk/gtkpreview.c
gtk/gtkprinteroptionwidget.c
gtk/gtkprintjob.c
gtk/gtkprintoperation.c
gtk/gtkprintoperation-unix.c
gtk/gtkprintoperation-win32.c
gtk/gtkprintunixdialog.c
gtk/gtkprogress.c