Revert r10064 and to it the right way™.

This commit is contained in:
js 2008-07-29 19:42:31 +00:00
parent 981dca2b6b
commit 993d0d8609
3 changed files with 76 additions and 89 deletions

View File

@ -63,7 +63,6 @@
<child>
<widget class="GtkImage" id="working_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Working</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -106,7 +105,6 @@
<child>
<widget class="GtkImage" id="eating_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Eating</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -150,7 +148,6 @@
<child>
<widget class="GtkImage" id="exercising_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Exercising</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -194,7 +191,6 @@
<child>
<widget class="GtkImage" id="relaxing_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Relaxing</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -238,7 +234,6 @@
<child>
<widget class="GtkImage" id="talking_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Talking</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -282,7 +277,6 @@
<child>
<widget class="GtkImage" id="doing_chores_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Doing Chores</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -326,7 +320,6 @@
<child>
<widget class="GtkImage" id="inactive_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Inactive</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -370,7 +363,6 @@
<child>
<widget class="GtkImage" id="traveling_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Traveling</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -414,7 +406,6 @@
<child>
<widget class="GtkImage" id="having_appointment_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Having an Appointment</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -458,7 +449,6 @@
<child>
<widget class="GtkImage" id="drinking_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Drinking</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>
@ -502,7 +492,6 @@
<child>
<widget class="GtkImage" id="grooming_image">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Grooming</property>
<property name="stock">gtk-missing-image</property>
<property name="icon_size">1</property>
</widget>

View File

@ -72,7 +72,7 @@ ACTIVITIES = {
'shaving': _('Shaving'),
'taking_a_bath': _('Taking a Bath'),
'taking_a_shower': _('Taking a Shower')},
'having_appointment': {'category:': _('Having an Appointment')},
'having_appointment': {'category': _('Having an Appointment')},
'inactive': {'category': _('Inactive'),
'day_off': _('Day Off'),
'hanging_out': _('Haning out'),

View File

@ -355,8 +355,8 @@ class ChangeActivityDialog:
for category in pep.ACTIVITIES:
item = self.xml.get_widget(category + '_image')
item.set_from_pixbuf(
gtkgui_helpers.load_activity_icon(
category).get_pixbuf())
gtkgui_helpers.load_activity_icon(category).get_pixbuf())
gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category'])
vbox = self.xml.get_widget(category + '_vbox')
for activity in pep.ACTIVITIES[category]:
@ -370,10 +370,8 @@ class ChangeActivityDialog:
else:
rbtns[act] = group = gtk.RadioButton()
rbtns[act].set_label(
pep.ACTIVITIES[category][activity])
rbtns[act].connect('toggled',
self.on_rbtn_toggled,
rbtns[act].set_label(pep.ACTIVITIES[category][activity])
rbtns[act].connect('toggled', self.on_rbtn_toggled,
[category, activity])
vbox.pack_start(rbtns[act], False, False, 0)