Author: asterix Date: 2008-05-31 00:39:01 +0200 (Sat, 31 May 2008) New Revision: 9716
Modified: trunk/src/dialogs.py Log: show current mood / activity in the dialog for changing them. Fixes #3952
Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-05-30 21:43:53 UTC (rev 9715) +++ trunk/src/dialogs.py 2008-05-30 22:39:01 UTC (rev 9716) @@ -380,6 +380,18 @@ self.subactivity_combo.pack_start(cellrenderertext, True) self.subactivity_combo.add_attribute(cellrenderertext, 'text', 0)
+ con = gajim.connections[account] + if 'activity' in con.activity and con.activity['activity'] in \ + self.activities: + self.activity_combo.set_active(self.activities.keys().index( + con.activity['activity'])) + self.on_activity_combobox_changed(self.activity_combo) + else: + self.activity_combo.set_active(0) + + if 'text' in con.activity: + self.entry.set_text(con.activity['text']) + self.xml.signal_autoconnect(self) self.window.show_all()
@@ -393,6 +405,14 @@ self.liststore2.append((helpers.get_uf_activity(subactivity), subactivity)) self.subactivity_combo.set_sensitive(True) + con = gajim.connections[self.account] + if 'subactivity' in con.activity and con.activity['subactivity'] in\ + self.activities[selected_activity]: + self.subactivity_combo.set_active(self.activities[ + selected_activity].index(con.activity['subactivity'])) + else: + self.subactivity_combo.set_active(0) + else: self.subactivity_combo.set_sensitive(False)
@@ -449,6 +469,15 @@ for mood in self.moods: self.liststore.append((helpers.get_uf_mood(mood), mood))
+ con = gajim.connections[account] + if 'mood' in con.mood and con.mood['mood'] in self.moods: + self.combo.set_active(self.moods.index(con.mood['mood'])) + else: + self.combo.set_active(0) + + if 'text' in con.mood: + self.entry.set_text(con.mood['text']) + cellrenderertext = gtk.CellRendererText() self.combo.pack_start(cellrenderertext, True) self.combo.add_attribute(cellrenderertext, 'text', 0)