gnue/forms/src GFInstance.py uidrivers/_base/UI...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/05/19 20:13:51

Modified files:
        forms/src      : GFInstance.py 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 
        forms/src/uidrivers/wx/widgets: page.py 
Added files:
        forms/src/uidrivers/wx: PrintForm.py 

Log message:
        Added a basic print-screen function to forms (only in wx; not working 
quite right under X-Windows)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.110&tr2=1.111&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.101&tr2=1.102&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/PrintForm.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.247&tr2=1.248&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/page.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.110 gnue/forms/src/GFInstance.py:1.111
*** gnue/forms/src/GFInstance.py:1.110  Mon May 12 19:40:23 2003
--- gnue/forms/src/GFInstance.py        Mon May 19 20:13:50 2003
***************
*** 341,347 ****
  
      self.dispatchEvent('gotoENTRY',object=form._currentEntry,
                         _form=form)
!     
      form.refreshDisplay(form)
      self.updateStatus(form)
          
--- 341,347 ----
  
      self.dispatchEvent('gotoENTRY',object=form._currentEntry,
                         _form=form)
! 
      form.refreshDisplay(form)
      self.updateStatus(form)
          
***************
*** 756,770 ****
          message = _("Invalid numeric value entered.")
        else:
          message = event._form.jumpRecord(count)
!         
        if message:
          self.displayMessageBox(message)
!         
          return
!         
        self._entryUpdated(event._form)
!   
!   # 
    #
    # toggleInsertMode(self):
    #
--- 756,770 ----
          message = _("Invalid numeric value entered.")
        else:
          message = event._form.jumpRecord(count)
! 
        if message:
          self.displayMessageBox(message)
! 
          return
! 
        self._entryUpdated(event._form)
! 
!   #
    #
    # toggleInsertMode(self):
    #
***************
*** 785,791 ****
      else:
        # TODO: should probably do something else as a default if trigger not 
available
        # TODO: like a screen print
!       pass
  
    #
    # executeRollback
--- 785,791 ----
      else:
        # TODO: should probably do something else as a default if trigger not 
available
        # TODO: like a screen print
!       self.dispatchEvent('uiPRINTOUT', _form=event._form)
  
    #
    # executeRollback
***************
*** 894,900 ****
      message = event._form.executeQuery()
      if message:
        self.displayMessageBox(message)
!       
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
      event._form.refreshDisplay(event._form._currentBlock)
      self._entryUpdated(event._form)
--- 894,900 ----
      message = event._form.executeQuery()
      if message:
        self.displayMessageBox(message)
! 
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
      event._form.refreshDisplay(event._form._currentBlock)
      self._entryUpdated(event._form)
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.101 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.102
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.101    Thu Apr 10 04:32:27 2003
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Mon May 19 20:13:50 2003
***************
*** 75,91 ****
              # Clipboard contents
              'setCLIPBOARD'     : self.setClipboardContents,
              'getCLIPBOARD'     : self.getClipboardContents,
            })
  
      #
      # Mapping - internal record status : displayed on status bar
      #
!     self.statusValues = {'saved'     :'OK',   
                           'modified'  :'MOD',
                           'deleted'   :'DEL',
                           'query'     :'QRY',
                           }
!     
      #
      # Multi-form support
      #
--- 75,94 ----
              # Clipboard contents
              'setCLIPBOARD'     : self.setClipboardContents,
              'getCLIPBOARD'     : self.getClipboardContents,
+ 
+             # Printout
+             'uiPRINTOUT'       : self.printout,
            })
  
      #
      # Mapping - internal record status : displayed on status bar
      #
!     self.statusValues = {'saved'     :'OK',
                           'modified'  :'MOD',
                           'deleted'   :'DEL',
                           'query'     :'QRY',
                           }
! 
      #
      # Multi-form support
      #
***************
*** 97,103 ****
                                              # widgets with the GFObj used as 
the key
  
      self._gfObjToToolkitWidgets = {}        # the GFObj to UI widget cross ref
!     
  
      #
      # Our local "clipboard"
--- 100,106 ----
                                              # widgets with the GFObj used as 
the key
  
      self._gfObjToToolkitWidgets = {}        # the GFObj to UI widget cross ref
! 
  
      #
      # Our local "clipboard"
***************
*** 144,150 ****
                widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
              else: 
                raise ImportError, "How the fsck did I get here?"
!           
              try:
                self._supportedWidgets[widget.configuration['provides']]=widget
              except Exception,mesg:
--- 147,153 ----
                widget = dyn_import('gnue.forms.uidrivers.%s.widgets.%s' 
%(uiDriver,widgetName))
              else: 
                raise ImportError, "How the fsck did I get here?"
! 
              try:
                self._supportedWidgets[widget.configuration['provides']]=widget
              except Exception,mesg:
***************
*** 197,203 ****
                     widgetHeight=self.widgetHeight,
                     interface=self,
                     initialize=1))
!   
        uiWidget = 
self._supportedWidgets[object._type].configuration['baseClass'](event)
        uiWidget._form = self._form
  
--- 200,206 ----
                     widgetHeight=self.widgetHeight,
                     interface=self,
                     initialize=1))
! 
        uiWidget = 
self._supportedWidgets[object._type].configuration['baseClass'](event)
        uiWidget._form = self._form
  
***************
*** 224,230 ****
        # Note: The list would be empty on hidden fields
        if not uiWidget.widgets == []:
          self._gfObjToToolkitWidgets[object] = uiWidget.widgets
!         
        GDebug.printMesg(2, "Widget is %s" % uiWidget.widgets)
  
      except KeyError:
--- 227,233 ----
        # Note: The list would be empty on hidden fields
        if not uiWidget.widgets == []:
          self._gfObjToToolkitWidgets[object] = uiWidget.widgets
! 
        GDebug.printMesg(2, "Widget is %s" % uiWidget.widgets)
  
      except KeyError:
***************
*** 410,421 ****
    #
    # _updateCreateEvent
    #
!   # Can be used by UI drivers to add more attributes to the event that 
    # creates a widget.  Called by the _stdConstructor during the building of 
the UI
    #
    def _updateCreateEvent(self, event):
      return event
  
  
    
#############################################################################
    #
--- 413,432 ----
    #
    # _updateCreateEvent
    #
!   # Can be used by UI drivers to add more attributes to the event that
    # creates a widget.  Called by the _stdConstructor during the building of 
the UI
    #
    def _updateCreateEvent(self, event):
      return event
  
+   #
+   # printout
+   #
+   # Perform the default printout/"screen print" function for
+   # this uidriver
+   #
+   def printout(self, event):
+     pass
  
    
#############################################################################
    #
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.247 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.248
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.247       Mon Mar 10 00:42:55 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon May 19 20:13:50 2003
***************
*** 45,50 ****
--- 45,51 ----
  from gnue.forms.uidrivers.wx.UIWXSplashScreen import *
  from gnue.forms.uidrivers.wx.widgets._base  import *
  from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
+ from PrintForm import printForm
  
  #from common import *
  
***************
*** 214,219 ****
--- 215,224 ----
  
      else:
        GDebug.printMesg(5,'Unable to open clipboard for write')
+ 
+ 
+   def printout(self, event):
+     printForm(self._form, self)
  
  
    
#############################################################################
Index: gnue/forms/src/uidrivers/wx/widgets/page.py
diff -c gnue/forms/src/uidrivers/wx/widgets/page.py:1.2 
gnue/forms/src/uidrivers/wx/widgets/page.py:1.3
*** gnue/forms/src/uidrivers/wx/widgets/page.py:1.2     Mon Mar  3 16:28:07 2003
--- gnue/forms/src/uidrivers/wx/widgets/page.py Mon May 19 20:13:51 2003
***************
*** 49,58 ****
  #
  class UIPage(UIHelper):
    def _createWidget(self, event, spacer):
!     
      object = event.object
  
!     newWidget = self._uiForm._wrapper.createPage(object)  
      _setDefaultEventHandlers(newWidget, event.eventHandler, event.initialize, 
self._uiDriver)
      self._containerToolkitWidget = newWidget
      return newWidget
--- 49,58 ----
  #
  class UIPage(UIHelper):
    def _createWidget(self, event, spacer):
! 
      object = event.object
  
!     newWidget = self._uiForm._wrapper.createPage(object)
      _setDefaultEventHandlers(newWidget, event.eventHandler, event.initialize, 
self._uiDriver)
      self._containerToolkitWidget = newWidget
      return newWidget