X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-progress-bar-widget.c;h=fd6708fab1a9e8c5168e6eaae92bbf905ce5451c;hp=56c6759c4f0aaa76e03c97c3c8a49addb5f64a0d;hb=fcbc6a6dfa1a10921d2ca889256a21b192adbe98;hpb=efb61a9683b6bed0a9444ad8a9dc4de552a00cb9 diff --git a/src/maemo/modest-progress-bar-widget.c b/src/maemo/modest-progress-bar-widget.c index 56c6759..fd6708f 100644 --- a/src/maemo/modest-progress-bar-widget.c +++ b/src/maemo/modest-progress-bar-widget.c @@ -32,6 +32,8 @@ #include #include "modest-progress-bar-widget.h" #include +#include "modest-platform.h" +#include "modest-runtime.h" /* 'private'/'protected' functions */ static void modest_progress_bar_widget_class_init (ModestProgressBarWidgetClass *klass); @@ -44,12 +46,19 @@ static void modest_progress_bar_add_operation (ModestProgressObject *self, static void modest_progress_bar_remove_operation (ModestProgressObject *self, ModestMailOperation *mail_op); +static void modest_progress_bar_cancel_current_operation (ModestProgressObject *self); + +static void modest_progress_bar_cancel_all_operations (ModestProgressObject *self); + +static guint modest_progress_bar_num_pending_operations (ModestProgressObject *self); + static void on_progress_changed (ModestMailOperation *mail_op, + ModestMailOperationState *state, ModestProgressBarWidget *self); static gboolean progressbar_clean (GtkProgressBar *bar); -#define XALIGN 1 +#define XALIGN 0.5 #define YALIGN 0.5 #define XSPACE 1 #define YSPACE 0 @@ -73,6 +82,7 @@ struct _ModestProgressBarWidgetPrivate { GSList *observables; ModestMailOperation *current; + guint count; GtkWidget *progress_bar; }; #define MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -92,6 +102,9 @@ modest_progress_object_init (gpointer g, gpointer iface_data) klass->add_operation_func = modest_progress_bar_add_operation; klass->remove_operation_func = modest_progress_bar_remove_operation; + klass->cancel_current_operation_func = modest_progress_bar_cancel_current_operation; + klass->cancel_all_operations_func = modest_progress_bar_cancel_all_operations; + klass->num_pending_operations_func = modest_progress_bar_num_pending_operations; } @@ -162,32 +175,28 @@ modest_progress_bar_widget_init (ModestProgressBarWidget *self) GtkAdjustment *adj; priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE(self); - + + /* Alignment */ + align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE); + /* Build GtkProgressBar */ - align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE); adj = (GtkAdjustment *) gtk_adjustment_new (0, LOWER, UPPER, 0, 0, 0); priv->progress_bar = gtk_progress_bar_new_with_adjustment (adj); - req.width = 50; + req.width = 228; req.height = 64; gtk_progress_set_text_alignment (GTK_PROGRESS (priv->progress_bar), 0, 0.5); gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (priv->progress_bar), PANGO_ELLIPSIZE_END); + gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (priv->progress_bar), 0.05); gtk_widget_size_request (priv->progress_bar, &req); gtk_container_add (GTK_CONTAINER (align), priv->progress_bar); + gtk_widget_size_request (align, &req); - /* Add progress bar widget */ + /* Add progress bar widget */ gtk_box_pack_start (GTK_BOX(self), align, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(align), priv->progress_bar); gtk_widget_show_all (GTK_WIDGET(self)); } static void -destroy_observable_data (ObservableData *data) -{ - g_signal_handler_disconnect (data->mail_op, data->signal_handler); - g_object_unref (data->mail_op); -} - -static void modest_progress_bar_widget_finalize (GObject *obj) { ModestProgressBarWidgetPrivate *priv; @@ -197,8 +206,10 @@ modest_progress_bar_widget_finalize (GObject *obj) GSList *tmp; for (tmp = priv->observables; tmp; tmp = g_slist_next (tmp)) { - destroy_observable_data ((ObservableData *) tmp->data); - g_free (tmp->data); + ObservableData *ob_data = tmp->data; + g_signal_handler_disconnect (ob_data->mail_op, ob_data->signal_handler); + g_object_unref (ob_data->mail_op); + g_free (ob_data); } g_slist_free (priv->observables); priv->observables = NULL; @@ -212,27 +223,31 @@ static void modest_progress_bar_add_operation (ModestProgressObject *self, ModestMailOperation *mail_op) { - ModestProgressBarWidget *me; - ObservableData *data; - ModestProgressBarWidgetPrivate *priv; + ModestProgressBarWidget *me = NULL; + ObservableData *data = NULL; + ModestProgressBarWidgetPrivate *priv = NULL; me = MODEST_PROGRESS_BAR_WIDGET (self); priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); data = g_malloc0 (sizeof (ObservableData)); data->mail_op = g_object_ref (mail_op); - data->signal_handler = g_signal_connect (data->mail_op, + data->signal_handler = g_signal_connect (data->mail_op, "progress-changed", G_CALLBACK (on_progress_changed), me); - - if (priv->observables == NULL) { + /* Set curent operation */ + if (priv->current == NULL) { priv->current = mail_op; + + priv->count = 0; + + /* Call progress_change handler to initialize progress message */ + modest_progress_bar_widget_set_undetermined_progress (MODEST_PROGRESS_BAR_WIDGET(self), mail_op); } - priv->observables = g_slist_append (priv->observables, data); - /* Call progress_change handler to initialize progress message */ -/* on_progress_changed (mail_op, me); */ + /* Add operation to obserbable objects list */ + priv->observables = g_slist_prepend (priv->observables, data); } static gint @@ -246,31 +261,39 @@ compare_observable_data (ObservableData *data1, ObservableData *data2) static void modest_progress_bar_remove_operation (ModestProgressObject *self, - ModestMailOperation *mail_op) + ModestMailOperation *mail_op) { ModestProgressBarWidget *me; ModestProgressBarWidgetPrivate *priv; GSList *link; ObservableData *tmp_data = NULL; + gboolean is_current; me = MODEST_PROGRESS_BAR_WIDGET (self); priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); + is_current = (priv->current == mail_op); + /* Find item */ tmp_data = g_malloc0 (sizeof (ObservableData)); - tmp_data->mail_op = g_object_ref (mail_op); + tmp_data->mail_op = mail_op; link = g_slist_find_custom (priv->observables, tmp_data, (GCompareFunc) compare_observable_data); /* Remove the item */ if (link) { - priv->observables = g_slist_remove_link (priv->observables, link); - destroy_observable_data ((ObservableData *) link->data); + ObservableData *ob_data = link->data; + g_signal_handler_disconnect (ob_data->mail_op, ob_data->signal_handler); + g_object_unref (ob_data->mail_op); + g_free (ob_data); + priv->observables = g_slist_delete_link (priv->observables, link); + tmp_data->mail_op = NULL; + link = NULL; } /* Update the current mail operation */ - if (priv->current == mail_op) { + if (is_current) { if (priv->observables) priv->current = ((ObservableData *) priv->observables->data)->mail_op; else @@ -284,47 +307,94 @@ modest_progress_bar_remove_operation (ModestProgressObject *self, g_free(tmp_data); } +static guint +modest_progress_bar_num_pending_operations (ModestProgressObject *self) +{ + ModestProgressBarWidget *me; + ModestProgressBarWidgetPrivate *priv; + + me = MODEST_PROGRESS_BAR_WIDGET (self); + priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); + + return g_slist_length(priv->observables); +} + +static void +modest_progress_bar_cancel_current_operation (ModestProgressObject *self) +{ + ModestProgressBarWidget *me; + ModestProgressBarWidgetPrivate *priv; + + me = MODEST_PROGRESS_BAR_WIDGET (self); + priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); + + if (priv->current == NULL) return; + + modest_mail_operation_cancel (priv->current); +} + +static void +modest_progress_bar_cancel_all_operations (ModestProgressObject *self) +{ + ModestProgressBarWidget *me; + ModestProgressBarWidgetPrivate *priv; + + me = MODEST_PROGRESS_BAR_WIDGET (self); + priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); + + /* Cancel all the mail operations */ + modest_mail_operation_queue_cancel_all (modest_runtime_get_mail_operation_queue ()); +} + static void on_progress_changed (ModestMailOperation *mail_op, + ModestMailOperationState *state, ModestProgressBarWidget *self) { ModestProgressBarWidgetPrivate *priv; gboolean determined = FALSE; - ModestMailOperationId id; priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self); /* If the mail operation is the currently shown one */ if (priv->current == mail_op) { gchar *msg = NULL; - gint done = modest_mail_operation_get_task_done (mail_op); - gint total = modest_mail_operation_get_task_total (mail_op); - - determined = (done > 0 && total > 0); - id = modest_mail_operation_get_id (mail_op); + + determined = (state->done > 0 && state->total > 1) && + !(state->done == 1 && state->total == 100); - switch (id) { - case MODEST_MAIL_OPERATION_ID_RECEIVE: + switch (state->op_type) { + case MODEST_MAIL_OPERATION_TYPE_RECEIVE: if (determined) - msg = g_strdup_printf(_("mcen_me_receiving"), done, total); + msg = g_strdup_printf(_("mcen_me_receiving"), + state->done, state->total); else - msg = g_strdup(_("mail_me_receiving")); + msg = g_strdup(_("mail_me_receiving")); break; - case MODEST_MAIL_OPERATION_ID_SEND: + case MODEST_MAIL_OPERATION_TYPE_SEND: if (determined) - msg = g_strdup_printf(_("mcen_me_sending"), done, total); - else + msg = g_strdup_printf(_("mcen_me_sending"), state->done, + state->total); + else msg = g_strdup(_("mail_me_sending")); break; - case MODEST_MAIL_OPERATION_ID_OPEN: + case MODEST_MAIL_OPERATION_TYPE_OPEN: msg = g_strdup(_("mail_me_opening")); break; default: msg = g_strdup(""); } - modest_progress_bar_widget_set_progress (self, msg, done, total); + /* If we have byte information use it */ + if ((state->bytes_done != 0) && (state->bytes_total != 0)) + modest_progress_bar_widget_set_progress (self, msg, + state->bytes_done, + state->bytes_total); + else + modest_progress_bar_widget_set_progress (self, msg, + state->done, + state->total); g_free (msg); } } @@ -346,23 +416,68 @@ modest_progress_bar_widget_new () void -modest_progress_bar_widget_set_progress (ModestProgressBarWidget *self, - const gchar *message, - gint done, - gint total) +modest_progress_bar_widget_set_progress (ModestProgressBarWidget *self, + const gchar *message, + gint done, + gint total) { ModestProgressBarWidgetPrivate *priv; + gboolean determined = FALSE; + + g_return_if_fail (MODEST_IS_PROGRESS_BAR_WIDGET(self)); + g_return_if_fail (done <= total); priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self); - - /* Set progress */ - if (total != 0) - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar), - (gdouble)done/(gdouble)total); - else - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar)); + priv->count++; + + /* Set progress. Tinymail sometimes returns us 1/100 when it + does not have any clue, NOTE that 1/100 could be also a + valid progress (we will loose it), but it will be recovered + once the done is greater than 1 */ + determined = (done > 0 && total > 1) && + !(done == 1 && total == 100); +/* if ((done == 0 && total == 0) || */ +/* (done == 1 && total == 100)) { */ + if (!determined) { + gtk_progress_bar_set_bar_style (GTK_PROGRESS_BAR (priv->progress_bar), /* Deprecated */ + GTK_PROGRESS_CONTINUOUS); + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar)); +/* printf ("debug: %s:\n undetermined progress (%i) changed (%i/%i) : %i\n", __FUNCTION__, */ +/* (int) priv->progress_bar, */ +/* done, */ +/* total, */ +/* priv->count); */ + } else { + gdouble percent = 0; + if (total != 0) /* Avoid division by zero. */ + percent = (gdouble)done/(gdouble)total; + + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar), + percent); + +/* printf ("debug: %s:\n determined progress (%i) changed (%i/%i) : %i\n", __FUNCTION__, */ +/* (int) priv->progress_bar, */ +/* done, */ +/* total, */ +/* priv->count); */ + } + /* Set text */ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress_bar), message); } + +void +modest_progress_bar_widget_set_undetermined_progress (ModestProgressBarWidget *self, + ModestMailOperation *mail_op) +{ + ModestMailOperationState *state = NULL; + + state = g_malloc0(sizeof(ModestMailOperationState)); + state->done = 0; + state->total = 0; + state->op_type = modest_mail_operation_get_type_operation (mail_op); + on_progress_changed (mail_op, state, self); + g_free(state); +}