[vidalia-svn] r1409: The logic for comparing two items in the list of servers was (trunk/src/gui/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-27 22:27:28 -0400 (Fri, 27 Oct 2006)
New Revision: 1409

Modified:
   trunk/src/gui/network/routerlistitem.cpp
   trunk/src/gui/network/routerlistwidget.cpp
Log:
The logic for comparing two items in the list of servers was precisely
backwards, so the little arrows in the header were always upside-down.


Modified: trunk/src/gui/network/routerlistitem.cpp
===================================================================
--- trunk/src/gui/network/routerlistitem.cpp	2006-10-28 01:59:44 UTC (rev 1408)
+++ trunk/src/gui/network/routerlistitem.cpp	2006-10-28 02:27:28 UTC (rev 1409)
@@ -110,10 +110,10 @@
   if (_list) {
     if (_list->sortColumn() == RouterListWidget::StatusColumn) {
       /* Numeric comparison based on status and/or bandwidth */
-      return (a->_statusValue > b->_statusValue);
+      return (a->_statusValue < b->_statusValue);
     } else if (_list->sortColumn() == RouterListWidget::NameColumn) {
       /* Perform a case-insensitive comparison based on router name */
-      return (a->name().toLower() > b->name().toLower());
+      return (a->name().toLower() < b->name().toLower());
     }
   }
   return QTreeWidgetItem::operator<(other);

Modified: trunk/src/gui/network/routerlistwidget.cpp
===================================================================
--- trunk/src/gui/network/routerlistwidget.cpp	2006-10-28 01:59:44 UTC (rev 1408)
+++ trunk/src/gui/network/routerlistwidget.cpp	2006-10-28 02:27:28 UTC (rev 1409)
@@ -39,11 +39,8 @@
   /* Create and initialize columns */
   setHeaderLabels(QStringList() << tr("Status") << tr("Server"));
 
-  /* Set the column size and sort order for the router list. We call
-   * sortByColumn() twice so that the highest bandwidth servers are at the top
-   * instead of the bottom. */
-  sortByColumn(StatusColumn);
-  sortByColumn(StatusColumn);
+  /* Sort by descending server bandwidth */
+  sortByColumn(StatusColumn, Qt::DescendingOrder);
 
   /* Find out when the selected item has changed. */
   connect(this, SIGNAL(itemSelectionChanged()),