commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue designer/src/GFDesigner.py designer/src/In...


From: Jason Cater
Subject: gnue designer/src/GFDesigner.py designer/src/In...
Date: Fri, 11 Jan 2002 02:35:56 -0500

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/11 02:35:56

Modified files:
        designer/src   : GFDesigner.py Instance.py __init__.py 
        designer/src/forms: __init__.py 
        designer/src/navigator: __init__.py 
        forms/src      : __init__.py 
        navigator/src  : __init__.py 
        reports/src    : __init__.py 

Log message:
        misc changes; restructuring -- this may temporarily break cvs, I'll fix 
in the AM

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/__init__.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/__init__.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/navigator/__init__.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/__init__.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/navigator/src/__init__.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/__init__.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/designer/src/GFDesigner.py
diff -c gnue/designer/src/GFDesigner.py:1.25 
gnue/designer/src/GFDesigner.py:1.26
*** gnue/designer/src/GFDesigner.py:1.25        Mon Nov 26 12:40:32 2001
--- gnue/designer/src/GFDesigner.py     Fri Jan 11 02:35:55 2002
***************
*** 29,48 ****
  from StringIO import StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
- from gnue.designer.Instance import GFDInstance
  from gnue.designer import VERSION, PACKAGE
  import TemplateParser, TemplateChooser, MRUManager
  from gnue.common.GClientApp import GClientApp
  from gnue.forms import UIwxpython, GFForm
  
  class GFDesigner(GClientApp, wxApp):
  
    # GClientApp stuff...
    NAME = PACKAGE
    VERSION = VERSION
!   COMMAND = "gfdesign"
    SUMMARY = "A graphical tool for the rapid deployment of GNU Enterprise 
forms and reports."
!   USAGE = "gfdesign [options] [files]"
  
    def __init__(self):
      self.mru = MRUManager.MRUManager(self)
--- 29,51 ----
  from StringIO import StringIO
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  from gnue.designer import VERSION, PACKAGE
  import TemplateParser, TemplateChooser, MRUManager
  from gnue.common.GClientApp import GClientApp
+ 
+ # TODO: Must go!!
  from gnue.forms import UIwxpython, GFForm
+ from gnue.designer.forms import Instance as GFDInstance
+ 
  
  class GFDesigner(GClientApp, wxApp):
  
    # GClientApp stuff...
    NAME = PACKAGE
    VERSION = VERSION
!   COMMAND = "gdes"
    SUMMARY = "A graphical tool for the rapid deployment of GNU Enterprise 
forms and reports."
!   USAGE = "gdes [options] [files]"
  
    def __init__(self):
      self.mru = MRUManager.MRUManager(self)
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.35 gnue/designer/src/Instance.py:1.36
*** gnue/designer/src/Instance.py:1.35  Tue Jan  1 13:31:59 2002
--- gnue/designer/src/Instance.py       Fri Jan 11 02:35:55 2002
***************
*** 1,5 ****
  #
! # Copyright 2001 Free Software Foundation
  #
  # This file is part of GNU Enterprise.
  #
--- 1,5 ----
  #
! # Copyright 2001-2002 Free Software Foundation
  #
  # This file is part of GNU Enterprise.
  #
***************
*** 30,36 ****
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  from gnue.common.GClientApp import GClientApp
- from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
  from MenuBar import MainMenuBar
  from PopupMenu import ObjectMenu
  from LayoutEditor import LayoutEditor
--- 30,35 ----
***************
*** 41,51 ****
  from ToolFrame import ToolFrame
  from gnue.designer import VERSION, PACKAGE
  
  TITLE=PACKAGE
  
! class GFDInstance(GFInstance.GFInstance, wxFrame):
    def __init__(self, app, location=None, deferInit=0, buffer=None):
-     GFInstance.GFInstance.__init__(self, app, -1, app.connections, None, 
disableSplash=1)
      wxFrame.__init__(self, NULL, -1, "")
  
      # Register ourself with RuntimeSettings
--- 40,53 ----
  from ToolFrame import ToolFrame
  from gnue.designer import VERSION, PACKAGE
  
+ # TODO: Must go!!
+ from gnue.forms import GFForm, GFParser, GFObjects, GFTrigger, GFLibrary, 
UIwxpython
+ 
+ 
  TITLE=PACKAGE
  
! class BaseInstance(wxFrame):
    def __init__(self, app, location=None, deferInit=0, buffer=None):
      wxFrame.__init__(self, NULL, -1, "")
  
      # Register ourself with RuntimeSettings
***************
*** 362,376 ****
          other.append(child)
  
  
!     # Reorder the children so items of same class are grouped 
      self._form._children = []
!     for child in options: 
        self._form._children.append(child)
      for child in imports:
        self._form._children.append(child)
!     for child in datasources: 
        self._form._children.append(child)
!     for child in triggers: 
        self._form._children.append(child)
      for child in pages: 
        self._form._children.append(child)
--- 364,378 ----
          other.append(child)
  
  
!     # Reorder the children so items of same class are grouped
      self._form._children = []
!     for child in options:
        self._form._children.append(child)
      for child in imports:
        self._form._children.append(child)
!     for child in datasources:
        self._form._children.append(child)
!     for child in triggers:
        self._form._children.append(child)
      for child in pages: 
        self._form._children.append(child)
***************
*** 378,384 ****
        self._form._children.append(child)
  
      fileHandle = open(location,'w')
!     if sys.getdefaultencoding() == 'ascii': 
        fileHandle.write('<?xml version="1.0"?>\n\n')
      else: 
        fileHandle.write('<?xml version="1.0" encoding="%s"?>\n\n' % \
--- 380,386 ----
        self._form._children.append(child)
  
      fileHandle = open(location,'w')
!     if sys.getdefaultencoding() == 'ascii':
        fileHandle.write('<?xml version="1.0"?>\n\n')
      else: 
        fileHandle.write('<?xml version="1.0" encoding="%s"?>\n\n' % \
***************
*** 425,431 ****
        dlg.Destroy()
        if save == wxID_YES:
          self.OnSave(event)
!       elif save == wxID_CANCEL: 
          event.Veto()
          return
  
--- 427,433 ----
        dlg.Destroy()
        if save == wxID_YES:
          self.OnSave(event)
!       elif save == wxID_CANCEL:
          event.Veto()
          return
  
***************
*** 435,439 ****
--- 437,458 ----
  
    def OnDebugRun (self, event):
      DebugSession(self)
+ 
+ 
+ #
+ # Helper class used by the tool-specific packages
+ #
+ class ToolProperties:
+   xmlOpeningTag = 'undefined'
+   short = 'undefined'
+   application = 'GNUe Tool'
+   description = 'undefined'
+   fileExtensions = {}
+   defaultFileExtension = 'undefined'
+ 
+ 
+ def load(app, file):
+   pass
+ 
  
  
Index: gnue/designer/src/__init__.py
diff -c gnue/designer/src/__init__.py:1.5 gnue/designer/src/__init__.py:1.6
*** gnue/designer/src/__init__.py:1.5   Sun Nov  4 22:21:11 2001
--- gnue/designer/src/__init__.py       Fri Jan 11 02:35:55 2002
***************
*** 19,26 ****
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
  PACKAGE='GNUe Designer'
- VERSION='0.1.0'
  TITLE = 'GNUe Designer'
  
  
--- 19,73 ----
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
+ 
+ #
+ # CREATING A RELEASE:
+ #   1. Change _version to be the current version number
+ #   2. Set _release to 1
+ #
+ # AFTER THE RELEASE:
+ #   3. Increase the minor number
+ #   4. Set _release = 0
+ #   5. Commit to CVS
+ 
+ _version = (0,1,1)
+ _release = 0
+ 
+ # Version will be of the form "1.1.2" if a release or "1.1.2a" if in CVS
+ VERSION= ("%s.%s.%s" % _version) + (not _release and 'a' or '')
+ 
+ # Hex Version will be an integer in which version 1.2.15 is represented
+ # as 0x010215FF (for a release) or 0x01021500 (for a CVS snapshot)
+ # This allows numeric testing of version numbers
+ # (e.g., HEXVERSION >= 0x01020000)
+ HEXVERSION = eval('0x%s%s' % ('%02d%02d%02d' % _version,
+                                _release and 'FF' or '00') )
+ 
+ # Sigh... For Python compatability
+ __version__ = VERSION
+ __hexversion__ = HEXVERSION
+ 
+ 
  PACKAGE='GNUe Designer'
  TITLE = 'GNUe Designer'
  
+ 
+ ###########################################################
+ #
+ # Now, GNUe Designer specific stuff
+ #
+ 
+ from gnue.common import GDebug as _GDebug
+ 
+ SupportedTools = []
+ UnsupportedTools = []
+ 
+ for tool in ('forms','reports','navigator'):
+   try:
+     SupportedTools.append(__import__(tool))
+     _GDebug.printMesg(1,'Loaded Designer support for %s' % tool)
+   except ImportError, mesg:
+     UnsupportedTools.append(tool)
+     _GDebug.printMesg(1,'Cannot load Designer support for %s' % tool)
+     _GDebug.printMesg(2,'  Error: %s' % mesg)
  
Index: gnue/designer/src/forms/__init__.py
diff -c gnue/designer/src/forms/__init__.py:1.1 
gnue/designer/src/forms/__init__.py:1.2
*** gnue/designer/src/forms/__init__.py:1.1     Thu Jan 10 21:22:07 2002
--- gnue/designer/src/forms/__init__.py Fri Jan 11 02:35:55 2002
***************
*** 0 ****
--- 1,47 ----
+ #
+ # Copyright 2002 Free Software Foundation
+ #
+ # This file is part of GNU Enterprise.
+ #
+ # GNU Enterprise is free software; you can redistribute it
+ # and/or modify it under the terms of the GNU General Public
+ # License as published by the Free Software Foundation; either
+ # version 2, or (at your option) any later version.
+ #
+ # GNU Enterprise is distributed in the hope that it will be
+ # useful, but WITHOUT ANY WARRANTY; without even the implied
+ # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ # PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public
+ # License along with program; see the file COPYING. If not,
+ # write to the Free Software Foundation, Inc., 59 Temple Place
+ # - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # FILE:
+ # form/__init__.py
+ #
+ # DESCRIPTION:
+ # Various constants for the forms interface
+ #
+ # NOTES:
+ # This __init__ causes gnue.designer.forms to expose
+ # the Instance class plus a properties object.
+ #
+ 
+ print "I beeze here!"
+ #from Instance import Instance
+ 
+ class FormToolProperties(Instance.FormProperties):
+ 
+   application = 'GNUe Forms'
+   nickname = 'Form'
+   description = 'GNUe Form Definition'
+   xmlOpeningTag = 'form'
+ 
+   fileExtensions = { 'gfd': 'GNUe Form Definition',
+                      'gfl': 'GNUe Form Library' }
+ 
+   defaultFileExtension = 'gfd'
+ 
+ properties = FormToolProperties()
Index: gnue/designer/src/navigator/__init__.py
diff -c gnue/designer/src/navigator/__init__.py:1.1 
gnue/designer/src/navigator/__init__.py:1.2
*** gnue/designer/src/navigator/__init__.py:1.1 Thu Jan 10 21:22:07 2002
--- gnue/designer/src/navigator/__init__.py     Fri Jan 11 02:35:55 2002
***************
*** 0 ****
--- 1,45 ----
+ #
+ # Copyright 2002 Free Software Foundation
+ #
+ # This file is part of GNU Enterprise.
+ #
+ # GNU Enterprise is free software; you can redistribute it
+ # and/or modify it under the terms of the GNU General Public
+ # License as published by the Free Software Foundation; either
+ # version 2, or (at your option) any later version.
+ #
+ # GNU Enterprise is distributed in the hope that it will be
+ # useful, but WITHOUT ANY WARRANTY; without even the implied
+ # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ # PURPOSE. See the GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public
+ # License along with program; see the file COPYING. If not,
+ # write to the Free Software Foundation, Inc., 59 Temple Place
+ # - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # FILE:
+ # navigator/__init__.py
+ #
+ # DESCRIPTION:
+ # Various constants for the navigator interface
+ #
+ # NOTES:
+ # This __init__ causes gnue.designer.navigator to expose
+ # the Instance class plus a properties object.
+ #
+ 
+ from Instance import Instance
+ 
+ class NavigatorToolProperties(Instance.NavigatorProperties):
+ 
+   application = 'GNUe Navigator'
+   nickname = 'Navigation'
+   description = 'GNUe Process Definition'
+   xmlOpeningTag = 'processes'
+ 
+   fileExtensions = { 'gpd': 'GNUe Menu/Process Definition' }
+ 
+   defaultFileExtension = 'gpd'
+ 
+ properties = NavigatorToolProperties()
\ No newline at end of file
Index: gnue/forms/src/__init__.py
diff -c gnue/forms/src/__init__.py:1.3 gnue/forms/src/__init__.py:1.4
*** gnue/forms/src/__init__.py:1.3      Sun Nov  4 20:28:05 2001
--- gnue/forms/src/__init__.py  Fri Jan 11 02:35:55 2002
***************
*** 19,23 ****
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
  PACKAGE="GNUe Forms"
- VERSION="0.1.0"
--- 19,52 ----
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
+ 
+ 
+ #
+ # CREATING A RELEASE:
+ #   1. Change _version to be the current version number
+ #   2. Set _release to 1
+ #
+ # AFTER THE RELEASE:
+ #   3. Increase the minor number
+ #   4. Set _release = 0
+ #   5. Commit to CVS
+ 
+ _version = (0,1,1)
+ _release = 0
+ 
+ # Version will be of the form "1.1.2" if a release or "1.1.2a" if in CVS
+ VERSION= ("%s.%s.%s" % _version) + (not _release and 'a' or '')
+ 
+ # Hex Version will be an integer in which version 1.2.15 is represented
+ # as 0x010215FF (for a release) or 0x01021500 (for a CVS snapshot)
+ # This allows numeric testing of version numbers
+ # (e.g., HEXVERSION >= 0x01020000)
+ HEXVERSION = eval('0x%s%s' % ('%02d%02d%02d' % _version,
+                                _release and 'FF' or '00') )
+ 
+ # Sigh... For Python compatability
+ __version__ = VERSION
+ __hexversion__ = HEXVERSION
+ 
+ 
  PACKAGE="GNUe Forms"
Index: gnue/navigator/src/__init__.py
diff -c gnue/navigator/src/__init__.py:1.1 gnue/navigator/src/__init__.py:1.2
*** gnue/navigator/src/__init__.py:1.1  Tue Jan  8 17:16:55 2002
--- gnue/navigator/src/__init__.py      Fri Jan 11 02:35:56 2002
***************
*** 19,23 ****
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
  PACKAGE="GNUe Navigator"
! VERSION="0.0.1"
--- 19,52 ----
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
+ 
+ #
+ # CREATING A RELEASE:
+ #   1. Change _version to be the current version number
+ #   2. Set _release to 1
+ #
+ # AFTER THE RELEASE:
+ #   3. Increase the minor number
+ #   4. Set _release = 0
+ #   5. Commit to CVS
+ 
+ _version = (0,0,1)
+ _release = 0
+ 
+ # Version will be of the form "1.1.2" if a release or "1.1.2a" if in CVS
+ VERSION= ("%s.%s.%s" % _version) + (not _release and 'a' or '')
+ 
+ # Hex Version will be an integer in which version 1.2.15 is represented
+ # as 0x010215FF (for a release) or 0x01021500 (for a CVS snapshot)
+ # This allows numeric testing of version numbers
+ # (e.g., HEXVERSION >= 0x01020000)
+ HEXVERSION = eval('0x%s%s' % ('%02d%02d%02d' % _version,
+                                _release and 'FF' or '00') )
+ 
+ # Sigh... For Python compatability
+ __version__ = VERSION
+ __hexversion__ = HEXVERSION
+ 
+ 
  PACKAGE="GNUe Navigator"
! TITLE=PACKAGE
\ No newline at end of file
Index: gnue/reports/src/__init__.py
diff -c gnue/reports/src/__init__.py:1.2 gnue/reports/src/__init__.py:1.3
*** gnue/reports/src/__init__.py:1.2    Mon Jul  2 13:53:45 2001
--- gnue/reports/src/__init__.py        Fri Jan 11 02:35:56 2002
***************
*** 19,23 ****
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
  PACKAGE="GNUe Reports"
- VERSION="pre0.0.1"
--- 19,51 ----
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  
+ 
+ #
+ # CREATING A RELEASE:
+ #   1. Change _version to be the current version number
+ #   2. Set _release to 1
+ #
+ # AFTER THE RELEASE:
+ #   3. Increase the minor number
+ #   4. Set _release = 0
+ #   5. Commit to CVS
+ 
+ _version = (0,0,1)
+ _release = 0
+ 
+ # Version will be of the form "1.1.2" if a release or "1.1.2a" if in CVS
+ VERSION= ("%s.%s.%s" % _version) + (not _release and 'a' or '')
+ 
+ # Hex Version will be an integer in which version 1.2.15 is represented
+ # as 0x010215FF (for a release) or 0x01021500 (for a CVS snapshot)
+ # This allows numeric testing of version numbers
+ # (e.g., HEXVERSION >= 0x01020000)
+ HEXVERSION = eval('0x%s%s' % ('%02d%02d%02d' % _version,
+                                _release and 'FF' or '00') )
+ 
+ # Sigh... For Python compatability
+ __version__ = VERSION
+ __hexversion__ = HEXVERSION
+ 
+ 
  PACKAGE="GNUe Reports"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]