[Pythoncard-cvs] PythonCard/tools/codeEditor .cvsignore,1.3,1.4 restEditor.py,1.3,1.4 restEditor.rsrc.py,1.2,1.3 snippet.py,1.1,1.2

[Kevin A. <ka...@us...>]

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

Modified Files:
	.cvsignore restEditor.py restEditor.rsrc.py snippet.py 
Log Message:
added exception code to restify, render and return on render menu items


Index: snippet.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/codeEditor/snippet.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** snippet.py	26 Jul 2004 15:51:14 -0000	1.1
--- snippet.py	16 Aug 2004 03:20:12 -0000	1.2
***************
*** 1,4 ****
--- 1,5 ----
  from docutils import core
  from docutils.writers.html4css1 import Writer,HTMLTranslator
+ from docutils.utils import SystemMessage
  
  class NoHeaderHTMLTranslator(HTMLTranslator):
***************
*** 14,18 ****
  
  def restify(string):
!     return core.publish_string(string,writer=_w)
  
  if __name__ == '__main__':
--- 15,25 ----
  
  def restify(string):
! #    return core.publish_string(string,writer=_w)
!     try:
!         result = core.publish_string(string,writer=_w, settings_overrides={'traceback': True})
!     except SystemMessage, e:
!         result = None
!         print "barf"
!     return result
  
  if __name__ == '__main__':

Index: .cvsignore
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/codeEditor/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	17 Apr 2004 07:21:14 -0000	1.3
--- .cvsignore	16 Aug 2004 03:20:12 -0000	1.4
***************
*** 6,7 ****
--- 6,9 ----
  user.config.txt
  .DS_Store
+ build
+ dist

Index: restEditor.rsrc.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/codeEditor/restEditor.rsrc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** restEditor.rsrc.py	26 Jul 2004 16:04:11 -0000	1.2
--- restEditor.rsrc.py	16 Aug 2004 03:20:12 -0000	1.3
***************
*** 41,68 ****
                     'label':'-',
                    },
!                   {'type':'MenuItem',
!                    'name':'menuFileCheckSyntax',
!                    'label':'&Check Syntax (Module)\tAlt+F5',
!                    'command':'checkSyntax',
!                   },
!                   {'type':'MenuItem',
!                    'name':'menuFileRun',
!                    'label':'&Run\tCtrl+R',
!                    'command':'fileRun',
!                   },
!                   {'type':'MenuItem',
!                    'name':'menuFileRunWithInterpreter',
!                    'label':'Run with &interpreter\tCtrl+Shift+R',
!                    'command':'fileRunWithInterpreter',
!                   },
!                   {'type':'MenuItem',
!                    'name':'menuFileRunOptions',
!                    'label':'Run Options...',
!                    'command':'fileRunOptions',
!                   },
!                   {'type':'MenuItem',
!                    'name':'fileSep2',
!                    'label':'-',
!                   },
                    {'type':'MenuItem',
                     'name':'menuFilePageSetup',
--- 41,68 ----
                     'label':'-',
                    },
! ##                  {'type':'MenuItem',
! ##                   'name':'menuFileCheckSyntax',
! ##                   'label':'&Check Syntax (Module)\tAlt+F5',
! ##                   'command':'checkSyntax',
! ##                  },
! ##                  {'type':'MenuItem',
! ##                   'name':'menuFileRun',
! ##                   'label':'&Run\tCtrl+R',
! ##                   'command':'fileRun',
! ##                  },
! ##                  {'type':'MenuItem',
! ##                   'name':'menuFileRunWithInterpreter',
! ##                   'label':'Run with &interpreter\tCtrl+Shift+R',
! ##                   'command':'fileRunWithInterpreter',
! ##                  },
! ##                  {'type':'MenuItem',
! ##                   'name':'menuFileRunOptions',
! ##                   'label':'Run Options...',
! ##                   'command':'fileRunOptions',
! ##                  },
! ##                  {'type':'MenuItem',
! ##                   'name':'fileSep2',
! ##                   'label':'-',
! ##                  },
                    {'type':'MenuItem',
                     'name':'menuFilePageSetup',
***************
*** 269,272 ****
--- 269,287 ----
                     'checkable':1,
                    },
+                   {'type':'MenuItem',
+                    'name':'formatSep1',
+                    'label':'-',
+                   },
+                   {'type':'MenuItem',
+                    'name':'menuFormatRender',
+                    'label':'Render Page\tCtrl+R',
+                    'command':'previewPost',
+                   },
+                   {'type':'MenuItem',
+                    'name':'menuFormatRenderOnReturn',
+                    'label':'Render on Return',
+                    'checkable':1,
+                    'checked':1,
+                   },
                ]
               },

Index: restEditor.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/codeEditor/restEditor.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** restEditor.py	14 Aug 2004 03:41:04 -0000	1.3
--- restEditor.py	16 Aug 2004 03:20:12 -0000	1.4
***************
*** 20,23 ****
--- 20,24 ----
      def on_initialize(self, event):
          super(RestEditor, self).on_initialize(event)
+         self.renderOnReturn = self.menuBar.getChecked('menuFormatRenderOnReturn')
          self.previewWindow = model.childWindow(self, HtmlPreview)
          #self.previewWindow.position = (425, -1)
***************
*** 36,40 ****
                  html = '<html><head></head><body>' + txt + '</body></html>'
          else:
!             html = '<html><head></head><body>' + restify(txt) + '</body></html>'
          # do make sure stylesheets and relative image references can be found
          # might need to chdir here
--- 37,49 ----
                  html = '<html><head></head><body>' + txt + '</body></html>'
          else:
!             # KEA 2004-08-15
!             # snippet.restify is returning None when there is a reST error
!             # what's a better way to provide feedback to the user without barfing
!             # all over the output?
!             rest = restify(txt)
!             if rest:
!                 html = '<html><head></head><body>' + rest + '</body></html>'
!             else:
!                 html = self.previewWindow.components.html.text
          # do make sure stylesheets and relative image references can be found
          # might need to chdir here
***************
*** 45,50 ****
  
      def on_document_keyDown(self, event):
!         if event.keyCode == 13:
!             # since we won't be calling Skip, insert a newline manually
              self.components.document.CmdKeyExecute(stc.STC_CMD_NEWLINE)
              self.on_previewPost_command(None)
--- 54,59 ----
  
      def on_document_keyDown(self, event):
!         if event.keyCode == 13 and self.renderOnReturn:
!             # since we won't be calling skip, insert a newline manually
              self.components.document.CmdKeyExecute(stc.STC_CMD_NEWLINE)
              self.on_previewPost_command(None)
***************
*** 52,55 ****
--- 61,67 ----
              event.skip()
  
+     def on_menuFormatRenderOnReturn_select(self, event):
+         self.renderOnReturn = self.menuBar.getChecked('menuFormatRenderOnReturn')
+ 
  
  if __name__ == '__main__':