epydoc-commits

[Epydoc-commits] SF.net SVN: epydoc: [1184] trunk/epydoc/src/epydoc/gui.py

[<ed...@us...>]

Revision: 1184
Author:   edloper
Date:     2006-04-06 18:06:01 -0700 (Thu, 06 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/epydoc/?rev=1184&view=rev

Log Message:
-----------
- Added option for selecting parsing/introspection/both
- Removed obsolete private-css options

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/gui.py
Modified: trunk/epydoc/src/epydoc/gui.py
===================================================================
--- trunk/epydoc/src/epydoc/gui.py	2006-04-07 01:05:18 UTC (rev 1183)
+++ trunk/epydoc/src/epydoc/gui.py	2006-04-07 01:06:01 UTC (rev 1184)
@@ -24,6 +24,9 @@
     -V, --version             Print the version of epydoc.
     -h, -?, --help, --usage   Display this usage message
     --debug                   Do not suppress error messages
+
+@todo: Use ini-style project files, rather than pickles (using the
+same format as the CLI).
 """
 __docformat__ = 'epytext en'
 
@@ -218,7 +221,9 @@
     epydoc.docstringparser.DEFAULT_DOCFORMAT = docformat
 
     try:
-        docindex = build_doc_index(options['modules'])
+        parse = options['introspect_or_parse'] in ('parse', 'both')
+        introspect = options['introspect_or_parse'] in ('introspect', 'both')
+        docindex = build_doc_index(options['modules'], parse, introspect)
         html_writer = HTMLWriter(docindex, **options)
         log.start_progress('Writing HTML docs to %r' % options['target'])
         html_writer.write(options['target'])
@@ -507,7 +512,7 @@
         div = Frame(oframe2, background=BG_COLOR, border=1, relief='sunk')
         div.pack(ipady=1, fill='x', padx=4, pady=2)
 
-        Label(oframe2, text="CSS Stylesheets", font='helvetica -16',
+        Label(oframe2, text="CSS Stylesheet", font='helvetica -16',
               **COLOR_CONFIG).pack(anchor='w')
         oframe6 = Frame(oframe2, background=BG_COLOR)
         oframe6.pack(fill='x')
@@ -611,6 +616,26 @@
         b.grid(row=row, column=3, sticky='w')
         row += 1
 
+        # Separater
+        Frame(oframe7, background=BG_COLOR).grid(row=row, column=1, pady=3)
+        row += 1
+
+        # --parse-only, --introspect-only
+        l = Label(oframe7, text="Get docs from:", **COLOR_CONFIG)
+        l.grid(row=row, column=0, sticky='e')
+        iop_var = self._introspect_or_parse_var = StringVar(self._root)
+        self._introspect_or_parse_var.set('both')
+        b = Radiobutton(oframe7, var=iop_var, text='Parsing',
+                        value='parse', **CBUTTON_CONFIG)
+        b.grid(row=row, column=1, sticky='w')
+        b = Radiobutton(oframe7, var=iop_var, text='Introspecting',
+                        value='introspect', **CBUTTON_CONFIG)
+        b.grid(row=row, column=2, sticky='w')
+        b = Radiobutton(oframe7, var=iop_var, text='Both',
+                        value='both', **CBUTTON_CONFIG)
+        b.grid(row=row, column=3, sticky='w')
+        row += 1
+
         #==================== oframe5 ====================
         # --help-file FILE
         row = 0
@@ -644,36 +669,38 @@
         # -c CSS, --css CSS
         # --private-css CSS
         row = 0
-        l = Label(oframe6, text="Public", **COLOR_CONFIG)
-        l.grid(row=row, column=0, sticky='e')
-        l = Label(oframe6, text="Private", **COLOR_CONFIG)
-        l.grid(row=row, column=1, sticky='w')
+        #l = Label(oframe6, text="Public", **COLOR_CONFIG)
+        #l.grid(row=row, column=0, sticky='e')
+        #l = Label(oframe6, text="Private", **COLOR_CONFIG)
+        #l.grid(row=row, column=1, sticky='w')
         row += 1
         css_var = self._css_var = StringVar(self._root)
         css_var.set('default')
-        private_css_var = self._private_css_var = StringVar(self._root)
-        private_css_var.set('default')
+        #private_css_var = self._private_css_var = StringVar(self._root)
+        #private_css_var.set('default')
         for (name, (sheet, descr)) in items:
             b = Radiobutton(oframe6, var=css_var, value=name, **CBUTTON_CONFIG)
             b.grid(row=row, column=0, sticky='e')
-            b = Radiobutton(oframe6, var=private_css_var, value=name, 
-                            text=name, **CBUTTON_CONFIG)
-            b.grid(row=row, column=1, sticky='w')
+            #b = Radiobutton(oframe6, var=private_css_var, value=name, 
+            #                text=name, **CBUTTON_CONFIG)
+            #b.grid(row=row, column=1, sticky='w')
             l = Label(oframe6, text=descr, **COLOR_CONFIG)
-            l.grid(row=row, column=2, sticky='w')
+            l.grid(row=row, column=1, sticky='w')
             row += 1
-        b = Radiobutton(oframe6, var=css_var, value='-other-', 
+        b = Radiobutton(oframe6, var=css_var, value='-other-',
                         **CBUTTON_CONFIG)
         b.grid(row=row, column=0, sticky='e')
-        b = Radiobutton(oframe6, text='Select File', var=private_css_var, 
-                        value='-other-', **CBUTTON_CONFIG)
-        b.grid(row=row, column=1, sticky='w')
+        #b = Radiobutton(oframe6, text='Select File', var=private_css_var, 
+        #                value='-other-', **CBUTTON_CONFIG)
+        #b.grid(row=row, column=1, sticky='w')
+        #l = Label(oframe6, text='Select File', **COLOR_CONFIG)
+        #l.grid(row=row, column=1, sticky='w')
         self._css_entry = Entry(oframe6, **ENTRY_CONFIG)
-        self._css_entry.grid(row=row, column=2, sticky='ew')
+        self._css_entry.grid(row=row, column=1, sticky='ew')
         self._css_browse = Button(oframe6, text="Browse",
                                   command=self._browse_css,
                                   **BUTTON_CONFIG) 
-        self._css_browse.grid(row=row, column=3, sticky='ew', padx=2)
+        self._css_browse.grid(row=row, column=2, sticky='ew', padx=2)
 
     def _init_bindings(self):
         self._root.bind('<Delete>', self._delete_module)
@@ -700,11 +727,11 @@
     def _messages_toggle(self, *e):
         if self._messages_visible:
             self._msgsframe.forget()
-            self._message_button['image'] = self._downImage
+            self._message_button['image'] = self._rightImage
             self._messages_visible = 0
         else:
             self._msgsframe.pack(fill='both', side='bottom', expand=1)
-            self._message_button['image'] = self._upImage
+            self._message_button['image'] = self._leftImage
             self._messages_visible = 1
 
     def _configure(self, event):
@@ -818,6 +845,7 @@
         options['prj_url'] = self._url_entry.get() or None
         options['docformat'] = self._docformat_var.get()
         options['inheritance'] = self._inheritance_var.get()
+        options['introspect_or_parse'] = self._introspect_or_parse_var.get()
         options['target'] = self._out_entry.get() or 'html'
         options['frames'] = self._frames_var.get()
         options['private'] = self._private_var.get()
@@ -830,10 +858,10 @@
             options['css'] = self._css_entry.get() or 'default'
         else:
             options['css'] = self._css_var.get() or 'default'
-        if self._private_css_var.get() == '-other-':
-            options['private_css'] = self._css_entry.get() or 'default'
-        else:
-            options['private_css'] = self._private_css_var.get() or 'default'
+        #if self._private_css_var.get() == '-other-':
+        #    options['private_css'] = self._css_entry.get() or 'default'
+        #else:
+        #    options['private_css'] = self._private_css_var.get() or 'default'
         return options
     
     def _go(self, *e):
@@ -884,10 +912,13 @@
             elif level == 'uline':
                 self._messages.insert('end', data, 'uline header')
             elif level >= log.ERROR:
+                data= data.rstrip()+'\n\n'
                 self._messages.insert('end', data, 'guierror')
             elif level >= log.DOCSTRING_WARNING:
+                data= data.rstrip()+'\n\n'
                 self._messages.insert('end', data, 'warning')
             elif log >= log.INFO:
+                data= data.rstrip()+'\n\n'
                 self._messages.insert('end', data, 'message')
 #                 if data == '\n':
 #                     if self._last_tag != 'header2':
@@ -945,6 +976,7 @@
         self._url_entry.delete(0, 'end')
         self._docformat_var.set('epytext')
         self._inheritance_var.set('grouped')
+        self._introspect_or_parse_var.set('both')
         self._out_entry.delete(0, 'end')
         self._module_entry.delete(0, 'end')
         self._css_entry.delete(0, 'end')
@@ -953,7 +985,7 @@
         self._private_var.set(1)
         self._imports_var.set(0)
         self._css_var.set('default')
-        self._private_css_var.set('default')
+        #self._private_css_var.set('default')
         self._help_var.set('default')
         self._filename = None
         self._init_dir = None
@@ -990,6 +1022,8 @@
 
             self._docformat_var.set(opts.get('docformat', 'epytext'))
             self._inheritance_var.set(opts.get('inheritance', 'grouped'))
+            self._introspect_or_parse_var.set(
+                opts.get('introspect_or_parse', 'both'))
 
             self._help_entry.delete(0, 'end')
             if opts.get('help') is None:
@@ -1012,11 +1046,11 @@
                 self._css_var.set('-other-')
                 self._css_entry.insert(0, opts.get('css', 'default'))
 
-            if opts.get('private_css', 'default') in STYLESHEETS.keys():
-                self._private_css_var.set(opts.get('private_css', 'default'))
-            else:
-                self._private_css_var.set('-other-')
-                self._css_entry.insert(0, opts.get('private_css', 'default'))
+            #if opts.get('private_css', 'default') in STYLESHEETS.keys():
+            #    self._private_css_var.set(opts.get('private_css', 'default'))
+            #else:
+            #    self._private_css_var.set('-other-')
+            #    self._css_entry.insert(0, opts.get('private_css', 'default'))
                                                    
         except Exception, e:
             log.error('Error opening %s: %s' % (prjfile, e))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Epydoc-commits] SF.net SVN: epydoc: [1273] trunk/epydoc/src/epydoc/gui.py

[<ed...@us...>]

Revision: 1273
Author:   edloper
Date:     2006-08-21 04:49:30 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/epydoc/?rev=1273&view=rev

Log Message:
-----------
- Added a 'remove module' button (sf bug #1480448).

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/gui.py
Modified: trunk/epydoc/src/epydoc/gui.py
===================================================================
--- trunk/epydoc/src/epydoc/gui.py	2006-08-21 11:45:59 UTC (rev 1272)
+++ trunk/epydoc/src/epydoc/gui.py	2006-08-21 11:49:30 UTC (rev 1273)
@@ -368,6 +368,10 @@
         self._module_entry = Entry(mframe3, **ENTRY_CONFIG)
         self._module_entry.pack(side='left', fill='x', expand=1)
         self._module_entry.bind('<Return>', self._entry_module)
+        self._module_delete = Button(mframe3, text="Remove",
+                                     command=self._delete_module,
+                                     **BUTTON_CONFIG) 
+        self._module_delete.pack(side='right', expand=0, padx=2)
         self._module_browse = Button(mframe3, text="Browse",
                                      command=self._browse_module,
                                      **BUTTON_CONFIG) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Epydoc-commits] SF.net SVN: epydoc: [1276] trunk/epydoc/src/epydoc/gui.py

[<ed...@us...>]

Revision: 1276
Author:   edloper
Date:     2006-08-21 06:09:34 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/epydoc/?rev=1276&view=rev

Log Message:
-----------
- Fixed SF bug [ 1480680 ] Alpha 2 Windows Forgets Output Directory.

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/gui.py
Modified: trunk/epydoc/src/epydoc/gui.py
===================================================================
--- trunk/epydoc/src/epydoc/gui.py	2006-08-21 12:15:25 UTC (rev 1275)
+++ trunk/epydoc/src/epydoc/gui.py	2006-08-21 13:09:34 UTC (rev 1276)
@@ -208,7 +208,7 @@
 
     @param options: The options to use for generating documentation.
         This includes keyword options that can be given to
-        L{html.HTMLFormatter}, as well as the option C{outdir}, which
+        L{html.HTMLFormatter}, as well as the option C{target}, which
         controls where the output is written to.
     @type options: C{dictionary}
     """
@@ -1037,7 +1037,7 @@
                 self._help_entry.insert(0, opts.get('help'))
                 
             self._out_entry.delete(0, 'end')
-            self._out_entry.insert(0, opts.get('outdir', 'html'))
+            self._out_entry.insert(0, opts.get('target', 'html'))
 
             self._frames_var.set(opts.get('frames', 1))
             self._private_var.set(opts.get('private', 1))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Epydoc-commits] SF.net SVN: epydoc: [1599] trunk/epydoc/src/epydoc/gui.py

[<ed...@us...>]

Revision: 1599
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1599&view=rev
Author:   edloper
Date:     2007-09-21 15:46:28 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
fixed -V option [sf bug 1795126]

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/gui.py

Modified: trunk/epydoc/src/epydoc/gui.py
===================================================================
--- trunk/epydoc/src/epydoc/gui.py	2007-09-06 13:02:50 UTC (rev 1598)
+++ trunk/epydoc/src/epydoc/gui.py	2007-09-21 22:46:28 UTC (rev 1599)
@@ -1120,7 +1120,7 @@
     modules = []
     for arg in sys.argv[1:]:
         if arg[0] == '-':
-            arg = arg.lower()
+            if arg != '-V': arg = arg.lower()
             if arg in ('-h', '--help', '-?', '--usage'): _usage()
             elif arg in ('-V', '--version'): _version()
             elif arg in ('--debug',): DEBUG = 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Epydoc-commits] SF.net SVN: epydoc: [1690] trunk/epydoc/src/epydoc/gui.py

[<ed...@us...>]

Revision: 1690
          http://epydoc.svn.sourceforge.net/epydoc/?rev=1690&view=rev
Author:   edloper
Date:     2008-01-30 09:07:10 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
- Fixed _STAGES bug

Modified Paths:
--------------
    trunk/epydoc/src/epydoc/gui.py

Modified: trunk/epydoc/src/epydoc/gui.py
===================================================================
--- trunk/epydoc/src/epydoc/gui.py	2008-01-30 17:01:02 UTC (rev 1689)
+++ trunk/epydoc/src/epydoc/gui.py	2008-01-30 17:07:10 UTC (rev 1690)
@@ -144,7 +144,7 @@
 from epydoc import log
 from epydoc.util import wordwrap
 class GUILogger(log.Logger):
-    _STAGES = [40, 7, 1, 3, 30, 1, 2, 100]
+    _STAGES = [40, 7, 1, 3, 1, 30, 1, 2, 100]
     
     def __init__(self, progress, cancel):
         self._progress = progress


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.