gnue/forms/src/uidrivers/qt UILoginHandler.py w...

[Jason Cater]

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

Modified files:
        forms/src/uidrivers/qt: UILoginHandler.py 
        forms/src/uidrivers/qt/widgets/form: widget.py wrappers.py 

Log message:
        fixed dialog support in QT; fixed login box issues

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

Patches:
Index: gnue/forms/src/uidrivers/qt/UILoginHandler.py
diff -c gnue/forms/src/uidrivers/qt/UILoginHandler.py:1.2 
gnue/forms/src/uidrivers/qt/UILoginHandler.py:1.3
*** gnue/forms/src/uidrivers/qt/UILoginHandler.py:1.2   Wed Mar  5 23:13:08 2003
--- gnue/forms/src/uidrivers/qt/UILoginHandler.py       Thu Mar  6 18:01:48 2003
***************
*** 108,114 ****
  ##      loginId = wxNewId()
  ##      cancelId = wxNewId()
  
!       loginButton = QPushButton(self.dlg)       
        loginButton.setText(_('Login'))
        loginButton.show()
        cancelButton = QPushButton(self.dlg)
--- 108,114 ----
  ##      loginId = wxNewId()
  ##      cancelId = wxNewId()
  
!       loginButton = QPushButton(self.dlg)
        loginButton.setText(_('Login'))
        loginButton.show()
        cancelButton = QPushButton(self.dlg)
***************
*** 117,123 ****
  
        QObject.connect(loginButton, SIGNAL("clicked()"),
                       self.loginButtonEventTrap)
!       QObject.connect(loginButton, SIGNAL("clicked()"),
                       self.loginCancelEventTrap)
        
        dlgWidth = max(dlgWidth, loginButton.width() +
--- 117,123 ----
  
        QObject.connect(loginButton, SIGNAL("clicked()"),
                       self.loginButtonEventTrap)
!       QObject.connect(cancelButton, SIGNAL("clicked()"),
                       self.loginCancelEventTrap)
        
        dlgWidth = max(dlgWidth, loginButton.width() +
***************
*** 173,179 ****
           dlgWidth - 10 - cancelButton.width(),
                  dlgHeight - 10 - max(loginButton.height(),
                                              cancelButton.height()))
!       print "Cancel Button %s,%s" % (cancelButton.x(),cancelButton.y())
        loginButton.move(
          dlgWidth - 16 - cancelButton.width() - \
                  loginButton.width(),
--- 173,179 ----
           dlgWidth - 10 - cancelButton.width(),
                  dlgHeight - 10 - max(loginButton.height(),
                                              cancelButton.height()))
! 
        loginButton.move(
          dlgWidth - 16 - cancelButton.width() - \
                  loginButton.width(),
***************
*** 185,190 ****
--- 185,191 ----
        self.dlg.setFixedSize(dlgWidth, dlgHeight)
  
        # If user cancels, this will be set to 0
+       self._accept = 0
        completed = self.dlg.exec_loop()
  
        if completed == QDialog.Rejected:
***************
*** 196,207 ****
  
        return rv
  
-   #
-   # Login is completed, for whatever reason
-   #
-   def loginCompleted(self, successful):
-     self._completed = successful
-     self.dlg.EndModal(1)
  
    #
    # Called when user clicks "login"
--- 197,202 ----
Index: gnue/forms/src/uidrivers/qt/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.4 
gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.5
*** gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.4      Tue Mar  4 
23:12:02 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/widget.py  Thu Mar  6 18:01:51 2003
***************
*** 68,87 ****
  
  
      # The main frame of this form
!     self.mainWindow = QMainWindow()
      self.mainWindow.setCaption(str(self._form.title))
!     
!     # The status bar 
!     self.statusBar = self.mainWindow.statusBar()
!     self.statusFields = []
!     for i in range(5): 
!       w = QLabel(self.statusBar,"%s" % i)
!       self.statusFields.append(w)
!       self.statusBar.addWidget(w, not i, 1)
!     
  ##    self.statusBar.SetStatusWidths([-1,50,50,75,75])
  
!     # The window in which pages will be rendered 
      if object._layout.tabbed:
        self._wrapper = wrappers.TabbedWrapper(self)
      else:
--- 68,91 ----
  
  
      # The main frame of this form
!     if self._form.name == '__main__':
!       self.mainWindow = QMainWindow()
!       # The status bar
!       self.statusBar = self.mainWindow.statusBar()
!       self.statusFields = []
!       for i in range(5):
!         w = QLabel(self.statusBar,"%s" % i)
!         self.statusFields.append(w)
!         self.statusBar.addWidget(w, not i, 1)
!     else:
!       self.mainWindow = QDialog(None, "w00t", 1)
! 
      self.mainWindow.setCaption(str(self._form.title))
! 
! 
  ##    self.statusBar.SetStatusWidths([-1,50,50,75,75])
  
!     # The window in which pages will be rendered
      if object._layout.tabbed:
        self._wrapper = wrappers.TabbedWrapper(self)
      else:
***************
*** 90,105 ****
      newWidget = self._wrapper.pane
      self._containerToolkitWidget = newWidget
  
!     
      # Add the menu
      if not self._form._features['GUI:MENUBAR:SUPPRESS']:
        MenuBar(self._uiDriver, self.mainWindow, self._form)
!     
      # and the Toolbar
      if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
        ToolBar(self._uiDriver, self.mainWindow, self._form)
!      
!       
      self._eventHandler = event.eventHandler
      self._wrapper.finalize()
  
--- 94,109 ----
      newWidget = self._wrapper.pane
      self._containerToolkitWidget = newWidget
  
! 
      # Add the menu
      if not self._form._features['GUI:MENUBAR:SUPPRESS']:
        MenuBar(self._uiDriver, self.mainWindow, self._form)
! 
      # and the Toolbar
      if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
        ToolBar(self._uiDriver, self.mainWindow, self._form)
! 
! 
      self._eventHandler = event.eventHandler
      self._wrapper.finalize()
  
***************
*** 190,201 ****
  
      
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
  
!              
    def show(self):
      #self.containerFrame.Show()
      self.mainWindow.show()
    def showModal(self):
      #self.containerFrame.Show()
!     self.mainWindow.showModal()
  
-                       
--- 194,206 ----
  
      
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
  
! 
    def show(self):
      #self.containerFrame.Show()
      self.mainWindow.show()
+ 
    def showModal(self):
      #self.containerFrame.Show()
!     self.mainWindow.exec_loop()
! 
  
Index: gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.3 
gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.4
*** gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py:1.3    Thu Mar  6 
01:51:22 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/wrappers.py        Thu Mar  6 
18:01:54 2003
***************
*** 34,81 ****
  
  from qt import *
  
! class ScrollableWrapper(QScrollView): 
!   def __init__(self, uiform): 
      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()
!     
!           
!   def OnFrameSize(self, event): 
      self.SetSize(self.frame.GetClientSize())
      self.fixScrollbars()
!     
!   def fixScrollbars(self): 
      x1, y1 = self.frame.GetClientSizeTuple()
      x2, y2 = self.pane.GetSizeTuple()
      if x1 < x2 or y1 < y2: 
--- 34,84 ----
  
  from qt import *
  
! class ScrollableWrapper(QScrollView):
!   def __init__(self, uiform):
      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 = []
!     try:
!       self.frame.setCentralWidget(self.spacerpane)
!     except AttributeError:
!       pass
! 
  
!   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()
! 
! 
!   def OnFrameSize(self, event):
      self.SetSize(self.frame.GetClientSize())
      self.fixScrollbars()
! 
!   def fixScrollbars(self):
      x1, y1 = self.frame.GetClientSizeTuple()
      x2, y2 = self.pane.GetSizeTuple()
      if x1 < x2 or y1 < y2: