Updating icons

diff --git a/data/Settings.png b/data/Settings.png
deleted file mode 100644 (file)
index 65445c9..0000000
Binary files a/data/Settings.png and /dev/null differ

diff --git a/data/about.png b/data/about.png
deleted file mode 100644 (file)
index 9bb439a..0000000
Binary files a/data/about.png and /dev/null differ

diff --git a/data/aboutcontent.png b/data/aboutcontent.png
deleted file mode 100644 (file)
index dd4879c..0000000
Binary files a/data/aboutcontent.png and /dev/null differ

diff --git a/data/conference_bg.png b/data/conference_bg.png
new file mode 100644 (file)
index 0000000..63bdac0
Binary files /dev/null and b/data/conference_bg.png differ

diff --git a/data/icon.png b/data/icon.png
index bf5bccd..e4949a6 100644 (file)
Binary files a/data/icon.png and b/data/icon.png differ

diff --git a/data/magazine_bg.png b/data/magazine_bg.png
new file mode 100644 (file)
index 0000000..7b8986e
Binary files /dev/null and b/data/magazine_bg.png differ

diff --git a/data/radio_header.png b/data/radio_header.png
new file mode 100644 (file)
index 0000000..39debe9
Binary files /dev/null and b/data/radio_header.png differ

diff --git a/data/radiobackground_01.png b/data/radiobackground_01.png
deleted file mode 100644 (file)
index b14f13d..0000000
Binary files a/data/radiobackground_01.png and /dev/null differ

diff --git a/data/radiobackground_02.png b/data/radiobackground_02.png
deleted file mode 100644 (file)
index 2b5af4b..0000000
Binary files a/data/radiobackground_02.png and /dev/null differ

diff --git a/data/radiobackground_03.png b/data/radiobackground_03.png
deleted file mode 100644 (file)
index f201658..0000000
Binary files a/data/radiobackground_03.png and /dev/null differ

diff --git a/data/radiobackground_04.png b/data/radiobackground_04.png
deleted file mode 100644 (file)
index 9866189..0000000
Binary files a/data/radiobackground_04.png and /dev/null differ

diff --git a/data/radiobackground_05.png b/data/radiobackground_05.png
deleted file mode 100644 (file)
index ba2609e..0000000
Binary files a/data/radiobackground_05.png and /dev/null differ

diff --git a/data/scriptures_bg.png b/data/scriptures_bg.png
new file mode 100644 (file)
index 0000000..9c103ab
Binary files /dev/null and b/data/scriptures_bg.png differ

diff --git a/data/settings-background.png b/data/settings-background.png
deleted file mode 100644 (file)
index b3b46c9..0000000
Binary files a/data/settings-background.png and /dev/null differ

diff --git a/hand_tests/fake_player.py b/hand_tests/fake_player.py
index d9c84cc..be955d2 100644 (file)
--- a/hand_tests/fake_player.py
+++ b/hand_tests/fake_player.py
@@ -70,7 +70,7 @@ class FakePlayer(gobject.GObject):
 
        @property
        def background(self):
-               return "night_temple_background"
+               return "conference_background"
 
        def _state_change(self, widget, state):
                self.emit("state_change", state)

diff --git a/src/imagestore.py b/src/imagestore.py
index cc2ea55..af0a1e2 100644 (file)
--- a/src/imagestore.py
+++ b/src/imagestore.py
@@ -13,11 +13,10 @@ class ImageStore(object):
                "play": "play.png",
                "stop": "stop.png",
 
-               "generic_background": "radiobackground_01.png",
-               "night_temple_background": "radiobackground_02.png",
-               "day_temple_background": "radiobackground_03.png",
-               "presidency_background": "radiobackground_04.png",
-               "scriptures_background": "radiobackground_05.png",
+               "radio_header": "radio_header.png",
+               "conference_background": "conference_bg.png",
+               "magazine_background": "magazine_bg.png",
+               "scriptures_background": "scripture_bg.png",
 
                "conferences": "conference.png",
                "magazines": "magazines.png",
@@ -42,3 +41,7 @@ class ImageStore(object):
                image = gtk.Image()
                image.set_from_file(path)
                return image
+
+       def get_pixbuf_from_store(self, image):
+               path = os.path.join(self._storePath, image)
+               return gtk.gdk.pixbuf_new_from_file(path)