Changeset 3055

Timestamp:

06/29/08 10:31:59 (5 years ago)

Author:

luis

Message:

update

Location:

branch/PreferencesWindow

Files:

• . (modified) (1 prop)
• drafts (modified) (1 prop)
• higwidgets (modified) (1 prop)
• share (modified) (1 prop)
• share/doc (modified) (1 prop)
• share/doc/umit (modified) (1 prop)
• share/doc/umit/comparing_results (modified) (1 prop)
• share/doc/umit/nse_facilitator (modified) (1 prop)
• share/doc/umit/profile_editor (modified) (1 prop)
• share/doc/umit/scanning (modified) (1 prop)
• share/doc/umit/screenshots (modified) (1 prop)
• share/doc/umit/searching (modified) (1 prop)
• share/doc/umit/under_the_roof (modified) (1 prop)
• share/doc/umit/wizard (modified) (1 prop)
• share/icons (modified) (1 prop)
• share/icons/umit (modified) (1 prop)
• share/locale (modified) (1 prop)
• share/locale/id (modified) (1 prop)
• share/locale/id/LC_MESSAGES (modified) (1 prop)
• share/locale/it (modified) (1 prop)
• share/locale/it/LC_MESSAGES (modified) (1 prop)
• share/locale/ms (modified) (1 prop)
• share/locale/ms/LC_MESSAGES (modified) (1 prop)
• share/locale/pl_PL (modified) (1 prop)
• share/locale/pl_PL/LC_MESSAGES (modified) (1 prop)
• share/locale/pt_BR (modified) (1 prop)
• share/locale/pt_BR/LC_MESSAGES (modified) (1 prop)
• share/locale/pt_PT (modified) (1 prop)
• share/locale/pt_PT/LC_MESSAGES (modified) (1 prop)
• share/locale/zh_CN (modified) (1 prop)
• share/locale/zh_CN/LC_MESSAGES (modified) (1 prop)
• share/pixmaps (modified) (1 prop)
• share/pixmaps/umit (modified) (1 prop)
• share/pixmaps/umit/Preferences (modified) (1 prop)
• share/umit (modified) (1 prop)
• share/umit/config (modified) (1 prop)
• share/umit/misc (modified) (1 prop)
• umitCore (modified) (1 prop)
• umitGUI (modified) (1 prop)
• umitPreferences (modified) (1 prop)
• umitPreferences/PreferencesWindow.py (modified) (4 diffs)
• umitPreferences/PreviewWindow.py (modified) (7 diffs)

branch/PreferencesWindow/umitPreferences/PreferencesWindow.py

@@ -31 +31 @@
 from umitCore.I18N import _
 
-from  umitPreferences.TabsWidget import TabsIcon
+from umitPreferences.TabsWidget import TabsIcon
+from umitPreferences.PreviewWindow import PreviewWindow
 
 
@@ -48 +49 @@
         self.set_title("Preferences")
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        self.resize(550,400)
+        self.resize(550,500)
         self.__create()
         self.__pack()
@@ -175 +176 @@
         self.__check_extensions.set_border_width(3)
         self.__check_splash.set_border_width(3)
+        p = PreviewWindow()
         self.__framebox.set_row_spacings(10)
         self.__framebox.set_border_width(10)
@@ -186 +188 @@
         self.__framebox.attach(self.__entry_nmap, 1,2,2,3, gtk.FILL|gtk.EXPAND|\
                                gtk.SHRINK, gtk.FILL)    
+        
+        self.__framebox.attach(p, 0,1,3,4)      
+        
     def _create_frame(self, name):
         if self.__frame is not None:

branch/PreferencesWindow/umitPreferences/PreviewWindow.py

@@ -55 +55 @@
         gtk.EventBox.__init__(self)
         self.__text_color = True 
+        self.add_events(gtk.gdk.BUTTON_MOTION_MASK)
        
         
@@ -151 +152 @@
         
         
-    def change_color(self, cr, w, h):
+    def change_color(self, cr,result=True):
+        w = self.__w
+        h = self.__h 
         try:
-            cr.rectangle(0, h-h/30, w, h)
-            cr.set_source_rgba(0.8,0.8,0.8,0.8)
+            cr.rectangle(0, h-h/40, w, h)
+            cr.set_source_rgb(0.8,0.8,0.8)
             cr.fill()
-            cr.move_to(0, h-h/30)
+            cr.move_to(w/2-w/4, h-h/30)
             self.__text_color = not self.__text_color
             if (self.__text_color):
                 cr.set_source_rgb(0,0.3,1)
             else:
-                cr.set_source_rgb(1,1.0,1)
+                cr.set_source_rgb(0.3,0.3,0.3)
             self._layout.context_changed()
             cr.update_layout(self._layout)    
             cr.show_layout(self._layout)
-            return True
+            return result
         except cairo.Error, e:
             return False
@@ -176 +179 @@
     def draw_text(self, cr, w_tmp, h_tmp_down, width, height):
         ############# Text ##################
-        print "draw text"
         
         cr.set_source_rgba(0,0.3,1,0.5)
@@ -182 +184 @@
         
         cr.move_to(w_tmp+width/30, h_tmp_down+height/30)
-        self._layout = self.create_pango_layout('General')
+        self._layout = self.create_pango_layout('Toolbar')
         self._layout.set_font_description(pango.FontDescription(\
             "Sans Serif 16"))
         cr.update_layout(self._layout)    
         cr.show_layout(self._layout)
-        gobject.timeout_add(300, self.change_color, cr, width, height)
-        
-        self.change_color(cr, width, height)
+        self.__h = height
+        self.__w = width
+        self.change_color(cr, False)
+        
+        gobject.timeout_add(1000, self.change_color, cr)
+        
+        
         
     def press_toolbar(self):
@@ -213 +219 @@
         height = alloc.height
         width = alloc.width
-       
+    def do_enter_notify_event(self, event):
+        print "enter over x=%d y=%d" % (event.x, event.y)
+    def do_leave_notify_event(self, event):
+        print "leave over x=%d y=%d" % (event.x, event.y)
        
     def do_button_press_event(self, event):
-        print "press"
         cr = self.window.cairo_create()
         # Get sizes and allocate
@@ -232 +240 @@
                
     def do_expose_event(self, event):
-        print "expose evnet"
         self.draw_umit_preview(event)
     def do_realize(self):
@@ -238 +245 @@
         self.draw_umit_preview(None)
     
-
 # Testing - develpment
 
-w = gtk.Window()
-
-s = PreviewWindow()
-w.add(s)
-w.show_all()
-gtk.main()
+if __name__ == "__main__":
+    w = gtk.Window()
+
+    s = PreviewWindow()
+    w.add(s)
+    w.show_all()
+    gtk.main()