gnue-forms/src/uidrivers/gtk2 widgets/box.py UI...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/09/06 06:43:40

Modified files:
        src/uidrivers/gtk2/widgets: box.py 
        src/uidrivers/gtk2: UILoginHandler.py 

Log message:
        gtk2 uidriver changes:
        * replace deprecated 'attach_defaults' with simple 'attach' 
(UILoginHandler)
        * just send integer coordinates to gtk (widget/box.py)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/widgets/box.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue-forms/src/uidrivers/gtk2/UILoginHandler.py
diff -c gnue-forms/src/uidrivers/gtk2/UILoginHandler.py:1.3 
gnue-forms/src/uidrivers/gtk2/UILoginHandler.py:1.4
*** gnue-forms/src/uidrivers/gtk2/UILoginHandler.py:1.3 Mon Jun 16 17:32:29 2003
--- gnue-forms/src/uidrivers/gtk2/UILoginHandler.py     Sat Sep  6 06:43:40 2003
***************
*** 78,87 ****
        imageFile = images_dir+gConfigForms('loginPNG')
        
      bmp.set_from_file(imageFile)
!     table1.attach_defaults(bmp,1,3,0,1)
      
      messageField = gtk.Label(str(loginMesg))
!     table1.attach_defaults(messageField,1,3,2,3)
      
      self.textEntryList = []
      labelList = []
--- 78,87 ----
        imageFile = images_dir+gConfigForms('loginPNG')
        
      bmp.set_from_file(imageFile)
!     table1.attach(bmp,1,3,0,1)
      
      messageField = gtk.Label(str(loginMesg))
!     table1.attach(messageField,1,3,2,3)
      
      self.textEntryList = []
      labelList = []
***************
*** 109,116 ****
      # Add labels and entry fields to layout
  
      for i in range(0, len(self.textEntryList)):
!       table1.attach_defaults(labelList[i],1,2,i+3,i+4)
!       table1.attach_defaults(self.textEntryList[i],2,3,i+3,i+4)
  
      if errortext:
        errorField = gtk.Label(str(errortext))
--- 109,116 ----
      # Add labels and entry fields to layout
  
      for i in range(0, len(self.textEntryList)):
!       table1.attach(labelList[i],1,2,i+3,i+4)
!       table1.attach(self.textEntryList[i],2,3,i+3,i+4)
  
      if errortext:
        errorField = gtk.Label(str(errortext))
***************
*** 119,125 ****
        errorField.modify_fg(gtk.STATE_NORMAL,gtk.gdk.color_parse('red'))
        
        t = len(self.textEntryList)
!       table1.attach_defaults(errorField,1,3,t+4,t+5)
  
      # focus first entry
      self.textEntryList[0].grab_focus()
--- 119,125 ----
        errorField.modify_fg(gtk.STATE_NORMAL,gtk.gdk.color_parse('red'))
        
        t = len(self.textEntryList)
!       table1.attach(errorField,1,3,t+4,t+5)
  
      # focus first entry
      self.textEntryList[0].grab_focus()
Index: gnue-forms/src/uidrivers/gtk2/widgets/box.py
diff -c gnue-forms/src/uidrivers/gtk2/widgets/box.py:1.3 
gnue-forms/src/uidrivers/gtk2/widgets/box.py:1.4
*** gnue-forms/src/uidrivers/gtk2/widgets/box.py:1.3    Mon Jun 16 17:32:29 2003
--- gnue-forms/src/uidrivers/gtk2/widgets/box.py        Sat Sep  6 06:43:40 2003
***************
*** 40,54 ****
      object = event.object
      
      newWidget = gtk.Frame()
!     newWidget.set_size_request(self.itemWidth - (1 * event.widgetWidth),
!                                self.itemHeight - (0.5 * event.widgetHeight))
      
      newWidget.set_label(str(object.label))
      newWidget.get_label_widget().modify_font(self._uiDriver.mono_font)
  
!     event.container.put(newWidget, (object.Char__x+0.5) * event.widgetWidth,
!                         (object.Char__y + spacer + 0.5) * event.widgetHeight)
! 
      return newWidget
  
  #
--- 40,54 ----
      object = event.object
      
      newWidget = gtk.Frame()
!     newWidget.set_size_request(int(self.itemWidth - (1 * event.widgetWidth)),
!                                int(self.itemHeight - (0.5 * 
event.widgetHeight)))
      
      newWidget.set_label(str(object.label))
      newWidget.get_label_widget().modify_font(self._uiDriver.mono_font)
  
!     event.container.put(newWidget,
!                         int((object.Char__x+0.5) * event.widgetWidth),
!                         int((object.Char__y + spacer + 0.5) * 
event.widgetHeight))
      return newWidget
  
  #