Changeset 822:08829c45f0a9

Timestamp:

09/25/16 06:45:38 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

A column descriptor can be marked as the default sortable one instead of hardwiring column 2 (re #307).

File:

• src/mlx/gui/flightlist.py (modified) (5 diffs)

src/mlx/gui/flightlist.py

@@ -13 +13 @@
     def __init__(self, attribute, heading, type = str,
                  convertFn = None, renderer = gtk.CellRendererText(),
-                 extraColumnAttributes = None, sortable = False):
+                 extraColumnAttributes = None, sortable = False,
+                 defaultSortable = False):
         """Construct the descriptor."""
         self._attribute = attribute
@@ -22 +23 @@
         self._extraColumnAttributes = extraColumnAttributes
         self._sortable = sortable
+        self._defaultSortable = defaultSortable
+
+    @property
+    def defaultSortable(self):
+        """Determine if this column is the default sortable one."""
+        return self._defaultSortable
 
     def appendType(self, types):
@@ -65 +72 @@
         ColumnDescriptor("callsign", xstr("flightsel_no")),
         ColumnDescriptor("departureTime", xstr("flightsel_deptime"),
-                         sortable = True),
+                         sortable = True, defaultSortable = True),
         ColumnDescriptor("departureICAO", xstr("flightsel_from"),
                          sortable = True),
@@ -80 +87 @@
 
         types = [int]
+        defaultSortableIndex = None
         for columnDescriptor in self._columnDescriptors:
+            if columnDescriptor.defaultSortable:
+                defaultSortableIndex = len(types)
             columnDescriptor.appendType(types)
 
         self._model = gtk.ListStore(*types)
-        self._model.set_sort_column_id(2, SORT_ASCENDING)
+        if defaultSortableIndex is not None:
+            self._model.set_sort_column_id(defaultSortableIndex,
+                                           SORT_ASCENDING)
         self._view = gtk.TreeView(self._model)
 
@@ -213 +225 @@
         ColumnDescriptor("callsign", xstr("flightsel_no")),
         ColumnDescriptor("departureTime", xstr("flightsel_deptime"),
-                         sortable = True),
+                         sortable = True, defaultSortable = True),
         ColumnDescriptor("departureICAO", xstr("flightsel_from"),
                          sortable = True),