gnue designer/src/forms/Instance.py designer/sr...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/03 23:32:54

Modified files:
        designer/src/forms: Instance.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
        forms/src      : GFInstance.py 
        reports/src/adapters/filters/_merge: MergeBase.py 

Log message:
        Misc changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/_merge/MergeBase.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.21 
gnue/designer/src/forms/Instance.py:1.22
*** gnue/designer/src/forms/Instance.py:1.21    Fri Nov 29 02:07:00 2002
--- gnue/designer/src/forms/Instance.py Tue Dec  3 23:32:53 2002
***************
*** 83,91 ****
  
      BaseInstance.__init__(self, app, *args, **params)
  
! ##    self.registerEventListeners({
! ##                       'ObjectModified' : self.onModifyObject,
! ##                      })
  
    def loadBuffer(self, buffer):
      form = GFParser.loadFile (buffer, self, initialize=0)
--- 83,92 ----
  
      BaseInstance.__init__(self, app, *args, **params)
  
!     self.registerEventListeners({
!                        'ObjectModified' : self.onModifyObject,
!                        'ObjectDeleted' :  self.onDeleteObject,
!                       })
  
    def loadBuffer(self, buffer):
      form = GFParser.loadFile (buffer, self, initialize=0)
***************
*** 121,127 ****
        if self.rootObject._blockMap.has_key(object.name):
          raise "Warning: Multiple blocks with name %s" % object.name
        self.rootObject._blockMap[object.name] = object
! 
      elif isinstance(object, GFObjects.GFPage) and \
          object._parent == self.rootObject:
        self._pages.append(object)
--- 122,133 ----
        if self.rootObject._blockMap.has_key(object.name):
          raise "Warning: Multiple blocks with name %s" % object.name
        self.rootObject._blockMap[object.name] = object
!       object._fieldMap = {}
!     elif object._type == 'GFField':
!       object.findParentOfType('GFBlock')._fieldMap[object.name] = object
!     elif object._type == 'GFEntry':
!       object._block = self.rootObject._blockMap[object.block]
!       object._field = object._block._fieldMap[object.field]
      elif isinstance(object, GFObjects.GFPage) and \
          object._parent == self.rootObject:
        self._pages.append(object)
***************
*** 129,136 ****
      object._popupMenu = ObjectMenu(self, object)
  
  
! ##  def onModifyObject(self, event):
! ##    object = event.object
  
    def createTools(self):
      self.addTool('visualEditor',   _('Layout Editor'), LayoutEditor, 'F11')
--- 135,152 ----
      object._popupMenu = ObjectMenu(self, object)
  
  
!   def onModifyObject(self, event):
!     object = event.object
!     # TODO: Maintain all those fun dicts/lists created in inventoryObject()
! 
! 
!   def onDeleteObject(self, event):
!     object = event.object
!     if object._type == 'GFPage':
!       self._pages.remove(object)
! 
!     # TODO: Maintain all those fun dicts/lists created in inventoryObject()
! 
  
    def createTools(self):
      self.addTool('visualEditor',   _('Layout Editor'), LayoutEditor, 'F11')
***************
*** 148,168 ****
    def createWizards(self):
      self.loadWizards(wizards)
  
- 
- ##  def insertDataSourceTool(self, event=None, params=None):
- ##    pass
- ##
- ##  def insertPageTool(self, event=None, params=None):
- ##    pass
- ##
- ##  def insertBlockTool(self, event=None, params=None):
- ##    pass
- ##
- ##  def insertFieldTool(self, event=None, params=None):
- ##    pass
- ##
- ##  def insertDropdownTool(self, event=None, params=None):
- ##    pass
  
    def preSave(self):
  
--- 164,169 ----
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.39 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.40
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.39   Tue Dec  3 
00:33:08 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Tue Dec  3 
23:32:53 2002
***************
*** 65,71 ****
  
      self.notebook = wxNotebook(self, -1, pos=wxPoint(4, 4), 
size=wxSize(32,32))
      self.backcolor = wxWHITE
! ##    self.propBar = PropertyBar(self)
      self.toolbar = LayoutEditorTools(self, self.frame)
  
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
--- 65,71 ----
  
      self.notebook = wxNotebook(self, -1, pos=wxPoint(4, 4), 
size=wxSize(32,32))
      self.backcolor = wxWHITE
!     self.propBar = PropertyBar(self)
      self.toolbar = LayoutEditorTools(self, self.frame)
  
      EVT_NOTEBOOK_PAGE_CHANGED(self,self.notebook.GetId(), self.OnPageSelected)
***************
*** 126,131 ****
--- 126,133 ----
        self.notebook.AddPage(self.workspacescroll,object.name)
        object.__workspace = self.workspace
        self.drawPage(object)
+     elif object._type == 'GFEntry' and not self.block:
+       self.block = object._block
  
  
    def onSetCurrentObject (self, event):
***************
*** 140,156 ****
  ##      self.propBar.setCurrentObject(object)
      if handler != "Forms::LayoutEditor":
        self._setCurrentPage(object)
  
!   def _setCurrentBlock(self,object): 
!     if not object: 
        return
!     block = self.findParentOfType('GFBlock')
      if not block:
!       if object._type == 'GFField': 
          block = object._block
  
-   def _setCurrentPage(self, object):
  
      page = isinstance(object, GFObjects.GFPage) and object or \
             object.findParentOfType('GFPage')
  
--- 142,162 ----
  ##      self.propBar.setCurrentObject(object)
      if handler != "Forms::LayoutEditor":
        self._setCurrentPage(object)
+       self._setCurrentBlock(object)
  
!   def _setCurrentBlock(self,object):
!     if not object:
        return
!     block = object.findParentOfType('GFBlock')
      if not block:
!       if object._type == 'GFEntry':
          block = object._block
+     if block:
+       self.block = block
+       self.SetFeedbackText('Block: %s' % block.name)
  
  
+   def _setCurrentPage(self, object):
      page = isinstance(object, GFObjects.GFPage) and object or \
             object.findParentOfType('GFPage')
  
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.73 gnue/forms/src/GFInstance.py:1.74
*** gnue/forms/src/GFInstance.py:1.73   Tue Dec  3 13:06:32 2002
--- gnue/forms/src/GFInstance.py        Tue Dec  3 23:32:53 2002
***************
*** 136,142 ****
      for key in options.keys():
        if string.lower(key)[:4] == 'key_':
          mapping[key[4:]] = options[key]
!         
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
    #
--- 136,142 ----
      for key in options.keys():
        if string.lower(key)[:4] == 'key_':
          mapping[key[4:]] = options[key]
! 
      GFKeyMapper.KeyMapper.loadUserKeyMap(mapping)
  
    #
Index: gnue/reports/src/adapters/filters/_merge/MergeBase.py
diff -c gnue/reports/src/adapters/filters/_merge/MergeBase.py:1.6 
gnue/reports/src/adapters/filters/_merge/MergeBase.py:1.7
*** gnue/reports/src/adapters/filters/_merge/MergeBase.py:1.6   Wed Nov 13 
17:15:25 2002
--- gnue/reports/src/adapters/filters/_merge/MergeBase.py       Tue Dec  3 
23:32:54 2002
***************
*** 137,144 ****
  
      reg = re.search(self.REGEX, tmpl, re.DOTALL)
      if reg == None:
!       print "\nUnable to parse the requested template file.\n"
!       sys.exit()
  
      header, self.repeating, footer = reg.groups()
      self.output = output
--- 137,143 ----
  
      reg = re.search(self.REGEX, tmpl, re.DOTALL)
      if reg == None:
!       raise "Unable to parse the requested template file."
  
      header, self.repeating, footer = reg.groups()
      self.output = output