Changeset 6d87082 in sasview


Ignore:
Timestamp:
Sep 26, 2018 3:08:10 AM (6 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
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:
9d23e4c
Parents:
49699a3
Message:

UTlogo and magnetic orientation images in release. SASVIEW-1109
SASVIEW-1157

Location:
src/sas
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rcb39d66 r6d87082  
    321321        self.magneticAnglesWidget = QtWidgets.QWidget() 
    322322        labl = QtWidgets.QLabel(self.magneticAnglesWidget) 
    323         pixmap = QtGui.QPixmap(GuiUtils.IMAGES_DIRECTORY_LOCATION + '/M_angles_pic.bmp') 
     323        pixmap = QtGui.QPixmap(GuiUtils.IMAGES_DIRECTORY_LOCATION + '/M_angles_pic.png') 
    324324        labl.setPixmap(pixmap) 
    325325        self.magneticAnglesWidget.setFixedSize(pixmap.width(), pixmap.height()) 

  • src/sas/qtgui/Utilities/GuiUtils.py

    ree22241 r6d87082  
    2929from sas.qtgui.Utilities import CustomDir 
    3030 
    31 ## TODO: CHANGE FOR SHIPPED PATH IN RELEASE 
    3231if os.path.splitext(sys.argv[0])[1].lower() != ".py": 
    3332        HELP_DIRECTORY_LOCATION = "doc" 

  • src/sas/qtgui/Utilities/LocalConfig.py

    rb764ae5 r6d87082  
    7373_nsf_logo = os.path.join(icon_path, "nsf_logo.png") 
    7474_danse_logo = os.path.join(icon_path, "danse_logo.png") 
    75 _inst_logo = os.path.join(icon_path, "utlogo.gif") 
     75_inst_logo = os.path.join(icon_path, "utlogo.png") 
    7676_nist_url = "http://www.nist.gov/" 
    7777_umd_url = "http://www.umd.edu/" 
Note: See TracChangeset for help on using the changeset viewer.