Changeset 433:340267206759 for src/mlx/gui

Timestamp:

02/20/13 16:23:16 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added the beginnings of the new delay code list widget (re #154)

Location:

src/mlx/gui

Files:

• common.py (modified) (4 diffs)
• delaycodes.py (added)
• info.py (modified) (4 diffs)

src/mlx/gui/common.py

@@ -73 +73 @@
 
     SHADOW_IN = gtk.SHADOW_IN
+    SHADOW_NONE = gtk.SHADOW_NONE
 
     POLICY_AUTOMATIC = gtk.POLICY_AUTOMATIC
@@ -86 +87 @@
 
     EVENT_BUTTON_PRESS = gdk.BUTTON_PRESS
+
+    TREE_VIEW_COLUMN_FIXED = gtk.TREE_VIEW_COLUMN_FIXED
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -139 +142 @@
 
     SHADOW_IN = gtk.ShadowType.IN
+    SHADOW_NONE = gtk.ShadowType.NONE
 
     POLICY_AUTOMATIC = gtk.PolicyType.AUTOMATIC
@@ -152 +156 @@
 
     EVENT_BUTTON_PRESS = gdk.EventType.BUTTON_PRESS
+
+    TREE_VIEW_COLUMN_FIXED = gtk.TreeViewColumnSizing.FIXED
 
     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file

src/mlx/gui/info.py

@@ -1 +1 @@
 
 from common import *
+
+from mlx.gui.delaycodes import DelayCodeTable
 
 from mlx.i18n import xstr
@@ -98 +100 @@
                               padding_left = 8, padding_right = 8)
 
-        self._delayTable = table = gtk.Table(5, 2)
-        table.set_col_spacings(16)
 
-        row = 0
-        column = 0
+        # self._delayTable = table = gtk.Table(5, 2)
+        # table.set_col_spacings(16)
 
-        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
+        # row = 0
+        # column = 0
 
-        alignment.add(table)
+        # 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
+        self._delayTable = table = DelayCodeTable()
+        self._delayWindow = scrolledWindow = gtk.ScrolledWindow()
+        scrolledWindow.add(table)
+        scrolledWindow.set_size_request(400, 150)
+        scrolledWindow.set_policy(gtk.PolicyType.ALWAYS if pygobject
+                                  else gtk.POLICY_AUTOMATIC,
+                                  gtk.PolicyType.ALWAYS if pygobject
+                                  else gtk.POLICY_AUTOMATIC)
+        scrolledWindow.set_shadow_type(gtk.ShadowType.IN if pygobject
+                                       else gtk.SHADOW_IN)
+
+        alignment.add(scrolledWindow)
         frame.add(alignment)
 
@@ -158 +171 @@
         self._comments.set_sensitive(True)
         self._flightDefects.set_sensitive(True)
-        self._delayTable.set_sensitive(True)
+        self._delayWindow.set_sensitive(True)
 
     def disable(self):
@@ -164 +177 @@
         self._comments.set_sensitive(False)
         self._flightDefects.set_sensitive(False)
-        self._delayTable.set_sensitive(False)
+        self._delayWindow.set_sensitive(False)
 
     def reset(self):