openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

start projector

This commit is contained in:
Tim Bentley 2018-06-03 18:10:29 +01:00
parent 2f144c79d8
commit d0950f2bd5
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/projectors/manager.py
View File

@ -120,7 +120,7 @@ class UiProjectorManager(object):
self.one_toolbar.add_toolbar_action('connect_projector', self.one_toolbar.add_toolbar_action('connect_projector',
text=translate('OpenLP.ProjectorManager', text=translate('OpenLP.ProjectorManager',
'Connect to selected projector.'), 'Connect to selected projector.'),
icon=':/projector/projector_connect.png', icon=UiIcons().projector_connect,
tooltip=translate('OpenLP.ProjectorManager', tooltip=translate('OpenLP.ProjectorManager',
'Connect to selected projector.'), 'Connect to selected projector.'),
triggers=self.on_connect_projector) triggers=self.on_connect_projector)
@ -134,7 +134,7 @@ class UiProjectorManager(object):
self.one_toolbar.add_toolbar_action('disconnect_projector', self.one_toolbar.add_toolbar_action('disconnect_projector',
text=translate('OpenLP.ProjectorManager', text=translate('OpenLP.ProjectorManager',
'Disconnect from selected projectors'), 'Disconnect from selected projectors'),
icon=':/projector/projector_disconnect.png', icon=UiIcons().disconnect,
tooltip=translate('OpenLP.ProjectorManager', tooltip=translate('OpenLP.ProjectorManager',
'Disconnect from selected projector.'), 'Disconnect from selected projector.'),
triggers=self.on_disconnect_projector) triggers=self.on_disconnect_projector)
@ -149,7 +149,7 @@ class UiProjectorManager(object):
self.one_toolbar.add_toolbar_action('poweron_projector', self.one_toolbar.add_toolbar_action('poweron_projector',
text=translate('OpenLP.ProjectorManager', text=translate('OpenLP.ProjectorManager',
'Power on selected projector'), 'Power on selected projector'),
icon=':/projector/projector_power_on.png', icon=UiIcons().projector_on,
tooltip=translate('OpenLP.ProjectorManager', tooltip=translate('OpenLP.ProjectorManager',
'Power on selected projector.'), 'Power on selected projector.'),
triggers=self.on_poweron_projector) triggers=self.on_poweron_projector)
@ -162,7 +162,7 @@ class UiProjectorManager(object):
triggers=self.on_poweron_projector) triggers=self.on_poweron_projector)
self.one_toolbar.add_toolbar_action('poweroff_projector', self.one_toolbar.add_toolbar_action('poweroff_projector',
text=translate('OpenLP.ProjectorManager', 'Standby selected projector'), text=translate('OpenLP.ProjectorManager', 'Standby selected projector'),
icon=':/projector/projector_power_off.png', icon=UiIcons().projector_off,
tooltip=translate('OpenLP.ProjectorManager', tooltip=translate('OpenLP.ProjectorManager',
'Put selected projector in standby.'), 'Put selected projector in standby.'),
triggers=self.on_poweroff_projector) triggers=self.on_poweroff_projector)

3
openlp/core/projectors/tab.py
View File

@ -29,6 +29,7 @@ from PyQt5 import QtWidgets
from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.settings import Settings from openlp.core.common.settings import Settings
from openlp.core.lib import SettingsTab from openlp.core.lib import SettingsTab
from openlp.core.ui.icons import UiIcons
from openlp.core.projectors import DialogSourceStyle from openlp.core.projectors import DialogSourceStyle
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -45,7 +46,7 @@ class ProjectorTab(SettingsTab):
:param parent: Parent widget :param parent: Parent widget
""" """
self.icon_path = ':/projector/projector_manager.png' self.icon_path = UiIcons().projectore
projector_translated = translate('OpenLP.ProjectorTab', 'Projector') projector_translated = translate('OpenLP.ProjectorTab', 'Projector')
super(ProjectorTab, self).__init__(parent, 'Projector', projector_translated) super(ProjectorTab, self).__init__(parent, 'Projector', projector_translated)

9
openlp/core/ui/icons.py
View File

@ -109,6 +109,15 @@ class UiIcons(object):
'plus': {'icon': 'fa.plus'}, 'plus': {'icon': 'fa.plus'},
'presentation': {'icon': 'fa.bar-chart'}, 'presentation': {'icon': 'fa.bar-chart'},
'preview': {'icon': 'fa.laptop'}, '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'}, 'picture': {'icon': 'fa.picture-o'},
'print': {'icon': 'fa.print'}, 'print': {'icon': 'fa.print'},
'remote': {'icon': 'fa.rss'}, 'remote': {'icon': 'fa.rss'},

4
openlp/core/ui/mainwindow.py
View File

@ -157,7 +157,7 @@ class Ui_MainWindow(object):
# Create the projector manager # Create the projector manager
self.projector_manager_dock = OpenLPDockWidget(parent=main_window, self.projector_manager_dock = OpenLPDockWidget(parent=main_window,
name='projector_manager_dock', 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 = ProjectorManager(self.projector_manager_dock)
self.projector_manager_contents.setObjectName('projector_manager_contents') self.projector_manager_contents.setObjectName('projector_manager_contents')
self.projector_manager_dock.setWidget(self.projector_manager_contents) self.projector_manager_dock.setWidget(self.projector_manager_contents)
@ -200,7 +200,7 @@ class Ui_MainWindow(object):
can_shortcuts=False) can_shortcuts=False)
action_list.add_category(UiStrings().Import, CategoryOrder.standard_menu) action_list.add_category(UiStrings().Import, CategoryOrder.standard_menu)
self.view_projector_manager_item = create_action(main_window, 'viewProjectorManagerItem', self.view_projector_manager_item = create_action(main_window, 'viewProjectorManagerItem',
icon=':/projector/projector_manager.png', icon=UiIcons().projector,
checked=self.projector_manager_dock.isVisible(), checked=self.projector_manager_dock.isVisible(),
can_shortcuts=True, can_shortcuts=True,
category=UiStrings().View, category=UiStrings().View,

1
resources/images/openlp-2.qrc
View File

@ -65,7 +65,6 @@
<file>projector_error.png</file> <file>projector_error.png</file>
<file>projector_item_connect.png</file> <file>projector_item_connect.png</file>
<file>projector_item_disconnect.png</file> <file>projector_item_disconnect.png</file>
<file>projector_manager.png</file>
<file>projector_not_connected_error.png</file> <file>projector_not_connected_error.png</file>
<file>projector_off.png</file> <file>projector_off.png</file>
<file>projector_on.png</file> <file>projector_on.png</file>

BIN
resources/images/projector_manager.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 842 B