Mercurial > pidgin.yaz
comparison pidgin/gtkft.c @ 29891:7f7ce73365eb
The official GTK+ version of CellRendererProgress uses "value" which is an
int from 0 to 100 and not "percentage" (double from 0.0 to 1.0).
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 28 Feb 2010 01:11:19 +0000 |
parents | 2b9db39bd7ed |
children | 6d3a90b49dba |
comparison
equal
deleted
inserted
replaced
29889:0d3151a41134 | 29891:7f7ce73365eb |
---|---|
573 GTK_POLICY_AUTOMATIC); | 573 GTK_POLICY_AUTOMATIC); |
574 gtk_widget_show(sw); | 574 gtk_widget_show(sw); |
575 | 575 |
576 /* Build the tree model */ | 576 /* Build the tree model */ |
577 /* Transfer type, Progress Bar, Filename, Size, Remaining */ | 577 /* Transfer type, Progress Bar, Filename, Size, Remaining */ |
578 model = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_DOUBLE, | 578 model = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_INT, |
579 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, | 579 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, |
580 G_TYPE_POINTER); | 580 G_TYPE_POINTER); |
581 dialog->model = model; | 581 dialog->model = model; |
582 | 582 |
583 /* Create the treeview */ | 583 /* Create the treeview */ |
607 gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); | 607 gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); |
608 | 608 |
609 /* Progress bar column */ | 609 /* Progress bar column */ |
610 renderer = gtk_cell_renderer_progress_new(); | 610 renderer = gtk_cell_renderer_progress_new(); |
611 column = gtk_tree_view_column_new_with_attributes(_("Progress"), renderer, | 611 column = gtk_tree_view_column_new_with_attributes(_("Progress"), renderer, |
612 "percentage", COLUMN_PROGRESS, NULL); | 612 "value", COLUMN_PROGRESS, NULL); |
613 gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE); | 613 gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE); |
614 gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); | 614 gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); |
615 | 615 |
616 /* Filename column */ | 616 /* Filename column */ |
617 renderer = gtk_cell_renderer_text_new(); | 617 renderer = gtk_cell_renderer_text_new(); |
904 utf8 = g_filename_to_utf8(lfilename, -1, NULL, NULL, NULL); | 904 utf8 = g_filename_to_utf8(lfilename, -1, NULL, NULL, NULL); |
905 g_free(lfilename); | 905 g_free(lfilename); |
906 lfilename = utf8; | 906 lfilename = utf8; |
907 gtk_list_store_set(dialog->model, &data->iter, | 907 gtk_list_store_set(dialog->model, &data->iter, |
908 COLUMN_STATUS, pixbuf, | 908 COLUMN_STATUS, pixbuf, |
909 COLUMN_PROGRESS, 0.0, | 909 COLUMN_PROGRESS, 0, |
910 COLUMN_FILENAME, (type == PURPLE_XFER_RECEIVE) | 910 COLUMN_FILENAME, (type == PURPLE_XFER_RECEIVE) |
911 ? purple_xfer_get_filename(xfer) | 911 ? purple_xfer_get_filename(xfer) |
912 : lfilename, | 912 : lfilename, |
913 COLUMN_SIZE, size_str, | 913 COLUMN_SIZE, size_str, |
914 COLUMN_REMAINING, _("Waiting for transfer to begin"), | 914 COLUMN_REMAINING, _("Waiting for transfer to begin"), |
1037 | 1037 |
1038 size_str = purple_str_size_to_units(purple_xfer_get_size(xfer)); | 1038 size_str = purple_str_size_to_units(purple_xfer_get_size(xfer)); |
1039 remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer)); | 1039 remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer)); |
1040 | 1040 |
1041 gtk_list_store_set(xfer_dialog->model, &data->iter, | 1041 gtk_list_store_set(xfer_dialog->model, &data->iter, |
1042 COLUMN_PROGRESS, purple_xfer_get_progress(xfer), | 1042 COLUMN_PROGRESS, (gint)(purple_xfer_get_progress(xfer) * 100), |
1043 COLUMN_SIZE, size_str, | 1043 COLUMN_SIZE, size_str, |
1044 COLUMN_REMAINING, remaining_str, | 1044 COLUMN_REMAINING, remaining_str, |
1045 -1); | 1045 -1); |
1046 | 1046 |
1047 g_free(size_str); | 1047 g_free(size_str); |