more cleanups

openlp/core/ui/icons.py

@@ -59,6 +59,7 @@ class UiIcons(object):
             'arrow_right': 'fa.arrow-right',
             'arrow_up': 'fa.arrow-up',
             'address': 'fa.book',
+            'back': 'fa.step-backward',
             'bible': 'fa.book',
             'blank': 'fa.times-circle',
             'bottom': 'fa.angle-double-down',

openlp/core/ui/shortcutlistdialog.py

@@ -27,6 +27,7 @@ from PyQt5 import QtCore, QtWidgets
 from openlp.core.common.i18n import translate
 from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button_box
+from openlp.core.ui.icons import UiIcons
 
 
 class CaptureShortcutButton(QtWidgets.QPushButton):
@@ -101,23 +102,23 @@ class Ui_ShortcutListDialog(object):
         self.primary_push_button = CaptureShortcutButton(shortcutListDialog)
         self.primary_push_button.setObjectName('primary_push_button')
         self.primary_push_button.setMinimumSize(QtCore.QSize(84, 0))
-        self.primary_push_button.setIcon(build_icon(':/system/system_configure_shortcuts.png'))
+        self.primary_push_button.setIcon(UiIcons.shortcuts)
         self.primary_layout.addWidget(self.primary_push_button)
         self.clear_primary_button = QtWidgets.QToolButton(shortcutListDialog)
         self.clear_primary_button.setObjectName('clear_primary_button')
         self.clear_primary_button.setMinimumSize(QtCore.QSize(0, 16))
-        self.clear_primary_button.setIcon(build_icon(':/system/clear_shortcut.png'))
+        self.clear_primary_button.setIcon(UiIcons().settings)
         self.primary_layout.addWidget(self.clear_primary_button)
         self.details_layout.addLayout(self.primary_layout, 1, 1, 1, 1)
         self.alternate_layout = QtWidgets.QHBoxLayout()
         self.alternate_layout.setObjectName('alternate_layout')
         self.alternate_push_button = CaptureShortcutButton(shortcutListDialog)
         self.alternate_push_button.setObjectName('alternate_push_button')
-        self.alternate_push_button.setIcon(build_icon(':/system/system_configure_shortcuts.png'))
+        self.alternate_push_button.setIcon(UiIcons().settings)
         self.alternate_layout.addWidget(self.alternate_push_button)
         self.clear_alternate_button = QtWidgets.QToolButton(shortcutListDialog)
         self.clear_alternate_button.setObjectName('clear_alternate_button')
-        self.clear_alternate_button.setIcon(build_icon(':/system/clear_shortcut.png'))
+        self.clear_alternate_button.setIcon(UiIcons().settings)
         self.alternate_layout.addWidget(self.clear_alternate_button)
         self.details_layout.addLayout(self.alternate_layout, 1, 2, 1, 1)
         self.primary_label = QtWidgets.QLabel(shortcutListDialog)

openlp/core/widgets/edits.py

@@ -63,7 +63,7 @@ class SearchEdit(QtWidgets.QLineEdit):
         self.settings_section = settings_section
         self._current_search_type = -1
         self.clear_button = QtWidgets.QToolButton(self)
-        self.clear_button.setIcon(build_icon(':/system/clear_shortcut.png'))
+        self.clear_button.setIcon(UiIcons().shortcuts)
         self.clear_button.setCursor(QtCore.Qt.ArrowCursor)
         self.clear_button.setStyleSheet('QToolButton { border: none; padding: 0px; }')
         self.clear_button.resize(18, 18)
@@ -151,7 +151,7 @@ class SearchEdit(QtWidgets.QLineEdit):
             action.placeholder_text = placeholder
         if not hasattr(self, 'menu_button'):
             self.menu_button = QtWidgets.QToolButton(self)
-            self.menu_button.setIcon(build_icon(':/system/clear_shortcut.png'))
+            self.menu_button.setIcon(UiIcons().shortcuts)
             self.menu_button.setCursor(QtCore.Qt.ArrowCursor)
             self.menu_button.setPopupMode(QtWidgets.QToolButton.InstantPopup)
             self.menu_button.setStyleSheet('QToolButton { border: none; padding: 0px 10px 0px 0px; }')

openlp/plugins/bibles/lib/mediaitem.py

@@ -32,6 +32,7 @@ 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
+from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import SearchEdit
 from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm
 from openlp.plugins.bibles.forms.editbibleform import EditBibleForm
@@ -105,7 +106,7 @@ class BibleMediaItem(MediaManagerItem):
         :param kwargs: Keyword arguments to pass to the super method. (dict)
         """
         self.clear_icon = build_icon(':/bibles/bibles_search_clear.png')
-        self.save_results_icon = build_icon(':/bibles/bibles_save_results.png')
+        self.save_results_icon = UiIcons.save
         self.sort_icon = build_icon(':/bibles/bibles_book_sort.png')
         self.bible = None
         self.second_bible = None

openlp/plugins/songs/forms/songselectdialog.py

@@ -112,7 +112,7 @@ class Ui_SongSelectDialog(object):
         self.search_combobox.setObjectName('search_combobox')
         self.search_input_layout.addWidget(self.search_combobox)
         self.search_button = QtWidgets.QPushButton(self.search_page)
-        self.search_button.setIcon(build_icon(':/general/general_find.png'))
+        self.search_button.setIcon(UiIcons().search)
         self.search_button.setObjectName('search_button')
         self.search_input_layout.addWidget(self.search_button)
         self.search_layout.addLayout(self.search_input_layout)
@@ -149,7 +149,7 @@ class Ui_SongSelectDialog(object):
         self.view_spacer = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.view_layout.addItem(self.view_spacer)
         self.view_button = QtWidgets.QPushButton(self.search_page)
-        self.view_button.setIcon(build_icon(':/songs/song_search_all.png'))
+        self.view_button.setIcon(UiIcons().search)
         self.view_button.setObjectName('view_button')
         self.view_layout.addWidget(self.view_button)
         self.search_layout.addLayout(self.view_layout)
@@ -204,7 +204,7 @@ class Ui_SongSelectDialog(object):
         self.import_layout = QtWidgets.QHBoxLayout()
         self.import_layout.setObjectName('import_layout')
         self.back_button = QtWidgets.QPushButton(self.song_page)
-        self.back_button.setIcon(build_icon(':/general/general_back.png'))
+        self.back_button.setIcon(UiIcons().back)
         self.back_button.setObjectName('back_button')
         self.import_layout.addWidget(self.back_button)
         self.import_spacer = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding,

resources/images/openlp-2.qrc

@@ -1,6 +1,5 @@
 <RCC>
   <qresource prefix="songs">
-    <file>song_search_all.png</file>
     <file>song_search_author.png</file>
     <file>song_search_ccli.png</file>
     <file>song_search_lyrics.png</file>
@@ -20,8 +19,7 @@
     <file>bibles_search_text.png</file>
     <file>bibles_search_reference.png</file>
     <file>bibles_search_clear.png</file>
-    <file>bibles_save_results.png</file>
-  </qresource>
+    </qresource>
   <qresource prefix="plugins">
     <file>plugin_alerts.png</file>
     <file>plugin_songs.png</file>
@@ -30,9 +28,7 @@
   <qresource prefix="general">
     <file>general_delete.png</file>
     <file>general_import.png</file>
-    <file>general_find.png</file>
-    <file>general_back.png</file>
-  </qresource>
+    </qresource>
   <qresource prefix="slides">
     <file>slide_theme.png</file>
     <file>media_playback_start.png</file>
@@ -63,15 +59,13 @@
     </qresource>
   <qresource prefix="system">
     <file>system_close.png</file>
-    <file>clear_shortcut.png</file>
     <file>system_mediamanager.png</file>
     <file>system_volunteer.png</file>
     <file>system_servicemanager.png</file>
     <file>system_thememanager.png</file>
     <file>settings_plugin_list.png</file>
     <file>system_edit_copy.png</file>
-    <file>system_configure_shortcuts.png</file>
-  </qresource>
+    </qresource>
   <qresource prefix="media">
     <file>media_time.png</file>
     <file>media_audio.png</file>