X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-progress-bar-widget.c;h=e8ce5d8a4486a7a75cc378430f411b0d9fb45831;hb=fce141104a93d994fa67163492c07a1ea2cc8f72;hp=bd4cc3ea52d1038930c96c8d0c09ede4c39d4ff2;hpb=f213c6daa765f3de742ba2a2475a5ecf4c181d94;p=modest diff --git a/src/maemo/modest-progress-bar-widget.c b/src/maemo/modest-progress-bar-widget.c index bd4cc3e..e8ce5d8 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,11 +46,11 @@ 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_current_operation (ModestProgressObject *self); -static guint -modest_progress_bar_num_pending_operations (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, @@ -100,6 +102,7 @@ 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; } @@ -171,7 +174,7 @@ 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); @@ -218,9 +221,10 @@ 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; + ModestMailOperationState *state = NULL; me = MODEST_PROGRESS_BAR_WIDGET (self); priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); @@ -231,13 +235,19 @@ modest_progress_bar_add_operation (ModestProgressObject *self, "progress-changed", G_CALLBACK (on_progress_changed), me); - if (priv->observables == NULL) { - priv->current = mail_op; - } - priv->observables = g_slist_append (priv->observables, data); + /* Set curent operation */ + priv->current = mail_op; /* Call progress_change handler to initialize progress message */ -/* on_progress_changed (mail_op, me); */ + 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, me); */ + g_free(state); + + /* Add operation to obserbable objects list */ + priv->observables = g_slist_prepend (priv->observables, data); } static gint @@ -251,19 +261,22 @@ 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 = mail_op; + tmp_data->mail_op = mail_op; link = g_slist_find_custom (priv->observables, tmp_data, (GCompareFunc) compare_observable_data); @@ -280,7 +293,7 @@ modest_progress_bar_remove_operation (ModestProgressObject *self, } /* 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 @@ -316,9 +329,35 @@ modest_progress_bar_cancel_current_operation (ModestProgressObject *self) priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me); if (priv->current == NULL) return; + + /* If received canceled we shall show banner */ + if (modest_mail_operation_get_type_operation (priv->current) == + MODEST_MAIL_OPERATION_TYPE_RECEIVE) + modest_platform_information_banner (NULL, NULL, + _("emev_ib_ui_pop3_msg_recv_cancel")); + 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); + + /* If received canceled we shall show banner */ + if (priv->current && modest_mail_operation_get_type_operation (priv->current) == + MODEST_MAIL_OPERATION_TYPE_RECEIVE) + modest_platform_information_banner (NULL, NULL, + _("emev_ib_ui_pop3_msg_recv_cancel")); + + /* 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, @@ -348,7 +387,7 @@ on_progress_changed (ModestMailOperation *mail_op, if (determined) msg = g_strdup_printf(_("mcen_me_sending"), state->done, state->total); - else + else msg = g_strdup(_("mail_me_sending")); break; @@ -360,7 +399,7 @@ on_progress_changed (ModestMailOperation *mail_op, } /* If we have byte information use it */ - if ((state->bytes_done == 0) && (state->bytes_total == 0)) + if ((state->bytes_done != 0) && (state->bytes_total != 0)) modest_progress_bar_widget_set_progress (self, msg, state->bytes_done, state->bytes_total); @@ -400,17 +439,22 @@ modest_progress_bar_widget_set_progress (ModestProgressBarWidget *self, g_return_if_fail (done <= total); priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self); - - /* Set progress */ - if (total != 100) /* FIXME: tinymail send 1/100 when it doesn't know better.. */ { + + /* 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 */ + if ((done == 0 && total == 0) || + (done == 1 && total == 100)) { + gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar)); + } 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); - }else - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar)); + percent); + } /* Set text */ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress_bar), message);