[Pythoncard-cvs] PythonCard/samples/life lexicon.py,1.14,1.15 life.py,1.37,1.38 patterns.py,1.14,1.15

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/samples/life
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16543/samples/life

Modified Files:
	lexicon.py life.py patterns.py 
Log Message:
removed Stack class, changed self.stack.app references to self.application
  changed childWindow, Background, and CustomDialog inits so stack arg
  isn't passed in. only did minimal testing of tools and samples


Index: lexicon.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/samples/life/lexicon.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lexicon.py	24 Apr 2004 06:49:46 -0000	1.14
--- lexicon.py	10 May 2004 00:45:19 -0000	1.15
***************
*** 116,120 ****
      def loadPattern(self, name):
          #filename = name + '.lif'
!         #path = os.path.join(self.stack.app.applicationDirectory, 'patterns', filename)
          try:
              description, patternString = self.lexicon[name]
--- 116,120 ----
      def loadPattern(self, name):
          #filename = name + '.lif'
!         #path = os.path.join(self.application.applicationDirectory, 'patterns', filename)
          try:
              description, patternString = self.lexicon[name]

Index: life.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/samples/life/life.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** life.py	5 May 2004 16:53:26 -0000	1.37
--- life.py	10 May 2004 00:45:19 -0000	1.38
***************
*** 312,316 ****
          self.openingFileDialog = 1
          wildcard = "Life files (*.lif)|*.lif;*.LIF"
!         directory = os.path.join(self.stack.app.applicationDirectory, 'patterns')
          result = dialog.openFileDialog(None, "Import which file?", directory, '', wildcard)
          if result['accepted']:
--- 312,316 ----
          self.openingFileDialog = 1
          wildcard = "Life files (*.lif)|*.lif;*.LIF"
!         directory = os.path.join(self.application.applicationDirectory, 'patterns')
          result = dialog.openFileDialog(None, "Import which file?", directory, '', wildcard)
          if result['accepted']:

Index: patterns.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/samples/life/patterns.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** patterns.py	24 Apr 2004 06:49:46 -0000	1.14
--- patterns.py	10 May 2004 00:45:20 -0000	1.15
***************
*** 38,42 ****
  
      def populatePatternsList(self):
!         files = glob.glob(os.path.join(self.stack.app.applicationDirectory, 'patterns', '*.[Ll][Ii][Ff]'))
          items = []
          self.files = {}
--- 38,42 ----
  
      def populatePatternsList(self):
!         files = glob.glob(os.path.join(self.application.applicationDirectory, 'patterns', '*.[Ll][Ii][Ff]'))
          items = []
          self.files = {}
***************
*** 55,59 ****
      def loadPattern(self, name):
          #filename = name + '.lif'
!         #path = os.path.join(self.stack.app.applicationDirectory, 'patterns', filename)
          try:
              path = self.files[name]
--- 55,59 ----
      def loadPattern(self, name):
          #filename = name + '.lif'
!         #path = os.path.join(self.application.applicationDirectory, 'patterns', filename)
          try:
              path = self.files[name]