[Python-checkins] python/dist/src/Mac/Tools/IDE PythonIDEMain.py,1.31,1.32

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory sc8-pr-cvs1:/tmp/cvs-serv9930/Mac/Tools/IDE

Modified Files:
	PythonIDEMain.py 
Log Message:
The MacPython introductory help is now called MacPython Help, and the
optional full documentation Python Documentation.


Index: PythonIDEMain.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PythonIDEMain.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** PythonIDEMain.py	3 Mar 2003 12:28:04 -0000	1.31
--- PythonIDEMain.py	16 Mar 2003 22:09:21 -0000	1.32
***************
*** 354,363 ****
  		
  	def makehelpmenu(self):
! 		docs = self.installdocumentation()
  		self.helpmenu = m = self.gethelpmenu()
  		docitem = FrameWork.MenuItem(m, "Python Documentation", None, self.domenu_localdocs)
! 		docitem.enable(docs)
  		finditem = FrameWork.MenuItem(m, "Lookup in Python Documentation", None, 'lookuppython')
! 		finditem.enable(docs)
  		if runningOnOSX():
  			FrameWork.Separator(m)
--- 354,365 ----
  		
  	def makehelpmenu(self):
! 		hashelp, hasdocs = self.installdocumentation()
  		self.helpmenu = m = self.gethelpmenu()
+ 		helpitem = FrameWork.MenuItem(m, "MacPython Help", None, self.domenu_localhelp)
+ 		helpitem.enable(hashelp)
  		docitem = FrameWork.MenuItem(m, "Python Documentation", None, self.domenu_localdocs)
! 		docitem.enable(hasdocs)
  		finditem = FrameWork.MenuItem(m, "Lookup in Python Documentation", None, 'lookuppython')
! 		finditem.enable(hasdocs)
  		if runningOnOSX():
  			FrameWork.Separator(m)
***************
*** 371,375 ****
  	def domenu_localdocs(self, *args):
  		from Carbon import AH
! 		AH.AHGotoPage("Python Help", None, None)
  		
  	def domenu_appledocs(self, *args):
--- 373,381 ----
  	def domenu_localdocs(self, *args):
  		from Carbon import AH
! 		AH.AHGotoPage("Python Documentation", None, None)
! 		
! 	def domenu_localhelp(self, *args):
! 		from Carbon import AH
! 		AH.AHGotoPage("MacPython Help", None, None)
  		
  	def domenu_appledocs(self, *args):
***************
*** 389,393 ****
  			return
  		try:
! 			AH.AHSearch("Python Help", searchstring)
  		except AH.Error, arg:
  			W.Message("AppleHelp Error: %s" % `arg`)
--- 395,399 ----
  			return
  		try:
! 			AH.AHSearch("Python Documentation", searchstring)
  		except AH.Error, arg:
  			W.Message("AppleHelp Error: %s" % `arg`)
***************
*** 442,455 ****
  		# the plist file) we refer it to Python.app
  		python_app = os.path.join(sys.prefix, 'Resources/Python.app')
! 		doc_source = os.path.join(python_app, 'Contents/Resources/English.lproj/Documentation')
! 		if not os.path.isdir(doc_source):
! 			return 0
! 		try:
! 			from Carbon import AH
! 			AH.AHRegisterHelpBook(python_app)
! 		except (ImportError, MacOS.Error), arg:
! 			W.Message("Cannot register Python documentation: %s" % `arg`)
! 			return 0
! 		return 1
  	
  
--- 448,462 ----
  		# the plist file) we refer it to Python.app
  		python_app = os.path.join(sys.prefix, 'Resources/Python.app')
! 		help_source = os.path.join(python_app, 'Contents/Resources/English.lproj/Documentation')
! 		doc_source = os.path.join(python_app, 'Contents/Resources/English.lproj/PythonDocumentation')
! 		has_help = os.path.isdir(help_source)
! 		has_doc = os.path.isdir(doc_source)
! 		if has_help or has_doc:
! 			try:
! 				from Carbon import AH
! 				AH.AHRegisterHelpBook(python_app)
! 			except (ImportError, MacOS.Error), arg:
! 				pass # W.Message("Cannot register Python Documentation: %s" % str(arg))
! 		return has_help, has_doc