From cd011842a043dab2acba501fcf9211052767c419 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 6 May 2018 21:11:06 +0100 Subject: [PATCH] more bits --- openlp/core/ui/icons.py | 3 +++ openlp/core/ui/servicemanager.py | 11 +++++------ .../plugins/songs/forms/songmaintenancedialog.py | 2 +- resources/images/auto-start_active.png | Bin 815 -> 0 bytes resources/images/auto-start_inactive.png | Bin 767 -> 0 bytes resources/images/book_maintenance.png | Bin 1722 -> 0 bytes resources/images/openlp-2.qrc | 3 --- 7 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 resources/images/auto-start_active.png delete mode 100644 resources/images/auto-start_inactive.png delete mode 100644 resources/images/book_maintenance.png diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index c9ab20590..a8c68890a 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -54,6 +54,7 @@ class UiIcons(object): color_disabled=palette.color(QtGui.QPalette.Disabled, QtGui.QPalette.ButtonText)) icon_list = { + 'active': {'icon': 'fa.child'}, 'add': {'icon': 'fa.plus-circle'}, 'alert': {'icon': 'fa.exclamation-triangle'}, 'arrow_down': {'icon': 'fa.arrow-down'}, @@ -65,6 +66,7 @@ class UiIcons(object): 'back': {'icon': 'fa.step-backward'}, 'bible': {'icon': 'fa.book'}, 'blank': {'icon': 'fa.times-circle'}, + 'book': {'icon': 'fa.book'}, 'bottom': {'icon': 'fa.angle-double-down'}, 'clock': {'icon': 'fa.clock-o'}, 'clone': {'icon': 'fa.clone'}, @@ -79,6 +81,7 @@ class UiIcons(object): 'email': {'icon': 'fa.envelope'}, 'exit': {'icon': 'fa.sign-out'}, 'group': {'icon': 'fa.object-group'}, + 'inactive': {'icon': 'fa.child', 'attr': 'color=\'red\''}, 'info': {'icon': 'fa.info'}, 'live': {'icon': 'fa.desktop'}, 'manual': {'icon': 'fa.graduation-cap'}, diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 7a036df46..ee228e01f 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -253,7 +253,7 @@ class Ui_ServiceManager(object): self.time_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Start Time'), icon=':/media/media_time.png', triggers=self.on_start_time_form) self.auto_start_action = create_widget_action(self.menu, text='', - icon=':/media/auto-start_active.png', + icon=UiIcons().active, triggers=self.on_auto_start) # Add already existing delete action to the menu. self.menu.addAction(self.delete_action) @@ -315,8 +315,6 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi Sets up the service manager, toolbars, list view, et al. """ super().__init__(parent) - self.active = build_icon(':/media/auto-start_active.png') - self.inactive = build_icon(':/media/auto-start_inactive.png') self.service_items = [] self.suffixes = [] self.drop_position = -1 @@ -799,11 +797,12 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi self.time_action.setVisible(True) if service_item['service_item'].is_capable(ItemCapabilities.CanAutoStartForLive): self.auto_start_action.setVisible(True) - self.auto_start_action.setIcon(self.inactive) - self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive')) if service_item['service_item'].will_auto_start: self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - active')) - self.auto_start_action.setIcon(self.active) + self.auto_start_action.setIcon(UiIcons().active) + else: + self.auto_start_action.setIcon(UiIcons().inactive) + self.auto_start_action.setText(translate('OpenLP.ServiceManager', '&Auto Start - inactive')) if service_item['service_item'].is_text(): for plugin in self.plugin_manager.plugins: if plugin.name == 'custom' and plugin.status == PluginStatus.Active: diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 4df97ede1..fdcbfdc84 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -52,7 +52,7 @@ class Ui_SongMaintenanceDialog(object): self.topics_list_item = QtWidgets.QListWidgetItem(self.type_list_widget) self.topics_list_item.setIcon(build_icon(':/songs/topic_maintenance.png')) self.books_list_item = QtWidgets.QListWidgetItem(self.type_list_widget) - self.books_list_item.setIcon(build_icon(':/songs/book_maintenance.png')) + self.books_list_item.setIcon(UiIcons().book) self.dialog_layout.addWidget(self.type_list_widget, 0, 0) self.stacked_layout = QtWidgets.QStackedLayout() self.stacked_layout.setObjectName('stacked_layout') diff --git a/resources/images/auto-start_active.png b/resources/images/auto-start_active.png deleted file mode 100644 index 4213f429f0f379b470bcbfc598215a65523f8307..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 815 zcmV+~1JL}5P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iyS@ z01Y;*@J!(V00OT`L_t(I%Z*Z7NRx3KJ^yc;yW^&5W=2^WPLmQPT}63`9<(r0iV%IN zsLWm(`A`oLL7_Myda53xppdM{une&b%~E?=h_;EhhMQ|{pS$QT-}Zg~9>fr`*?B$Z zcR1(pBZz??&vGzsn#fMiP`%J>-Jv5AnK?LZs?I!`HA*%Pu4&ex$=34K02{)LSA1t!Z|LXjjP<^XNZE z)a$0sD78vN#UNb71-T}YrBu6X6)Im^T$}*4im8cNAx^^YW8_*2Aw+_+{gj;;A!4Zt zf)MA4@LSsb0nekD1_V?EfY2}t5s{KGO)})39%^0TyPLDu{)5T3LjVA&Ha(Hh2!xOe zU_x|zZk}h_ZI-{OOpSvxcsFW~~T# zZB$9dHWwa0F;>}V#H+hS%L#7QRWarI??Xwc$pvx=OCb`Gpg#bYGi)xXx9I?aUgOTP z#Q4RY_+&Mei5W6yr||Zpy~tM$4bE tO0Qamy?$AP!zF6Vzi5w_OMEN<{08M#G8&@?@YnzV002ovPDHLkV1jRYZB76H diff --git a/resources/images/auto-start_inactive.png b/resources/images/auto-start_inactive.png deleted file mode 100644 index 2e6ed64cd2c242afd764dd79b7e6dc79319f7838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 767 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 QTmS$707*qoM6N<$f|qq3i~s-t diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 0462b463f..645725049 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -5,7 +5,6 @@ song_search_lyrics.png song_search_title.png song_search_topic.png - book_maintenance.png topic_maintenance.png @@ -56,8 +55,6 @@ media_time.png slidecontroller_multimedia.png - auto-start_active.png - auto-start_inactive.png multimedia-player.png