debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show transfer speed next to size in tooltips

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/725377
This commit is contained in:
Tomasz Szatkowski 2011-03-05 13:58:57 +01:00 committed by Christian Dywan
parent d903505ee6
commit 7d8b3c25d4
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
toolbars/midori-transferbar.c
View file

@ -79,13 +79,32 @@ midori_transferbar_download_notify_progress_cb (WebKitDownload* download,
gchar* total; gchar* total;
gchar* size_text; gchar* size_text;
gchar* text; gchar* text;
gchar* transfer;
gdouble* last_time;
guint64* last_size;
gdouble time;
guint64 size;
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
webkit_download_get_progress (download)); webkit_download_get_progress (download));
current = g_format_size_for_display (webkit_download_get_current_size (download)); current = g_format_size_for_display (webkit_download_get_current_size (download));
total = g_format_size_for_display (webkit_download_get_total_size (download)); total = g_format_size_for_display (webkit_download_get_total_size (download));
size_text = g_strdup_printf (_("%s of %s"), current, total); last_time = g_object_get_data (G_OBJECT (download), "last-time");
last_size = g_object_get_data (G_OBJECT (download), "last-size");
time = webkit_download_get_elapsed_time (download);
size = webkit_download_get_current_size (download);
if (time != *last_time)
transfer = g_format_size_for_display ((size - *last_size) / (time - *last_time));
else
transfer = "?B";
/* i18n: Download tooltip, 4KB of 43MB, 130KB/s */
size_text = g_strdup_printf (_("%s of %s, %s/s"), current, total, transfer);
if (time - *last_time > 5.0)
{
*last_time = time;
*last_size = size;
}
g_free (current); g_free (current);
g_free (total); g_free (total);
text = g_strdup_printf ("%s (%s)", text = g_strdup_printf ("%s (%s)",
@ -224,6 +243,8 @@ midori_transferbar_add_download_item (MidoriTransferbar* transferbar,
G_CALLBACK (midori_transferbar_download_notify_status_cb), info); G_CALLBACK (midori_transferbar_download_notify_status_cb), info);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (midori_transferbar_download_button_clicked_cb), info); G_CALLBACK (midori_transferbar_download_button_clicked_cb), info);
g_object_set_data_full (G_OBJECT (download), "last-time", g_new0 (gdouble, 1), g_free);
g_object_set_data_full (G_OBJECT (download), "last-size", g_new0 (guint64, 1), g_free);
} }
static void static void