This patch adds an option for graphical settings of sort style for accounts,
groups and contacts in roster.
Original version comes from psi-devel mailing and adds options only for
contacts sorting. I modified it to fit for roster-nr and adds ability to
set group and account sorting style as well.

Przemysław 'Troll' Maciąg <pmaciag (at) gmail (dot) com>

diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/options/opt_roster.cpp psi-0.10-test3/src/options/opt_roster.cpp
--- psi-0.10-test3-orig/src/options/opt_roster.cpp	2005-12-17 14:51:18.000000000 +0000
+++ psi-0.10-test3/src/options/opt_roster.cpp	2005-12-17 15:47:14.000000000 +0000
@@ -3,6 +3,7 @@
 #include "iconwidget.h"
 
 #include <qwhatsthis.h>
+#include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qbuttongroup.h>
@@ -40,6 +41,18 @@
 		tr("Makes Psi scroll the main window automatically so you can see new incoming events."));
 	QWhatsThis::add(d->ck_statusIndicator,
 		tr("Displays an indicator by the contact name if the contact entered a descriptive text status line."));
+	QWhatsThis::add(d->cb_accountOrderType, 
+		tr("<P>Set order of sorting account items in roster:</P>" 
+		   "<P><B>Status</B> - sort by status first of all.</P>" 
+		   "<P><B>Alphabetic order</B> - ignore status.</P>"));
+	QWhatsThis::add(d->cb_groupOrderType, 
+		tr("<P>Set order of sorting group items in roster:</P>" 
+		   "<P><B>Status</B> - sort by status first of all.</P>" 
+		   "<P><B>Alphabetic order</B> - ignore status.</P>"));
+	QWhatsThis::add(d->cb_contactOrderType, 
+		tr("<P>Set order of sorting contact items in roster:</P>" 
+		   "<P><B>Status</B> - sort by status first of all.</P>" 
+		   "<P><B>Alphabetic order</B> - ignore status.</P>"));
 	QWhatsThis::add(d->ck_useStatusLinebreak,
 		tr("Use new lines characters in shown statuses (shown statuses will be a bit bigger with this)."));
 
@@ -69,6 +82,9 @@
 	opt->scrollTo = d->ck_scrollTo->isChecked();
 	opt->clStIndicator = d->ck_statusIndicator->isChecked();
 	opt->clIconsAtTop  = d->ck_iconsAtTop->isChecked();
+	opt->rosterAccountSortStyle = static_cast<enum Options::Roster_AccountSortStyle>(d->cb_accountOrderType->currentItem());
+	opt->rosterGroupSortStyle = static_cast<enum Options::Roster_GroupSortStyle>(d->cb_groupOrderType->currentItem());
+	opt->rosterContactSortStyle = static_cast<enum Options::Roster_ContactSortStyle>(d->cb_contactOrderType->currentItem());
 	opt->smSingleLine = d->ck_useSingleLineStatus->isChecked();
 	opt->useStatusLinebreak = d->ck_useStatusLinebreak->isChecked();
 	opt->clTransportStatus = d->ck_transportStatus->isChecked();
@@ -90,6 +106,9 @@
 	d->ck_scrollTo->setChecked( opt->scrollTo );
 	d->ck_statusIndicator->setChecked( opt->clStIndicator );
 	d->ck_iconsAtTop->setChecked( opt->clIconsAtTop );
+	d->cb_accountOrderType->setCurrentItem ( static_cast<int> (opt->rosterAccountSortStyle) );
+	d->cb_groupOrderType->setCurrentItem ( static_cast<int> (opt->rosterGroupSortStyle) );
+	d->cb_contactOrderType->setCurrentItem ( static_cast<int> (opt->rosterContactSortStyle) );
 	d->ck_useSingleLineStatus->setChecked( opt->smSingleLine );
 	d->ck_useStatusLinebreak->setChecked( opt->useStatusLinebreak );
 	d->ck_transportStatus->setChecked( opt->clTransportStatus );
diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/options/opt_roster-ui.ui psi-0.10-test3/src/options/opt_roster-ui.ui
--- psi-0.10-test3-orig/src/options/opt_roster-ui.ui	2005-12-17 14:51:18.000000000 +0000
+++ psi-0.10-test3/src/options/opt_roster-ui.ui	2005-12-17 15:42:35.000000000 +0000
@@ -204,6 +204,75 @@
                 </widget>
             </widget>
         </widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel3</cstring>
+            </property>
+            <property name="text">
+                <string>Sort accounts by:</string>
+            </property>
+        </widget>
+	<widget class="QComboBox">
+	    <item>
+	        <property name="text">
+		     <string>Alphabetic order</string>
+		</property>
+	    </item>
+	    <item>
+	        <property name="text">
+		     <string>Rank order</string>
+		</property>
+	    </item>
+	    <property name="name">
+                <cstring>cb_accountOrderType</cstring>
+            </property>
+	</widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel4</cstring>
+            </property>
+            <property name="text">
+                <string>Sort groups by:</string>
+            </property>
+        </widget>
+	<widget class="QComboBox">
+	    <item>
+	        <property name="text">
+		     <string>Alphabetic order</string>
+		</property>
+	    </item>
+	    <item>
+	        <property name="text">
+		     <string>Rank</string>
+		</property>
+	    </item>
+	    <property name="name">
+                <cstring>cb_groupOrderType</cstring>
+            </property>
+	</widget>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>TextLabel5</cstring>
+            </property>
+            <property name="text">
+                <string>Sort contacts by:</string>
+            </property>
+        </widget>
+	<widget class="QComboBox">
+	    <item>
+	        <property name="text">
+		     <string>Status</string>
+		</property>
+	    </item>
+	    <item>
+	        <property name="text">
+		     <string>Alphabetic order</string>
+		</property>
+	    </item>
+	    <property name="name">
+                <cstring>cb_contactOrderType</cstring>
+            </property>
+	</widget>
     </vbox>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>