diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py
index cd975db02..22cacdc20 100644
--- a/openlp/core/projectors/manager.py
+++ b/openlp/core/projectors/manager.py
@@ -108,21 +108,21 @@ class UiProjectorManager(object):
self.one_toolbar.add_toolbar_action('connect_projector_multiple',
text=translate('OpenLP.ProjectorManager',
'Connect to selected projectors'),
- icon=':/projector/projector_connect_tiled.png',
+ icon=UiIcons().projector_connect,
tooltip=translate('OpenLP.ProjectorManager',
'Connect to selected projectors.'),
triggers=self.on_connect_projector)
self.one_toolbar.add_toolbar_action('disconnect_projector',
text=translate('OpenLP.ProjectorManager',
'Disconnect from selected projectors'),
- icon=UiIcons().disconnect,
+ icon=UiIcons().projector_disconnect,
tooltip=translate('OpenLP.ProjectorManager',
'Disconnect from selected projector.'),
triggers=self.on_disconnect_projector)
self.one_toolbar.add_toolbar_action('disconnect_projector_multiple',
text=translate('OpenLP.ProjectorManager',
'Disconnect from selected projector'),
- icon=':/projector/projector_disconnect_tiled.png',
+ icon=UiIcons().projector_disconnect,
tooltip=translate('OpenLP.ProjectorManager',
'Disconnect from selected projectors.'),
triggers=self.on_disconnect_projector)
@@ -137,7 +137,7 @@ class UiProjectorManager(object):
self.one_toolbar.add_toolbar_action('poweron_projector_multiple',
text=translate('OpenLP.ProjectorManager',
'Power on selected projector'),
- icon=':/projector/projector_power_on_tiled.png',
+ icon=UiIcons().projector_on,
tooltip=translate('OpenLP.ProjectorManager',
'Power on selected projectors.'),
triggers=self.on_poweron_projector)
@@ -149,7 +149,7 @@ class UiProjectorManager(object):
triggers=self.on_poweroff_projector)
self.one_toolbar.add_toolbar_action('poweroff_projector_multiple',
text=translate('OpenLP.ProjectorManager', 'Standby selected projector'),
- icon=':/projector/projector_power_off_tiled.png',
+ icon=UiIcons().projector_off,
tooltip=translate('OpenLP.ProjectorManager',
'Put selected projectors in standby.'),
triggers=self.on_poweroff_projector)
@@ -164,21 +164,21 @@ class UiProjectorManager(object):
self.one_toolbar.add_toolbar_action('blank_projector_multiple',
text=translate('OpenLP.ProjectorManager',
'Blank selected projectors screen'),
- icon=':/projector/projector_blank_tiled.png',
+ icon=UiIcons().blank,
tooltip=translate('OpenLP.ProjectorManager',
'Blank selected projectors screen.'),
triggers=self.on_blank_projector)
self.one_toolbar.add_toolbar_action('show_projector',
text=translate('OpenLP.ProjectorManager',
'Show selected projector screen'),
- icon=':/projector/projector_show.png',
+ icon=UiIcons().desktop,
tooltip=translate('OpenLP.ProjectorManager',
'Show selected projector screen.'),
triggers=self.on_show_projector)
self.one_toolbar.add_toolbar_action('show_projector_multiple',
text=translate('OpenLP.ProjectorManager',
'Show selected projector screen'),
- icon=':/projector/projector_show_tiled.png',
+ icon=UiIcons().desktop,
tooltip=translate('OpenLP.ProjectorManager',
'Show selected projectors screen.'),
triggers=self.on_show_projector)
@@ -277,7 +277,7 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM
self.projector_list = []
self.source_select_form = None
# Dict for matching projector status to display icon
- self.self.status_icons = {
+ self.status_icons = {
S_NOT_CONNECTED: UiIcons().projector_disconnect,
S_CONNECTING: UiIcons().projector_connect,
S_CONNECTED: UiIcons().projector_off,
@@ -713,7 +713,7 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM
"""
item = ProjectorItem(link=self._add_projector(projector))
item.db_item = projector
- item.icon = QtGui.QIcon(QtGui.QPixmap(self.status_icons[S_NOT_CONNECTED]))
+ item.icon = QtGui.QIcon(self.status_icons[S_NOT_CONNECTED])
widget = QtWidgets.QListWidgetItem(item.icon,
item.link.name,
self.projector_list_widget
@@ -800,7 +800,7 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM
return
item.status = status
- item.icon = QtGui.QIcon(QtGui.QPixmap(self.status_icons[status]))
+ item.icon = self.status_icons[status]
log.debug('({name}) Updating icon with {code}'.format(name=item.link.name, code=STATUS_CODE[status]))
item.widget.setIcon(item.icon)
return self.update_icons()
diff --git a/openlp/core/projectors/tab.py b/openlp/core/projectors/tab.py
index 934a54a80..28efbf6e4 100644
--- a/openlp/core/projectors/tab.py
+++ b/openlp/core/projectors/tab.py
@@ -46,7 +46,7 @@ class ProjectorTab(SettingsTab):
:param parent: Parent widget
"""
- self.icon_path = UiIcons().projectore
+ self.icon_path = UiIcons().projector
projector_translated = translate('OpenLP.ProjectorTab', 'Projector')
super(ProjectorTab, self).__init__(parent, 'Projector', projector_translated)
diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index 55591ecd0..e24dc5b90 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -48,7 +48,7 @@ class Ui_ExceptionDialog(object):
self.message_layout.setContentsMargins(0, 0, 50, 0)
self.message_layout.addSpacing(12)
self.bug_label = QtWidgets.QLabel(exception_dialog)
- self.bug_label.setPixmap(QtGui.QPixmap(UiIcons().exception))
+ self.bug_label.setPixmap(UiIcons().exception.pixmap(40, 40))
self.bug_label.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
self.bug_label.setObjectName('bug_label')
self.message_layout.addWidget(self.bug_label)
diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index 2933dbb6a..b4ab5c8f8 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -112,12 +112,12 @@ class UiIcons(object):
'projector': {'icon': 'fa.video'},
'projector_blank': {'icon': 'fa.desktop'},
'projector_connect': {'icon': 'fa.plug'},
- 'projector_cooldown': {'icon': 'fa.video', 'attr': 'blue'},
+ 'projector_cooldown': {'icon': 'fa.video-camera', 'attr': 'blue'},
'projector_disconnect': {'icon': 'fa.plug', 'attr': 'lightGray'},
- 'projector_error': {'icon': 'fa.video', 'attr': 'red'},
- 'projector_off': {'icon': 'fa.video', 'attr': 'black'},
- 'projector_on': {'icon': 'fa.video', 'attr': 'green'},
- 'projector_warmup': {'icon': 'fa.video', 'attr': 'yellow'},
+ 'projector_error': {'icon': 'fa.video-camera', 'attr': 'red'},
+ 'projector_off': {'icon': 'fa.video-camera', 'attr': 'black'},
+ 'projector_on': {'icon': 'fa.video-camera', 'attr': 'green'},
+ 'projector_warmup': {'icon': 'fa.video-camera', 'attr': 'yellow'},
'picture': {'icon': 'fa.picture-o'},
'print': {'icon': 'fa.print'},
'remote': {'icon': 'fa.rss'},
@@ -149,13 +149,18 @@ class UiIcons(object):
'video': {'icon': 'fa.file-video-o'}
}
+ self.load_icons(self, icon_list)
+
+ def load_icons(self, icon_list):
+ """
+ Load the list of icons to be processed
+ """
for key in icon_list:
try:
icon = icon_list[key]['icon']
try:
attr = icon_list[key]['attr']
setattr(self, key, qta.icon(icon, color=attr))
- a = 1
except KeyError:
setattr(self, key, qta.icon(icon))
except Exception:
@@ -170,7 +175,7 @@ class UiIcons(object):
@staticmethod
def _print_icons():
"""
- Have ability to dump icons to see what is available. Can only run within an application
+ Have ability to dump icons to see what is actually available. Can only run within an application
:return:
"""
ico = qta._resource['iconic']
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 3ad440367..7290fafed 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -55,19 +55,13 @@
theme_new.png
- projector_blank_tiled.png
projector_connect.png
- projector_connect_tiled.png
projector_hdmi.png
projector_disconnect.png
- projector_disconnect_tiled.png
projector_not_connected_error.png
projector_power_off.png
- projector_power_off_tiled.png
projector_power_on.png
- projector_power_on_tiled.png
projector_show.png
- projector_show_tiled.png
app_qr.svg
diff --git a/resources/images/projector_blank_tiled.png b/resources/images/projector_blank_tiled.png
deleted file mode 100644
index f70fd8074..000000000
Binary files a/resources/images/projector_blank_tiled.png and /dev/null differ
diff --git a/resources/images/projector_connect_tiled.png b/resources/images/projector_connect_tiled.png
deleted file mode 100644
index 0030f6da9..000000000
Binary files a/resources/images/projector_connect_tiled.png and /dev/null differ
diff --git a/resources/images/projector_disconnect_tiled.png b/resources/images/projector_disconnect_tiled.png
deleted file mode 100644
index 714d1039b..000000000
Binary files a/resources/images/projector_disconnect_tiled.png and /dev/null differ
diff --git a/resources/images/projector_power_off_tiled.png b/resources/images/projector_power_off_tiled.png
deleted file mode 100644
index 69e4ae934..000000000
Binary files a/resources/images/projector_power_off_tiled.png and /dev/null differ
diff --git a/resources/images/projector_power_on_tiled.png b/resources/images/projector_power_on_tiled.png
deleted file mode 100644
index b38970c60..000000000
Binary files a/resources/images/projector_power_on_tiled.png and /dev/null differ
diff --git a/resources/images/projector_show_tiled.png b/resources/images/projector_show_tiled.png
deleted file mode 100644
index 9d7ff8d08..000000000
Binary files a/resources/images/projector_show_tiled.png and /dev/null differ
diff --git a/tests/functional/openlp_plugins/bibles/test_mediaitem.py b/tests/functional/openlp_plugins/bibles/test_mediaitem.py
index 549cc4b57..4508e864e 100755
--- a/tests/functional/openlp_plugins/bibles/test_mediaitem.py
+++ b/tests/functional/openlp_plugins/bibles/test_mediaitem.py
@@ -137,8 +137,7 @@ class TestMediaItem(TestCase, TestMixin):
Registry().register('main_window', self.mocked_main_window)
self.mocked_plugin = MagicMock()
- with patch('openlp.plugins.bibles.lib.mediaitem.build_icon'), \
- patch('openlp.plugins.bibles.lib.mediaitem.MediaManagerItem._setup'), \
+ with patch('openlp.plugins.bibles.lib.mediaitem.MediaManagerItem._setup'), \
patch('openlp.plugins.bibles.lib.mediaitem.BibleMediaItem.setup_item'):
self.media_item = BibleMediaItem(None, self.mocked_plugin)