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

Cleanup and finish bits

This commit is contained in:
Tim Bentley 2010-05-04 21:01:45 +01:00
parent a0d081186a
commit e0bfaf07bc
4 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/lib/serviceitem.py
View File

@ -81,6 +81,7 @@ class ServiceItem(object):
self.notes = u'' self.notes = u''
self.from_plugin = False self.from_plugin = False
self.capabilities = [] self.capabilities = []
self.isValid = True
def add_capability(self, capability): def add_capability(self, capability):
self.capabilities.append(capability) self.capabilities.append(capability)

3
openlp/core/ui/generaltab.py
View File

@ -44,7 +44,8 @@ class GeneralTab(SettingsTab):
settings = QtCore.QSettings() settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection) settings.beginGroup(self.settingsSection)
self.MonitorNumber = settings.value(u'monitor', self.MonitorNumber = settings.value(u'monitor',
QtCore.QVariant(self.screens.monitor_number)).toInt()[0] QtCore.QVariant(self.screens.display_count - 1)).toInt()[0]
print self.MonitorNumber, self.screens.monitor_number, self.screens.display_count, self.screens.screen_list
self.screens.set_current_display(self.MonitorNumber) self.screens.set_current_display(self.MonitorNumber)
self.screens.monitor_number = self.MonitorNumber self.screens.monitor_number = self.MonitorNumber
self.DisplayOnMonitor = settings.value( self.DisplayOnMonitor = settings.value(

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

@ -326,7 +326,7 @@ class ServiceManager(QtGui.QWidget):
Called by a signal to select a specific item Called by a signal to select a specific item
""" """
self.setItem(int(message[0])) self.setItem(int(message[0]))
def setItem(self, index): def setItem(self, index):
""" """
Makes a specific item in the service live Makes a specific item in the service live
@ -495,19 +495,22 @@ class ServiceManager(QtGui.QWidget):
for itemcount, item in enumerate(self.serviceItems): for itemcount, item in enumerate(self.serviceItems):
serviceitem = item[u'service_item'] serviceitem = item[u'service_item']
treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList) treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
if serviceitem.notes: if serviceitem.isValid:
icon = QtGui.QImage(serviceitem.icon) if serviceitem.notes:
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, icon = QtGui.QImage(serviceitem.icon)
QtCore.Qt.SmoothTransformation) icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
overlay = QtGui.QImage(':/services/service_item_notes.png') QtCore.Qt.SmoothTransformation)
overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio, overlay = QtGui.QImage(':/services/service_item_notes.png')
QtCore.Qt.SmoothTransformation) overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
painter = QtGui.QPainter(icon) QtCore.Qt.SmoothTransformation)
painter.drawImage(0, 0, overlay) painter = QtGui.QPainter(icon)
painter.end() painter.drawImage(0, 0, overlay)
treewidgetitem.setIcon(0, build_icon(icon)) painter.end()
treewidgetitem.setIcon(0, build_icon(icon))
else:
treewidgetitem.setIcon(0, serviceitem.iconic_representation)
else: else:
treewidgetitem.setIcon(0, serviceitem.iconic_representation) treewidgetitem.setIcon(0, build_icon(u':/general/general_delete.png'))
treewidgetitem.setText(0, serviceitem.title) treewidgetitem.setText(0, serviceitem.title)
treewidgetitem.setToolTip(0, serviceitem.notes) treewidgetitem.setToolTip(0, serviceitem.notes)
treewidgetitem.setData(0, QtCore.Qt.UserRole, treewidgetitem.setData(0, QtCore.Qt.UserRole,
@ -651,8 +654,8 @@ class ServiceManager(QtGui.QWidget):
serviceitem = ServiceItem() serviceitem = ServiceItem()
serviceitem.RenderManager = self.parent.RenderManager serviceitem.RenderManager = self.parent.RenderManager
serviceitem.set_from_service(item, self.servicePath) serviceitem.set_from_service(item, self.servicePath)
if self.validateItem(serviceitem): self.validateItem(serviceitem)
self.addServiceItem(serviceitem) self.addServiceItem(serviceitem)
try: try:
if os.path.isfile(p_file): if os.path.isfile(p_file):
os.remove(p_file) os.remove(p_file)
@ -671,12 +674,15 @@ class ServiceManager(QtGui.QWidget):
self.parent.serviceChanged(True, self.serviceName) self.parent.serviceChanged(True, self.serviceName)
def validateItem(self, serviceItem): def validateItem(self, serviceItem):
# print "---" """
# print serviceItem.name Validates the service item and if the suffix matches an accepted
# print serviceItem.title one it allows the item to be displayed
# print serviceItem.service_item_path """
# print serviceItem.service_item_type print serviceItem.title
return True if serviceItem.is_command():
type = serviceItem._raw_frames[0][u'title'].split(u'.')[1]
if type not in ['odp']:
serviceItem.isValid = False
def cleanUp(self): def cleanUp(self):
""" """
@ -778,17 +784,26 @@ class ServiceManager(QtGui.QWidget):
Send the current item to the Live slide controller Send the current item to the Live slide controller
""" """
item, count = self.findServiceItem() item, count = self.findServiceItem()
self.parent.LiveController.addServiceManagerItem( if self.serviceItems[item][u'service_item'].isValid:
self.serviceItems[item][u'service_item'], count) self.parent.LiveController.addServiceManagerItem(
if QtCore.QSettings().value( self.serviceItems[item][u'service_item'], count)
self.parent.generalSettingsSection + u'/auto preview', if QtCore.QSettings().value(
QtCore.QVariant(False)).toBool(): self.parent.generalSettingsSection + u'/auto preview',
item += 1 QtCore.QVariant(False)).toBool():
if self.serviceItems and item < len(self.serviceItems) and \ item += 1
self.serviceItems[item][u'service_item'].is_capable( if self.serviceItems and item < len(self.serviceItems) and \
ItemCapabilities.AllowsPreview): self.serviceItems[item][u'service_item'].is_capable(
self.parent.PreviewController.addServiceManagerItem( ItemCapabilities.AllowsPreview):
self.serviceItems[item][u'service_item'], 0) self.parent.PreviewController.addServiceManagerItem(
self.serviceItems[item][u'service_item'], 0)
else:
QtGui.QMessageBox.critical(self,
self.trUtf8('Missing Display Handler?'),
self.trUtf8('Your item cannot be display as '
'there is no handler to display it?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
def remoteEdit(self): def remoteEdit(self):
""" """
@ -920,7 +935,7 @@ class ServiceManager(QtGui.QWidget):
return item.data(0, QtCore.Qt.UserRole).toInt()[0] return item.data(0, QtCore.Qt.UserRole).toInt()[0]
else: else:
return parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] return parentitem.data(0, QtCore.Qt.UserRole).toInt()[0]
def listRequest(self, message=None): def listRequest(self, message=None):
data = [] data = []
curindex, count = self.findServiceItem() curindex, count = self.findServiceItem()

1
openlp/plugins/presentations/presentationplugin.py
View File

@ -53,6 +53,7 @@ class PresentationPlugin(Plugin):
log.info(u'Presentations Initialising') log.info(u'Presentations Initialising')
Plugin.initialise(self) Plugin.initialise(self)
self.insert_toolbox_item() self.insert_toolbox_item()
presentation_types = []
for controller in self.controllers: for controller in self.controllers:
if self.controllers[controller].enabled: if self.controllers[controller].enabled:
self.controllers[controller].start_process() self.controllers[controller].start_process()