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

Head928

This commit is contained in:
Tim Bentley 2010-07-09 20:46:40 +01:00
parent 341e0a165b e32b349d2c
commit b438cb22a5
22 changed files with 325 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
openlp/core/lib/mediamanageritem.py
View File

@ -66,7 +66,7 @@ class MediaManagerItem(QtGui.QWidget):
The shortened (usually singular) name for the plugin e.g. *'Song'* The shortened (usually singular) name for the plugin e.g. *'Song'*
for the Songs plugin. for the Songs plugin.
``self.PluginNameVisible`` ``self.pluginNameVisible``
The user visible name for a plugin which should use a suitable The user visible name for a plugin which should use a suitable
translation function. translation function.
@ -108,21 +108,17 @@ class MediaManagerItem(QtGui.QWidget):
self.icon = None self.icon = None
if title: if title:
self.title = title self.title = title
self.Toolbar = None self.toolbar = None
self.remoteTriggered = None self.remoteTriggered = None
self.ServiceItemIconName = None self.serviceItemIconName = None
self.singleServiceItem = True self.singleServiceItem = True
self.PageLayout = QtGui.QVBoxLayout(self) self.pageLayout = QtGui.QVBoxLayout(self)
self.PageLayout.setSpacing(0) self.pageLayout.setSpacing(0)
self.PageLayout.setContentsMargins(4, 0, 4, 0) self.pageLayout.setContentsMargins(4, 0, 4, 0)
self.requiredIcons() self.requiredIcons()
self.initPluginNameVisible()
self.setupUi() self.setupUi()
self.retranslateUi() self.retranslateUi()
def initPluginNameVisible(self):
pass
def requiredIcons(self): def requiredIcons(self):
""" """
This method is called to define the icons for the plugin. This method is called to define the icons for the plugin.
@ -149,9 +145,9 @@ class MediaManagerItem(QtGui.QWidget):
A method to help developers easily add a toolbar to the media A method to help developers easily add a toolbar to the media
manager item. manager item.
""" """
if self.Toolbar is None: if self.toolbar is None:
self.Toolbar = OpenLPToolbar(self) self.toolbar = OpenLPToolbar(self)
self.PageLayout.addWidget(self.Toolbar) self.pageLayout.addWidget(self.toolbar)
def addToolbarButton( def addToolbarButton(
self, title, tooltip, icon, slot=None, checkable=False): self, title, tooltip, icon, slot=None, checkable=False):
@ -180,13 +176,13 @@ class MediaManagerItem(QtGui.QWidget):
# break compatability), but it makes sense for the icon to # break compatability), but it makes sense for the icon to
# come before the tooltip (as you have to have an icon, but # come before the tooltip (as you have to have an icon, but
# not neccesarily a tooltip) # not neccesarily a tooltip)
self.Toolbar.addToolbarButton(title, icon, tooltip, slot, checkable) self.toolbar.addToolbarButton(title, icon, tooltip, slot, checkable)
def addToolbarSeparator(self): def addToolbarSeparator(self):
""" """
A very simple method to add a separator to the toolbar. A very simple method to add a separator to the toolbar.
""" """
self.Toolbar.addSeparator() self.toolbar.addSeparator()
def setupUi(self): def setupUi(self):
""" """
@ -215,7 +211,7 @@ class MediaManagerItem(QtGui.QWidget):
unicode(translate('MediaManagerItem', 'Import %s')) % unicode(translate('MediaManagerItem', 'Import %s')) %
self.PluginNameShort, self.PluginNameShort,
unicode(translate('MediaManagerItem', 'Import a %s')) % unicode(translate('MediaManagerItem', 'Import a %s')) %
self.PluginNameVisible, self.pluginNameVisible,
u':/general/general_import.png', self.onImportClick) u':/general/general_import.png', self.onImportClick)
## File Button ## ## File Button ##
if self.hasFileIcon: if self.hasFileIcon:
@ -223,7 +219,7 @@ class MediaManagerItem(QtGui.QWidget):
unicode(translate('MediaManagerItem', 'Load %s')) % unicode(translate('MediaManagerItem', 'Load %s')) %
self.PluginNameShort, self.PluginNameShort,
unicode(translate('MediaManagerItem', 'Load a new %s')) % unicode(translate('MediaManagerItem', 'Load a new %s')) %
self.PluginNameVisible, self.pluginNameVisible,
u':/general/general_open.png', self.onFileClick) u':/general/general_open.png', self.onFileClick)
## New Button ## ## New Button ##
if self.hasNewIcon: if self.hasNewIcon:
@ -231,7 +227,7 @@ class MediaManagerItem(QtGui.QWidget):
unicode(translate('MediaManagerItem', 'New %s')) % unicode(translate('MediaManagerItem', 'New %s')) %
self.PluginNameShort, self.PluginNameShort,
unicode(translate('MediaManagerItem', 'Add a new %s')) % unicode(translate('MediaManagerItem', 'Add a new %s')) %
self.PluginNameVisible, self.pluginNameVisible,
u':/general/general_new.png', self.onNewClick) u':/general/general_new.png', self.onNewClick)
## Edit Button ## ## Edit Button ##
if self.hasEditIcon: if self.hasEditIcon:
@ -240,7 +236,7 @@ class MediaManagerItem(QtGui.QWidget):
self.PluginNameShort, self.PluginNameShort,
unicode(translate( unicode(translate(
'MediaManagerItem', 'Edit the selected %s')) % 'MediaManagerItem', 'Edit the selected %s')) %
self.PluginNameVisible, self.pluginNameVisible,
u':/general/general_edit.png', self.onEditClick) u':/general/general_edit.png', self.onEditClick)
## Delete Button ## ## Delete Button ##
if self.hasDeleteIcon: if self.hasDeleteIcon:
@ -275,60 +271,60 @@ class MediaManagerItem(QtGui.QWidget):
Creates the main widget for listing items the media item is tracking Creates the main widget for listing items the media item is tracking
""" """
#Add the List widget #Add the List widget
self.ListView = self.ListViewWithDnD_class(self) self.listView = self.ListViewWithDnD_class(self)
self.ListView.uniformItemSizes = True self.listView.uniformItemSizes = True
self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591)) self.listView.setGeometry(QtCore.QRect(10, 100, 256, 591))
self.ListView.setSpacing(1) self.listView.setSpacing(1)
self.ListView.setSelectionMode( self.listView.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection) QtGui.QAbstractItemView.ExtendedSelection)
self.ListView.setAlternatingRowColors(True) self.listView.setAlternatingRowColors(True)
self.ListView.setDragEnabled(True) self.listView.setDragEnabled(True)
self.ListView.setObjectName(u'%sListView' % self.PluginNameShort) self.listView.setObjectName(u'%sListView' % self.PluginNameShort)
#Add tp PageLayout #Add to pageLayout
self.PageLayout.addWidget(self.ListView) self.pageLayout.addWidget(self.listView)
#define and add the context menu #define and add the context menu
self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
if self.hasEditIcon: if self.hasEditIcon:
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/general/general_edit.png', self.listView, u':/general/general_edit.png',
unicode(translate('MediaManagerItem', '&Edit %s')) % unicode(translate('MediaManagerItem', '&Edit %s')) %
self.PluginNameVisible, self.pluginNameVisible,
self.onEditClick)) self.onEditClick))
self.ListView.addAction(context_menu_separator(self.ListView)) self.listView.addAction(context_menu_separator(self.listView))
if self.hasDeleteIcon: if self.hasDeleteIcon:
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/general/general_delete.png', self.listView, u':/general/general_delete.png',
unicode(translate('MediaManagerItem', '&Delete %s')) % unicode(translate('MediaManagerItem', '&Delete %s')) %
self.PluginNameVisible, self.pluginNameVisible,
self.onDeleteClick)) self.onDeleteClick))
self.ListView.addAction(context_menu_separator(self.ListView)) self.listView.addAction(context_menu_separator(self.listView))
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/general/general_preview.png', self.listView, u':/general/general_preview.png',
unicode(translate('MediaManagerItem', '&Preview %s')) % unicode(translate('MediaManagerItem', '&Preview %s')) %
self.PluginNameVisible, self.pluginNameVisible,
self.onPreviewClick)) self.onPreviewClick))
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/general/general_live.png', self.listView, u':/general/general_live.png',
translate('MediaManagerItem', '&Show Live'), translate('MediaManagerItem', '&Show Live'),
self.onLiveClick)) self.onLiveClick))
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/general/general_add.png', self.listView, u':/general/general_add.png',
translate('MediaManagerItem', '&Add to Service'), translate('MediaManagerItem', '&Add to Service'),
self.onAddClick)) self.onAddClick))
if self.addToServiceItem: if self.addToServiceItem:
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/general/general_add.png', self.listView, u':/general/general_add.png',
translate('MediaManagerItem', translate('MediaManagerItem',
'&Add to selected Service Item'), '&Add to selected Service Item'),
self.onAddEditClick)) self.onAddEditClick))
QtCore.QObject.connect( QtCore.QObject.connect(
self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.listView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
self.onPreviewClick) self.onPreviewClick)
def initialise(self): def initialise(self):
@ -372,8 +368,8 @@ class MediaManagerItem(QtGui.QWidget):
""" """
count = 0 count = 0
filelist = [] filelist = []
while count < self.ListView.count(): while count < self.listView.count():
bitem = self.ListView.item(count) bitem = self.listView.item(count)
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
filelist.append(filename) filelist.append(filename)
count += 1 count += 1
@ -388,11 +384,11 @@ class MediaManagerItem(QtGui.QWidget):
thumbdate = os.stat(thumb).st_mtime thumbdate = os.stat(thumb).st_mtime
#if file updated rebuild icon #if file updated rebuild icon
if filedate > thumbdate: if filedate > thumbdate:
self.IconFromFile(file, thumb) self.iconFromFile(file, thumb)
return True return True
return False return False
def IconFromFile(self, file, thumb): def iconFromFile(self, file, thumb):
""" """
Create a thumbnail icon from a given file Create a thumbnail icon from a given file
@ -433,7 +429,7 @@ class MediaManagerItem(QtGui.QWidget):
Preview an item by building a service item then adding that service Preview an item by building a service item then adding that service
item to the preview slide controller. item to the preview slide controller.
""" """
if not self.ListView.selectedIndexes() and not self.remoteTriggered: if not self.listView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('MediaManagerItem', 'No Items Selected'), translate('MediaManagerItem', 'No Items Selected'),
translate('MediaManagerItem', translate('MediaManagerItem',
@ -450,7 +446,7 @@ class MediaManagerItem(QtGui.QWidget):
Send an item live by building a service item then adding that service Send an item live by building a service item then adding that service
item to the live slide controller. item to the live slide controller.
""" """
if not self.ListView.selectedIndexes(): if not self.listView.selectedIndexes():
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('MediaManagerItem', 'No Items Selected'), translate('MediaManagerItem', 'No Items Selected'),
translate('MediaManagerItem', translate('MediaManagerItem',
@ -466,7 +462,7 @@ class MediaManagerItem(QtGui.QWidget):
""" """
Add a selected item to the current service Add a selected item to the current service
""" """
if not self.ListView.selectedIndexes() and not self.remoteTriggered: if not self.listView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('MediaManagerItem', 'No Items Selected'), translate('MediaManagerItem', 'No Items Selected'),
translate('MediaManagerItem', translate('MediaManagerItem',
@ -482,7 +478,7 @@ class MediaManagerItem(QtGui.QWidget):
self.parent.serviceManager.addServiceItem(service_item, self.parent.serviceManager.addServiceItem(service_item,
replace=self.remoteTriggered) replace=self.remoteTriggered)
else: else:
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
for item in items: for item in items:
service_item = self.buildServiceItem(item) service_item = self.buildServiceItem(item)
if service_item: if service_item:
@ -493,7 +489,7 @@ class MediaManagerItem(QtGui.QWidget):
""" """
Add a selected item to an existing item in the current service. Add a selected item to an existing item in the current service.
""" """
if not self.ListView.selectedIndexes() and not self.remoteTriggered: if not self.listView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate('MediaManagerItem', 'No items selected'), translate('MediaManagerItem', 'No items selected'),
translate('MediaManagerItem', translate('MediaManagerItem',
@ -522,8 +518,8 @@ class MediaManagerItem(QtGui.QWidget):
Common method for generating a service item Common method for generating a service item
""" """
service_item = ServiceItem(self.parent) service_item = ServiceItem(self.parent)
if self.ServiceItemIconName: if self.serviceItemIconName:
service_item.add_icon(self.ServiceItemIconName) service_item.add_icon(self.serviceItemIconName)
else: else:
service_item.add_icon(self.parent.icon) service_item.add_icon(self.parent.icon)
if self.generateSlideData(service_item, item): if self.generateSlideData(service_item, item):

26
openlp/core/lib/toolbar.py
View File

@ -71,27 +71,27 @@ class OpenLPToolbar(QtGui.QToolBar):
``objectname`` ``objectname``
The name of the object, as used in `<button>.setObjectName()`. The name of the object, as used in `<button>.setObjectName()`.
""" """
ToolbarButton = None toolbarButton = None
if icon: if icon:
ButtonIcon = build_icon(icon) buttonIcon = build_icon(icon)
if slot and not checkable: if slot and not checkable:
ToolbarButton = self.addAction(ButtonIcon, title, slot) toolbarButton = self.addAction(buttonIcon, title, slot)
else: else:
ToolbarButton = self.addAction(ButtonIcon, title) toolbarButton = self.addAction(buttonIcon, title)
self.icons[title] = ButtonIcon self.icons[title] = buttonIcon
else: else:
ToolbarButton = QtGui.QAction(title, ToolbarButton) toolbarButton = QtGui.QAction(title, toolbarButton)
self.addAction(ToolbarButton) self.addAction(toolbarButton)
QtCore.QObject.connect(ToolbarButton, QtCore.QObject.connect(toolbarButton,
QtCore.SIGNAL(u'triggered()'), slot) QtCore.SIGNAL(u'triggered()'), slot)
if tooltip: if tooltip:
ToolbarButton.setToolTip(tooltip) toolbarButton.setToolTip(tooltip)
if checkable: if checkable:
ToolbarButton.setCheckable(True) toolbarButton.setCheckable(True)
QtCore.QObject.connect(ToolbarButton, QtCore.QObject.connect(toolbarButton,
QtCore.SIGNAL(u'toggled(bool)'), slot) QtCore.SIGNAL(u'toggled(bool)'), slot)
self.actions[title] = ToolbarButton self.actions[title] = toolbarButton
return ToolbarButton return toolbarButton
def addToolbarSeparator(self, handle): def addToolbarSeparator(self, handle):
""" """

2
openlp/core/theme/theme.py
View File

@ -203,7 +203,7 @@ class Theme(object):
val = element_text val = element_text
if (element.tag.find(u'Color') > 0 or if (element.tag.find(u'Color') > 0 or
(element.tag.find(u'BackgroundParameter') == 0 and (element.tag.find(u'BackgroundParameter') == 0 and
type(val) == type(0))): isinstance(int, val))):
# convert to a wx.Colour # convert to a wx.Colour
if not delphi_color_change: if not delphi_color_change:
val = QtGui.QColor( val = QtGui.QColor(

186
openlp/core/ui/aboutdialog.py
View File

@ -24,98 +24,89 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate
from openlp.core.lib import build_icon, translate
class Ui_AboutDialog(object): class Ui_AboutDialog(object):
def setupUi(self, AboutDialog): def setupUi(self, aboutDialog):
AboutDialog.setObjectName(u'AboutDialog') aboutDialog.setObjectName(u'aboutDialog')
AboutDialog.resize(516, 481) aboutDialog.resize(516, 481)
LogoIcon = QtGui.QIcon() aboutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png'))
LogoIcon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), self.aboutDialogLayout = QtGui.QVBoxLayout(aboutDialog)
QtGui.QIcon.Normal, QtGui.QIcon.Off) self.aboutDialogLayout.setSpacing(8)
AboutDialog.setWindowIcon(LogoIcon) self.aboutDialogLayout.setMargin(8)
self.AboutDialogLayout = QtGui.QVBoxLayout(AboutDialog) self.aboutDialogLayout.setObjectName(u'aboutDialogLayout')
self.AboutDialogLayout.setSpacing(8) self.logoLabel = QtGui.QLabel(aboutDialog)
self.AboutDialogLayout.setMargin(8) self.logoLabel.setPixmap(
self.AboutDialogLayout.setObjectName(u'AboutDialogLayout')
self.LogoLabel = QtGui.QLabel(AboutDialog)
self.LogoLabel.setPixmap(
QtGui.QPixmap(u':/graphics/openlp-about-logo.png')) QtGui.QPixmap(u':/graphics/openlp-about-logo.png'))
self.LogoLabel.setScaledContents(False) self.logoLabel.setScaledContents(False)
self.LogoLabel.setIndent(0) self.logoLabel.setIndent(0)
self.LogoLabel.setObjectName(u'LogoLabel') self.logoLabel.setObjectName(u'logoLabel')
self.AboutDialogLayout.addWidget(self.LogoLabel) self.aboutDialogLayout.addWidget(self.logoLabel)
self.AboutNotebook = QtGui.QTabWidget(AboutDialog) self.aboutNotebook = QtGui.QTabWidget(aboutDialog)
self.AboutNotebook.setObjectName(u'AboutNotebook') self.aboutNotebook.setObjectName(u'aboutNotebook')
self.AboutTab = QtGui.QWidget() self.aboutTab = QtGui.QWidget()
self.AboutTab.setObjectName(u'AboutTab') self.aboutTab.setObjectName(u'aboutTab')
self.AboutTabLayout = QtGui.QVBoxLayout(self.AboutTab) self.aboutTabLayout = QtGui.QVBoxLayout(self.aboutTab)
self.AboutTabLayout.setSpacing(0) self.aboutTabLayout.setSpacing(0)
self.AboutTabLayout.setMargin(8) self.aboutTabLayout.setMargin(8)
self.AboutTabLayout.setObjectName(u'AboutTabLayout') self.aboutTabLayout.setObjectName(u'aboutTabLayout')
self.AboutTextEdit = QtGui.QPlainTextEdit(self.AboutTab) self.aboutTextEdit = QtGui.QPlainTextEdit(self.aboutTab)
self.AboutTextEdit.setReadOnly(True) self.aboutTextEdit.setReadOnly(True)
self.AboutTextEdit.setObjectName(u'AboutTextEdit') self.aboutTextEdit.setObjectName(u'aboutTextEdit')
self.AboutTabLayout.addWidget(self.AboutTextEdit) self.aboutTabLayout.addWidget(self.aboutTextEdit)
self.AboutNotebook.addTab(self.AboutTab, '') self.aboutNotebook.addTab(self.aboutTab, '')
self.CreditsTab = QtGui.QWidget() self.creditsTab = QtGui.QWidget()
self.CreditsTab.setObjectName(u'CreditsTab') self.creditsTab.setObjectName(u'creditsTab')
self.CreditsTabLayout = QtGui.QVBoxLayout(self.CreditsTab) self.creditsTabLayout = QtGui.QVBoxLayout(self.creditsTab)
self.CreditsTabLayout.setSpacing(0) self.creditsTabLayout.setSpacing(0)
self.CreditsTabLayout.setMargin(8) self.creditsTabLayout.setMargin(8)
self.CreditsTabLayout.setObjectName(u'CreditsTabLayout') self.creditsTabLayout.setObjectName(u'creditsTabLayout')
self.CreditsTextEdit = QtGui.QPlainTextEdit(self.CreditsTab) self.creditsTextEdit = QtGui.QPlainTextEdit(self.creditsTab)
self.CreditsTextEdit.setReadOnly(True) self.creditsTextEdit.setReadOnly(True)
self.CreditsTextEdit.setObjectName(u'CreditsTextEdit') self.creditsTextEdit.setObjectName(u'creditsTextEdit')
self.CreditsTabLayout.addWidget(self.CreditsTextEdit) self.creditsTabLayout.addWidget(self.creditsTextEdit)
self.AboutNotebook.addTab(self.CreditsTab, '') self.aboutNotebook.addTab(self.creditsTab, '')
self.LicenseTab = QtGui.QWidget() self.licenseTab = QtGui.QWidget()
self.LicenseTab.setObjectName(u'LicenseTab') self.licenseTab.setObjectName(u'licenseTab')
self.LicenseTabLayout = QtGui.QVBoxLayout(self.LicenseTab) self.licenseTabLayout = QtGui.QVBoxLayout(self.licenseTab)
self.LicenseTabLayout.setSpacing(8) self.licenseTabLayout.setSpacing(8)
self.LicenseTabLayout.setMargin(8) self.licenseTabLayout.setMargin(8)
self.LicenseTabLayout.setObjectName(u'LicenseTabLayout') self.licenseTabLayout.setObjectName(u'licenseTabLayout')
self.LicenseTextEdit = QtGui.QPlainTextEdit(self.LicenseTab) self.licenseTextEdit = QtGui.QPlainTextEdit(self.licenseTab)
self.LicenseTextEdit.setReadOnly(True) self.licenseTextEdit.setReadOnly(True)
self.LicenseTextEdit.setObjectName(u'LicenseTextEdit') self.licenseTextEdit.setObjectName(u'licenseTextEdit')
self.LicenseTabLayout.addWidget(self.LicenseTextEdit) self.licenseTabLayout.addWidget(self.licenseTextEdit)
self.AboutNotebook.addTab(self.LicenseTab, '') self.aboutNotebook.addTab(self.licenseTab, '')
self.AboutDialogLayout.addWidget(self.AboutNotebook) self.aboutDialogLayout.addWidget(self.aboutNotebook)
self.ButtonWidget = QtGui.QWidget(AboutDialog) self.buttonWidget = QtGui.QWidget(aboutDialog)
self.ButtonWidget.setObjectName(u'ButtonWidget') self.buttonWidget.setObjectName(u'buttonWidget')
self.ButtonWidgetLayout = QtGui.QHBoxLayout(self.ButtonWidget) self.buttonWidgetLayout = QtGui.QHBoxLayout(self.buttonWidget)
self.ButtonWidgetLayout.setSpacing(8) self.buttonWidgetLayout.setSpacing(8)
self.ButtonWidgetLayout.setMargin(0) self.buttonWidgetLayout.setMargin(0)
self.ButtonWidgetLayout.setObjectName(u'ButtonWidgetLayout') self.buttonWidgetLayout.setObjectName(u'buttonWidgetLayout')
ButtonSpacer = QtGui.QSpacerItem(275, 20, buttonSpacer = QtGui.QSpacerItem(275, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.ButtonWidgetLayout.addItem(ButtonSpacer) self.buttonWidgetLayout.addItem(buttonSpacer)
self.ContributeButton = QtGui.QPushButton(self.ButtonWidget) self.contributeButton = QtGui.QPushButton(self.buttonWidget)
ContributeIcon = QtGui.QIcon() self.contributeButton.setIcon(
ContributeIcon.addPixmap( build_icon(u':/system/system_contribute.png'))
QtGui.QPixmap(u':/system/system_contribute.png'), self.contributeButton.setObjectName(u'contributeButton')
QtGui.QIcon.Normal, QtGui.QIcon.Off) self.buttonWidgetLayout.addWidget(self.contributeButton)
self.ContributeButton.setIcon(ContributeIcon) self.closeButton = QtGui.QPushButton(self.buttonWidget)
self.ContributeButton.setObjectName(u'ContributeButton') self.closeButton.setIcon(build_icon(u':/system/system_close.png'))
self.ButtonWidgetLayout.addWidget(self.ContributeButton) self.closeButton.setObjectName(u'closeButton')
self.CloseButton = QtGui.QPushButton(self.ButtonWidget) self.buttonWidgetLayout.addWidget(self.closeButton)
CloseIcon = QtGui.QIcon() self.aboutDialogLayout.addWidget(self.buttonWidget)
CloseIcon.addPixmap(QtGui.QPixmap(u':/system/system_close.png'), self.retranslateUi(aboutDialog)
QtGui.QIcon.Normal, QtGui.QIcon.Off) self.aboutNotebook.setCurrentIndex(0)
self.CloseButton.setIcon(CloseIcon) QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL(u'clicked()'),
self.CloseButton.setObjectName(u'CloseButton') aboutDialog.close)
self.ButtonWidgetLayout.addWidget(self.CloseButton) QtCore.QMetaObject.connectSlotsByName(aboutDialog)
self.AboutDialogLayout.addWidget(self.ButtonWidget)
self.retranslateUi(AboutDialog) def retranslateUi(self, aboutDialog):
self.AboutNotebook.setCurrentIndex(0) aboutDialog.setWindowTitle(translate('AboutForm', 'About OpenLP'))
QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'), self.aboutTextEdit.setPlainText(translate('AboutForm',
AboutDialog.close)
QtCore.QMetaObject.connectSlotsByName(AboutDialog)
def retranslateUi(self, AboutDialog):
AboutDialog.setWindowTitle(translate('AboutForm', 'About OpenLP'))
self.AboutTextEdit.setPlainText(translate('AboutForm',
'OpenLP <version><revision> - Open Source Lyrics ' 'OpenLP <version><revision> - Open Source Lyrics '
'Projection\n' 'Projection\n'
'\n' '\n'
@ -131,11 +122,10 @@ class Ui_AboutDialog(object):
'like to see more free Christian software being written, please ' 'like to see more free Christian software being written, please '
'consider contributing by using the button below.' 'consider contributing by using the button below.'
)) ))
self.AboutNotebook.setTabText( self.aboutNotebook.setTabText(
self.aboutNotebook.indexOf(self.aboutTab),
self.AboutNotebook.indexOf(self.AboutTab),
translate('AboutForm', 'About')) translate('AboutForm', 'About'))
self.CreditsTextEdit.setPlainText(translate('AboutForm', self.creditsTextEdit.setPlainText(translate('AboutForm',
'Project Lead\n' 'Project Lead\n'
' Raoul "superfly" Snyman\n' ' Raoul "superfly" Snyman\n'
'\n' '\n'
@ -165,10 +155,10 @@ class Ui_AboutDialog(object):
' Matthias "matthub" Hub (Mac OS X)\n' ' Matthias "matthub" Hub (Mac OS X)\n'
' Raoul "superfly" Snyman (Windows)\n' ' Raoul "superfly" Snyman (Windows)\n'
)) ))
self.AboutNotebook.setTabText( self.aboutNotebook.setTabText(
self.AboutNotebook.indexOf(self.CreditsTab), self.aboutNotebook.indexOf(self.creditsTab),
translate('AboutForm', 'Credits')) translate('AboutForm', 'Credits'))
self.LicenseTextEdit.setPlainText(translate('AboutForm', self.licenseTextEdit.setPlainText(translate('AboutForm',
'Copyright \xa9 2004-2010 Raoul Snyman\n' 'Copyright \xa9 2004-2010 Raoul Snyman\n'
'Portions copyright \xa9 2004-2010 ' 'Portions copyright \xa9 2004-2010 '
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, ' 'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
@ -557,8 +547,8 @@ class Ui_AboutDialog(object):
'linking proprietary applications with the library. If this is ' 'linking proprietary applications with the library. If this is '
'what you want to do, use the GNU Lesser General Public License ' 'what you want to do, use the GNU Lesser General Public License '
'instead of this License.')) 'instead of this License.'))
self.AboutNotebook.setTabText( self.aboutNotebook.setTabText(
self.AboutNotebook.indexOf(self.LicenseTab), self.aboutNotebook.indexOf(self.licenseTab),
translate('AboutForm', 'License')) translate('AboutForm', 'License'))
self.ContributeButton.setText(translate('AboutForm', 'Contribute')) self.contributeButton.setText(translate('AboutForm', 'Contribute'))
self.CloseButton.setText(translate('AboutForm', 'Close')) self.closeButton.setText(translate('AboutForm', 'Close'))

6
openlp/core/ui/aboutform.py
View File

@ -40,7 +40,7 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
self.applicationVersion = applicationVersion self.applicationVersion = applicationVersion
self.setupUi(self) self.setupUi(self)
about_text = self.AboutTextEdit.toPlainText() about_text = self.aboutTextEdit.toPlainText()
about_text = about_text.replace(u'<version>', about_text = about_text.replace(u'<version>',
self.applicationVersion[u'version']) self.applicationVersion[u'version'])
if self.applicationVersion[u'build']: if self.applicationVersion[u'build']:
@ -49,8 +49,8 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
else: else:
build_text = u'' build_text = u''
about_text = about_text.replace(u'<revision>', build_text) about_text = about_text.replace(u'<revision>', build_text)
self.AboutTextEdit.setPlainText(about_text) self.aboutTextEdit.setPlainText(about_text)
QtCore.QObject.connect(self.ContributeButton, QtCore.QObject.connect(self.contributeButton,
QtCore.SIGNAL(u'clicked()'), self.onContributeButtonClicked) QtCore.SIGNAL(u'clicked()'), self.onContributeButtonClicked)
def onContributeButtonClicked(self): def onContributeButtonClicked(self):

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

@ -154,9 +154,10 @@ class DisplayWidget(QtGui.QGraphicsView):
""" """
log.info(u'MainDisplay loaded') log.info(u'MainDisplay loaded')
def __init__(self, parent=None, name=None): def __init__(self, parent=None, name=None, primary=False):
QtGui.QWidget.__init__(self, None) QtGui.QWidget.__init__(self, None)
self.parent = parent self.parent = parent
self.primary = primary
self.hotkey_map = { self.hotkey_map = {
QtCore.Qt.Key_Return: 'servicemanager_next_item', QtCore.Qt.Key_Return: 'servicemanager_next_item',
QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop', QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
@ -189,6 +190,14 @@ class DisplayWidget(QtGui.QGraphicsView):
else: else:
event.ignore() event.ignore()
def resetDisplay(self):
log.debug(u'resetDisplay')
Receiver.send_message(u'slidecontroller_live_stop_loop')
if self.primary:
self.setVisible(False)
else:
self.setVisible(True)
class MainDisplay(DisplayWidget): class MainDisplay(DisplayWidget):
""" """
This is the form that is used to display things on the projector. This is the form that is used to display things on the projector.
@ -206,7 +215,7 @@ class MainDisplay(DisplayWidget):
The list of screens. The list of screens.
""" """
log.debug(u'Initialisation started') log.debug(u'Initialisation started')
DisplayWidget.__init__(self, parent) DisplayWidget.__init__(self, parent, primary=True)
self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint) self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
@ -222,7 +231,6 @@ class MainDisplay(DisplayWidget):
self.setupText() self.setupText()
self.setupAlert() self.setupAlert()
self.setupBlank() self.setupBlank()
self.primary = True
self.blankFrame = None self.blankFrame = None
self.frame = None self.frame = None
#Hide desktop for now until we know where to put it #Hide desktop for now until we know where to put it
@ -239,23 +247,24 @@ class MainDisplay(DisplayWidget):
self.screen = self.screens.current self.screen = self.screens.current
#Sort out screen locations and sizes #Sort out screen locations and sizes
self.setGeometry(self.screen[u'size']) self.setGeometry(self.screen[u'size'])
self.scene.setSceneRect(0,0,self.size().width(), self.size().height()) self.scene.setSceneRect(0, 0, self.size().width(),
self.size().height())
self.webView.setGeometry(0, 0, self.size().width(), self.webView.setGeometry(0, 0, self.size().width(),
self.size().height()) self.size().height())
#Build a custom splash screen #Build a custom splash screen
self.InitialFrame = QtGui.QImage( self.initialFrame = QtGui.QImage(
self.screen[u'size'].width(), self.screen[u'size'].width(),
self.screen[u'size'].height(), self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied) QtGui.QImage.Format_ARGB32_Premultiplied)
splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png') splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
painter_image = QtGui.QPainter() painter_image = QtGui.QPainter()
painter_image.begin(self.InitialFrame) painter_image.begin(self.initialFrame)
painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white) painter_image.fillRect(self.initialFrame.rect(), QtCore.Qt.white)
painter_image.drawImage( painter_image.drawImage(
(self.screen[u'size'].width() - splash_image.width()) / 2, (self.screen[u'size'].width() - splash_image.width()) / 2,
(self.screen[u'size'].height() - splash_image.height()) / 2, (self.screen[u'size'].height() - splash_image.height()) / 2,
splash_image) splash_image)
self.displayImage(self.InitialFrame) self.displayImage(self.initialFrame)
self.repaint() self.repaint()
#Build a Black screen #Build a Black screen
painter = QtGui.QPainter() painter = QtGui.QPainter()
@ -281,7 +290,7 @@ class MainDisplay(DisplayWidget):
def setupScene(self): def setupScene(self):
self.scene = QtGui.QGraphicsScene(self) self.scene = QtGui.QGraphicsScene(self)
self.scene.setSceneRect(0,0,self.size().width(), self.size().height()) self.scene.setSceneRect(0, 0, self.size().width(), self.size().height())
self.setScene(self.scene) self.setScene(self.scene)
def setupVideo(self): def setupVideo(self):
@ -323,14 +332,6 @@ class MainDisplay(DisplayWidget):
self.displayBlank.setZValue(10) self.displayBlank.setZValue(10)
self.scene.addItem(self.displayBlank) self.scene.addItem(self.displayBlank)
def resetDisplay(self):
log.debug(u'resetDisplay')
Receiver.send_message(u'slidecontroller_live_stop_loop')
if self.primary:
self.setVisible(False)
else:
self.setVisible(True)
# def hideDisplayForVideo(self): # def hideDisplayForVideo(self):
# """ # """
# Hides the main display if for the video to be played # Hides the main display if for the video to be played
@ -389,9 +390,9 @@ class MainDisplay(DisplayWidget):
if location == 0: if location == 0:
self.alertText.setPos(0, 0) self.alertText.setPos(0, 0)
elif location == 1: elif location == 1:
self.alertText.setPos(0,self.size().height()/2) self.alertText.setPos(0, self.size().height() / 2)
else: else:
self.alertText.setPos(0,self.size().height() - 76) self.alertText.setPos(0, self.size().height() - 76)
self.alertText.setHtml(message) self.alertText.setHtml(message)
def displayImage(self, frame): def displayImage(self, frame):
@ -536,8 +537,8 @@ class VideoDisplay(Phonon.VideoWidget):
Shutting down so clean up connections Shutting down so clean up connections
""" """
self.onMediaStop() self.onMediaStop()
for pth in self.outputPaths(): for path in self.outputPaths():
disconnected = pth.disconnect() path.disconnect()
# def onMediaBackground(self, message=None): # def onMediaBackground(self, message=None):
# """ # """
@ -662,8 +663,8 @@ class AudioPlayer(QtCore.QObject):
Shutting down so clean up connections Shutting down so clean up connections
""" """
self.onMediaStop() self.onMediaStop()
for pth in self.mediaObject.outputPaths(): for path in self.mediaObject.outputPaths():
disconnected = pth.disconnect() path.disconnect()
def onMediaQueue(self, message): def onMediaQueue(self, message):
""" """

4
openlp/core/ui/mainwindow.py
View File

@ -38,7 +38,7 @@ from openlp.core.utils import check_latest_version, AppLocation, add_actions, \
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
media_manager_style = """ MEDIA_MANAGER_STYLE = """
QToolBox::tab { QToolBox::tab {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(button), stop: 1.0 palette(dark)); stop: 0 palette(button), stop: 1.0 palette(dark));
@ -174,7 +174,7 @@ class Ui_MainWindow(object):
self.MediaManagerDock = OpenLPDockWidget(MainWindow) self.MediaManagerDock = OpenLPDockWidget(MainWindow)
self.MediaManagerDock.setWindowIcon( self.MediaManagerDock.setWindowIcon(
build_icon(u':/system/system_mediamanager.png')) build_icon(u':/system/system_mediamanager.png'))
self.MediaManagerDock.setStyleSheet(media_manager_style) self.MediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE)
self.MediaManagerDock.setMinimumWidth( self.MediaManagerDock.setMinimumWidth(
self.settingsmanager.mainwindow_left) self.settingsmanager.mainwindow_left)
self.MediaManagerDock.setObjectName(u'MediaManagerDock') self.MediaManagerDock.setObjectName(u'MediaManagerDock')

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

@ -33,7 +33,8 @@ log = logging.getLogger(__name__)
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \ from openlp.core.lib import OpenLPToolbar, ServiceItem, context_menu_action, \
Receiver, build_icon, ItemCapabilities, SettingsManager, translate, ThemeLevel Receiver, build_icon, ItemCapabilities, SettingsManager, translate, \
ThemeLevel
from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm
from openlp.core.utils import AppLocation from openlp.core.utils import AppLocation

35
openlp/plugins/alerts/forms/alertdialog.py
View File

@ -25,16 +25,13 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import build_icon, translate
class Ui_AlertDialog(object): class Ui_AlertDialog(object):
def setupUi(self, AlertDialog): def setupUi(self, AlertDialog):
AlertDialog.setObjectName(u'AlertDialog') AlertDialog.setObjectName(u'AlertDialog')
AlertDialog.resize(567, 440) AlertDialog.resize(567, 440)
icon = QtGui.QIcon() AlertDialog.setWindowIcon(build_icon(u':/icon/openlp.org-icon-32.bmp'))
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
AlertDialog.setWindowIcon(icon)
self.AlertDialogLayout = QtGui.QVBoxLayout(AlertDialog) self.AlertDialogLayout = QtGui.QVBoxLayout(AlertDialog)
self.AlertDialogLayout.setSpacing(8) self.AlertDialogLayout.setSpacing(8)
self.AlertDialogLayout.setMargin(8) self.AlertDialogLayout.setMargin(8)
@ -79,25 +76,16 @@ class Ui_AlertDialog(object):
self.ManageButtonLayout.setSpacing(8) self.ManageButtonLayout.setSpacing(8)
self.ManageButtonLayout.setObjectName(u'ManageButtonLayout') self.ManageButtonLayout.setObjectName(u'ManageButtonLayout')
self.NewButton = QtGui.QPushButton(AlertDialog) self.NewButton = QtGui.QPushButton(AlertDialog)
icon1 = QtGui.QIcon() self.NewButton.setIcon(build_icon(u':/general/general_new.png'))
icon1.addPixmap(QtGui.QPixmap(u':/general/general_new.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.NewButton.setIcon(icon1)
self.NewButton.setObjectName(u'NewButton') self.NewButton.setObjectName(u'NewButton')
self.ManageButtonLayout.addWidget(self.NewButton) self.ManageButtonLayout.addWidget(self.NewButton)
self.SaveButton = QtGui.QPushButton(AlertDialog) self.SaveButton = QtGui.QPushButton(AlertDialog)
self.SaveButton.setEnabled(False) self.SaveButton.setEnabled(False)
icon2 = QtGui.QIcon() self.SaveButton.setIcon(build_icon(u':/general/general_save.png'))
icon2.addPixmap(QtGui.QPixmap(u':/general/general_save.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.SaveButton.setIcon(icon2)
self.SaveButton.setObjectName(u'SaveButton') self.SaveButton.setObjectName(u'SaveButton')
self.ManageButtonLayout.addWidget(self.SaveButton) self.ManageButtonLayout.addWidget(self.SaveButton)
self.DeleteButton = QtGui.QPushButton(AlertDialog) self.DeleteButton = QtGui.QPushButton(AlertDialog)
icon3 = QtGui.QIcon() self.DeleteButton.setIcon(build_icon(u':/general/general_delete.png'))
icon3.addPixmap(QtGui.QPixmap(u':/general/general_delete.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.DeleteButton.setIcon(icon3)
self.DeleteButton.setObjectName(u'DeleteButton') self.DeleteButton.setObjectName(u'DeleteButton')
self.ManageButtonLayout.addWidget(self.DeleteButton) self.ManageButtonLayout.addWidget(self.DeleteButton)
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
@ -111,22 +99,17 @@ class Ui_AlertDialog(object):
spacerItem1 = QtGui.QSpacerItem(181, 0, QtGui.QSizePolicy.Expanding, spacerItem1 = QtGui.QSpacerItem(181, 0, QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Minimum)
self.AlertButtonLayout.addItem(spacerItem1) self.AlertButtonLayout.addItem(spacerItem1)
displayIcon = build_icon(u':/general/general_live.png')
self.DisplayButton = QtGui.QPushButton(AlertDialog) self.DisplayButton = QtGui.QPushButton(AlertDialog)
icon4 = QtGui.QIcon() self.DisplayButton.setIcon(displayIcon)
icon4.addPixmap(QtGui.QPixmap(u':/general/general_live.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.DisplayButton.setIcon(icon4)
self.DisplayButton.setObjectName(u'DisplayButton') self.DisplayButton.setObjectName(u'DisplayButton')
self.AlertButtonLayout.addWidget(self.DisplayButton) self.AlertButtonLayout.addWidget(self.DisplayButton)
self.DisplayCloseButton = QtGui.QPushButton(AlertDialog) self.DisplayCloseButton = QtGui.QPushButton(AlertDialog)
self.DisplayCloseButton.setIcon(icon4) self.DisplayCloseButton.setIcon(displayIcon)
self.DisplayCloseButton.setObjectName(u'DisplayCloseButton') self.DisplayCloseButton.setObjectName(u'DisplayCloseButton')
self.AlertButtonLayout.addWidget(self.DisplayCloseButton) self.AlertButtonLayout.addWidget(self.DisplayCloseButton)
self.CloseButton = QtGui.QPushButton(AlertDialog) self.CloseButton = QtGui.QPushButton(AlertDialog)
icon5 = QtGui.QIcon() self.CloseButton.setIcon(build_icon(u':/system/system_close.png'))
icon5.addPixmap(QtGui.QPixmap(u':/system/system_close.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.CloseButton.setIcon(icon5)
self.CloseButton.setObjectName(u'CloseButton') self.CloseButton.setObjectName(u'CloseButton')
self.AlertButtonLayout.addWidget(self.CloseButton) self.AlertButtonLayout.addWidget(self.CloseButton)
self.AlertDialogLayout.addLayout(self.AlertButtonLayout) self.AlertDialogLayout.addLayout(self.AlertButtonLayout)

4
openlp/plugins/alerts/lib/alertstab.py
View File

@ -274,10 +274,6 @@ class AlertsTab(SettingsTab):
self.FontComboBox.setCurrentFont(font) self.FontComboBox.setCurrentFont(font)
self.updateDisplay() self.updateDisplay()
def onItemSelected(self):
self.EditButton.setEnabled(True)
self.DeleteButton.setEnabled(True)
def save(self): def save(self):
settings = QtCore.QSettings() settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection) settings.beginGroup(self.settingsSection)

27
openlp/plugins/bibles/forms/bibleimportwizard.py
View File

@ -24,7 +24,8 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate
from openlp.core.lib import build_icon, translate
class Ui_BibleImportWizard(object): class Ui_BibleImportWizard(object):
def setupUi(self, BibleImportWizard): def setupUi(self, BibleImportWizard):
@ -61,10 +62,10 @@ class Ui_BibleImportWizard(object):
BibleImportWizard.addPage(self.WelcomePage) BibleImportWizard.addPage(self.WelcomePage)
self.SelectPage = QtGui.QWizardPage() self.SelectPage = QtGui.QWizardPage()
self.SelectPage.setObjectName(u'SelectPage') self.SelectPage.setObjectName(u'SelectPage')
self.SelectPageLayout = QtGui.QVBoxLayout(self.SelectPage) self.selectPageLayout = QtGui.QVBoxLayout(self.SelectPage)
self.SelectPageLayout.setSpacing(8) self.selectPageLayout.setSpacing(8)
self.SelectPageLayout.setMargin(20) self.selectPageLayout.setMargin(20)
self.SelectPageLayout.setObjectName(u'SelectPageLayout') self.selectPageLayout.setObjectName(u'selectPageLayout')
self.FormatSelectLayout = QtGui.QHBoxLayout() self.FormatSelectLayout = QtGui.QHBoxLayout()
self.FormatSelectLayout.setSpacing(8) self.FormatSelectLayout.setSpacing(8)
self.FormatSelectLayout.setObjectName(u'FormatSelectLayout') self.FormatSelectLayout.setObjectName(u'FormatSelectLayout')
@ -81,7 +82,7 @@ class Ui_BibleImportWizard(object):
spacerItem2 = QtGui.QSpacerItem(40, 20, spacerItem2 = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.FormatSelectLayout.addItem(spacerItem2) self.FormatSelectLayout.addItem(spacerItem2)
self.SelectPageLayout.addLayout(self.FormatSelectLayout) self.selectPageLayout.addLayout(self.FormatSelectLayout)
self.FormatWidget = QtGui.QStackedWidget(self.SelectPage) self.FormatWidget = QtGui.QStackedWidget(self.SelectPage)
self.FormatWidget.setObjectName(u'FormatWidget') self.FormatWidget.setObjectName(u'FormatWidget')
self.OsisPage = QtGui.QWidget() self.OsisPage = QtGui.QWidget()
@ -104,10 +105,8 @@ class Ui_BibleImportWizard(object):
self.OsisLocationLayout.addWidget(self.OSISLocationEdit) self.OsisLocationLayout.addWidget(self.OSISLocationEdit)
self.OsisFileButton = QtGui.QToolButton(self.OsisPage) self.OsisFileButton = QtGui.QToolButton(self.OsisPage)
self.OsisFileButton.setMaximumSize(QtCore.QSize(32, 16777215)) self.OsisFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
icon = QtGui.QIcon() generalIcon = build_icon(u':/general/general_open.png')
icon.addPixmap(QtGui.QPixmap(u':/general/general_open.png'), self.OsisFileButton.setIcon(generalIcon)
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OsisFileButton.setIcon(icon)
self.OsisFileButton.setObjectName(u'OsisFileButton') self.OsisFileButton.setObjectName(u'OsisFileButton')
self.OsisLocationLayout.addWidget(self.OsisFileButton) self.OsisLocationLayout.addWidget(self.OsisFileButton)
self.OsisLayout.setLayout(1, QtGui.QFormLayout.FieldRole, self.OsisLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
@ -137,7 +136,7 @@ class Ui_BibleImportWizard(object):
self.CsvBooksLayout.addWidget(self.BooksLocationEdit) self.CsvBooksLayout.addWidget(self.BooksLocationEdit)
self.BooksFileButton = QtGui.QToolButton(self.CsvPage) self.BooksFileButton = QtGui.QToolButton(self.CsvPage)
self.BooksFileButton.setMaximumSize(QtCore.QSize(32, 16777215)) self.BooksFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
self.BooksFileButton.setIcon(icon) self.BooksFileButton.setIcon(generalIcon)
self.BooksFileButton.setObjectName(u'BooksFileButton') self.BooksFileButton.setObjectName(u'BooksFileButton')
self.CsvBooksLayout.addWidget(self.BooksFileButton) self.CsvBooksLayout.addWidget(self.BooksFileButton)
self.CsvSourceLayout.setLayout(0, QtGui.QFormLayout.FieldRole, self.CsvSourceLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
@ -154,7 +153,7 @@ class Ui_BibleImportWizard(object):
self.CsvVerseLayout.addWidget(self.CsvVerseLocationEdit) self.CsvVerseLayout.addWidget(self.CsvVerseLocationEdit)
self.CsvVersesFileButton = QtGui.QToolButton(self.CsvPage) self.CsvVersesFileButton = QtGui.QToolButton(self.CsvPage)
self.CsvVersesFileButton.setMaximumSize(QtCore.QSize(32, 16777215)) self.CsvVersesFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
self.CsvVersesFileButton.setIcon(icon) self.CsvVersesFileButton.setIcon(generalIcon)
self.CsvVersesFileButton.setObjectName(u'CsvVersesFileButton') self.CsvVersesFileButton.setObjectName(u'CsvVersesFileButton')
self.CsvVerseLayout.addWidget(self.CsvVersesFileButton) self.CsvVerseLayout.addWidget(self.CsvVersesFileButton)
self.CsvSourceLayout.setLayout(1, QtGui.QFormLayout.FieldRole, self.CsvSourceLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
@ -177,7 +176,7 @@ class Ui_BibleImportWizard(object):
self.OpenSongFileEdit.setObjectName(u'OpenSongFileEdit') self.OpenSongFileEdit.setObjectName(u'OpenSongFileEdit')
self.OpenSongFileLayout.addWidget(self.OpenSongFileEdit) self.OpenSongFileLayout.addWidget(self.OpenSongFileEdit)
self.OpenSongBrowseButton = QtGui.QToolButton(self.OpenSongPage) self.OpenSongBrowseButton = QtGui.QToolButton(self.OpenSongPage)
self.OpenSongBrowseButton.setIcon(icon) self.OpenSongBrowseButton.setIcon(generalIcon)
self.OpenSongBrowseButton.setObjectName(u'OpenSongBrowseButton') self.OpenSongBrowseButton.setObjectName(u'OpenSongBrowseButton')
self.OpenSongFileLayout.addWidget(self.OpenSongBrowseButton) self.OpenSongFileLayout.addWidget(self.OpenSongBrowseButton)
self.OpenSongLayout.setLayout(0, QtGui.QFormLayout.FieldRole, self.OpenSongLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
@ -251,7 +250,7 @@ class Ui_BibleImportWizard(object):
self.WebDownloadTabWidget.addTab(self.ProxyServerTab, u'') self.WebDownloadTabWidget.addTab(self.ProxyServerTab, u'')
self.WebDownloadLayout.addWidget(self.WebDownloadTabWidget) self.WebDownloadLayout.addWidget(self.WebDownloadTabWidget)
self.FormatWidget.addWidget(self.WebDownloadPage) self.FormatWidget.addWidget(self.WebDownloadPage)
self.SelectPageLayout.addWidget(self.FormatWidget) self.selectPageLayout.addWidget(self.FormatWidget)
BibleImportWizard.addPage(self.SelectPage) BibleImportWizard.addPage(self.SelectPage)
self.LicenseDetailsPage = QtGui.QWizardPage() self.LicenseDetailsPage = QtGui.QWizardPage()
self.LicenseDetailsPage.setObjectName(u'LicenseDetailsPage') self.LicenseDetailsPage.setObjectName(u'LicenseDetailsPage')

28
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -55,6 +55,7 @@ class BibleMediaItem(MediaManagerItem):
def __init__(self, parent, icon, title): def __init__(self, parent, icon, title):
self.PluginNameShort = u'Bible' self.PluginNameShort = u'Bible'
self.pluginNameVisible = translate('BiblesPlugin.MediaItem', 'Bible')
self.IconPath = u'songs/song' self.IconPath = u'songs/song'
self.ListViewWithDnD_class = BibleListView self.ListViewWithDnD_class = BibleListView
self.lastReference = [] self.lastReference = []
@ -70,9 +71,6 @@ class BibleMediaItem(MediaManagerItem):
obj = obj.toPyObject() obj = obj.toPyObject()
return unicode(obj) return unicode(obj)
def initPluginNameVisible(self):
self.PluginNameVisible = translate('BiblesPlugin.MediaItem', 'Bible')
def requiredIcons(self): def requiredIcons(self):
MediaManagerItem.requiredIcons(self) MediaManagerItem.requiredIcons(self)
self.hasImportIcon = True self.hasImportIcon = True
@ -238,7 +236,7 @@ class BibleMediaItem(MediaManagerItem):
self.SearchTabWidget.addTab(self.AdvancedTab, self.SearchTabWidget.addTab(self.AdvancedTab,
translate('BiblesPlugin.MediaItem', 'Advanced')) translate('BiblesPlugin.MediaItem', 'Advanced'))
# Add the search tab widget to the page layout # Add the search tab widget to the page layout
self.PageLayout.addWidget(self.SearchTabWidget) self.pageLayout.addWidget(self.SearchTabWidget)
# Combo Boxes # Combo Boxes
QtCore.QObject.connect(self.AdvancedVersionComboBox, QtCore.QObject.connect(self.AdvancedVersionComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onAdvancedVersionComboBox) QtCore.SIGNAL(u'activated(int)'), self.onAdvancedVersionComboBox)
@ -274,8 +272,8 @@ class BibleMediaItem(MediaManagerItem):
self.SearchProgress.setFormat('') self.SearchProgress.setFormat('')
self.SearchProgress.setMinimum(0) self.SearchProgress.setMinimum(0)
self.SearchProgress.setMaximum(0) self.SearchProgress.setMaximum(0)
self.SearchProgress.setGeometry(self.ListView.geometry().left(), self.SearchProgress.setGeometry(self.listView.geometry().left(),
self.ListView.geometry().top(), 81, 23) self.listView.geometry().top(), 81, 23)
self.SearchProgress.setVisible(False) self.SearchProgress.setVisible(False)
self.SearchProgress.setObjectName(u'SearchProgress') self.SearchProgress.setObjectName(u'SearchProgress')
@ -373,9 +371,9 @@ class BibleMediaItem(MediaManagerItem):
self.initialiseBible(bible) self.initialiseBible(bible)
def onListViewResize(self, width, height): def onListViewResize(self, width, height):
self.SearchProgress.setGeometry(self.ListView.geometry().x(), listViewGeometry = self.listView.geometry()
(self.ListView.geometry().y() + self.ListView.geometry().height())\ self.SearchProgress.setGeometry(listViewGeometry.x(),
- 23, 81, 23) (listViewGeometry.y() + listViewGeometry.height()) - 23, 81, 23)
def onSearchProgressShow(self): def onSearchProgressShow(self):
self.SearchProgress.setVisible(True) self.SearchProgress.setVisible(True)
@ -439,7 +437,7 @@ class BibleMediaItem(MediaManagerItem):
chapter_to, verse_to) chapter_to, verse_to)
self.search_results = self.parent.manager.get_verses(bible, versetext) self.search_results = self.parent.manager.get_verses(bible, versetext)
if self.ClearAdvancedSearchComboBox.currentIndex() == 0: if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
self.ListView.clear() self.listView.clear()
self.lastReference = [] self.lastReference = []
self.lastReference.append(versetext) self.lastReference.append(versetext)
self.displayResults(bible) self.displayResults(bible)
@ -459,7 +457,7 @@ class BibleMediaItem(MediaManagerItem):
bible = unicode(self.QuickVersionComboBox.currentText()) bible = unicode(self.QuickVersionComboBox.currentText())
text = unicode(self.QuickSearchEdit.text()) text = unicode(self.QuickSearchEdit.text())
if self.ClearQuickSearchComboBox.currentIndex() == 0: if self.ClearQuickSearchComboBox.currentIndex() == 0:
self.ListView.clear() self.listView.clear()
self.lastReference = [] self.lastReference = []
self.lastReference.append(text) self.lastReference.append(text)
self.search_results = self.parent.manager.get_verses(bible, text) self.search_results = self.parent.manager.get_verses(bible, text)
@ -468,7 +466,7 @@ class BibleMediaItem(MediaManagerItem):
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):
log.debug(u'generating slide data') log.debug(u'generating slide data')
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
if len(items) == 0: if len(items) == 0:
return False return False
old_chapter = u'' old_chapter = u''
@ -509,7 +507,7 @@ class BibleMediaItem(MediaManagerItem):
bible2_permission = u'' bible2_permission = u''
# Let's loop through the main lot, and assemble our verses # Let's loop through the main lot, and assemble our verses
for item in items: for item in items:
bitem = self.ListView.item(item.row()) bitem = self.listView.item(item.row())
reference = bitem.data(QtCore.Qt.UserRole) reference = bitem.data(QtCore.Qt.UserRole)
if isinstance(reference, QtCore.QVariant): if isinstance(reference, QtCore.QVariant):
reference = reference.toPyObject() reference = reference.toPyObject()
@ -657,8 +655,8 @@ class BibleMediaItem(MediaManagerItem):
'text': QtCore.QVariant(verse.text) 'text': QtCore.QVariant(verse.text)
} }
bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict)) bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict))
self.ListView.addItem(bible_verse) self.listView.addItem(bible_verse)
row = self.ListView.setCurrentRow(count) row = self.listView.setCurrentRow(count)
if row: if row:
row.setSelected(True) row.setSelected(True)

19
openlp/plugins/custom/forms/editcustomdialog.py
View File

@ -25,16 +25,14 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import build_icon, translate
class Ui_customEditDialog(object): class Ui_customEditDialog(object):
def setupUi(self, customEditDialog): def setupUi(self, customEditDialog):
customEditDialog.setObjectName(u'customEditDialog') customEditDialog.setObjectName(u'customEditDialog')
customEditDialog.resize(590, 541) customEditDialog.resize(590, 541)
icon = QtGui.QIcon() customEditDialog.setWindowIcon(
icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), build_icon(u':/icon/openlp.org-icon-32.bmp'))
QtGui.QIcon.Normal, QtGui.QIcon.Off)
customEditDialog.setWindowIcon(icon)
self.gridLayout = QtGui.QGridLayout(customEditDialog) self.gridLayout = QtGui.QGridLayout(customEditDialog)
self.gridLayout.setObjectName(u'gridLayout') self.gridLayout.setObjectName(u'gridLayout')
self.horizontalLayout = QtGui.QHBoxLayout() self.horizontalLayout = QtGui.QHBoxLayout()
@ -56,20 +54,14 @@ class Ui_customEditDialog(object):
self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout = QtGui.QVBoxLayout()
self.verticalLayout.setObjectName(u'verticalLayout') self.verticalLayout.setObjectName(u'verticalLayout')
self.UpButton = QtGui.QPushButton(customEditDialog) self.UpButton = QtGui.QPushButton(customEditDialog)
icon1 = QtGui.QIcon() self.UpButton.setIcon(build_icon(u':/services/service_up.png'))
icon1.addPixmap(QtGui.QPixmap(u':/services/service_up.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.UpButton.setIcon(icon1)
self.UpButton.setObjectName(u'UpButton') self.UpButton.setObjectName(u'UpButton')
self.verticalLayout.addWidget(self.UpButton) self.verticalLayout.addWidget(self.UpButton)
spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum, spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem) self.verticalLayout.addItem(spacerItem)
self.DownButton = QtGui.QPushButton(customEditDialog) self.DownButton = QtGui.QPushButton(customEditDialog)
icon2 = QtGui.QIcon() self.DownButton.setIcon(build_icon(u':/services/service_down.png'))
icon2.addPixmap(QtGui.QPixmap(u':/services/service_down.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.DownButton.setIcon(icon2)
self.DownButton.setObjectName(u'DownButton') self.DownButton.setObjectName(u'DownButton')
self.verticalLayout.addWidget(self.DownButton) self.verticalLayout.addWidget(self.DownButton)
self.horizontalLayout_4.addLayout(self.verticalLayout) self.horizontalLayout_4.addLayout(self.verticalLayout)
@ -138,7 +130,6 @@ class Ui_customEditDialog(object):
QtGui.QDialogButtonBox.Save) QtGui.QDialogButtonBox.Save)
self.buttonBox.setObjectName(u'buttonBox') self.buttonBox.setObjectName(u'buttonBox')
self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 1) self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 1)
self.retranslateUi(customEditDialog) self.retranslateUi(customEditDialog)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'), QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
customEditDialog.accept) customEditDialog.accept)

22
openlp/plugins/custom/lib/mediaitem.py
View File

@ -47,6 +47,7 @@ class CustomMediaItem(MediaManagerItem):
def __init__(self, parent, icon, title): def __init__(self, parent, icon, title):
self.PluginNameShort = u'Custom' self.PluginNameShort = u'Custom'
self.pluginNameVisible = translate('CustomPlugin.MediaItem', 'Custom')
self.IconPath = u'custom/custom' self.IconPath = u'custom/custom'
# this next is a class, not an instance of a class - it will # this next is a class, not an instance of a class - it will
# be instanced by the base MediaManagerItem # be instanced by the base MediaManagerItem
@ -67,9 +68,6 @@ class CustomMediaItem(MediaManagerItem):
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'custom_preview'), self.onPreviewClick) QtCore.SIGNAL(u'custom_preview'), self.onPreviewClick)
def initPluginNameVisible(self):
self.PluginNameVisible = translate('CustomPlugin.MediaItem', 'Custom')
def requiredIcons(self): def requiredIcons(self):
MediaManagerItem.requiredIcons(self) MediaManagerItem.requiredIcons(self)
@ -86,12 +84,12 @@ class CustomMediaItem(MediaManagerItem):
self.onRemoteEditClear() self.onRemoteEditClear()
def loadCustomListView(self, list): def loadCustomListView(self, list):
self.ListView.clear() self.listView.clear()
for customSlide in list: for customSlide in list:
custom_name = QtGui.QListWidgetItem(customSlide.title) custom_name = QtGui.QListWidgetItem(customSlide.title)
custom_name.setData( custom_name.setData(
QtCore.Qt.UserRole, QtCore.QVariant(customSlide.id)) QtCore.Qt.UserRole, QtCore.QVariant(customSlide.id))
self.ListView.addItem(custom_name) self.listView.addItem(custom_name)
def onNewClick(self): def onNewClick(self):
self.parent.edit_custom_form.loadCustom(0) self.parent.edit_custom_form.loadCustom(0)
@ -121,10 +119,10 @@ class CustomMediaItem(MediaManagerItem):
""" """
Edit a custom item Edit a custom item
""" """
if check_item_selected(self.ListView, if check_item_selected(self.listView,
translate('CustomPlugin.MediaItem', translate('CustomPlugin.MediaItem',
'You must select an item to edit.')): 'You must select an item to edit.')):
item = self.ListView.currentItem() item = self.listView.currentItem()
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
self.parent.edit_custom_form.loadCustom(item_id, False) self.parent.edit_custom_form.loadCustom(item_id, False)
self.parent.edit_custom_form.exec_() self.parent.edit_custom_form.exec_()
@ -134,17 +132,17 @@ class CustomMediaItem(MediaManagerItem):
""" """
Remove a custom item from the list and database Remove a custom item from the list and database
""" """
if check_item_selected(self.ListView, if check_item_selected(self.listView,
translate('CustomPlugin.MediaItem', translate('CustomPlugin.MediaItem',
'You must select an item to delete.')): 'You must select an item to delete.')):
row_list = [item.row() for item in self.ListView.selectedIndexes()] row_list = [item.row() for item in self.listView.selectedIndexes()]
row_list.sort(reverse=True) row_list.sort(reverse=True)
id_list = [(item.data(QtCore.Qt.UserRole)).toInt()[0] id_list = [(item.data(QtCore.Qt.UserRole)).toInt()[0]
for item in self.ListView.selectedIndexes()] for item in self.listView.selectedIndexes()]
for id in id_list: for id in id_list:
self.parent.custommanager.delete_object(CustomSlide, id) self.parent.custommanager.delete_object(CustomSlide, id)
for row in row_list: for row in row_list:
self.ListView.takeItem(row) self.listView.takeItem(row)
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):
raw_slides = [] raw_slides = []
@ -153,7 +151,7 @@ class CustomMediaItem(MediaManagerItem):
theme = None theme = None
if item is None: if item is None:
if self.remoteTriggered is None: if self.remoteTriggered is None:
item = self.ListView.currentItem() item = self.listView.currentItem()
if item is None: if item is None:
return False return False
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]

42
openlp/plugins/images/lib/mediaitem.py
View File

@ -50,15 +50,13 @@ class ImageMediaItem(MediaManagerItem):
def __init__(self, parent, icon, title): def __init__(self, parent, icon, title):
self.PluginNameShort = u'Image' self.PluginNameShort = u'Image'
self.pluginNameVisible = translate('ImagePlugin.MediaItem', 'Image')
self.IconPath = u'images/image' self.IconPath = u'images/image'
# this next is a class, not an instance of a class - it will # this next is a class, not an instance of a class - it will
# be instanced by the base MediaManagerItem # be instanced by the base MediaManagerItem
self.ListViewWithDnD_class = ImageListView self.ListViewWithDnD_class = ImageListView
MediaManagerItem.__init__(self, parent, icon, title) MediaManagerItem.__init__(self, parent, icon, title)
def initPluginNameVisible(self):
self.PluginNameVisible = translate('ImagePlugin.MediaItem', 'Image')
def retranslateUi(self): def retranslateUi(self):
self.OnNewPrompt = translate('ImagePlugin.MediaItem', self.OnNewPrompt = translate('ImagePlugin.MediaItem',
'Select Image(s)') 'Select Image(s)')
@ -75,10 +73,10 @@ class ImageMediaItem(MediaManagerItem):
def initialise(self): def initialise(self):
log.debug(u'initialise') log.debug(u'initialise')
self.ListView.clear() self.listView.clear()
self.ListView.setSelectionMode( self.listView.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection) QtGui.QAbstractItemView.ExtendedSelection)
self.ListView.setIconSize(QtCore.QSize(88, 50)) self.listView.setIconSize(QtCore.QSize(88, 50))
self.servicePath = os.path.join( self.servicePath = os.path.join(
AppLocation.get_section_data_path(self.settingsSection), AppLocation.get_section_data_path(self.settingsSection),
u'thumbnails') u'thumbnails')
@ -89,10 +87,10 @@ class ImageMediaItem(MediaManagerItem):
def addListViewToToolBar(self): def addListViewToToolBar(self):
MediaManagerItem.addListViewToToolBar(self) MediaManagerItem.addListViewToToolBar(self)
self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.ListView.addAction( self.listView.addAction(
context_menu_action( context_menu_action(
self.ListView, u':/slides/slide_blank.png', self.listView, u':/slides/slide_blank.png',
translate('ImagePlugin.MediaItem', 'Replace Live Background'), translate('ImagePlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick)) self.onReplaceClick))
@ -106,23 +104,23 @@ class ImageMediaItem(MediaManagerItem):
self.ImageWidget.sizePolicy().hasHeightForWidth()) self.ImageWidget.sizePolicy().hasHeightForWidth())
self.ImageWidget.setSizePolicy(sizePolicy) self.ImageWidget.setSizePolicy(sizePolicy)
self.ImageWidget.setObjectName(u'ImageWidget') self.ImageWidget.setObjectName(u'ImageWidget')
self.blankButton = self.Toolbar.addToolbarButton( self.blankButton = self.toolbar.addToolbarButton(
u'Replace Background', u':/slides/slide_blank.png', u'Replace Background', u':/slides/slide_blank.png',
translate('ImagePlugin.MediaItem', 'Replace Live Background'), translate('ImagePlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick, False) self.onReplaceClick, False)
# Add the song widget to the page layout # Add the song widget to the page layout
self.PageLayout.addWidget(self.ImageWidget) self.pageLayout.addWidget(self.ImageWidget)
def onDeleteClick(self): def onDeleteClick(self):
""" """
Remove an image item from the list Remove an image item from the list
""" """
if check_item_selected(self.ListView, translate('ImagePlugin.MediaItem', if check_item_selected(self.listView, translate('ImagePlugin.MediaItem',
'You must select an item to delete.')): 'You must select an item to delete.')):
row_list = [item.row() for item in self.ListView.selectedIndexes()] row_list = [item.row() for item in self.listView.selectedIndexes()]
row_list.sort(reverse=True) row_list.sort(reverse=True)
for row in row_list: for row in row_list:
text = self.ListView.item(row) text = self.listView.item(row)
if text: if text:
try: try:
os.remove(os.path.join(self.servicePath, os.remove(os.path.join(self.servicePath,
@ -130,7 +128,7 @@ class ImageMediaItem(MediaManagerItem):
except OSError: except OSError:
#if not present do not worry #if not present do not worry
pass pass
self.ListView.takeItem(row) self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection, SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList()) self.settingsSection, self.getFileList())
@ -144,14 +142,14 @@ class ImageMediaItem(MediaManagerItem):
else: else:
icon = build_icon(u':/general/general_delete.png') icon = build_icon(u':/general/general_delete.png')
else: else:
icon = self.IconFromFile(file, thumb) icon = self.iconFromFile(file, thumb)
item_name = QtGui.QListWidgetItem(filename) item_name = QtGui.QListWidgetItem(filename)
item_name.setIcon(icon) item_name.setIcon(icon)
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
self.ListView.addItem(item_name) self.listView.addItem(item_name)
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
if items: if items:
service_item.title = unicode( service_item.title = unicode(
translate('ImagePlugin.MediaItem', 'Image(s)')) translate('ImagePlugin.MediaItem', 'Image(s)'))
@ -160,7 +158,7 @@ class ImageMediaItem(MediaManagerItem):
service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsLoop)
service_item.add_capability(ItemCapabilities.AllowsAdditions) service_item.add_capability(ItemCapabilities.AllowsAdditions)
for item in items: for item in items:
bitem = self.ListView.item(item.row()) bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
frame = QtGui.QImage(unicode(filename)) frame = QtGui.QImage(unicode(filename))
(path, name) = os.path.split(filename) (path, name) = os.path.split(filename)
@ -170,12 +168,12 @@ class ImageMediaItem(MediaManagerItem):
return False return False
def onReplaceClick(self): def onReplaceClick(self):
if check_item_selected(self.ListView, if check_item_selected(self.listView,
translate('ImagePlugin.MediaItem', translate('ImagePlugin.MediaItem',
'You must select an item to process.')): 'You must select an item to process.')):
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
for item in items: for item in items:
bitem = self.ListView.item(item.row()) bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
frame = QtGui.QImage(unicode(filename)) frame = QtGui.QImage(unicode(filename))
self.parent.displayManager.displayImageWithText(frame) self.parent.displayManager.displayImageWithText(frame)

34
openlp/plugins/media/lib/mediaitem.py
View File

@ -47,6 +47,7 @@ class MediaMediaItem(MediaManagerItem):
def __init__(self, parent, icon, title): def __init__(self, parent, icon, title):
self.PluginNameShort = u'Media' self.PluginNameShort = u'Media'
self.pluginNameVisible = translate('MediaPlugin.MediaItem', 'Media')
self.IconPath = u'images/image' self.IconPath = u'images/image'
self.background = False self.background = False
# this next is a class, not an instance of a class - it will # this next is a class, not an instance of a class - it will
@ -56,10 +57,7 @@ class MediaMediaItem(MediaManagerItem):
u':/media/media_video.png').toImage() u':/media/media_video.png').toImage()
MediaManagerItem.__init__(self, parent, icon, title) MediaManagerItem.__init__(self, parent, icon, title)
self.singleServiceItem = False self.singleServiceItem = False
self.ServiceItemIconName = u':/media/media_video.png' self.serviceItemIconName = u':/media/media_video.png'
def initPluginNameVisible(self):
self.PluginNameVisible = translate('MediaPlugin.MediaItem', 'Media')
def retranslateUi(self): def retranslateUi(self):
self.OnNewPrompt = translate('MediaPlugin.MediaItem', 'Select Media') self.OnNewPrompt = translate('MediaPlugin.MediaItem', 'Select Media')
@ -76,9 +74,9 @@ class MediaMediaItem(MediaManagerItem):
def addListViewToToolBar(self): def addListViewToToolBar(self):
MediaManagerItem.addListViewToToolBar(self) MediaManagerItem.addListViewToToolBar(self)
self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.ListView.addAction( self.listView.addAction(
context_menu_action(self.ListView, u':/slides/slide_blank.png', context_menu_action(self.listView, u':/slides/slide_blank.png',
translate('MediaPlugin.MediaItem', 'Replace Live Background'), translate('MediaPlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick)) self.onReplaceClick))
@ -93,25 +91,25 @@ class MediaMediaItem(MediaManagerItem):
self.ImageWidget.setSizePolicy(sizePolicy) self.ImageWidget.setSizePolicy(sizePolicy)
self.ImageWidget.setObjectName(u'ImageWidget') self.ImageWidget.setObjectName(u'ImageWidget')
#Replace backgrounds do not work at present so remove functionality. #Replace backgrounds do not work at present so remove functionality.
self.blankButton = self.Toolbar.addToolbarButton( self.blankButton = self.toolbar.addToolbarButton(
u'Replace Background', u':/slides/slide_blank.png', u'Replace Background', u':/slides/slide_blank.png',
translate('MediaPlugin.MediaItem', 'Replace Live Background'), translate('MediaPlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick, False) self.onReplaceClick, False)
# Add the song widget to the page layout # Add the song widget to the page layout
self.PageLayout.addWidget(self.ImageWidget) self.pageLayout.addWidget(self.ImageWidget)
def onReplaceClick(self): def onReplaceClick(self):
if check_item_selected(self.ListView, if check_item_selected(self.listView,
translate('ImagePlugin.MediaItem', translate('ImagePlugin.MediaItem',
'You must select an item to process.')): 'You must select an item to process.')):
item = self.ListView.currentItem() item = self.listView.currentItem()
filename = unicode(item.data(QtCore.Qt.UserRole).toString()) filename = unicode(item.data(QtCore.Qt.UserRole).toString())
self.parent.displayManager.displayVideo(filename) self.parent.displayManager.displayVideo(filename)
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):
if item is None: if item is None:
item = self.ListView.currentItem() item = self.listView.currentItem()
if item is None: if item is None:
return False return False
filename = unicode(item.data(QtCore.Qt.UserRole).toString()) filename = unicode(item.data(QtCore.Qt.UserRole).toString())
@ -124,9 +122,9 @@ class MediaMediaItem(MediaManagerItem):
return True return True
def initialise(self): def initialise(self):
self.ListView.setSelectionMode( self.listView.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection) QtGui.QAbstractItemView.ExtendedSelection)
self.ListView.setIconSize(QtCore.QSize(88, 50)) self.listView.setIconSize(QtCore.QSize(88, 50))
self.loadList(SettingsManager.load_list(self.settingsSection, self.loadList(SettingsManager.load_list(self.settingsSection,
self.settingsSection)) self.settingsSection))
@ -134,12 +132,12 @@ class MediaMediaItem(MediaManagerItem):
""" """
Remove a media item from the list Remove a media item from the list
""" """
if check_item_selected(self.ListView, translate('MediaPlugin.MediaItem', if check_item_selected(self.listView, translate('MediaPlugin.MediaItem',
'You must select an item to delete.')): 'You must select an item to delete.')):
row_list = [item.row() for item in self.ListView.selectedIndexes()] row_list = [item.row() for item in self.listView.selectedIndexes()]
row_list.sort(reverse=True) row_list.sort(reverse=True)
for row in row_list: for row in row_list:
self.ListView.takeItem(row) self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection, SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList()) self.settingsSection, self.getFileList())
@ -150,4 +148,4 @@ class MediaMediaItem(MediaManagerItem):
img = QtGui.QPixmap(u':/media/media_video.png').toImage() img = QtGui.QPixmap(u':/media/media_video.png').toImage()
item_name.setIcon(build_icon(img)) item_name.setIcon(build_icon(img))
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
self.ListView.addItem(item_name) self.listView.addItem(item_name)

24
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -52,6 +52,8 @@ class PresentationMediaItem(MediaManagerItem):
def __init__(self, parent, icon, title, controllers): def __init__(self, parent, icon, title, controllers):
self.controllers = controllers self.controllers = controllers
self.PluginNameShort = u'Presentation' self.PluginNameShort = u'Presentation'
self.pluginNameVisible = translate('PresentationPlugin.MediaItem',
'Presentation')
self.IconPath = u'presentations/presentation' self.IconPath = u'presentations/presentation'
self.Automatic = u'' self.Automatic = u''
# this next is a class, not an instance of a class - it will # this next is a class, not an instance of a class - it will
@ -60,10 +62,6 @@ class PresentationMediaItem(MediaManagerItem):
MediaManagerItem.__init__(self, parent, icon, title) MediaManagerItem.__init__(self, parent, icon, title)
self.message_listener = MessageListener(self) self.message_listener = MessageListener(self)
def initPluginNameVisible(self):
self.PluginNameVisible = translate('PresentationPlugin.MediaItem',
'Presentation')
def retranslateUi(self): def retranslateUi(self):
self.OnNewPrompt = translate('PresentationPlugin.MediaItem', self.OnNewPrompt = translate('PresentationPlugin.MediaItem',
'Select Presentation(s)') 'Select Presentation(s)')
@ -108,13 +106,13 @@ class PresentationMediaItem(MediaManagerItem):
self.DisplayTypeLabel.setText( self.DisplayTypeLabel.setText(
translate('PresentationPlugin.MediaItem', 'Present using:')) translate('PresentationPlugin.MediaItem', 'Present using:'))
# Add the Presentation widget to the page layout # Add the Presentation widget to the page layout
self.PageLayout.addWidget(self.PresentationWidget) self.pageLayout.addWidget(self.PresentationWidget)
def initialise(self): def initialise(self):
self.servicePath = os.path.join( self.servicePath = os.path.join(
AppLocation.get_section_data_path(self.settingsSection), AppLocation.get_section_data_path(self.settingsSection),
u'thumbnails') u'thumbnails')
self.ListView.setIconSize(QtCore.QSize(88, 50)) self.listView.setIconSize(QtCore.QSize(88, 50))
if not os.path.exists(self.servicePath): if not os.path.exists(self.servicePath):
os.mkdir(self.servicePath) os.mkdir(self.servicePath)
list = SettingsManager.load_list( list = SettingsManager.load_list(
@ -165,22 +163,22 @@ class PresentationMediaItem(MediaManagerItem):
u':/general/general_delete.png') u':/general/general_delete.png')
else: else:
os.makedirs(thumbPath) os.makedirs(thumbPath)
icon = self.IconFromFile(preview, thumb) icon = self.iconFromFile(preview, thumb)
if not icon: if not icon:
icon = build_icon(u':/general/general_delete.png') icon = build_icon(u':/general/general_delete.png')
item_name = QtGui.QListWidgetItem(filename) item_name = QtGui.QListWidgetItem(filename)
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
item_name.setIcon(icon) item_name.setIcon(icon)
self.ListView.addItem(item_name) self.listView.addItem(item_name)
def onDeleteClick(self): def onDeleteClick(self):
""" """
Remove a presentation item from the list Remove a presentation item from the list
""" """
if check_item_selected(self.ListView, if check_item_selected(self.listView,
translate('PresentationPlugin.MediaItem', translate('PresentationPlugin.MediaItem',
'You must select an item to delete.')): 'You must select an item to delete.')):
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
row_list = [item.row() for item in items] row_list = [item.row() for item in items]
row_list.sort(reverse=True) row_list.sort(reverse=True)
for item in items: for item in items:
@ -193,12 +191,12 @@ class PresentationMediaItem(MediaManagerItem):
doc.presentation_deleted() doc.presentation_deleted()
doc.close_presentation() doc.close_presentation()
for row in row_list: for row in row_list:
self.ListView.takeItem(row) self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection, SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList()) self.settingsSection, self.getFileList())
def generateSlideData(self, service_item, item=None): def generateSlideData(self, service_item, item=None):
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
if len(items) > 1: if len(items) > 1:
return False return False
service_item.title = unicode(self.DisplayTypeComboBox.currentText()) service_item.title = unicode(self.DisplayTypeComboBox.currentText())
@ -206,7 +204,7 @@ class PresentationMediaItem(MediaManagerItem):
shortname = service_item.shortname shortname = service_item.shortname
if shortname: if shortname:
for item in items: for item in items:
bitem = self.ListView.item(item.row()) bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
if shortname == self.Automatic: if shortname == self.Automatic:
service_item.shortname = self.findControllerByType(filename) service_item.shortname = self.findControllerByType(filename)

7
openlp/plugins/songs/forms/editversedialog.py
View File

@ -25,7 +25,7 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import build_icon, translate
from openlp.plugins.songs.lib import VerseType from openlp.plugins.songs.lib import VerseType
class Ui_EditVerseDialog(object): class Ui_EditVerseDialog(object):
@ -61,10 +61,7 @@ class Ui_EditVerseDialog(object):
self.VerseNumberBox.setObjectName(u'VerseNumberBox') self.VerseNumberBox.setObjectName(u'VerseNumberBox')
self.VerseTypeLayout.addWidget(self.VerseNumberBox) self.VerseTypeLayout.addWidget(self.VerseNumberBox)
self.InsertButton = QtGui.QPushButton(EditVerseDialog) self.InsertButton = QtGui.QPushButton(EditVerseDialog)
self.AddIcon = QtGui.QIcon() self.InsertButton.setIcon(build_icon(u':/general/general_add.png'))
self.AddIcon.addPixmap(QtGui.QPixmap(u':/general/general_add.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.InsertButton.setIcon(self.AddIcon)
self.InsertButton.setObjectName(u'InsertButton') self.InsertButton.setObjectName(u'InsertButton')
self.VerseTypeLayout.addWidget(self.InsertButton) self.VerseTypeLayout.addWidget(self.InsertButton)
self.VerseTypeSpacer = QtGui.QSpacerItem(40, 20, self.VerseTypeSpacer = QtGui.QSpacerItem(40, 20,

15
openlp/plugins/songs/forms/songimportwizard.py
View File

@ -25,7 +25,7 @@
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import build_icon, translate
class Ui_SongImportWizard(object): class Ui_SongImportWizard(object):
def setupUi(self, SongImportWizard): def setupUi(self, SongImportWizard):
@ -109,21 +109,16 @@ class Ui_SongImportWizard(object):
self.OpenLyricsButtonLayout.setSpacing(8) self.OpenLyricsButtonLayout.setSpacing(8)
self.OpenLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout') self.OpenLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout')
self.OpenLyricsAddButton = QtGui.QPushButton(self.OpenLyricsPage) self.OpenLyricsAddButton = QtGui.QPushButton(self.OpenLyricsPage)
self.OpenIcon = QtGui.QIcon() self.OpenLyricsAddButton.setIcon(
self.OpenIcon.addPixmap(QtGui.QPixmap(u':/general/general_open.png'), build_icon(u':/general/general_open.png'))
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.DeleteIcon = QtGui.QIcon()
self.DeleteIcon.addPixmap(
QtGui.QPixmap(u':/general/general_delete.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.OpenLyricsAddButton.setIcon(self.OpenIcon)
self.OpenLyricsAddButton.setObjectName(u'OpenLyricsAddButton') self.OpenLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsAddButton) self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsAddButton)
self.OpenLyricsButtonSpacer = QtGui.QSpacerItem(40, 20, self.OpenLyricsButtonSpacer = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.OpenLyricsButtonLayout.addItem(self.OpenLyricsButtonSpacer) self.OpenLyricsButtonLayout.addItem(self.OpenLyricsButtonSpacer)
self.OpenLyricsRemoveButton = QtGui.QPushButton(self.OpenLyricsPage) self.OpenLyricsRemoveButton = QtGui.QPushButton(self.OpenLyricsPage)
self.OpenLyricsRemoveButton.setIcon(self.DeleteIcon) self.OpenLyricsRemoveButton.setIcon(
build_icon(u':/general/general_delete.png'))
self.OpenLyricsRemoveButton.setObjectName(u'OpenLyricsRemoveButton') self.OpenLyricsRemoveButton.setObjectName(u'OpenLyricsRemoveButton')
self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsRemoveButton) self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsRemoveButton)
self.OpenLyricsLayout.addLayout(self.OpenLyricsButtonLayout) self.OpenLyricsLayout.addLayout(self.OpenLyricsButtonLayout)

40
openlp/plugins/songs/lib/mediaitem.py
View File

@ -49,6 +49,7 @@ class SongMediaItem(MediaManagerItem):
def __init__(self, parent, icon, title): def __init__(self, parent, icon, title):
self.PluginNameShort = u'Song' self.PluginNameShort = u'Song'
self.pluginNameVisible = translate('SongsPlugin.MediaItem', 'Song')
self.IconPath = u'songs/song' self.IconPath = u'songs/song'
self.ListViewWithDnD_class = SongListView self.ListViewWithDnD_class = SongListView
MediaManagerItem.__init__(self, parent, icon, title) MediaManagerItem.__init__(self, parent, icon, title)
@ -61,9 +62,6 @@ class SongMediaItem(MediaManagerItem):
# which Song is required. # which Song is required.
self.remoteSong = -1 self.remoteSong = -1
def initPluginNameVisible(self):
self.PluginNameVisible = translate('SongsPlugin.MediaItem', 'Song')
def requiredIcons(self): def requiredIcons(self):
MediaManagerItem.requiredIcons(self) MediaManagerItem.requiredIcons(self)
@ -75,7 +73,7 @@ class SongMediaItem(MediaManagerItem):
translate('SongsPlugin.MediaItem', translate('SongsPlugin.MediaItem',
'Maintain the lists of authors, topics and books'), 'Maintain the lists of authors, topics and books'),
':/songs/song_maintenance.png', self.onSongMaintenanceClick) ':/songs/song_maintenance.png', self.onSongMaintenanceClick)
self.PageLayout.setSpacing(4) self.pageLayout.setSpacing(4)
self.SearchLayout = QtGui.QFormLayout() self.SearchLayout = QtGui.QFormLayout()
self.SearchLayout.setMargin(0) self.SearchLayout.setMargin(0)
self.SearchLayout.setSpacing(4) self.SearchLayout.setSpacing(4)
@ -100,7 +98,7 @@ class SongMediaItem(MediaManagerItem):
self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox') self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox')
self.SearchLayout.setWidget( self.SearchLayout.setWidget(
1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox) 1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox)
self.PageLayout.addLayout(self.SearchLayout) self.pageLayout.addLayout(self.SearchLayout)
self.SearchButtonLayout = QtGui.QHBoxLayout() self.SearchButtonLayout = QtGui.QHBoxLayout()
self.SearchButtonLayout.setMargin(0) self.SearchButtonLayout.setMargin(0)
self.SearchButtonLayout.setSpacing(4) self.SearchButtonLayout.setSpacing(4)
@ -114,7 +112,7 @@ class SongMediaItem(MediaManagerItem):
self.ClearTextButton = QtGui.QPushButton(self) self.ClearTextButton = QtGui.QPushButton(self)
self.ClearTextButton.setObjectName(u'ClearTextButton') self.ClearTextButton.setObjectName(u'ClearTextButton')
self.SearchButtonLayout.addWidget(self.ClearTextButton) self.SearchButtonLayout.addWidget(self.ClearTextButton)
self.PageLayout.addLayout(self.SearchButtonLayout) self.pageLayout.addLayout(self.SearchButtonLayout)
# Signals and slots # Signals and slots
QtCore.QObject.connect(self.SearchTextEdit, QtCore.QObject.connect(self.SearchTextEdit,
QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick) QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick)
@ -193,7 +191,7 @@ class SongMediaItem(MediaManagerItem):
def displayResultsSong(self, searchresults): def displayResultsSong(self, searchresults):
log.debug(u'display results Song') log.debug(u'display results Song')
self.ListView.clear() self.listView.clear()
for song in searchresults: for song in searchresults:
author_list = u'' author_list = u''
for author in song.authors: for author in song.authors:
@ -204,11 +202,11 @@ class SongMediaItem(MediaManagerItem):
song_detail = u'%s (%s)' % (song_title, author_list) song_detail = u'%s (%s)' % (song_title, author_list)
song_name = QtGui.QListWidgetItem(song_detail) song_name = QtGui.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
self.ListView.addItem(song_name) self.listView.addItem(song_name)
def displayResultsAuthor(self, searchresults): def displayResultsAuthor(self, searchresults):
log.debug(u'display results Author') log.debug(u'display results Author')
self.ListView.clear() self.listView.clear()
for author in searchresults: for author in searchresults:
for song in author.songs: for song in author.songs:
song_detail = unicode( song_detail = unicode(
@ -216,7 +214,7 @@ class SongMediaItem(MediaManagerItem):
(author.display_name, song.title) (author.display_name, song.title)
song_name = QtGui.QListWidgetItem(song_detail) song_name = QtGui.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
self.ListView.addItem(song_name) self.listView.addItem(song_name)
def onClearTextButtonClick(self): def onClearTextButtonClick(self):
""" """
@ -247,18 +245,6 @@ class SongMediaItem(MediaManagerItem):
self.edit_song_form.newSong() self.edit_song_form.newSong()
self.edit_song_form.exec_() self.edit_song_form.exec_()
def onEditAuthorClick(self):
self.authors_form.load_form()
self.authors_form.exec_()
def onEditTopicClick(self):
self.topics_form.load_form()
self.topics_form.exec_()
def onEditBookClick(self):
self.song_book_form.load_form()
self.song_book_form.exec_()
def onSongMaintenanceClick(self): def onSongMaintenanceClick(self):
self.song_maintenance_form.exec_() self.song_maintenance_form.exec_()
@ -284,9 +270,9 @@ class SongMediaItem(MediaManagerItem):
""" """
Edit a song Edit a song
""" """
if check_item_selected(self.ListView, translate('SongsPlugin.MediaItem', if check_item_selected(self.listView, translate('SongsPlugin.MediaItem',
'You must select an item to edit.')): 'You must select an item to edit.')):
item = self.ListView.currentItem() item = self.listView.currentItem()
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
self.edit_song_form.loadSong(item_id, False) self.edit_song_form.loadSong(item_id, False)
self.edit_song_form.exec_() self.edit_song_form.exec_()
@ -295,9 +281,9 @@ class SongMediaItem(MediaManagerItem):
""" """
Remove a song from the list and database Remove a song from the list and database
""" """
if check_item_selected(self.ListView, translate('SongsPlugin.MediaItem', if check_item_selected(self.listView, translate('SongsPlugin.MediaItem',
'You must select an item to delete.')): 'You must select an item to delete.')):
items = self.ListView.selectedIndexes() items = self.listView.selectedIndexes()
if len(items) == 1: if len(items) == 1:
del_message = translate('SongsPlugin.MediaItem', del_message = translate('SongsPlugin.MediaItem',
'Delete song?') 'Delete song?')
@ -325,7 +311,7 @@ class SongMediaItem(MediaManagerItem):
ccli = u'' ccli = u''
if item is None: if item is None:
if self.remoteTriggered is None: if self.remoteTriggered is None:
item = self.ListView.currentItem() item = self.listView.currentItem()
if item is None: if item is None:
return False return False
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]

9
openlp/plugins/songusage/forms/songusagedetaildialog.py
View File

@ -24,7 +24,8 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate
from openlp.core.lib import build_icon, translate
class Ui_SongUsageDetailDialog(object): class Ui_SongUsageDetailDialog(object):
def setupUi(self, SongUsageDetailDialog): def setupUi(self, SongUsageDetailDialog):
@ -60,10 +61,8 @@ class Ui_SongUsageDetailDialog(object):
self.FileLineEdit.setObjectName(u'FileLineEdit') self.FileLineEdit.setObjectName(u'FileLineEdit')
self.horizontalLayout.addWidget(self.FileLineEdit) self.horizontalLayout.addWidget(self.FileLineEdit)
self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox) self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
icon = QtGui.QIcon() self.SaveFilePushButton.setIcon(
icon.addPixmap(QtGui.QPixmap(u':/general/general_load.png'), build_icon(u':/general/general_load.png'))
QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.SaveFilePushButton.setIcon(icon)
self.SaveFilePushButton.setObjectName(u'SaveFilePushButton') self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
self.horizontalLayout.addWidget(self.SaveFilePushButton) self.horizontalLayout.addWidget(self.SaveFilePushButton)
self.verticalLayout_4.addLayout(self.horizontalLayout) self.verticalLayout_4.addLayout(self.horizontalLayout)

32
resources/forms/about.ui
View File

@ -23,7 +23,7 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="AboutDialogLayout"> <layout class="QVBoxLayout" name="aboutDialogLayout">
<property name="spacing"> <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
@ -47,11 +47,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTabWidget" name="AboutNotebook"> <widget class="QTabWidget" name="aboutNotebook">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="AboutTab"> <widget class="QWidget" name="aboutTab">
<attribute name="title"> <attribute name="title">
<string>About</string> <string>About</string>
</attribute> </attribute>
@ -63,7 +63,7 @@
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QPlainTextEdit" name="AboutTextEdit"> <widget class="QPlainTextEdit" name="aboutTextEdit">
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -80,11 +80,11 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="CreditsTab"> <widget class="QWidget" name="creditsTab">
<attribute name="title"> <attribute name="title">
<string>Credits</string> <string>Credits</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="CreditsTabLayout"> <layout class="QVBoxLayout" name="creditsTabLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@ -92,7 +92,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QPlainTextEdit" name="CreditsTextEdit"> <widget class="QPlainTextEdit" name="creditsTextEdit">
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -116,11 +116,11 @@ Testers
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="LicenseTab"> <widget class="QWidget" name="licenseTab">
<attribute name="title"> <attribute name="title">
<string>License</string> <string>License</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="LicenseTabLayout"> <layout class="QVBoxLayout" name="licenseTabLayout">
<property name="spacing"> <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
@ -128,7 +128,7 @@ Testers
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QPlainTextEdit" name="LicenseTextEdit"> <widget class="QPlainTextEdit" name="licenseTextEdit">
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -272,8 +272,8 @@ This General Public License does not permit incorporating your program into prop
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" name="ButtonWidget" native="true"> <widget class="QWidget" name="buttonWidget" native="true">
<layout class="QHBoxLayout" name="ButtonWidgetLayout"> <layout class="QHBoxLayout" name="buttonWidgetLayout">
<property name="spacing"> <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
@ -294,7 +294,7 @@ This General Public License does not permit incorporating your program into prop
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="ContributeButton"> <widget class="QPushButton" name="contributeButton">
<property name="text"> <property name="text">
<string>Contribute</string> <string>Contribute</string>
</property> </property>
@ -305,7 +305,7 @@ This General Public License does not permit incorporating your program into prop
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="CloseButton"> <widget class="QPushButton" name="closeButton">
<property name="text"> <property name="text">
<string>Close</string> <string>Close</string>
</property> </property>
@ -326,14 +326,14 @@ This General Public License does not permit incorporating your program into prop
</action> </action>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>ContributeButton</tabstop> <tabstop>contributeButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../images/openlp-2.qrc"/> <include location="../images/openlp-2.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
<sender>CloseButton</sender> <sender>closeButton</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>AboutDialog</receiver> <receiver>AboutDialog</receiver>
<slot>close()</slot> <slot>close()</slot>