Changes in src/mlx/gui/info.py [441:226907f421a6:349:41c486c8a0b4]

File:

• src/mlx/gui/info.py (modified) (7 diffs)

src/mlx/gui/info.py

@@ -1 +1 @@
 
 from common import *
-
-from mlx.gui.delaycodes import DelayCodeTable
 
 from mlx.i18n import xstr
@@ -23 +21 @@
     """The flight info tab."""
     @staticmethod
+    def _delayCodes():
+        """Get an array of delay codes."""
+        return [ (const.DELAYCODE_LOADING, xstr("info_delay_loading")),
+                 (const.DELAYCODE_VATSIM, xstr("info_delay_vatsim")),
+                 (const.DELAYCODE_NETWORK, xstr("info_delay_net")),
+                 (const.DELAYCODE_CONTROLLER, xstr("info_delay_atc")),
+                 (const.DELAYCODE_SYSTEM, xstr("info_delay_system")),
+                 (const.DELAYCODE_NAVIGATION, xstr("info_delay_nav")),
+                 (const.DELAYCODE_TRAFFIC, xstr("info_delay_traffic")),
+                 (const.DELAYCODE_APRON, xstr("info_delay_apron")),
+                 (const.DELAYCODE_WEATHER, xstr("info_delay_weather")),
+                 (const.DELAYCODE_PERSONAL, xstr("info_delay_personal")) ]
+
+    @staticmethod
     def _createCommentArea(label):
         """Create a comment area.
@@ -40 +52 @@
 
         scroller = gtk.ScrolledWindow()
-        scroller.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-        scroller.set_shadow_type(SHADOW_IN)
-
+        # FIXME: these should be constants
+        scroller.set_policy(gtk.PolicyType.AUTOMATIC if pygobject
+                            else gtk.POLICY_AUTOMATIC,
+                            gtk.PolicyType.AUTOMATIC if pygobject
+                            else gtk.POLICY_AUTOMATIC)
+        scroller.set_shadow_type(gtk.ShadowType.IN if pygobject
+                                 else gtk.SHADOW_IN)
         comments = gtk.TextView()
         comments.set_wrap_mode(WRAP_WORD)
@@ -78 +94 @@
 
         alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
-                                  xscale = 1.0, yscale = 1.0)
+                                  xscale = 0.0, yscale = 0.0)
         alignment.set_padding(padding_top = 4, padding_bottom = 4,
                               padding_left = 8, padding_right = 8)
 
-        self._delayCodeTable = table = DelayCodeTable()
-        self._delayWindow = scrolledWindow = gtk.ScrolledWindow()
-        scrolledWindow.add(table)
-        scrolledWindow.set_size_request(-1, 185)
-        scrolledWindow.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-        scrolledWindow.set_shadow_type(SHADOW_IN)
+        self._delayTable = table = gtk.Table(5, 2)
+        table.set_col_spacings(16)
 
-        alignment.add(scrolledWindow)
+        row = 0
+        column = 0
+
+        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)
         frame.add(alignment)
 
         self._delayAlignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,
-                                             xscale = 1.0, yscale = 1.0)
+                                             xscale = 0.0, yscale = 0.0)
         self._delayAlignment.add(frame)
-        self._delayAlignment.set_padding(padding_top = 0, padding_bottom = 0,
-                                         padding_left = 8, padding_right = 8)
 
         self.pack_start(self._delayAlignment, False, False, 8)
@@ -122 +147 @@
     def delayCodes(self):
         """Get the list of delay codes checked by the user."""
-        return self._delayCodeTable.delayCodes
+        codes =  []
+        delayCodes = FlightInfo._delayCodes()
+        for index in range(0, len(delayCodes)):
+            if self._delayCodeWidgets[index].get_active():
+                codes.append(delayCodes[index][0])
+        return codes
 
-    def enable(self, aircraftType):
+    def enable(self):
         """Enable the flight info tab."""
         self._comments.set_sensitive(True)
         self._flightDefects.set_sensitive(True)
-        self._delayCodeTable.setType(aircraftType)
-        self._delayWindow.set_sensitive(True)
-        self._delayCodeTable.setStyle()
+        self._delayTable.set_sensitive(True)
 
     def disable(self):
@@ -136 +164 @@
         self._comments.set_sensitive(False)
         self._flightDefects.set_sensitive(False)
-        self._delayWindow.set_sensitive(False)
-        self._delayCodeTable.setStyle()
+        self._delayTable.set_sensitive(False)
 
     def reset(self):
@@ -143 +170 @@
         self._comments.get_buffer().set_text("")
         self._flightDefects.get_buffer().set_text("")
-        self._delayCodeTable.reset()
+
+        for widget in self._delayCodeWidgets:
+            widget.set_active(False)
 
     def _commentsChanged(self, textbuffer):