From 2bb842b21c20459ad6b86da52d963672b6a68663 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 24 Jun 2018 07:56:50 +0100 Subject: [PATCH] Conversion finished --- openlp/core/common/registry.py | 1 + openlp/core/ui/aboutdialog.py | 2 +- openlp/core/ui/fonts/OpenLP.ttf | Bin 166796 -> 167184 bytes openlp/core/ui/fonts/openlp-charmap.json | 5 +- openlp/core/ui/fonts/openlp.sfd | 136 +++++++++++++++++++- openlp/core/ui/icons.py | 11 +- openlp/core/ui/mainwindow.py | 12 +- openlp/core/ui/themestab.py | 3 +- openlp/plugins/songusage/songusageplugin.py | 8 +- resources/images/openlp-2.qrc | 9 +- resources/images/song_usage_active.png | Bin 757 -> 0 bytes resources/images/song_usage_inactive.png | Bin 716 -> 0 bytes resources/images/system_mediamanager.png | Bin 460 -> 0 bytes resources/images/system_servicemanager.png | Bin 626 -> 0 bytes resources/images/system_thememanager.png | Bin 985 -> 0 bytes resources/images/system_volunteer.png | Bin 2092 -> 0 bytes resources/images/theme_new.png | Bin 985 -> 0 bytes 17 files changed, 155 insertions(+), 32 deletions(-) delete mode 100644 resources/images/song_usage_active.png delete mode 100644 resources/images/song_usage_inactive.png delete mode 100644 resources/images/system_mediamanager.png delete mode 100644 resources/images/system_servicemanager.png delete mode 100644 resources/images/system_thememanager.png delete mode 100644 resources/images/system_volunteer.png delete mode 100644 resources/images/theme_new.png 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 4e74c63bbfbac587c03fa81bd0fe1edf5b32d5f5..0dbea253ee0fe0addcfae87b0d2a22ba30c17cfc 100644 GIT binary patch delta 3344 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 delta 3339 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 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 1221e13103a3066b11a821e82e26f441fac9dc5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 757 zcmV( zu7%a2Roh&aSgW9Is}@mYfvfg@U<>=ej6$bT8Fkc|dGF18_vGV=jf8)=+{HQP z$GzvAzo;tpvhG-?8{w8(j0g+^C@hF!&WD%gh516A4gqpTti(CFe=^6#=*=W z>Goa#^4lvc<`;SO>9zko|KmYzMxW|uHHUzx*dCFO_paQ{T_3%MZ3|)nLM#PU2x`jP znRh(<@O(O$)5{UW25892_>Bu!a~FrsvsKH3p$(u z2Cyq7Qe8MffiYWzY*VZ9wKPkA@)QV^i?I1qz#>)wx(1Y%ju^1K_l;yqk#))1z_8=M zYGsLFr%HGG309W{Zx66Q00p*|Ad^)#%j*=}Rh$+;7`6eB_-yP4w##c2Hk%2`32eIo z1VR&H2Q}Pkg}@IG`PX0@SnynOEd~I>Fd)&p!^XTEc|m4K2}3~RMtW61S+G=@b@znO z2R&#~TMwkOO0pf29grDS+R~tY91mTnmIO7-irkiHjPscRby7WGwSY8%I3NkY0t{#k z)B{t7ojh3Ynh6)-MnB~CVb2X_U+ay;JRFTwYih-#0la%(5K zuC&tJ2@OqP*?`1colW>@>#!uLAC_P%7dDJ`d~7 nbgZ4lVnnUj&SF^5W92nAaxE{#x9n?dXzXmN3N z(4{(baH^BELc6q3a2Dy%#nnkDbna+11at}oF(G2BVxpJ(``*6ar5p;S&3N7^7N z=77Ct%ggT2=qN15ffAC4C?SXdX6Psa3*#U_yVb(?^>zP>dD3=)`8?pN)6?Epvsuu< z0F)~$nM^7`VF>N};BFW8#Rc+~GP#ORb zA044kD4-v-8x3U5>4KnSr*D<&Tc9I*Av7@8st-VGjecSFcB2TU);1aH5LHIxMO}j9 zj|o0eyXq@bVI&{J_9CA+~~f*Lp$Jl-rks%(iO+WLdocnG+e?d_O6U zuC5XWoes|1Z8Sa4_n2SVOOox+O0Bix_=DqlAf3qx7Il;Va6cC}tJ zwYQ>tSEd2a{yWY@RDyubI5Yoqoc{m~r92WwE;k{~O diff --git a/resources/images/system_mediamanager.png b/resources/images/system_mediamanager.png deleted file mode 100644 index 81a6ad68dfb7f1f2231b58118aece43c1cd2eb5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0W*-`f`GrKlxM5Fp8kiYi1esh}2FO_SRM z#}D9_keoS*sK8-xh^j;O910Q~wFFYOCoVmD?H=L6CX-Au^S+s#*=11_CnN<7C(E+S zAPDY;!{NIr4gj1?CU2Hy?U{mgT@L_!k^DBrwbqsGdERamMUvzXwdDgCbf7Cg&+}4r zlD9e}VK+_#+7@Ux;=ck&u3h8*9c%)aK<&y#K-WxwwylOJgn$sDCvHQU>Wx@yz3hPG z8bAoK5_bXJ>HuKR=kr&`ae7agB&wO_D5IiT$OzIMCaDfzyyKzZCFs(J~K%Vx8O zuIrk?V4$<)x~|D)vxh)VRnJ#QBoZ%6rBWI=NTpJ1?RMK~Hk&ioYPZ`?p-@-@R)DW@ zfKsWn7=~dvolf^f#K~kbY;SMR1e_X+h&X^VF|pNZRYm00($dm1V+_Z~$JFcfsf(MN zo4oBNc$B{}+e9D*y!Jd#d%d1sENiWvot!*3~yu#i5J=WLPdH-X9`**G}91gDpL}3_4$z;;m-`~d=!)P=j9*+}65#@{}2m-<| zjDYh|E=E~I4n@R>h+ZKhB9kb~zu#Fz1h~z4Or2T&j9=~mN2;oS0rk8kQ{~+#k^lez M07*qoM6N<$f*$Z8{{R30 diff --git a/resources/images/system_thememanager.png b/resources/images/system_thememanager.png deleted file mode 100644 index 6601f53c3ece4e5437fef9f7aec4a854bf67061e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 985 zcmV;~119{5P)P(;2>*xT4ebXW2R=J?Uu^O6H-EjXt`-)6_k+@X7eV>2fa3R8 z$>GCGu8z=02V2(LS{l)@7T*?)#`b?#+n)o zyLORMRU8fnPNx%5=lJ>b)WF48)<5osERZ%RA*B`QO`Q6)Wt;CS-AxgaKmu4Xnb?2) zIPQJ>&@>He@lWHBTO-+fWX>teJttq*BcCRdl4~dpI zFU8yqN&eciak0twL=c}vcM_%A=b^La#iApT%l%}u+0g6t02I?dkRLz5R=Ld5LXeHj zILbyGOT_~QXYcsi9*)%NfHuHe*2p8eL?SXjKmTJcm%Du!n-{aqfyH7&%U(fE{(_qR zjRK_@YuE0dce|h00pA0cGSdv|N=l3q6BGT>XmkTWF_clP?!j!eaZkCG>E8onmx2`5 z;;dWta<#4P1|oup&;YfcIGuhGVQ6URR4f+zXA4CsTq2163k|-|v5KWMo8=$)qeVFH36rLy66e$=KM~x!&I1iaR{T2d~w*-5vLO zJhfY_)^atQRpY_nY~=d&q2jymG&`NHMtikAzM5VAE*uV@>FeveBqG{o13rfy9kl16 zQnzCV8y3s0R3Z@>PNmL$3k!O^eoLWH;PxyCkOx+PB_Q)R8yT^+u=-nh00000NkvXX Hu0mjfBqq## diff --git a/resources/images/system_volunteer.png b/resources/images/system_volunteer.png deleted file mode 100644 index d010161028706c9533efcf2e2aeee14889043679..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2092 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 Hu0mjfBqq##