gnue common/src/GDataObjects.py designer/client...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/22 21:48:53

Modified files:
        common/src     : GDataObjects.py 
        designer/client: gfdesigner.in 
        designer/src   : DataSourceEditor.py Designer.py Instance.py 
                         MRUManager.py SchemaViewer.py ToolFrame.py 
        designer/src/navigator: LayoutEditor.py 
        forms/src      : UIwxpython.py 

Log message:
        fixed name issues from moving files in cvs; misc other bug fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GDataObjects.py.diff?cvsroot=OldCVS&tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/client/gfdesigner.in.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/DataSourceEditor.py.diff?cvsroot=OldCVS&tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Designer.py.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/MRUManager.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/SchemaViewer.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/ToolFrame.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/navigator/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.131&tr2=1.132&r1=text&r2=text

Patches:
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.37 
gnue/common/src/GDataObjects.py:1.38
*** gnue/common/src/GDataObjects.py:1.37        Mon Jan 21 13:50:24 2002
--- gnue/common/src/GDataObjects.py     Tue Jan 22 21:48:53 2002
***************
*** 664,676 ****
  # Used to store schema data
  class Schema:
    def __init__(self, attrs={}, getChildSchema=None):
!     self.name = None
!     self.type = None
      self.__dict__.update(attrs)
      if getChildSchema != None:
        self.getChildSchema = getChildSchema
  
    def __cmp__(self, other):
      return cmp(string.lower(self.name), string.lower(other.name))
  
    def getChildSchema(self, parent):
--- 664,679 ----
  # Used to store schema data
  class Schema:
    def __init__(self, attrs={}, getChildSchema=None):
!     self.name = ''
!     self.type = ''
      self.__dict__.update(attrs)
      if getChildSchema != None:
        self.getChildSchema = getChildSchema
  
    def __cmp__(self, other):
+     if not isinstance(other, Schema):
+       return cmp(self,other)
+ 
      return cmp(string.lower(self.name), string.lower(other.name))
  
    def getChildSchema(self, parent):
Index: gnue/designer/client/gfdesigner.in
diff -c gnue/designer/client/gfdesigner.in:1.1 
gnue/designer/client/gfdesigner.in:1.2
*** gnue/designer/client/gfdesigner.in:1.1      Sat Jun 30 15:54:29 2001
--- gnue/designer/client/gfdesigner.in  Tue Jan 22 21:48:53 2002
***************
*** 29,35 ****
      if os.path.isfile(INST_GNUE_CONNECTIONS):
          os.environ['GNUE_CONNECTIONS'] = INST_GNUE_CONNECTIONS
    
! from  gnue.designer.GFDesigner import *
  
  if __name__ == '__main__':
!         GFDesigner().run()
--- 29,35 ----
      if os.path.isfile(INST_GNUE_CONNECTIONS):
          os.environ['GNUE_CONNECTIONS'] = INST_GNUE_CONNECTIONS
    
! from  gnue.designer.Designer import *
  
  if __name__ == '__main__':
!         Designer().run()
Index: gnue/designer/src/DataSourceEditor.py
diff -c gnue/designer/src/DataSourceEditor.py:1.19 
gnue/designer/src/DataSourceEditor.py:1.20
*** gnue/designer/src/DataSourceEditor.py:1.19  Tue Jan 22 13:17:14 2002
--- gnue/designer/src/DataSourceEditor.py       Tue Jan 22 21:48:53 2002
***************
*** 30,36 ****
  import sys, os, cPickle, traceback, StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig, GDataSource
! import RuntimeSettings
  import Incubator
  
  class DataSourceEditor(wxPanel):
--- 30,36 ----
  import sys, os, cPickle, traceback, StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig, GDataSource
! from gnue.common import RuntimeSettings
  import Incubator
  
  class DataSourceEditor(wxPanel):
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.33 gnue/designer/src/Designer.py:1.34
*** gnue/designer/src/Designer.py:1.33  Tue Jan 22 14:19:15 2002
--- gnue/designer/src/Designer.py       Tue Jan 22 21:48:53 2002
***************
*** 70,76 ****
  from gnue.designer import forms
  
  
! class GFDesigner(GClientApp, wxApp):
  
    # GClientApp stuff...
    NAME = PACKAGE
--- 70,76 ----
  from gnue.designer import forms
  
  
! class Designer(GClientApp, wxApp):
  
    # GClientApp stuff...
    NAME = PACKAGE
***************
*** 125,134 ****
      return isdirty
  
  
- ##  def OnNew(self, event):
- ##    GFDInstance(self, None)
- 
- 
    def OnWizard(self, event):
  
      wizard = TemplateChooser.TemplateChooser(self).run()
--- 125,130 ----
***************
*** 147,162 ****
      # TODO:        instance, not do away with having to
      # TODO:        create a new, final instance.)
  
!     instance = GFDInstance(self, None)
      form = GFForm.GFForm(app=instance)
  
      if TemplateParser.TemplateParser(instance, form,
            instance, templateInformation).run():
  
!       GFDInstance(self, buffer=StringIO(form.dumpXML()))
  
      instance.Close()
  
    def isFileOpened(self, location):
      # TODO: Check to see if a file is already opened
      return 0
--- 143,160 ----
      # TODO:        instance, not do away with having to
      # TODO:        create a new, final instance.)
  
! 
!     instance = self.newInstance(forms)
      form = GFForm.GFForm(app=instance)
  
      if TemplateParser.TemplateParser(instance, form,
            instance, templateInformation).run():
  
!       self.newInstance(forms, buffer=StringIO(form.dumpXML()))
  
      instance.Close()
  
+ 
    def isFileOpened(self, location):
      # TODO: Check to see if a file is already opened
      return 0
***************
*** 181,187 ****
  
      location = self.mru.mruMenuMap[event.GetId()]
      if not self.isFileOpened(location):
!       GFDInstance( self, location )
  
  
    def OnExit(self, event):
--- 179,185 ----
  
      location = self.mru.mruMenuMap[event.GetId()]
      if not self.isFileOpened(location):
!       self.load(location )
  
  
    def OnExit(self, event):
***************
*** 301,305 ****
  #
  #
  if __name__ == '__main__':
!   GFDesigner().run()
  
--- 299,303 ----
  #
  #
  if __name__ == '__main__':
!   Designer().run()
  
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.45 gnue/designer/src/Instance.py:1.46
*** gnue/designer/src/Instance.py:1.45  Tue Jan 22 14:19:15 2002
--- gnue/designer/src/Instance.py       Tue Jan 22 21:48:53 2002
***************
*** 30,36 ****
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  from MenuBar import MainMenuBar
! import RuntimeSettings
  from ToolFrame import ToolFrame
  from gnue.designer import VERSION, PACKAGE
  
--- 30,36 ----
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  from MenuBar import MainMenuBar
! from gnue.common import RuntimeSettings
  from ToolFrame import ToolFrame
  from gnue.designer import VERSION, PACKAGE
  
Index: gnue/designer/src/MRUManager.py
diff -c gnue/designer/src/MRUManager.py:1.2 gnue/designer/src/MRUManager.py:1.3
*** gnue/designer/src/MRUManager.py:1.2 Mon Nov 26 12:40:32 2001
--- gnue/designer/src/MRUManager.py     Tue Jan 22 21:48:53 2002
***************
*** 28,34 ****
  #
  
  import os
! import RuntimeSettings
  from wxPython import wx
  
  class MRUManager: 
--- 28,34 ----
  #
  
  import os
! from gnue.common import RuntimeSettings
  from wxPython import wx
  
  class MRUManager: 
Index: gnue/designer/src/SchemaViewer.py
diff -c gnue/designer/src/SchemaViewer.py:1.2 
gnue/designer/src/SchemaViewer.py:1.3
*** gnue/designer/src/SchemaViewer.py:1.2       Tue Jan 22 13:17:14 2002
--- gnue/designer/src/SchemaViewer.py   Tue Jan 22 21:48:53 2002
***************
*** 30,36 ****
  import sys, os, cPickle, traceback, StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig, GDataSource
! import RuntimeSettings
  import Incubator
  
  class SchemaViewer(wxPanel):
--- 30,36 ----
  import sys, os, cPickle, traceback, StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig, GDataSource
! from gnue.common import RuntimeSettings
  import Incubator
  
  class SchemaViewer(wxPanel):
Index: gnue/designer/src/ToolFrame.py
diff -c gnue/designer/src/ToolFrame.py:1.7 gnue/designer/src/ToolFrame.py:1.8
*** gnue/designer/src/ToolFrame.py:1.7  Mon Jan 14 18:19:29 2002
--- gnue/designer/src/ToolFrame.py      Tue Jan 22 21:48:53 2002
***************
*** 27,33 ****
  #
  
  import os, sys
! import RuntimeSettings
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  
--- 27,33 ----
  #
  
  import os, sys
! from gnue.common import RuntimeSettings
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  
Index: gnue/designer/src/navigator/LayoutEditor.py
diff -c gnue/designer/src/navigator/LayoutEditor.py:1.3 
gnue/designer/src/navigator/LayoutEditor.py:1.4
*** gnue/designer/src/navigator/LayoutEditor.py:1.3     Tue Jan 22 20:25:45 2002
--- gnue/designer/src/navigator/LayoutEditor.py Tue Jan 22 21:48:53 2002
***************
*** 29,35 ****
  import sys, os, cPickle, string
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
! import RuntimeSettings
  
  
  class LayoutEditor (wxPanel):
--- 29,35 ----
  import sys, os, cPickle, string
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
! from gnue.common import RuntimeSettings
  
  
  class LayoutEditor (wxPanel):
Index: gnue/forms/src/UIwxpython.py
diff -c gnue/forms/src/UIwxpython.py:1.131 gnue/forms/src/UIwxpython.py:1.132
*** gnue/forms/src/UIwxpython.py:1.131  Tue Jan 22 21:38:03 2002
--- gnue/forms/src/UIwxpython.py        Tue Jan 22 21:48:53 2002
***************
*** 77,98 ****
  #
  def initFont(widget, affectsLayout=1):
  
!   if not (affectsLayout or (not affectsLayout and \
!           int(GConfig.get('fixedWidthEntries','1')))):
!     return
! 
!   face = GConfig.get('fontface',None)
! 
!   if face != None:
!     if string.lower(GConfig.get('fontweight','normal')) == 'bold':
!       weight = wxBOLD
!     else:
!       weight = wxNORMAL
! 
!     widget.SetFont(wxFont(int(GConfig.get('PointSize')),wxMODERN,
!           wxNORMAL,weight, faceName=face))
! 
!   elif int(GConfig.get('fixedWidthFont')):
      
widget.SetFont(wxFont(int(GConfig.get('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))
  
  
--- 77,98 ----
  #
  def initFont(widget, affectsLayout=1):
  
! ##  if not (affectsLayout or (not affectsLayout and \
! ##          int(GConfig.get('fixedWidthEntries','1')))):
! ##    return
! ##
! ##  face = GConfig.get('fontface',None)
! ##
! ##  if face != None:
! ##    if string.lower(GConfig.get('fontweight','normal')) == 'bold':
! ##      weight = wxBOLD
! ##    else:
! ##      weight = wxNORMAL
! ##
! ##    widget.SetFont(wxFont(int(GConfig.get('PointSize')),wxMODERN,
! ##          wxNORMAL,weight, faceName=face))
! ## elif...
!   if int(GConfig.get('fixedWidthFont')):
      
widget.SetFont(wxFont(int(GConfig.get('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))