gnue-forms/src/uidrivers/gtk2/widgets/form widg...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Jan Ischebeck <address@hidden>  03/09/04 17:09:19

Modified files:
        src/uidrivers/gtk2/widgets/form: widget.py 

Log message:
        beautify statusbar and remove unused statusbar resize code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
diff -c gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py:1.5 
gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py:1.6
*** gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py:1.5    Mon Aug  4 
11:50:14 2003
--- gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py        Thu Sep  4 
17:09:19 2003
***************
*** 148,159 ****
      self.statusBar4 = gtk.Statusbar()
      self.statusBar5 = gtk.Statusbar()
  
!     status_bar_table=gtk.Table(1,5)
!     status_bar_table.attach_defaults(self.statusBar1,0,1,0,1)
!     status_bar_table.attach_defaults(self.statusBar2,1,2,0,1)
!     status_bar_table.attach_defaults(self.statusBar3,2,3,0,1)
!     status_bar_table.attach_defaults(self.statusBar4,3,4,0,1)
!     status_bar_table.attach_defaults(self.statusBar5,4,5,0,1)
  
      self.content_table.attach(status_bar_table,
                   # X direction           Y direction
--- 148,170 ----
      self.statusBar4 = gtk.Statusbar()
      self.statusBar5 = gtk.Statusbar()
  
!     self.statusBar1.set_has_resize_grip(gtk.FALSE)
!     self.statusBar2.set_has_resize_grip(gtk.FALSE)
!     self.statusBar3.set_has_resize_grip(gtk.FALSE)
!     self.statusBar4.set_has_resize_grip(gtk.FALSE)
!     self.statusBar5.set_has_resize_grip(gtk.TRUE)
! 
!     status_bar_table=gtk.HBox(2)
!     status_bar_table.set_homogeneous(gtk.FALSE)
!     status_bar_table.pack_start(self.statusBar1,gtk.TRUE,gtk.TRUE,0)
!     
!     status_bar_table2=gtk.HBox(4)
!     status_bar_table2.pack_start(self.statusBar2,gtk.TRUE,gtk.TRUE,0)
!     status_bar_table2.pack_start(self.statusBar3,gtk.TRUE,gtk.TRUE,0)
!     status_bar_table2.pack_start(self.statusBar4,gtk.TRUE,gtk.TRUE,0)
!     status_bar_table2.pack_start(self.statusBar5,gtk.TRUE,gtk.TRUE,0)
! 
!     status_bar_table.pack_start(status_bar_table2,gtk.TRUE,gtk.TRUE,0)
  
      self.content_table.attach(status_bar_table,
                   # X direction           Y direction
***************
*** 199,224 ****
        context_id=self.statusBar5.get_context_id("currentPage_and_maxPage")
        messg=string.strip("%s/%s"%(currentPage,maxPage))
        self.statusBar5.push(context_id,messg)
- 
- 
- ##     #
- ##     # Adjust the status fields to reflect width of text in them
- ##     #
- ##     # This is a hack
- ##     #
- ##     tipWidth = -1 # Fill whatever remains
- ##     statusWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(1))
- ##     insertWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(2))
- ##     recordWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(3))
- ##     pageWidth,unused = 
self.statusBar.GetTextExtent(self.statusBar.GetStatusText(4))
- 
- ##     # Either double the width if it's set or default to 5
- ##     statusWidth = statusWidth and (statusWidth * 2) or 5
- ##     insertWidth = insertWidth and (insertWidth * 2) or 5
- ##     recordWidth = recordWidth and (recordWidth * 2) or 5
- ##     pageWidth   = pageWidth   and (pageWidth   * 2) or 5
- 
- ##     
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
  
  
    def show(self):
--- 210,215 ----