callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added some line-breaks for readability.

Browse Source 
2008-03-13  Sven Neumann  <sven@gimp.org>

	* gtk/gtkprintunixdialog.c (add_custom_button_to_dialog)
	(overwrite_confirmation_dialog): added some line-breaks for
	readability.

svn path=/trunk/; revision=19862
This commit is contained in:
Sven Neumann 2008-03-13 09:22:48 +00:00 committed by Sven Neumann
parent 29e27ab52f
commit c59ceab0fc
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-13 Sven Neumann <sven@gimp.org>
* gtk/gtkprintunixdialog.c (add_custom_button_to_dialog)
(overwrite_confirmation_dialog): added some line-breaks for
readability.
2008-03-12 Federico Mena Quintero <federico@novell.com> 2008-03-12 Federico Mena Quintero <federico@novell.com>
Rework the way completion works in GtkFileChooserEntry. Fixes Rework the way completion works in GtkFileChooserEntry. Fixes

29
gtk/gtkprintunixdialog.c
View File

@ -300,7 +300,8 @@ add_custom_button_to_dialog (GtkDialog *dialog,
button = gtk_button_new_with_mnemonic (mnemonic_label); button = gtk_button_new_with_mnemonic (mnemonic_label);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_button_set_image (GTK_BUTTON (button), gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON)); gtk_image_new_from_stock (stock_id,
GTK_ICON_SIZE_BUTTON));
gtk_widget_show (button); gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
@ -329,13 +330,16 @@ overwrite_confirmation_dialog (GtkPrintUnixDialog *print_dialog,
if (printer != NULL && gtk_printer_is_virtual (printer)) if (printer != NULL && gtk_printer_is_virtual (printer))
{ {
option = gtk_printer_option_set_lookup (priv->options, "gtk-main-page-custom-input"); option = gtk_printer_option_set_lookup (priv->options,
"gtk-main-page-custom-input");
if (option != NULL && option->type == GTK_PRINTER_OPTION_TYPE_FILESAVE) if (option != NULL &&
option->type == GTK_PRINTER_OPTION_TYPE_FILESAVE)
{ {
filename = g_filename_from_uri (option->value, NULL, NULL); filename = g_filename_from_uri (option->value, NULL, NULL);
if (filename != NULL && g_file_test (filename, G_FILE_TEST_EXISTS)) if (filename != NULL &&
g_file_test (filename, G_FILE_TEST_EXISTS))
{ {
toplevel = get_toplevel (GTK_WIDGET (print_dialog)); toplevel = get_toplevel (GTK_WIDGET (print_dialog));
@ -343,7 +347,8 @@ overwrite_confirmation_dialog (GtkPrintUnixDialog *print_dialog,
dirname = g_path_get_dirname (filename); dirname = g_path_get_dirname (filename);
dialog = gtk_message_dialog_new (toplevel, dialog = gtk_message_dialog_new (toplevel,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE, GTK_BUTTONS_NONE,
_("A file named \"%s\" already exists. Do you want to replace it?"), _("A file named \"%s\" already exists. Do you want to replace it?"),
@ -354,12 +359,18 @@ overwrite_confirmation_dialog (GtkPrintUnixDialog *print_dialog,
"overwrite its contents."), "overwrite its contents."),
dirname); dirname);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (dialog),
add_custom_button_to_dialog (GTK_DIALOG (dialog), _("_Replace"), GTK_STOCK_PRINT, GTK_RESPONSE_ACCEPT); GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); add_custom_button_to_dialog (GTK_DIALOG (dialog),
_("_Replace"),
GTK_STOCK_PRINT,
GTK_RESPONSE_ACCEPT);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT);
if (toplevel->group) if (toplevel->group)
gtk_window_group_add_window (toplevel->group, GTK_WINDOW (dialog)); gtk_window_group_add_window (toplevel->group,
GTK_WINDOW (dialog));
response = gtk_dialog_run (GTK_DIALOG (dialog)); response = gtk_dialog_run (GTK_DIALOG (dialog));