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

Fix bug 642754 in service manager

This commit is contained in:
Tim Bentley 2010-09-21 20:05:45 +01:00
parent 1c58fcda9f
commit 3e0a3f799b
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/ui/maindisplay.py
View File

@ -327,7 +327,10 @@ class MainDisplay(DisplayWidget):
while not self.loaded: while not self.loaded:
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
# if was hidden keep it hidden # if was hidden keep it hidden
if self.hide_mode and self.isLive: if self.isLive:
# self.setVisible(True)
# # if was hidden keep it hidden
# if self.hide_mode and self.isLive:
self.hideDisplay(self.hide_mode) self.hideDisplay(self.hide_mode)
preview = QtGui.QImage(self.screen[u'size'].width(), preview = QtGui.QImage(self.screen[u'size'].width(),
self.screen[u'size'].height(), self.screen[u'size'].height(),

34
openlp/core/ui/servicemanager.py
View File

@ -383,20 +383,20 @@ class ServiceManager(QtGui.QWidget):
serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList) serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList)
tempItem = None tempItem = None
setLastItem = False setLastItem = False
while serviceIterator: while serviceIterator.value():
if serviceIterator.isSelected() and tempItem is None: if serviceIterator.value().isSelected() and tempItem is None:
setLastItem = True setLastItem = True
serviceIterator.setSelected(False) serviceIterator.value().setSelected(False)
if serviceIterator.isSelected(): if serviceIterator.value().isSelected():
#We are on the first record # We are on the first record
if tempItem: if tempItem:
tempItem.setSelected(True) tempItem.setSelected(True)
serviceIterator.setSelected(False) serviceIterator.value().setSelected(False)
else: else:
tempItem = serviceIterator tempItem = serviceIterator.value()
lastItem = serviceIterator lastItem = serviceIterator.value()
++serviceIterator serviceIterator += 1
#Top Item was selected so set the last one # Top Item was selected so set the last one
if setLastItem: if setLastItem:
lastItem.setSelected(True) lastItem.setSelected(True)
@ -406,16 +406,18 @@ class ServiceManager(QtGui.QWidget):
Called by the down arrow Called by the down arrow
""" """
serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList) serviceIterator = QtGui.QTreeWidgetItemIterator(self.serviceManagerList)
firstItem = serviceIterator firstItem = None
setSelected = False setSelected = False
while serviceIterator: while serviceIterator.value():
if not firstItem:
firstItem = serviceIterator.value()
if setSelected: if setSelected:
setSelected = False setSelected = False
serviceIterator.setSelected(True) serviceIterator.value().setSelected(True)
elif serviceIterator.isSelected(): elif serviceIterator.value() and serviceIterator.value().isSelected():
serviceIterator.setSelected(False) serviceIterator.value().setSelected(False)
setSelected = True setSelected = True
++serviceIterator serviceIterator += 1
if setSelected: if setSelected:
firstItem.setSelected(True) firstItem.setSelected(True)