diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py
index 7447c7c6a..cd975db02 100644
--- a/openlp/core/projectors/manager.py
+++ b/openlp/core/projectors/manager.py
@@ -50,25 +50,6 @@ log = logging.getLogger(__name__)
log.debug('projectormanager loaded')
-# Dict for matching projector status to display icon
-STATUS_ICONS = {
- S_NOT_CONNECTED: ':/projector/projector_item_disconnect.png',
- S_CONNECTING: ':/projector/projector_item_connect.png',
- S_CONNECTED: ':/projector/projector_off.png',
- S_OFF: ':/projector/projector_off.png',
- S_INITIALIZE: ':/projector/projector_off.png',
- S_STANDBY: ':/projector/projector_off.png',
- S_WARMUP: ':/projector/projector_warmup.png',
- S_ON: ':/projector/projector_on.png',
- S_COOLDOWN: ':/projector/projector_cooldown.png',
- E_ERROR: ':/projector/projector_error.png',
- E_NETWORK: ':/projector/projector_not_connected_error.png',
- E_AUTHENTICATION: ':/projector/projector_not_connected_error.png',
- E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png',
- E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png'
-}
-
-
class UiProjectorManager(object):
"""
UI part of the Projector Manager
@@ -295,6 +276,23 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM
self.projectordb = projectordb
self.projector_list = []
self.source_select_form = None
+ # Dict for matching projector status to display icon
+ self.self.status_icons = {
+ S_NOT_CONNECTED: UiIcons().projector_disconnect,
+ S_CONNECTING: UiIcons().projector_connect,
+ S_CONNECTED: UiIcons().projector_off,
+ S_OFF: UiIcons().projector_off,
+ S_INITIALIZE: UiIcons().projector_on,
+ S_STANDBY: UiIcons().projector_off,
+ S_WARMUP: UiIcons().projector_warmup,
+ S_ON: UiIcons().projector_off,
+ S_COOLDOWN: UiIcons().projector_cooldown,
+ E_ERROR: UiIcons().projector_error,
+ E_NETWORK: ':/projector/projector_not_connected_error.png',
+ E_AUTHENTICATION: ':/projector/projector_not_connected_error.png',
+ E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png',
+ E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png'
+ }
def bootstrap_initialise(self):
"""
@@ -715,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(STATUS_ICONS[S_NOT_CONNECTED]))
+ item.icon = QtGui.QIcon(QtGui.QPixmap(self.status_icons[S_NOT_CONNECTED]))
widget = QtWidgets.QListWidgetItem(item.icon,
item.link.name,
self.projector_list_widget
@@ -802,7 +800,7 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM
return
item.status = status
- item.icon = QtGui.QIcon(QtGui.QPixmap(STATUS_ICONS[status]))
+ item.icon = QtGui.QIcon(QtGui.QPixmap(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/ui/icons.py b/openlp/core/ui/icons.py
index 1d29ec6f9..2933dbb6a 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -115,9 +115,9 @@ class UiIcons(object):
'projector_cooldown': {'icon': 'fa.video', 'attr': 'blue'},
'projector_disconnect': {'icon': 'fa.plug', 'attr': 'lightGray'},
'projector_error': {'icon': 'fa.video', 'attr': 'red'},
- 'projector_off': {'icon': 'fa.video', 'attr': 'red'},
+ 'projector_off': {'icon': 'fa.video', 'attr': 'black'},
'projector_on': {'icon': 'fa.video', 'attr': 'green'},
- 'projector_warm': {'icon': 'fa.video', 'attr': 'yellow'},
+ 'projector_warmup': {'icon': 'fa.video', 'attr': 'yellow'},
'picture': {'icon': 'fa.picture-o'},
'print': {'icon': 'fa.print'},
'remote': {'icon': 'fa.rss'},
@@ -161,6 +161,7 @@ class UiIcons(object):
except Exception:
import sys
print("Unexpected error:", sys.exc_info())
+ setattr(self, key, qta.icon('fa.plus-circle', color='red'))
except:
setattr(self, key, qta.icon('fa.plus-circle', color='red'))
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 81091d194..3ad440367 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -59,22 +59,15 @@
projector_connect.png
projector_connect_tiled.png
projector_hdmi.png
- projector_cooldown.png
projector_disconnect.png
projector_disconnect_tiled.png
- projector_error.png
- projector_item_connect.png
- projector_item_disconnect.png
projector_not_connected_error.png
- projector_off.png
- projector_on.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
- projector_warmup.png
app_qr.svg
diff --git a/resources/images/projector_cooldown.png b/resources/images/projector_cooldown.png
deleted file mode 100644
index c4a4140f5..000000000
Binary files a/resources/images/projector_cooldown.png and /dev/null differ
diff --git a/resources/images/projector_error.png b/resources/images/projector_error.png
deleted file mode 100644
index 6cfa3e86a..000000000
Binary files a/resources/images/projector_error.png and /dev/null differ
diff --git a/resources/images/projector_item_connect.png b/resources/images/projector_item_connect.png
deleted file mode 100644
index 6d5b27b5b..000000000
Binary files a/resources/images/projector_item_connect.png and /dev/null differ
diff --git a/resources/images/projector_item_disconnect.png b/resources/images/projector_item_disconnect.png
deleted file mode 100644
index 2981c5b9e..000000000
Binary files a/resources/images/projector_item_disconnect.png and /dev/null differ
diff --git a/resources/images/projector_off.png b/resources/images/projector_off.png
deleted file mode 100644
index 88e1ccb0c..000000000
Binary files a/resources/images/projector_off.png and /dev/null differ
diff --git a/resources/images/projector_on.png b/resources/images/projector_on.png
deleted file mode 100644
index 6555c7aac..000000000
Binary files a/resources/images/projector_on.png and /dev/null differ
diff --git a/resources/images/projector_warmup.png b/resources/images/projector_warmup.png
deleted file mode 100644
index b692bb6fa..000000000
Binary files a/resources/images/projector_warmup.png and /dev/null differ