From 44bb70122ef398b1fc6c764a7915fad943169bad Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 22 Apr 2018 07:59:35 +0100 Subject: [PATCH] more bits --- openlp/core/lib/serviceitem.py | 3 +-- openlp/core/ui/icons.py | 5 ++++- openlp/plugins/images/lib/mediaitem.py | 6 +++--- openlp/plugins/media/lib/mediaitem.py | 17 +++++++---------- resources/images/image_group.png | Bin 1562 -> 0 bytes resources/images/image_new_group.png | Bin 762 -> 0 bytes resources/images/media_audio.png | Bin 1763 -> 0 bytes resources/images/media_optical.png | Bin 2056 -> 0 bytes resources/images/media_video.png | Bin 1838 -> 0 bytes resources/images/openlp-2.qrc | 7 +------ scripts/check_dependencies.py | 3 ++- 11 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 resources/images/image_group.png delete mode 100644 resources/images/image_new_group.png delete mode 100644 resources/images/media_audio.png delete mode 100644 resources/images/media_optical.png delete mode 100644 resources/images/media_video.png diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 7b2f13a3b..18984f172 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -242,7 +242,7 @@ class ServiceItem(RegistryProperties): self.icon = UiIcons().presentation elif self.name == 'images': self.icon = UiIcons().picture - elif self.name == 'medias': + elif self.name == 'media': self.icon = UiIcons().video else: self.icon = UiIcons().clone @@ -370,7 +370,6 @@ class ServiceItem(RegistryProperties): 'plugin': self.name, 'theme': self.theme, 'title': self.title, - 'icon': self.icon, 'footer': self.raw_footer, 'type': self.service_item_type, 'audit': self.audit, diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index 37baf65da..5e4fd91ba 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -60,6 +60,7 @@ class UiIcons(object): 'arrow_left': 'fa.arrow-left', 'arrow_right': 'fa.arrow-right', 'arrow_up': 'fa.arrow-up', + 'audio': 'fa.file-sound-o', 'address': 'fa.book', 'back': 'fa.step-backward', 'bible': 'fa.book', @@ -73,10 +74,11 @@ class UiIcons(object): 'default': 'fa.info-circle', 'desktop': 'fa.desktop', 'delete': 'fa.trash', + 'download': 'fa.cloud-download', 'edit': 'fa.edit', 'email': 'fa.envelope', 'exit': 'fa.sign-out', - 'download': 'fa.cloud-download', + 'group': 'fa.object-group', 'info': 'fa.info', 'live': 'fa.desktop', 'manual': 'fa.graduation-cap', @@ -86,6 +88,7 @@ class UiIcons(object): 'new_group': 'fa.folder', 'notes': 'fa.sticky-note', 'open': 'fa.folder-open', + 'optical': 'fa.file-video-o', 'pause': 'fa.pause', 'play': 'fa.play', 'plus': 'fa.plus', diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 0e8740803..8eda8a232 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -183,7 +183,7 @@ class ImageMediaItem(MediaManagerItem): create_widget_action(self.list_view, separator=True) create_widget_action( self.list_view, - text=UiStrings().AddGroup, icon=':/images/image_new_group.png', triggers=self.on_add_group_click) + text=UiStrings().AddGroup, icon=UiIcons().group, triggers=self.on_add_group_click) create_widget_action( self.list_view, text=translate('ImagePlugin', 'Add new image(s)'), @@ -201,7 +201,7 @@ class ImageMediaItem(MediaManagerItem): Add custom buttons to the start of the toolbar. """ self.add_group_action = self.toolbar.add_toolbar_action('add_group_action', - icon=':/images/image_new_group.png', + icon=UiIcons().group, triggers=self.on_add_group_click) def add_end_header_bar(self): @@ -283,7 +283,7 @@ class ImageMediaItem(MediaManagerItem): """ image_groups = self.manager.get_all_objects(ImageGroups, ImageGroups.parent_id == parent_group_id) image_groups.sort(key=lambda group_object: get_natural_key(group_object.group_name)) - folder_icon = build_icon(':/images/image_group.png') + folder_icon = UiIcons().group for image_group in image_groups: group = QtWidgets.QTreeWidgetItem() group.setText(0, image_group.group_name) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 4acbce20a..0ab3b28f7 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -32,7 +32,7 @@ from openlp.core.common.path import Path, path_to_str, create_paths from openlp.core.common.registry import Registry from openlp.core.common.settings import Settings from openlp.core.lib import ItemCapabilities, MediaManagerItem, MediaType, ServiceItem, ServiceItemContext, \ - build_icon, check_item_selected + check_item_selected from openlp.core.lib.ui import create_widget_action, critical_error_message_box, create_horizontal_adjusting_combo_box from openlp.core.ui import DisplayControllerType from openlp.core.ui.icons import UiIcons @@ -68,9 +68,6 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): self.icon_path = 'images/image' self.background = False self.automatic = '' - self.optical_icon = build_icon(':/media/media_optical.png') - self.video_icon = build_icon(':/media/media_video.png') - self.audio_icon = build_icon(':/media/media_audio.png') self.error_icon = UiIcons().delete def setup_item(self): @@ -138,7 +135,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD') optical_button_tooltip = translate('MediaPlugin.MediaItem', 'CD/DVD playback is only supported if VLC is installed and enabled.') - self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon, + self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=UiIcons().optical, text=optical_button_text, tooltip=optical_button_tooltip, triggers=self.on_load_optical) @@ -206,7 +203,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): def video_background_replaced(self): """ - Triggered by main display on change of serviceitem. + Triggered by main display on change of service item. """ self.reset_action.setVisible(False) self.reset_action_context.setVisible(False) @@ -370,7 +367,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): # Handle optical based item (file_name, title, audio_track, subtitle_track, start, end, clip_name) = parse_optical_path(track) item_name = QtWidgets.QListWidgetItem(clip_name) - item_name.setIcon(self.optical_icon) + item_name.setIcon(UiIcons().optical) item_name.setData(QtCore.Qt.UserRole, track) item_name.setToolTip('{name}@{start}-{end}'.format(name=file_name, start=format_milliseconds(start), @@ -379,7 +376,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): # File doesn't exist, mark as error. file_name = os.path.split(str(track))[1] item_name = QtWidgets.QListWidgetItem(file_name) - item_name.setIcon(self.error_icon) + item_name.setIcon(UiIcons().error) item_name.setData(QtCore.Qt.UserRole, track) item_name.setToolTip(track) elif track_info.isFile(): @@ -388,9 +385,9 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): item_name = QtWidgets.QListWidgetItem(file_name) search = file_name.split('.')[-1].lower() if '*.{text}'.format(text=search) in self.media_controller.audio_extensions_list: - item_name.setIcon(self.audio_icon) + item_name.setIcon(UiIcons().audio) else: - item_name.setIcon(self.video_icon) + item_name.setIcon(UiIcons().video) item_name.setData(QtCore.Qt.UserRole, track) item_name.setToolTip(track) if item_name: diff --git a/resources/images/image_group.png b/resources/images/image_group.png deleted file mode 100644 index 352c3b0e2cf95bee00f408e745f6734567b8148d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1562 zcmV+#2IcvQP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipW5 z6$LIzCs;8600o*!L_t(o!|j(nsBKpf$A7cd+WXw=d)_2SA{u>&HVOtIDT7T4F<7K9 zq_Ge?8%v9Tjg5BJ76!BvENw(ku?PebC65?l5zWgpc^|&}?z?&So{#;pW-Mmb-RBVm z3nh&Q4tt+|ln4sc|8JGdV zNGa2If(QZ_VCFVr zU;-#;94g}H2#|mpPyZNZ!?VBs$#cIc0K;&fSKmD4pQl?&94_Jx4EXFPd%pa{SEOXY zFtWJAk_CX2ge)K;bjkN1LQaqb1b;UmC#aI_xdp|#>TgtI6Wktqr(fvG|A%x8lvP^<8%#~zYfH?Q>o1;A2fGi*Th0@mc` z_-0k+-8sj1-sAYz4aRYBI9s3w)v z&Rbv49M#knR2$^E7;;_%=nJNoOQx?vSuRm43|Fb{+?W<2e zY170)?|tm{*4Asd`d5WylwiJ?6D=D|K~4;+ES=H_h(XuRmdxqNZOYr%?tlK$3f8mI zMaDaWRU=enVFoI2n2p(lK7neqm%$iMLO)UKfvx(PH3FN03x<~>8>a|?YZ~$y&$qe<9Xm9|7 z2^iw=O*m^P%(1S)i#d`>Vlb;4slra(uxcFcoMRV(s`}qB7$ZYf5Bh**9rbfHY^%BB zs{Sk%lHYoMr`B|WU3Jo!KG-@I$PBt@{4VNoIl)Gk3r2y1SZiDv&C79^B2hC62Gi_2 zEH?I0jw#sN%CX<2DcF99m*Q*=9SF!Xj>LXfD{vsNn<1A#Rf3VNM%j4pL3s@U`(lU+l?V?j+T|xt@EfeFQxsVdI0aSeuY^zf&zI;S80+;>R%W4_e{!-p%=w8#B~Sqdb@ z-z{M#NKym^F@);X$1n^Lzekhk#cx3|-Ei{GFW~DR;XkI|Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipY* z5)3D=WNfMc00MeRL_t(I%XO1WNR&|&$A9O3*U86359omv5!5Ox=;5x?N<)Gu8iNRG z)v8@VBm`{&3tB`Gw5wJ0SV&+LNiIyJpd@-g3KqRg94p6pnDc%2o)+JXj8J!T;lTO* zf9G&7{O6?3ch4U|2tZQjAHHy68c`4c6>K7SfA3sN!))_a z4zz4->Dskqi=JKEDHlgNw0HcK^bGW*r0vvgZQa|3x)5W8Ah0~{?bAdeA&6m~Tfp5_ ztu(Am>cZTp^tCHH?hBL2dVM=KI&5>938o8EydIgrU|6%PhMkR@#3LwBt4p{uJjI(6 z87T|(wJU(gWm#vZevOgI=82~B1O|paXK|q;o&H8HGf7o6AKE}}2z9?9*P$dkh5RC5 z4Z}7wG0L047kvDhCNKgBf2OnS+r62C`wt@C@HA_<@Z}i!l0kkEumV!%R9aFUH}&+% zBV-FR7!zBn3NtfBhDUxAMoKlc3??6N+n*u)kt0!`WrU z7!fppDuE&eHsss5qKB~y5=8kKymR!J>sVF62vAB709OWiC;}EGBqZcl39nT7I#95x z5P8LUMSut}fKw2O-$tU6uXv1FF=FIA>J=*@7!wc} zKRZG>&6jSefW>vi1OW!Yj{VH===nR;M{|-)g@yj(uh>Kl-@cDyS1(`8rj6@yQ8=4a zsajd{72w3Y8V1InW2XwmC&kdWMxi1CUgJep5ihZ<6qZ0%09720La1HB(rtT)!tH>d sY7hifnH^shL`nh@%ZYdtrMkBNFJcfTonXt~p#T5?07*qoM6N<$g0JI4!vFvP diff --git a/resources/images/media_audio.png b/resources/images/media_audio.png deleted file mode 100644 index f05a5bf559842cda3f3c39aafab7aa045d25920d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1763 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.png - image_group.png - image_new_group.png - + bibles_book_sort.png bibles_search_combined.png @@ -68,9 +66,6 @@ media_time.png - media_audio.png - media_video.png - media_optical.png media_repeat.png slidecontroller_multimedia.png auto-start_active.png diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 9eaa8fe25..242b28477 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -98,7 +98,8 @@ MODULES = [ 'waitress', 'six', 'webob', - 'requests' + 'requests', + 'qtawesome' ]