diff --git a/README b/README index 0befe28f9..3ad036bb2 100644 --- a/README +++ b/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. ========================== diff --git a/createicons.sh b/createicons.sh index 114a822c5..9303e5adb 100755 --- a/createicons.sh +++ b/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 diff --git a/deluge/common.py b/deluge/common.py index ed875f11d..8e8926803 100644 --- a/deluge/common.py +++ b/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): diff --git a/deluge/data/icons/hicolor/128x128/apps/deluge.png b/deluge/ui/data/icons/hicolor/128x128/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/128x128/apps/deluge.png rename to deluge/ui/data/icons/hicolor/128x128/apps/deluge.png diff --git a/deluge/data/icons/hicolor/16x16/apps/deluge.png b/deluge/ui/data/icons/hicolor/16x16/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/16x16/apps/deluge.png rename to deluge/ui/data/icons/hicolor/16x16/apps/deluge.png diff --git a/deluge/data/icons/hicolor/192x192/apps/deluge.png b/deluge/ui/data/icons/hicolor/192x192/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/192x192/apps/deluge.png rename to deluge/ui/data/icons/hicolor/192x192/apps/deluge.png diff --git a/deluge/data/icons/hicolor/22x22/apps/deluge.png b/deluge/ui/data/icons/hicolor/22x22/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/22x22/apps/deluge.png rename to deluge/ui/data/icons/hicolor/22x22/apps/deluge.png diff --git a/deluge/data/icons/hicolor/24x24/apps/deluge.png b/deluge/ui/data/icons/hicolor/24x24/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/24x24/apps/deluge.png rename to deluge/ui/data/icons/hicolor/24x24/apps/deluge.png diff --git a/deluge/data/icons/hicolor/256x256/apps/deluge.png b/deluge/ui/data/icons/hicolor/256x256/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/256x256/apps/deluge.png rename to deluge/ui/data/icons/hicolor/256x256/apps/deluge.png diff --git a/deluge/data/icons/hicolor/32x32/apps/deluge.png b/deluge/ui/data/icons/hicolor/32x32/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/32x32/apps/deluge.png rename to deluge/ui/data/icons/hicolor/32x32/apps/deluge.png diff --git a/deluge/data/icons/hicolor/36x36/apps/deluge.png b/deluge/ui/data/icons/hicolor/36x36/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/36x36/apps/deluge.png rename to deluge/ui/data/icons/hicolor/36x36/apps/deluge.png diff --git a/deluge/data/icons/hicolor/48x48/apps/deluge.png b/deluge/ui/data/icons/hicolor/48x48/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/48x48/apps/deluge.png rename to deluge/ui/data/icons/hicolor/48x48/apps/deluge.png diff --git a/deluge/data/icons/hicolor/64x64/apps/deluge.png b/deluge/ui/data/icons/hicolor/64x64/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/64x64/apps/deluge.png rename to deluge/ui/data/icons/hicolor/64x64/apps/deluge.png diff --git a/deluge/data/icons/hicolor/72x72/apps/deluge.png b/deluge/ui/data/icons/hicolor/72x72/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/72x72/apps/deluge.png rename to deluge/ui/data/icons/hicolor/72x72/apps/deluge.png diff --git a/deluge/data/icons/hicolor/96x96/apps/deluge.png b/deluge/ui/data/icons/hicolor/96x96/apps/deluge.png similarity index 100% rename from deluge/data/icons/hicolor/96x96/apps/deluge.png rename to deluge/ui/data/icons/hicolor/96x96/apps/deluge.png diff --git a/deluge/data/icons/scalable/apps/deluge.svg b/deluge/ui/data/icons/scalable/apps/deluge.svg similarity index 100% rename from deluge/data/icons/scalable/apps/deluge.svg rename to deluge/ui/data/icons/scalable/apps/deluge.svg diff --git a/deluge/data/pixmaps/active.svg b/deluge/ui/data/pixmaps/active.svg similarity index 100% rename from deluge/data/pixmaps/active.svg rename to deluge/ui/data/pixmaps/active.svg diff --git a/deluge/data/pixmaps/active16.png b/deluge/ui/data/pixmaps/active16.png similarity index 100% rename from deluge/data/pixmaps/active16.png rename to deluge/ui/data/pixmaps/active16.png diff --git a/deluge/data/pixmaps/alert.svg b/deluge/ui/data/pixmaps/alert.svg similarity index 100% rename from deluge/data/pixmaps/alert.svg rename to deluge/ui/data/pixmaps/alert.svg diff --git a/deluge/data/pixmaps/alert16.png b/deluge/ui/data/pixmaps/alert16.png similarity index 100% rename from deluge/data/pixmaps/alert16.png rename to deluge/ui/data/pixmaps/alert16.png diff --git a/deluge/data/pixmaps/all.svg b/deluge/ui/data/pixmaps/all.svg similarity index 100% rename from deluge/data/pixmaps/all.svg rename to deluge/ui/data/pixmaps/all.svg diff --git a/deluge/data/pixmaps/all16.png b/deluge/ui/data/pixmaps/all16.png similarity index 100% rename from deluge/data/pixmaps/all16.png rename to deluge/ui/data/pixmaps/all16.png diff --git a/deluge/data/pixmaps/checking.svg b/deluge/ui/data/pixmaps/checking.svg similarity index 100% rename from deluge/data/pixmaps/checking.svg rename to deluge/ui/data/pixmaps/checking.svg diff --git a/deluge/data/pixmaps/checking16.png b/deluge/ui/data/pixmaps/checking16.png similarity index 100% rename from deluge/data/pixmaps/checking16.png rename to deluge/ui/data/pixmaps/checking16.png diff --git a/deluge/data/pixmaps/deluge-about.png b/deluge/ui/data/pixmaps/deluge-about.png similarity index 100% rename from deluge/data/pixmaps/deluge-about.png rename to deluge/ui/data/pixmaps/deluge-about.png diff --git a/deluge/data/pixmaps/deluge.ico b/deluge/ui/data/pixmaps/deluge.ico similarity index 100% rename from deluge/data/pixmaps/deluge.ico rename to deluge/ui/data/pixmaps/deluge.ico diff --git a/deluge/data/pixmaps/deluge.png b/deluge/ui/data/pixmaps/deluge.png similarity index 100% rename from deluge/data/pixmaps/deluge.png rename to deluge/ui/data/pixmaps/deluge.png diff --git a/deluge/data/pixmaps/deluge.svg b/deluge/ui/data/pixmaps/deluge.svg similarity index 100% rename from deluge/data/pixmaps/deluge.svg rename to deluge/ui/data/pixmaps/deluge.svg diff --git a/deluge/data/pixmaps/deluge.xpm b/deluge/ui/data/pixmaps/deluge.xpm similarity index 100% rename from deluge/data/pixmaps/deluge.xpm rename to deluge/ui/data/pixmaps/deluge.xpm diff --git a/deluge/data/pixmaps/deluge16.png b/deluge/ui/data/pixmaps/deluge16.png similarity index 100% rename from deluge/data/pixmaps/deluge16.png rename to deluge/ui/data/pixmaps/deluge16.png diff --git a/deluge/data/pixmaps/dht.svg b/deluge/ui/data/pixmaps/dht.svg similarity index 100% rename from deluge/data/pixmaps/dht.svg rename to deluge/ui/data/pixmaps/dht.svg diff --git a/deluge/data/pixmaps/dht16.png b/deluge/ui/data/pixmaps/dht16.png similarity index 100% rename from deluge/data/pixmaps/dht16.png rename to deluge/ui/data/pixmaps/dht16.png diff --git a/deluge/data/pixmaps/downloading.svg b/deluge/ui/data/pixmaps/downloading.svg similarity index 100% rename from deluge/data/pixmaps/downloading.svg rename to deluge/ui/data/pixmaps/downloading.svg diff --git a/deluge/data/pixmaps/downloading16.png b/deluge/ui/data/pixmaps/downloading16.png similarity index 100% rename from deluge/data/pixmaps/downloading16.png rename to deluge/ui/data/pixmaps/downloading16.png diff --git a/deluge/data/pixmaps/flags/FLAGS_LICENCE b/deluge/ui/data/pixmaps/flags/FLAGS_LICENCE similarity index 100% rename from deluge/data/pixmaps/flags/FLAGS_LICENCE rename to deluge/ui/data/pixmaps/flags/FLAGS_LICENCE diff --git a/deluge/data/pixmaps/flags/ad.png b/deluge/ui/data/pixmaps/flags/ad.png similarity index 100% rename from deluge/data/pixmaps/flags/ad.png rename to deluge/ui/data/pixmaps/flags/ad.png diff --git a/deluge/data/pixmaps/flags/ae.png b/deluge/ui/data/pixmaps/flags/ae.png similarity index 100% rename from deluge/data/pixmaps/flags/ae.png rename to deluge/ui/data/pixmaps/flags/ae.png diff --git a/deluge/data/pixmaps/flags/af.png b/deluge/ui/data/pixmaps/flags/af.png similarity index 100% rename from deluge/data/pixmaps/flags/af.png rename to deluge/ui/data/pixmaps/flags/af.png diff --git a/deluge/data/pixmaps/flags/ag.png b/deluge/ui/data/pixmaps/flags/ag.png similarity index 100% rename from deluge/data/pixmaps/flags/ag.png rename to deluge/ui/data/pixmaps/flags/ag.png diff --git a/deluge/data/pixmaps/flags/ai.png b/deluge/ui/data/pixmaps/flags/ai.png similarity index 100% rename from deluge/data/pixmaps/flags/ai.png rename to deluge/ui/data/pixmaps/flags/ai.png diff --git a/deluge/data/pixmaps/flags/al.png b/deluge/ui/data/pixmaps/flags/al.png similarity index 100% rename from deluge/data/pixmaps/flags/al.png rename to deluge/ui/data/pixmaps/flags/al.png diff --git a/deluge/data/pixmaps/flags/am.png b/deluge/ui/data/pixmaps/flags/am.png similarity index 100% rename from deluge/data/pixmaps/flags/am.png rename to deluge/ui/data/pixmaps/flags/am.png diff --git a/deluge/data/pixmaps/flags/an.png b/deluge/ui/data/pixmaps/flags/an.png similarity index 100% rename from deluge/data/pixmaps/flags/an.png rename to deluge/ui/data/pixmaps/flags/an.png diff --git a/deluge/data/pixmaps/flags/ao.png b/deluge/ui/data/pixmaps/flags/ao.png similarity index 100% rename from deluge/data/pixmaps/flags/ao.png rename to deluge/ui/data/pixmaps/flags/ao.png diff --git a/deluge/data/pixmaps/flags/aq.png b/deluge/ui/data/pixmaps/flags/aq.png similarity index 100% rename from deluge/data/pixmaps/flags/aq.png rename to deluge/ui/data/pixmaps/flags/aq.png diff --git a/deluge/data/pixmaps/flags/ar.png b/deluge/ui/data/pixmaps/flags/ar.png similarity index 100% rename from deluge/data/pixmaps/flags/ar.png rename to deluge/ui/data/pixmaps/flags/ar.png diff --git a/deluge/data/pixmaps/flags/as.png b/deluge/ui/data/pixmaps/flags/as.png similarity index 100% rename from deluge/data/pixmaps/flags/as.png rename to deluge/ui/data/pixmaps/flags/as.png diff --git a/deluge/data/pixmaps/flags/at.png b/deluge/ui/data/pixmaps/flags/at.png similarity index 100% rename from deluge/data/pixmaps/flags/at.png rename to deluge/ui/data/pixmaps/flags/at.png diff --git a/deluge/data/pixmaps/flags/au.png b/deluge/ui/data/pixmaps/flags/au.png similarity index 100% rename from deluge/data/pixmaps/flags/au.png rename to deluge/ui/data/pixmaps/flags/au.png diff --git a/deluge/data/pixmaps/flags/aw.png b/deluge/ui/data/pixmaps/flags/aw.png similarity index 100% rename from deluge/data/pixmaps/flags/aw.png rename to deluge/ui/data/pixmaps/flags/aw.png diff --git a/deluge/data/pixmaps/flags/ax.png b/deluge/ui/data/pixmaps/flags/ax.png similarity index 100% rename from deluge/data/pixmaps/flags/ax.png rename to deluge/ui/data/pixmaps/flags/ax.png diff --git a/deluge/data/pixmaps/flags/az.png b/deluge/ui/data/pixmaps/flags/az.png similarity index 100% rename from deluge/data/pixmaps/flags/az.png rename to deluge/ui/data/pixmaps/flags/az.png diff --git a/deluge/data/pixmaps/flags/ba.png b/deluge/ui/data/pixmaps/flags/ba.png similarity index 100% rename from deluge/data/pixmaps/flags/ba.png rename to deluge/ui/data/pixmaps/flags/ba.png diff --git a/deluge/data/pixmaps/flags/bb.png b/deluge/ui/data/pixmaps/flags/bb.png similarity index 100% rename from deluge/data/pixmaps/flags/bb.png rename to deluge/ui/data/pixmaps/flags/bb.png diff --git a/deluge/data/pixmaps/flags/bd.png b/deluge/ui/data/pixmaps/flags/bd.png similarity index 100% rename from deluge/data/pixmaps/flags/bd.png rename to deluge/ui/data/pixmaps/flags/bd.png diff --git a/deluge/data/pixmaps/flags/be.png b/deluge/ui/data/pixmaps/flags/be.png similarity index 100% rename from deluge/data/pixmaps/flags/be.png rename to deluge/ui/data/pixmaps/flags/be.png diff --git a/deluge/data/pixmaps/flags/bf.png b/deluge/ui/data/pixmaps/flags/bf.png similarity index 100% rename from deluge/data/pixmaps/flags/bf.png rename to deluge/ui/data/pixmaps/flags/bf.png diff --git a/deluge/data/pixmaps/flags/bg.png b/deluge/ui/data/pixmaps/flags/bg.png similarity index 100% rename from deluge/data/pixmaps/flags/bg.png rename to deluge/ui/data/pixmaps/flags/bg.png diff --git a/deluge/data/pixmaps/flags/bh.png b/deluge/ui/data/pixmaps/flags/bh.png similarity index 100% rename from deluge/data/pixmaps/flags/bh.png rename to deluge/ui/data/pixmaps/flags/bh.png diff --git a/deluge/data/pixmaps/flags/bi.png b/deluge/ui/data/pixmaps/flags/bi.png similarity index 100% rename from deluge/data/pixmaps/flags/bi.png rename to deluge/ui/data/pixmaps/flags/bi.png diff --git a/deluge/data/pixmaps/flags/bj.png b/deluge/ui/data/pixmaps/flags/bj.png similarity index 100% rename from deluge/data/pixmaps/flags/bj.png rename to deluge/ui/data/pixmaps/flags/bj.png diff --git a/deluge/data/pixmaps/flags/bm.png b/deluge/ui/data/pixmaps/flags/bm.png similarity index 100% rename from deluge/data/pixmaps/flags/bm.png rename to deluge/ui/data/pixmaps/flags/bm.png diff --git a/deluge/data/pixmaps/flags/bn.png b/deluge/ui/data/pixmaps/flags/bn.png similarity index 100% rename from deluge/data/pixmaps/flags/bn.png rename to deluge/ui/data/pixmaps/flags/bn.png diff --git a/deluge/data/pixmaps/flags/bo.png b/deluge/ui/data/pixmaps/flags/bo.png similarity index 100% rename from deluge/data/pixmaps/flags/bo.png rename to deluge/ui/data/pixmaps/flags/bo.png diff --git a/deluge/data/pixmaps/flags/br.png b/deluge/ui/data/pixmaps/flags/br.png similarity index 100% rename from deluge/data/pixmaps/flags/br.png rename to deluge/ui/data/pixmaps/flags/br.png diff --git a/deluge/data/pixmaps/flags/bs.png b/deluge/ui/data/pixmaps/flags/bs.png similarity index 100% rename from deluge/data/pixmaps/flags/bs.png rename to deluge/ui/data/pixmaps/flags/bs.png diff --git a/deluge/data/pixmaps/flags/bt.png b/deluge/ui/data/pixmaps/flags/bt.png similarity index 100% rename from deluge/data/pixmaps/flags/bt.png rename to deluge/ui/data/pixmaps/flags/bt.png diff --git a/deluge/data/pixmaps/flags/bv.png b/deluge/ui/data/pixmaps/flags/bv.png similarity index 100% rename from deluge/data/pixmaps/flags/bv.png rename to deluge/ui/data/pixmaps/flags/bv.png diff --git a/deluge/data/pixmaps/flags/bw.png b/deluge/ui/data/pixmaps/flags/bw.png similarity index 100% rename from deluge/data/pixmaps/flags/bw.png rename to deluge/ui/data/pixmaps/flags/bw.png diff --git a/deluge/data/pixmaps/flags/by.png b/deluge/ui/data/pixmaps/flags/by.png similarity index 100% rename from deluge/data/pixmaps/flags/by.png rename to deluge/ui/data/pixmaps/flags/by.png diff --git a/deluge/data/pixmaps/flags/bz.png b/deluge/ui/data/pixmaps/flags/bz.png similarity index 100% rename from deluge/data/pixmaps/flags/bz.png rename to deluge/ui/data/pixmaps/flags/bz.png diff --git a/deluge/data/pixmaps/flags/ca.png b/deluge/ui/data/pixmaps/flags/ca.png similarity index 100% rename from deluge/data/pixmaps/flags/ca.png rename to deluge/ui/data/pixmaps/flags/ca.png diff --git a/deluge/data/pixmaps/flags/cc.png b/deluge/ui/data/pixmaps/flags/cc.png similarity index 100% rename from deluge/data/pixmaps/flags/cc.png rename to deluge/ui/data/pixmaps/flags/cc.png diff --git a/deluge/data/pixmaps/flags/cd.png b/deluge/ui/data/pixmaps/flags/cd.png similarity index 100% rename from deluge/data/pixmaps/flags/cd.png rename to deluge/ui/data/pixmaps/flags/cd.png diff --git a/deluge/data/pixmaps/flags/cf.png b/deluge/ui/data/pixmaps/flags/cf.png similarity index 100% rename from deluge/data/pixmaps/flags/cf.png rename to deluge/ui/data/pixmaps/flags/cf.png diff --git a/deluge/data/pixmaps/flags/cg.png b/deluge/ui/data/pixmaps/flags/cg.png similarity index 100% rename from deluge/data/pixmaps/flags/cg.png rename to deluge/ui/data/pixmaps/flags/cg.png diff --git a/deluge/data/pixmaps/flags/ch.png b/deluge/ui/data/pixmaps/flags/ch.png similarity index 100% rename from deluge/data/pixmaps/flags/ch.png rename to deluge/ui/data/pixmaps/flags/ch.png diff --git a/deluge/data/pixmaps/flags/ci.png b/deluge/ui/data/pixmaps/flags/ci.png similarity index 100% rename from deluge/data/pixmaps/flags/ci.png rename to deluge/ui/data/pixmaps/flags/ci.png diff --git a/deluge/data/pixmaps/flags/ck.png b/deluge/ui/data/pixmaps/flags/ck.png similarity index 100% rename from deluge/data/pixmaps/flags/ck.png rename to deluge/ui/data/pixmaps/flags/ck.png diff --git a/deluge/data/pixmaps/flags/cl.png b/deluge/ui/data/pixmaps/flags/cl.png similarity index 100% rename from deluge/data/pixmaps/flags/cl.png rename to deluge/ui/data/pixmaps/flags/cl.png diff --git a/deluge/data/pixmaps/flags/cm.png b/deluge/ui/data/pixmaps/flags/cm.png similarity index 100% rename from deluge/data/pixmaps/flags/cm.png rename to deluge/ui/data/pixmaps/flags/cm.png diff --git a/deluge/data/pixmaps/flags/cn.png b/deluge/ui/data/pixmaps/flags/cn.png similarity index 100% rename from deluge/data/pixmaps/flags/cn.png rename to deluge/ui/data/pixmaps/flags/cn.png diff --git a/deluge/data/pixmaps/flags/co.png b/deluge/ui/data/pixmaps/flags/co.png similarity index 100% rename from deluge/data/pixmaps/flags/co.png rename to deluge/ui/data/pixmaps/flags/co.png diff --git a/deluge/data/pixmaps/flags/cr.png b/deluge/ui/data/pixmaps/flags/cr.png similarity index 100% rename from deluge/data/pixmaps/flags/cr.png rename to deluge/ui/data/pixmaps/flags/cr.png diff --git a/deluge/data/pixmaps/flags/cs.png b/deluge/ui/data/pixmaps/flags/cs.png similarity index 100% rename from deluge/data/pixmaps/flags/cs.png rename to deluge/ui/data/pixmaps/flags/cs.png diff --git a/deluge/data/pixmaps/flags/cu.png b/deluge/ui/data/pixmaps/flags/cu.png similarity index 100% rename from deluge/data/pixmaps/flags/cu.png rename to deluge/ui/data/pixmaps/flags/cu.png diff --git a/deluge/data/pixmaps/flags/cv.png b/deluge/ui/data/pixmaps/flags/cv.png similarity index 100% rename from deluge/data/pixmaps/flags/cv.png rename to deluge/ui/data/pixmaps/flags/cv.png diff --git a/deluge/data/pixmaps/flags/cx.png b/deluge/ui/data/pixmaps/flags/cx.png similarity index 100% rename from deluge/data/pixmaps/flags/cx.png rename to deluge/ui/data/pixmaps/flags/cx.png diff --git a/deluge/data/pixmaps/flags/cy.png b/deluge/ui/data/pixmaps/flags/cy.png similarity index 100% rename from deluge/data/pixmaps/flags/cy.png rename to deluge/ui/data/pixmaps/flags/cy.png diff --git a/deluge/data/pixmaps/flags/cz.png b/deluge/ui/data/pixmaps/flags/cz.png similarity index 100% rename from deluge/data/pixmaps/flags/cz.png rename to deluge/ui/data/pixmaps/flags/cz.png diff --git a/deluge/data/pixmaps/flags/de.png b/deluge/ui/data/pixmaps/flags/de.png similarity index 100% rename from deluge/data/pixmaps/flags/de.png rename to deluge/ui/data/pixmaps/flags/de.png diff --git a/deluge/data/pixmaps/flags/dj.png b/deluge/ui/data/pixmaps/flags/dj.png similarity index 100% rename from deluge/data/pixmaps/flags/dj.png rename to deluge/ui/data/pixmaps/flags/dj.png diff --git a/deluge/data/pixmaps/flags/dk.png b/deluge/ui/data/pixmaps/flags/dk.png similarity index 100% rename from deluge/data/pixmaps/flags/dk.png rename to deluge/ui/data/pixmaps/flags/dk.png diff --git a/deluge/data/pixmaps/flags/dm.png b/deluge/ui/data/pixmaps/flags/dm.png similarity index 100% rename from deluge/data/pixmaps/flags/dm.png rename to deluge/ui/data/pixmaps/flags/dm.png diff --git a/deluge/data/pixmaps/flags/do.png b/deluge/ui/data/pixmaps/flags/do.png similarity index 100% rename from deluge/data/pixmaps/flags/do.png rename to deluge/ui/data/pixmaps/flags/do.png diff --git a/deluge/data/pixmaps/flags/dz.png b/deluge/ui/data/pixmaps/flags/dz.png similarity index 100% rename from deluge/data/pixmaps/flags/dz.png rename to deluge/ui/data/pixmaps/flags/dz.png diff --git a/deluge/data/pixmaps/flags/ec.png b/deluge/ui/data/pixmaps/flags/ec.png similarity index 100% rename from deluge/data/pixmaps/flags/ec.png rename to deluge/ui/data/pixmaps/flags/ec.png diff --git a/deluge/data/pixmaps/flags/ee.png b/deluge/ui/data/pixmaps/flags/ee.png similarity index 100% rename from deluge/data/pixmaps/flags/ee.png rename to deluge/ui/data/pixmaps/flags/ee.png diff --git a/deluge/data/pixmaps/flags/eg.png b/deluge/ui/data/pixmaps/flags/eg.png similarity index 100% rename from deluge/data/pixmaps/flags/eg.png rename to deluge/ui/data/pixmaps/flags/eg.png diff --git a/deluge/data/pixmaps/flags/eh.png b/deluge/ui/data/pixmaps/flags/eh.png similarity index 100% rename from deluge/data/pixmaps/flags/eh.png rename to deluge/ui/data/pixmaps/flags/eh.png diff --git a/deluge/data/pixmaps/flags/er.png b/deluge/ui/data/pixmaps/flags/er.png similarity index 100% rename from deluge/data/pixmaps/flags/er.png rename to deluge/ui/data/pixmaps/flags/er.png diff --git a/deluge/data/pixmaps/flags/es.png b/deluge/ui/data/pixmaps/flags/es.png similarity index 100% rename from deluge/data/pixmaps/flags/es.png rename to deluge/ui/data/pixmaps/flags/es.png diff --git a/deluge/data/pixmaps/flags/et.png b/deluge/ui/data/pixmaps/flags/et.png similarity index 100% rename from deluge/data/pixmaps/flags/et.png rename to deluge/ui/data/pixmaps/flags/et.png diff --git a/deluge/data/pixmaps/flags/fi.png b/deluge/ui/data/pixmaps/flags/fi.png similarity index 100% rename from deluge/data/pixmaps/flags/fi.png rename to deluge/ui/data/pixmaps/flags/fi.png diff --git a/deluge/data/pixmaps/flags/fj.png b/deluge/ui/data/pixmaps/flags/fj.png similarity index 100% rename from deluge/data/pixmaps/flags/fj.png rename to deluge/ui/data/pixmaps/flags/fj.png diff --git a/deluge/data/pixmaps/flags/fk.png b/deluge/ui/data/pixmaps/flags/fk.png similarity index 100% rename from deluge/data/pixmaps/flags/fk.png rename to deluge/ui/data/pixmaps/flags/fk.png diff --git a/deluge/data/pixmaps/flags/fm.png b/deluge/ui/data/pixmaps/flags/fm.png similarity index 100% rename from deluge/data/pixmaps/flags/fm.png rename to deluge/ui/data/pixmaps/flags/fm.png diff --git a/deluge/data/pixmaps/flags/fo.png b/deluge/ui/data/pixmaps/flags/fo.png similarity index 100% rename from deluge/data/pixmaps/flags/fo.png rename to deluge/ui/data/pixmaps/flags/fo.png diff --git a/deluge/data/pixmaps/flags/fr.png b/deluge/ui/data/pixmaps/flags/fr.png similarity index 100% rename from deluge/data/pixmaps/flags/fr.png rename to deluge/ui/data/pixmaps/flags/fr.png diff --git a/deluge/data/pixmaps/flags/fx.png b/deluge/ui/data/pixmaps/flags/fx.png similarity index 100% rename from deluge/data/pixmaps/flags/fx.png rename to deluge/ui/data/pixmaps/flags/fx.png diff --git a/deluge/data/pixmaps/flags/ga.png b/deluge/ui/data/pixmaps/flags/ga.png similarity index 100% rename from deluge/data/pixmaps/flags/ga.png rename to deluge/ui/data/pixmaps/flags/ga.png diff --git a/deluge/data/pixmaps/flags/gb.png b/deluge/ui/data/pixmaps/flags/gb.png similarity index 100% rename from deluge/data/pixmaps/flags/gb.png rename to deluge/ui/data/pixmaps/flags/gb.png diff --git a/deluge/data/pixmaps/flags/gd.png b/deluge/ui/data/pixmaps/flags/gd.png similarity index 100% rename from deluge/data/pixmaps/flags/gd.png rename to deluge/ui/data/pixmaps/flags/gd.png diff --git a/deluge/data/pixmaps/flags/ge.png b/deluge/ui/data/pixmaps/flags/ge.png similarity index 100% rename from deluge/data/pixmaps/flags/ge.png rename to deluge/ui/data/pixmaps/flags/ge.png diff --git a/deluge/data/pixmaps/flags/gf.png b/deluge/ui/data/pixmaps/flags/gf.png similarity index 100% rename from deluge/data/pixmaps/flags/gf.png rename to deluge/ui/data/pixmaps/flags/gf.png diff --git a/deluge/data/pixmaps/flags/gg.png b/deluge/ui/data/pixmaps/flags/gg.png similarity index 100% rename from deluge/data/pixmaps/flags/gg.png rename to deluge/ui/data/pixmaps/flags/gg.png diff --git a/deluge/data/pixmaps/flags/gh.png b/deluge/ui/data/pixmaps/flags/gh.png similarity index 100% rename from deluge/data/pixmaps/flags/gh.png rename to deluge/ui/data/pixmaps/flags/gh.png diff --git a/deluge/data/pixmaps/flags/gi.png b/deluge/ui/data/pixmaps/flags/gi.png similarity index 100% rename from deluge/data/pixmaps/flags/gi.png rename to deluge/ui/data/pixmaps/flags/gi.png diff --git a/deluge/data/pixmaps/flags/gl.png b/deluge/ui/data/pixmaps/flags/gl.png similarity index 100% rename from deluge/data/pixmaps/flags/gl.png rename to deluge/ui/data/pixmaps/flags/gl.png diff --git a/deluge/data/pixmaps/flags/gm.png b/deluge/ui/data/pixmaps/flags/gm.png similarity index 100% rename from deluge/data/pixmaps/flags/gm.png rename to deluge/ui/data/pixmaps/flags/gm.png diff --git a/deluge/data/pixmaps/flags/gn.png b/deluge/ui/data/pixmaps/flags/gn.png similarity index 100% rename from deluge/data/pixmaps/flags/gn.png rename to deluge/ui/data/pixmaps/flags/gn.png diff --git a/deluge/data/pixmaps/flags/gp.png b/deluge/ui/data/pixmaps/flags/gp.png similarity index 100% rename from deluge/data/pixmaps/flags/gp.png rename to deluge/ui/data/pixmaps/flags/gp.png diff --git a/deluge/data/pixmaps/flags/gq.png b/deluge/ui/data/pixmaps/flags/gq.png similarity index 100% rename from deluge/data/pixmaps/flags/gq.png rename to deluge/ui/data/pixmaps/flags/gq.png diff --git a/deluge/data/pixmaps/flags/gr.png b/deluge/ui/data/pixmaps/flags/gr.png similarity index 100% rename from deluge/data/pixmaps/flags/gr.png rename to deluge/ui/data/pixmaps/flags/gr.png diff --git a/deluge/data/pixmaps/flags/gs.png b/deluge/ui/data/pixmaps/flags/gs.png similarity index 100% rename from deluge/data/pixmaps/flags/gs.png rename to deluge/ui/data/pixmaps/flags/gs.png diff --git a/deluge/data/pixmaps/flags/gt.png b/deluge/ui/data/pixmaps/flags/gt.png similarity index 100% rename from deluge/data/pixmaps/flags/gt.png rename to deluge/ui/data/pixmaps/flags/gt.png diff --git a/deluge/data/pixmaps/flags/gu.png b/deluge/ui/data/pixmaps/flags/gu.png similarity index 100% rename from deluge/data/pixmaps/flags/gu.png rename to deluge/ui/data/pixmaps/flags/gu.png diff --git a/deluge/data/pixmaps/flags/gw.png b/deluge/ui/data/pixmaps/flags/gw.png similarity index 100% rename from deluge/data/pixmaps/flags/gw.png rename to deluge/ui/data/pixmaps/flags/gw.png diff --git a/deluge/data/pixmaps/flags/gy.png b/deluge/ui/data/pixmaps/flags/gy.png similarity index 100% rename from deluge/data/pixmaps/flags/gy.png rename to deluge/ui/data/pixmaps/flags/gy.png diff --git a/deluge/data/pixmaps/flags/hk.png b/deluge/ui/data/pixmaps/flags/hk.png similarity index 100% rename from deluge/data/pixmaps/flags/hk.png rename to deluge/ui/data/pixmaps/flags/hk.png diff --git a/deluge/data/pixmaps/flags/hm.png b/deluge/ui/data/pixmaps/flags/hm.png similarity index 100% rename from deluge/data/pixmaps/flags/hm.png rename to deluge/ui/data/pixmaps/flags/hm.png diff --git a/deluge/data/pixmaps/flags/hn.png b/deluge/ui/data/pixmaps/flags/hn.png similarity index 100% rename from deluge/data/pixmaps/flags/hn.png rename to deluge/ui/data/pixmaps/flags/hn.png diff --git a/deluge/data/pixmaps/flags/hr.png b/deluge/ui/data/pixmaps/flags/hr.png similarity index 100% rename from deluge/data/pixmaps/flags/hr.png rename to deluge/ui/data/pixmaps/flags/hr.png diff --git a/deluge/data/pixmaps/flags/ht.png b/deluge/ui/data/pixmaps/flags/ht.png similarity index 100% rename from deluge/data/pixmaps/flags/ht.png rename to deluge/ui/data/pixmaps/flags/ht.png diff --git a/deluge/data/pixmaps/flags/hu.png b/deluge/ui/data/pixmaps/flags/hu.png similarity index 100% rename from deluge/data/pixmaps/flags/hu.png rename to deluge/ui/data/pixmaps/flags/hu.png diff --git a/deluge/data/pixmaps/flags/id.png b/deluge/ui/data/pixmaps/flags/id.png similarity index 100% rename from deluge/data/pixmaps/flags/id.png rename to deluge/ui/data/pixmaps/flags/id.png diff --git a/deluge/data/pixmaps/flags/ie.png b/deluge/ui/data/pixmaps/flags/ie.png similarity index 100% rename from deluge/data/pixmaps/flags/ie.png rename to deluge/ui/data/pixmaps/flags/ie.png diff --git a/deluge/data/pixmaps/flags/il.png b/deluge/ui/data/pixmaps/flags/il.png similarity index 100% rename from deluge/data/pixmaps/flags/il.png rename to deluge/ui/data/pixmaps/flags/il.png diff --git a/deluge/data/pixmaps/flags/in.png b/deluge/ui/data/pixmaps/flags/in.png similarity index 100% rename from deluge/data/pixmaps/flags/in.png rename to deluge/ui/data/pixmaps/flags/in.png diff --git a/deluge/data/pixmaps/flags/io.png b/deluge/ui/data/pixmaps/flags/io.png similarity index 100% rename from deluge/data/pixmaps/flags/io.png rename to deluge/ui/data/pixmaps/flags/io.png diff --git a/deluge/data/pixmaps/flags/iq.png b/deluge/ui/data/pixmaps/flags/iq.png similarity index 100% rename from deluge/data/pixmaps/flags/iq.png rename to deluge/ui/data/pixmaps/flags/iq.png diff --git a/deluge/data/pixmaps/flags/ir.png b/deluge/ui/data/pixmaps/flags/ir.png similarity index 100% rename from deluge/data/pixmaps/flags/ir.png rename to deluge/ui/data/pixmaps/flags/ir.png diff --git a/deluge/data/pixmaps/flags/is.png b/deluge/ui/data/pixmaps/flags/is.png similarity index 100% rename from deluge/data/pixmaps/flags/is.png rename to deluge/ui/data/pixmaps/flags/is.png diff --git a/deluge/data/pixmaps/flags/it.png b/deluge/ui/data/pixmaps/flags/it.png similarity index 100% rename from deluge/data/pixmaps/flags/it.png rename to deluge/ui/data/pixmaps/flags/it.png diff --git a/deluge/data/pixmaps/flags/je.png b/deluge/ui/data/pixmaps/flags/je.png similarity index 100% rename from deluge/data/pixmaps/flags/je.png rename to deluge/ui/data/pixmaps/flags/je.png diff --git a/deluge/data/pixmaps/flags/jm.png b/deluge/ui/data/pixmaps/flags/jm.png similarity index 100% rename from deluge/data/pixmaps/flags/jm.png rename to deluge/ui/data/pixmaps/flags/jm.png diff --git a/deluge/data/pixmaps/flags/jo.png b/deluge/ui/data/pixmaps/flags/jo.png similarity index 100% rename from deluge/data/pixmaps/flags/jo.png rename to deluge/ui/data/pixmaps/flags/jo.png diff --git a/deluge/data/pixmaps/flags/jp.png b/deluge/ui/data/pixmaps/flags/jp.png similarity index 100% rename from deluge/data/pixmaps/flags/jp.png rename to deluge/ui/data/pixmaps/flags/jp.png diff --git a/deluge/data/pixmaps/flags/ke.png b/deluge/ui/data/pixmaps/flags/ke.png similarity index 100% rename from deluge/data/pixmaps/flags/ke.png rename to deluge/ui/data/pixmaps/flags/ke.png diff --git a/deluge/data/pixmaps/flags/kg.png b/deluge/ui/data/pixmaps/flags/kg.png similarity index 100% rename from deluge/data/pixmaps/flags/kg.png rename to deluge/ui/data/pixmaps/flags/kg.png diff --git a/deluge/data/pixmaps/flags/kh.png b/deluge/ui/data/pixmaps/flags/kh.png similarity index 100% rename from deluge/data/pixmaps/flags/kh.png rename to deluge/ui/data/pixmaps/flags/kh.png diff --git a/deluge/data/pixmaps/flags/ki.png b/deluge/ui/data/pixmaps/flags/ki.png similarity index 100% rename from deluge/data/pixmaps/flags/ki.png rename to deluge/ui/data/pixmaps/flags/ki.png diff --git a/deluge/data/pixmaps/flags/km.png b/deluge/ui/data/pixmaps/flags/km.png similarity index 100% rename from deluge/data/pixmaps/flags/km.png rename to deluge/ui/data/pixmaps/flags/km.png diff --git a/deluge/data/pixmaps/flags/kn.png b/deluge/ui/data/pixmaps/flags/kn.png similarity index 100% rename from deluge/data/pixmaps/flags/kn.png rename to deluge/ui/data/pixmaps/flags/kn.png diff --git a/deluge/data/pixmaps/flags/kp.png b/deluge/ui/data/pixmaps/flags/kp.png similarity index 100% rename from deluge/data/pixmaps/flags/kp.png rename to deluge/ui/data/pixmaps/flags/kp.png diff --git a/deluge/data/pixmaps/flags/kr.png b/deluge/ui/data/pixmaps/flags/kr.png similarity index 100% rename from deluge/data/pixmaps/flags/kr.png rename to deluge/ui/data/pixmaps/flags/kr.png diff --git a/deluge/data/pixmaps/flags/kw.png b/deluge/ui/data/pixmaps/flags/kw.png similarity index 100% rename from deluge/data/pixmaps/flags/kw.png rename to deluge/ui/data/pixmaps/flags/kw.png diff --git a/deluge/data/pixmaps/flags/ky.png b/deluge/ui/data/pixmaps/flags/ky.png similarity index 100% rename from deluge/data/pixmaps/flags/ky.png rename to deluge/ui/data/pixmaps/flags/ky.png diff --git a/deluge/data/pixmaps/flags/kz.png b/deluge/ui/data/pixmaps/flags/kz.png similarity index 100% rename from deluge/data/pixmaps/flags/kz.png rename to deluge/ui/data/pixmaps/flags/kz.png diff --git a/deluge/data/pixmaps/flags/la.png b/deluge/ui/data/pixmaps/flags/la.png similarity index 100% rename from deluge/data/pixmaps/flags/la.png rename to deluge/ui/data/pixmaps/flags/la.png diff --git a/deluge/data/pixmaps/flags/lb.png b/deluge/ui/data/pixmaps/flags/lb.png similarity index 100% rename from deluge/data/pixmaps/flags/lb.png rename to deluge/ui/data/pixmaps/flags/lb.png diff --git a/deluge/data/pixmaps/flags/lc.png b/deluge/ui/data/pixmaps/flags/lc.png similarity index 100% rename from deluge/data/pixmaps/flags/lc.png rename to deluge/ui/data/pixmaps/flags/lc.png diff --git a/deluge/data/pixmaps/flags/li.png b/deluge/ui/data/pixmaps/flags/li.png similarity index 100% rename from deluge/data/pixmaps/flags/li.png rename to deluge/ui/data/pixmaps/flags/li.png diff --git a/deluge/data/pixmaps/flags/lk.png b/deluge/ui/data/pixmaps/flags/lk.png similarity index 100% rename from deluge/data/pixmaps/flags/lk.png rename to deluge/ui/data/pixmaps/flags/lk.png diff --git a/deluge/data/pixmaps/flags/lr.png b/deluge/ui/data/pixmaps/flags/lr.png similarity index 100% rename from deluge/data/pixmaps/flags/lr.png rename to deluge/ui/data/pixmaps/flags/lr.png diff --git a/deluge/data/pixmaps/flags/ls.png b/deluge/ui/data/pixmaps/flags/ls.png similarity index 100% rename from deluge/data/pixmaps/flags/ls.png rename to deluge/ui/data/pixmaps/flags/ls.png diff --git a/deluge/data/pixmaps/flags/lt.png b/deluge/ui/data/pixmaps/flags/lt.png similarity index 100% rename from deluge/data/pixmaps/flags/lt.png rename to deluge/ui/data/pixmaps/flags/lt.png diff --git a/deluge/data/pixmaps/flags/lu.png b/deluge/ui/data/pixmaps/flags/lu.png similarity index 100% rename from deluge/data/pixmaps/flags/lu.png rename to deluge/ui/data/pixmaps/flags/lu.png diff --git a/deluge/data/pixmaps/flags/lv.png b/deluge/ui/data/pixmaps/flags/lv.png similarity index 100% rename from deluge/data/pixmaps/flags/lv.png rename to deluge/ui/data/pixmaps/flags/lv.png diff --git a/deluge/data/pixmaps/flags/ly.png b/deluge/ui/data/pixmaps/flags/ly.png similarity index 100% rename from deluge/data/pixmaps/flags/ly.png rename to deluge/ui/data/pixmaps/flags/ly.png diff --git a/deluge/data/pixmaps/flags/ma.png b/deluge/ui/data/pixmaps/flags/ma.png similarity index 100% rename from deluge/data/pixmaps/flags/ma.png rename to deluge/ui/data/pixmaps/flags/ma.png diff --git a/deluge/data/pixmaps/flags/mc.png b/deluge/ui/data/pixmaps/flags/mc.png similarity index 100% rename from deluge/data/pixmaps/flags/mc.png rename to deluge/ui/data/pixmaps/flags/mc.png diff --git a/deluge/data/pixmaps/flags/md.png b/deluge/ui/data/pixmaps/flags/md.png similarity index 100% rename from deluge/data/pixmaps/flags/md.png rename to deluge/ui/data/pixmaps/flags/md.png diff --git a/deluge/data/pixmaps/flags/me.png b/deluge/ui/data/pixmaps/flags/me.png similarity index 100% rename from deluge/data/pixmaps/flags/me.png rename to deluge/ui/data/pixmaps/flags/me.png diff --git a/deluge/data/pixmaps/flags/mg.png b/deluge/ui/data/pixmaps/flags/mg.png similarity index 100% rename from deluge/data/pixmaps/flags/mg.png rename to deluge/ui/data/pixmaps/flags/mg.png diff --git a/deluge/data/pixmaps/flags/mh.png b/deluge/ui/data/pixmaps/flags/mh.png similarity index 100% rename from deluge/data/pixmaps/flags/mh.png rename to deluge/ui/data/pixmaps/flags/mh.png diff --git a/deluge/data/pixmaps/flags/mk.png b/deluge/ui/data/pixmaps/flags/mk.png similarity index 100% rename from deluge/data/pixmaps/flags/mk.png rename to deluge/ui/data/pixmaps/flags/mk.png diff --git a/deluge/data/pixmaps/flags/ml.png b/deluge/ui/data/pixmaps/flags/ml.png similarity index 100% rename from deluge/data/pixmaps/flags/ml.png rename to deluge/ui/data/pixmaps/flags/ml.png diff --git a/deluge/data/pixmaps/flags/mm.png b/deluge/ui/data/pixmaps/flags/mm.png similarity index 100% rename from deluge/data/pixmaps/flags/mm.png rename to deluge/ui/data/pixmaps/flags/mm.png diff --git a/deluge/data/pixmaps/flags/mn.png b/deluge/ui/data/pixmaps/flags/mn.png similarity index 100% rename from deluge/data/pixmaps/flags/mn.png rename to deluge/ui/data/pixmaps/flags/mn.png diff --git a/deluge/data/pixmaps/flags/mo.png b/deluge/ui/data/pixmaps/flags/mo.png similarity index 100% rename from deluge/data/pixmaps/flags/mo.png rename to deluge/ui/data/pixmaps/flags/mo.png diff --git a/deluge/data/pixmaps/flags/mp.png b/deluge/ui/data/pixmaps/flags/mp.png similarity index 100% rename from deluge/data/pixmaps/flags/mp.png rename to deluge/ui/data/pixmaps/flags/mp.png diff --git a/deluge/data/pixmaps/flags/mq.png b/deluge/ui/data/pixmaps/flags/mq.png similarity index 100% rename from deluge/data/pixmaps/flags/mq.png rename to deluge/ui/data/pixmaps/flags/mq.png diff --git a/deluge/data/pixmaps/flags/mr.png b/deluge/ui/data/pixmaps/flags/mr.png similarity index 100% rename from deluge/data/pixmaps/flags/mr.png rename to deluge/ui/data/pixmaps/flags/mr.png diff --git a/deluge/data/pixmaps/flags/ms.png b/deluge/ui/data/pixmaps/flags/ms.png similarity index 100% rename from deluge/data/pixmaps/flags/ms.png rename to deluge/ui/data/pixmaps/flags/ms.png diff --git a/deluge/data/pixmaps/flags/mt.png b/deluge/ui/data/pixmaps/flags/mt.png similarity index 100% rename from deluge/data/pixmaps/flags/mt.png rename to deluge/ui/data/pixmaps/flags/mt.png diff --git a/deluge/data/pixmaps/flags/mu.png b/deluge/ui/data/pixmaps/flags/mu.png similarity index 100% rename from deluge/data/pixmaps/flags/mu.png rename to deluge/ui/data/pixmaps/flags/mu.png diff --git a/deluge/data/pixmaps/flags/mv.png b/deluge/ui/data/pixmaps/flags/mv.png similarity index 100% rename from deluge/data/pixmaps/flags/mv.png rename to deluge/ui/data/pixmaps/flags/mv.png diff --git a/deluge/data/pixmaps/flags/mw.png b/deluge/ui/data/pixmaps/flags/mw.png similarity index 100% rename from deluge/data/pixmaps/flags/mw.png rename to deluge/ui/data/pixmaps/flags/mw.png diff --git a/deluge/data/pixmaps/flags/mx.png b/deluge/ui/data/pixmaps/flags/mx.png similarity index 100% rename from deluge/data/pixmaps/flags/mx.png rename to deluge/ui/data/pixmaps/flags/mx.png diff --git a/deluge/data/pixmaps/flags/my.png b/deluge/ui/data/pixmaps/flags/my.png similarity index 100% rename from deluge/data/pixmaps/flags/my.png rename to deluge/ui/data/pixmaps/flags/my.png diff --git a/deluge/data/pixmaps/flags/mz.png b/deluge/ui/data/pixmaps/flags/mz.png similarity index 100% rename from deluge/data/pixmaps/flags/mz.png rename to deluge/ui/data/pixmaps/flags/mz.png diff --git a/deluge/data/pixmaps/flags/na.png b/deluge/ui/data/pixmaps/flags/na.png similarity index 100% rename from deluge/data/pixmaps/flags/na.png rename to deluge/ui/data/pixmaps/flags/na.png diff --git a/deluge/data/pixmaps/flags/nc.png b/deluge/ui/data/pixmaps/flags/nc.png similarity index 100% rename from deluge/data/pixmaps/flags/nc.png rename to deluge/ui/data/pixmaps/flags/nc.png diff --git a/deluge/data/pixmaps/flags/ne.png b/deluge/ui/data/pixmaps/flags/ne.png similarity index 100% rename from deluge/data/pixmaps/flags/ne.png rename to deluge/ui/data/pixmaps/flags/ne.png diff --git a/deluge/data/pixmaps/flags/nf.png b/deluge/ui/data/pixmaps/flags/nf.png similarity index 100% rename from deluge/data/pixmaps/flags/nf.png rename to deluge/ui/data/pixmaps/flags/nf.png diff --git a/deluge/data/pixmaps/flags/ng.png b/deluge/ui/data/pixmaps/flags/ng.png similarity index 100% rename from deluge/data/pixmaps/flags/ng.png rename to deluge/ui/data/pixmaps/flags/ng.png diff --git a/deluge/data/pixmaps/flags/ni.png b/deluge/ui/data/pixmaps/flags/ni.png similarity index 100% rename from deluge/data/pixmaps/flags/ni.png rename to deluge/ui/data/pixmaps/flags/ni.png diff --git a/deluge/data/pixmaps/flags/nl.png b/deluge/ui/data/pixmaps/flags/nl.png similarity index 100% rename from deluge/data/pixmaps/flags/nl.png rename to deluge/ui/data/pixmaps/flags/nl.png diff --git a/deluge/data/pixmaps/flags/no.png b/deluge/ui/data/pixmaps/flags/no.png similarity index 100% rename from deluge/data/pixmaps/flags/no.png rename to deluge/ui/data/pixmaps/flags/no.png diff --git a/deluge/data/pixmaps/flags/np.png b/deluge/ui/data/pixmaps/flags/np.png similarity index 100% rename from deluge/data/pixmaps/flags/np.png rename to deluge/ui/data/pixmaps/flags/np.png diff --git a/deluge/data/pixmaps/flags/nr.png b/deluge/ui/data/pixmaps/flags/nr.png similarity index 100% rename from deluge/data/pixmaps/flags/nr.png rename to deluge/ui/data/pixmaps/flags/nr.png diff --git a/deluge/data/pixmaps/flags/nu.png b/deluge/ui/data/pixmaps/flags/nu.png similarity index 100% rename from deluge/data/pixmaps/flags/nu.png rename to deluge/ui/data/pixmaps/flags/nu.png diff --git a/deluge/data/pixmaps/flags/nz.png b/deluge/ui/data/pixmaps/flags/nz.png similarity index 100% rename from deluge/data/pixmaps/flags/nz.png rename to deluge/ui/data/pixmaps/flags/nz.png diff --git a/deluge/data/pixmaps/flags/om.png b/deluge/ui/data/pixmaps/flags/om.png similarity index 100% rename from deluge/data/pixmaps/flags/om.png rename to deluge/ui/data/pixmaps/flags/om.png diff --git a/deluge/data/pixmaps/flags/pa.png b/deluge/ui/data/pixmaps/flags/pa.png similarity index 100% rename from deluge/data/pixmaps/flags/pa.png rename to deluge/ui/data/pixmaps/flags/pa.png diff --git a/deluge/data/pixmaps/flags/pe.png b/deluge/ui/data/pixmaps/flags/pe.png similarity index 100% rename from deluge/data/pixmaps/flags/pe.png rename to deluge/ui/data/pixmaps/flags/pe.png diff --git a/deluge/data/pixmaps/flags/pf.png b/deluge/ui/data/pixmaps/flags/pf.png similarity index 100% rename from deluge/data/pixmaps/flags/pf.png rename to deluge/ui/data/pixmaps/flags/pf.png diff --git a/deluge/data/pixmaps/flags/pg.png b/deluge/ui/data/pixmaps/flags/pg.png similarity index 100% rename from deluge/data/pixmaps/flags/pg.png rename to deluge/ui/data/pixmaps/flags/pg.png diff --git a/deluge/data/pixmaps/flags/ph.png b/deluge/ui/data/pixmaps/flags/ph.png similarity index 100% rename from deluge/data/pixmaps/flags/ph.png rename to deluge/ui/data/pixmaps/flags/ph.png diff --git a/deluge/data/pixmaps/flags/pk.png b/deluge/ui/data/pixmaps/flags/pk.png similarity index 100% rename from deluge/data/pixmaps/flags/pk.png rename to deluge/ui/data/pixmaps/flags/pk.png diff --git a/deluge/data/pixmaps/flags/pl.png b/deluge/ui/data/pixmaps/flags/pl.png similarity index 100% rename from deluge/data/pixmaps/flags/pl.png rename to deluge/ui/data/pixmaps/flags/pl.png diff --git a/deluge/data/pixmaps/flags/pm.png b/deluge/ui/data/pixmaps/flags/pm.png similarity index 100% rename from deluge/data/pixmaps/flags/pm.png rename to deluge/ui/data/pixmaps/flags/pm.png diff --git a/deluge/data/pixmaps/flags/pn.png b/deluge/ui/data/pixmaps/flags/pn.png similarity index 100% rename from deluge/data/pixmaps/flags/pn.png rename to deluge/ui/data/pixmaps/flags/pn.png diff --git a/deluge/data/pixmaps/flags/pr.png b/deluge/ui/data/pixmaps/flags/pr.png similarity index 100% rename from deluge/data/pixmaps/flags/pr.png rename to deluge/ui/data/pixmaps/flags/pr.png diff --git a/deluge/data/pixmaps/flags/ps.png b/deluge/ui/data/pixmaps/flags/ps.png similarity index 100% rename from deluge/data/pixmaps/flags/ps.png rename to deluge/ui/data/pixmaps/flags/ps.png diff --git a/deluge/data/pixmaps/flags/pt.png b/deluge/ui/data/pixmaps/flags/pt.png similarity index 100% rename from deluge/data/pixmaps/flags/pt.png rename to deluge/ui/data/pixmaps/flags/pt.png diff --git a/deluge/data/pixmaps/flags/pw.png b/deluge/ui/data/pixmaps/flags/pw.png similarity index 100% rename from deluge/data/pixmaps/flags/pw.png rename to deluge/ui/data/pixmaps/flags/pw.png diff --git a/deluge/data/pixmaps/flags/py.png b/deluge/ui/data/pixmaps/flags/py.png similarity index 100% rename from deluge/data/pixmaps/flags/py.png rename to deluge/ui/data/pixmaps/flags/py.png diff --git a/deluge/data/pixmaps/flags/qa.png b/deluge/ui/data/pixmaps/flags/qa.png similarity index 100% rename from deluge/data/pixmaps/flags/qa.png rename to deluge/ui/data/pixmaps/flags/qa.png diff --git a/deluge/data/pixmaps/flags/re.png b/deluge/ui/data/pixmaps/flags/re.png similarity index 100% rename from deluge/data/pixmaps/flags/re.png rename to deluge/ui/data/pixmaps/flags/re.png diff --git a/deluge/data/pixmaps/flags/ro.png b/deluge/ui/data/pixmaps/flags/ro.png similarity index 100% rename from deluge/data/pixmaps/flags/ro.png rename to deluge/ui/data/pixmaps/flags/ro.png diff --git a/deluge/data/pixmaps/flags/rs.png b/deluge/ui/data/pixmaps/flags/rs.png similarity index 100% rename from deluge/data/pixmaps/flags/rs.png rename to deluge/ui/data/pixmaps/flags/rs.png diff --git a/deluge/data/pixmaps/flags/ru.png b/deluge/ui/data/pixmaps/flags/ru.png similarity index 100% rename from deluge/data/pixmaps/flags/ru.png rename to deluge/ui/data/pixmaps/flags/ru.png diff --git a/deluge/data/pixmaps/flags/rw.png b/deluge/ui/data/pixmaps/flags/rw.png similarity index 100% rename from deluge/data/pixmaps/flags/rw.png rename to deluge/ui/data/pixmaps/flags/rw.png diff --git a/deluge/data/pixmaps/flags/sa.png b/deluge/ui/data/pixmaps/flags/sa.png similarity index 100% rename from deluge/data/pixmaps/flags/sa.png rename to deluge/ui/data/pixmaps/flags/sa.png diff --git a/deluge/data/pixmaps/flags/sb.png b/deluge/ui/data/pixmaps/flags/sb.png similarity index 100% rename from deluge/data/pixmaps/flags/sb.png rename to deluge/ui/data/pixmaps/flags/sb.png diff --git a/deluge/data/pixmaps/flags/sc.png b/deluge/ui/data/pixmaps/flags/sc.png similarity index 100% rename from deluge/data/pixmaps/flags/sc.png rename to deluge/ui/data/pixmaps/flags/sc.png diff --git a/deluge/data/pixmaps/flags/sd.png b/deluge/ui/data/pixmaps/flags/sd.png similarity index 100% rename from deluge/data/pixmaps/flags/sd.png rename to deluge/ui/data/pixmaps/flags/sd.png diff --git a/deluge/data/pixmaps/flags/se.png b/deluge/ui/data/pixmaps/flags/se.png similarity index 100% rename from deluge/data/pixmaps/flags/se.png rename to deluge/ui/data/pixmaps/flags/se.png diff --git a/deluge/data/pixmaps/flags/sg.png b/deluge/ui/data/pixmaps/flags/sg.png similarity index 100% rename from deluge/data/pixmaps/flags/sg.png rename to deluge/ui/data/pixmaps/flags/sg.png diff --git a/deluge/data/pixmaps/flags/sh.png b/deluge/ui/data/pixmaps/flags/sh.png similarity index 100% rename from deluge/data/pixmaps/flags/sh.png rename to deluge/ui/data/pixmaps/flags/sh.png diff --git a/deluge/data/pixmaps/flags/si.png b/deluge/ui/data/pixmaps/flags/si.png similarity index 100% rename from deluge/data/pixmaps/flags/si.png rename to deluge/ui/data/pixmaps/flags/si.png diff --git a/deluge/data/pixmaps/flags/sj.png b/deluge/ui/data/pixmaps/flags/sj.png similarity index 100% rename from deluge/data/pixmaps/flags/sj.png rename to deluge/ui/data/pixmaps/flags/sj.png diff --git a/deluge/data/pixmaps/flags/sk.png b/deluge/ui/data/pixmaps/flags/sk.png similarity index 100% rename from deluge/data/pixmaps/flags/sk.png rename to deluge/ui/data/pixmaps/flags/sk.png diff --git a/deluge/data/pixmaps/flags/sl.png b/deluge/ui/data/pixmaps/flags/sl.png similarity index 100% rename from deluge/data/pixmaps/flags/sl.png rename to deluge/ui/data/pixmaps/flags/sl.png diff --git a/deluge/data/pixmaps/flags/sm.png b/deluge/ui/data/pixmaps/flags/sm.png similarity index 100% rename from deluge/data/pixmaps/flags/sm.png rename to deluge/ui/data/pixmaps/flags/sm.png diff --git a/deluge/data/pixmaps/flags/sn.png b/deluge/ui/data/pixmaps/flags/sn.png similarity index 100% rename from deluge/data/pixmaps/flags/sn.png rename to deluge/ui/data/pixmaps/flags/sn.png diff --git a/deluge/data/pixmaps/flags/so.png b/deluge/ui/data/pixmaps/flags/so.png similarity index 100% rename from deluge/data/pixmaps/flags/so.png rename to deluge/ui/data/pixmaps/flags/so.png diff --git a/deluge/data/pixmaps/flags/sr.png b/deluge/ui/data/pixmaps/flags/sr.png similarity index 100% rename from deluge/data/pixmaps/flags/sr.png rename to deluge/ui/data/pixmaps/flags/sr.png diff --git a/deluge/data/pixmaps/flags/st.png b/deluge/ui/data/pixmaps/flags/st.png similarity index 100% rename from deluge/data/pixmaps/flags/st.png rename to deluge/ui/data/pixmaps/flags/st.png diff --git a/deluge/data/pixmaps/flags/sv.png b/deluge/ui/data/pixmaps/flags/sv.png similarity index 100% rename from deluge/data/pixmaps/flags/sv.png rename to deluge/ui/data/pixmaps/flags/sv.png diff --git a/deluge/data/pixmaps/flags/sy.png b/deluge/ui/data/pixmaps/flags/sy.png similarity index 100% rename from deluge/data/pixmaps/flags/sy.png rename to deluge/ui/data/pixmaps/flags/sy.png diff --git a/deluge/data/pixmaps/flags/sz.png b/deluge/ui/data/pixmaps/flags/sz.png similarity index 100% rename from deluge/data/pixmaps/flags/sz.png rename to deluge/ui/data/pixmaps/flags/sz.png diff --git a/deluge/data/pixmaps/flags/tc.png b/deluge/ui/data/pixmaps/flags/tc.png similarity index 100% rename from deluge/data/pixmaps/flags/tc.png rename to deluge/ui/data/pixmaps/flags/tc.png diff --git a/deluge/data/pixmaps/flags/td.png b/deluge/ui/data/pixmaps/flags/td.png similarity index 100% rename from deluge/data/pixmaps/flags/td.png rename to deluge/ui/data/pixmaps/flags/td.png diff --git a/deluge/data/pixmaps/flags/tf.png b/deluge/ui/data/pixmaps/flags/tf.png similarity index 100% rename from deluge/data/pixmaps/flags/tf.png rename to deluge/ui/data/pixmaps/flags/tf.png diff --git a/deluge/data/pixmaps/flags/tg.png b/deluge/ui/data/pixmaps/flags/tg.png similarity index 100% rename from deluge/data/pixmaps/flags/tg.png rename to deluge/ui/data/pixmaps/flags/tg.png diff --git a/deluge/data/pixmaps/flags/th.png b/deluge/ui/data/pixmaps/flags/th.png similarity index 100% rename from deluge/data/pixmaps/flags/th.png rename to deluge/ui/data/pixmaps/flags/th.png diff --git a/deluge/data/pixmaps/flags/tj.png b/deluge/ui/data/pixmaps/flags/tj.png similarity index 100% rename from deluge/data/pixmaps/flags/tj.png rename to deluge/ui/data/pixmaps/flags/tj.png diff --git a/deluge/data/pixmaps/flags/tk.png b/deluge/ui/data/pixmaps/flags/tk.png similarity index 100% rename from deluge/data/pixmaps/flags/tk.png rename to deluge/ui/data/pixmaps/flags/tk.png diff --git a/deluge/data/pixmaps/flags/tl.png b/deluge/ui/data/pixmaps/flags/tl.png similarity index 100% rename from deluge/data/pixmaps/flags/tl.png rename to deluge/ui/data/pixmaps/flags/tl.png diff --git a/deluge/data/pixmaps/flags/tm.png b/deluge/ui/data/pixmaps/flags/tm.png similarity index 100% rename from deluge/data/pixmaps/flags/tm.png rename to deluge/ui/data/pixmaps/flags/tm.png diff --git a/deluge/data/pixmaps/flags/tn.png b/deluge/ui/data/pixmaps/flags/tn.png similarity index 100% rename from deluge/data/pixmaps/flags/tn.png rename to deluge/ui/data/pixmaps/flags/tn.png diff --git a/deluge/data/pixmaps/flags/to.png b/deluge/ui/data/pixmaps/flags/to.png similarity index 100% rename from deluge/data/pixmaps/flags/to.png rename to deluge/ui/data/pixmaps/flags/to.png diff --git a/deluge/data/pixmaps/flags/tp.png b/deluge/ui/data/pixmaps/flags/tp.png similarity index 100% rename from deluge/data/pixmaps/flags/tp.png rename to deluge/ui/data/pixmaps/flags/tp.png diff --git a/deluge/data/pixmaps/flags/tr.png b/deluge/ui/data/pixmaps/flags/tr.png similarity index 100% rename from deluge/data/pixmaps/flags/tr.png rename to deluge/ui/data/pixmaps/flags/tr.png diff --git a/deluge/data/pixmaps/flags/tt.png b/deluge/ui/data/pixmaps/flags/tt.png similarity index 100% rename from deluge/data/pixmaps/flags/tt.png rename to deluge/ui/data/pixmaps/flags/tt.png diff --git a/deluge/data/pixmaps/flags/tv.png b/deluge/ui/data/pixmaps/flags/tv.png similarity index 100% rename from deluge/data/pixmaps/flags/tv.png rename to deluge/ui/data/pixmaps/flags/tv.png diff --git a/deluge/data/pixmaps/flags/tw.png b/deluge/ui/data/pixmaps/flags/tw.png similarity index 100% rename from deluge/data/pixmaps/flags/tw.png rename to deluge/ui/data/pixmaps/flags/tw.png diff --git a/deluge/data/pixmaps/flags/tz.png b/deluge/ui/data/pixmaps/flags/tz.png similarity index 100% rename from deluge/data/pixmaps/flags/tz.png rename to deluge/ui/data/pixmaps/flags/tz.png diff --git a/deluge/data/pixmaps/flags/ua.png b/deluge/ui/data/pixmaps/flags/ua.png similarity index 100% rename from deluge/data/pixmaps/flags/ua.png rename to deluge/ui/data/pixmaps/flags/ua.png diff --git a/deluge/data/pixmaps/flags/ug.png b/deluge/ui/data/pixmaps/flags/ug.png similarity index 100% rename from deluge/data/pixmaps/flags/ug.png rename to deluge/ui/data/pixmaps/flags/ug.png diff --git a/deluge/data/pixmaps/flags/um.png b/deluge/ui/data/pixmaps/flags/um.png similarity index 100% rename from deluge/data/pixmaps/flags/um.png rename to deluge/ui/data/pixmaps/flags/um.png diff --git a/deluge/data/pixmaps/flags/us.png b/deluge/ui/data/pixmaps/flags/us.png similarity index 100% rename from deluge/data/pixmaps/flags/us.png rename to deluge/ui/data/pixmaps/flags/us.png diff --git a/deluge/data/pixmaps/flags/uy.png b/deluge/ui/data/pixmaps/flags/uy.png similarity index 100% rename from deluge/data/pixmaps/flags/uy.png rename to deluge/ui/data/pixmaps/flags/uy.png diff --git a/deluge/data/pixmaps/flags/uz.png b/deluge/ui/data/pixmaps/flags/uz.png similarity index 100% rename from deluge/data/pixmaps/flags/uz.png rename to deluge/ui/data/pixmaps/flags/uz.png diff --git a/deluge/data/pixmaps/flags/va.png b/deluge/ui/data/pixmaps/flags/va.png similarity index 100% rename from deluge/data/pixmaps/flags/va.png rename to deluge/ui/data/pixmaps/flags/va.png diff --git a/deluge/data/pixmaps/flags/vc.png b/deluge/ui/data/pixmaps/flags/vc.png similarity index 100% rename from deluge/data/pixmaps/flags/vc.png rename to deluge/ui/data/pixmaps/flags/vc.png diff --git a/deluge/data/pixmaps/flags/ve.png b/deluge/ui/data/pixmaps/flags/ve.png similarity index 100% rename from deluge/data/pixmaps/flags/ve.png rename to deluge/ui/data/pixmaps/flags/ve.png diff --git a/deluge/data/pixmaps/flags/vg.png b/deluge/ui/data/pixmaps/flags/vg.png similarity index 100% rename from deluge/data/pixmaps/flags/vg.png rename to deluge/ui/data/pixmaps/flags/vg.png diff --git a/deluge/data/pixmaps/flags/vi.png b/deluge/ui/data/pixmaps/flags/vi.png similarity index 100% rename from deluge/data/pixmaps/flags/vi.png rename to deluge/ui/data/pixmaps/flags/vi.png diff --git a/deluge/data/pixmaps/flags/vn.png b/deluge/ui/data/pixmaps/flags/vn.png similarity index 100% rename from deluge/data/pixmaps/flags/vn.png rename to deluge/ui/data/pixmaps/flags/vn.png diff --git a/deluge/data/pixmaps/flags/vu.png b/deluge/ui/data/pixmaps/flags/vu.png similarity index 100% rename from deluge/data/pixmaps/flags/vu.png rename to deluge/ui/data/pixmaps/flags/vu.png diff --git a/deluge/data/pixmaps/flags/wf.png b/deluge/ui/data/pixmaps/flags/wf.png similarity index 100% rename from deluge/data/pixmaps/flags/wf.png rename to deluge/ui/data/pixmaps/flags/wf.png diff --git a/deluge/data/pixmaps/flags/ws.png b/deluge/ui/data/pixmaps/flags/ws.png similarity index 100% rename from deluge/data/pixmaps/flags/ws.png rename to deluge/ui/data/pixmaps/flags/ws.png diff --git a/deluge/data/pixmaps/flags/ye.png b/deluge/ui/data/pixmaps/flags/ye.png similarity index 100% rename from deluge/data/pixmaps/flags/ye.png rename to deluge/ui/data/pixmaps/flags/ye.png diff --git a/deluge/data/pixmaps/flags/yt.png b/deluge/ui/data/pixmaps/flags/yt.png similarity index 100% rename from deluge/data/pixmaps/flags/yt.png rename to deluge/ui/data/pixmaps/flags/yt.png diff --git a/deluge/data/pixmaps/flags/yu.png b/deluge/ui/data/pixmaps/flags/yu.png similarity index 100% rename from deluge/data/pixmaps/flags/yu.png rename to deluge/ui/data/pixmaps/flags/yu.png diff --git a/deluge/data/pixmaps/flags/za.png b/deluge/ui/data/pixmaps/flags/za.png similarity index 100% rename from deluge/data/pixmaps/flags/za.png rename to deluge/ui/data/pixmaps/flags/za.png diff --git a/deluge/data/pixmaps/flags/zm.png b/deluge/ui/data/pixmaps/flags/zm.png similarity index 100% rename from deluge/data/pixmaps/flags/zm.png rename to deluge/ui/data/pixmaps/flags/zm.png diff --git a/deluge/data/pixmaps/flags/zw.png b/deluge/ui/data/pixmaps/flags/zw.png similarity index 100% rename from deluge/data/pixmaps/flags/zw.png rename to deluge/ui/data/pixmaps/flags/zw.png diff --git a/deluge/data/pixmaps/inactive.svg b/deluge/ui/data/pixmaps/inactive.svg similarity index 100% rename from deluge/data/pixmaps/inactive.svg rename to deluge/ui/data/pixmaps/inactive.svg diff --git a/deluge/data/pixmaps/inactive16.png b/deluge/ui/data/pixmaps/inactive16.png similarity index 100% rename from deluge/data/pixmaps/inactive16.png rename to deluge/ui/data/pixmaps/inactive16.png diff --git a/deluge/data/pixmaps/loading.gif b/deluge/ui/data/pixmaps/loading.gif similarity index 100% rename from deluge/data/pixmaps/loading.gif rename to deluge/ui/data/pixmaps/loading.gif diff --git a/deluge/data/pixmaps/lock48.png b/deluge/ui/data/pixmaps/lock48.png similarity index 100% rename from deluge/data/pixmaps/lock48.png rename to deluge/ui/data/pixmaps/lock48.png diff --git a/deluge/data/pixmaps/magnet.png b/deluge/ui/data/pixmaps/magnet.png similarity index 100% rename from deluge/data/pixmaps/magnet.png rename to deluge/ui/data/pixmaps/magnet.png diff --git a/deluge/data/pixmaps/queued.svg b/deluge/ui/data/pixmaps/queued.svg similarity index 100% rename from deluge/data/pixmaps/queued.svg rename to deluge/ui/data/pixmaps/queued.svg diff --git a/deluge/data/pixmaps/queued16.png b/deluge/ui/data/pixmaps/queued16.png similarity index 100% rename from deluge/data/pixmaps/queued16.png rename to deluge/ui/data/pixmaps/queued16.png diff --git a/deluge/data/pixmaps/seeding.svg b/deluge/ui/data/pixmaps/seeding.svg similarity index 100% rename from deluge/data/pixmaps/seeding.svg rename to deluge/ui/data/pixmaps/seeding.svg diff --git a/deluge/data/pixmaps/seeding16.png b/deluge/ui/data/pixmaps/seeding16.png similarity index 100% rename from deluge/data/pixmaps/seeding16.png rename to deluge/ui/data/pixmaps/seeding16.png diff --git a/deluge/data/pixmaps/tracker_all16.png b/deluge/ui/data/pixmaps/tracker_all16.png similarity index 100% rename from deluge/data/pixmaps/tracker_all16.png rename to deluge/ui/data/pixmaps/tracker_all16.png diff --git a/deluge/data/pixmaps/tracker_warning16.png b/deluge/ui/data/pixmaps/tracker_warning16.png similarity index 100% rename from deluge/data/pixmaps/tracker_warning16.png rename to deluge/ui/data/pixmaps/tracker_warning16.png diff --git a/deluge/data/pixmaps/traffic.svg b/deluge/ui/data/pixmaps/traffic.svg similarity index 100% rename from deluge/data/pixmaps/traffic.svg rename to deluge/ui/data/pixmaps/traffic.svg diff --git a/deluge/data/pixmaps/traffic16.png b/deluge/ui/data/pixmaps/traffic16.png similarity index 100% rename from deluge/data/pixmaps/traffic16.png rename to deluge/ui/data/pixmaps/traffic16.png diff --git a/deluge/data/share/applications/deluge.desktop b/deluge/ui/data/share/applications/deluge.desktop similarity index 100% rename from deluge/data/share/applications/deluge.desktop rename to deluge/ui/data/share/applications/deluge.desktop diff --git a/setup.py b/setup.py index b065c1f08..113be4c0d 100644 --- a/setup.py +++ b/setup.py @@ -401,21 +401,21 @@ cmdclass = { # Data files to be installed to the system _data_files = [ - ('share/icons/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']), - ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']), - ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']), - ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']), - ('share/icons/hicolor/22x22/apps', ['deluge/data/icons/hicolor/22x22/apps/deluge.png']), - ('share/icons/hicolor/24x24/apps', ['deluge/data/icons/hicolor/24x24/apps/deluge.png']), - ('share/icons/hicolor/256x256/apps', ['deluge/data/icons/hicolor/256x256/apps/deluge.png']), - ('share/icons/hicolor/32x32/apps', ['deluge/data/icons/hicolor/32x32/apps/deluge.png']), - ('share/icons/hicolor/36x36/apps', ['deluge/data/icons/hicolor/36x36/apps/deluge.png']), - ('share/icons/hicolor/48x48/apps', ['deluge/data/icons/hicolor/48x48/apps/deluge.png']), - ('share/icons/hicolor/64x64/apps', ['deluge/data/icons/hicolor/64x64/apps/deluge.png']), - ('share/icons/hicolor/72x72/apps', ['deluge/data/icons/hicolor/72x72/apps/deluge.png']), - ('share/icons/hicolor/96x96/apps', ['deluge/data/icons/hicolor/96x96/apps/deluge.png']), - ('share/applications', ['deluge/data/share/applications/deluge.desktop']), - ('share/pixmaps', ['deluge/data/pixmaps/deluge.png', 'deluge/data/pixmaps/deluge.xpm']), + ('share/icons/scalable/apps', ['deluge/ui/data/icons/scalable/apps/deluge.svg']), + ('share/icons/hicolor/128x128/apps', ['deluge/ui/data/icons/hicolor/128x128/apps/deluge.png']), + ('share/icons/hicolor/16x16/apps', ['deluge/ui/data/icons/hicolor/16x16/apps/deluge.png']), + ('share/icons/hicolor/192x192/apps', ['deluge/ui/data/icons/hicolor/192x192/apps/deluge.png']), + ('share/icons/hicolor/22x22/apps', ['deluge/ui/data/icons/hicolor/22x22/apps/deluge.png']), + ('share/icons/hicolor/24x24/apps', ['deluge/ui/data/icons/hicolor/24x24/apps/deluge.png']), + ('share/icons/hicolor/256x256/apps', ['deluge/ui/data/icons/hicolor/256x256/apps/deluge.png']), + ('share/icons/hicolor/32x32/apps', ['deluge/ui/data/icons/hicolor/32x32/apps/deluge.png']), + ('share/icons/hicolor/36x36/apps', ['deluge/ui/data/icons/hicolor/36x36/apps/deluge.png']), + ('share/icons/hicolor/48x48/apps', ['deluge/ui/data/icons/hicolor/48x48/apps/deluge.png']), + ('share/icons/hicolor/64x64/apps', ['deluge/ui/data/icons/hicolor/64x64/apps/deluge.png']), + ('share/icons/hicolor/72x72/apps', ['deluge/ui/data/icons/hicolor/72x72/apps/deluge.png']), + ('share/icons/hicolor/96x96/apps', ['deluge/ui/data/icons/hicolor/96x96/apps/deluge.png']), + ('share/applications', ['deluge/ui/data/share/applications/deluge.desktop']), + ('share/pixmaps', ['deluge/ui/data/pixmaps/deluge.png', 'deluge/ui/data/pixmaps/deluge.xpm']), ('share/man/man1', [ 'docs/man/deluge.1', 'docs/man/deluged.1', @@ -461,11 +461,11 @@ setup( ext_package = "deluge", ext_modules = _ext_modules, package_data = {"deluge": ["ui/gtkui/glade/*.glade", - "data/pixmaps/*.png", - "data/pixmaps/*.svg", - "data/pixmaps/*.ico", - "data/pixmaps/*.gif", - "data/pixmaps/flags/*.png", + "ui/data/pixmaps/*.png", + "ui/data/pixmaps/*.svg", + "ui/data/pixmaps/*.ico", + "ui/data/pixmaps/*.gif", + "ui/data/pixmaps/flags/*.png", "plugins/*.egg", "i18n/*.pot", "i18n/*/LC_MESSAGES/*.mo",