Changeset ed94228 in sasview

Timestamp:

Aug 17, 2011 6:11:20 PM (13 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:

c648414

Parents:

1c153e9

Message:

fixed some conflicting w/ gui-updates

Location:

calculatorview

Files:

• installer.iss (added)
• local_config.py (modified) (4 diffs)
• setup_exe.py (modified) (1 diff)

calculatorview/local_config.py

@@ -37 +37 @@
 _license = "mailto:sansdanse@gmail.com"
 
-_nsf_logo = "images/nsf_logo.png"
-_danse_logo = "images/danse_logo.png"
-_inst_logo = "images/utlogo.gif"
+_nsf_logo = "images/icons/nsf_logo.png"
+_danse_logo = "images/icons/danse_logo.png"
+_inst_logo = "images/icons/utlogo.gif"
 _nsf_url = "http://www.nsf.gov"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
-_corner_image = "images/angles_flat.png"
-_welcome_image = "images/SVwelcome.png"
+_corner_image = "images/icons/angles_flat.png"
+_welcome_image = "images/icons/SVwelcome.png"
 _copyright = "(c) 2009, University of Tennessee"
 
@@ -50 +50 @@
 #edit the list of file state your plugin can read
 APPLICATION_WLIST = ''
-APPLICATION_STATE_EXTENSION = ''
+APPLICATION_STATE_EXTENSION = None
 GUIFRAME_WIDTH = 300
 GUIFRAME_HEIGHT = 200
@@ -59 +59 @@
 DATAPANEL_WIDTH = 235
 DATAPANEL_HEIGHT = 700
-SPLASH_SCREEN_PATH = os.path.join("images","SVwelcome_mini.png")
+SPLASH_SCREEN_PATH = os.path.join("images","icons","SVwelcome_mini.png")
 TUTORIAL_PATH = os.path.join("media","Tutorial.pdf")
 DEFAULT_STYLE = GUIFRAME.CALCULATOR_ON
@@ -67 +67 @@
 WELCOME_PANEL_ON  = False
 CLEANUP_PLOT = False
-SetupIconFile_win = os.path.join("images", "ball.ico")
-SetupIconFile_mac = os.path.join("images", "ball.icns")
+SetupIconFile_win = os.path.join("images","icons", "ball.ico")
+SetupIconFile_mac = os.path.join("images","icons", "ball.icns")
 DefaultGroupName = "DANSE"
 OutputBaseFilename = "setupSansViewTool"

calculatorview/setup_exe.py

@@ -107 +107 @@
 if os.path.isfile(f):
     data_files.append(('.', [f]))
-
+f = 'local_config.py'
+if os.path.isfile(f):
+    data_files.append(('.', [f]))
 # Copying the HTML help docs
 path = cal.get_data_path('media')