Changeset 438:b7742450857a for src/mlx

Timestamp:

02/23/13 09:06:22 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Refined the formatting of the delay codes (re #154)

Location:

src/mlx/gui

Files:

• common.py (modified) (2 diffs)
• delaycodes.py (modified) (7 diffs)
• info.py (modified) (1 diff)

src/mlx/gui/common.py

@@ -89 +89 @@
 
     TREE_VIEW_COLUMN_FIXED = gtk.TREE_VIEW_COLUMN_FIXED
+
+    FILL = gtk.FILL
+    EXPAND = gtk.EXPAND
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -158 +161 @@
 
     TREE_VIEW_COLUMN_FIXED = gtk.TreeViewColumnSizing.FIXED
+
+    FILL = gtk.AttachOptions.FILL
+    EXPAND = gtk.AttachOptions.EXPAND
 
     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file

src/mlx/gui/delaycodes.py

@@ -202 +202 @@
            ["Num", "Code", "Title", "Description"],
            [ (CAPTION, "Others"),
-             (DELAYCODE, ("      6", "OA  ", "NO GATES/STAND AVAILABLE",
+             (DELAYCODE, ("        6", "OA     ", "NO GATES/STAND AVAILABLE",
                           "Due to own airline activity")),
              (DELAYCODE, ("9", "SG", "SCHEDULED GROUND TIME",
@@ -217 +217 @@
            ["MA", "IATA", "Description"],
            [ (CAPTION, "Passenger and baggage"),
-             (DELAYCODE, ("    012", "01   ",
+             (DELAYCODE, (" 012", "01   ",
                           "Late shipping of parts and/or materials")),
-             (DELAYCODE, ("    111", "11",
+             (DELAYCODE, (" 111", "11",
                           "Check-in reopened for late passengers")),
-             (DELAYCODE, ("    121", "12",
+             (DELAYCODE, (" 121", "12",
                           "Check-in not completed by flight closure time")),
-             (DELAYCODE, ("    132", "13",
+             (DELAYCODE, (" 132", "13",
                           "Error with passenger or baggage details"))
             ])
@@ -237 +237 @@
         self._delayCodeData = None
 
-        self._treeView = None
-
         self._treeView = gtk.TreeView(gtk.ListStore(str, str))
         self._treeView.set_rules_hint(True)
@@ -277 +275 @@
             self._previousWidth = allocation.width
             index = 0
+            lastIndex = len(self._alignments) - 1
             for alignment in self._alignments:
                 column = self._treeView.get_column(index)
-                width = alignment.allocatedWidth + (8 if index==0 else 16)
+                width = alignment.allocatedWidth
+                width += 8 if (index==0 or index==lastIndex) else 16
                 column.set_fixed_width(width)
                 index += 1
@@ -328 +328 @@
                 label.set_alignment(0.0, 0.5)
                 alignment.add(label)
-                self._table.attach(alignment, 1, numColumns, i, i+1)
+                self._table.attach(alignment, 1, numColumns, i, i+1,
+                                   yoptions = FILL)
                 self._table.set_row_spacing(i, 8)
             elif type==DELAYCODE:
@@ -335 +336 @@
                 alignment = Alignment(xalign = 0.5, yalign = 0.5, xscale = 1.0)
                 alignment.add(checkButton)
-                self._table.attach(alignment, 0, 1, i, i+1)
+                self._table.attach(alignment, 0, 1, i, i+1,
+                                   xoptions = FILL, yoptions = FILL)
                 if firstDelayCodeRow:
                     self._alignments.append(alignment)
 
-                for j in range(0, len(elements)):
+                for j in range(0, numColumns-1):
                     label = gtk.Label(elements[j])
                     label.set_alignment(1.0 if j==0 else 0.0, 0.5)
@@ -345 +347 @@
                                           xscale = 1.0)
                     alignment.add(label)
-                    self._table.attach(alignment, j+1, j+2, i, i+1)
+                    xoptions = FILL
+                    if j==(numColumns-2): xoptions |= EXPAND
+                    self._table.attach(alignment, j+1, j+2, i, i+1,
+                                       xoptions = xoptions, yoptions = FILL)
                     if firstDelayCodeRow:
                         self._alignments.append(alignment)

src/mlx/gui/info.py

@@ -85 +85 @@
         self._delayWindow = scrolledWindow = gtk.ScrolledWindow()
         scrolledWindow.add(table)
-        scrolledWindow.set_size_request(400, 150)
+        scrolledWindow.set_size_request(600, 175)
         scrolledWindow.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
         scrolledWindow.set_shadow_type(SHADOW_IN)