Changeset 1c7acc7 in sasview

Timestamp:

Aug 12, 2011 9:54:01 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

19aa896

Parents:

584f474

Message:

add media

Location:

sansview

Files:

• media/Tutorial.pdf (added)
• scripts/local_config.py (modified) (4 diffs)

sansview/scripts/local_config.py

@@ -5 +5 @@
 import os
 from sans.guiframe.gui_style import GUIFRAME
-import sans.perspectives.fitting as fitting
 # Version of the application
 __appname__ = "SansView"
@@ -48 +47 @@
 _copyright = "(c) 2009, University of Tennessee"
 
-
+path, _= os.path.split(os.getcwd())
+icon_path = os.path.join(path, "images")
+media_path = os.path.join(path, "media")
 #edit the list of file state your plugin can read
 APPLICATION_WLIST = 'SansView files (*.svs)|*.svs'
@@ -62 +63 @@
 DATAPANEL_WIDTH = 235
 DATAPANEL_HEIGHT = 700
-SPLASH_SCREEN_PATH = os.path.join("images","SVwelcome_mini.png")
-try:
-    fit_media_path = fitting.get_data_path(media='media')
-    TUTORIAL_PATH = os.path.join(fit_media_path,"Tutorial.pdf")
-except:
-    raise
+SPLASH_SCREEN_PATH = os.path.join(icon_path,"SVwelcome_mini.png")
+TUTORIAL_PATH = os.path.join(media_path,"Tutorial.pdf")
 DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\
                     |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON
@@ -81 +78 @@
 #EDIT MENU
 EDIT_MENU = True
-SetupIconFile_win = os.path.join("images", "ball.ico")
-SetupIconFile_mac = os.path.join("images", "ball.icns")
+
+SetupIconFile_win = os.path.join(icon_path, "ball.ico")
+SetupIconFile_mac = os.path.join(icon_path, "ball.icns")
 DefaultGroupName = "DANSE"
 OutputBaseFilename = "setupSansView"