[Idle-dev] CVS: idle EditorWindow.py,1.7,1.8

[Stephen]

Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv6589

Modified Files:
	EditorWindow.py 
Log Message:
A more lightweight (and read only) way to view help text
until the new help system is implemented. Removed some
commented cruft. 


Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/idlefork/idle/EditorWindow.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** EditorWindow.py	2001/07/31 07:01:47	1.7
--- EditorWindow.py	2001/07/31 11:11:38	1.8
***************
*** 18,22 ****
  import WindowList
  from IdleConf import idleconf
! import aboutDialog
  
  # The default tab setting for a Text widget, in average-width characters.
--- 18,22 ----
  import WindowList
  from IdleConf import idleconf
! import aboutDialog, textView
  
  # The default tab setting for a Text widget, in average-width characters.
***************
*** 79,103 ****
  #$ unix <Control-x>
  
- 
- about_title = "About IDLEfork"
- about_text = """\
- IDLEfork %s
- 
- IDLE is an Integrated DeveLopment Environment for Python \
- by Guido van Rossum.
- 
- IDLEfork is an official experimental development version of IDLE. \
- Succesful new features in IDLEfork will be mereged back in to stable IDLE.
- 
- This version of IDLEfork is based on the work in stable IDLE version 0.8, \
- IDLE fork 0.7.1 released by David Scherer, and the VPython idle fork. 
- 
- See README.txt and NEWS.txt for more details on this verion of IDLEfork.
- 
- WARNING: IDLEfork is at this stage alpha quality software, expect things \
- to be broken. 
- 
- """ % (idlever.IDLE_VERSION)
- 
  class EditorWindow:
  
--- 79,82 ----
***************
*** 110,116 ****
      from MultiStatusBar import MultiStatusBar
  
-     about_title = about_title
-     about_text = about_text
- 
      vars = {}
  
--- 89,92 ----
***************
*** 298,320 ****
  
      def about_dialog(self, event=None):
-         #tkMessageBox.showinfo(self.about_title, self.about_text,
-         #                      master=self.text)
          aboutDialog.AboutDialog(self.top,'About IDLEfork')
          
-     helpfile = "help.txt"
- 
      def good_advice(self, event=None):
          tkMessageBox.showinfo('Advice', "Don't Panic!", master=self.text)
  
      def help_dialog(self, event=None):
!         try:
!             helpfile = os.path.join(os.path.dirname(__file__), self.helpfile)
!         except NameError:
!             helpfile = self.helpfile
!         if self.flist:
!             self.flist.open(helpfile)
!         else:
!             self.io.loadfile(helpfile)
! 
      help_url = "http://www.python.org/doc/current/"
      if sys.platform[:3] == "win":
--- 274,286 ----
  
      def about_dialog(self, event=None):
          aboutDialog.AboutDialog(self.top,'About IDLEfork')
          
      def good_advice(self, event=None):
          tkMessageBox.showinfo('Advice', "Don't Panic!", master=self.text)
  
      def help_dialog(self, event=None):
!         fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'help.txt')
!         textView.TextViewer(self.top,'Help',fn)        
!         
      help_url = "http://www.python.org/doc/current/"
      if sys.platform[:3] == "win":