Mercurial > gftp.yaz

comparison src/gtk/bookmarks.c @ 866:877282be3a78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1ece208d1357
children b1cfb42c5be4
comparison
equal deleted inserted replaced
865:1fae947d4418 866:877282be3a78
407 GdkPixmap * closedir_pixmap, * opendir_pixmap; 407 GdkPixmap * closedir_pixmap, * opendir_pixmap;
408 GdkBitmap * closedir_bitmap, * opendir_bitmap; 408 GdkBitmap * closedir_bitmap, * opendir_bitmap;
409 gftp_bookmarks_var * tempentry, * newentry; 409 gftp_bookmarks_var * tempentry, * newentry;
410 char *pos, *text[2]; 410 char *pos, *text[2];
411 const char *str; 411 const char *str;
412 #if GTK_MAJOR_VERSION > 1
413 gsize bread, bwrite;
414 #endif
415 412
416 gftp_get_pixmap (tree, "open_dir.xpm", &opendir_pixmap, &opendir_bitmap); 413 gftp_get_pixmap (tree, "open_dir.xpm", &opendir_pixmap, &opendir_bitmap);
417 gftp_get_pixmap (tree, "dir.xpm", &closedir_pixmap, &closedir_bitmap); 414 gftp_get_pixmap (tree, "dir.xpm", &closedir_pixmap, &closedir_bitmap);
418 415
419 str = gtk_entry_get_text (GTK_ENTRY (ddata->edit)); 416 str = gtk_entry_get_text (GTK_ENTRY (ddata->edit));
805 static void 802 static void
806 bmedit_action (GtkWidget * widget, gint response, gpointer user_data) 803 bmedit_action (GtkWidget * widget, gint response, gpointer user_data)
807 { 804 {
808 switch (response) 805 switch (response)
809 { 806 {
810 case GTK_RESPONSE_APPLY:
811 entry_apply_changes (widget, user_data);
812 break;
813 case GTK_RESPONSE_OK: 807 case GTK_RESPONSE_OK:
814 entry_apply_changes (widget, user_data); 808 entry_apply_changes (widget, user_data);
815 /* no break */ 809 /* no break */
816 default: 810 default:
817 gtk_widget_destroy (widget); 811 gtk_widget_destroy (widget);
848 bm_dialog = gtk_dialog_new (); 842 bm_dialog = gtk_dialog_new ();
849 gtk_window_set_title (GTK_WINDOW (bm_dialog), _("Edit Entry")); 843 gtk_window_set_title (GTK_WINDOW (bm_dialog), _("Edit Entry"));
850 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (bm_dialog)->action_area), 15); 844 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (bm_dialog)->action_area), 15);
851 #else 845 #else
852 bm_dialog = gtk_dialog_new_with_buttons (_("Edit Entry"), NULL, 0, 846 bm_dialog = gtk_dialog_new_with_buttons (_("Edit Entry"), NULL, 0,
847 GTK_STOCK_CANCEL,
848 GTK_RESPONSE_CANCEL,
853 GTK_STOCK_SAVE, 849 GTK_STOCK_SAVE,
854 GTK_RESPONSE_OK, 850 GTK_RESPONSE_OK,
855 GTK_STOCK_CANCEL,
856 GTK_RESPONSE_CANCEL,
857 GTK_STOCK_APPLY,
858 GTK_RESPONSE_APPLY,
859 NULL); 851 NULL);
860 #endif 852 #endif
861 gtk_window_set_wmclass (GTK_WINDOW (bm_dialog), "Edit Bookmark Entry", 853 gtk_window_set_wmclass (GTK_WINDOW (bm_dialog), "Edit Bookmark Entry",
862 "gFTP"); 854 "gFTP");
863 gtk_window_set_position (GTK_WINDOW (bm_dialog), GTK_WIN_POS_MOUSE); 855 gtk_window_set_position (GTK_WINDOW (bm_dialog), GTK_WIN_POS_MOUSE);
1057 TRUE, TRUE, 0); 1049 TRUE, TRUE, 0);
1058 gtk_signal_connect_object (GTK_OBJECT (tempwid), "clicked", 1050 gtk_signal_connect_object (GTK_OBJECT (tempwid), "clicked",
1059 GTK_SIGNAL_FUNC (entry_close_dialog), NULL); 1051 GTK_SIGNAL_FUNC (entry_close_dialog), NULL);
1060 GTK_WIDGET_SET_FLAGS (tempwid, GTK_CAN_DEFAULT); 1052 GTK_WIDGET_SET_FLAGS (tempwid, GTK_CAN_DEFAULT);
1061 gtk_widget_grab_focus (tempwid); 1053 gtk_widget_grab_focus (tempwid);
1062 gtk_widget_show (tempwid);
1063
1064 tempwid = gtk_button_new_with_label (_("Apply"));
1065 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (bm_dialog)->action_area), tempwid,
1066 TRUE, TRUE, 0);
1067 gtk_signal_connect (GTK_OBJECT (tempwid), "clicked",
1068 GTK_SIGNAL_FUNC (entry_apply_changes),
1069 (gpointer) entry);
1070 GTK_WIDGET_SET_FLAGS (tempwid, GTK_CAN_DEFAULT);
1071 gtk_widget_show (tempwid); 1054 gtk_widget_show (tempwid);
1072 #else 1055 #else
1073 g_signal_connect (GTK_OBJECT (bm_dialog), "response", 1056 g_signal_connect (GTK_OBJECT (bm_dialog), "response",
1074 G_CALLBACK (bmedit_action), (gpointer) entry); 1057 G_CALLBACK (bmedit_action), (gpointer) entry);
1075 #endif 1058 #endif
1239 gtk_window_set_title (GTK_WINDOW (edit_bookmarks_dialog), 1222 gtk_window_set_title (GTK_WINDOW (edit_bookmarks_dialog),
1240 _("Edit Bookmarks")); 1223 _("Edit Bookmarks"));
1241 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (edit_bookmarks_dialog)->action_area), 15); 1224 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (edit_bookmarks_dialog)->action_area), 15);
1242 #else 1225 #else
1243 edit_bookmarks_dialog = gtk_dialog_new_with_buttons (_("Edit Bookmarks"), 1226 edit_bookmarks_dialog = gtk_dialog_new_with_buttons (_("Edit Bookmarks"),
1244 NULL, 0, GTK_STOCK_SAVE, 1227 NULL, 0,
1245 GTK_RESPONSE_OK,
1246 GTK_STOCK_CANCEL, 1228 GTK_STOCK_CANCEL,
1247 GTK_RESPONSE_CANCEL, 1229 GTK_RESPONSE_CANCEL,
1230 GTK_STOCK_SAVE,
1231 GTK_RESPONSE_OK,
1248 NULL); 1232 NULL);
1249 #endif 1233 #endif
1250 gtk_window_set_wmclass (GTK_WINDOW(edit_bookmarks_dialog), "Edit Bookmarks", 1234 gtk_window_set_wmclass (GTK_WINDOW(edit_bookmarks_dialog), "Edit Bookmarks",
1251 "gFTP"); 1235 "gFTP");
1252 gtk_window_set_position (GTK_WINDOW (edit_bookmarks_dialog), 1236 gtk_window_set_position (GTK_WINDOW (edit_bookmarks_dialog),