Changeset 836:df442f51e8de for src/mlx

Timestamp:

04/17/17 07:01:42 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Extracted the creation of the flight type combo box.

Location:

src/mlx/gui

Files:

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

src/mlx/gui/common.py

@@ -519 +519 @@
 
 #------------------------------------------------------------------------------
+
+def createFlightTypeComboBox():
+        flightTypeModel = gtk.ListStore(str, int)
+        for type in _const.flightTypes:
+            name = "flighttype_" + _const.flightType2string(type)
+            flightTypeModel.append([xstr(name), type])
+
+        flightType = gtk.ComboBox(model = flightTypeModel)
+        renderer = gtk.CellRendererText()
+        flightType.pack_start(renderer, True)
+        flightType.add_attribute(renderer, "text", 0)
+
+        return flightType
+
+#------------------------------------------------------------------------------

src/mlx/gui/flight.py

@@ -4521 +4521 @@
 class FinishPage(Page):
     """Flight finish page."""
-    _flightTypes = [ ("flighttype_scheduled", const.FLIGHTTYPE_SCHEDULED),
-                     ("flighttype_ot", const.FLIGHTTYPE_OLDTIMER),
-                     ("flighttype_vip", const.FLIGHTTYPE_VIP),
-                     ("flighttype_charter", const.FLIGHTTYPE_CHARTER) ]
-
     def __init__(self, wizard, saveHelper):
         """Construct the finish page."""
@@ -4658 +4653 @@
         table.attach(labelAlignment, 0, 1, row, row+1)
 
-        flightTypeModel = gtk.ListStore(str, int)
-        for (name, type) in FinishPage._flightTypes:
-            flightTypeModel.append([xstr(name), type])
-
-        self._flightType = gtk.ComboBox(model = flightTypeModel)
-        renderer = gtk.CellRendererText()
-        self._flightType.pack_start(renderer, True)
-        self._flightType.add_attribute(renderer, "text", 0)
+        self._flightType = createFlightTypeComboBox()
         self._flightType.set_tooltip_text(xstr("finish_type_tooltip"))
         self._flightType.set_active(0)