gnue/forms/src/uidrivers/qt UIdriver.py common....

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/04/23 23:37:11

Modified files:
        forms/src/uidrivers/qt: UIdriver.py common.py 
        forms/src/uidrivers/qt/widgets: box.py button.py label.py 

Log message:
        misc qt work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/UIdriver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/common.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/box.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/button.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/label.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/qt/UIdriver.py
diff -c gnue/forms/src/uidrivers/qt/UIdriver.py:1.7 
gnue/forms/src/uidrivers/qt/UIdriver.py:1.8
*** gnue/forms/src/uidrivers/qt/UIdriver.py:1.7 Tue Mar 11 20:13:52 2003
--- gnue/forms/src/uidrivers/qt/UIdriver.py     Wed Apr 23 23:37:11 2003
***************
*** 63,70 ****
    def initialize(self):
      self._qtapp = getQtApp()
  
!     font = QFont("Courier", int(gConfigForms('pointSize')))
  
      font.setPointSize(int(gConfig('pointSize')))
      setWidgetBaseFont(font)
  
--- 63,89 ----
    def initialize(self):
      self._qtapp = getQtApp()
  
!     fdb = QFontDatabase()
  
+     #
+     # TODO: Wouldn't it be nice if this actually picked a font
+     # TODO: that didn't suck.
+     #
+     #fixedFont = ""
+     #for family in fdb.families():
+     #  for style in fdb.styles(family):
+     #    if fdb.isFixedPitch(family,style):
+     #      fixedFont = fdb.font(family,style,int(gConfigForms('pointSize')))
+     #      break
+     #  if fixedFont != "":
+     #    break
+     #font = fixedFont
+     
+     font = QFont("Courier 10 Pitch", int(gConfigForms('pointSize')))
+     font.setFixedPitch(True)
+ 
+     #info = QFontInfo(font)
+     #print "DATA:", info.family(),info.fixedPitch()
      font.setPointSize(int(gConfig('pointSize')))
      setWidgetBaseFont(font)
  
***************
*** 76,82 ****
  
      fm = QFontMetrics(font)
      # TODO: Making some assumptions here!!
!     maxWidth=fm.width("W")
      maxHeight = fm.height()
      maxDescent = fm.descent()
      maxLeading = fm.leading()
--- 95,108 ----
  
      fm = QFontMetrics(font)
      # TODO: Making some assumptions here!!
!     maxWidth=0
!     checkchars = string.printable
!     for letter in checkchars:
!       width = fm.width("W")
!       maxWidth = max(maxWidth,width)
! 
!     print "Max Width = ", maxWidth, fm.width("i")
!     #maxWidth=fm.width("W")
      maxHeight = fm.height()
      maxDescent = fm.descent()
      maxLeading = fm.leading()
Index: gnue/forms/src/uidrivers/qt/common.py
diff -c gnue/forms/src/uidrivers/qt/common.py:1.7 
gnue/forms/src/uidrivers/qt/common.py:1.8
*** gnue/forms/src/uidrivers/qt/common.py:1.7   Tue Mar 11 20:13:52 2003
--- gnue/forms/src/uidrivers/qt/common.py       Wed Apr 23 23:37:11 2003
***************
*** 174,179 ****
--- 174,180 ----
    # Over-ride events
    #
    def mousePressEvent(self, event):
+     print "BOING!"
      uiwidget = self._uiwidget
      gfObject = uiwidget._gfObject
  
Index: gnue/forms/src/uidrivers/qt/widgets/box.py
diff -c gnue/forms/src/uidrivers/qt/widgets/box.py:1.2 
gnue/forms/src/uidrivers/qt/widgets/box.py:1.3
*** gnue/forms/src/uidrivers/qt/widgets/box.py:1.2      Fri Mar  7 00:14:28 2003
--- gnue/forms/src/uidrivers/qt/widgets/box.py  Wed Apr 23 23:37:11 2003
***************
*** 45,52 ****
          
      # ..and move it to it's proper place
      newWidget.setGeometry(object.Char__x*event.widgetWidth,
!                           
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
!                           self.itemWidth,self.itemHeight)
      
      return newWidget
  
--- 45,55 ----
          
      # ..and move it to it's proper place
      newWidget.setGeometry(object.Char__x*event.widgetWidth,
!                           
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight,
!                           (object.Char__width-1)*event.widgetWidth,
!                                                          
(object.Char__height-1)*event.widgetHeight)
! #                          self.itemWidth,self.itemHeight)
!     newWidget.lowerW()
      
      return newWidget
  
Index: gnue/forms/src/uidrivers/qt/widgets/button.py
diff -c gnue/forms/src/uidrivers/qt/widgets/button.py:1.5 
gnue/forms/src/uidrivers/qt/widgets/button.py:1.6
*** gnue/forms/src/uidrivers/qt/widgets/button.py:1.5   Sat Mar  8 00:11:26 2003
--- gnue/forms/src/uidrivers/qt/widgets/button.py       Wed Apr 23 23:37:11 2003
***************
*** 60,71 ****
--- 60,74 ----
      if event.initialize:
        self._eventHandler = event.eventHandler
        QObject.connect(newWidget, SIGNAL("clicked()"), self.buttonHandler)
+       #QObject.connect(newWidget, PYSIGNAL("sigClicked"), self.buttonHandler)
+       
  
      return newWidget
  
    #
    #
    def buttonHandler(self):
+     print "Click"
      self._eventHandler('buttonActivated', self._gfObject)
  
  
Index: gnue/forms/src/uidrivers/qt/widgets/label.py
diff -c gnue/forms/src/uidrivers/qt/widgets/label.py:1.1 
gnue/forms/src/uidrivers/qt/widgets/label.py:1.2
*** gnue/forms/src/uidrivers/qt/widgets/label.py:1.1    Fri Feb 21 01:30:50 2003
--- gnue/forms/src/uidrivers/qt/widgets/label.py        Wed Apr 23 23:37:11 2003
***************
*** 52,57 ****
--- 52,60 ----
      newWidget = QLabel(str(object.text), event.container)
      
      # ..move it to it's proper place..
+     print object.Char__x*event.widgetWidth, \
+                               
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, \
+                                                         
self.itemWidth,self.itemHeight
      newWidget.setGeometry(object.Char__x*event.widgetWidth,
                            
(object.Char__y+spacer+(spacer*object._gap))*event.widgetHeight, 
                            self.itemWidth,self.itemHeight)