Put "no new messages" label back to the center

[conv-inbox] / src / el-home-applet.c

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 5835938..f61840b 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -33,7 +33,7 @@
                 EL_TYPE_HOME_APPLET, ELHomeAppletPrivate))
 
 #define BOX_WIDTH 352
-#define BOX_HEIGHT 252
+#define BOX_HEIGHT 266
 
 #define C_WIDTH (BOX_WIDTH - 2*HILDON_MARGIN_HALF)
 #define C_HEIGHT (BOX_HEIGHT - 2*HILDON_MARGIN_HALF)
@@ -55,6 +55,7 @@ struct _ELHomeAppletPrivate
         GtkWidget *icon;
         GtkWidget *unread;
         GtkWidget *received;
+        GtkWidget *empty;
 
         gint       event_id;
 
@@ -65,8 +66,6 @@ struct _ELHomeAppletPrivate
         const gchar *current_font;
 
         guint idle_id;
-        /* new or updated event id */
-        gint  new_event_id;
 };
 
 HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
@@ -148,6 +147,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         gdk_cairo_region (cr, event->region);
         cairo_clip (cr);
 
+        /* draw bound box */
         cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
         cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.1f);
@@ -163,6 +163,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         cairo_close_path(cr);
         cairo_stroke (cr);
 
+        /* draw header */
         cairo_set_line_width (cr, 1.0f);
 
         cairo_translate (cr, C_X, C_Y);
@@ -181,6 +182,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         cairo_set_source_rgba (cr, red, green, blue, 1.0f);
         cairo_stroke (cr);
 
+        /* draw body */
         cairo_move_to (cr, 0, HEADER_HEIGHT);
         cairo_line_to (cr, 0, C_HEIGHT - BOX_RADIOUS);
         cairo_curve_to (cr, 0, C_HEIGHT, 0, C_HEIGHT, BOX_RADIOUS, C_HEIGHT);
@@ -190,10 +192,24 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         cairo_line_to (cr, 0, HEADER_HEIGHT);
         cairo_close_path(cr);
 
-        if (priv->active)
-                cairo_set_source_rgba (cr, red, green, blue, 0.8f);
-        else
-                cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.8f);
+        /* draw body filling depending on (in)active state */
+        cairo_pattern_t *grad;
+        grad = cairo_pattern_create_linear(0, HEADER_HEIGHT,
+                                           0, C_HEIGHT);
+
+        if (priv->active){
+                cairo_pattern_add_color_stop_rgba (grad, 0.5f,
+                                                   red, green, blue, 0.8f);
+                cairo_pattern_add_color_stop_rgba (grad, 1.0f,
+                                                   red/2, green/2, blue/2, 0.8f);
+        }
+        else {
+                cairo_pattern_add_color_stop_rgba (grad, 0.5f,
+                                                   0.4f, 0.4f, 0.4f, 0.8f);
+                cairo_pattern_add_color_stop_rgba (grad, 1.0f,
+                                                   0.2f, 0.2f, 0.2f, 0.8f);
+        }
+        cairo_set_source (cr, grad);
         cairo_fill (cr);
 
         /* cairo_set_source_rgba (cr, red, green, blue, 1.0f); */
@@ -206,7 +222,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
         /*                    BOX_RADIOUS); */
         /* cairo_close_path(cr); */
         /* cairo_stroke (cr); */
-
+        cairo_pattern_destroy (grad);
         cairo_destroy (cr);
 
         return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, event);
@@ -292,7 +308,16 @@ show_event (ELHomeApplet *self, RTComElIter *it)
                 priv->event_id = -1;
         }
 
-        gtk_label_set_text (GTK_LABEL (priv->message), message);
+        if (message){
+                if (!GTK_WIDGET_VISIBLE (priv->message))
+                        gtk_widget_show (priv->message);
+                gtk_label_set_text (GTK_LABEL (priv->message), message);
+        }
+        else{
+                gtk_widget_hide (priv->message);
+                gtk_widget_show (priv->empty);
+        }
+
         gtk_label_set_text (GTK_LABEL (priv->sender), remote);
         gtk_label_set_text (GTK_LABEL (priv->received), received);
 
@@ -356,9 +381,13 @@ update_unread_label (ELHomeApplet *self)
         ELHomeAppletPrivate *priv = self->priv;
         gchar *text;
 
-        text = g_strdup_printf ("%d", priv->unread_count);
-        gtk_label_set_text (GTK_LABEL (priv->unread), text);
-        g_free (text);
+        if (priv->unread_count > 0){
+                text = g_strdup_printf ("%d", priv->unread_count);
+                gtk_label_set_text (GTK_LABEL (priv->unread), text);
+                g_free (text);
+        }
+        else
+                gtk_label_set_text (GTK_LABEL (priv->unread), NULL);
 }
 
 static gint
@@ -426,18 +455,10 @@ read_new_event (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        if (priv->new_event_id >= 0){
-                RTComElIter *it = NULL;
-                it = make_query (priv->eventlogger, priv->new_event_id);
-                if (it){
-                        if (rtcom_el_iter_first (it))
-                                show_event (self, it);
-                        g_object_unref (it);
-                }
-                priv->unread_count = query_unread_events (priv->eventlogger);
-                update_unread_label (self);
-        }
-        priv->new_event_id = -1;
+        read_event (self);
+        priv->unread_count = query_unread_events (priv->eventlogger);
+        update_unread_label (self);
+
         priv->idle_id = 0;
 
         return FALSE;
@@ -464,9 +485,6 @@ new_event_cb (RTComEl      *backend,
               const gchar  *service,
               ELHomeApplet *self)
 {
-        ELHomeAppletPrivate *priv = self->priv;
-
-        priv->new_event_id = event_id;
         add_new_idle (self);
 }
 
@@ -571,6 +589,11 @@ el_home_applet_init (ELHomeApplet *self)
                                      MESSAGE_HEIGHT);
         gtk_widget_set_name (priv->message, "hildon-shadow-label");
 
+        /* TODO: l10n */
+        priv->empty = gtk_label_new ("No new messages");
+        gtk_widget_set_name (priv->empty, "hildon-shadow-label");
+        GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL);
+
         priv->received = gtk_label_new ("aewf aewf aewf awef");
         gtk_misc_set_alignment (GTK_MISC (priv->received),
                                 1.0f,
@@ -589,6 +612,7 @@ el_home_applet_init (ELHomeApplet *self)
         vbox = gtk_vbox_new (FALSE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), priv->message, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), priv->empty, TRUE, TRUE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), priv->received, FALSE, FALSE, 0);
 
         align = gtk_alignment_new (0.5f, 0.0f, 1.0f, 1.0f);
@@ -625,9 +649,7 @@ el_home_applet_init (ELHomeApplet *self)
                           G_CALLBACK (new_event_cb),
                           self);
 
-        read_event (self);
-        priv->unread_count = query_unread_events (priv->eventlogger);
-        update_unread_label (self);
+        read_new_event (self);
 #endif
 }