From d0950f2bd58af6b4199a95e7dffc368d60d692c0 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 3 Jun 2018 18:10:29 +0100 Subject: [PATCH] start projector --- openlp/core/projectors/manager.py | 8 ++++---- openlp/core/projectors/tab.py | 3 ++- openlp/core/ui/icons.py | 9 +++++++++ openlp/core/ui/mainwindow.py | 4 ++-- resources/images/openlp-2.qrc | 1 - resources/images/projector_manager.png | Bin 842 -> 0 bytes 6 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 resources/images/projector_manager.png diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py index 561a8f171..7447c7c6a 100644 --- a/openlp/core/projectors/manager.py +++ b/openlp/core/projectors/manager.py @@ -120,7 +120,7 @@ class UiProjectorManager(object): self.one_toolbar.add_toolbar_action('connect_projector', text=translate('OpenLP.ProjectorManager', 'Connect to selected projector.'), - icon=':/projector/projector_connect.png', + icon=UiIcons().projector_connect, tooltip=translate('OpenLP.ProjectorManager', 'Connect to selected projector.'), triggers=self.on_connect_projector) @@ -134,7 +134,7 @@ class UiProjectorManager(object): self.one_toolbar.add_toolbar_action('disconnect_projector', text=translate('OpenLP.ProjectorManager', 'Disconnect from selected projectors'), - icon=':/projector/projector_disconnect.png', + icon=UiIcons().disconnect, tooltip=translate('OpenLP.ProjectorManager', 'Disconnect from selected projector.'), triggers=self.on_disconnect_projector) @@ -149,7 +149,7 @@ class UiProjectorManager(object): self.one_toolbar.add_toolbar_action('poweron_projector', text=translate('OpenLP.ProjectorManager', 'Power on selected projector'), - icon=':/projector/projector_power_on.png', + icon=UiIcons().projector_on, tooltip=translate('OpenLP.ProjectorManager', 'Power on selected projector.'), triggers=self.on_poweron_projector) @@ -162,7 +162,7 @@ class UiProjectorManager(object): triggers=self.on_poweron_projector) self.one_toolbar.add_toolbar_action('poweroff_projector', text=translate('OpenLP.ProjectorManager', 'Standby selected projector'), - icon=':/projector/projector_power_off.png', + icon=UiIcons().projector_off, tooltip=translate('OpenLP.ProjectorManager', 'Put selected projector in standby.'), triggers=self.on_poweroff_projector) diff --git a/openlp/core/projectors/tab.py b/openlp/core/projectors/tab.py index 2f308d83a..934a54a80 100644 --- a/openlp/core/projectors/tab.py +++ b/openlp/core/projectors/tab.py @@ -29,6 +29,7 @@ from PyQt5 import QtWidgets from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.settings import Settings from openlp.core.lib import SettingsTab +from openlp.core.ui.icons import UiIcons from openlp.core.projectors import DialogSourceStyle log = logging.getLogger(__name__) @@ -45,7 +46,7 @@ class ProjectorTab(SettingsTab): :param parent: Parent widget """ - self.icon_path = ':/projector/projector_manager.png' + self.icon_path = UiIcons().projectore projector_translated = translate('OpenLP.ProjectorTab', 'Projector') super(ProjectorTab, self).__init__(parent, 'Projector', projector_translated) diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index 2d73f7f0a..1d29ec6f9 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -109,6 +109,15 @@ 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_connect': {'icon': 'fa.plug'}, + 'projector_cooldown': {'icon': 'fa.video', 'attr': 'blue'}, + 'projector_disconnect': {'icon': 'fa.plug', 'attr': 'lightGray'}, + 'projector_error': {'icon': 'fa.video', 'attr': 'red'}, + 'projector_off': {'icon': 'fa.video', 'attr': 'red'}, + 'projector_on': {'icon': 'fa.video', 'attr': 'green'}, + 'projector_warm': {'icon': 'fa.video', 'attr': 'yellow'}, 'picture': {'icon': 'fa.picture-o'}, 'print': {'icon': 'fa.print'}, 'remote': {'icon': 'fa.rss'}, diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 91d370af2..cb67eb360 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -157,7 +157,7 @@ class Ui_MainWindow(object): # Create the projector manager self.projector_manager_dock = OpenLPDockWidget(parent=main_window, name='projector_manager_dock', - icon=':/projector/projector_manager.png') + icon=UiIcons().projector) self.projector_manager_contents = ProjectorManager(self.projector_manager_dock) self.projector_manager_contents.setObjectName('projector_manager_contents') self.projector_manager_dock.setWidget(self.projector_manager_contents) @@ -200,7 +200,7 @@ class Ui_MainWindow(object): can_shortcuts=False) action_list.add_category(UiStrings().Import, CategoryOrder.standard_menu) self.view_projector_manager_item = create_action(main_window, 'viewProjectorManagerItem', - icon=':/projector/projector_manager.png', + icon=UiIcons().projector, checked=self.projector_manager_dock.isVisible(), can_shortcuts=True, category=UiStrings().View, diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 517176c2b..81091d194 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -65,7 +65,6 @@ projector_error.png projector_item_connect.png projector_item_disconnect.png - projector_manager.png projector_not_connected_error.png projector_off.png projector_on.png diff --git a/resources/images/projector_manager.png b/resources/images/projector_manager.png deleted file mode 100644 index 770fa572e6620d9fd491e3daebc5cebb777c4e87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 842 zcmV-Q1GW5#P)esFZCZ8VN6D(_rd_G{ABYIz z##OhjbQe$%bRjOZ2&Dv3q9PFu#0E7cPHpoclli)H&pqe7?gUGBeU?9X77si>x`;<2 z+()#7r@J8m5C8!J1qDDr_b3YhT?hXUS_oc14YMfu1#_bng-UvX;{A_a_3rbPJ|7_^ zi6RWdcCL;Z!r5Aru6_G7 zy@scvcCk%gjkanwcm|LG)v89N;;FMJL{_n10h?PP=!wMs<2`g01!MDET73MJM4$EZ zrXPRGa8a#}KH;&$gp72JV(uhG~GcK_-{ahJ{7(p2!fSAr?uM6fZ5 zi2z}!lp$OJlqy)cLo2^uADGg^;+?3~KaR?qbY7o-{zRU&w%(G?Cv$P2cgPO*K;)n} zKr@5%Dp#gHy<;XCK^LZ>bd8ax^fDedcYi!U$;VInu=LwWdj0mbc}o(ztEaxf_6GFQ z*rEVUo!OuM9=@_n7jW9#OA`kLf`AcFhL(MR7#