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

Fix notes edit not clearing between calls, added projectoreditform tests

This commit is contained in:
Ken Roberts 2014-12-18 10:50:51 -08:00
parent 926f89eece
commit c596940a15
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/ui/projector/editform.py
View File

@ -132,6 +132,8 @@ class Ui_ProjectorEditForm(object):
self.location_label.setText(translate('OpenLP.ProjectorEditForm', 'Location'))
self.location_text.setText(self.projector.location)
self.notes_label.setText(translate('OpenLP.ProjectorEditForm', 'Notes'))
self.notes_text.selectAll()
self.notes_text.cut()
self.notes_text.insertPlainText(self.projector.notes)
@ -158,7 +160,7 @@ class ProjectorEditForm(QDialog, Ui_ProjectorEditForm):
self.button_box.helpRequested.connect(self.help_me)
self.button_box.rejected.connect(self.cancel_me)
def exec_(self, projector=None):
def exec_(self, projector=None, test=False):
if projector is None:
self.projector = Projector()
self.new_projector = True
@ -167,7 +169,8 @@ class ProjectorEditForm(QDialog, Ui_ProjectorEditForm):
self.new_projector = False
self.retranslateUi(self)
reply = QDialog.exec_(self)
self.projector = None
if not test:
self.projector = None
return reply
@pyqtSlot()

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

@ -562,9 +562,8 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QWidget, Ui_ProjectorManager,
return
self.old_projector = projector
projector.link.disconnect_from_host()
record = self.projectordb.get_projector_by_ip(projector.link.ip)
self.projector_form.exec_(record)
new_record = self.projectordb.get_projector_by_id(record.id)
self.projector_form.exec(projector.db_item)
projector.db_item = self.projectordb.get_projector_by_id(self.old_projector.db_item.id)
def on_poweroff_projector(self, opt=None):
"""