Changeset 76

Timestamp:

01/19/05 11:42:11 (19 years ago)

Author:

jerome

Message:

More "portable" paths to icons

Location:

pykoticon/trunk

Files:

• bin/pykoticon (modified) (2 diffs)
• setup.py (modified) (2 diffs)

pykoticon/trunk/bin/pykoticon

@@ -36 +36 @@
     except ImportError :    
         raise ImportError, "Mark Hammond's Win32 Extensions are missing. Please install them."
+    else :    
+        iconsdir = "."
 else :        
     isWindows = 0
+    iconsdir = "/usr/share/pykoticon"   # TODO : change this
     import pwd
     
@@ -285 +288 @@
         self.tbicon = wxPython.wx.wxTaskBarIcon()
         
-        self.greenicon = wxPython.wx.wxIcon(os.path.join("..", "icons", "pykoticon-green.ico"), \
+        self.greenicon = wxPython.wx.wxIcon(os.path.join(iconsdir, "pykoticon-green.ico"), \
                                   wxPython.wx.wxBITMAP_TYPE_ICO)
-        self.redicon = wxPython.wx.wxIcon(os.path.join("..", "icons", "pykoticon-red.ico"), \
+        self.redicon = wxPython.wx.wxIcon(os.path.join(iconsdir, "pykoticon-red.ico"), \
                                   wxPython.wx.wxBITMAP_TYPE_ICO)
         

pykoticon/trunk/setup.py

@@ -34 +34 @@
         sys.exit(-1)
     else :    
+        directory = os.sep.join(["share", "pykoticon"])
         withPy2EXE = 0
 else :        
+    directory = "."
     withPy2EXE = 1
 
@@ -48 +50 @@
       windows=[os.path.join("bin", "pykoticon")],
       scripts=[os.path.join("bin", "pykoticon")],
-      data_files=[("icons", glob.glob(os.path.join("icons", "*.ico")))])
+      data_files=[(directory, glob.glob(os.path.join("icons", "*.ico")))])