Change namespace of other plugin icons.

openlp/plugins/bibles/bibleplugin.py

@@ -38,7 +38,7 @@ class BiblePlugin(Plugin):
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Bibles', u'1.9.2', plugin_helpers)
         self.weight = -9
-        self.icon = build_icon(u':/media/media_bible.png')
+        self.icon = build_icon(u':/plugins/plugin_bibles.png')
         #Register the bible Manager
         self.status = PluginStatus.Active
         self.manager = None
@@ -99,4 +99,4 @@ class BiblePlugin(Plugin):
     def can_delete_theme(self, theme):
         if self.settings_tab.bible_theme == theme:
             return False
-        return True
+        return True

openlp/plugins/custom/customplugin.py

@@ -50,7 +50,7 @@ class CustomPlugin(Plugin):
         self.weight = -5
         self.custommanager = Manager(u'custom', init_schema)
         self.edit_custom_form = EditCustomForm(self.custommanager)
-        self.icon = build_icon(u':/media/media_custom.png')
+        self.icon = build_icon(u':/plugins/plugin_custom.png')
         self.status = PluginStatus.Active
 
     def get_settings_tab(self):
@@ -82,4 +82,4 @@ class CustomPlugin(Plugin):
         if not self.custommanager.get_all_objects_filtered(CustomSlide,
             filter_string):
             return True
-        return False
+        return False

openlp/plugins/images/imageplugin.py

@@ -36,7 +36,7 @@ class ImagePlugin(Plugin):
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Images', u'1.9.2', plugin_helpers)
         self.weight = -7
-        self.icon = build_icon(u':/media/media_image.png')
+        self.icon = build_icon(u':/plugins/plugin_images.png')
         self.status = PluginStatus.Active
 
     def initialise(self):
@@ -64,4 +64,4 @@ class ImagePlugin(Plugin):
             'an image is selected any songs which are rendered will use the '
             'selected image from the background instead of the one provied by '
             'the theme.<br>')
-        return about_text
+        return about_text

openlp/plugins/media/mediaplugin.py

@@ -38,7 +38,7 @@ class MediaPlugin(Plugin):
     def __init__(self, plugin_helpers):
         Plugin.__init__(self, u'Media', u'1.9.2', plugin_helpers)
         self.weight = -6
-        self.icon = build_icon(u':/media/media_video.png')
+        self.icon = build_icon(u':/plugins/plugin_media.png')
         # passed with drag and drop messages
         self.dnd_id = u'Media'
         self.status = PluginStatus.Active

openlp/plugins/presentations/presentationplugin.py

@@ -40,7 +40,7 @@ class PresentationPlugin(Plugin):
         self.controllers = {}
         Plugin.__init__(self, u'Presentations', u'1.9.2', plugin_helpers)
         self.weight = -8
-        self.icon = build_icon(u':/media/media_presentation.png')
+        self.icon = build_icon(u':/plugins/plugin_presentations.png')
         self.status = PluginStatus.Active
 
     def get_settings_tab(self):

openlp/plugins/songs/songsplugin.py

@@ -57,7 +57,7 @@ class SongsPlugin(Plugin):
         Plugin.__init__(self, u'Songs', u'1.9.2', plugin_helpers)
         self.weight = -10
         self.manager = SongManager()
-        self.icon = build_icon(u':/media/media_song.png')
+        self.icon = build_icon(u':/plugins/plugin_songs.png')
         self.status = PluginStatus.Active
 
     def get_settings_tab(self):

resources/images/openlp-2.qrc

@@ -19,6 +19,12 @@
   </qresource>
   <qresource prefix="plugins">
     <file>plugin_alerts.png</file>
+    <file>plugin_bibles.png</file>
+    <file>plugin_custom.png</file>
+    <file>plugin_images.png</file>
+    <file>plugin_media.png</file>
+    <file>plugin_presentations.png</file>
+    <file>plugin_songs.png</file>
     <file>plugin_remote.png</file>
     <file>plugin_songusage.png</file>
   </qresource>
@@ -95,12 +101,6 @@
     <file>system_settings.png</file>
   </qresource>
   <qresource prefix="media">
-    <file>media_custom.png</file>
-    <file>media_presentation.png</file>
-    <file>media_image.png</file>
-    <file>media_song.png</file>
-    <file>media_bible.png</file>
-    <file>media_video.png</file>
     <file>media_time.png</file>
     <file>media_stop.png</file>
     <file>image_clapperboard.png</file>