more icons

openlp/core/api/tab.py

@@ -240,7 +240,6 @@ class ApiTab(SettingsTab):
         Settings().setValue(self.settings_section + '/authentication enabled', self.user_login_group_box.isChecked())
         Settings().setValue(self.settings_section + '/user id', self.user_id.text())
         Settings().setValue(self.settings_section + '/password', self.password.text())
-        self.generate_icon()
         if self.update_site_group_box.isChecked():
             self.settings_form.register_post_process('download_website')
 

openlp/core/ui/fonts/openlp-charmap.json

@@ -1,4 +1,7 @@
 {
     "users": "0041", 
-    "file-text": "0042"
+    "file-text": "0042",
+    "search-text": "0043",   
+    "search-lyrcs": "0044",   
+    "search-CCLI": "0045"       
 }

openlp/core/ui/icons.py

@@ -73,6 +73,7 @@ class UiIcons(object):
             'blank_theme': {'icon': 'fa.file-image-o'},
             'book': {'icon': 'fa.book'},
             'bottom': {'icon': 'fa.angle-double-down'},
+            'clapperboard': {'icon': 'fa.chess-board'},
             'clock': {'icon': 'fa.clock-o'},
             'clone': {'icon': 'fa.clone'},
             'close': {'icon': 'fa.times-circle-o'},
@@ -90,7 +91,7 @@ class UiIcons(object):
             'group': {'icon': 'fa.object-group'},
             'inactive': {'icon': 'fa.child', 'attr': 'lightGray'},
             'info': {'icon': 'fa.info'},
-            'lightbulb': {'icon': 'fa.lightbulb-o'},
+            'light_bulb': {'icon': 'fa.lightbulb-o'},
             'live': {'icon': 'fa.desktop'},
             'manual': {'icon': 'fa.graduation-cap'},
             'media': {'icon': 'fa.fax'},
@@ -103,6 +104,7 @@ class UiIcons(object):
             'optical': {'icon': 'fa.file-video-o'},
             'pause': {'icon': 'fa.pause'},
             'play': {'icon': 'fa.play'},
+            'player': {'icon': 'fa.tablet'},
             'plugin_list': {'icon': 'fa.puzzle-piece'},
             'plus': {'icon': 'fa.plus'},
             'presentation': {'icon': 'fa.bar-chart'},
@@ -113,10 +115,13 @@ class UiIcons(object):
             'repeat': {'icon': 'fa.repeat'},
             'save': {'icon': 'fa.save'},
             'search': {'icon': 'fa.search'},
+            'search_ccli': {'icon': 'op.search-CCLI'},
             'search_comb': {'icon': 'fa.columns'},
+            'search_lyrcs': {'icon': 'op.search-lyrcs'},
             'search_minus': {'icon': 'fa.search-minus'},
             'search_plus': {'icon': 'fa.search-plus'},
             'search_ref': {'icon': 'fa.institution'},
+            'search_text': {'icon': 'op.search-text'},
             'settings': {'icon': 'fa.cogs'},
             'shortcuts': {'icon': 'fa.wrench'},
             'song_usage': {'icon': 'fa.line-chart'},

openlp/core/ui/media/playertab.py

@@ -31,6 +31,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
 from openlp.core.lib import SettingsTab
 from openlp.core.lib.ui import create_button
+from openlp.core.ui.icons import UiIcons
 from openlp.core.ui.media import get_media_players, set_media_players
 from openlp.core.widgets.buttons import ColorButton
 
@@ -56,7 +57,7 @@ class PlayerTab(SettingsTab):
         """
         self.media_players = Registry().get('media_controller').media_players
         self.saved_used_players = None
-        self.icon_path = ':/media/multimedia-player.png'
+        self.icon_path = UiIcons().player
         player_translated = translate('OpenLP.PlayerTab', 'Players')
         super(PlayerTab, self).__init__(parent, 'Players', player_translated)
 

openlp/core/widgets/wizard.py

@@ -193,7 +193,7 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties):
         self.error_copy_to_button = QtWidgets.QPushButton(self.progress_page)
         self.error_copy_to_button.setObjectName('error_copy_to_button')
         self.error_copy_to_button.setHidden(True)
-        self.error_copy_to_button.setIcon(build_icon(':/system/system_edit_copy.png'))
+        self.error_copy_to_button.setIcon(UiIcons().copy)
         self.error_button_layout.addWidget(self.error_copy_to_button)
         self.error_save_to_button = QtWidgets.QPushButton(self.progress_page)
         self.error_save_to_button.setObjectName('error_save_to_button')

openlp/plugins/custom/lib/mediaitem.py

@@ -112,9 +112,9 @@ class CustomMediaItem(MediaManagerItem):
         Initialise the UI so it can provide Searches
         """
         self.search_text_edit.set_search_types(
-            [(CustomSearch.Titles, ':/songs/song_search_title.png', translate('SongsPlugin.MediaItem', 'Titles'),
+            [(CustomSearch.Titles, UiIcons().search, translate('SongsPlugin.MediaItem', 'Titles'),
               translate('SongsPlugin.MediaItem', 'Search Titles...')),
-             (CustomSearch.Themes, ':/slides/slide_theme.png', UiStrings().Themes, UiStrings().SearchThemes)])
+             (CustomSearch.Themes, UiIcons().theme, UiStrings().Themes, UiStrings().SearchThemes)])
         self.load_list(self.plugin.db_manager.get_all_objects(CustomSlide, order_by_ref=CustomSlide.title))
         self.config_update()
 

openlp/plugins/media/lib/mediaitem.py

@@ -46,7 +46,7 @@ if get_vlc() is not None:
 log = logging.getLogger(__name__)
 
 
-CLAPPERBOARD = ':/media/slidecontroller_multimedia.png'
+CLAPPERBOARD = UiIcons().clapperboard
 
 
 class MediaMediaItem(MediaManagerItem, RegistryProperties):

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -49,7 +49,7 @@ class Ui_SongMaintenanceDialog(object):
         self.authors_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
         self.authors_list_item.setIcon(UiIcons().usermo)
         self.topics_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
-        self.topics_list_item.setIcon(UiIcons().lightbulb)
+        self.topics_list_item.setIcon(UiIcons().light_bulb)
         self.books_list_item = QtWidgets.QListWidgetItem(self.type_list_widget)
         self.books_list_item.setIcon(UiIcons().book)
         self.dialog_layout.addWidget(self.type_list_widget, 0, 0)

openlp/plugins/songs/lib/mediaitem.py

@@ -149,23 +149,23 @@ class SongMediaItem(MediaManagerItem):
             (SongSearch.Entire, UiIcons().music,
                 translate('SongsPlugin.MediaItem', 'Entire Song'),
                 translate('SongsPlugin.MediaItem', 'Search Entire Song...')),
-            (SongSearch.Titles, ':/songs/song_search_title.png',
+            (SongSearch.Titles, UiIcons().search_text,
                 translate('SongsPlugin.MediaItem', 'Titles'),
                 translate('SongsPlugin.MediaItem', 'Search Titles...')),
-            (SongSearch.Lyrics, ':/songs/song_search_lyrics.png',
+            (SongSearch.Lyrics, UiIcons().search_lyrcs,
                 translate('SongsPlugin.MediaItem', 'Lyrics'),
                 translate('SongsPlugin.MediaItem', 'Search Lyrics...')),
-            (SongSearch.Authors, ':/songs/song_search_author.png', SongStrings.Authors,
+            (SongSearch.Authors, UiIcons().user, SongStrings.Authors,
                 translate('SongsPlugin.MediaItem', 'Search Authors...')),
-            (SongSearch.Topics, ':/songs/song_search_topic.png', SongStrings.Topics,
+            (SongSearch.Topics, UiIcons().theme, SongStrings.Topics,
                 translate('SongsPlugin.MediaItem', 'Search Topics...')),
             (SongSearch.Books, UiIcons().address, SongStrings.SongBooks,
                 translate('SongsPlugin.MediaItem', 'Search Songbooks...')),
-            (SongSearch.Themes, ':/slides/slide_theme.png', UiStrings().Themes, UiStrings().SearchThemes),
+            (SongSearch.Themes, UiIcons().theme, UiStrings().Themes, UiStrings().SearchThemes),
             (SongSearch.Copyright, UiIcons().copyright,
                 translate('SongsPlugin.MediaItem', 'Copyright'),
                 translate('SongsPlugin.MediaItem', 'Search Copyright...')),
-            (SongSearch.CCLInumber, ':/songs/song_search_ccli.png',
+            (SongSearch.CCLInumber, UiIcons().search_ccli,
                 translate('SongsPlugin.MediaItem', 'CCLI number'),
                 translate('SongsPlugin.MediaItem', 'Search CCLI number...'))
         ])

resources/images/openlp-2.qrc

@@ -1,10 +1,5 @@
 <RCC>
   <qresource prefix="songs">
-    <file>song_search_author.png</file>
-    <file>song_search_ccli.png</file>
-    <file>song_search_lyrics.png</file>
-    <file>song_search_title.png</file>
-    <file>song_search_topic.png</file>
     </qresource>
   <qresource prefix="images">
     </qresource>
@@ -43,12 +38,9 @@
     <file>system_volunteer.png</file>
     <file>system_servicemanager.png</file>
     <file>system_thememanager.png</file>
-    <file>system_edit_copy.png</file>
     </qresource>
   <qresource prefix="media">
-    <file>slidecontroller_multimedia.png</file>
-    <file>multimedia-player.png</file>
-  </qresource>
+    </qresource>
   <qresource prefix="messagebox">
     </qresource>
   <qresource prefix="remote">