more bits

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')

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()
 

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)

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:

resources/images/openlp-2.qrc

@@ -45,7 +45,6 @@
     <file>general_add.png</file>
     <file>general_delete.png</file>
     <file>general_edit.png</file>
-    <file>general_export.png</file>
     <file>general_import.png</file>
     <file>general_zoom_out.png</file>
     <file>general_zoom_in.png</file>
@@ -90,7 +89,6 @@
     <file>wizard_duplicateremoval.bmp</file>
     </qresource>
   <qresource prefix="services">
-    <file>service_item_notes.png</file>
     <file>service_down.png</file>
     <file>service_up.png</file>
   </qresource>
@@ -103,7 +101,6 @@
     <file>system_volunteer.png</file>
     <file>system_servicemanager.png</file>
     <file>system_thememanager.png</file>
-    <file>system_exit.png</file>
     <file>settings_plugin_list.png</file>
     <file>system_settings.png</file>
     <file>system_configure.png</file>
@@ -146,12 +143,10 @@
     <file>projector_cooldown.png</file>
     <file>projector_disconnect.png</file>
     <file>projector_disconnect_tiled.png</file>
-    <file>projector_edit.png</file>
     <file>projector_error.png</file>
     <file>projector_item_connect.png</file>
     <file>projector_item_disconnect.png</file>
     <file>projector_manager.png</file>
-    <file>projector_new.png</file>
     <file>projector_not_connected_error.png</file>
     <file>projector_off.png</file>
     <file>projector_on.png</file>