From 89800c1a7dc8f45be7e4c343c4ef825b99fc906e Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Fri, 10 Oct 2014 10:29:52 -0700 Subject: [PATCH] Relocate second toolbar to top --- openlp/core/ui/projector/manager.py | 28 +++++++++++++++----------- resources/images/openlp-2.qrc | 2 ++ resources/images/projector_spacer.png | Bin 0 -> 170 bytes 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 resources/images/projector_spacer.png diff --git a/openlp/core/ui/projector/manager.py b/openlp/core/ui/projector/manager.py index 7adc3ac28..bad8d9ecd 100644 --- a/openlp/core/ui/projector/manager.py +++ b/openlp/core/ui/projector/manager.py @@ -132,34 +132,29 @@ class Ui_ProjectorManager(object): triggers=self.on_show_projector) self.top_toolbar.addSeparator() self.layout.addWidget(self.top_toolbar) - # Add the projector list box self.projector_widget = QtGui.QWidgetAction(self.top_toolbar) 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.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', 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'), triggers=self.on_connect_all_projectors) self.bottom_toolbar.add_toolbar_action('disconnect_all_projectors', text=translate('OpenLP.ProjectorManager', 'Disconnect from all projectors'), - icon=':/projector/projector_disconnect-tiled.png', + icon=':/projector/projector_disconnect_tiled.png', tooltip=translate('OpenLP.ProjectorManager', 'Disconnect from all projectors'), triggers=self.on_disconnect_all_projectors) self.bottom_toolbar.addSeparator() self.bottom_toolbar.add_toolbar_action('poweron_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'), triggers=self.on_poweron_all_projectors) self.bottom_toolbar.add_toolbar_action('poweroff_all_projectors', @@ -181,7 +176,16 @@ class Ui_ProjectorManager(object): tooltip=translate('OpenLP.ProjectorManager', 'Show all projector screens'), triggers=self.on_show_all_projectors) + self.bottom_toolbar.addSeparator() 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) # Build the context menu self.menu = QtGui.QMenu() diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index fd37afcc4..0d7c19e63 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -174,6 +174,7 @@ projector_blank.png projector_blank_tiled.png projector_connect.png + projector_connect_tiled.png projector_connectors.png projector_cooldown.png projector_disconnect.png @@ -193,6 +194,7 @@ projector_power_on_tiled.png projector_show.png projector_show_tiled.png + projector_spacer.png projector_status.png projector_warmup.png projector_view.png diff --git a/resources/images/projector_spacer.png b/resources/images/projector_spacer.png new file mode 100644 index 0000000000000000000000000000000000000000..ca5a54a04af8bc1b5e6b64c0f3821d01664d0393 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq7nh&}t6oLdYM_v0iEBiObAE1aYF-J0b5UwyNotBh zd1gt5g1e`0KzJjcI8c$0r;B5V#p&b(3D(64B0WqT3=Av+42-SztBQcK44$rjF6*2U FngGWaD7pXu literal 0 HcmV?d00001