[Python-checkins] CVS: python/dist/src/Mac/Tools/IDE PythonIDEMain.py,1.14,1.14.8.1

[Jack Jansen]

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

Modified Files:
      Tag: release22-maint
	PythonIDEMain.py 
Log Message:
Backport of 1.15 and 1.16:
- Don't append quit menu when on OSX, it is special and automatic there.
- Changes by Donovan Preston (and a few minor ones by me) to make IDE run under
MachoPython. Mainly making sure we don't call routines that don't exist
and representing pathnames in a os.separator-neutral format.

These shouldn't interfere too much with Just's work on the next generation IDE,
I hope.



Index: PythonIDEMain.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/PythonIDEMain.py,v
retrieving revision 1.14
retrieving revision 1.14.8.1
diff -C2 -d -r1.14 -r1.14.8.1
*** PythonIDEMain.py	2 Nov 2001 19:30:21 -0000	1.14
--- PythonIDEMain.py	24 Feb 2002 23:19:07 -0000	1.14.8.1
***************
*** 8,11 ****
--- 8,24 ----
  import os
  import macfs
+ import MacOS
+ 
+ if MacOS.runtimemodel == 'macho':
+ 	ELIPSES = '...'
+ else:
+ 	ELIPSES = '\xc9'
+ 
+ def runningOnOSX():
+ 	from gestalt import gestalt
+ 	gestaltMenuMgrAquaLayoutBit = 1  # menus have the Aqua 1.0 layout
+ 	gestaltMenuMgrAquaLayoutMask = (1L << gestaltMenuMgrAquaLayoutBit)
+ 	value = gestalt("menu") & gestaltMenuMgrAquaLayoutMask
+ 	return not not value
  
  
***************
*** 51,63 ****
  		m = Wapplication.Menu(self.menubar, "File")
  		newitem = FrameWork.MenuItem(m, "New", "N", 'new')
! 		openitem = FrameWork.MenuItem(m, "Open\xc9", "O", 'open')
  		FrameWork.Separator(m)
  		closeitem = FrameWork.MenuItem(m, "Close", "W", 'close')
  		saveitem = FrameWork.MenuItem(m, "Save", "S", 'save')
! 		saveasitem = FrameWork.MenuItem(m, "Save as\xc9", None, 'save_as')
! 		FrameWork.Separator(m)
! 		saveasappletitem = FrameWork.MenuItem(m, "Save as Applet\xc9", None, 'save_as_applet')
  		FrameWork.Separator(m)
! 		quititem = FrameWork.MenuItem(m, "Quit", "Q", 'quit')
  		
  		m = Wapplication.Menu(self.menubar, "Edit")
--- 64,79 ----
  		m = Wapplication.Menu(self.menubar, "File")
  		newitem = FrameWork.MenuItem(m, "New", "N", 'new')
! 		openitem = FrameWork.MenuItem(m, "Open"+ELIPSES, "O", 'open')
  		FrameWork.Separator(m)
  		closeitem = FrameWork.MenuItem(m, "Close", "W", 'close')
  		saveitem = FrameWork.MenuItem(m, "Save", "S", 'save')
! 		saveasitem = FrameWork.MenuItem(m, "Save as"+ELIPSES, None, 'save_as')
  		FrameWork.Separator(m)
! 		saveasappletitem = FrameWork.MenuItem(m, "Save as Applet"+ELIPSES, None, 'save_as_applet')
! 		if not runningOnOSX():
! 			# On OSX there's a special "magic" quit menu, so we shouldn't add
! 			# it to the File menu.
! 			FrameWork.Separator(m)
! 			quititem = FrameWork.MenuItem(m, "Quit", "Q", 'quit')
  		
  		m = Wapplication.Menu(self.menubar, "Edit")
***************
*** 72,76 ****
  		sellineitem = FrameWork.MenuItem(m, "Select line", "L", "selectline")
  		FrameWork.Separator(m)
! 		finditem = FrameWork.MenuItem(m, "Find\xc9", "F", "find")
  		findagainitem = FrameWork.MenuItem(m, "Find again", 'G', "findnext")
  		enterselitem = FrameWork.MenuItem(m, "Enter search string", "E", "entersearchstring")
--- 88,92 ----
  		sellineitem = FrameWork.MenuItem(m, "Select line", "L", "selectline")
  		FrameWork.Separator(m)
! 		finditem = FrameWork.MenuItem(m, "Find"+ELIPSES, "F", "find")
  		findagainitem = FrameWork.MenuItem(m, "Find again", 'G', "findnext")
  		enterselitem = FrameWork.MenuItem(m, "Enter search string", "E", "entersearchstring")
***************
*** 85,94 ****
  		runselitem = FrameWork.MenuItem(m, "Run selection", None, 'runselection')
  		FrameWork.Separator(m)
! 		moditem = FrameWork.MenuItem(m, "Module browser\xc9", "M", self.domenu_modulebrowser)
  		FrameWork.Separator(m)
  		mm = FrameWork.SubMenu(m, "Preferences")
! 		FrameWork.MenuItem(mm, "Set Scripts folder\xc9", None, self.do_setscriptsfolder)
! 		FrameWork.MenuItem(mm, "Editor default settings\xc9", None, self.do_editorprefs)
! 		FrameWork.MenuItem(mm, "Set default window font\xc9", None, self.do_setwindowfont)
  		
  		self.openwindowsmenu = Wapplication.Menu(self.menubar, 'Windows')
--- 101,110 ----
  		runselitem = FrameWork.MenuItem(m, "Run selection", None, 'runselection')
  		FrameWork.Separator(m)
! 		moditem = FrameWork.MenuItem(m, "Module browser"+ELIPSES, "M", self.domenu_modulebrowser)
  		FrameWork.Separator(m)
  		mm = FrameWork.SubMenu(m, "Preferences")
! 		FrameWork.MenuItem(mm, "Set Scripts folder"+ELIPSES, None, self.do_setscriptsfolder)
! 		FrameWork.MenuItem(mm, "Editor default settings"+ELIPSES, None, self.do_editorprefs)
! 		FrameWork.MenuItem(mm, "Set default window font"+ELIPSES, None, self.do_setwindowfont)
  		
  		self.openwindowsmenu = Wapplication.Menu(self.menubar, 'Windows')
***************
*** 111,115 ****
  				if not os.path.exists(path):
  					os.mkdir(path)
! 					f = open(os.path.join(path, "Place your scripts here\xc9"), "w")
  					f.close()
  			fss = macfs.FSSpec(path)
--- 127,131 ----
  				if not os.path.exists(path):
  					os.mkdir(path)
! 					f = open(os.path.join(path, "Place your scripts here"+ELIPSES), "w")
  					f.close()
  			fss = macfs.FSSpec(path)
***************
*** 160,164 ****
  	
  	def getabouttext(self):
! 		return "About Python IDE\xc9"
  	
  	def do_about(self, id, item, window, event):
--- 176,180 ----
  	
  	def getabouttext(self):
! 		return "About Python IDE"+ELIPSES
  	
  	def do_about(self, id, item, window, event):