Author: js Date: 2008-08-14 16:49:03 +0200 (Thu, 14 Aug 2008) New Revision: 10239

Modified: trunk/data/glade/change_activity_dialog.glade trunk/src/dialogs.py Log: Sort activities.

Modified: trunk/data/glade/change_activity_dialog.glade =================================================================== --- trunk/data/glade/change_activity_dialog.glade 2008-08-14 14:12:11 UTC (rev 10238) +++ trunk/data/glade/change_activity_dialog.glade 2008-08-14 14:49:03 UTC (rev 10239) @@ -33,12 +33,12 @@ <property name="sensitive">False</property> <property name="can_focus">True</property> <child> - <widget class="GtkVBox" id="working_vbox"> + <widget class="GtkVBox" id="doing_chores_vbox"> <property name="visible">True</property> </widget> </child> <child> - <widget class="GtkImage" id="working_image"> + <widget class="GtkImage" id="doing_chores_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -49,7 +49,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="eating_vbox"> + <widget class="GtkVBox" id="drinking_vbox"> <property name="visible">True</property> </widget> <packing> @@ -57,7 +57,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="eating_image"> + <widget class="GtkImage" id="drinking_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -69,7 +69,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="exercising_vbox"> + <widget class="GtkVBox" id="eating_vbox"> <property name="visible">True</property> </widget> <packing> @@ -77,7 +77,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="exercising_image"> + <widget class="GtkImage" id="eating_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -89,7 +89,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="relaxing_vbox"> + <widget class="GtkVBox" id="exercising_vbox"> <property name="visible">True</property> </widget> <packing> @@ -97,7 +97,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="relaxing_image"> + <widget class="GtkImage" id="exercising_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -109,7 +109,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="talking_vbox"> + <widget class="GtkVBox" id="grooming_vbox"> <property name="visible">True</property> </widget> <packing> @@ -117,7 +117,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="talking_image"> + <widget class="GtkImage" id="grooming_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -129,7 +129,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="doing_chores_vbox"> + <widget class="GtkVBox" id="having_appointment_vbox"> <property name="visible">True</property> </widget> <packing> @@ -137,7 +137,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="doing_chores_image"> + <widget class="GtkImage" id="having_appointment_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -169,7 +169,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="traveling_vbox"> + <widget class="GtkVBox" id="relaxing_vbox"> <property name="visible">True</property> </widget> <packing> @@ -177,7 +177,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="traveling_image"> + <widget class="GtkImage" id="relaxing_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -189,7 +189,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="having_appointment_vbox"> + <widget class="GtkVBox" id="talking_vbox"> <property name="visible">True</property> </widget> <packing> @@ -197,7 +197,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="having_appointment_image"> + <widget class="GtkImage" id="talking_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -209,7 +209,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="drinking_vbox"> + <widget class="GtkVBox" id="traveling_vbox"> <property name="visible">True</property> </widget> <packing> @@ -217,7 +217,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="drinking_image"> + <widget class="GtkImage" id="traveling_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property> @@ -229,7 +229,7 @@ </packing> </child> <child> - <widget class="GtkVBox" id="grooming_vbox"> + <widget class="GtkVBox" id="working_vbox"> <property name="visible">True</property> </widget> <packing> @@ -237,7 +237,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="grooming_image"> + <widget class="GtkImage" id="working_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon_size">1</property>

Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-08-14 14:12:11 UTC (rev 10238) +++ trunk/src/dialogs.py 2008-08-14 14:49:03 UTC (rev 10239) @@ -336,6 +336,7 @@

rbtns = {} group = None + for category in pep.ACTIVITIES: item = self.xml.get_widget(category + '_image') item.set_from_pixbuf( @@ -360,7 +361,12 @@ [category, 'other']) vbox.pack_start(rbtns[act], False, False, 0)

+ activities = [] for activity in pep.ACTIVITIES[category]: + activities.append(activity) + activities.sort() + + for activity in activities: if activity == 'category': continue