more bits

openlp/core/ui/icons.py

@@ -100,16 +100,22 @@ class UiIcons(object):
             'repeat': {'icon': 'fa.repeat'},
             'save': {'icon': 'fa.save'},
             'search': {'icon': 'fa.search'},
+            'search_comb': {'icon': 'fa.columns'},
             'search_minus': {'icon': 'fa.search-minus'},
             'search_plus': {'icon': 'fa.search-plus'},
+            'search_ref': {'icon': 'fa.institution'},
             'settings': {'icon': 'fa.cogs'},
             'shortcuts': {'icon': 'fa.wrench'},
+            'sort': {'icon': 'fa.sort'},
             'stop': {'icon': 'fa.stop'},
+            'square': {'icon': 'fa.square'},
+            'text': {'icon': 'fa.file-text'},
             'theme': {'icon': 'fa.file-image-o'},
             'top': {'icon': 'fa.angle-double-up'},
             'undo': {'icon': 'fa.undo'},
             'upload': {'icon': 'fa.cloud-upload'},
             'user': {'icon': 'fa.user'},
+            'usermo': {'icon': 'fa.user-md'},
             'users': {'icon': 'fa.users'},
             'video': {'icon': 'fa.file-video-o'}
         }

openlp/plugins/bibles/lib/mediaitem.py

@@ -31,7 +31,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext
 from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \
-    critical_error_message_box, find_and_set_in_combo_box, build_icon
+    critical_error_message_box, find_and_set_in_combo_box
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import SearchEdit
 from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm
@@ -105,9 +105,9 @@ class BibleMediaItem(MediaManagerItem):
         :param args: Positional arguments to pass to the super method. (tuple)
         :param kwargs: Keyword arguments to pass to the super method. (dict)
         """
-        self.clear_icon = build_icon(':/bibles/bibles_search_clear.png')
+        self.clear_icon = UiIcons().square
         self.save_results_icon = UiIcons.save
-        self.sort_icon = build_icon(':/bibles/bibles_book_sort.png')
+        self.sort_icon = UiIcons().sort
         self.bible = None
         self.second_bible = None
         self.saved_results = []
@@ -315,13 +315,13 @@ class BibleMediaItem(MediaManagerItem):
         self.plugin.manager.media = self
         self.populate_bible_combo_boxes()
         self.search_edit.set_search_types([
-            (BibleSearch.Combined, ':/bibles/bibles_search_combined.png',
+            (BibleSearch.Combined, UiIcons().search_comb,
                 translate('BiblesPlugin.MediaItem', 'Text or Reference'),
                 translate('BiblesPlugin.MediaItem', 'Text or Reference...')),
-            (BibleSearch.Reference, ':/bibles/bibles_search_reference.png',
+            (BibleSearch.Reference, UiIcons().search_ref,
                 translate('BiblesPlugin.MediaItem', 'Scripture Reference'),
                 translate('BiblesPlugin.MediaItem', 'Search Scripture Reference...')),
-            (BibleSearch.Text, ':/bibles/bibles_search_text.png',
+            (BibleSearch.Text, UiIcons().text,
                 translate('BiblesPlugin.MediaItem', 'Text Search'),
                 translate('BiblesPlugin.MediaItem', 'Search Text...'))
         ])

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -48,7 +48,7 @@ class Ui_SongMaintenanceDialog(object):
         self.type_list_widget.setUniformItemSizes(True)
         self.type_list_widget.setObjectName('type_list_widget')
         self.authors_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
-        self.authors_list_item.setIcon(build_icon(':/songs/author_maintenance.png'))
+        self.authors_list_item.setIcon(UiIcons().usermo)
         self.topics_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
         self.topics_list_item.setIcon(build_icon(':/songs/topic_maintenance.png'))
         self.books_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)

resources/images/openlp-2.qrc

@@ -6,17 +6,11 @@
     <file>song_search_title.png</file>
     <file>song_search_topic.png</file>
     <file>book_maintenance.png</file>
-    <file>author_maintenance.png</file>
     <file>topic_maintenance.png</file>
     </qresource>
   <qresource prefix="images">
     </qresource>
   <qresource prefix="bibles">
-    <file>bibles_book_sort.png</file>
-    <file>bibles_search_combined.png</file>
-    <file>bibles_search_text.png</file>
-    <file>bibles_search_reference.png</file>
-    <file>bibles_search_clear.png</file>
     </qresource>
   <qresource prefix="plugins">
     <file>plugin_alerts.png</file>