diff --git a/openlp/core/common/i18n.py b/openlp/core/common/i18n.py
index a4abc01b7..301c27f44 100644
--- a/openlp/core/common/i18n.py
+++ b/openlp/core/common/i18n.py
@@ -589,6 +589,7 @@ class UiIcons(object):
self.default = qta.icon('fa.info-circle')
self.delete = qta.icon('fa.trash')
self.edit = qta.icon('fa.edit')
+ self.exit = qta.icon('fa.sign-out')
self.download = qta.icon('fa.cloud-download')
self.live = qta.icon('fa.camera')
self.minus = qta.icon('fa.minus')
@@ -603,6 +604,7 @@ class UiIcons(object):
self.print = qta.icon('fa.print')
#self.remote = qta.icon('fa.podcast')
self.save = qta.icon('fa.save')
+ self.settings = qta.icon('fa.cogs')
self.top = qta.icon('fa.angle-double-up')
self.upload = qta.icon('fa.cloud-upload')
self.user = qta.icon('fa.user')
diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py
index d676a0d85..3a8faca3b 100644
--- a/openlp/core/projectors/manager.py
+++ b/openlp/core/projectors/manager.py
@@ -29,7 +29,7 @@ import logging
from PyQt5 import QtCore, QtGui, QtWidgets
-from openlp.core.common.i18n import translate
+from openlp.core.common.i18n import UiIcons, translate
from openlp.core.common.mixins import LogMixin, RegistryProperties
from openlp.core.common.registry import RegistryBase
from openlp.core.common.settings import Settings
@@ -103,18 +103,18 @@ class UiProjectorManager(object):
self.one_toolbar = OpenLPToolbar(widget)
self.one_toolbar.add_toolbar_action('new_projector',
text=translate('OpenLP.ProjectorManager', 'Add Projector'),
- icon=':/projector/projector_new.png',
+ icon=UiIcons().new,
tooltip=translate('OpenLP.ProjectorManager', 'Add a new projector.'),
triggers=self.on_add_projector)
# Show edit/delete when projector not connected
self.one_toolbar.add_toolbar_action('edit_projector',
text=translate('OpenLP.ProjectorManager', 'Edit Projector'),
- icon=':/general/general_edit.png',
+ icon=UiIcons().edit,
tooltip=translate('OpenLP.ProjectorManager', 'Edit selected projector.'),
triggers=self.on_edit_projector)
self.one_toolbar.add_toolbar_action('delete_projector',
text=translate('OpenLP.ProjectorManager', 'Delete Projector'),
- icon=':/general/general_delete.png',
+ icon=UiIcons().delete,
tooltip=translate('OpenLP.ProjectorManager', 'Delete selected projector.'),
triggers=self.on_delete_projector)
# Show source/view when projector connected
@@ -238,7 +238,7 @@ class UiProjectorManager(object):
self.edit_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'&Edit Projector'),
- icon=':/projector/projector_edit.png',
+ icon=UiIcons().edit,
triggers=self.on_edit_projector)
self.menu.addSeparator()
self.connect_action = create_widget_action(self.menu,
@@ -271,7 +271,7 @@ class UiProjectorManager(object):
self.edit_input_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'Edit Input Source'),
- icon=':/general/general_edit.png',
+ icon=UiIcons().edit,
triggers=self.on_edit_input)
self.blank_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
@@ -287,7 +287,7 @@ class UiProjectorManager(object):
self.delete_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'&Delete Projector'),
- icon=':/general/general_delete.png',
+ icon=UiIcons().delete,
triggers=self.on_delete_projector)
self.update_icons()
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 2117a4d98..3c1e78d72 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -96,11 +96,11 @@ class Ui_MainWindow(object):
self.recent_files_menu.setObjectName('recentFilesMenu')
self.file_import_menu = QtWidgets.QMenu(self.file_menu)
if not is_macosx():
- self.file_import_menu.setIcon(build_icon(u':/general/general_import.png'))
+ self.file_import_menu.setIcon(UiIcons().download)
self.file_import_menu.setObjectName('file_import_menu')
self.file_export_menu = QtWidgets.QMenu(self.file_menu)
if not is_macosx():
- self.file_export_menu.setIcon(build_icon(u':/general/general_export.png'))
+ self.file_export_menu.setIcon(UiIcons().upload)
self.file_export_menu.setObjectName('file_export_menu')
# View Menu
self.view_menu = QtWidgets.QMenu(self.menu_bar)
@@ -180,7 +180,7 @@ class Ui_MainWindow(object):
self.print_service_order_item = create_action(main_window, 'printServiceItem', can_shortcuts=True,
category=UiStrings().File,
triggers=lambda x: PrintServiceForm().exec())
- self.file_exit_item = create_action(main_window, 'fileExitItem', icon=':/system/system_exit.png',
+ self.file_exit_item = create_action(main_window, 'fileExitItem', icon=UiIcons().exit,
can_shortcuts=True,
category=UiStrings().File, triggers=main_window.close)
# Give QT Extra Hint that this is the Exit Menu Item
@@ -274,7 +274,7 @@ class Ui_MainWindow(object):
icon=UiIcons().edit, category=UiStrings().Settings,
can_shortcuts=True)
self.settings_configure_item = create_action(main_window, 'settingsConfigureItem',
- icon=':/system/system_settings.png', can_shortcuts=True,
+ icon=UiIcons().settings, can_shortcuts=True,
category=UiStrings().Settings)
# Give QT Extra Hint that this is the Preferences Menu Item
self.settings_configure_item.setMenuRole(QtWidgets.QAction.PreferencesRole)
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index c1b78f75a..141ce45c6 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -233,9 +233,9 @@ class Ui_ServiceManager(object):
# build the drag and drop context menu
self.dnd_menu = QtWidgets.QMenu()
self.new_action = self.dnd_menu.addAction(translate('OpenLP.ServiceManager', '&Add New Item'))
- self.new_action.setIcon(build_icon(':/general/general_edit.png'))
+ self.new_action.setIcon(UiIcons().edit)
self.add_to_action = self.dnd_menu.addAction(translate('OpenLP.ServiceManager', '&Add to Selected Item'))
- self.add_to_action.setIcon(build_icon(':/general/general_edit.png'))
+ self.add_to_action.setIcon(UiIcons().edit)
# build the context menu
self.menu = QtWidgets.QMenu()
self.edit_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Edit Item'),
@@ -1169,7 +1169,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
if service_item_from_item.notes:
icon = QtGui.QImage(service_item_from_item.icon)
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
- overlay = QtGui.QImage(':/services/service_item_notes.png')
+ overlay = QtGui.QImage(UiIcons().notes)
overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
painter = QtGui.QPainter(icon)
painter.drawImage(0, 0, overlay)
@@ -1178,7 +1178,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
elif service_item_from_item.temporary_edit:
icon = QtGui.QImage(service_item_from_item.icon)
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
- overlay = QtGui.QImage(':/general/general_export.png')
+ overlay = QtGui.QImage(UiIcons().upload)
overlay = overlay.scaled(40, 40, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
painter = QtGui.QPainter(icon)
painter.drawImage(40, 0, overlay)
@@ -1187,7 +1187,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
else:
tree_widget_item.setIcon(0, service_item_from_item.iconic_representation)
else:
- tree_widget_item.setIcon(0, build_icon(':/general/general_delete.png'))
+ tree_widget_item.setIcon(0, UiIcons().delete)
tree_widget_item.setText(0, service_item_from_item.get_display_title())
tips = []
if service_item_from_item.temporary_edit:
diff --git a/resources/images/general_export.png b/resources/images/general_export.png
deleted file mode 100644
index d26519b7f..000000000
Binary files a/resources/images/general_export.png and /dev/null differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index ec2025d7b..4d56a24fc 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -45,7 +45,6 @@
general_add.png
general_delete.png
general_edit.png
- general_export.png
general_import.png
general_zoom_out.png
general_zoom_in.png
@@ -90,7 +89,6 @@
wizard_duplicateremoval.bmp
- service_item_notes.png
service_down.png
service_up.png
@@ -103,7 +101,6 @@
system_volunteer.png
system_servicemanager.png
system_thememanager.png
- system_exit.png
settings_plugin_list.png
system_settings.png
system_configure.png
@@ -146,12 +143,10 @@
projector_cooldown.png
projector_disconnect.png
projector_disconnect_tiled.png
- projector_edit.png
projector_error.png
projector_item_connect.png
projector_item_disconnect.png
projector_manager.png
- projector_new.png
projector_not_connected_error.png
projector_off.png
projector_on.png
diff --git a/resources/images/projector_edit.png b/resources/images/projector_edit.png
deleted file mode 100644
index 84e345d22..000000000
Binary files a/resources/images/projector_edit.png and /dev/null differ
diff --git a/resources/images/projector_new.png b/resources/images/projector_new.png
deleted file mode 100644
index ef83f38d5..000000000
Binary files a/resources/images/projector_new.png and /dev/null differ
diff --git a/resources/images/service_item_notes.png b/resources/images/service_item_notes.png
deleted file mode 100644
index 59991dba8..000000000
Binary files a/resources/images/service_item_notes.png and /dev/null differ
diff --git a/resources/images/system_exit.png b/resources/images/system_exit.png
deleted file mode 100644
index ef827290c..000000000
Binary files a/resources/images/system_exit.png and /dev/null differ