Changeset d66dbcc in sasview for src/sas


Ignore:
Timestamp:
May 2, 2017 7:17:05 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
2f6d340
Parents:
914ba0a
Message:

complete the merge

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/guiframe/documentation_window.py

    r914ba0a rd66dbcc  
    1 """ 
    2 documentation module provides a simple means to add help throughout the 
    3 application. It checks for the existence of html2 package needed to support 
    4 fully html panel which supports css.  The class defined here takes a title for 
    5 the particular help panel, a pointer to the html documentation file of interest 
    6 within the documentation tree along with a 'command' string such as a page 
    7 anchor or a query string etc.  The path to the doc directory is retrieved 
    8 automatically by the class itself.  Thus with these three pieces of information 
    9 the class generates a panel with the appropriate title bar and help file 
    10 formatted according the style sheets called in the html file.  Finally, if an 
    11 old version of Python is running and the html2 package is not available the 
    12 class brings up the default browser and passes the file:/// string to it.  In 
    13 this case however the instruction portion is usually not passed for security 
    14 reasons. 
    15 """ 
    16 import os 
    17 import logging 
    18 import urllib 
    19  
    20 import webbrowser 
    21 import wx 
    22  
    23 from sas.sasgui import get_app_dir 
    24  
    25 SPHINX_DOC_ENV = "SASVIEW_DOC_PATH" 
    26 WX_SUPPORTS_HTML2 = True 
    27 try: 
    28     import wx.html2 as html 
    29 except: 
    30     WX_SUPPORTS_HTML2 = False 
    31  
    32  
    33 ======= 
    341""" 
    352documentation module provides a simple means to add help throughout the 

  • src/sas/sasview/welcome_panel.py

    r914ba0a rd66dbcc  
    7373        """ 
    7474        self.frame = frame 
    75         if frame != None: 
     75        if frame is not None: 
    7676            self.frame.Bind(wx.EVT_CLOSE, self.on_close_page) 
    7777 
Note: See TracChangeset for help on using the changeset viewer.