Changeset 427 for trunk/GSASII.py


Ignore:
Timestamp:
Nov 22, 2011 3:21:38 PM (11 years ago)
Author:
toby
Message:

implement HTML help

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r426 r427  
    4848    print "MKL module not present"
    4949__version__ = '0.1.5'
     50G2gd.__version__ = __version__
     51print "This is GSAS-II version:     ",__version__
    5052
    5153# useful degree trig functions
     
    7981wxID_EXPORTCIF, wxID_EXPORTPEAKLIST, wxID_EXPORTPDF,
    8082] = [wx.NewId() for _init_coll_Export_Items in range(7)]
    81 
    82 [wxID_HELPABOUT, wxID_HELPHELP,
    83 ] = [wx.NewId() for _init_coll_Help_Items in range(2)]
    8483
    8584class GSASII(wx.Frame):
     
    9190        parent.Append(menu=self.Import, title='Import')
    9291        parent.Append(menu=self.Export, title='Export')
    93         parent.Append(menu=self.Help, title='Help')
     92        parent.Append(menu=G2gd.MyHelp(self,helpType='Data tree'),title='&Help' )
    9493
    9594    def _init_coll_File_Items(self, parent):
     
    205204        self.Bind(wx.EVT_MENU, self.OnExportCIF, id=wxID_EXPORTCIF)
    206205               
    207     def _init_coll_Help_Items(self, parent):
    208         parent.Append(help='', id=wxID_HELPHELP, kind=wx.ITEM_NORMAL,
    209             text='Help')
    210         parent.Append(help='', id=wxID_HELPABOUT, kind=wx.ITEM_NORMAL,
    211             text='About')
    212         self.Bind(wx.EVT_MENU, self.OnHelpHelp, id=wxID_HELPHELP)
    213         self.Bind(wx.EVT_MENU, self.OnHelpAbout, id=wxID_HELPABOUT)
    214 
    215206    def _init_utils(self):
    216207        self.GSASIIMenu = wx.MenuBar()
     
    220211        self.Import = wx.Menu(title='')       
    221212        self.Export = wx.Menu(title='')       
    222         self.Help = wx.Menu(title='')
    223213
    224214        self._init_coll_GSASIIMenu_Menus(self.GSASIIMenu)
     
    228218        self._init_coll_Import_Items(self.Import)
    229219        self._init_coll_Export_Items(self.Export)
    230         self._init_coll_Help_Items(self.Help)
    231220       
    232221    def _init_ctrls(self, parent):
     
    15991588    def OnHelpHelp(self, event):
    16001589        event.Skip()
    1601        
    1602     def OnHelpAbout(self, event):
    1603         info = wx.AboutDialogInfo()
    1604         info.Name = 'GSAS-II'
    1605         info.Version = __version__
    1606         info.Copyright = '''
    1607 Robert B. Von Dreele
    1608 Argonne National Laboratory(C)
    1609 This product includes software developed
    1610 by the UChicago Argonne, LLC, as
    1611 Operator of Argonne National Laboratory.         '''
    1612         info.Description = '''
    1613 General Structure Analysis System - II
    1614         '''
    1615         wx.AboutBox(info)
    1616        
     1590               
    16171591class GSASIImain(wx.App):
    16181592    def OnInit(self):
Note: See TracChangeset for help on using the changeset viewer.