Ignore:
Timestamp:
Sep 19, 2018 9:33:59 AM (6 years ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
bdfe0be
Parents:
dee9e5f (diff), d1e4689 (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 'ESS_GUI' of https://github.com/SasView/sasview into ESS_GUI_Pr_fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/GuiManager.py

    rfc5d2d7f rdee9e5f  
    992992        When setting a perspective, sets up the menu bar 
    993993        """ 
     994        self._workspace.actionReport.setEnabled(False) 
    994995        if isinstance(perspective, Perspectives.PERSPECTIVES["Fitting"]): 
    995996            self.checkAnalysisOption(self._workspace.actionFitting) 
     
    10011002            self._workspace.menubar.addAction(self._workspace.menuWindow.menuAction()) 
    10021003            self._workspace.menubar.addAction(self._workspace.menuHelp.menuAction()) 
     1004            self._workspace.actionReport.setEnabled(True) 
    10031005 
    10041006        elif isinstance(perspective, Perspectives.PERSPECTIVES["Invariant"]): 
Note: See TracChangeset for help on using the changeset viewer.