From ef5b597a8bcea1e7e3150f1265926599fd1ebc9f Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Tue, 14 Oct 2014 19:18:40 -0700 Subject: [PATCH] Fix missing information from view item --- openlp/core/ui/projector/manager.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openlp/core/ui/projector/manager.py b/openlp/core/ui/projector/manager.py index 8b9a5b238..0617a1ae8 100644 --- a/openlp/core/ui/projector/manager.py +++ b/openlp/core/ui/projector/manager.py @@ -606,8 +606,10 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa projector.link.pjlink_name) message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Manufacturer'), projector.link.manufacturer) - message = '%s%s: %s

' % (message, translate('OpenLP.ProjectorManager', 'Model'), - projector.link.model) + message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Model'), + projector.link.model) + message = '%s%s: %s

' % (message, translate('OpenLP.ProjectorManager', 'Other info'), + projector.link.other_info) message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Power status'), ERROR_MSG[projector.link.power]) message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Shutter is'), @@ -616,15 +618,6 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa message = '%s%s: %s
' % (message, translate('OpenLP.ProjectorManager', 'Current source input is'), projector.link.source) - message = '%s

' % message - if projector.link.projector_errors is None: - message = '%s%s' % (message, translate('OpenLP.ProjectorManager', 'No current errors or warnings')) - else: - message = '%s%s' % (message, translate('OpenLP.ProjectorManager', 'Current errors/warnings')) - for (key, val) in projector.link.projector_errors.items(): - message = '%s%s: %s
' % (message, key, ERROR_MSG[val]) - message = '%s

' % message - message = '%s%s
' % (message, translate('OpenLP.ProjectorManager', 'Lamp status')) count = 1 for item in projector.link.lamp: message = '%s %s %s (%s) %s: %s
' % (message, @@ -636,6 +629,13 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa translate('OpenLP.ProjectorManager', 'Hours'), item['Hours']) count = count + 1 + message = '%s

' % message + if projector.link.projector_errors is None: + message = '%s%s' % (message, translate('OpenLP.ProjectorManager', 'No current errors or warnings')) + else: + message = '%s%s' % (message, translate('OpenLP.ProjectorManager', 'Current errors/warnings')) + for (key, val) in projector.link.projector_errors.items(): + message = '%s%s: %s
' % (message, key, ERROR_MSG[val]) QtGui.QMessageBox.information(self, translate('OpenLP.ProjectorManager', 'Projector Information'), message) def _add_projector(self, projector):