Change Presentation Plugin to choose presentation software.

Trial version until superfly gets his hands on it!
This commit is contained in:
Tim Bentley 2009-05-18 17:04:34 +01:00
parent 27027eb051
commit 37b755affe
3 changed files with 49 additions and 25 deletions

View File

@ -20,5 +20,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
from filelistdata import FileListData from filelistdata import FileListData
from mediaitem import PresentationMediaItem from mediaitem import PresentationMediaItem
from presentationtab import PresentationTab
__all__ = ['PresentationMediaItem', 'FileListData'] __all__ = ['PresentationMediaItem', 'FileListData', 'PresentationTab']

View File

@ -72,6 +72,27 @@ class PresentationMediaItem(MediaManagerItem):
':/system/system_add.png',self.onPresentationAddClick, 'PresentationsAddItem') ':/system/system_add.png',self.onPresentationAddClick, 'PresentationsAddItem')
## Add the Presentationlist widget ## ## Add the Presentationlist widget ##
self.PresentationWidget = QtGui.QWidget(self)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.PresentationWidget.sizePolicy().hasHeightForWidth())
self.PresentationWidget.setSizePolicy(sizePolicy)
self.PresentationWidget.setObjectName('PresentationWidget')
self.DisplayLayout = QtGui.QGridLayout(self.PresentationWidget)
self.DisplayLayout.setObjectName('DisplayLayout')
self.DisplayTypeComboBox = QtGui.QComboBox(self.PresentationWidget)
self.DisplayTypeComboBox.setObjectName('DisplayTypeComboBox')
self.DisplayLayout.addWidget(self.DisplayTypeComboBox, 0, 1, 1, 2)
self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget)
self.DisplayTypeLabel.setObjectName('SearchTypeLabel')
self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1)
self.DisplayTypeLabel.setText(translate('PresentationMediaItem', u'Present using:'))
# Add the song widget to the page layout
self.PageLayout.addWidget(self.PresentationWidget)
self.PresentationsListView = QtGui.QListView() self.PresentationsListView = QtGui.QListView()
self.PresentationsListView.setAlternatingRowColors(True) self.PresentationsListView.setAlternatingRowColors(True)
self.PresentationsListData = FileListData() self.PresentationsListData = FileListData()
@ -95,6 +116,8 @@ class PresentationMediaItem(MediaManagerItem):
def initialise(self): def initialise(self):
list = self.parent.config.load_list(u'presentations') list = self.parent.config.load_list(u'presentations')
self.loadPresentationList(list) self.loadPresentationList(list)
self.DisplayTypeComboBox.addItem(u'Impress')
self.DisplayTypeComboBox.addItem(u'Powerpoint')
def onPresentationNewClick(self): def onPresentationNewClick(self):
files = QtGui.QFileDialog.getOpenFileNames(None, files = QtGui.QFileDialog.getOpenFileNames(None,

View File

@ -3,7 +3,7 @@
""" """
OpenLP - Open Source Lyrics Projection OpenLP - Open Source Lyrics Projection
Copyright (c) 2008 Raoul Snyman Copyright (c) 2008 Raoul Snyman
Portions copyright (c) 2008 Martin Thompson, Tim Bentley, Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
This program is free software; you can redistribute it and/or modify it under This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software the terms of the GNU General Public License as published by the Free Software
@ -22,9 +22,8 @@ import os
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.resources import *
from openlp.core.lib import Plugin, MediaManagerItem from openlp.core.lib import Plugin, MediaManagerItem
from openlp.plugins.presentations.lib import PresentationMediaItem from openlp.plugins.presentations.lib import PresentationMediaItem, PresentationTab
class PresentationPlugin(Plugin): class PresentationPlugin(Plugin):
@ -38,7 +37,8 @@ class PresentationPlugin(Plugin):
QtGui.QIcon.Normal, QtGui.QIcon.Off) QtGui.QIcon.Normal, QtGui.QIcon.Off)
def get_settings_tab(self): def get_settings_tab(self):
pass self.presentation_tab = PresentationTab()
return self.presentation_tab
def get_media_manager_item(self): def get_media_manager_item(self):
# Create the MediaManagerItem object # Create the MediaManagerItem object