From 7e6431fcea80f46aaec1041a4aa0b6bb44c273d2 Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Mon, 7 Apr 2008 11:44:35 +0000 Subject: [PATCH] Small fixes for activity dialog. --- src/common/helpers.py | 4 ++-- src/dialogs.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/helpers.py b/src/common/helpers.py index 73e00b2c0..f0f8232ee 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -385,7 +385,7 @@ def get_uf_activity(activity): 'buying_groceries':_('buying groceries'), 'shaving':_('shaving'), 'getting_a_haircut':_('getting a haircut'), 'gaming':_('gaming'), 'having_dinner':_('having dinner'), 'doing_maintenance':_('doing maintenance'), - 'doing_the_laundry': _('doing the laundry'), + 'doing_the_laundry':_('doing the laundry'), 'on_video_phone':_('on video phone'), 'scheduled_holiday':_('scheduled holiday'), 'going_out':_('going out'), 'partying':_('partying'), 'having_a_snack':_('having a snack'), 'having_lunch':_('having lunch'), 'working_out':_('working out'), @@ -396,7 +396,7 @@ def get_uf_activity(activity): 'shopping':_('shopping'), 'on_a_train':_('on a train'), 'running':_('running'), 'taking_a_shower':_('taking a shower'), 'jogging':_('jogging'), 'in_a_meeting': _('in a meeting'), 'in_a_car':_('in a car'), - 'studying': _('studying'), 'swimming': _('swimming'), 'other': _('other'), + 'studying': _('studying'), 'swimming': _('swimming'), 'having_coffee': _('having coffee')} if activities.has_key(activity): return activities[activity] diff --git a/src/dialogs.py b/src/dialogs.py index 8227d7e96..60e3012fa 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -373,7 +373,7 @@ class ChooseGPGKeyDialog: class ChangeActivityDialog: activities = \ {'doing_chores': ['buying_groceries', 'cleaning', 'cooking', - 'doing_maintenance', 'doing_the_dishes' 'doing_the_laundry', + 'doing_maintenance', 'doing_the_dishes', 'doing_the_laundry', 'gardening', 'running_an_errand', 'walking_the_dog'], 'drinking': ['having_a_beer', 'having_coffee', 'having_tea'], 'eating': ['having_a_snack', 'having_breakfast', 'having_dinner', @@ -427,9 +427,13 @@ class ChangeActivityDialog: selected_activity = self.activity_combo.get_active() if selected_activity > -1: selected_activity = self.liststore1[selected_activity][1] - for subactivity in self.activities[selected_activity]: - self.liststore2.append((helpers.get_uf_activity(subactivity), - subactivity)) + if self.activities[selected_activity]: + for subactivity in self.activities[selected_activity]: + self.liststore2.append((helpers.get_uf_activity(subactivity), + subactivity)) + self.subactivity_combo.set_sensitive(True) + else: + self.subactivity_combo.set_sensitive(False) def on_ok_button_clicked(self, widget): '''Return activity and messsage (None if no activity selected)'''