[SCM] GUI front-end for Debian Live. branch, master, updated. 50db20df21dddbdb1b40ba59ea9e7bef02a2bcd5

Chris Lamb chris at chris-lamb.co.uk
Wed Mar 5 00:41:19 UTC 2008


The following commit has been merged in the master branch:
commit 70877086f0c027f7c579d19d358a531ad5ca5733
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Wed Mar 5 00:37:38 2008 +0000

    Move misc files from glade/ to misc/, add resource-locating util.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/utils.py b/LiveMagic/utils.py
new file mode 100644
index 0000000..b192eb5
--- /dev/null
+++ b/LiveMagic/utils.py
@@ -0,0 +1,17 @@
+import os
+
+def find_resource(resource):
+    dirs = (
+        os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'misc'),
+        '/usr/share/live-magic',
+        '/usr/local/share/live-magic',
+    )
+
+    tried = []
+    for base in dirs:
+        path = os.path.join(base, resource)
+        if os.path.isfile(path):
+            return path
+        tried.append(path)
+
+    raise ValueError, 'Cannot find %s resource. Tried: %s' % (resource, tried)
diff --git a/glade/debian_openlogo-nd-100.png b/misc/debian_openlogo-nd-100.png
similarity index 100%
rename from glade/debian_openlogo-nd-100.png
rename to misc/debian_openlogo-nd-100.png
diff --git a/glade/debian_sm.png b/misc/debian_sm.png
similarity index 100%
rename from glade/debian_sm.png
rename to misc/debian_sm.png
diff --git a/glade/gnome-logo-icon-transparent.png b/misc/gnome-logo-icon-transparent.png
similarity index 100%
rename from glade/gnome-logo-icon-transparent.png
rename to misc/gnome-logo-icon-transparent.png
diff --git a/glade/kde.png b/misc/kde.png
similarity index 100%
rename from glade/kde.png
rename to misc/kde.png
diff --git a/glade/main.glade b/misc/main.glade
similarity index 100%
rename from glade/main.glade
rename to misc/main.glade
diff --git a/glade/world_map-960.png b/misc/world_map-960.png
similarity index 100%
rename from glade/world_map-960.png
rename to misc/world_map-960.png
diff --git a/glade/xfce.png b/misc/xfce.png
similarity index 100%
rename from glade/xfce.png
rename to misc/xfce.png

-- 
GUI front-end for Debian Live.



More information about the debian-live-changes mailing list