From 06d21070a78bdcaac4b1b23384ae5791f8d0f5ff Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Sep 2013 11:34:31 -0500 Subject: add 'title' to the root action's state dict --- src/service.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/service.c b/src/service.c index 0928205..3ba1c24 100644 --- a/src/service.c +++ b/src/service.c @@ -453,6 +453,7 @@ create_desktop_header_state (IndicatorDatetimeService * self) gchar * str; gboolean visible; GDateTime * now; + const gchar * title = _("Date and Time"); visible = g_settings_get_boolean (self->priv->settings, SETTINGS_SHOW_CLOCK_S); @@ -469,6 +470,7 @@ create_desktop_header_state (IndicatorDatetimeService * self) g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT); g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_string (str)); g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (str)); + g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title)); g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (visible)); /* cleanup */ @@ -489,6 +491,7 @@ create_phone_header_state (IndicatorDatetimeService * self) gchar * label; gboolean has_alarms; gchar * a11y; + const gchar * title = _("Date and Time"); g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT); @@ -515,6 +518,7 @@ create_phone_header_state (IndicatorDatetimeService * self) g_variant_new_take_string (a11y)); g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE)); + g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title)); g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label)); /* cleanup */ -- cgit v1.2.3 From 9233c969e7fe1de9442b233258a183466b5f068a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Sep 2013 12:12:10 -0500 Subject: in the phone profile, move the day-of-week entry from the first menuitem to the header action state's title as per the spec --- src/service.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/service.c b/src/service.c index 3ba1c24..ce8139f 100644 --- a/src/service.c +++ b/src/service.c @@ -491,7 +491,7 @@ create_phone_header_state (IndicatorDatetimeService * self) gchar * label; gboolean has_alarms; gchar * a11y; - const gchar * title = _("Date and Time"); + gchar * title; g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT); @@ -518,9 +518,12 @@ create_phone_header_state (IndicatorDatetimeService * self) g_variant_new_take_string (a11y)); g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE)); - g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title)); g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label)); + /* title is day-of-week */ + title = g_date_time_format (now, _("%A")); + g_variant_builder_add (&b, "{sv}", "title", g_variant_new_take_string (title)); + /* cleanup */ g_date_time_unref (now); return g_variant_builder_end (&b); @@ -651,9 +654,6 @@ create_phone_calendar_section (IndicatorDatetimeService * self) { GMenu * menu = g_menu_new (); - /* strftime(3) format string to show day of week */ - add_localtime_menuitem (menu, self, _("%A"), NULL); - /* strftime(3) format string to show date */ add_localtime_menuitem (menu, self, _("%e %B %Y"), "calendar"); -- cgit v1.2.3