Changeset 657e52c in sasview for sansview/local_config.py

Timestamp:

Dec 14, 2012 12:50:24 PM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

0203ade

Parents:

aa01d07b

Message:

merging from the release 2.2.0

File:

• sansview/local_config.py (modified) (4 diffs)

sansview/local_config.py

@@ -12 +12 @@
 __version__ = sans.sansview.__version__
 __build__ = sans.sansview.__build__
-__download_page__ = 'https://sourceforge.net/projects/sansviewproject/files/'
-__update_URL__ = 'http://sansviewproject.svn.sourceforge.net/viewvc/sansviewproject/trunk/sansview.latestversion'
+__download_page__ = 'http://sourceforge.net/projects/sasview/files/'
+__update_URL__ = ['svn.code.sf.net', 
+                  '/p/sasview/code/trunk/sansview.latestversion']
 
 
@@ -35 +36 @@
 
 '''
-_homepage = "http://danse.chem.utk.edu"
-_download = "https://sourceforge.net/projects/sansviewproject/"
+_homepage = "http://www.sasview.org"
+_download = __download_page__
 _authors = []
-_paper = "http://sourceforge.net/apps/trac/sansviewproject/report"
-_license = "mailto:sansviewproject-developers@lists.sourceforge.net"
+_paper = "http://sourceforge.net/p/sasview/tickets/"
+_license = "mailto:help@sasview.org"
 
 
@@ -47 +48 @@
 test_path =  os.path.abspath(os.path.join(os.path.dirname(__file__), "test"))
 
-_nist_logo = "images/nist_logo.png"
-_umd_logo = "images/umd_logo.png"
-_sns_logo = "images/sns_logo.png"
+_nist_logo = os.path.join(icon_path, "nist_logo.png")
+_umd_logo = os.path.join(icon_path, "umd_logo.png")
+_sns_logo = os.path.join(icon_path, "sns_logo.png")
+_isis_logo = os.path.join(icon_path, "isis_logo.png")
+_ess_logo = os.path.join(icon_path, "ess_logo.png")
+_ill_logo = os.path.join(icon_path, "ill_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")
@@ -57 +61 @@
 _sns_url = "http://neutrons.ornl.gov/"
 _nsf_url = "http://www.nsf.gov"
+_isis_url = "http://www.isis.stfc.ac.uk/"
+_ess_url = "http://ess-scandinavia.eu/"
+_ill_url = "http://www.ill.eu/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"