* src/maemo/modest-progress-bar-widget.c:

[modest] / src / maemo / modest-progress-bar-widget.c

diff --git a/src/maemo/modest-progress-bar-widget.c b/src/maemo/modest-progress-bar-widget.c
index 5c8d239..638ab31 100644 (file)
--- a/src/maemo/modest-progress-bar-widget.c
+++ b/src/maemo/modest-progress-bar-widget.c
@@ -32,6 +32,8 @@
 #include <widgets/modest-combo-box.h>
 #include "modest-progress-bar-widget.h"
 #include <string.h>
 #include <widgets/modest-combo-box.h>
 #include "modest-progress-bar-widget.h"
 #include <string.h>

+#include "modest-platform.h"
+#include "modest-runtime.h"

 
 /* 'private'/'protected' functions */
 static void modest_progress_bar_widget_class_init (ModestProgressBarWidgetClass *klass);
 
 /* '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_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,
 
 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->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;
 }
 
        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);
        GtkAdjustment *adj;
 
        priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE(self);

-       
+

        /* Alignment */
        align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE);
 
        /* Alignment */
        align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE);
 

@@ -232,19 +235,21 @@ modest_progress_bar_add_operation (ModestProgressObject *self,
                                                 "progress-changed",
                                                 G_CALLBACK (on_progress_changed),
                                                 me);
                                                 "progress-changed",
                                                 G_CALLBACK (on_progress_changed),
                                                 me);

-       if (priv->observables == NULL) {
+       /* Set curent operation */
+       if (priv->current == NULL) {

                priv->current = mail_op;
 
                /* Call progress_change handler to initialize progress message */
                state = g_malloc0(sizeof(ModestMailOperationState));
                state->done = 0;
                state->total = 0;
                priv->current = mail_op;
 
                /* Call progress_change handler to initialize progress message */
                state = g_malloc0(sizeof(ModestMailOperationState));
                state->done = 0;
                state->total = 0;

-               state->op_type = modest_mail_operation_get_type_operation (mail_op);;
+               state->op_type = modest_mail_operation_get_type_operation (mail_op);

                on_progress_changed (mail_op, state, me);
                g_free(state);
        }
                on_progress_changed (mail_op, state, me);
                g_free(state);
        }

-       priv->observables = g_slist_append (priv->observables, data);

 
 

+       /* Add operation to obserbable objects list */
+       priv->observables = g_slist_prepend (priv->observables, data);

 }
 
 static gint
 }
 
 static gint

@@ -258,19 +263,22 @@ compare_observable_data (ObservableData *data1, ObservableData *data2)
 
 static void 
 modest_progress_bar_remove_operation (ModestProgressObject *self,
 
 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;
 {
        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);
 
 
        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));
        /* 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);
        link = g_slist_find_custom (priv->observables,
                                    tmp_data,
                                    (GCompareFunc) compare_observable_data);

@@ -287,7 +295,7 @@ modest_progress_bar_remove_operation (ModestProgressObject *self,
        }
        
        /* Update the current mail operation */
        }
        
        /* 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
                if (priv->observables)
                        priv->current = ((ObservableData *) priv->observables->data)->mail_op;
                else

@@ -323,9 +331,35 @@ modest_progress_bar_cancel_current_operation (ModestProgressObject *self)
        priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me);
 
        if (priv->current == NULL) return;
        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);
        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,
 static void 
 on_progress_changed (ModestMailOperation  *mail_op, 
                     ModestMailOperationState *state,

@@ -340,7 +374,7 @@ on_progress_changed (ModestMailOperation  *mail_op,
        if (priv->current == mail_op) {
                gchar *msg = NULL;
                
        if (priv->current == mail_op) {
                gchar *msg = NULL;
                

-               determined = (state->done > 0 && state->total > 0) && 
+               determined = (state->done > 0 && state->total > 1) && 

                        !(state->done == 1 && state->total == 100);
 
                switch (state->op_type) {
                        !(state->done == 1 && state->total == 100);
 
                switch (state->op_type) {

@@ -355,7 +389,7 @@ on_progress_changed (ModestMailOperation  *mail_op,
                        if (determined)
                                msg = g_strdup_printf(_("mcen_me_sending"), state->done,
                                                      state->total);
                        if (determined)
                                msg = g_strdup_printf(_("mcen_me_sending"), state->done,
                                                      state->total);

-                       else 
+                       else

                                msg = g_strdup(_("mail_me_sending"));
                        break;
                        
                                msg = g_strdup(_("mail_me_sending"));
                        break;