diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 687537867..1a3dbab56 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -619,7 +619,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
:param context: The context on which this is called
"""
service_item = ServiceItem(self.plugin)
- service_item.add_icon(self.plugin.icon_path)
+ service_item.add_icon()
if self.generate_slide_data(service_item, item, xml_version, remote, context):
return service_item
else:
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index e3fe4bf1d..7b2f13a3b 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -170,7 +170,7 @@ class ServiceItem(RegistryProperties):
self.processor = None
self.audit = ''
self.items = []
- self.iconic_representation = None
+ self.icon = UiIcons().default
self.raw_footer = []
self.foot_text = ''
self.theme = None
@@ -230,25 +230,22 @@ class ServiceItem(RegistryProperties):
"""
return capability in self.capabilities
- def add_icon(self, icon):
+ def add_icon(self):
"""
Add an icon to the service item. This is used when displaying the service item in the service manager.
-
- :param icon: A string to an icon in the resources or on disk.
"""
- self.icon = icon
if self.name == 'songs':
- self.iconic_representation = UiIcons().music
+ self.icon = UiIcons().music
elif self.name == 'bibles':
- self.iconic_representation = UiIcons().bible
+ self.icon = UiIcons().bible
elif self.name == 'presentations':
- self.iconic_representation = UiIcons().presentation
+ self.icon = UiIcons().presentation
elif self.name == 'images':
- self.iconic_representation = UiIcons().picture
+ self.icon = UiIcons().picture
elif self.name == 'medias':
- self.iconic_representation = UiIcons().video
+ self.icon = UiIcons().video
else:
- self.iconic_representation = UiIcons().clone
+ self.icon = UiIcons().clone
def render(self, provides_own_theme_data=False):
"""
@@ -425,7 +422,7 @@ class ServiceItem(RegistryProperties):
self.name = header['name']
self.service_item_type = header['type']
self.theme = header['theme']
- self.add_icon(header['icon'])
+ self.add_icon()
self.raw_footer = header['footer']
self.audit = header['audit']
self.notes = header['notes']
diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py
index 769f9f699..87771606f 100644
--- a/openlp/core/ui/printservicedialog.py
+++ b/openlp/core/ui/printservicedialog.py
@@ -26,6 +26,7 @@ from PyQt5 import QtCore, QtWidgets, QtPrintSupport
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.lib import build_icon
+from openlp.core.ui.icons import UiIcons
from openlp.core.widgets.edits import SpellTextEdit
@@ -59,31 +60,31 @@ class Ui_PrintServiceDialog(object):
self.toolbar = QtWidgets.QToolBar(print_service_dialog)
self.toolbar.setIconSize(QtCore.QSize(22, 22))
self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
- self.print_button = self.toolbar.addAction(build_icon(':/general/general_print.png'),
+ self.print_button = self.toolbar.addAction(UiIcons().print,
translate('OpenLP.PrintServiceForm', 'Print'))
self.options_button = QtWidgets.QToolButton(self.toolbar)
self.options_button.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
- self.options_button.setIcon(build_icon(':/system/system_configure.png'))
+ self.options_button.setIcon(UiIcons().settings)
self.options_button.setCheckable(True)
self.toolbar.addWidget(self.options_button)
self.toolbar.addSeparator()
- self.plain_copy = self.toolbar.addAction(build_icon(':/system/system_edit_copy.png'),
+ self.plain_copy = self.toolbar.addAction(UiIcons().clone,
translate('OpenLP.PrintServiceForm', 'Copy'))
- self.html_copy = self.toolbar.addAction(build_icon(':/system/system_edit_copy.png'),
+ self.html_copy = self.toolbar.addAction(UiIcons().clone,
translate('OpenLP.PrintServiceForm', 'Copy as HTML'))
self.toolbar.addSeparator()
self.zoom_in_button = QtWidgets.QToolButton(self.toolbar)
- self.zoom_in_button.setIcon(build_icon(':/general/general_zoom_in.png'))
+ self.zoom_in_button.setIcon(UiIcons().search_plus)
self.zoom_in_button.setObjectName('zoom_in_button')
self.zoom_in_button.setIconSize(QtCore.QSize(22, 22))
self.toolbar.addWidget(self.zoom_in_button)
self.zoom_out_button = QtWidgets.QToolButton(self.toolbar)
- self.zoom_out_button.setIcon(build_icon(':/general/general_zoom_out.png'))
+ self.zoom_out_button.setIcon(UiIcons().search_minus)
self.zoom_out_button.setObjectName('zoom_out_button')
self.zoom_out_button.setIconSize(QtCore.QSize(22, 22))
self.toolbar.addWidget(self.zoom_out_button)
self.zoom_original_button = QtWidgets.QToolButton(self.toolbar)
- self.zoom_original_button.setIcon(build_icon(':/general/general_zoom_original.png'))
+ self.zoom_original_button.setIcon(UiIcons().search)
self.zoom_original_button.setObjectName('zoom_original_button')
self.zoom_original_button.setIconSize(QtCore.QSize(22, 22))
self.toolbar.addWidget(self.zoom_original_button)
diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index ed3c90add..683b8b620 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -209,7 +209,7 @@ class PrintServiceForm(QtWidgets.QDialog, Ui_PrintServiceDialog, RegistryPropert
div = self._add_element('div', class_id='item', parent=body)
# Add the title of the service item.
item_title = self._add_element('h2', parent=div, class_id='itemTitle')
- img = image_to_byte(item.iconic_representation.pixmap(20, 20).toImage())
+ img = image_to_byte(item.icon.pixmap(20, 20).toImage())
self._add_element('img', parent=item_title, attribute=('src', 'data:image/png;base64, ' + img))
self._add_element('span', ' ' + html.escape(item.get_display_title()), item_title)
if self.slide_text_check_box.isChecked():
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 20235033e..7a036df46 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -1168,16 +1168,16 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
tree_widget_item = QtWidgets.QTreeWidgetItem(self.service_manager_list)
if service_item_from_item.is_valid:
if service_item_from_item.notes:
- icon = QtGui.QImage(service_item_from_item.icon)
+ icon = service_item_from_item.icon.pixmap(80, 80).toImage()
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
- overlay = QtGui.QImage(UiIcons().notes)
- overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+ overlay = UiIcons().notes.pixmap(40, 40).toImage()
+ overlay = overlay.scaled(40, 40, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
painter = QtGui.QPainter(icon)
painter.drawImage(0, 0, overlay)
painter.end()
tree_widget_item.setIcon(0, build_icon(icon))
elif service_item_from_item.temporary_edit:
- icon = QtGui.QImage(service_item_from_item.icon)
+ icon = service_item_from_item.icon.pixmap(80, 80).toImage()
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
overlay = QtGui.QImage(UiIcons().upload)
overlay = overlay.scaled(40, 40, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
@@ -1186,7 +1186,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
painter.end()
tree_widget_item.setIcon(0, build_icon(icon))
else:
- tree_widget_item.setIcon(0, service_item_from_item.iconic_representation)
+ tree_widget_item.setIcon(0, service_item_from_item.icon)
else:
tree_widget_item.setIcon(0, UiIcons().delete)
tree_widget_item.setText(0, service_item_from_item.get_display_title())
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index b1c6ff806..3a7d06f4e 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -80,12 +80,12 @@ class Ui_ThemeManager(object):
self.toolbar.addSeparator()
self.toolbar.add_toolbar_action('importTheme',
text=translate('OpenLP.ThemeManager', 'Import Theme'),
- icon=build_icon(UiIcons().download),
+ icon=UiIcons().download,
tooltip=translate('OpenLP.ThemeManager', 'Import a theme.'),
triggers=self.on_import_theme)
self.toolbar.add_toolbar_action('exportTheme',
text=translate('OpenLP.ThemeManager', 'Export Theme'),
- icon=build_icon(UiIcons().upload),
+ icon=UiIcons().upload,
tooltip=translate('OpenLP.ThemeManager', 'Export a theme.'),
triggers=self.on_export_theme)
self.layout.addWidget(self.toolbar)
diff --git a/openlp/core/widgets/wizard.py b/openlp/core/widgets/wizard.py
index a60627e34..f39caacc2 100644
--- a/openlp/core/widgets/wizard.py
+++ b/openlp/core/widgets/wizard.py
@@ -198,7 +198,7 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties):
self.error_save_to_button = QtWidgets.QPushButton(self.progress_page)
self.error_save_to_button.setObjectName('error_save_to_button')
self.error_save_to_button.setHidden(True)
- self.error_save_to_button.setIcon(build_icon(UiIcons().save))
+ self.error_save_to_button.setIcon(UiIcons().save)
self.error_button_layout.addWidget(self.error_save_to_button)
self.progress_layout.addLayout(self.error_button_layout)
self.addPage(self.progress_page)
diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py
index f2777440f..04aee0842 100644
--- a/openlp/plugins/alerts/forms/alertdialog.py
+++ b/openlp/plugins/alerts/forms/alertdialog.py
@@ -65,12 +65,12 @@ class Ui_AlertDialog(object):
self.manage_button_layout = QtWidgets.QVBoxLayout()
self.manage_button_layout.setObjectName('manage_button_layout')
self.new_button = QtWidgets.QPushButton(alert_dialog)
- self.new_button.setIcon(build_icon(UiIcons().new))
+ self.new_button.setIcon(UiIcons().new)
self.new_button.setObjectName('new_button')
self.manage_button_layout.addWidget(self.new_button)
self.save_button = QtWidgets.QPushButton(alert_dialog)
self.save_button.setEnabled(False)
- self.save_button.setIcon(build_icon(UiIcons().save))
+ self.save_button.setIcon(UiIcons().save)
self.save_button.setObjectName('save_button')
self.manage_button_layout.addWidget(self.save_button)
self.delete_button = create_button(alert_dialog, 'delete_button', role='delete', enabled=False,
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 361c77ae9..675233807 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -347,7 +347,7 @@ class MessageListener(object):
# Some of the original serviceitem attributes is needed in the new serviceitem
item.footer = item_cpy.footer
item.from_service = item_cpy.from_service
- item.iconic_representation = item_cpy.iconic_representation
+ item.iconic_representation = item_cpy.icon
item.image_border = item_cpy.image_border
item.main = item_cpy.main
item.theme_data = item_cpy.theme_data
diff --git a/resources/images/general_email.png b/resources/images/general_email.png
deleted file mode 100644
index bb3cab8f3..000000000
Binary files a/resources/images/general_email.png and /dev/null differ
diff --git a/resources/images/general_zoom_in.png b/resources/images/general_zoom_in.png
deleted file mode 100644
index 8393e281a..000000000
Binary files a/resources/images/general_zoom_in.png and /dev/null differ
diff --git a/resources/images/general_zoom_original.png b/resources/images/general_zoom_original.png
deleted file mode 100644
index a268a9984..000000000
Binary files a/resources/images/general_zoom_original.png and /dev/null differ
diff --git a/resources/images/general_zoom_out.png b/resources/images/general_zoom_out.png
deleted file mode 100644
index f66575efd..000000000
Binary files a/resources/images/general_zoom_out.png and /dev/null differ
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 39c636140..836defaaf 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -25,16 +25,11 @@
plugin_alerts.png
plugin_songs.png
- plugin_remote.png
plugin_songusage.png
general_delete.png
general_import.png
- general_zoom_out.png
- general_zoom_in.png
- general_zoom_original.png
- general_email.png
general_find.png
general_back.png
@@ -74,7 +69,6 @@
system_servicemanager.png
system_thememanager.png
settings_plugin_list.png
- system_settings.png
system_edit_copy.png
system_configure_shortcuts.png
diff --git a/resources/images/plugin_remote.png b/resources/images/plugin_remote.png
deleted file mode 100644
index d70f0f6de..000000000
Binary files a/resources/images/plugin_remote.png and /dev/null differ
diff --git a/resources/images/system_settings.png b/resources/images/system_settings.png
deleted file mode 100644
index 3c38e96b9..000000000
Binary files a/resources/images/system_settings.png and /dev/null differ