From 150d10943485b8a3d7326ac84ee93033e03cc538 Mon Sep 17 00:00:00 2001
From: js <js-gajim@webkeks.org>
Date: Thu, 14 Aug 2008 14:49:03 +0000
Subject: [PATCH] Sort activities.

---
 data/glade/change_activity_dialog.glade | 144 ++++++++++++------------
 src/dialogs.py                          |   6 +
 2 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/data/glade/change_activity_dialog.glade b/data/glade/change_activity_dialog.glade
index bc4d7cfcc..5c321eadf 100644
--- a/data/glade/change_activity_dialog.glade
+++ b/data/glade/change_activity_dialog.glade
@@ -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,13 +49,33 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="eating_vbox">
+              <widget class="GtkVBox" id="drinking_vbox">
                 <property name="visible">True</property>
               </widget>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkImage" id="drinking_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+                <property name="icon_size">1</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="eating_vbox">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkImage" id="eating_image">
                 <property name="visible">True</property>
@@ -64,7 +84,7 @@
               </widget>
               <packing>
                 <property name="type">tab</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -73,7 +93,7 @@
                 <property name="visible">True</property>
               </widget>
               <packing>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
@@ -82,26 +102,6 @@
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="relaxing_vbox">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkImage" id="relaxing_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
-                <property name="icon_size">1</property>
-              </widget>
               <packing>
                 <property name="type">tab</property>
                 <property name="position">3</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,59 +169,59 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="traveling_vbox">
+              <widget class="GtkVBox" id="relaxing_vbox">
                 <property name="visible">True</property>
               </widget>
               <packing>
                 <property name="position">7</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkImage" id="relaxing_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+                <property name="icon_size">1</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">7</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="talking_vbox">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="position">8</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkImage" id="talking_image">
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+                <property name="icon_size">1</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">8</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="traveling_vbox">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="position">9</property>
+              </packing>
+            </child>
             <child>
               <widget class="GtkImage" id="traveling_image">
                 <property name="visible">True</property>
                 <property name="stock">gtk-missing-image</property>
                 <property name="icon_size">1</property>
               </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="position">7</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="having_appointment_vbox">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="position">8</property>
-              </packing>
-            </child>
-            <child>
-              <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>
-              </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="position">8</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="drinking_vbox">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="position">9</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkImage" id="drinking_image">
-                <property name="visible">True</property>
-                <property name="stock">gtk-missing-image</property>
-                <property name="icon_size">1</property>
-              </widget>
               <packing>
                 <property name="type">tab</property>
                 <property name="position">9</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>
diff --git a/src/dialogs.py b/src/dialogs.py
index cced8bced..03936b3db 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -336,6 +336,7 @@ class ChangeActivityDialog:
 
 		rbtns = {}
 		group = None
+
 		for category in pep.ACTIVITIES:
 			item = self.xml.get_widget(category + '_image')
 			item.set_from_pixbuf(
@@ -360,7 +361,12 @@ class ChangeActivityDialog:
 				[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