Ignore:
Timestamp:
Feb 18, 2015 6:12:45 AM (9 years ago)
Author:
Peter Parker
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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
42b65f4
Parents:
9afc543 (diff), 1ee0772 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:SasView/sasview

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/guiframe/documentation_window.py

    r9afc543 r573e7034  
    1414 
    1515class DocumentationWindow(Frame): 
    16     def __init__(self, parent, id, path, title='Help', size=(850, 540)): 
     16    def __init__(self, parent, id, path, title, size=(850, 540)): 
    1717        Frame.__init__(self, parent, id, title, size=size) 
    1818 
     
    4242 
    4343            webbrowser.open_new_tab("file:///" + docs_path + "/" + path) 
     44            print ("file:///" + docs_path + "/" + path) 
    4445 
    4546  
Note: See TracChangeset for help on using the changeset viewer.