r15964 - in /branches/uf_redesign: graphics/__init__.py gui/paths.py -- May 04, 2012 - 14:09

Author: bugman
Date: Fri May  4 14:09:28 2012
New Revision: 15964

URL: http://svn.gna.org/viewcvs/relax?rev=15964&view=rev
Log:
Shifted a number of the image path variables from the gui.paths module to the 
graphics package.


Modified:
    branches/uf_redesign/graphics/__init__.py
    branches/uf_redesign/gui/paths.py

Modified: branches/uf_redesign/graphics/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/graphics/__init__.py?rev=15964&r1=15963&r2=15964&view=diff
==============================================================================
--- branches/uf_redesign/graphics/__init__.py (original)
+++ branches/uf_redesign/graphics/__init__.py Fri May  4 14:09:28 2012
@@ -26,6 +26,14 @@
 # Python module imports.
 from os import sep
 from string import split
+
+# relax module imports.
+from status import Status; status = Status()
+
+# GUI image and icon paths.
+ANALYSIS_IMAGE_PATH = status.install_path + sep + 'graphics' + sep + 
'analyses' + sep
+IMAGE_PATH = status.install_path + sep + 'gui' + sep + 'images' + sep
+WIZARD_IMAGE_PATH = status.install_path + sep + 'graphics' + sep + 'wizards' 
+ sep
 
 
 def fetch_icon(icon=None, size='16x16'):

Modified: branches/uf_redesign/gui/paths.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/paths.py?rev=15964&r1=15963&r2=15964&view=diff
==============================================================================
--- branches/uf_redesign/gui/paths.py (original)
+++ branches/uf_redesign/gui/paths.py Fri May  4 14:09:28 2012
@@ -32,15 +32,13 @@
 import sys
 
 # relax module imports.
+from graphics import IMAGE_PATH
 from status import Status; status = Status()
 
 
 # GUI image and icon paths.
-ANALYSIS_IMAGE_PATH = status.install_path + sep + 'graphics' + sep + 
'analyses' + sep
 OXY_ICON_PATH = status.install_path + sep + 'graphics' + sep + 
'oxygen_icons' + sep
-IMAGE_PATH = status.install_path + sep + 'gui' + sep + 'images' + sep
 ICON_RELAX_PATH = status.install_path + sep + 'graphics' + sep + 
'relax_icons' + sep
-WIZARD_IMAGE_PATH = status.install_path + sep + 'graphics' + sep + 'wizards' 
+ sep