Changeset 5833

Timestamp:

08/19/10 15:40:36 (3 years ago)

Author:

diogo

Message:

changed layout of Preferences Window menu

Files:

• network-scanner/branches/GSoC2010/umit/preferences/widgets/VTab.py (modified) (10 diffs)

network-scanner/branches/GSoC2010/umit/preferences/widgets/VTab.py

@@ -52 +52 @@
         'changed':  (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
                      (gobject.TYPE_INT, )),
+        'close':  (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE,
+                     ()),
     }
 
@@ -74 +76 @@
         self.image = gtk.Image()
         tmp_box = gtk.VBox()
-        tmp_box.pack_start(self.image, False, True) # Temporary Pack Image
+        tmp_box.pack_start(self.image, False, True, 6) # Temporary Pack Image
         tmp_box.set_border_width(2)
         self.image.set_from_file(image)
-        self.hbox.pack_start(tmp_box, False, True) # Pack Image
-        self.hbox.pack_start(label, False, False)
-        self.hbox.set_spacing(10)
+        self.hbox.pack_start(tmp_box, False, True, 6) # Pack Image
+        self.hbox.pack_start(label, False, False, 6)
         self.vbox.pack_start(self.hbox, False, False)
         self.add(self.vbox)
@@ -98 +99 @@
         self.__ibox = gtk.VBox()
         self.vbox.pack_start(self.__ibox, True, True)
-        self.vbox.set_spacing(5)
         
         
@@ -128 +128 @@
         hbox.pack_start(img, False, False)
         hbox.pack_start(label, False, False)
+
         if image!= None:
             img.set_from_file('%s' % image) 
@@ -194 +195 @@
         
         # Mouse over - event
-        
-        if self.__size!=None and self.over!= -1 :
+        # dont show rectangle in tab title
+        if self.__size!=None and self.over>= 33 :
             
             # Get sizes 
             alloc = self.allocation 
-            width = alloc.width        
-            
-            h = self.__size[1]*self.number_item(self.over)
-            cr_rectangule_curve(cr, 2,h ,width-3, self.__size[1], 20)
+            width = alloc.width
+            heig = self.__size[1]
+            
+            h = heig*self.number_item(self.over)
+            cr_rectangule_curve(cr, 0, h, width, heig, 20)
             state = gtk.STATE_SELECTED
             color = self.get_style().base[state]
@@ -228 +230 @@
             self.window.move_resize(*allocation)
             
+    def close(self):
+        if self.expanded:
+            print("close")
+            self.expand()
+            
     def expand(self):
+        self.set_size_request(-1, 28)
         x = self.get_size_request()
 
         if not self.expanded:
-            
+            # close opened tabs
+            self.emit('close')
             # FIXME
             self.__size = self.get_size_request()
@@ -246 +255 @@
             self.__enable = not self.__enable
         
-        self.expanded= not self.expanded       
+        self.expanded= not self.expanded  
+        
     def _animate_show(self):
         x = self.get_size_request()
@@ -267 +277 @@
             return True
         else:
+            self.set_size_request(x[0], 33)
             return False
- 
 
     def do_expose_event(self, event):
@@ -274 +284 @@
         Render widget
         """
-
         gtk.EventBox.do_expose_event(self, event)
         self.draw(self.__enable)
@@ -307 +316 @@
         
     def do_motion_notify_event(self, event):
-
         if not self.expanded or ( self.__size != None \
            and self.__size[1] > event.y):