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

Fix authentication send, added current source to source select dialog

Browse Source
This commit is contained in:
Ken Roberts 2014-10-16 17:04:19 -07:00
parent 054be0135a
commit c1415bb891
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/projector/pjlink1.py
View File

@ -450,7 +450,7 @@ class PJLink1(QTcpSocket):
if salt is None:
out = '%s%s %s%s' % (PJLINK_HEADER, cmd, opts, CR)
else:
out = '%s%s %s%s' % (salt, cmd, opts, CR)
out = '%s%s%s %s%s' % (salt, PJLINK_HEADER, cmd, opts, CR)
if out in self.send_queue:
# Already there, so don't add
log.debug('(%s) send_command(out="%s") Already in queue - skipping' % (self.ip, out.strip()))

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

@ -361,6 +361,8 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
for item in source_list.keys():
sort.append(item)
sort.sort()
current = QtGui.QLabel(translate('OpenLP.ProjectorManager', 'Current source is %s' % source_list[projector.link.source]))
layout.addWidget(current)
for item in sort:
button = self._select_input_widget(parent=self,
selected=projector.link.source,