diff --git a/openlp/core/lib/projector/pjlink1.py b/openlp/core/lib/projector/pjlink1.py
index 10a03adfa..e3777acfd 100644
--- a/openlp/core/lib/projector/pjlink1.py
+++ b/openlp/core/lib/projector/pjlink1.py
@@ -123,11 +123,14 @@ class PJLink1(QTcpSocket):
# Convert seconds to milliseconds
self.poll_time = kwargs['poll_time'] * 1000
else:
- # Default
+ # Default 20 seconds
self.poll_time = 20000
if 'socket_timeout' in kwargs:
# Convert seconds to milliseconds
self.socket_timeout = kwargs['socket_timeout'] * 1000
+ else:
+ # Default is 5 seconds
+ self.socket_timeout = 5000
self.i_am_running = False
self.status_connect = S_NOT_CONNECTED
self.last_command = ''
diff --git a/openlp/core/ui/projector/manager.py b/openlp/core/ui/projector/manager.py
index 21cdebedc..8b9a5b238 100644
--- a/openlp/core/ui/projector/manager.py
+++ b/openlp/core/ui/projector/manager.py
@@ -58,10 +58,10 @@ STATUS_ICONS = {S_NOT_CONNECTED: ':/projector/projector_item_disconnect.png',
S_ON: ':/projector/projector_on.png',
S_COOLDOWN: ':/projector/projector_cooldown.png',
E_ERROR: ':/projector/projector_error.png',
- E_NETWORK: ':/projector/projector_not_connected.png',
- E_AUTHENTICATION: ':/projector/projector_not_connected.png',
- E_UNKNOWN_SOCKET_ERROR: ':/icons/projector_not_connected.png',
- E_NOT_CONNECTED: ':/projector/projector_not_connected.png'
+ E_NETWORK: ':/projector/projector_not_connected_error.png',
+ E_AUTHENTICATION: ':/projector/projector_not_connected_error.png',
+ E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png',
+ E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png'
}
@@ -80,54 +80,46 @@ class Ui_ProjectorManager(object):
self.layout.setSpacing(0)
self.layout.setMargin(0)
self.layout.setObjectName('layout')
- # Add spacer toolbar
- self.no_toolbar = OpenLPToolbar(widget)
- self.no_toolbar.add_toolbar_action('new_projector',
- text=translate('OpenLP.Projector', 'Add Projector'),
- icon=':/projector/projector_new.png',
- tooltip=translate('OpenLP.ProjectorManager', 'Add a new projector'),
- triggers=self.on_add_projector)
- self.no_toolbar.addSeparator()
- self.no_toolbar.add_toolbar_action('connect_no_projectors',
- icon=':/projector/projector_connect.png',
- enabled=False)
- self.no_toolbar.add_toolbar_action('disconnect_no_projectors',
- icon=':/projector/projector_disconnect.png',
- enabled=False)
- self.no_toolbar.addSeparator()
- self.no_toolbar.add_toolbar_action('poweron_no_projectors',
- icon=':/projector/projector_power_on.png',
- enabled=False)
- self.no_toolbar.add_toolbar_action('poweroff_no_projectors',
- icon=':/projector/projector_power_off.png',
- enabled=False)
- self.no_toolbar.addSeparator()
- self.no_toolbar.add_toolbar_action('blank_no_projectors',
- icon=':/projector/projector_blank.png',
- enabled=False)
- self.no_toolbar.add_toolbar_action('show_no_projectors',
- icon=':/projector/projector_show.png',
- enabled=False)
- self.no_toolbar.addSeparator()
- self.layout.addWidget(self.no_toolbar)
- self.projector_one_widget = QtGui.QWidgetAction(self.no_toolbar)
- self.projector_one_widget.setObjectName('projector_no_toolbar_widget')
# Add one selection toolbar
self.one_toolbar = OpenLPToolbar(widget)
self.one_toolbar.add_toolbar_action('new_projector',
- text=translate('OpenLP.Projector', 'Add Projector'),
+ text=translate('OpenLP.ProjectorManager', 'Add Projector'),
icon=':/projector/projector_new.png',
tooltip=translate('OpenLP.ProjectorManager', 'Add a new projector'),
triggers=self.on_add_projector)
+ # Show edit/delete when projector not connected
+ self.one_toolbar.add_toolbar_action('edit_projector',
+ text=translate('OpenLP.ProjectorManager', 'Edit Projector'),
+ icon=':/general/general_edit.png',
+ tooltip=translate('OpenLP.ProjectorManager', 'Edit selected projector'),
+ triggers=self.on_edit_projector)
+ self.one_toolbar.add_toolbar_action('delete_projector',
+ text=translate('OpenLP.ProjectorManager', 'Delete Projector'),
+ icon=':/general/general_delete.png',
+ tooltip=translate('OpenLP.ProjectorManager', 'Delete selected projector'),
+ triggers=self.on_delete_projector)
+ # Show source/view when projector connected
+ self.one_toolbar.add_toolbar_action('source_projector',
+ text=translate('OpenLP.ProjectorManager', 'Select Input Source'),
+ icon=':/projector/projector_hdmi.png',
+ tooltip=translate('OpenLP.ProjectorManager',
+ 'Choose input source on selected projector'),
+ triggers=self.on_select_input)
+ self.one_toolbar.add_toolbar_action('view_projector',
+ text=translate('OpenLP.ProjectorManager', 'View Projector'),
+ icon=':/general/general_find.png',
+ tooltip=translate('OpenLP.ProjectorManager',
+ 'View selected projector information'),
+ triggers=self.on_status_projector)
self.one_toolbar.addSeparator()
- self.one_toolbar.add_toolbar_action('connect_selected_projectors',
+ self.one_toolbar.add_toolbar_action('connect_projector',
text=translate('OpenLP.ProjectorManager',
'Connect to selected projector'),
icon=':/projector/projector_connect.png',
tootip=translate('OpenLP.ProjectorManager',
'Connect to selected projector'),
triggers=self.on_connect_projector)
- self.one_toolbar.add_toolbar_action('disconnect_selected_projectors',
+ self.one_toolbar.add_toolbar_action('disconnect_projector',
text=translate('OpenLP.ProjectorManager',
'Disconnect from selected projector'),
icon=':/projector/projector_disconnect.png',
@@ -135,28 +127,28 @@ class Ui_ProjectorManager(object):
'Disconnect from selected projector'),
triggers=self.on_disconnect_projector)
self.one_toolbar.addSeparator()
- self.one_toolbar.add_toolbar_action('poweron_selected_projectors',
+ self.one_toolbar.add_toolbar_action('poweron_projector',
text=translate('OpenLP.ProjectorManager',
'Power on selected projector'),
icon=':/projector/projector_power_on.png',
tooltip=translate('OpenLP.ProjectorManager',
'Power on selected projector'),
triggers=self.on_poweron_projector)
- self.one_toolbar.add_toolbar_action('poweroff_selected_projectors',
+ self.one_toolbar.add_toolbar_action('poweroff_projector',
text=translate('OpenLP.ProjectorManager', 'Standby selected projector'),
icon=':/projector/projector_power_off.png',
tooltip=translate('OpenLP.ProjectorManager',
'Put selected projector in standby'),
triggers=self.on_poweroff_projector)
self.one_toolbar.addSeparator()
- self.one_toolbar.add_toolbar_action('blank_selected_projectors',
+ self.one_toolbar.add_toolbar_action('blank_projector',
text=translate('OpenLP.ProjectorManager',
'Blank selected projector screen'),
icon=':/projector/projector_blank.png',
tooltip=translate('OpenLP.ProjectorManager',
'Blank selected projector screen'),
triggers=self.on_blank_projector)
- self.one_toolbar.add_toolbar_action('show_selected_projectors',
+ self.one_toolbar.add_toolbar_action('show_projector',
ext=translate('OpenLP.ProjectorManager',
'Show selected projector screen'),
icon=':/projector/projector_show.png',
@@ -167,61 +159,6 @@ class Ui_ProjectorManager(object):
self.layout.addWidget(self.one_toolbar)
self.projector_one_widget = QtGui.QWidgetAction(self.one_toolbar)
self.projector_one_widget.setObjectName('projector_one_toolbar_widget')
- # Add many selection toolbar
- self.many_toolbar = OpenLPToolbar(widget)
- self.many_toolbar.add_toolbar_action('new_projector',
- text=translate('OpenLP.Projector', 'Add Projector'),
- icon=':/projector/projector_new.png',
- tooltip=translate('OpenLP.ProjectorManager', 'Add a new projector'),
- triggers=self.on_add_projector)
- self.many_toolbar.addSeparator()
- self.many_toolbar.add_toolbar_action('connect_selected_projectors',
- text=translate('OpenLP.ProjectorManager',
- 'Connect to selected projectors'),
- icon=':/projector/projector_connect_tiled.png',
- tootip=translate('OpenLP.ProjectorManager',
- 'Connect to selected projectors'),
- triggers=self.on_connect_projector)
- self.many_toolbar.add_toolbar_action('disconnect_selected_projectors',
- text=translate('OpenLP.ProjectorManager',
- 'Disconnect from selected projectors'),
- icon=':/projector/projector_disconnect_tiled.png',
- tooltip=translate('OpenLP.ProjectorManager',
- 'Disconnect from selected projectors'),
- triggers=self.on_disconnect_projector)
- self.many_toolbar.addSeparator()
- self.many_toolbar.add_toolbar_action('poweron_selected_projectors',
- text=translate('OpenLP.ProjectorManager',
- 'Power on selected projectors'),
- icon=':/projector/projector_power_on_tiled.png',
- tooltip=translate('OpenLP.ProjectorManager',
- 'Power on selected projectors'),
- triggers=self.on_poweron_projector)
- self.many_toolbar.add_toolbar_action('poweroff_selected_projectors',
- text=translate('OpenLP.ProjectorManager', 'Standby selected projectors'),
- icon=':/projector/projector_power_off_tiled.png',
- tooltip=translate('OpenLP.ProjectorManager',
- 'Put selected projectors in standby'),
- triggers=self.on_poweroff_projector)
- self.many_toolbar.addSeparator()
- self.many_toolbar.add_toolbar_action('blank_selected_projectors',
- text=translate('OpenLP.ProjectorManager',
- 'Blank selected projector screens'),
- icon=':/projector/projector_blank_tiled.png',
- tooltip=translate('OpenLP.ProjectorManager',
- 'Blank selected projector screens'),
- triggers=self.on_blank_projector)
- self.many_toolbar.add_toolbar_action('show_selected_projectors',
- ext=translate('OpenLP.ProjectorManager',
- 'Show selected projector screens'),
- icon=':/projector/projector_show_tiled.png',
- tooltip=translate('OpenLP.ProjectorManager',
- 'Show selected projector screens'),
- triggers=self.on_show_projector)
- self.many_toolbar.addSeparator()
- self.layout.addWidget(self.many_toolbar)
- self.projector_one_widget = QtGui.QWidgetAction(self.many_toolbar)
- self.projector_one_widget.setObjectName('projector_many_toolbar_widget')
# Create projector manager list
self.projector_list_widget = QtGui.QListWidget(widget)
self.projector_list_widget.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
@@ -233,14 +170,9 @@ class Ui_ProjectorManager(object):
self.projector_list_widget.customContextMenuRequested.connect(self.context_menu)
# Build the context menu
self.menu = QtGui.QMenu()
- self.view_action = create_widget_action(self.menu,
- text=translate('OpenLP.ProjectorManager',
- '&View Projector Information'),
- icon=':/projector/projector_view.png',
- triggers=self.on_view_projector)
self.status_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
- 'View &Projector Status'),
+ '&View Projector Information'),
icon=':/projector/projector_status.png',
triggers=self.on_status_projector)
self.edit_action = create_widget_action(self.menu,
@@ -345,7 +277,6 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
log.debug('(%s) Building menu - visible = %s' % (projector_name, visible))
self.delete_action.setVisible(True)
self.edit_action.setVisible(True)
- self.view_action.setVisible(True)
self.connect_action.setVisible(not visible)
self.disconnect_action.setVisible(visible)
self.status_action.setVisible(visible)
@@ -664,11 +595,15 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
projector.link.ip)
message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Port'),
projector.link.port)
+ message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Notes'),
+ projector.link.notes)
message = '%s