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

[Phil E. <l2...@us...>]

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

Modified Files:
	changelog.txt standaloneBuilder.py 
Log Message:
Cosmetic fixes to button icons so they display better under Linux. Also fixed and exception in the new project wizard code.


Index: changelog.txt
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/changelog.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** changelog.txt	15 Apr 2005 15:18:53 -0000	1.2
--- changelog.txt	18 Apr 2005 11:33:14 -0000	1.3
***************
*** 1,4 ****
--- 1,8 ----
  standaloneBuilder version Version 0.1.1 release date TBA
  ---------------------------------------------------------------------------
+     - Fixed a bug which was causing an exception when creating a new
+       project due to trying to incorrectly make a relative path out of a
+       file name
+     - Cosmetic fixes to button layouts and icons
      - Fixed a bug in the rebuild process which was causing the wrong
        text fields to be shown when doing more than one rebuild in a

Index: standaloneBuilder.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/standaloneBuilder/standaloneBuilder.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** standaloneBuilder.py	15 Apr 2005 16:02:19 -0000	1.4
--- standaloneBuilder.py	18 Apr 2005 11:33:14 -0000	1.5
***************
*** 721,724 ****
--- 721,726 ----
          self.createProject()
          self.Project2UI()
+         self.on_menuFileSaveAs_select(None) # save the project
+         self.updateStatusBar()
          
          for comp in self.components.keys():
***************
*** 1113,1121 ****
          # create a config file the first time pimp is run
          title = 'Initial setup'
!         txt = 'Since this is the first time you have run projectmanager, you need to configure '
          txt += 'the program according to your preferences. Most users should find that the '
!         txt += 'default settings are satisfactory. On this system, settings will be stored '
          txt += 'in "%s". In the preferences dialog, you can click the "?" buttons to get ' % self.CONFIG_FILE
!         txt += 'help with any of the options. Click OK to begin configuring projectmanager.'
          bull = dialog.alertDialog(self, wrap_string(txt, 60), title)
          
--- 1115,1123 ----
          # create a config file the first time pimp is run
          title = 'Initial setup'
!         txt = 'Since this is the first time you have run standaloneBuilder, you need to configure '
          txt += 'the program according to your preferences. Most users should find that the '
!         txt += 'default settings are satisfactory.\n\nOn this system, settings will be stored '
          txt += 'in "%s". In the preferences dialog, you can click the "?" buttons to get ' % self.CONFIG_FILE
!         txt += 'help with any of the options.\n\nClick OK to begin configuring standaloneBuilder.'
          bull = dialog.alertDialog(self, wrap_string(txt, 60), title)
          
***************
*** 1147,1151 ****
          self.cfg.set('ConfigData', 'installerpath', installer)
          
!         self.cfg.set('ConfigData', 'compilerpath', '')
          self.cfg.set('ConfigData', 'publisher', '')
          self.cfg.set('ConfigData', 'companyname', '')
--- 1149,1158 ----
          self.cfg.set('ConfigData', 'installerpath', installer)
          
!         # see if we can find the Inno Setup command line compiler
!         # C:\Program Files\Inno Setup 5\ISCC.exe
!         want = os.path.join('Inno Setup 5', 'ISCC.exe')
!         compiler = self.lookFor(want)
!         self.cfg.set('ConfigData', 'compilerpath', compiler)
!         
          self.cfg.set('ConfigData', 'publisher', '')
          self.cfg.set('ConfigData', 'companyname', '')
***************
*** 1181,1185 ****
          self.project.set('Project', 'fixnumber', str(vstring[2]))
          self.project.set('Project', 'name', self.components.projectName.text)
!         self.project.set('Project', 'basepath', self.pathSplit(self.components.baseDir.text))
          self.project.set('Project', 'projectdesc', self.components.projectDesc.text)
          self.project.set('Project', 'mainscript', self.pathSplit(self.components.mainScript.text))
--- 1188,1192 ----
          self.project.set('Project', 'fixnumber', str(vstring[2]))
          self.project.set('Project', 'name', self.components.projectName.text)
!         self.project.set('Project', 'basepath', self.getRelativePath(self.cfg.get('ConfigData', 'projects'), self.components.baseDir.text))
          self.project.set('Project', 'projectdesc', self.components.projectDesc.text)
          self.project.set('Project', 'mainscript', self.pathSplit(self.components.mainScript.text))
***************
*** 1193,1198 ****
--- 1200,1207 ----
          except:
              pass
+             
          cnt = 0
          for item in self.components.scriptList.items:
+             print 'processing item %s, [%s]' % (cnt, item)
              self.project.set('Scripts', str(cnt), self.pathSplit(item))
              cnt += 1
***************
*** 1203,1206 ****
--- 1212,1216 ----
          except:
              pass
+             
          cnt = 0
          for item in self.components.resList.items:
***************
*** 1213,1216 ****
--- 1223,1227 ----
          except:
              pass
+             
          cnt = 0
          for item in self.components.otherList.items:
***************
*** 1255,1259 ****
      def createProject(self):
          # create all the folders and other gubbins
!         basepath = self.project.get('Project', 'basepath')
          
          try:
--- 1266,1270 ----
      def createProject(self):
          # create all the folders and other gubbins
!         basepath = os.path.join(self.cfg.get('ConfigData', 'projects'), self.project.get('Project', 'basepath'))
          
          try:
***************
*** 1398,1401 ****
--- 1409,1415 ----
          if sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):
              searchpaths.append('/usr/share')
+         
+         if sys.platform.startswith('win'):
+             searchpaths.append('C:\\Program Files')
              
          for search in searchpaths: