From e265a386566ca7756eda00529fb869349e339d8f Mon Sep 17 00:00:00 2001 From: tanya Date: Thu, 6 May 2010 11:15:36 +0300 Subject: [PATCH] done missed calls and unread sms count in billboard --- applet/src/livewp-actor.c | 18 ++++++++++++------ applet/src/livewp-home-widget.c | 5 ++--- applet/src/livewp-scene.c | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/applet/src/livewp-actor.c b/applet/src/livewp-actor.c index be02fe1..cf028bc 100644 --- a/applet/src/livewp-actor.c +++ b/applet/src/livewp-actor.c @@ -135,10 +135,11 @@ change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin) GtkWidget *label; sqlite3 *db = NULL; sqlite3_stmt *res = NULL; - gchar *errMsg = NULL; - gchar sql[1024], str[2048]; + gchar *errMsg = NULL, *message; + gchar sql[1024]; gint call_count=0, sms_count=0, rc=0; GtkListStore *list = NULL; + PangoFontDescription *pfd = NULL; rc = sqlite3_open("/home/user/.rtcom-eventlogger/el.db", &db); if (rc){ @@ -163,7 +164,7 @@ change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin) fprintf(stderr, "not sqlite_row\n"); } call_count = sqlite3_column_int(res, 0); - fprintf(stderr, "count missing calls = %d\n", call_count); + //fprintf(stderr, "count missing calls = %d\n", call_count); sqlite3_finalize(res); snprintf(sql, sizeof(sql)-1, "select count(id) from Events where event_type_id=%d and is_read=%d", 7, 0); @@ -175,15 +176,20 @@ change_billboard(Actor * actor, AWallpaperPlugin *desktop_plugin) fprintf(stderr, "not sqlite_row\n"); } sms_count = sqlite3_column_int(res, 0); - fprintf(stderr, "count sms = %d\n", sms_count); + //fprintf(stderr, "count sms = %d\n", sms_count); sqlite3_finalize(res); //#endif sqlite3_close(db); } label = actor->image; - snprintf(str, sizeof(str)-1, "Missed calls: %d\nUnread sms: %d", call_count, sms_count); - gtk_label_set_text(label, str); + message = g_markup_printf_escaped("Missed calls: %d Unread sms: %d", "#FFFFFF", "#000000", call_count, sms_count); + gtk_label_set_markup(GTK_LABEL(label), message); + g_free(message); + pfd = pango_font_description_from_string("Sans 14"); + gtk_widget_modify_font(GTK_WIDGET(label), NULL); + gtk_widget_modify_font(GTK_WIDGET(label), pfd); + pango_font_description_free(pfd); actor->time_start_animation = time(NULL) + 20; } diff --git a/applet/src/livewp-home-widget.c b/applet/src/livewp-home-widget.c index d55208c..debd350 100644 --- a/applet/src/livewp-home-widget.c +++ b/applet/src/livewp-home-widget.c @@ -163,16 +163,15 @@ destroy_hildon_actor(Actor *actor) } void -create_hildon_actor_text(Actor *actor, AWallpaperPlugin *desktop_plugin, gchar *text) +create_hildon_actor_text(Actor *actor, AWallpaperPlugin *desktop_plugin) { GtkWidget *ha = NULL; GdkPixbuf *pixbuf = NULL; GtkWidget *image = NULL; GtkWidget *label = NULL; - gchar *str = NULL; ha = hildon_animation_actor_new(); - label = gtk_label_new(text); + label = gtk_label_new(NULL); if (label){ //g_signal_connect(G_OBJECT(label), "expose_event", diff --git a/applet/src/livewp-scene.c b/applet/src/livewp-scene.c index 1ec0db5..7410060 100644 --- a/applet/src/livewp-scene.c +++ b/applet/src/livewp-scene.c @@ -223,7 +223,7 @@ init_scene_Modern(AWallpaperPlugin *desktop_plugin) 460, 180, 9, 300, 108, TRUE, FALSE, 100, 255, (gpointer)&change_billboard, NULL, NULL); - create_hildon_actor_text(actor, desktop_plugin, ""); + create_hildon_actor_text(actor, desktop_plugin); //actor->time_start_animation = time(NULL) + 20; change_billboard(actor, desktop_plugin); scene->actors = g_slist_append(scene->actors, actor); -- 1.7.9.5