copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fixes for activity dialog.

This commit is contained in:
Stephan Erb 2008-04-07 11:44:35 +00:00
parent 05218db68a
commit 7e6431fcea
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/helpers.py
View File

@ -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]

12
src/dialogs.py
View File

@ -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)'''