Changeset 3281

Timestamp:

08/01/08 14:19:42 (5 years ago)

Author:

nopper

Message:

Implementing expand on ToolBox?

Location:

branch/PacketManipulator/widgets

Files:

• Expander.py (modified) (8 diffs)
• PropertyGrid.py (modified) (1 diff)

branch/PacketManipulator/widgets/Expander.py

@@ -503 +503 @@
     (friend of ToolBox. Don't use in other widgets)
     """
-    def __init__(self, parent, label=None, image=gtk.STOCK_PROPERTIES):
+    def __init__(self, parent, label=None, image=gtk.STOCK_PROPERTIES, expand=True):
         assert(isinstance(parent, ToolBox))
 
@@ -509 +509 @@
 
         self._parent = parent
-        self._active = False
+        self._expand = expand
 
         self._layout.connect('animation-end', self.__on_end_anim)
@@ -573 +573 @@
     # Public API
 
-    def append_page(self, child, txt):
-        page = ToolPage(self, txt)
+    def append_page(self, child, txt=None, image=gtk.STOCK_PROPERTIES, expand=True):
+        page = ToolPage(self, txt, image, expand)
         page.add_widget(child, False)
 
@@ -602 +602 @@
         children.reverse()
 
+        spulciato = filter(lambda x: x._expand and x._layout.get_active(), children)
+
+        if spulciato:
+            children = spulciato
+
         for child in children:
             if page == child or \
@@ -619 +624 @@
                 return
 
+        print "nothing setted", children
         self._active_page = None
     
     def _repack(self, page):
+        if not page._expand:
+            return False
+
         info = self.query_child_packing(page)
 
@@ -636 +645 @@
         return False
 
-    def _set_active_page(self, page=None):
-        if self._active_page:
+    def _set_active_page(self, page):
+
+        if page._expand and self._active_page:
             if self._one_page:
                 self._set_expanded(self._active_page, False)
@@ -646 +656 @@
 
         if page:
+
+            # Here we should check if there's a child with True as packing options
+            # if not ignore the page._expand and set the packing to True
+
+            print "yuuuuuuuuu"
+
+            for child in self.get_children():
+                print "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+                print self.query_child_packing(child)
+
+                if 1 in self.query_child_packing(child)[0:2]:
+                    self.set_child_packing(page, page._expand, page._expand, 0, gtk.PACK_START)
+                    return
+
+            # If we are here not True :D
             self.set_child_packing(page, True, True, 0, gtk.PACK_START)
+
 
     # Public stuff
@@ -686 +712 @@
     box = ToolBox()
     box.append_page(gtk.Label("Testing"), "miao")
-    box.append_page(gtk.Label("Testing"), "miao")
+    box.append_page(gtk.Label("Testing"), "miao", expand=False)
     box.append_page(gtk.Label("Testing"), "miao")
     w.add(box)

branch/PacketManipulator/widgets/PropertyGrid.py

@@ -623 +623 @@
             toolbox = ToolBox()
             toolbox.append_page(self.tree, 'Protocol')
-            toolbox.append_page(sw, 'Description')
+            toolbox.append_page(sw, 'Description', expand=False)
             self.pack_start(toolbox)
         else: