More icons and fixes

openlp/core/common/i18n.py

@@ -581,10 +581,14 @@ class UiIcons(object):
         self.database = qta.icon('fa.database')
         self.delete = qta.icon('fa.trash')
         self.edit = qta.icon('fa.edit')
-        self.download = qta.icon('fa.download')
+        self.download = qta.icon('fa.cloud-download')
+        self.live = qta.icon('fa.camera')
         self.music = qta.icon('fa.music')
         self.new = qta.icon('fa.file')
+        self.presentation = qta.icon("fa.bar-chart")
+        self.picture = qta.icon("fa.picture-o")
         self.print = qta.icon('fa.print')
         self.save = qta.icon('fa.save')
-        self.upload = qta.icon('fa.upload')
+        self.upload = qta.icon('fa.cloud-upload')
-        #self.video = qta.icon('fa.video')
+        self.user = qta.icon('fa.user')
+        self.video = qta.icon('fa.file-video-o')

openlp/core/lib/mediamanageritem.py

@@ -27,7 +27,7 @@ import re
 
 from PyQt5 import QtCore, QtWidgets
 
-from openlp.core.common.i18n import UiStrings, translate
+from openlp.core.common.i18n import UiStrings, UiIcons, translate
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.path import path_to_str, str_to_path
 from openlp.core.common.registry import Registry
@@ -165,26 +165,24 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
         toolbar_actions = []
         # Import Button
         if self.has_import_icon:
-            toolbar_actions.append(['Import', StringContent.Import,
+            toolbar_actions.append(['Import', StringContent.Import, UiIcons().download, self.on_import_click])
-                                    ':/general/general_import.png', self.on_import_click])
         # Load Button
         if self.has_file_icon:
             toolbar_actions.append(['Load', StringContent.Load, ':/general/general_open.png', self.on_file_click])
         # New Button
         if self.has_new_icon:
-            toolbar_actions.append(['New', StringContent.New, ':/general/general_new.png', self.on_new_click])
+            toolbar_actions.append(['New', StringContent.New, UiIcons().new, self.on_new_click])
         # Edit Button
         if self.has_edit_icon:
-            toolbar_actions.append(['Edit', StringContent.Edit, ':/general/general_edit.png', self.on_edit_click])
+            toolbar_actions.append(['Edit', StringContent.Edit, UiIcons().edit, self.on_edit_click])
         # Delete Button
         if self.has_delete_icon:
-            toolbar_actions.append(['Delete', StringContent.Delete,
+            toolbar_actions.append(['Delete', StringContent.Delete, UiIcons().delete, self.on_delete_click])
-                                    ':/general/general_delete.png', self.on_delete_click])
         # Preview
         toolbar_actions.append(['Preview', StringContent.Preview,
                                 ':/general/general_preview.png', self.on_preview_click])
         # Live Button
-        toolbar_actions.append(['Live', StringContent.Live, ':/general/general_live.png', self.on_live_click])
+        toolbar_actions.append(['Live', StringContent.Live, UiIcons().live, self.on_live_click])
         # Add to service Button
         toolbar_actions.append(['Service', StringContent.Service, ':/general/general_add.png', self.on_add_click])
         for action in toolbar_actions:

openlp/core/ui/exceptiondialog.py

@@ -25,7 +25,7 @@ The GUI widgets of the exception dialog.
 
 from PyQt5 import QtGui, QtWidgets
 
-from openlp.core.common.i18n import translate
+from openlp.core.common.i18n import UiIcons, translate
 from openlp.core.lib import build_icon
 from openlp.core.lib.ui import create_button, create_button_box
 
@@ -75,7 +75,7 @@ class Ui_ExceptionDialog(object):
                                                 icon=':/general/general_email.png',
                                                 click=self.on_send_report_button_clicked)
         self.save_report_button = create_button(exception_dialog, 'save_report_button',
-                                                icon=UiIcon().save,
+                                                icon=UiIcons().save,
                                                 click=self.on_save_report_button_clicked)
         self.attach_tile_button = create_button(exception_dialog, 'attach_tile_button',
                                                 icon=':/general/general_open.png',

openlp/core/widgets/wizard.py

@@ -27,7 +27,7 @@ import logging
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import is_macosx
-from openlp.core.common.i18n import UiStrings, translate
+from openlp.core.common.i18n import UiStrings, UiIcons, translate
 from openlp.core.common.mixins import RegistryProperties
 from openlp.core.common.registry import Registry
 from openlp.core.common.settings import Settings
@@ -197,7 +197,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(UiIcon().save))
+        self.error_save_to_button.setIcon(build_icon(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)

openlp/plugins/images/imageplugin.py

@@ -25,7 +25,7 @@ import logging
 from PyQt5 import QtGui
 
 from openlp.core.api.http import register_endpoint
-from openlp.core.common.i18n import translate
+from openlp.core.common.i18n import UiIcons, translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib import Plugin, StringContent, ImageSource, build_icon
 from openlp.core.lib.db import Manager
@@ -53,7 +53,7 @@ class ImagePlugin(Plugin):
         super(ImagePlugin, self).__init__('images', __default_settings__, ImageMediaItem, ImageTab)
         self.manager = Manager('images', init_schema, upgrade_mod=upgrade)
         self.weight = -7
-        self.icon_path = ':/plugins/plugin_images.png'
+        self.icon_path = UiIcons().picture
         self.icon = build_icon(self.icon_path)
         register_endpoint(images_endpoint)
         register_endpoint(api_images_endpoint)

openlp/plugins/media/mediaplugin.py

@@ -30,7 +30,7 @@ from PyQt5 import QtCore
 from openlp.core.api.http import register_endpoint
 from openlp.core.common import check_binary_exists
 from openlp.core.common.applocation import AppLocation
-from openlp.core.common.i18n import translate
+from openlp.core.common.i18n import UiIcons, translate
 from openlp.core.common.path import Path
 from openlp.core.lib import Plugin, StringContent, build_icon
 from openlp.plugins.media.endpoint import api_media_endpoint, media_endpoint
@@ -56,7 +56,7 @@ class MediaPlugin(Plugin):
     def __init__(self):
         super(MediaPlugin, self).__init__('media', __default_settings__, MediaMediaItem)
         self.weight = -6
-        self.icon_path = ':/plugins/plugin_media.png'
+        self.icon_path = UiIcons().video
         self.icon = build_icon(self.icon_path)
         # passed with drag and drop messages
         self.dnd_id = 'Media'

openlp/plugins/presentations/presentationplugin.py

@@ -30,7 +30,7 @@ from PyQt5 import QtCore
 
 from openlp.core.api.http import register_endpoint
 from openlp.core.common import extension_loader
-from openlp.core.common.i18n import translate
+from openlp.core.common.i18n import UiIcons, translate
 from openlp.core.common.settings import Settings
 from openlp.core.lib import Plugin, StringContent, build_icon
 from openlp.plugins.presentations.endpoint import api_presentations_endpoint, presentations_endpoint
@@ -68,7 +68,7 @@ class PresentationPlugin(Plugin):
         self.controllers = {}
         Plugin.__init__(self, 'presentations', __default_settings__, __default_settings__)
         self.weight = -8
-        self.icon_path = ':/plugins/plugin_presentations.png'
+        self.icon_path = UiIcons().presentation
         self.icon = build_icon(self.icon_path)
         register_endpoint(presentations_endpoint)
         register_endpoint(api_presentations_endpoint)