Commit 8e110a96 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

converted the "Delete File" dialog to GtkMessageDialog. Marked missing

2002-02-11  Sven Neumann  <sven@gimp.org>

	* gtk/gtkfilesel.c: converted the "Delete File" dialog to
	GtkMessageDialog. Marked missing strings for translation.
parent abc8455d
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
2002-02-11 Sven Neumann <sven@gimp.org>
* gtk/gtkfilesel.c: converted the "Delete File" dialog to
GtkMessageDialog. Marked missing strings for translation.
Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk> Mon Feb 11 22:03:15 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget. * gtk/gtkpaned.[ch]: Opaque resizing + prelighting for paned widget.
* gtk/gtkvpaned.c, gtk/gtkvpaned.h: move reszing logic to gtkpaned.c * gtk/gtkvpaned.c, gtk/gtkvpaned.h: move resizing logic to gtkpaned.c
Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org> Mon Feb 11 21:42:17 2002 Kristian Rietveld <kris@gtk.org>
...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org> ...@@ -34,7 +39,6 @@ Mon Feb 11 16:40:44 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_set_model): install presize * gtk/gtktreeview.c (gtk_tree_view_set_model): install presize
handler, so the validate_rows_handler will always be run (#70997) handler, so the validate_rows_handler will always be run (#70997)
>>>>>>> 1.2993
Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org> Sun Feb 10 22:20:46 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase
...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com> ...@@ -51,8 +55,9 @@ Sun Feb 10 12:32:44 2002 Owen Taylor <otaylor@redhat.com>
2002-02-10 Anders Carlsson <andersca@gnu.org> 2002-02-10 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler; * gtk/gtkcalendar.c (gtk_calendar_class_init): Set finalize handler;
(gtk_calendar_finalize): Rename gtk_calendar_destroy to gtk_calendar_finalize (gtk_calendar_finalize): Rename gtk_calendar_destroy to
since ::destroy can be called multiple times, resulting in double-freeing memory. gtk_calendar_finalize since ::destroy can be called multiple times,
resulting in double-freeing memory.
2002-02-10 Hans Breuer <hans@breuer.org> 2002-02-10 Hans Breuer <hans@breuer.org>
......
...@@ -1388,8 +1388,9 @@ gtk_file_selection_create_dir (GtkWidget *widget, ...@@ -1388,8 +1388,9 @@ gtk_file_selection_create_dir (GtkWidget *widget,
} }
static void static void
gtk_file_selection_delete_file_confirmed (GtkWidget *widget, gtk_file_selection_delete_file_response (GtkDialog *dialog,
gpointer data) gint response_id,
gpointer data)
{ {
GtkFileSelection *fs = data; GtkFileSelection *fs = data;
CompletionState *cmpl_state; CompletionState *cmpl_state;
...@@ -1401,6 +1402,12 @@ gtk_file_selection_delete_file_confirmed (GtkWidget *widget, ...@@ -1401,6 +1402,12 @@ gtk_file_selection_delete_file_confirmed (GtkWidget *widget,
g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
if (response_id != GTK_RESPONSE_OK)
{
gtk_widget_destroy (GTK_WIDGET (dialog));
return;
}
cmpl_state = (CompletionState*) fs->cmpl_state; cmpl_state = (CompletionState*) fs->cmpl_state;
path = cmpl_reference_position (cmpl_state); path = cmpl_reference_position (cmpl_state);
...@@ -1441,17 +1448,13 @@ gtk_file_selection_delete_file (GtkWidget *widget, ...@@ -1441,17 +1448,13 @@ gtk_file_selection_delete_file (GtkWidget *widget,
gpointer data) gpointer data)
{ {
GtkFileSelection *fs = data; GtkFileSelection *fs = data;
GtkWidget *label;
GtkWidget *vbox;
GtkWidget *button;
GtkWidget *dialog; GtkWidget *dialog;
const gchar *filename; const gchar *filename;
gchar *buf;
g_return_if_fail (GTK_IS_FILE_SELECTION (fs)); g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
if (fs->fileop_dialog) if (fs->fileop_dialog)
return; return;
#ifdef G_WITH_CYGWIN #ifdef G_WITH_CYGWIN
translate_win32_path (fs); translate_win32_path (fs);
...@@ -1465,54 +1468,32 @@ gtk_file_selection_delete_file (GtkWidget *widget, ...@@ -1465,54 +1468,32 @@ gtk_file_selection_delete_file (GtkWidget *widget,
fs->fileop_file = g_strdup (filename); fs->fileop_file = g_strdup (filename);
/* main dialog */ /* main dialog */
fs->fileop_dialog = dialog = gtk_dialog_new (); fs->fileop_dialog = dialog =
gtk_message_dialog_new (GTK_WINDOW (fs),
GTK_WINDOW (fs)->modal ? GTK_DIALOG_MODAL : 0,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
_("Really delete file \"%s\" ?"), filename);
gtk_signal_connect (GTK_OBJECT (dialog), "destroy", gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
(GtkSignalFunc) gtk_file_selection_fileop_destroy, (GtkSignalFunc) gtk_file_selection_fileop_destroy,
(gpointer) fs); (gpointer) fs);
gtk_window_set_title (GTK_WINDOW (dialog), _("Delete File")); gtk_window_set_title (GTK_WINDOW (dialog), _("Delete File"));
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fs));
/* If file dialog is grabbed, grab option dialog */
/* When option dialog is closed, file dialog will be grabbed again */
if (GTK_WINDOW (fs)->modal)
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox,
FALSE, FALSE, 0);
gtk_widget_show (vbox);
buf = g_strconcat ("Really delete file \"", filename, "\" ?", NULL);
label = gtk_label_new (buf);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 5);
gtk_widget_show (label);
g_free (buf);
/* buttons */ /* buttons */
button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); gtk_dialog_add_buttons (GTK_DIALOG (dialog),
gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
(GtkSignalFunc) gtk_widget_destroy, GTK_STOCK_DELETE, GTK_RESPONSE_OK,
(gpointer) dialog); NULL);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
button, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_grab_default (button);
gtk_widget_show (button);
button = gtk_button_new_from_stock (GTK_STOCK_DELETE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_file_selection_delete_file_confirmed, g_signal_connect (G_OBJECT (dialog), "response",
(gpointer) fs); G_CALLBACK (gtk_file_selection_delete_file_response),
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), fs);
button, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_widget_show (button);
gtk_widget_show (dialog); gtk_widget_show (dialog);
} }
static void static void
...@@ -1631,8 +1612,8 @@ gtk_file_selection_rename_file (GtkWidget *widget, ...@@ -1631,8 +1612,8 @@ gtk_file_selection_rename_file (GtkWidget *widget,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_widget_show(vbox); gtk_widget_show(vbox);
buf = g_strconcat ("Rename file \"", fs->fileop_file, "\" to:", NULL); buf = g_strdup_printf (_("Rename file \"%s\" to:"), fs->fileop_file);
label = gtk_label_new(buf); label = gtk_label_new (buf);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 5); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 5);
gtk_widget_show (label); gtk_widget_show (label);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment