CVS: anygui/lib/anygui/backends qtgui.py,1.19,1.20

Update of /cvsroot/anygui/anygui/lib/anygui/backends
In directory usw-pr-cvs1:/tmp/cvs-serv3865

Modified Files:
	qtgui.py 
Log Message:
Fixed some bugs related to native strings and models...
Also was forced to add check for self.widget != None...


Index: qtgui.py
===================================================================
RCS file: /cvsroot/anygui/anygui/lib/anygui/backends/qtgui.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** qtgui.py	21 Aug 2002 13:20:09 -0000	1.19
--- qtgui.py	23 Sep 2002 19:40:21 -0000	1.20
***************
*** 26,30 ****
  from qt import *
  from anygui.Applications import AbstractApplication
! from anygui.Wrappers import AbstractWrapper, DummyWidget, isDummy
  from anygui.Events import *
  from anygui.Windows import Window
--- 26,30 ----
  from qt import *
  from anygui.Applications import AbstractApplication
! from anygui.Wrappers import AbstractWrapper
  from anygui.Events import *
  from anygui.Windows import Window
***************
*** 95,127 ****
  
      def setX(self, x):
!         self.setGeometry(x,self.y,self.width,self.height)
  
      def setY(self, y):
!         self.setGeometry(self.x,y,self.width,self.height)
  
      def setWidth(self, width):
!         self.setGeometry(self.x,self.y,width,self.height)
  
      def setHeight(self, height):
!         self.setGeometry(self.x,self.y,self.width,height)
  
      def setPosition(self, x, y):
!         self.setGeometry(x,y,self.width,self.height)
  
      def setSize(self, width, height):
!         self.setGeometry(self.x,self.y,width,height)
  
      def setGeometry(self, x, y, width, height):
!         self.widget.setGeometry(x,y,width,height)
  
      def getGeometry(self):
!         r = self.widget.geometry()
!         return (r.x(), r.y(), r.width(), r.height())
  
      def setVisible(self, visible):
!         if visible:
!             self.widget.show()
!         else:
!             self.widget.hide()
  
      def setContainer(self, container):
--- 95,136 ----
  
      def setX(self, x):
!         if self.widget:
!             self.setGeometry(x,self.y,self.width,self.height)
  
      def setY(self, y):
!         if self.widget:
!             self.setGeometry(self.x,y,self.width,self.height)
  
      def setWidth(self, width):
!         if self.widget:
!             self.setGeometry(self.x,self.y,width,self.height)
  
      def setHeight(self, height):
!         if self.widget:
!             self.setGeometry(self.x,self.y,self.width,height)
  
      def setPosition(self, x, y):
!         if self.widget:
!             self.setGeometry(x,y,self.width,self.height)
  
      def setSize(self, width, height):
!         if self.widget:
!             self.setGeometry(self.x,self.y,width,height)
  
      def setGeometry(self, x, y, width, height):
!         if self.widget:
!             self.widget.setGeometry(x,y,width,height)
  
      def getGeometry(self):
!         if self.widget:
!             r = self.widget.geometry()
!             return (r.x(), r.y(), r.width(), r.height())
  
      def setVisible(self, visible):
!         if self.widget:
!             if visible:
!                 self.widget.show()
!             else:
!                 self.widget.hide()
  
      def setContainer(self, container):
***************
*** 135,139 ****
          parent = container.wrapper.widget
          try:
!             assert parent.isDummy()
          except (AttributeError, AssertionError):
              # self.destroy()
--- 144,148 ----
          parent = container.wrapper.widget
          try:
!             assert parent is None
          except (AttributeError, AssertionError):
              # self.destroy()
***************
*** 143,161 ****
  
      def setEnabled(self, enabled):
!            self.widget.setEnabled(enabled)
  
      def setText(self, text):
!         try:
!             self.widget.setText(QString(text))
!         except:
!             pass
  
      def getText(self):
!         try:
!             return str(self.widget.text())
!         except:
!             # Widget has no text.
!             return ""
! 
  #    def setText(self, text):
  #        try: self.widget
--- 152,173 ----
  
      def setEnabled(self, enabled):
!         if self.widget:
!             self.widget.setEnabled(enabled)
  
      def setText(self, text):
!         if self.widget:
!             try:
!                 self.widget.setText(QString(str(text)))
!             except:
!                 pass
  
      def getText(self):
!         if self.widget:
!             try:
!                 return str(self.widget.text())
!             except:
!                 # Widget has no text.
!                 return ""
!             
  #    def setText(self, text):
  #        try: self.widget
***************
*** 218,235 ****
  
      def setItems(self, items):
!         self.widget.clear()
!         self.items = items[:]
!         for item in self.items:
!             self.widget.insertItem(QString(str(item)),-1)
  
      def getItems(self):
!         return self.items
  
      def setSelection(self, selection):
!         self.widget.setCurrentItem(int(selection))
  
      def getSelection(self):
!         selection = int(self.widget.currentItem())
!         return selection
  
      def clickHandler(self, index):
--- 230,251 ----
  
      def setItems(self, items):
!         if self.widget:
!             self.widget.clear()
!             self.items = items[:]
!             for item in self.items:
!                 self.widget.insertItem(QString(str(item)),-1)
  
      def getItems(self):
!         if self.widget:
!             return self.items
  
      def setSelection(self, selection):
!         if self.widget:
!             self.widget.setCurrentItem(int(selection))
  
      def getSelection(self):
!         if self.widget:
!             selection = int(self.widget.currentItem())
!             return selection
  
      def clickHandler(self, index):
***************
*** 271,278 ****
  
      def setOn(self, on):
!         self.widget.setChecked(on)
  
      def getOn(self):
!         return self.widget.isChecked()
  
  #--------------------------------------------------------------#
--- 287,296 ----
  
      def setOn(self, on):
!         if self.widget:
!             self.widget.setChecked(on)
  
      def getOn(self):
!         if self.widget:
!             return self.widget.isChecked()
  
  #--------------------------------------------------------------#
***************
*** 336,343 ****
  
      def setEditable(self, editable):
!         self.widget.setReadOnly(not editable)
  
      def qtText(self):
!         return QString(self.text)
  
      def keyPressHandler(self, event):
--- 354,362 ----
  
      def setEditable(self, editable):
!         if self.widget:
!             self.widget.setReadOnly(not editable)
  
      def qtText(self):
!         return QString(str(self.text))
  
      def keyPressHandler(self, event):
***************
*** 382,396 ****
  
      def setSelection(self, selection):
!         if DEBUG: print 'in setSelection of: ', self.widget
!         start, end = selection
!         self.widget.setSelection(start, end-start)
          
      def getSelection(self):
!         if DEBUG: print 'in getSelection of: ', self.widget
!         pos = self.widget.cursorPosition()
!         if self.widget.hasSelectedText():
!             return self.widget.getSelection()[1:] #ignore bool
!         else:
!             return pos, pos
  
  #--------------------------------------------------------------#
--- 401,417 ----
  
      def setSelection(self, selection):
!         if self.widget:
!             if DEBUG: print 'in setSelection of: ', self.widget
!             start, end = selection
!             self.widget.setSelection(start, end-start)
          
      def getSelection(self):
!         if self.widget:
!             if DEBUG: print 'in getSelection of: ', self.widget
!             pos = self.widget.cursorPosition()
!             if self.widget.hasSelectedText():
!                 return self.widget.getSelection()[1:] #ignore bool
!             else:
!                 return pos, pos
  
  #--------------------------------------------------------------#
***************
*** 427,431 ****
      def qtGetParagraphs(self):
          paras = []
!         if not self.noWidget():
              for n in range(self.widget.paragraphs()):
                  paras.append(str(self.widget.text(n)) + '\n')
--- 448,452 ----
      def qtGetParagraphs(self):
          paras = []
!         if self.widget is not None:
              for n in range(self.widget.paragraphs()):
                  paras.append(str(self.widget.text(n)) + '\n')
***************
*** 492,497 ****
  
      def setTitle(self, title):
!         if not self.noWidget():
!             self.mainWindow.setCaption(QString(title))
  
      def widgetSetUp(self):
--- 513,518 ----
  
      def setTitle(self, title):
!         if self.widget is not None:
!             self.mainWindow.setCaption(QString(str(title)))
  
      def widgetSetUp(self):
***************
*** 554,558 ****
          if container is None: return
          try:
!             assert(self.widget.isDummy())
              self.create()
          except (AttributeError):
--- 575,579 ----
          if container is None: return
          try:
!             assert(self.widget is None)
              self.create()
          except (AttributeError):
***************
*** 585,589 ****
  
      def setGeometry(self, x, y, width, height):
!         if not self.noWidget():
              g = self.widget.geometry()
              dx = -self.widget.x()
--- 606,610 ----
  
      def setGeometry(self, x, y, width, height):
!         if self.widget is not None:
              g = self.widget.geometry()
              dx = -self.widget.x()
***************
*** 595,599 ****
  
      def getGeometry(self):
!         if not self.noWidget():
              r = self.widget.geometry()
              p = self.widget.mapToGlobal(QPoint(r.x(), r.y()))
--- 616,620 ----
  
      def getGeometry(self):
!         if self.widget is not None:
              r = self.widget.geometry()
              p = self.widget.mapToGlobal(QPoint(r.x(), r.y()))
***************
*** 627,634 ****
  
      def widgetFactory(self,*args,**kws):
!         return QtMenuDummy()
  
      def createIfNeeded(self):
!         if self.noWidget(): self.create()
  
      def setEnabled(self,enabled):
--- 648,655 ----
  
      def widgetFactory(self,*args,**kws):
!         return None
  
      def createIfNeeded(self):
!         if self.widget is None: self.create()
  
      def setEnabled(self,enabled):
***************
*** 643,647 ****
              if self.proxy in self.proxy.container.contents:
                  self.proxy.container.contents.remove(self.proxy)
!             self.widget = DummyWidget()
              self.proxy.container.wrapper.rebuild()
          else:
--- 664,668 ----
              if self.proxy in self.proxy.container.contents:
                  self.proxy.container.contents.remove(self.proxy)
!             self.widget = None
              self.proxy.container.wrapper.rebuild()
          else:
***************
*** 664,670 ****
          pass
  
- class QtMenuDummy:
-     pass
- 
  class MenuWrapper(MenuItemMixin, ComponentWrapper):
  
--- 685,688 ----
***************
*** 680,684 ****
              #print "DESTROYING",self
              self.widget.destroy()
!             self.widget = DummyWidget()
              self.proxy.container.wrapper.rebuild()
          else:
--- 698,702 ----
              #print "DESTROYING",self
              self.widget.destroy()
!             self.widget = None
              self.proxy.container.wrapper.rebuild()
          else:
***************
*** 713,717 ****
          parent = self.proxy.container.wrapper.widget
          if DEBUG: print "\nREBUILDING: ", self,self.proxy.contents
!         if not self.noWidget():
              self.widget.clear()
          else:
--- 731,735 ----
          parent = self.proxy.container.wrapper.widget
          if DEBUG: print "\nREBUILDING: ", self,self.proxy.contents
!         if self.widget is not None:
              self.widget.clear()
          else:



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf