raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Relocate second toolbar to top

Browse Source
This commit is contained in:
Ken Roberts 2014-10-10 10:29:52 -07:00
parent a58cf9754b
commit 89800c1a7d
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openlp/core/ui/projector/manager.py
View File

@ -132,34 +132,29 @@ class Ui_ProjectorManager(object):
triggers=self.on_show_projector) triggers=self.on_show_projector)
self.top_toolbar.addSeparator() self.top_toolbar.addSeparator()
self.layout.addWidget(self.top_toolbar) self.layout.addWidget(self.top_toolbar)
# Add the projector list box
self.projector_widget = QtGui.QWidgetAction(self.top_toolbar) self.projector_widget = QtGui.QWidgetAction(self.top_toolbar)
self.projector_widget.setObjectName('projector_widget') self.projector_widget.setObjectName('projector_widget')
# Create projector manager list
self.projector_list_widget = QtGui.QListWidget(widget)
self.projector_list_widget.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.projector_list_widget.setAlternatingRowColors(True)
self.projector_list_widget.setIconSize(QtCore.QSize(90, 50))
self.projector_list_widget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
self.projector_list_widget.setObjectName('projector_list_widget')
self.layout.addWidget(self.projector_list_widget)
self.bottom_toolbar = OpenLPToolbar(widget) self.bottom_toolbar = OpenLPToolbar(widget)
self.bottom_toolbar.add_toolbar_action('connect_all_projectors',
text=translate('OpenLP.ProjectorManager', 'Nothing here'),
icon=':/projector/projector_spacer.png')
self.bottom_toolbar.addSeparator()
self.bottom_toolbar.add_toolbar_action('connect_all_projectors', self.bottom_toolbar.add_toolbar_action('connect_all_projectors',
text=translate('OpenLP.ProjectorManager', 'Connect to all projectors'), text=translate('OpenLP.ProjectorManager', 'Connect to all projectors'),
icon=':/projector/projector_connect-tiled.png', icon=':/projector/projector_connect_tiled.png',
tootip=translate('OpenLP.ProjectorManager', 'Connect to all projectors'), tootip=translate('OpenLP.ProjectorManager', 'Connect to all projectors'),
triggers=self.on_connect_all_projectors) triggers=self.on_connect_all_projectors)
self.bottom_toolbar.add_toolbar_action('disconnect_all_projectors', self.bottom_toolbar.add_toolbar_action('disconnect_all_projectors',
text=translate('OpenLP.ProjectorManager', text=translate('OpenLP.ProjectorManager',
'Disconnect from all projectors'), 'Disconnect from all projectors'),
icon=':/projector/projector_disconnect-tiled.png', icon=':/projector/projector_disconnect_tiled.png',
tooltip=translate('OpenLP.ProjectorManager', tooltip=translate('OpenLP.ProjectorManager',
'Disconnect from all projectors'), 'Disconnect from all projectors'),
triggers=self.on_disconnect_all_projectors) triggers=self.on_disconnect_all_projectors)
self.bottom_toolbar.addSeparator() self.bottom_toolbar.addSeparator()
self.bottom_toolbar.add_toolbar_action('poweron_all_projectors', self.bottom_toolbar.add_toolbar_action('poweron_all_projectors',
text=translate('OpenLP.ProjectorManager', 'Power On All Projectors'), text=translate('OpenLP.ProjectorManager', 'Power On All Projectors'),
icon=':/projector/projector_power_on-tiled.png', icon=':/projector/projector_power_on_tiled.png',
tooltip=translate('OpenLP.ProjectorManager', 'Power on all projectors'), tooltip=translate('OpenLP.ProjectorManager', 'Power on all projectors'),
triggers=self.on_poweron_all_projectors) triggers=self.on_poweron_all_projectors)
self.bottom_toolbar.add_toolbar_action('poweroff_all_projectors', self.bottom_toolbar.add_toolbar_action('poweroff_all_projectors',
@ -181,7 +176,16 @@ class Ui_ProjectorManager(object):
tooltip=translate('OpenLP.ProjectorManager', tooltip=translate('OpenLP.ProjectorManager',
'Show all projector screens'), 'Show all projector screens'),
triggers=self.on_show_all_projectors) triggers=self.on_show_all_projectors)
self.bottom_toolbar.addSeparator()
self.layout.addWidget(self.bottom_toolbar, alignment=QtCore.Qt.AlignBottom) self.layout.addWidget(self.bottom_toolbar, alignment=QtCore.Qt.AlignBottom)
# Create projector manager list
self.projector_list_widget = QtGui.QListWidget(widget)
self.projector_list_widget.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
self.projector_list_widget.setAlternatingRowColors(True)
self.projector_list_widget.setIconSize(QtCore.QSize(90, 50))
self.projector_list_widget.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
self.projector_list_widget.setObjectName('projector_list_widget')
self.layout.addWidget(self.projector_list_widget)
self.projector_list_widget.customContextMenuRequested.connect(self.context_menu) self.projector_list_widget.customContextMenuRequested.connect(self.context_menu)
# Build the context menu # Build the context menu
self.menu = QtGui.QMenu() self.menu = QtGui.QMenu()

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

@ -174,6 +174,7 @@
<file>projector_blank.png</file> <file>projector_blank.png</file>
<file>projector_blank_tiled.png</file> <file>projector_blank_tiled.png</file>
<file>projector_connect.png</file> <file>projector_connect.png</file>
<file>projector_connect_tiled.png</file>
<file>projector_connectors.png</file> <file>projector_connectors.png</file>
<file>projector_cooldown.png</file> <file>projector_cooldown.png</file>
<file>projector_disconnect.png</file> <file>projector_disconnect.png</file>
@ -193,6 +194,7 @@
<file>projector_power_on_tiled.png</file> <file>projector_power_on_tiled.png</file>
<file>projector_show.png</file> <file>projector_show.png</file>
<file>projector_show_tiled.png</file> <file>projector_show_tiled.png</file>
<file>projector_spacer.png</file>
<file>projector_status.png</file> <file>projector_status.png</file>
<file>projector_warmup.png</file> <file>projector_warmup.png</file>
<file>projector_view.png</file> <file>projector_view.png</file>

BIN
resources/images/projector_spacer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 B