pixmaps and icons moved to ui/data, all necessary references changed.

README

@@ -15,9 +15,9 @@ For past developers and contributers see: http://dev.deluge-torrent.org/wiki/Abo
 License
 ==========================
 Deluge is under the GNU GPLv3 license.
-Icon data/pixmaps/deluge.svg and derivatives in data/icons are copyright
+Icon ui/data/pixmaps/deluge.svg and derivatives in ui/data/icons are copyright
 Andrew Wedderburn and are under the GNU GPLv3.
-All other icons in data/pixmaps are copyright Andrew Resch and are under
+All other icons in ui/data/pixmaps are copyright Andrew Resch and are under
 the GNU GPLv3.
 
 ==========================

createicons.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-for size in 16 22 24 32 36 48 64 72 96 128 192 256; do mkdir -p deluge/data/\
+for size in 16 22 24 32 36 48 64 72 96 128 192 256; do mkdir -p deluge/ui/data/\
 icons/hicolor/${size}x${size}/apps; rsvg-convert -w ${size} -h ${size} \
--o deluge/data/icons/hicolor/${size}x${size}/apps/deluge.png deluge/data/pixmaps\
-/deluge.svg; mkdir -p deluge/data/icons/scalable/apps/; cp deluge/data/pixmaps/\
-deluge.svg deluge/data/icons/scalable/apps/deluge.svg; done
+-o deluge/ui/data/icons/hicolor/${size}x${size}/apps/deluge.png deluge/ui/data/pixmaps\
+/deluge.svg; mkdir -p deluge/ui/data/icons/scalable/apps/; cp deluge/ui/data/pixmaps/\
+deluge.svg deluge/ui/data/icons/scalable/apps/deluge.svg; done

deluge/common.py

@@ -212,7 +212,7 @@ def osx_check():
 
 def get_pixmap(fname):
     """
-    Provides easy access to files in the deluge/data/pixmaps folder within the Deluge egg
+    Provides easy access to files in the deluge/ui/data/pixmaps folder within the Deluge egg
 
     :param fname: the filename to look for
     :type fname: string
@@ -220,7 +220,7 @@ def get_pixmap(fname):
     :rtype: string
 
     """
-    return pkg_resources.resource_filename("deluge", os.path.join("data", \
+    return pkg_resources.resource_filename("deluge", os.path.join("ui/data", \
                                            "pixmaps", fname))
 
 def open_file(path):