#define HEADER_HEIGHT 48
#define FOOTER_HEIGHT 24
-#define FOOTER_HEIGHT_PRESS 48 /* approx, used only for checking clicks, bigger than controls */
-#define FOOTER_WIDTH C_WIDTH/5
+#define FOOTER_HEIGHT_PRESS FOOTER_HEIGHT*2 /* approx, used only for checking clicks */
+#define FOOTER_WIDTH C_WIDTH/4
+#define FOOTER_WIDTH_PRESS (FOOTER_WIDTH + FOOTER_WIDTH/2) /* approx, used only for checking clicks, bigger than controls */
#define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT)
#define MESSAGE_WIDTH (C_WIDTH - 2*HILDON_MARGIN_DEFAULT)
-#define BOX_RADIOUS 10
+#define BOX_RADIOUS 20
#define SCROLL_PERIOD 100 /* ms */
#define SCROLL_STEP 1 /* pixel */
#define NOTIFICATION_UI_DBUS_PATH "/org/freedesktop/Telepathy/Client/NotificationUI"
#define NOTIFICATION_UI_DBUS_IFACE "com.nokia.RtcomNotificationUi"
+static const gchar *conv_services[] = {"RTCOM_EL_SERVICE_SMS",
+ "RTCOM_EL_SERVICE_CHAT",
+ NULL};
+static const gchar *conv_event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_INBOUND",
+ "RTCOM_EL_EVENTTYPE_CHAT_INBOUND",
+ NULL};
+
typedef enum {
SELECTED_NONE,
SELECTED_HEADER,
guint8 border_color[4];
PangoFontDescription *font_desc;
+ GdkPixbuf *service_pixbuf;
+
guint idle_id;
cairo_surface_t *message_surface;
GTK_WIDGET_CLASS (el_home_applet_parent_class)->realize (widget);
}
-/*
- * Thanks http://cairographics.org/cookbook/roundedrectangles/
+enum {
+ ROUND_CORNER_TL = 1,
+ ROUND_CORNER_TR = 1<<1,
+ ROUND_CORNER_BL = 1<<2,
+ ROUND_CORNER_BR = 1<<3,
+ ROUND_CORNER_ALL = ROUND_CORNER_TL | ROUND_CORNER_TR |
+ ROUND_CORNER_BL | ROUND_CORNER_BR
+};
+
+/**
+ * Draw rectangle with optional round corners.
+ *
+ * @x
+ * @y
+ * @w width
+ * @h height
+ * @r round corner radious
+ * @round_corners define which corners draw round, ROUND_CORNER_TL,
+ * ROUND_CORNER_TR, ROUND_CORNER_BL, ROUND_CORNER_BR
*/
static void
rounded_rectangle (cairo_t *cr,
- double x,
- double y,
- double w,
- double h,
- double r)
+ double x,
+ double y,
+ double w,
+ double h,
+ double r,
+ guint round_corners)
{
- cairo_move_to (cr, x + r, y);
- cairo_line_to (cr, x + w - r, y);
- cairo_curve_to (cr, x + w, y,
- x + w, y,
- x + w, y + r);
- cairo_line_to (cr, x + w, y + h - r);
- cairo_curve_to (cr, x + w, y + h,
- x + w, y + h,
- x + w - r, y + h);
- cairo_line_to (cr, x + r, y + h);
- cairo_curve_to (cr, x, y + h,
- x, y + h,
- x, y + h - r);
- cairo_line_to (cr, x, y + r);
- cairo_curve_to (cr, x, y,
- x, y,
- x + r, y);
+ if (round_corners & ROUND_CORNER_TL)
+ cairo_move_to (cr, x + r, y);
+ else
+ cairo_move_to (cr, x, y);
+
+ if (round_corners & ROUND_CORNER_TR) {
+ cairo_line_to (cr, x + w - r, y);
+ cairo_rel_curve_to (cr,
+ r, 0,
+ r, 0,
+ r, r);
+ }
+ else
+ cairo_line_to (cr, x + w, y);
+
+ if (round_corners & ROUND_CORNER_BR) {
+ cairo_line_to (cr, x + w, y + h - r);
+ cairo_rel_curve_to (cr,
+ 0, r,
+ 0, r,
+ -r, r);
+ }
+ else
+ cairo_line_to (cr, x + w, y + h);
+
+ if (round_corners & ROUND_CORNER_BL) {
+ cairo_line_to (cr, x + r, y + h);
+ cairo_rel_curve_to (cr,
+ -r, 0,
+ -r, 0,
+ -r, -r);
+ }
+ else
+ cairo_line_to (cr, x, y + h);
+
+ if (round_corners & ROUND_CORNER_TL) {
+ cairo_line_to (cr, x, y + r);
+ cairo_rel_curve_to (cr,
+ 0, -r,
+ 0, -r,
+ r, -r);
+ }
+ else
+ cairo_line_to (cr, x, y);
}
static cairo_surface_t*
CONTENT_OFFSET_Y_TOP,
BOX_WIDTH - 2*CONTENT_OFFSET_X,
BOX_HEIGHT - (CONTENT_OFFSET_Y_TOP + CONTENT_OFFSET_Y_BOTTOM),
- BOX_RADIOUS);
+ BOX_RADIOUS,
+ ROUND_CORNER_ALL);
cairo_close_path (cr);
cairo_stroke (cr);
cairo_set_line_width (cr, 1.0f);
cairo_translate (cr, CONTENT_OFFSET_X, CONTENT_OFFSET_Y_TOP);
- cairo_move_to (cr, 0, HEADER_HEIGHT);
- cairo_line_to (cr, 0, BOX_RADIOUS);
- cairo_curve_to (cr, 0, 0, 0, 0, BOX_RADIOUS, 0);
- cairo_line_to (cr, C_WIDTH - BOX_RADIOUS, 0);
- cairo_curve_to (cr, C_WIDTH, 0, C_WIDTH, 0, C_WIDTH, BOX_RADIOUS);
- cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
- cairo_line_to (cr, 0, HEADER_HEIGHT);
-
+ rounded_rectangle (cr,
+ 0, 0,
+ C_WIDTH, HEADER_HEIGHT,
+ BOX_RADIOUS,
+ ROUND_CORNER_TL | ROUND_CORNER_TR);
cairo_close_path (cr);
switch (priv->active) {
/* draw body */
if (!priv->message) {
- 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);
- cairo_line_to (cr, C_WIDTH - BOX_RADIOUS, C_HEIGHT);
- cairo_curve_to (cr, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT - BOX_RADIOUS);
- cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
- cairo_line_to (cr, 0, HEADER_HEIGHT);
+ rounded_rectangle (cr,
+ 0, HEADER_HEIGHT,
+ C_WIDTH, C_HEIGHT,
+ BOX_RADIOUS,
+ ROUND_CORNER_BL | ROUND_CORNER_BR);
cairo_close_path (cr);
}
else
cairo_pattern_destroy (grad);
if (priv->message) {
+ if (priv->service_pixbuf) {
+ gdk_cairo_set_source_pixbuf (cr,
+ priv->service_pixbuf,
+ 0, 0);
+ cairo_paint_with_alpha (cr, 0.5);
+ }
+
/* draw footer unread part bg */
- cairo_move_to (cr, 0, C_HEIGHT - FOOTER_HEIGHT);
- cairo_line_to (cr, 0, C_HEIGHT - BOX_RADIOUS);
- cairo_curve_to (cr, 0, C_HEIGHT, 0, C_HEIGHT, BOX_RADIOUS, C_HEIGHT);
- cairo_line_to (cr, FOOTER_WIDTH, C_HEIGHT);
- cairo_line_to (cr, FOOTER_WIDTH, C_HEIGHT - FOOTER_HEIGHT);
- cairo_line_to (cr, 0, C_HEIGHT - FOOTER_HEIGHT);
+ rounded_rectangle (cr,
+ 0, C_HEIGHT - FOOTER_HEIGHT,
+ FOOTER_WIDTH, FOOTER_HEIGHT,
+ BOX_RADIOUS,
+ ROUND_CORNER_BL);
cairo_close_path (cr);
/* draw body filling depending on (in)active state */
cairo_fill (cr);
/* draw footer received part bg */
- cairo_move_to (cr, FOOTER_WIDTH, C_HEIGHT - FOOTER_HEIGHT);
- cairo_rel_line_to (cr, 0, FOOTER_HEIGHT);
- cairo_rel_line_to (cr, C_WIDTH - FOOTER_WIDTH - BOX_RADIOUS, 0);
- cairo_rel_curve_to (cr, BOX_RADIOUS, 0, BOX_RADIOUS, 0, BOX_RADIOUS, -BOX_RADIOUS);
- cairo_rel_line_to (cr, 0, -(FOOTER_HEIGHT - BOX_RADIOUS));
- cairo_rel_line_to (cr, -(C_WIDTH - FOOTER_WIDTH), 0);
+ rounded_rectangle (cr,
+ FOOTER_WIDTH, C_HEIGHT - FOOTER_HEIGHT,
+ C_WIDTH - FOOTER_WIDTH, FOOTER_HEIGHT,
+ BOX_RADIOUS,
+ ROUND_CORNER_BR);
cairo_close_path (cr);
cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f);
{
ELHomeAppletPrivate *priv = self->priv;
+ if (priv->service_pixbuf) {
+ g_object_unref (priv->service_pixbuf);
+ priv->service_pixbuf = NULL;
+ }
+
if (priv->message) {
g_free (priv->message);
priv->message = NULL;
gtk_label_set_text (GTK_LABEL (priv->sender),
osso_abook_contact_get_display_name (priv->contact));
- avatar_image = osso_abook_avatar_get_image_rounded
+ avatar_image = osso_abook_avatar_get_image_scaled /*rounded*/
(OSSO_ABOOK_AVATAR (priv->contact),
HILDON_ICON_PIXEL_SIZE_THUMB,
HILDON_ICON_PIXEL_SIZE_THUMB,
- TRUE,
- -1,
- priv->border_color);
+ TRUE);
+ /* -1, */
+ /* priv->border_color); */
if (avatar_image) {
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->avatar),
RTComElQuery *query = NULL;
RTComElIter *it = NULL;
- static const gchar *services[] = {"RTCOM_EL_SERVICE_SMS",
- "RTCOM_EL_SERVICE_CHAT",
- NULL};
- static const gchar *event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_INBOUND",
- "RTCOM_EL_EVENTTYPE_CHAT_INBOUND",
- NULL};
-
query = rtcom_el_query_new (el);
rtcom_el_query_set_limit (query, 1);
if (event_id >= 0) {
rtcom_el_query_prepare (query,
- "is-read", FALSE, RTCOM_EL_OP_EQUAL,
"id", event_id, RTCOM_EL_OP_EQUAL,
- "service", services, RTCOM_EL_OP_IN_STRV,
- "event-type", event_types, RTCOM_EL_OP_IN_STRV,
NULL);
}
else {
rtcom_el_query_prepare (query,
"is-read", FALSE, RTCOM_EL_OP_EQUAL,
- "service", services, RTCOM_EL_OP_IN_STRV,
- "event-type", event_types, RTCOM_EL_OP_IN_STRV,
+ "service", conv_services, RTCOM_EL_OP_IN_STRV,
+ "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV,
NULL);
}
it = rtcom_el_get_events (el, query);
it = make_query (priv->eventlogger, -1);
show_event (self, it);
resolve_contact (self);
+
+ if (g_strcmp0 (priv->local_id, "ring/tel/ring" == 0)) {
+ McAccount *account;
+ const gchar *icon_name = NULL;
+ account = osso_abook_account_manager_lookup_by_name (NULL,
+ priv->local_id);
+ if (account) {
+ McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+ icon_name = mc_profile_get_icon_name (profile);
+ }
+ if (icon_name) {
+ GdkScreen *screen;
+ GtkIconTheme *icon_theme;
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (self));
+ icon_theme = gtk_icon_theme_get_for_screen (screen);
+
+ priv->service_pixbuf = gtk_icon_theme_load_icon (icon_theme,
+ icon_name,
+ 128,
+ 0, NULL);
+ }
+ }
+
if (it) g_object_unref (it);
}
const gchar *service,
ELHomeApplet *self)
{
- /* TODO: avoid updating if not related */
- add_new_idle (self);
+ const gchar** conv_service = conv_services;
+
+ do {
+ if (!g_strcmp0 (*conv_service, service)) {
+ add_new_idle (self);
+ return;
+ }
+ }
+ while(++conv_service);
}
static gboolean
3*CONTENT_OFFSET_X,
HEADER_HEIGHT + CONTENT_OFFSET_Y_TOP,
MESSAGE_WIDTH,
- C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT);
+ MESSAGE_HEIGHT);
to_continue = priv->scroll_offset <= priv->hidden_message_height;
if (!to_continue) {
priv->active = SELECTED_HEADER;
}
else if (event->y > (BOX_HEIGHT - CONTENT_OFFSET_Y_BOTTOM - FOOTER_HEIGHT_PRESS) &&
- event->x < FOOTER_WIDTH)
+ event->x < FOOTER_WIDTH_PRESS)
priv->active = SELECTED_FOOTER;
else
priv->active = SELECTED_BODY;
projects / conv-inbox / blobdiff