Merge pull request #82 from dragonyanglong/move_icons_path

Move icons and doc folder path

Author: dragonyanglong

Diff for: setup.py

@@ -15,7 +15,7 @@
 
 # Use this version when git data are not available, like in git zip archive.
 # Update when tagging a new release.
-FALLBACK_VERSION = '1.4.2'
+FALLBACK_VERSION = '1.4.3'
 
 # determine if we run with Python 3.
 PY3 = (sys.version_info[0] == 3)

Diff for: doc/Farrow-jpcm-2007.pdf renamed to src/diffpy/pdfgui/doc/Farrow-jpcm-2007.pdf

@@ -37,8 +37,13 @@
 
 # Requirement must have egg-info.  Do not use in _development_mode.
 _req = Requirement.parse("diffpy.pdfgui")
-APPDATADIR = (os.path.dirname(_upbasedir) if _development_mode
-              else resource_filename(_req, ""))
+# APPDATADIR = (os.path.dirname(_upbasedir) if _development_mode
+#               else resource_filename(_req, ""))
+if _development_mode:
+    APPDATADIR = os.path.dirname(_upbasedir)
+else:
+    APPDATADIR = os.path.join(resource_filename(_req, ""), "diffpy/pdfgui")
+
 APPDATADIR = os.path.abspath(APPDATADIR)
 
 # Location of the HTML manual
@@ -59,11 +64,6 @@ def iconpath(iconfilename):
     Return string.
     """
     rv = os.path.join(APPDATADIR, 'icons', iconfilename)
-    print("APPDATADIR")
-    print(APPDATADIR)
-    print("rv")
-    print(rv)
-    print(os.path.isfile(rv))
     assert os.path.isfile(rv), "icon file does not exist"
     return rv