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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/06 01:51:22

Modified files:
        forms/src/uidrivers/qt: UIdriver.py 
        forms/src/uidrivers/qt/widgets: entry.py 
        forms/src/uidrivers/qt/widgets/form: wrappers.py 

Log message:
        more work on QT driver

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/UIdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/entry.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/form/wrappers.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/qt/UIdriver.py
diff -c gnue/forms/src/uidrivers/qt/UIdriver.py:1.4 
gnue/forms/src/uidrivers/qt/UIdriver.py:1.5
*** gnue/forms/src/uidrivers/qt/UIdriver.py:1.4 Wed Mar  5 22:03:27 2003
--- gnue/forms/src/uidrivers/qt/UIdriver.py     Thu Mar  6 01:51:20 2003
***************
*** 107,113 ****
    #
    # Tells the application to close it's main window
    #
!   def _exit(self):
      exitApp = 1
      for child in self._children:
        if child._form.name == formName:
--- 107,113 ----
    #
    # Tells the application to close it's main window
    #
!   def _exit(self, formName):
      exitApp = 1
      for child in self._children:
        if child._form.name == formName:
Index: gnue/forms/src/uidrivers/qt/widgets/entry.py
diff -c gnue/forms/src/uidrivers/qt/widgets/entry.py:1.2 
gnue/forms/src/uidrivers/qt/widgets/entry.py:1.3
*** gnue/forms/src/uidrivers/qt/widgets/entry.py:1.2    Sat Feb 22 01:54:58 2003
--- gnue/forms/src/uidrivers/qt/widgets/entry.py        Thu Mar  6 01:51:22 2003
***************
*** 53,62 ****
        newWidget = QComboBox(event.container)
        
        if event.initialize:
!         newWidget.insertStringList(choices)
          newWidget._origAllowedValues = object._field._allowedValues
          newWidget.setEditable(1)
!         newWidget.setCurrentItem("")
          
          # TODO: Listen for textChanged(), highlighted()
  
--- 53,63 ----
        newWidget = QComboBox(event.container)
        
        if event.initialize:
!         for choice in choices: 
!           newWidget.insertItem(choice)
          newWidget._origAllowedValues = object._field._allowedValues
          newWidget.setEditable(1)
!         newWidget.setCurrentItem(0)
          
          # TODO: Listen for textChanged(), highlighted()
  
Index: gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.2 
gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.3
*** gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.2    Sat Feb 22 
01:54:59 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py        Thu Mar  6 
01:51:22 2003
***************
*** 39,62 ****
      self.uiform = uiform
      self.frame = frame = uiform.mainWindow
      self.form = form = uiform._form
!     QScrollView.__init__(self, frame)
      
  ##    EVT_SIZE(self.frame, self.OnFrameSize)
      formWidth = int(form._layout.Char__width)
      formHeight = int(form._layout.Char__height)
      self.layoutSize = (0,0,formWidth*uiform._uiDriver.widgetWidth,
                        formHeight*uiform._uiDriver.widgetHeight)
      self._fitted = 0
      self._pageList = []
  
-     self.setGeometry(*self.layoutSize)
-     
      
    def finalize(self): 
      # This is the initial panel window setup during init
      # not a wxPanel set per page right after this
! ##    self.SetVirtualSize(self.pane.GetSize())
! ##    tempx,tempy =  self.pane.GetSizeTuple()
      self.show()
  ##    self.fixScrollbars()
      
--- 39,72 ----
      self.uiform = uiform
      self.frame = frame = uiform.mainWindow
      self.form = form = uiform._form
!     
!     self.margin = 6
!     self.spacerpane = QFrame(frame)
!     
!     QScrollView.__init__(self, self.spacerpane)
      
  ##    EVT_SIZE(self.frame, self.OnFrameSize)
      formWidth = int(form._layout.Char__width)
      formHeight = int(form._layout.Char__height)
      self.layoutSize = (0,0,formWidth*uiform._uiDriver.widgetWidth,
                        formHeight*uiform._uiDriver.widgetHeight)
+                       
+     
      self._fitted = 0
      self._pageList = []
+     self.frame.setCentralWidget(self.spacerpane)
  
      
    def finalize(self): 
      # This is the initial panel window setup during init
      # not a wxPanel set per page right after this
!     w = self.pane.width()
!     h = self.pane.height()
!     
!     self.spacerpane.resize(w+self.margin*2, h+self.margin*2)
!     self.move(self.margin, self.margin)
!     self.resize(w,h)
!     
      self.show()
  ##    self.fixScrollbars()
      
***************
*** 84,101 ****
      
      self.pane = notebook = QTabWidget(self)
      notebook.setTabPosition(_tabStyles[self.form._layout.tabbed])
!     
! ##    self.notebooksizer = sizer1 = wxNotebookSizer(notebook)
! ##    sizer2 = wxBoxSizer(wxVERTICAL)
! ##    sizer2.Add(self.notebooksizer)
! ##    self.frame.SetAutoLayout(1)
! ##    self.SetSizer(sizer2)
                               
      notebook.show()
-     self.__notebookLoopTrap = 0
      
! ##    EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(), 
self.notebookTabHandler)
!                              
    def createPage(self, object): 
  
  ##    sizer = wxBoxSizer(wxVERTICAL)  
--- 94,110 ----
      
      self.pane = notebook = QTabWidget(self)
      notebook.setTabPosition(_tabStyles[self.form._layout.tabbed])
! 
!     # Hack!
!     w,h = self.layoutSize[2:]
!     notebook.resize(w*1.1, h*1.1)
                               
+     QObject.connect(notebook, SIGNAL("currentChanged(QWidget*)"), 
+                     self.notebookTabHandler)
+                     
      notebook.show()
      
!   
    def createPage(self, object): 
  
  ##    sizer = wxBoxSizer(wxVERTICAL)  
***************
*** 123,139 ****
      self.frame.SetClientSize(self.GetSize())
      self._fitted = 1
    
!   def notebookTabHandler(self,event):
!     if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
!       #object = _IdToGFObj[_eventObjToQtWindow(event).GetId()]
!       action = None
!       if self.__notebookLoopTrap == 0:
!         action = events.Event('requestPAGE',event.GetSelection(), 
_form=self.form)
!         self.__notebookLoopTrap = 1
!       else:
!         self.__notebookLoopTrap = 0
!     if action:
!       self.uiform._eventHandler(action)
    
    def setPage(self, page): 
      pageId = self._pageList.index(page)
--- 132,141 ----
      self.frame.SetClientSize(self.GetSize())
      self._fitted = 1
    
!   def notebookTabHandler(self,qwidget):
!     #object = _IdToGFObj[_eventObjToQtWindow(event).GetId()]
!     action = events.Event('requestPAGE',self.pane.currentPageIndex(), 
_form=self.form)
!     self.uiform._eventHandler(action)
    
    def setPage(self, page): 
      pageId = self._pageList.index(page)