diff --git a/openlp/core/common/registry.py b/openlp/core/common/registry.py
index 969518297..0dab36bad 100644
--- a/openlp/core/common/registry.py
+++ b/openlp/core/common/registry.py
@@ -58,6 +58,7 @@ class Registry(object):
registry.working_flags = {}
# Allow the tests to remove Registry entries but not the live system
registry.running_under_test = 'nose' in sys.argv[0]
+ registry.running_under_test = 'pytest' in sys.argv[0]
registry.initialising = True
return registry
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index 399bec8d4..cc3cd862a 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -78,7 +78,7 @@ class UiAboutDialog(object):
self.license_tab_layout.addWidget(self.license_text_edit)
self.about_notebook.addTab(self.license_tab, '')
self.about_dialog_layout.addWidget(self.about_notebook)
- self.volunteer_button = create_button(None, 'volunteer_button', icon=':/system/system_volunteer.png')
+ self.volunteer_button = create_button(None, 'volunteer_button', icon=UiIcons().volunteer)
self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.volunteer_button])
self.about_dialog_layout.addWidget(self.button_box)
self.retranslate_ui(about_dialog)
diff --git a/openlp/core/ui/fonts/OpenLP.ttf b/openlp/core/ui/fonts/OpenLP.ttf
index 4e74c63bb..0dbea253e 100644
Binary files a/openlp/core/ui/fonts/OpenLP.ttf and b/openlp/core/ui/fonts/OpenLP.ttf differ
diff --git a/openlp/core/ui/fonts/openlp-charmap.json b/openlp/core/ui/fonts/openlp-charmap.json
index 0aedb3646..7044294c7 100644
--- a/openlp/core/ui/fonts/openlp-charmap.json
+++ b/openlp/core/ui/fonts/openlp-charmap.json
@@ -4,5 +4,8 @@
"search-text": "0043",
"search-lyrcs": "0044",
"search-CCLI": "0045",
- "hdmi": "0046"
+ "hdmi": "0046",
+ "video": "0047",
+ "plus_sign": "0048",
+ "minus_sign": "0049"
}
diff --git a/openlp/core/ui/fonts/openlp.sfd b/openlp/core/ui/fonts/openlp.sfd
index 839a57f73..09f72998a 100644
--- a/openlp/core/ui/fonts/openlp.sfd
+++ b/openlp/core/ui/fonts/openlp.sfd
@@ -22,7 +22,7 @@ OS2Version: 3
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0
CreationTime: 1328122800
-ModificationTime: 1529128498
+ModificationTime: 1529821956
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@@ -83,10 +83,10 @@ NameList: AGL For New Fonts
DisplaySize: -48
AntiAlias: 1
FitToEm: 0
-WinInfo: 0 27 9
+WinInfo: 61560 27 9
BeginPrivate: 0
EndPrivate
-BeginChars: 65539 713
+BeginChars: 65539 716
StartChar: .notdef
Encoding: 65536 -1 0
@@ -48944,7 +48944,7 @@ SplineSet
1882 1280 1882 1280 1901 1261 c 128,-1,45
1920 1242 1920 1242 1920 1216 c 2,30,-1
EndSplineSet
-Validated: 524329
+Validated: 41
EndChar
StartChar: D
@@ -48994,7 +48994,7 @@ SplineSet
1882 1280 1882 1280 1901 1261 c 128,-1,45
1920 1242 1920 1242 1920 1216 c 2,30,-1
EndSplineSet
-Validated: 524325
+Validated: 37
EndChar
StartChar: E
@@ -49057,7 +49057,7 @@ SplineSet
1882 1280 1882 1280 1901 1261 c 128,-1,56
1920 1242 1920 1242 1920 1216 c 2,41,-1
EndSplineSet
-Validated: 524325
+Validated: 37
EndChar
StartChar: F
@@ -49155,5 +49155,129 @@ SplineSet
EndSplineSet
Validated: 1
EndChar
+
+StartChar: G
+Encoding: 71 71 713
+Width: 1792
+Flags: W
+LayerCount: 2
+Fore
+SplineSet
+1792 1184 m 2,0,-1
+ 1792 96 l 2,1,2
+ 1792 54 1792 54 1753 37 c 0,3,4
+ 1740 32 1740 32 1728 32 c 0,5,6
+ 1701 32 1701 32 1683 51 c 2,7,-1
+ 1280 454 l 1,8,-1
+ 1280 288 l 2,9,10
+ 1280 169 1280 169 1195.5 84.5 c 128,-1,11
+ 1111 0 1111 0 992 0 c 2,12,-1
+ 288 0 l 2,13,14
+ 169 0 169 0 84.5 84.5 c 128,-1,15
+ 0 169 0 169 0 288 c 2,16,-1
+ 0 992 l 2,17,18
+ 0 1111 0 1111 84.5 1195.5 c 128,-1,19
+ 169 1280 169 1280 288 1280 c 2,20,-1
+ 992 1280 l 2,21,22
+ 1111 1280 1111 1280 1195.5 1195.5 c 128,-1,23
+ 1280 1111 1280 1111 1280 992 c 2,24,-1
+ 1280 827 l 1,25,-1
+ 1683 1229 l 2,26,27
+ 1701 1248 1701 1248 1728 1248 c 0,28,29
+ 1740 1248 1740 1248 1753 1243 c 0,30,31
+ 1792 1226 1792 1226 1792 1184 c 2,0,-1
+EndSplineSet
+Validated: 1
+EndChar
+
+StartChar: H
+Encoding: 72 72 714
+Width: 1536
+Flags: W
+LayerCount: 2
+Fore
+SplineSet
+1216 576 m 2,0,-1
+ 1216 704 l 2,1,2
+ 1216 730 1216 730 1197 749 c 128,-1,3
+ 1178 768 1178 768 1152 768 c 2,4,-1
+ 896 768 l 1,5,-1
+ 896 1024 l 2,6,7
+ 896 1050 896 1050 877 1069 c 128,-1,8
+ 858 1088 858 1088 832 1088 c 2,9,-1
+ 704 1088 l 2,10,11
+ 678 1088 678 1088 659 1069 c 128,-1,12
+ 640 1050 640 1050 640 1024 c 2,13,-1
+ 640 768 l 1,14,-1
+ 384 768 l 2,15,16
+ 358 768 358 768 339 749 c 128,-1,17
+ 320 730 320 730 320 704 c 2,18,-1
+ 320 576 l 2,19,20
+ 320 550 320 550 339 531 c 128,-1,21
+ 358 512 358 512 384 512 c 2,22,-1
+ 640 512 l 1,23,-1
+ 640 256 l 2,24,25
+ 640 230 640 230 659 211 c 128,-1,26
+ 678 192 678 192 704 192 c 2,27,-1
+ 832 192 l 2,28,29
+ 858 192 858 192 877 211 c 128,-1,30
+ 896 230 896 230 896 256 c 2,31,-1
+ 896 512 l 1,32,-1
+ 1152 512 l 2,33,34
+ 1178 512 1178 512 1197 531 c 128,-1,35
+ 1216 550 1216 550 1216 576 c 2,0,-1
+1536 640 m 128,-1,37
+ 1536 431 1536 431 1433 254.5 c 128,-1,38
+ 1330 78 1330 78 1153.5 -25 c 128,-1,39
+ 977 -128 977 -128 768 -128 c 128,-1,40
+ 559 -128 559 -128 382.5 -25 c 128,-1,41
+ 206 78 206 78 103 254.5 c 128,-1,42
+ 0 431 0 431 0 640 c 128,-1,43
+ 0 849 0 849 103 1025.5 c 128,-1,44
+ 206 1202 206 1202 382.5 1305 c 128,-1,45
+ 559 1408 559 1408 768 1408 c 128,-1,46
+ 977 1408 977 1408 1153.5 1305 c 128,-1,47
+ 1330 1202 1330 1202 1433 1025.5 c 128,-1,36
+ 1536 849 1536 849 1536 640 c 128,-1,37
+EndSplineSet
+Validated: 1
+EndChar
+
+StartChar: I
+Encoding: 73 73 715
+Width: 1536
+Flags: W
+LayerCount: 2
+Fore
+SplineSet
+1216 576 m 2,0,-1
+ 1216 704 l 2,1,2
+ 1216 730 1216 730 1197 749 c 128,-1,3
+ 1178 768 1178 768 1152 768 c 2,4,-1
+ 384 768 l 2,5,6
+ 358 768 358 768 339 749 c 128,-1,7
+ 320 730 320 730 320 704 c 2,8,-1
+ 320 576 l 2,9,10
+ 320 550 320 550 339 531 c 128,-1,11
+ 358 512 358 512 384 512 c 2,12,-1
+ 1152 512 l 2,13,14
+ 1178 512 1178 512 1197 531 c 128,-1,15
+ 1216 550 1216 550 1216 576 c 2,0,-1
+1536 640 m 128,-1,17
+ 1536 431 1536 431 1433 254.5 c 128,-1,18
+ 1330 78 1330 78 1153.5 -25 c 128,-1,19
+ 977 -128 977 -128 768 -128 c 128,-1,20
+ 559 -128 559 -128 382.5 -25 c 128,-1,21
+ 206 78 206 78 103 254.5 c 128,-1,22
+ 0 431 0 431 0 640 c 128,-1,23
+ 0 849 0 849 103 1025.5 c 128,-1,24
+ 206 1202 206 1202 382.5 1305 c 128,-1,25
+ 559 1408 559 1408 768 1408 c 128,-1,26
+ 977 1408 977 1408 1153.5 1305 c 128,-1,27
+ 1330 1202 1330 1202 1433 1025.5 c 128,-1,16
+ 1536 849 1536 849 1536 640 c 128,-1,17
+EndSplineSet
+Validated: 1
+EndChar
EndChars
EndSplineFont
diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py
index f00eb9518..183e591e7 100644
--- a/openlp/core/ui/icons.py
+++ b/openlp/core/ui/icons.py
@@ -74,6 +74,7 @@ class UiIcons(object):
'blank_theme': {'icon': 'fa.file-image-o'},
'book': {'icon': 'fa.book'},
'bottom': {'icon': 'fa.angle-double-down'},
+ 'box': {'icon': 'fa.briefcase'},
'clapperboard': {'icon': 'fa.chess-board'},
'clock': {'icon': 'fa.clock-o'},
'clone': {'icon': 'fa.clone'},
@@ -94,7 +95,7 @@ class UiIcons(object):
'inactive': {'icon': 'fa.child', 'attr': 'lightGray'},
'info': {'icon': 'fa.info'},
'light_bulb': {'icon': 'fa.lightbulb-o'},
- 'live': {'icon': 'fa.desktop'},
+ 'live': {'icon': 'fa.eye'},
'manual': {'icon': 'fa.graduation-cap'},
'media': {'icon': 'fa.fax'},
'minus': {'icon': 'fa.minus'},
@@ -111,8 +112,7 @@ class UiIcons(object):
'plus': {'icon': 'fa.plus'},
'presentation': {'icon': 'fa.bar-chart'},
'preview': {'icon': 'fa.laptop'},
- 'projector': {'icon': 'fa.video'},
- 'projector_blank': {'icon': 'fa.desktop'},
+ 'projector': {'icon': 'op.video'},
'projector_connect': {'icon': 'fa.plug'},
'projector_cooldown': {'icon': 'fa.video-camera', 'attr': 'blue'},
'projector_disconnect': {'icon': 'fa.plug', 'attr': 'lightGray'},
@@ -137,6 +137,8 @@ class UiIcons(object):
'settings': {'icon': 'fa.cogs'},
'shortcuts': {'icon': 'fa.wrench'},
'song_usage': {'icon': 'fa.line-chart'},
+ 'song_usage_active': {'icon': 'op.plus_sign'},
+ 'song_usage_inactive': {'icon': 'op.minus_sign'},
'sort': {'icon': 'fa.sort'},
'stop': {'icon': 'fa.stop'},
'square': {'icon': 'fa.square'},
@@ -149,7 +151,8 @@ class UiIcons(object):
'user': {'icon': 'fa.user'},
'usermo': {'icon': 'op.users'},
'users': {'icon': 'fa.users'},
- 'video': {'icon': 'fa.file-video-o'}
+ 'video': {'icon': 'fa.file-video-o'},
+ 'volunteer': {'icon': 'fa.group'}
}
self.load_icons(self, icon_list)
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index cb67eb360..15e6e4b2b 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -134,7 +134,7 @@ class Ui_MainWindow(object):
self.status_bar.addPermanentWidget(self.default_theme_label)
# Create the MediaManager
self.media_manager_dock = OpenLPDockWidget(main_window, 'media_manager_dock',
- ':/system/system_mediamanager.png')
+ UiIcons().box)
self.media_manager_dock.setStyleSheet(get_library_stylesheet())
# Create the media toolbox
self.media_tool_box = QtWidgets.QToolBox(self.media_manager_dock)
@@ -143,13 +143,13 @@ class Ui_MainWindow(object):
main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, self.media_manager_dock)
# Create the service manager
self.service_manager_dock = OpenLPDockWidget(main_window, 'service_manager_dock',
- ':/system/system_servicemanager.png')
+ UiIcons().live)
self.service_manager_contents = ServiceManager(self.service_manager_dock)
self.service_manager_dock.setWidget(self.service_manager_contents)
main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, self.service_manager_dock)
# Create the theme manager
self.theme_manager_dock = OpenLPDockWidget(main_window, 'theme_manager_dock',
- ':/system/system_thememanager.png')
+ UiIcons().theme)
self.theme_manager_contents = ThemeManager(self.theme_manager_dock)
self.theme_manager_contents.setObjectName('theme_manager_contents')
self.theme_manager_dock.setWidget(self.theme_manager_contents)
@@ -206,16 +206,16 @@ class Ui_MainWindow(object):
category=UiStrings().View,
triggers=self.toggle_projector_manager)
self.view_media_manager_item = create_action(main_window, 'viewMediaManagerItem',
- icon=':/system/system_mediamanager.png',
+ icon=UiIcons().box,
checked=self.media_manager_dock.isVisible(),
can_shortcuts=True,
category=UiStrings().View, triggers=self.toggle_media_manager)
self.view_theme_manager_item = create_action(main_window, 'viewThemeManagerItem', can_shortcuts=True,
- icon=':/system/system_thememanager.png',
+ icon=UiIcons().theme,
checked=self.theme_manager_dock.isVisible(),
category=UiStrings().View, triggers=self.toggle_theme_manager)
self.view_service_manager_item = create_action(main_window, 'viewServiceManagerItem', can_shortcuts=True,
- icon=':/system/system_servicemanager.png',
+ icon=UiIcons().live,
checked=self.service_manager_dock.isVisible(),
category=UiStrings().View, triggers=self.toggle_service_manager)
self.view_preview_panel = create_action(main_window, 'viewPreviewPanel', can_shortcuts=True,
diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py
index 077f59d83..d19218e83 100644
--- a/openlp/core/ui/themestab.py
+++ b/openlp/core/ui/themestab.py
@@ -30,6 +30,7 @@ from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.lib import SettingsTab
from openlp.core.lib.ui import find_and_set_in_combo_box
+from openlp.core.ui.icons import UiIcons
class ThemesTab(SettingsTab):
@@ -40,7 +41,7 @@ class ThemesTab(SettingsTab):
"""
Constructor
"""
- self.icon_path = ':/themes/theme_new.png'
+ self.icon_path = UiIcons().theme
theme_translated = translate('OpenLP.ThemesTab', 'Themes')
super(ThemesTab, self).__init__(parent, 'Themes', theme_translated)
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index 7c327f410..6d600dfb6 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -29,7 +29,7 @@ from openlp.core.common.actions import ActionList
from openlp.core.common.i18n import translate
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
-from openlp.core.lib import Plugin, StringContent, build_icon
+from openlp.core.lib import Plugin, StringContent
from openlp.core.lib.db import Manager
from openlp.core.lib.ui import create_action
from openlp.core.ui.icons import UiIcons
@@ -65,8 +65,6 @@ class SongUsagePlugin(Plugin):
self.manager = Manager('songusage', init_schema, upgrade_mod=upgrade)
self.weight = -4
self.icon = UiIcons().song_usage
- self.active_icon = build_icon(':/songusage/song_usage_active.png')
- self.inactive_icon = build_icon(':/songusage/song_usage_inactive.png')
self.song_usage_active = False
def check_pre_conditions(self):
@@ -170,12 +168,12 @@ class SongUsagePlugin(Plugin):
self.song_usage_active_button.blockSignals(True)
self.song_usage_status.blockSignals(True)
if self.song_usage_active:
- self.song_usage_active_button.setIcon(self.active_icon)
+ self.song_usage_active_button.setIcon(UiIcons().song_usage_active)
self.song_usage_status.setChecked(True)
self.song_usage_active_button.setChecked(True)
self.song_usage_active_button.setToolTip(translate('SongUsagePlugin', 'Song usage tracking is active.'))
else:
- self.song_usage_active_button.setIcon(self.inactive_icon)
+ self.song_usage_active_button.setIcon(UiIcons().song_usage_inactive)
self.song_usage_status.setChecked(False)
self.song_usage_active_button.setChecked(False)
self.song_usage_active_button.setToolTip(translate('SongUsagePlugin', 'Song usage tracking is inactive.'))
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 41fbcefe2..fa158cdbd 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -34,10 +34,6 @@
- system_mediamanager.png
- system_volunteer.png
- system_servicemanager.png
- system_thememanager.png
@@ -46,13 +42,10 @@
- song_usage_active.png
- song_usage_inactive.png
-
+
- theme_new.png
diff --git a/resources/images/song_usage_active.png b/resources/images/song_usage_active.png
deleted file mode 100644
index 1221e1310..000000000
Binary files a/resources/images/song_usage_active.png and /dev/null differ
diff --git a/resources/images/song_usage_inactive.png b/resources/images/song_usage_inactive.png
deleted file mode 100644
index cdcf944ee..000000000
Binary files a/resources/images/song_usage_inactive.png and /dev/null differ
diff --git a/resources/images/system_mediamanager.png b/resources/images/system_mediamanager.png
deleted file mode 100644
index 81a6ad68d..000000000
Binary files a/resources/images/system_mediamanager.png and /dev/null differ
diff --git a/resources/images/system_servicemanager.png b/resources/images/system_servicemanager.png
deleted file mode 100644
index 05d9f2ced..000000000
Binary files a/resources/images/system_servicemanager.png and /dev/null differ
diff --git a/resources/images/system_thememanager.png b/resources/images/system_thememanager.png
deleted file mode 100644
index 6601f53c3..000000000
Binary files a/resources/images/system_thememanager.png and /dev/null differ
diff --git a/resources/images/system_volunteer.png b/resources/images/system_volunteer.png
deleted file mode 100644
index d01016102..000000000
Binary files a/resources/images/system_volunteer.png and /dev/null differ
diff --git a/resources/images/theme_new.png b/resources/images/theme_new.png
deleted file mode 100644
index 6601f53c3..000000000
Binary files a/resources/images/theme_new.png and /dev/null differ