Changeset 818:e58b0fa0408a

Timestamp:

09/25/16 06:34:33 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The default column descriptors are moved to the FlightList (re #307).

Location:

src/mlx/gui

Files:

• flight.py (modified) (2 diffs)
• flightlist.py (modified) (1 diff)

src/mlx/gui/flight.py

@@ -437 +437 @@
 class FlightSelectionPage(Page):
     """The page to select the flight."""
-    columnDescriptors = [
-        ColumnDescriptor("callsign", xstr("flightsel_no")),
-        ColumnDescriptor("departureTime", xstr("flightsel_deptime")),
-        ColumnDescriptor("departureICAO", xstr("flightsel_from")),
-        ColumnDescriptor("arrivalICAO", xstr("flightsel_to"))
-    ]
-
     def __init__(self, wizard):
         """Construct the flight selection page."""
@@ -452 +445 @@
                                                   help, completedHelp = completedHelp)
 
-        self._flightList = FlightList(FlightSelectionPage.columnDescriptors,
-                                      popupMenuProducer =
+        self._flightList = FlightList(popupMenuProducer =
                                       self._createListPopupMenu,
                                       widthRequest = 400)

src/mlx/gui/flightlist.py

@@ -59 +59 @@
     This is a complete widget with a scroll window. It is alignment centered
     horizontally and expandable vertically."""
-    def __init__(self, columnDescriptors, popupMenuProducer = None,
-                 widthRequest = None):
+
+    defaultColumnDescriptors = [
+        ColumnDescriptor("callsign", xstr("flightsel_no")),
+        ColumnDescriptor("departureTime", xstr("flightsel_deptime"),
+                         sortable = True),
+        ColumnDescriptor("departureICAO", xstr("flightsel_from"),
+                         sortable = True),
+        ColumnDescriptor("arrivalICAO", xstr("flightsel_to"), sortable = True)
+    ]
+
+    def __init__(self, columnDescriptors = defaultColumnDescriptors,
+                 popupMenuProducer = None, widthRequest = None):
         """Construct the flight list with the given column descriptors."""