Changeset 814:6886acd6bcd5 for src/mlx

Timestamp:

09/25/16 06:30:42 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Columns can be sorted in the flight list (re #307).

File:

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

src/mlx/gui/flightlist.py

@@ -11 +11 @@
     def __init__(self, attribute, heading, type = str,
                  convertFn = None, renderer = gtk.CellRendererText(),
-                 extraColumnAttributes = None):
+                 extraColumnAttributes = None, sortable = False):
         """Construct the descriptor."""
         self._attribute = attribute
@@ -19 +19 @@
         self._renderer = renderer
         self._extraColumnAttributes = extraColumnAttributes
+        self._sortable = sortable
 
     def appendType(self, types):
@@ -39 +40 @@
                                     text = index)
         column.set_expand(True)
+        if self._sortable:
+            column.set_sort_column_id(index)
+            column.set_sort_indicator(True)
 
         return column
@@ -63 +67 @@
         self._popupMenu = None
 
-        types = []
+        types = [int]
         for columnDescriptor in self._columnDescriptors:
             columnDescriptor.appendType(types)
 
         self._model = gtk.ListStore(*types)
+        self._model.set_sort_column_id(2, SORT_ASCENDING)
         self._view = gtk.TreeView(self._model)
 
-        index = 0
+        flightIndexColumn = gtk.TreeViewColumn()
+        flightIndexColumn.set_visible(False)
+        self._view.append_column(flightIndexColumn)
+
+        index = 1
         for columnDescriptor in self._columnDescriptors:
             column = columnDescriptor.getViewColumn(index)
@@ -106 +115 @@
             return None
         else:
-            path = model.get_path(iter)
-            [index] = path.get_indices() if pygobject else path
+            index = model.get_value(iter, 0)
             return index
 
@@ -116 +124 @@
     def addFlight(self, flight):
         """Add the given booked flight."""
-        values = []
+        values = [self._model.iter_n_children(None)]
         for columnDescriptor in self._columnDescriptors:
             values.append(columnDescriptor.getValueFrom(flight))