[Pythoncard-cvs] PythonCard/tools/standaloneBuilder changelog.txt,1.4,1.5 standaloneBuilder.py,1.7,1

Update of /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5246

Modified Files:
	changelog.txt standaloneBuilder.py standaloneBuilder.rsrc.py 
Log Message:
Added a workaround for a bug in fileSaveDialog under GTK2, fixed a relative path error when clicking 2 of the buttons on the main window


Index: changelog.txt
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/changelog.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** changelog.txt	19 Apr 2005 08:23:56 -0000	1.4
--- changelog.txt	26 Apr 2005 12:39:12 -0000	1.5
***************
*** 1,4 ****
--- 1,6 ----
  standaloneBuilder version Version 0.1.1 release date TBA
  --------------------------------------------------------
+     - Added a workaround for a GTK bug which affects the fileSaveDialog
+     - Fixed an UnboundLocalError when rebuilding projects
      - Fixed bug in spec file generation which was causing an exception
        in McMillan Installer when no Windows icon file had been selected

Index: standaloneBuilder.rsrc.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/standaloneBuilder.rsrc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** standaloneBuilder.rsrc.py	15 Apr 2005 15:18:54 -0000	1.3
--- standaloneBuilder.rsrc.py	26 Apr 2005 12:39:12 -0000	1.4
***************
*** 1,518 ****
! {'application':{'type':'Application',
!           'name':'Template',
!     'backgrounds': [
!     {'type':'Background',
!           'name':'standaloneBuilder',
!           'title':'PythonCard standaloneBuilder',
!           'size':(800, 594),
!           'statusBar':1,
! 
!         'menubar': {'type':'MenuBar',
[...1011 lines suppressed...]
!     'position':(450, 125), 
!     'text':'Version', 
!     },
! 
! {'type':'StaticText', 
!     'name':'StaticText7', 
!     'position':(15, 95), 
!     'text':'Base directory', 
!     },
! 
! {'type':'StaticText', 
!     'name':'StaticText6', 
!     'position':(15, 65), 
!     'text':'Name', 
!     },
! 
! ] # end components
! } # end background
! ] # end backgrounds
! } }

Index: standaloneBuilder.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/standaloneBuilder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** standaloneBuilder.py	21 Apr 2005 07:57:08 -0000	1.7
--- standaloneBuilder.py	26 Apr 2005 12:39:12 -0000	1.8
***************
*** 82,85 ****
--- 82,86 ----
  ##############################################################################
      def on_initialize(self, event):
+         self.str = self.resource.strings
          self.startTitle = self.GetTitle()
          self.loadConfig()
***************
*** 110,115 ****
          wildcard = "Project files (*.pmr)|*.pmr;*.PMR|All files (*.*)|*.*"
          if self.documentPath is None:
!             dir = self.components.baseDir.text
!             filename = '%s.pmr' % self.components.projectName.text
          else:
              dir = os.path.dirname(self.documentPath)
--- 111,119 ----
          wildcard = "Project files (*.pmr)|*.pmr;*.PMR|All files (*.*)|*.*"
          if self.documentPath is None:
!             dir = os.path.join(self.cfg.get('ConfigData', 'projects'), self.components.baseDir.text)
!             if sys.platform.startswith('win'):
!                 filename = '%s.pmr' % self.components.projectName.text
!             else:
!                 filename = 'Untitled.pmr'
          else:
              dir = os.path.dirname(self.documentPath)
***************
*** 322,326 ****
          if self.components.scriptList.stringSelection != '':
              editor = self.cfg.get('ConfigData', 'codeeditor')
!             os.system(editor + ' ' + self.components.scriptList.stringSelection)
              
      def on_scriptDelAllBtn_mouseClick(self, event):
--- 326,333 ----
          if self.components.scriptList.stringSelection != '':
              editor = self.cfg.get('ConfigData', 'codeeditor')
!             item = self.pathJoin(self.components.scriptList.stringSelection)
!             item = os.path.join(self.components.baseDir.text, item)
!             item = os.path.join(self.cfg.get('ConfigData', 'projects'), item)
!             os.system(editor + ' ' + item)
              
      def on_scriptDelAllBtn_mouseClick(self, event):
***************
*** 348,352 ****
          if self.components.resList.stringSelection != '':
              editor = self.cfg.get('ConfigData', 'reseditor')
!             os.system(editor + ' ' + self.components.resList.stringSelection)
              
      def on_resDelAllBtn_mouseClick(self, event):
--- 355,362 ----
          if self.components.resList.stringSelection != '':
              editor = self.cfg.get('ConfigData', 'reseditor')
!             item = self.pathJoin(self.components.resList.stringSelection)
!             item = os.path.join(self.components.baseDir.text, item)
!             item = os.path.join(self.cfg.get('ConfigData', 'projects'), item)
!             os.system(editor + ' ' + item)
              
      def on_resDelAllBtn_mouseClick(self, event):
***************
*** 1270,1274 ****
          mod = ''
          if self.documentChanged: mod = ' *'
!         self.SetTitle(self.startTitle + ' - [' + os.path.split(self.documentPath)[-1] + mod + ']')
          self.statusBar.text = string
          try:
--- 1280,1288 ----
          mod = ''
          if self.documentChanged: mod = ' *'
!         if self.documentPath is not None:
!             self.SetTitle(self.startTitle + ' - [' + os.path.split(self.documentPath)[-1] + mod + ']')
!         else:
!             self.SetTitle(self.startTitle + ' - [Untitled' + mod + ']')
!             
          self.statusBar.text = string
          try: