Merge lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime/0.3

Proposed by Karl Lattimer on 2011-03-23
Status: Merged
Merged at revision: 75
Proposed branch: lp:~karl-qdh/indicator-datetime/sniffles
Merge into: lp:indicator-datetime/0.3
Diff against target: 46 lines (+7/-3)
3 files modified
data/datetime-dialog.ui (+1/-1)
src/datetime-service.c (+5/-1)
src/utils.c (+1/-1)
To merge this branch: bzr merge lp:~karl-qdh/indicator-datetime/sniffles
Reviewer Review Type Date Requested Status
David Barth 2011-03-23 Approve on 2011-03-23
Review via email: mp+54501@code.launchpad.net

Description of the change

Two UX bugs from MPT 'sniffles'

To post a comment you must log in.
David Barth (dbarth) wrote :

You need to check that evolution is installed before you enable the items. It's ok not to update that when it's installed after the indicator has started or if it gets uninstalled though.

There is an example for that at: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-me/trunk/view/head:/src/me-service.c#L251

review: Needs Fixing
Karl Lattimer (karl-qdh) wrote :

this is already done a few lines above the diff;

368: datetime-service.c
gchar *evo = g_find_program_in_path("evolution");
 if (evo != NULL) {
  g_debug("Found the calendar application: %s", evo);

75. By Karl Lattimer on 2011-03-23

Date and time -> Date and month *sniffles*

76. By Karl Lattimer on 2011-03-23

Removed comma from date time indicator

David Barth (dbarth) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/datetime-dialog.ui'
2--- data/datetime-dialog.ui 2011-03-03 13:10:00 +0000
3+++ data/datetime-dialog.ui 2011-03-23 12:26:42 +0000
4@@ -474,7 +474,7 @@
5 </child>
6 <child>
7 <object class="GtkCheckButton" id="showDateTimeCheck">
8- <property name="label" translatable="yes">_Date and time</property>
9+ <property name="label" translatable="yes">_Date and month</property>
10 <property name="visible">True</property>
11 <property name="can_focus">True</property>
12 <property name="receives_default">False</property>
13
14=== modified file 'src/datetime-service.c'
15--- src/datetime-service.c 2011-03-22 21:38:50 +0000
16+++ src/datetime-service.c 2011-03-23 12:26:42 +0000
17@@ -371,11 +371,15 @@
18 dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
19 dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
20
21+ dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
22+ g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
23+ G_CALLBACK (activate_cb), "evolution -c calendar");
24+
25 events_separator = dbusmenu_menuitem_new();
26 dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
27 dbusmenu_menuitem_child_add_position(root, events_separator, 2);
28 add_appointment = dbusmenu_menuitem_new();
29- dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Appointment"));
30+ dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event..."));
31 dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
32 g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "evolution -c calendar");
33 dbusmenu_menuitem_child_add_position (root, add_appointment, 3);
34
35=== modified file 'src/utils.c'
36--- src/utils.c 2011-02-25 14:18:57 +0000
37+++ src/utils.c 2011-03-23 12:26:42 +0000
38@@ -183,7 +183,7 @@
39 /* TRANSLATORS: This is a format string passed to strftime to combine the
40 date and the time. The value of "%s, %s" would result in a string like
41 this in US English 12-hour time: 'Fri Jul 16, 11:50 AM' */
42- return g_strdup_printf(T_("%s, %s"), date_string, time_string);
43+ return g_strdup_printf(T_("%s %s"), date_string, time_string);
44 }
45
46 gchar *

Subscribers

People subscribed via source and target branches