gnue/forms setup.py src/dialogs/_base.py src/di...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/04/02 15:49:13

Modified files:
        forms          : setup.py 
        forms/src/dialogs: _base.py 
        forms/src/dialogs/about: __init__.py 
        forms/src/dialogs/jumpto: __init__.py 
        forms/src/dialogs/messageBox: __init__.py 
Added files:
        forms/dialogs  : about.gfd jumpto.gfd messageBox.gfd 
Removed files:
        forms/src/dialogs/about: about.gfd 
        forms/src/dialogs/jumpto: jumpto.gfd 
        forms/src/dialogs/messageBox: messageBox.gfd 

Log message:
        moved the dialog .gfd files into the shared data directories, instead 
of the module code directories

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/setup.py.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/dialogs/about.gfd?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/dialogs/jumpto.gfd?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/dialogs/messageBox.gfd?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/_base.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/about/__init__.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/jumpto/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/messageBox/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/forms/setup.py
diff -c gnue/forms/setup.py:1.82 gnue/forms/setup.py:1.83
*** gnue/forms/setup.py:1.82    Wed Apr  2 04:08:56 2003
--- gnue/forms/setup.py Wed Apr  2 15:49:12 2003
***************
*** 273,280 ****
               preserve_path = 1),
    Data_Files(
               base_dir = 'install_data',
!              copy_to = 'lib/python/gnue/forms',
!              template = ['recursive-include src/dialogs *.gfd',
                          ],
               strip_dirs = 1, # This is a number, not true/false
               preserve_path = 1),
--- 273,280 ----
               preserve_path = 1),
    Data_Files(
               base_dir = 'install_data',
!              copy_to = 'shared/dialogs',
!              template = ['recursive-include dialogs *.gfd',
                          ],
               strip_dirs = 1, # This is a number, not true/false
               preserve_path = 1),
Index: gnue/forms/src/dialogs/_base.py
diff -c gnue/forms/src/dialogs/_base.py:1.2 gnue/forms/src/dialogs/_base.py:1.3
*** gnue/forms/src/dialogs/_base.py:1.2 Wed Feb 12 22:27:31 2003
--- gnue/forms/src/dialogs/_base.py     Wed Apr  2 15:49:12 2003
***************
*** 1,14 ****
  import os, sys
  
! dialogName = ''
  
! def buildForm():
!   basedir  = os.path.dirname(__file__)
!   #basedir +='/dialogs/'
  
!   print "Da basedir is", basedir+dialogName
!         
!   formFile = open(basedir+dialogName)
!   form = formFile.readlines()
    formFile.close()
    return form
--- 1,41 ----
+ #
+ # 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.
+ #
+ # Copyright 2003 Free Software Foundation
+ #
+ # FILE:
+ # GFForm.py
+ #
+ # DESCRIPTION:
+ #
+ # NOTES:
+ #
+ 
  import os, sys
+ from gnue.common.apps import GConfig
+ from gnue.common.utils.FileUtils import openResource
+ 
  
! def loadDialog(dialogName):
  
!   basedir  = GConfig.getInstalledBase('form_shared', 'common_shared')
  
!   formFile = openResource(os.path.join(basedir,'dialogs',dialogName))
!   form = formFile.read()
    formFile.close()
    return form
Index: gnue/forms/src/dialogs/about/__init__.py
diff -c gnue/forms/src/dialogs/about/__init__.py:1.3 
gnue/forms/src/dialogs/about/__init__.py:1.4
*** gnue/forms/src/dialogs/about/__init__.py:1.3        Fri Feb 28 19:15:07 2003
--- gnue/forms/src/dialogs/about/__init__.py    Wed Apr  2 15:49:12 2003
***************
*** 1,11 ****
! import os, sys
  
! dialogName = '/about.gfd'
  
  def buildForm():
!     basedir  = os.path.dirname(__file__)
!     
!     formFile = open(basedir+dialogName)
!     form = formFile.read()
!     formFile.close()
!     return form
--- 1,34 ----
! #
! # 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.
! #
! # Copyright 2003 Free Software Foundation
! #
! # FILE:
! # about/__init__.py
! #
! # DESCRIPTION:
! #
! # NOTES:
! #
  
! dialogName = 'about.gfd'
! 
! from gnue.forms.dialogs._base import loadDialog as _load
  
  def buildForm():
!   return _load(dialogName)
Index: gnue/forms/src/dialogs/jumpto/__init__.py
diff -c gnue/forms/src/dialogs/jumpto/__init__.py:1.1 
gnue/forms/src/dialogs/jumpto/__init__.py:1.2
*** gnue/forms/src/dialogs/jumpto/__init__.py:1.1       Fri Feb 28 19:15:07 2003
--- gnue/forms/src/dialogs/jumpto/__init__.py   Wed Apr  2 15:49:12 2003
***************
*** 1,11 ****
! import os, sys
  
! dialogName = '/jumpto.gfd'
  
  def buildForm():
!     basedir  = os.path.dirname(__file__)
!     
!     formFile = open(basedir+dialogName)
!     form = formFile.read()
!     formFile.close()
!     return form
--- 1,34 ----
! #
! # 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.
! #
! # Copyright 2003 Free Software Foundation
! #
! # FILE:
! # jumpto/__init__.py
! #
! # DESCRIPTION:
! #
! # NOTES:
! #
  
! dialogName = 'jumpto.gfd'
! 
! from gnue.forms.dialogs._base import loadDialog as _load
  
  def buildForm():
!   return _load(dialogName)
Index: gnue/forms/src/dialogs/messageBox/__init__.py
diff -c gnue/forms/src/dialogs/messageBox/__init__.py:1.1 
gnue/forms/src/dialogs/messageBox/__init__.py:1.2
*** gnue/forms/src/dialogs/messageBox/__init__.py:1.1   Wed Mar  5 21:06:03 2003
--- gnue/forms/src/dialogs/messageBox/__init__.py       Wed Apr  2 15:49:12 2003
***************
*** 1,11 ****
! import os, sys
  
! dialogName = '/messageBox.gfd'
  
  def buildForm():
!     basedir  = os.path.dirname(__file__)
!     
!     formFile = open(basedir+dialogName)
!     form = formFile.read()
!     formFile.close()
!     return form
--- 1,34 ----
! #
! # 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.
! #
! # Copyright 2003 Free Software Foundation
! #
! # FILE:
! # messageBox/__init__.py
! #
! # DESCRIPTION:
! #
! # NOTES:
! #
  
! dialogName = 'messageBox.gfd'
! 
! from gnue.forms.dialogs._base import loadDialog as _load
  
  def buildForm():
!   return _load(dialogName)