Mercurial > gftp.yaz
changeset 866:877282be3a78
2006-11-30 Brian Masney <masneyb@gftp.org>
* src/gtk/bookmarks.c - changed the button order to match the
button order in GNOME. (from Alan Horkan <horkana@maths.tcd.ie>)
* src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/gtkui_transfer.c
src/gtk/misc-gtk.c - changed the button order to match what is in
GNOME. (closes #310786)
* src/gtk/bookmarks.c src/gtk/options_dialog.c - removed the apply
button (closes #153373)
| author | masneyb |
|---|---|
| date | Sat, 23 Dec 2006 19:54:08 +0000 |
| parents | 1fae947d4418 |
| children | b1cfb42c5be4 |
| files | ChangeLog src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/gtkui_transfer.c src/gtk/misc-gtk.c src/gtk/options_dialog.c |
| diffstat | 6 files changed, 24 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Dec 23 19:44:19 2006 +0000 +++ b/ChangeLog Sat Dec 23 19:54:08 2006 +0000 @@ -1,4 +1,14 @@ 2006-11-30 Brian Masney <masneyb@gftp.org> + * src/gtk/bookmarks.c - changed the button order to match the + button order in GNOME. (from Alan Horkan <horkana@maths.tcd.ie>) + + * src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/gtkui_transfer.c + src/gtk/misc-gtk.c - changed the button order to match what is in + GNOME. (closes #310786) + + * src/gtk/bookmarks.c src/gtk/options_dialog.c - removed the apply + button (closes #153373) + * lib/local.c lib/protocols.c lib/rfc959.c lib/sshv2.c src/gtk/gftp-gtk.c src/gtk/transfer.c src/uicommon/gftpui.c - removed unused variables @@ -3769,7 +3779,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.509 2006/12/23 19:44:09 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.510 2006/12/23 19:54:08 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/bookmarks.c Sat Dec 23 19:44:19 2006 +0000 +++ b/src/gtk/bookmarks.c Sat Dec 23 19:54:08 2006 +0000 @@ -409,9 +409,6 @@ gftp_bookmarks_var * tempentry, * newentry; char *pos, *text[2]; const char *str; -#if GTK_MAJOR_VERSION > 1 - gsize bread, bwrite; -#endif gftp_get_pixmap (tree, "open_dir.xpm", &opendir_pixmap, &opendir_bitmap); gftp_get_pixmap (tree, "dir.xpm", &closedir_pixmap, &closedir_bitmap); @@ -807,9 +804,6 @@ { switch (response) { - case GTK_RESPONSE_APPLY: - entry_apply_changes (widget, user_data); - break; case GTK_RESPONSE_OK: entry_apply_changes (widget, user_data); /* no break */ @@ -850,12 +844,10 @@ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (bm_dialog)->action_area), 15); #else bm_dialog = gtk_dialog_new_with_buttons (_("Edit Entry"), NULL, 0, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, - GTK_STOCK_APPLY, - GTK_RESPONSE_APPLY, NULL); #endif gtk_window_set_wmclass (GTK_WINDOW (bm_dialog), "Edit Bookmark Entry", @@ -1060,15 +1052,6 @@ GTK_WIDGET_SET_FLAGS (tempwid, GTK_CAN_DEFAULT); gtk_widget_grab_focus (tempwid); gtk_widget_show (tempwid); - - tempwid = gtk_button_new_with_label (_("Apply")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (bm_dialog)->action_area), tempwid, - TRUE, TRUE, 0); - gtk_signal_connect (GTK_OBJECT (tempwid), "clicked", - GTK_SIGNAL_FUNC (entry_apply_changes), - (gpointer) entry); - GTK_WIDGET_SET_FLAGS (tempwid, GTK_CAN_DEFAULT); - gtk_widget_show (tempwid); #else g_signal_connect (GTK_OBJECT (bm_dialog), "response", G_CALLBACK (bmedit_action), (gpointer) entry); @@ -1241,10 +1224,11 @@ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (edit_bookmarks_dialog)->action_area), 15); #else edit_bookmarks_dialog = gtk_dialog_new_with_buttons (_("Edit Bookmarks"), - NULL, 0, GTK_STOCK_SAVE, - GTK_RESPONSE_OK, + NULL, 0, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, + GTK_RESPONSE_OK, NULL); #endif gtk_window_set_wmclass (GTK_WINDOW(edit_bookmarks_dialog), "Edit Bookmarks",
--- a/src/gtk/chmod_dialog.c Sat Dec 23 19:44:19 2006 +0000 +++ b/src/gtk/chmod_dialog.c Sat Dec 23 19:54:08 2006 +0000 @@ -140,10 +140,10 @@ gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), TRUE); #else dialog = gtk_dialog_new_with_buttons (_("Chmod"), NULL, 0, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, NULL); #endif gtk_window_set_wmclass (GTK_WINDOW(dialog), "Chmod", "gFTP");
--- a/src/gtk/gtkui_transfer.c Sat Dec 23 19:44:19 2006 +0000 +++ b/src/gtk/gtkui_transfer.c Sat Dec 23 19:54:08 2006 +0000 @@ -231,10 +231,10 @@ GTK_OBJECT (dialog)); #else dialog = gtk_dialog_new_with_buttons (_("Transfer Files"), NULL, 0, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, NULL); #endif gtk_window_set_wmclass (GTK_WINDOW(dialog), "transfer", "gFTP");
--- a/src/gtk/misc-gtk.c Sat Dec 23 19:44:19 2006 +0000 +++ b/src/gtk/misc-gtk.c Sat Dec 23 19:54:08 2006 +0000 @@ -937,10 +937,10 @@ } dialog = gtk_dialog_new_with_buttons (_(diagtxt), NULL, 0, + GTK_STOCK_CANCEL, + GTK_RESPONSE_NO, yes_text, GTK_RESPONSE_YES, - GTK_STOCK_CANCEL, - GTK_RESPONSE_NO, NULL); #endif gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 10); @@ -1064,10 +1064,10 @@ gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), TRUE); #else dialog = gtk_dialog_new_with_buttons (_(diagtxt), NULL, 0, + GTK_STOCK_NO, + GTK_RESPONSE_NO, GTK_STOCK_YES, GTK_RESPONSE_YES, - GTK_STOCK_NO, - GTK_RESPONSE_NO, NULL); #endif gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 10);
--- a/src/gtk/options_dialog.c Sat Dec 23 19:44:19 2006 +0000 +++ b/src/gtk/options_dialog.c Sat Dec 23 19:54:08 2006 +0000 @@ -758,9 +758,6 @@ { switch (response) { - case GTK_RESPONSE_APPLY: - apply_changes (widget, NULL); - break; case GTK_RESPONSE_OK: apply_changes (widget, NULL); /* no break */ @@ -1373,8 +1370,6 @@ gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (gftp_option_data->dialog)->action_area), TRUE); #else gftp_option_data->dialog = gtk_dialog_new_with_buttons (_("Options"), NULL, 0, - GTK_STOCK_APPLY, - GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK,