more gone

openlp/core/ui/icons.py

@@ -97,6 +97,7 @@ class UiIcons(object):
             'picture': 'fa.picture-o',
             'print': 'fa.print',
             'remote': 'fa.rss',
+            'repeat': 'fa.repeat',
             'save': 'fa.save',
             'search': 'fa.search',
             'search_minus': 'fa.search-minus',

openlp/core/ui/media/mediacontroller.py

@@ -38,6 +38,7 @@ from openlp.core.common.settings import Settings
 from openlp.core.lib import ItemCapabilities
 from openlp.core.lib.ui import critical_error_message_box
 from openlp.core.ui import DisplayControllerType
+from openlp.core.ui.icons import UiIcons
 from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \
     parse_optical_path
 from openlp.core.ui.media.endpoint import media_endpoint
@@ -283,19 +284,19 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties):
         # Build a Media ToolBar
         controller.mediabar = OpenLPToolbar(controller)
         controller.mediabar.add_toolbar_action('playbackPlay', text='media_playback_play',
-                                               icon=':/slides/media_playback_start.png',
+                                               icon=UiIcons().play,
                                                tooltip=translate('OpenLP.SlideController', 'Start playing media.'),
                                                triggers=controller.send_to_plugins)
         controller.mediabar.add_toolbar_action('playbackPause', text='media_playback_pause',
-                                               icon=':/slides/media_playback_pause.png',
+                                               icon=UiIcons().pause,
                                                tooltip=translate('OpenLP.SlideController', 'Pause playing media.'),
                                                triggers=controller.send_to_plugins)
         controller.mediabar.add_toolbar_action('playbackStop', text='media_playback_stop',
-                                               icon=':/slides/media_playback_stop.png',
+                                               icon=UiIcons().stop,
                                                tooltip=translate('OpenLP.SlideController', 'Stop playing media.'),
                                                triggers=controller.send_to_plugins)
         controller.mediabar.add_toolbar_action('playbackLoop', text='media_playback_loop',
-                                               icon=':/media/media_repeat.png', checked=False,
+                                               icon=UiIcons().repeat, checked=False,
                                                tooltip=translate('OpenLP.SlideController', 'Loop playing media.'),
                                                triggers=controller.send_to_plugins)
         controller.position_label = QtWidgets.QLabel()

openlp/plugins/media/forms/mediaclipselectordialog.py

@@ -24,7 +24,7 @@
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
+from openlp.core.ui.icons import UiIcons
 
 
 class Ui_MediaClipSelector(object):
@@ -106,7 +106,7 @@ class Ui_MediaClipSelector(object):
         self.controls_layout = QtWidgets.QHBoxLayout()
         self.controls_layout.setObjectName('controls_layout')
         self.play_button = QtWidgets.QToolButton(media_clip_selector)
-        self.play_button.setIcon(build_icon(':/slides/media_playback_start.png'))
+        self.play_button.setIcon(UiIcons().play)
         self.play_button.setObjectName('play_button')
         self.controls_layout.addWidget(self.play_button)
         self.position_slider = QtWidgets.QSlider(media_clip_selector)

openlp/plugins/media/forms/mediaclipselectorform.py

@@ -25,13 +25,14 @@ import re
 from datetime import datetime
 from time import sleep
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common import is_win, is_linux, is_macosx
 from openlp.core.common.i18n import translate
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.path import Path
 from openlp.core.lib.ui import critical_error_message_box
+from openlp.core.ui.icons import UiIcons
 from openlp.core.ui.media.vlcplayer import get_vlc
 from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
 
@@ -66,12 +67,8 @@ class MediaClipSelectorForm(QtWidgets.QDialog, Ui_MediaClipSelector, RegistryPro
         self.media_item = media_item
         self.setupUi(self)
         # setup play/pause icon
-        self.play_icon = QtGui.QIcon()
+        self.play_icon = UiIcons().play
-        self.play_icon.addPixmap(QtGui.QPixmap(":/slides/media_playback_start.png"), QtGui.QIcon.Normal,
+        self.pause_icon = UiIcons().pause
-                                 QtGui.QIcon.Off)
-        self.pause_icon = QtGui.QIcon()
-        self.pause_icon.addPixmap(QtGui.QPixmap(":/slides/media_playback_pause.png"), QtGui.QIcon.Normal,
-                                  QtGui.QIcon.Off)
 
     def reject(self):
         """

openlp/plugins/presentations/lib/mediaitem.py

@@ -37,9 +37,6 @@ from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETY
 log = logging.getLogger(__name__)
 
 
-ERROR_IMAGE = QtGui.QImage(':/general/general_delete.png')
-
-
 class PresentationMediaItem(MediaManagerItem):
     """
     This is the Presentation media manager item for Presentation Items. It can present files using Openoffice and
@@ -175,7 +172,7 @@ class PresentationMediaItem(MediaManagerItem):
             file_name = file_path.name
             if not file_path.exists():
                 item_name = QtWidgets.QListWidgetItem(file_name)
-                item_name.setIcon(build_icon(ERROR_IMAGE))
+                item_name.setIcon(UiIcons().delete)
                 item_name.setData(QtCore.Qt.UserRole, path_to_str(file_path))
                 item_name.setToolTip(str(file_path))
                 self.list_view.addItem(item_name)

openlp/plugins/songs/forms/songselectdialog.py

@@ -26,7 +26,6 @@ The :mod:`~openlp.plugins.songs.forms.songselectdialog` module contains the user
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common.i18n import translate
-from openlp.core.lib import build_icon
 from openlp.core.ui import SingleColumnTableWidget
 from openlp.core.ui.icons import UiIcons
 from openlp.core.widgets.edits import HistoryComboBox
@@ -211,7 +210,7 @@ class Ui_SongSelectDialog(object):
                                                    QtWidgets.QSizePolicy.Minimum)
         self.import_layout.addItem(self.import_spacer)
         self.import_button = QtWidgets.QPushButton(self.song_page)
-        self.import_button.setIcon(build_icon(':/general/general_import.png'))
+        self.import_button.setIcon(UiIcons().download)
         self.import_button.setObjectName('import_button')
         self.import_layout.addWidget(self.import_button)
         self.song_layout.addLayout(self.import_layout, 5, 0, 1, 5)

resources/images/openlp-2.qrc

@@ -24,14 +24,9 @@
     <file>plugin_songusage.png</file>
   </qresource>
   <qresource prefix="general">
-    <file>general_delete.png</file>
-    <file>general_import.png</file>
     </qresource>
   <qresource prefix="slides">
     <file>slide_theme.png</file>
-    <file>media_playback_start.png</file>
-    <file>media_playback_stop.png</file>
-    <file>media_playback_pause.png</file>
     </qresource>
   <qresource prefix="icon">
     <file>openlp-logo.svg</file>
@@ -66,7 +61,6 @@
     </qresource>
   <qresource prefix="media">
     <file>media_time.png</file>
-    <file>media_repeat.png</file>
     <file>slidecontroller_multimedia.png</file>
     <file>auto-start_active.png</file>
     <file>auto-start_inactive.png</file>