Mercurial > pidgin.yaz

comparison src/gtkft.c @ 9785:2356d2153c94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10653] Dave West made us check errno and give better file related errors for file transfers. He also added some information to the xfer dialog, like the protocol and account name. He also made the initial status of xfers added to the dialog be "waiting for transfer to start" committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Thu, 19 Aug 2004 22:46:08 +0000
parents 03be9d653123
children 4a15962c344a
comparison
equal deleted inserted replaced
9784:d7cc09a9da4c 9785:2356d2153c94
55 55
56 GtkWidget *disclosure; 56 GtkWidget *disclosure;
57 57
58 GtkWidget *table; 58 GtkWidget *table;
59 59
60 GtkWidget *user_desc_label; 60 GtkWidget *local_user_desc_label;
61 GtkWidget *user_label; 61 GtkWidget *local_user_label;
62 GtkWidget *remote_user_desc_label;
63 GtkWidget *remote_user_label;
64 GtkWidget *protocol_label;
62 GtkWidget *filename_label; 65 GtkWidget *filename_label;
63 GtkWidget *status_label; 66 GtkWidget *status_label;
64 GtkWidget *speed_label; 67 GtkWidget *speed_label;
65 GtkWidget *time_elapsed_label; 68 GtkWidget *time_elapsed_label;
66 GtkWidget *time_remaining_label; 69 GtkWidget *time_remaining_label;
209 -1); 212 -1);
210 213
211 g_object_unref(pixbuf); 214 g_object_unref(pixbuf);
212 } 215 }
213 216
214 if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) 217 if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
215 gtk_label_set_markup(GTK_LABEL(dialog->user_desc_label), 218 gtk_label_set_markup(GTK_LABEL(dialog->local_user_desc_label),
219 _("<b>Receiving As:</b>"));
220 gtk_label_set_markup(GTK_LABEL(dialog->remote_user_desc_label),
216 _("<b>Receiving From:</b>")); 221 _("<b>Receiving From:</b>"));
217 else 222 }
218 gtk_label_set_markup(GTK_LABEL(dialog->user_desc_label), 223 else {
224 gtk_label_set_markup(GTK_LABEL(dialog->remote_user_desc_label),
219 _("<b>Sending To:</b>")); 225 _("<b>Sending To:</b>"));
220 226 gtk_label_set_markup(GTK_LABEL(dialog->local_user_desc_label),
221 gtk_label_set_text(GTK_LABEL(dialog->user_label), xfer->who); 227 _("<b>Sending As:</b>"));
228 }
229
230 gtk_label_set_text(GTK_LABEL(dialog->local_user_label),
231 gaim_account_get_username(xfer->account));
232 gtk_label_set_text(GTK_LABEL(dialog->remote_user_label), xfer->who);
233 gtk_label_set_text(GTK_LABEL(dialog->protocol_label),
234 gaim_account_get_protocol_name(xfer->account));
222 235
223 if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) { 236 if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
224 gtk_label_set_text(GTK_LABEL(dialog->filename_label), 237 gtk_label_set_text(GTK_LABEL(dialog->filename_label),
225 gaim_xfer_get_filename(xfer)); 238 gaim_xfer_get_filename(xfer));
226 } else { 239 } else {
534 GtkWidget **val_label; 547 GtkWidget **val_label;
535 const char *desc; 548 const char *desc;
536 549
537 } labels[] = 550 } labels[] =
538 { 551 {
539 { &dialog->user_desc_label, &dialog->user_label, NULL }, 552 { &dialog->local_user_desc_label, &dialog->local_user_label, NULL },
553 { &dialog->remote_user_desc_label, &dialog->remote_user_label, NULL },
554 { &label, &dialog->protocol_label, _("Protocol:") },
540 { &label, &dialog->filename_label, _("Filename:") }, 555 { &label, &dialog->filename_label, _("Filename:") },
541 { &label, &dialog->status_label, _("Status:") }, 556 { &label, &dialog->status_label, _("Status:") },
542 { &label, &dialog->speed_label, _("Speed:") }, 557 { &label, &dialog->speed_label, _("Speed:") },
543 { &label, &dialog->time_elapsed_label, _("Time Elapsed:") }, 558 { &label, &dialog->time_elapsed_label, _("Time Elapsed:") },
544 { &label, &dialog->time_remaining_label, _("Time Remaining:") } 559 { &label, &dialog->time_remaining_label, _("Time Remaining:") }
545 }; 560 };
546 561
547 /* Setup the initial table */ 562 /* Setup the initial table */
548 dialog->table = table = gtk_table_new(8, 2, FALSE); 563 dialog->table = table = gtk_table_new(10, 2, FALSE);
549 gtk_table_set_row_spacings(GTK_TABLE(table), 6); 564 gtk_table_set_row_spacings(GTK_TABLE(table), 6);
550 gtk_table_set_col_spacings(GTK_TABLE(table), 6); 565 gtk_table_set_col_spacings(GTK_TABLE(table), 6);
551 566
552 /* Setup the labels */ 567 /* Setup the labels */
553 for (i = 0; i < sizeof(labels) / sizeof(*labels); i++) { 568 for (i = 0; i < sizeof(labels) / sizeof(*labels); i++) {
572 gtk_widget_show(label); 587 gtk_widget_show(label);
573 } 588 }
574 589
575 /* Setup the progress bar */ 590 /* Setup the progress bar */
576 dialog->progress = gtk_progress_bar_new(); 591 dialog->progress = gtk_progress_bar_new();
577 gtk_table_attach(GTK_TABLE(table), dialog->progress, 0, 2, 6, 7, 592 gtk_table_attach(GTK_TABLE(table), dialog->progress, 0, 2, 8, 9,
578 GTK_FILL, GTK_FILL, 0, 0); 593 GTK_FILL, GTK_FILL, 0, 0);
579 gtk_widget_show(dialog->progress); 594 gtk_widget_show(dialog->progress);
580 595
581 sep = gtk_hseparator_new(); 596 sep = gtk_hseparator_new();
582 gtk_table_attach(GTK_TABLE(table), sep, 0, 2, 7, 8, 597 gtk_table_attach(GTK_TABLE(table), sep, 0, 2, 9, 10,
583 GTK_FILL, GTK_FILL, 0, 0); 598 GTK_FILL, GTK_FILL, 0, 0);
584 gtk_widget_show(sep); 599 gtk_widget_show(sep);
585 600
586 return table; 601 return table;
587 } 602 }
827 COLUMN_PROGRESS, 0.0, 842 COLUMN_PROGRESS, 0.0,
828 COLUMN_FILENAME, (type == GAIM_XFER_RECEIVE) 843 COLUMN_FILENAME, (type == GAIM_XFER_RECEIVE)
829 ? gaim_xfer_get_filename(xfer) 844 ? gaim_xfer_get_filename(xfer)
830 : lfilename, 845 : lfilename,
831 COLUMN_SIZE, size_str, 846 COLUMN_SIZE, size_str,
832 COLUMN_REMAINING, remaining_str, 847 COLUMN_REMAINING, _("Waiting for transfer to begin"),
833 COLUMN_DATA, xfer, 848 COLUMN_DATA, xfer,
834 -1); 849 -1);
835 g_free(lfilename); 850 g_free(lfilename);
836 851
837 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(dialog->tree)); 852 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(dialog->tree));
961 COLUMN_STATUS, pixbuf, 976 COLUMN_STATUS, pixbuf,
962 COLUMN_REMAINING, _("Finished"), 977 COLUMN_REMAINING, _("Finished"),
963 -1); 978 -1);
964 979
965 g_object_unref(pixbuf); 980 g_object_unref(pixbuf);
966 } 981 }
967 982
968 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree)); 983 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(xfer_dialog->tree));
969 984
970 if (xfer == dialog->selected_xfer) 985 if (xfer == dialog->selected_xfer)
971 update_detailed_info(xfer_dialog, xfer); 986 update_detailed_info(xfer_dialog, xfer);