[Inteproxy-commits] r90 - in trunk: . inteproxy share share/images

[scm-commit@wald.intevation.org]

Author: bh
Date: 2007-05-08 16:11:15 +0200 (Tue, 08 May 2007)
New Revision: 90

Added:
   trunk/share/
   trunk/share/images/
   trunk/share/images/InteProxy-icon.png
   trunk/share/images/InteProxy-logo.png
Removed:
   trunk/inteproxy/InteProxy-icon.png
   trunk/inteproxy/InteProxy-logo.png
Modified:
   trunk/ChangeLog
   trunk/inteproxy/resources.py
Log:
* inteproxy/InteProxy-icon.png, inteproxy/InteProxy-logo.png,
share/images/InteProxy-icon.png, share/images/InteProxy-logo.png:
Moved the images to share/images.

* inteproxy/resources.py (share_dir): Name of the share
subdirectory determined at import time from the filename of the
resources module
(gettext): Use the share_dir variable
(image_filename): Return image filenames relative to
share_dir/images now.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-08 13:57:42 UTC (rev 89)
+++ trunk/ChangeLog	2007-05-08 14:11:15 UTC (rev 90)
@@ -1,5 +1,18 @@
 2007-05-08  Bernhard Herzog  <bh at intevation.de>
 
+	* inteproxy/InteProxy-icon.png, inteproxy/InteProxy-logo.png,
+	share/images/InteProxy-icon.png, share/images/InteProxy-logo.png:
+	Moved the images to share/images.
+
+	* inteproxy/resources.py (share_dir): Name of the share
+	subdirectory determined at import time from the filename of the
+	resources module
+	(gettext): Use the share_dir variable
+	(image_filename): Return image filenames relative to
+	share_dir/images now.
+
+2007-05-08  Bernhard Herzog  <bh at intevation.de>
+
 	* inteproxy/gtkapp.py (image_filename),
 	inteproxy/resources.py (image_filename): Moved from gtkapp to
 	resources

Deleted: trunk/inteproxy/InteProxy-icon.png
===================================================================
(Binary files differ)

Deleted: trunk/inteproxy/InteProxy-logo.png
===================================================================
(Binary files differ)

Modified: trunk/inteproxy/resources.py
===================================================================
--- trunk/inteproxy/resources.py	2007-05-08 13:57:42 UTC (rev 89)
+++ trunk/inteproxy/resources.py	2007-05-08 14:11:15 UTC (rev 90)
@@ -10,14 +10,15 @@
 import os
 import gettext as py_gettext
 
+share_dir = os.path.join(os.path.dirname(__file__), os.pardir, "share")
+
 def gettext(message):
     """Translates the message according to the user's locale.
 
     If a translation can be found, the return value is a unicode object
     otherwise the message is returned unchanged.
     """
-    modir = os.path.join(os.path.dirname(__file__),
-                         "..", "share", "locale")
+    modir = os.path.join(share_dir, "locale")
     t = py_gettext.translation("inteproxy", modir)
 
     return t.ugettext(message)
@@ -30,4 +31,4 @@
     inteproxy package directory.  The parameter basename should be the
     basename of the image file in that directory.
     """
-    return os.path.join(os.path.dirname(__file__), basename)
+    return os.path.join(share_dir, "images", basename)

Copied: trunk/share/images/InteProxy-icon.png (from rev 89, trunk/inteproxy/InteProxy-icon.png)

Copied: trunk/share/images/InteProxy-logo.png (from rev 89, trunk/inteproxy/InteProxy-logo.png)