Changeset 98:f017d907fa39

Timestamp:

04/21/12 14:58:44 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The delay code buttons are generated in a more generic way

Location:

src/mlx

Files:

• const.py (modified) (1 diff)
• gui/info.py (modified) (2 diffs)

src/mlx/const.py

@@ -143 +143 @@
 # Flight type: charter
 FLIGHTTYPE_CHARTER = 3
+
+#-------------------------------------------------------------------------------
+
+# Delay code: loading problems
+DELAYCODE_LOADING = 0
+
+# Delay code: VATSIM problem
+DELAYCODE_VATSIM = 1
+
+# Delay code: network problems
+DELAYCODE_NETWORK = 2
+
+# Delay code: controller's fault
+DELAYCODE_CONTROLLER = 3
+
+# Delay code: system crash or freeze
+DELAYCODE_SYSTEM = 4
+
+# Delay code: navigation problem
+DELAYCODE_NAVIGATION = 5
+
+# Delay code: traffic problems
+DELAYCODE_TRAFFIC = 6
+
+# Delay code: apron navigation
+DELAYCODE_APRON = 7
+
+# Delay code: weather problems
+DELAYCODE_WEATHER = 8
+
+# Delay code: personal reasons
+DELAYCODE_PERSONAL = 9
 
 #-------------------------------------------------------------------------------

src/mlx/gui/info.py

@@ -3 +3 @@
 from common import *
 
+import mlx.const as const
+
 class FlightInfo(gtk.VBox):
     """The flight info tab."""
+    _delayCodes = [ (const.DELAYCODE_LOADING, "L_oading problems"),
+                    (const.DELAYCODE_VATSIM, "_VATSIM problem"),
+                    (const.DELAYCODE_NETWORK, "_Net problems"),
+                    (const.DELAYCODE_CONTROLLER, "Controller's _fault"),
+                    (const.DELAYCODE_SYSTEM, "S_ystem crash/freeze"),
+                    (const.DELAYCODE_NAVIGATION, "Navi_gation problem"),
+                    (const.DELAYCODE_TRAFFIC, "T_raffic problems"),
+                    (const.DELAYCODE_APRON, "_Apron navigation problem"),
+                    (const.DELAYCODE_WEATHER, "_Weather problems"),
+                    (const.DELAYCODE_PERSONAL, "_Personal reasons") ]
+    
     @staticmethod
     def _createCommentArea(label):
@@ -69 +82 @@
         table.set_col_spacings(16)
 
-        self._loadingProblems = gtk.CheckButton("L_oading problems")
-        self._loadingProblems.set_use_underline(True)
-        table.attach(self._loadingProblems, 0, 1, 0, 1)
+        row = 0
+        column = 0
 
-        self._vatsimProblem = gtk.CheckButton("_VATSIM problem")
-        self._vatsimProblem.set_use_underline(True)
-        table.attach(self._vatsimProblem, 1, 2, 0, 1)
-
-        self._netProblems = gtk.CheckButton("_Net problems")
-        self._netProblems.set_use_underline(True)
-        table.attach(self._netProblems, 0, 1, 1, 2)
-
-        self._controllersFault = gtk.CheckButton("Controllers _fault")
-        self._controllersFault.set_use_underline(True)
-        table.attach(self._controllersFault, 1, 2, 1, 2)
-
-        self._systemCrash = gtk.CheckButton("S_ystem crash/freeze")
-        self._systemCrash.set_use_underline(True)
-        table.attach(self._systemCrash, 0, 1, 2, 3)
-
-        self._navigationProblem = gtk.CheckButton("Navi_gation problem")
-        self._navigationProblem.set_use_underline(True)
-        table.attach(self._navigationProblem, 1, 2, 2, 3)
-
-        self._trafficProblems = gtk.CheckButton("T_raffic problems")
-        self._trafficProblems.set_use_underline(True)
-        table.attach(self._trafficProblems, 0, 1, 3, 4)
-
-        self._apronProblem = gtk.CheckButton("_Apron navigation problem")
-        self._apronProblem.set_use_underline(True)
-        table.attach(self._apronProblem, 1, 2, 3, 4)
-
-        self._weatherProblems = gtk.CheckButton("_Weather problems")
-        self._weatherProblems.set_use_underline(True)
-        table.attach(self._weatherProblems, 0, 1, 4, 5)
-
-        self._personalReasons = gtk.CheckButton("_Personal reasons")
-        self._personalReasons.set_use_underline(True)
-        table.attach(self._personalReasons, 1, 2, 4, 5)
+        self._delayCodeWidgets = []
+        for (_code, label) in FlightInfo._delayCodes:
+            button = gtk.CheckButton(label)
+            button.set_use_underline(True)
+            table.attach(button, column, column + 1, row, row + 1)
+            self._delayCodeWidgets.append(button)
+            if column==0:
+                column += 1
+            else:
+                row += 1
+                column = 0
 
         alignment.add(table)