openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02382
[Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Cleanups all over:
* Large naming cleanup
* Switch last remaining manual creations to build_icon
* Remove initPluginNameVisible hack - not needed due to change in translation methods
* Remove dead/unused/unnecessary code
* Rearrange code so parent class doesn't call code declared in child class
* Some self.parent cleanups
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/29484
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2010-07-02 18:21:45 +0000
+++ openlp/core/lib/mediamanageritem.py 2010-07-08 17:23:42 +0000
@@ -66,7 +66,7 @@
The shortened (usually singular) name for the plugin e.g. *'Song'*
for the Songs plugin.
- ``self.PluginNameVisible``
+ ``self.pluginNameVisible``
The user visible name for a plugin which should use a suitable
translation function.
@@ -108,21 +108,17 @@
self.icon = None
if title:
self.title = title
- self.Toolbar = None
+ self.toolbar = None
self.remoteTriggered = None
- self.ServiceItemIconName = None
+ self.serviceItemIconName = None
self.singleServiceItem = True
- self.PageLayout = QtGui.QVBoxLayout(self)
- self.PageLayout.setSpacing(0)
- self.PageLayout.setContentsMargins(4, 0, 4, 0)
+ self.pageLayout = QtGui.QVBoxLayout(self)
+ self.pageLayout.setSpacing(0)
+ self.pageLayout.setContentsMargins(4, 0, 4, 0)
self.requiredIcons()
- self.initPluginNameVisible()
self.setupUi()
self.retranslateUi()
- def initPluginNameVisible(self):
- pass
-
def requiredIcons(self):
"""
This method is called to define the icons for the plugin.
@@ -149,9 +145,9 @@
A method to help developers easily add a toolbar to the media
manager item.
"""
- if self.Toolbar is None:
- self.Toolbar = OpenLPToolbar(self)
- self.PageLayout.addWidget(self.Toolbar)
+ if self.toolbar is None:
+ self.toolbar = OpenLPToolbar(self)
+ self.pageLayout.addWidget(self.toolbar)
def addToolbarButton(
self, title, tooltip, icon, slot=None, checkable=False):
@@ -180,13 +176,13 @@
# break compatability), but it makes sense for the icon to
# come before the tooltip (as you have to have an icon, but
# not neccesarily a tooltip)
- self.Toolbar.addToolbarButton(title, icon, tooltip, slot, checkable)
+ self.toolbar.addToolbarButton(title, icon, tooltip, slot, checkable)
def addToolbarSeparator(self):
"""
A very simple method to add a separator to the toolbar.
"""
- self.Toolbar.addSeparator()
+ self.toolbar.addSeparator()
def setupUi(self):
"""
@@ -215,7 +211,7 @@
unicode(translate('MediaManagerItem', 'Import %s')) %
self.PluginNameShort,
unicode(translate('MediaManagerItem', 'Import a %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
u':/general/general_import.png', self.onImportClick)
## File Button ##
if self.hasFileIcon:
@@ -223,7 +219,7 @@
unicode(translate('MediaManagerItem', 'Load %s')) %
self.PluginNameShort,
unicode(translate('MediaManagerItem', 'Load a new %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
u':/general/general_open.png', self.onFileClick)
## New Button ##
if self.hasNewIcon:
@@ -231,7 +227,7 @@
unicode(translate('MediaManagerItem', 'New %s')) %
self.PluginNameShort,
unicode(translate('MediaManagerItem', 'Add a new %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
u':/general/general_new.png', self.onNewClick)
## Edit Button ##
if self.hasEditIcon:
@@ -240,7 +236,7 @@
self.PluginNameShort,
unicode(translate(
'MediaManagerItem', 'Edit the selected %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
u':/general/general_edit.png', self.onEditClick)
## Delete Button ##
if self.hasDeleteIcon:
@@ -275,60 +271,60 @@
Creates the main widget for listing items the media item is tracking
"""
#Add the List widget
- self.ListView = self.ListViewWithDnD_class(self)
- self.ListView.uniformItemSizes = True
- self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591))
- self.ListView.setSpacing(1)
- self.ListView.setSelectionMode(
+ self.listView = self.ListViewWithDnD_class(self)
+ self.listView.uniformItemSizes = True
+ self.listView.setGeometry(QtCore.QRect(10, 100, 256, 591))
+ self.listView.setSpacing(1)
+ self.listView.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection)
- self.ListView.setAlternatingRowColors(True)
- self.ListView.setDragEnabled(True)
- self.ListView.setObjectName(u'%sListView' % self.PluginNameShort)
- #Add tp PageLayout
- self.PageLayout.addWidget(self.ListView)
+ self.listView.setAlternatingRowColors(True)
+ self.listView.setDragEnabled(True)
+ self.listView.setObjectName(u'%sListView' % self.PluginNameShort)
+ #Add to pageLayout
+ self.pageLayout.addWidget(self.listView)
#define and add the context menu
- self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
+ self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
if self.hasEditIcon:
- self.ListView.addAction(
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/general/general_edit.png',
+ self.listView, u':/general/general_edit.png',
unicode(translate('MediaManagerItem', '&Edit %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
self.onEditClick))
- self.ListView.addAction(context_menu_separator(self.ListView))
+ self.listView.addAction(context_menu_separator(self.listView))
if self.hasDeleteIcon:
- self.ListView.addAction(
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/general/general_delete.png',
+ self.listView, u':/general/general_delete.png',
unicode(translate('MediaManagerItem', '&Delete %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
self.onDeleteClick))
- self.ListView.addAction(context_menu_separator(self.ListView))
- self.ListView.addAction(
+ self.listView.addAction(context_menu_separator(self.listView))
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/general/general_preview.png',
+ self.listView, u':/general/general_preview.png',
unicode(translate('MediaManagerItem', '&Preview %s')) %
- self.PluginNameVisible,
+ self.pluginNameVisible,
self.onPreviewClick))
- self.ListView.addAction(
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/general/general_live.png',
+ self.listView, u':/general/general_live.png',
translate('MediaManagerItem', '&Show Live'),
self.onLiveClick))
- self.ListView.addAction(
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/general/general_add.png',
+ self.listView, u':/general/general_add.png',
translate('MediaManagerItem', '&Add to Service'),
self.onAddClick))
if self.addToServiceItem:
- self.ListView.addAction(
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/general/general_add.png',
+ self.listView, u':/general/general_add.png',
translate('MediaManagerItem',
'&Add to selected Service Item'),
self.onAddEditClick))
QtCore.QObject.connect(
- self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
+ self.listView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
self.onPreviewClick)
def initialise(self):
@@ -372,8 +368,8 @@
"""
count = 0
filelist = []
- while count < self.ListView.count():
- bitem = self.ListView.item(count)
+ while count < self.listView.count():
+ bitem = self.listView.item(count)
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
filelist.append(filename)
count += 1
@@ -388,11 +384,11 @@
thumbdate = os.stat(thumb).st_mtime
#if file updated rebuild icon
if filedate > thumbdate:
- self.IconFromFile(file, thumb)
+ self.iconFromFile(file, thumb)
return True
return False
- def IconFromFile(self, file, thumb):
+ def iconFromFile(self, file, thumb):
"""
Create a thumbnail icon from a given file
@@ -433,7 +429,7 @@
Preview an item by building a service item then adding that service
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,
translate('MediaManagerItem', 'No Items Selected'),
translate('MediaManagerItem',
@@ -450,7 +446,7 @@
Send an item live by building a service item then adding that service
item to the live slide controller.
"""
- if not self.ListView.selectedIndexes():
+ if not self.listView.selectedIndexes():
QtGui.QMessageBox.information(self,
translate('MediaManagerItem', 'No Items Selected'),
translate('MediaManagerItem',
@@ -466,7 +462,7 @@
"""
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,
translate('MediaManagerItem', 'No Items Selected'),
translate('MediaManagerItem',
@@ -482,7 +478,7 @@
self.parent.serviceManager.addServiceItem(service_item,
replace=self.remoteTriggered)
else:
- items = self.ListView.selectedIndexes()
+ items = self.listView.selectedIndexes()
for item in items:
service_item = self.buildServiceItem(item)
if service_item:
@@ -493,7 +489,7 @@
"""
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,
translate('MediaManagerItem', 'No items selected'),
translate('MediaManagerItem',
@@ -522,8 +518,8 @@
Common method for generating a service item
"""
service_item = ServiceItem(self.parent)
- if self.ServiceItemIconName:
- service_item.add_icon(self.ServiceItemIconName)
+ if self.serviceItemIconName:
+ service_item.add_icon(self.serviceItemIconName)
else:
service_item.add_icon(self.parent.icon)
if self.generateSlideData(service_item, item):
=== modified file 'openlp/core/lib/toolbar.py'
--- openlp/core/lib/toolbar.py 2010-07-06 21:59:52 +0000
+++ openlp/core/lib/toolbar.py 2010-07-08 17:23:42 +0000
@@ -71,27 +71,27 @@
``objectname``
The name of the object, as used in `<button>.setObjectName()`.
"""
- ToolbarButton = None
+ toolbarButton = None
if icon:
- ButtonIcon = build_icon(icon)
+ buttonIcon = build_icon(icon)
if slot and not checkable:
- ToolbarButton = self.addAction(ButtonIcon, title, slot)
+ toolbarButton = self.addAction(buttonIcon, title, slot)
else:
- ToolbarButton = self.addAction(ButtonIcon, title)
- self.icons[title] = ButtonIcon
+ toolbarButton = self.addAction(buttonIcon, title)
+ self.icons[title] = buttonIcon
else:
- ToolbarButton = QtGui.QAction(title, ToolbarButton)
- self.addAction(ToolbarButton)
- QtCore.QObject.connect(ToolbarButton,
+ toolbarButton = QtGui.QAction(title, toolbarButton)
+ self.addAction(toolbarButton)
+ QtCore.QObject.connect(toolbarButton,
QtCore.SIGNAL(u'triggered()'), slot)
if tooltip:
- ToolbarButton.setToolTip(tooltip)
+ toolbarButton.setToolTip(tooltip)
if checkable:
- ToolbarButton.setCheckable(True)
- QtCore.QObject.connect(ToolbarButton,
+ toolbarButton.setCheckable(True)
+ QtCore.QObject.connect(toolbarButton,
QtCore.SIGNAL(u'toggled(bool)'), slot)
- self.actions[title] = ToolbarButton
- return ToolbarButton
+ self.actions[title] = toolbarButton
+ return toolbarButton
def addToolbarSeparator(self, handle):
"""
=== modified file 'openlp/core/theme/theme.py'
--- openlp/core/theme/theme.py 2010-07-03 21:50:42 +0000
+++ openlp/core/theme/theme.py 2010-07-08 17:23:42 +0000
@@ -203,7 +203,7 @@
val = element_text
if (element.tag.find(u'Color') > 0 or
(element.tag.find(u'BackgroundParameter') == 0 and
- type(val) == type(0))):
+ isinstance(int, val))):
# convert to a wx.Colour
if not delphi_color_change:
val = QtGui.QColor(
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2010-06-25 08:07:51 +0000
+++ openlp/core/ui/aboutdialog.py 2010-07-08 17:23:42 +0000
@@ -24,98 +24,89 @@
###############################################################################
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
+
+from openlp.core.lib import build_icon, translate
class Ui_AboutDialog(object):
- def setupUi(self, AboutDialog):
- AboutDialog.setObjectName(u'AboutDialog')
- AboutDialog.resize(516, 481)
- LogoIcon = QtGui.QIcon()
- LogoIcon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- AboutDialog.setWindowIcon(LogoIcon)
- self.AboutDialogLayout = QtGui.QVBoxLayout(AboutDialog)
- self.AboutDialogLayout.setSpacing(8)
- self.AboutDialogLayout.setMargin(8)
- self.AboutDialogLayout.setObjectName(u'AboutDialogLayout')
- self.LogoLabel = QtGui.QLabel(AboutDialog)
- self.LogoLabel.setPixmap(
+ def setupUi(self, aboutDialog):
+ aboutDialog.setObjectName(u'aboutDialog')
+ aboutDialog.resize(516, 481)
+ aboutDialog.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png'))
+ self.aboutDialogLayout = QtGui.QVBoxLayout(aboutDialog)
+ self.aboutDialogLayout.setSpacing(8)
+ self.aboutDialogLayout.setMargin(8)
+ self.aboutDialogLayout.setObjectName(u'aboutDialogLayout')
+ self.logoLabel = QtGui.QLabel(aboutDialog)
+ self.logoLabel.setPixmap(
QtGui.QPixmap(u':/graphics/openlp-about-logo.png'))
- self.LogoLabel.setScaledContents(False)
- self.LogoLabel.setIndent(0)
- self.LogoLabel.setObjectName(u'LogoLabel')
- self.AboutDialogLayout.addWidget(self.LogoLabel)
- self.AboutNotebook = QtGui.QTabWidget(AboutDialog)
- self.AboutNotebook.setObjectName(u'AboutNotebook')
- self.AboutTab = QtGui.QWidget()
- self.AboutTab.setObjectName(u'AboutTab')
- self.AboutTabLayout = QtGui.QVBoxLayout(self.AboutTab)
- self.AboutTabLayout.setSpacing(0)
- self.AboutTabLayout.setMargin(8)
- self.AboutTabLayout.setObjectName(u'AboutTabLayout')
- self.AboutTextEdit = QtGui.QPlainTextEdit(self.AboutTab)
- self.AboutTextEdit.setReadOnly(True)
- self.AboutTextEdit.setObjectName(u'AboutTextEdit')
- self.AboutTabLayout.addWidget(self.AboutTextEdit)
- self.AboutNotebook.addTab(self.AboutTab, '')
- self.CreditsTab = QtGui.QWidget()
- self.CreditsTab.setObjectName(u'CreditsTab')
- self.CreditsTabLayout = QtGui.QVBoxLayout(self.CreditsTab)
- self.CreditsTabLayout.setSpacing(0)
- self.CreditsTabLayout.setMargin(8)
- self.CreditsTabLayout.setObjectName(u'CreditsTabLayout')
- self.CreditsTextEdit = QtGui.QPlainTextEdit(self.CreditsTab)
- self.CreditsTextEdit.setReadOnly(True)
- self.CreditsTextEdit.setObjectName(u'CreditsTextEdit')
- self.CreditsTabLayout.addWidget(self.CreditsTextEdit)
- self.AboutNotebook.addTab(self.CreditsTab, '')
- self.LicenseTab = QtGui.QWidget()
- self.LicenseTab.setObjectName(u'LicenseTab')
- self.LicenseTabLayout = QtGui.QVBoxLayout(self.LicenseTab)
- self.LicenseTabLayout.setSpacing(8)
- self.LicenseTabLayout.setMargin(8)
- self.LicenseTabLayout.setObjectName(u'LicenseTabLayout')
- self.LicenseTextEdit = QtGui.QPlainTextEdit(self.LicenseTab)
- self.LicenseTextEdit.setReadOnly(True)
- self.LicenseTextEdit.setObjectName(u'LicenseTextEdit')
- self.LicenseTabLayout.addWidget(self.LicenseTextEdit)
- self.AboutNotebook.addTab(self.LicenseTab, '')
- self.AboutDialogLayout.addWidget(self.AboutNotebook)
- self.ButtonWidget = QtGui.QWidget(AboutDialog)
- self.ButtonWidget.setObjectName(u'ButtonWidget')
- self.ButtonWidgetLayout = QtGui.QHBoxLayout(self.ButtonWidget)
- self.ButtonWidgetLayout.setSpacing(8)
- self.ButtonWidgetLayout.setMargin(0)
- self.ButtonWidgetLayout.setObjectName(u'ButtonWidgetLayout')
- ButtonSpacer = QtGui.QSpacerItem(275, 20,
+ self.logoLabel.setScaledContents(False)
+ self.logoLabel.setIndent(0)
+ self.logoLabel.setObjectName(u'logoLabel')
+ self.aboutDialogLayout.addWidget(self.logoLabel)
+ self.aboutNotebook = QtGui.QTabWidget(aboutDialog)
+ self.aboutNotebook.setObjectName(u'aboutNotebook')
+ self.aboutTab = QtGui.QWidget()
+ self.aboutTab.setObjectName(u'aboutTab')
+ self.aboutTabLayout = QtGui.QVBoxLayout(self.aboutTab)
+ self.aboutTabLayout.setSpacing(0)
+ self.aboutTabLayout.setMargin(8)
+ self.aboutTabLayout.setObjectName(u'aboutTabLayout')
+ self.aboutTextEdit = QtGui.QPlainTextEdit(self.aboutTab)
+ self.aboutTextEdit.setReadOnly(True)
+ self.aboutTextEdit.setObjectName(u'aboutTextEdit')
+ self.aboutTabLayout.addWidget(self.aboutTextEdit)
+ self.aboutNotebook.addTab(self.aboutTab, '')
+ self.creditsTab = QtGui.QWidget()
+ self.creditsTab.setObjectName(u'creditsTab')
+ self.creditsTabLayout = QtGui.QVBoxLayout(self.creditsTab)
+ self.creditsTabLayout.setSpacing(0)
+ self.creditsTabLayout.setMargin(8)
+ self.creditsTabLayout.setObjectName(u'creditsTabLayout')
+ self.creditsTextEdit = QtGui.QPlainTextEdit(self.creditsTab)
+ self.creditsTextEdit.setReadOnly(True)
+ self.creditsTextEdit.setObjectName(u'creditsTextEdit')
+ self.creditsTabLayout.addWidget(self.creditsTextEdit)
+ self.aboutNotebook.addTab(self.creditsTab, '')
+ self.licenseTab = QtGui.QWidget()
+ self.licenseTab.setObjectName(u'licenseTab')
+ self.licenseTabLayout = QtGui.QVBoxLayout(self.licenseTab)
+ self.licenseTabLayout.setSpacing(8)
+ self.licenseTabLayout.setMargin(8)
+ self.licenseTabLayout.setObjectName(u'licenseTabLayout')
+ self.licenseTextEdit = QtGui.QPlainTextEdit(self.licenseTab)
+ self.licenseTextEdit.setReadOnly(True)
+ self.licenseTextEdit.setObjectName(u'licenseTextEdit')
+ self.licenseTabLayout.addWidget(self.licenseTextEdit)
+ self.aboutNotebook.addTab(self.licenseTab, '')
+ self.aboutDialogLayout.addWidget(self.aboutNotebook)
+ self.buttonWidget = QtGui.QWidget(aboutDialog)
+ self.buttonWidget.setObjectName(u'buttonWidget')
+ self.buttonWidgetLayout = QtGui.QHBoxLayout(self.buttonWidget)
+ self.buttonWidgetLayout.setSpacing(8)
+ self.buttonWidgetLayout.setMargin(0)
+ self.buttonWidgetLayout.setObjectName(u'buttonWidgetLayout')
+ buttonSpacer = QtGui.QSpacerItem(275, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.ButtonWidgetLayout.addItem(ButtonSpacer)
- self.ContributeButton = QtGui.QPushButton(self.ButtonWidget)
- ContributeIcon = QtGui.QIcon()
- ContributeIcon.addPixmap(
- QtGui.QPixmap(u':/system/system_contribute.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.ContributeButton.setIcon(ContributeIcon)
- self.ContributeButton.setObjectName(u'ContributeButton')
- self.ButtonWidgetLayout.addWidget(self.ContributeButton)
- self.CloseButton = QtGui.QPushButton(self.ButtonWidget)
- CloseIcon = QtGui.QIcon()
- CloseIcon.addPixmap(QtGui.QPixmap(u':/system/system_close.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.CloseButton.setIcon(CloseIcon)
- self.CloseButton.setObjectName(u'CloseButton')
- self.ButtonWidgetLayout.addWidget(self.CloseButton)
- self.AboutDialogLayout.addWidget(self.ButtonWidget)
-
- self.retranslateUi(AboutDialog)
- self.AboutNotebook.setCurrentIndex(0)
- QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'),
- AboutDialog.close)
- QtCore.QMetaObject.connectSlotsByName(AboutDialog)
-
- def retranslateUi(self, AboutDialog):
- AboutDialog.setWindowTitle(translate('AboutForm', 'About OpenLP'))
- self.AboutTextEdit.setPlainText(translate('AboutForm',
+ self.buttonWidgetLayout.addItem(buttonSpacer)
+ self.contributeButton = QtGui.QPushButton(self.buttonWidget)
+ self.contributeButton.setIcon(
+ build_icon(u':/system/system_contribute.png'))
+ self.contributeButton.setObjectName(u'contributeButton')
+ self.buttonWidgetLayout.addWidget(self.contributeButton)
+ self.closeButton = QtGui.QPushButton(self.buttonWidget)
+ self.closeButton.setIcon(build_icon(u':/system/system_close.png'))
+ self.closeButton.setObjectName(u'closeButton')
+ self.buttonWidgetLayout.addWidget(self.closeButton)
+ self.aboutDialogLayout.addWidget(self.buttonWidget)
+ self.retranslateUi(aboutDialog)
+ self.aboutNotebook.setCurrentIndex(0)
+ QtCore.QObject.connect(self.closeButton, QtCore.SIGNAL(u'clicked()'),
+ 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 '
'Projection\n'
'\n'
@@ -131,11 +122,10 @@
'like to see more free Christian software being written, please '
'consider contributing by using the button below.'
))
- self.AboutNotebook.setTabText(
-
- self.AboutNotebook.indexOf(self.AboutTab),
+ self.aboutNotebook.setTabText(
+ self.aboutNotebook.indexOf(self.aboutTab),
translate('AboutForm', 'About'))
- self.CreditsTextEdit.setPlainText(translate('AboutForm',
+ self.creditsTextEdit.setPlainText(translate('AboutForm',
'Project Lead\n'
' Raoul "superfly" Snyman\n'
'\n'
@@ -165,10 +155,10 @@
' Matthias "matthub" Hub (Mac OS X)\n'
' Raoul "superfly" Snyman (Windows)\n'
))
- self.AboutNotebook.setTabText(
- self.AboutNotebook.indexOf(self.CreditsTab),
+ self.aboutNotebook.setTabText(
+ self.aboutNotebook.indexOf(self.creditsTab),
translate('AboutForm', 'Credits'))
- self.LicenseTextEdit.setPlainText(translate('AboutForm',
+ self.licenseTextEdit.setPlainText(translate('AboutForm',
'Copyright \xa9 2004-2010 Raoul Snyman\n'
'Portions copyright \xa9 2004-2010 '
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
@@ -557,8 +547,8 @@
'linking proprietary applications with the library. If this is '
'what you want to do, use the GNU Lesser General Public License '
'instead of this License.'))
- self.AboutNotebook.setTabText(
- self.AboutNotebook.indexOf(self.LicenseTab),
+ self.aboutNotebook.setTabText(
+ self.aboutNotebook.indexOf(self.licenseTab),
translate('AboutForm', 'License'))
- self.ContributeButton.setText(translate('AboutForm', 'Contribute'))
- self.CloseButton.setText(translate('AboutForm', 'Close'))
+ self.contributeButton.setText(translate('AboutForm', 'Contribute'))
+ self.closeButton.setText(translate('AboutForm', 'Close'))
=== modified file 'openlp/core/ui/aboutform.py'
--- openlp/core/ui/aboutform.py 2010-06-18 23:48:16 +0000
+++ openlp/core/ui/aboutform.py 2010-07-08 17:23:42 +0000
@@ -40,7 +40,7 @@
QtGui.QDialog.__init__(self, parent)
self.applicationVersion = applicationVersion
self.setupUi(self)
- about_text = self.AboutTextEdit.toPlainText()
+ about_text = self.aboutTextEdit.toPlainText()
about_text = about_text.replace(u'<version>',
self.applicationVersion[u'version'])
if self.applicationVersion[u'build']:
@@ -49,8 +49,8 @@
else:
build_text = u''
about_text = about_text.replace(u'<revision>', build_text)
- self.AboutTextEdit.setPlainText(about_text)
- QtCore.QObject.connect(self.ContributeButton,
+ self.aboutTextEdit.setPlainText(about_text)
+ QtCore.QObject.connect(self.contributeButton,
QtCore.SIGNAL(u'clicked()'), self.onContributeButtonClicked)
def onContributeButtonClicked(self):
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2010-07-07 16:00:44 +0000
+++ openlp/core/ui/maindisplay.py 2010-07-08 17:23:42 +0000
@@ -154,9 +154,10 @@
"""
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)
self.parent = parent
+ self.primary = primary
self.hotkey_map = {
QtCore.Qt.Key_Return: 'servicemanager_next_item',
QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop',
@@ -189,6 +190,14 @@
else:
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):
"""
This is the form that is used to display things on the projector.
@@ -206,7 +215,7 @@
The list of screens.
"""
log.debug(u'Initialisation started')
- DisplayWidget.__init__(self, parent)
+ DisplayWidget.__init__(self, parent, primary=True)
self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint)
self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
@@ -222,7 +231,6 @@
self.setupText()
self.setupAlert()
self.setupBlank()
- self.primary = True
self.blankFrame = None
self.frame = None
#Hide desktop for now until we know where to put it
@@ -239,23 +247,24 @@
self.screen = self.screens.current
#Sort out screen locations and sizes
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.size().height())
#Build a custom splash screen
- self.InitialFrame = QtGui.QImage(
+ self.initialFrame = QtGui.QImage(
self.screen[u'size'].width(),
self.screen[u'size'].height(),
QtGui.QImage.Format_ARGB32_Premultiplied)
splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
painter_image = QtGui.QPainter()
- painter_image.begin(self.InitialFrame)
- painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
+ painter_image.begin(self.initialFrame)
+ painter_image.fillRect(self.initialFrame.rect(), QtCore.Qt.white)
painter_image.drawImage(
(self.screen[u'size'].width() - splash_image.width()) / 2,
(self.screen[u'size'].height() - splash_image.height()) / 2,
splash_image)
- self.displayImage(self.InitialFrame)
+ self.displayImage(self.initialFrame)
self.repaint()
#Build a Black screen
painter = QtGui.QPainter()
@@ -281,7 +290,7 @@
def setupScene(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)
def setupVideo(self):
@@ -323,14 +332,6 @@
self.displayBlank.setZValue(10)
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):
# """
# Hides the main display if for the video to be played
@@ -389,9 +390,9 @@
if location == 0:
self.alertText.setPos(0, 0)
elif location == 1:
- self.alertText.setPos(0,self.size().height()/2)
+ self.alertText.setPos(0, self.size().height() / 2)
else:
- self.alertText.setPos(0,self.size().height() - 76)
+ self.alertText.setPos(0, self.size().height() - 76)
self.alertText.setHtml(message)
def displayImage(self, frame):
@@ -536,8 +537,8 @@
Shutting down so clean up connections
"""
self.onMediaStop()
- for pth in self.outputPaths():
- disconnected = pth.disconnect()
+ for path in self.outputPaths():
+ path.disconnect()
# def onMediaBackground(self, message=None):
# """
@@ -662,8 +663,8 @@
Shutting down so clean up connections
"""
self.onMediaStop()
- for pth in self.mediaObject.outputPaths():
- disconnected = pth.disconnect()
+ for path in self.mediaObject.outputPaths():
+ path.disconnect()
def onMediaQueue(self, message):
"""
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2010-07-06 21:23:09 +0000
+++ openlp/core/ui/mainwindow.py 2010-07-08 17:23:42 +0000
@@ -38,7 +38,7 @@
log = logging.getLogger(__name__)
-media_manager_style = """
+MEDIA_MANAGER_STYLE = """
QToolBox::tab {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(button), stop: 1.0 palette(dark));
@@ -174,7 +174,7 @@
self.MediaManagerDock = OpenLPDockWidget(MainWindow)
self.MediaManagerDock.setWindowIcon(
build_icon(u':/system/system_mediamanager.png'))
- self.MediaManagerDock.setStyleSheet(media_manager_style)
+ self.MediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE)
self.MediaManagerDock.setMinimumWidth(
self.settingsmanager.mainwindow_left)
self.MediaManagerDock.setObjectName(u'MediaManagerDock')
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2010-06-30 11:59:09 +0000
+++ openlp/core/ui/servicemanager.py 2010-07-08 17:23:42 +0000
@@ -33,7 +33,8 @@
from PyQt4 import QtCore, QtGui
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.utils import AppLocation
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py 2010-06-21 16:43:59 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py 2010-07-08 17:23:42 +0000
@@ -25,16 +25,13 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
+from openlp.core.lib import build_icon, translate
class Ui_AlertDialog(object):
def setupUi(self, AlertDialog):
AlertDialog.setObjectName(u'AlertDialog')
AlertDialog.resize(567, 440)
- icon = QtGui.QIcon()
- icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- AlertDialog.setWindowIcon(icon)
+ AlertDialog.setWindowIcon(build_icon(u':/icon/openlp.org-icon-32.bmp'))
self.AlertDialogLayout = QtGui.QVBoxLayout(AlertDialog)
self.AlertDialogLayout.setSpacing(8)
self.AlertDialogLayout.setMargin(8)
@@ -79,25 +76,16 @@
self.ManageButtonLayout.setSpacing(8)
self.ManageButtonLayout.setObjectName(u'ManageButtonLayout')
self.NewButton = QtGui.QPushButton(AlertDialog)
- icon1 = QtGui.QIcon()
- icon1.addPixmap(QtGui.QPixmap(u':/general/general_new.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.NewButton.setIcon(icon1)
+ self.NewButton.setIcon(build_icon(u':/general/general_new.png'))
self.NewButton.setObjectName(u'NewButton')
self.ManageButtonLayout.addWidget(self.NewButton)
self.SaveButton = QtGui.QPushButton(AlertDialog)
self.SaveButton.setEnabled(False)
- icon2 = QtGui.QIcon()
- icon2.addPixmap(QtGui.QPixmap(u':/general/general_save.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.SaveButton.setIcon(icon2)
+ self.SaveButton.setIcon(build_icon(u':/general/general_save.png'))
self.SaveButton.setObjectName(u'SaveButton')
self.ManageButtonLayout.addWidget(self.SaveButton)
self.DeleteButton = QtGui.QPushButton(AlertDialog)
- icon3 = QtGui.QIcon()
- icon3.addPixmap(QtGui.QPixmap(u':/general/general_delete.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.DeleteButton.setIcon(icon3)
+ self.DeleteButton.setIcon(build_icon(u':/general/general_delete.png'))
self.DeleteButton.setObjectName(u'DeleteButton')
self.ManageButtonLayout.addWidget(self.DeleteButton)
spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
@@ -111,22 +99,17 @@
spacerItem1 = QtGui.QSpacerItem(181, 0, QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Minimum)
self.AlertButtonLayout.addItem(spacerItem1)
+ displayIcon = build_icon(u':/general/general_live.png')
self.DisplayButton = QtGui.QPushButton(AlertDialog)
- icon4 = QtGui.QIcon()
- icon4.addPixmap(QtGui.QPixmap(u':/general/general_live.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.DisplayButton.setIcon(icon4)
+ self.DisplayButton.setIcon(displayIcon)
self.DisplayButton.setObjectName(u'DisplayButton')
self.AlertButtonLayout.addWidget(self.DisplayButton)
self.DisplayCloseButton = QtGui.QPushButton(AlertDialog)
- self.DisplayCloseButton.setIcon(icon4)
+ self.DisplayCloseButton.setIcon(displayIcon)
self.DisplayCloseButton.setObjectName(u'DisplayCloseButton')
self.AlertButtonLayout.addWidget(self.DisplayCloseButton)
self.CloseButton = QtGui.QPushButton(AlertDialog)
- icon5 = QtGui.QIcon()
- icon5.addPixmap(QtGui.QPixmap(u':/system/system_close.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.CloseButton.setIcon(icon5)
+ self.CloseButton.setIcon(build_icon(u':/system/system_close.png'))
self.CloseButton.setObjectName(u'CloseButton')
self.AlertButtonLayout.addWidget(self.CloseButton)
self.AlertDialogLayout.addLayout(self.AlertButtonLayout)
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2010-06-26 08:09:09 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2010-07-08 17:23:42 +0000
@@ -274,10 +274,6 @@
self.FontComboBox.setCurrentFont(font)
self.updateDisplay()
- def onItemSelected(self):
- self.EditButton.setEnabled(True)
- self.DeleteButton.setEnabled(True)
-
def save(self):
settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection)
=== modified file 'openlp/plugins/bibles/forms/bibleimportwizard.py'
--- openlp/plugins/bibles/forms/bibleimportwizard.py 2010-06-21 18:28:36 +0000
+++ openlp/plugins/bibles/forms/bibleimportwizard.py 2010-07-08 17:23:42 +0000
@@ -24,7 +24,8 @@
###############################################################################
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
+
+from openlp.core.lib import build_icon, translate
class Ui_BibleImportWizard(object):
def setupUi(self, BibleImportWizard):
@@ -61,10 +62,10 @@
BibleImportWizard.addPage(self.WelcomePage)
self.SelectPage = QtGui.QWizardPage()
self.SelectPage.setObjectName(u'SelectPage')
- self.SelectPageLayout = QtGui.QVBoxLayout(self.SelectPage)
- self.SelectPageLayout.setSpacing(8)
- self.SelectPageLayout.setMargin(20)
- self.SelectPageLayout.setObjectName(u'SelectPageLayout')
+ self.selectPageLayout = QtGui.QVBoxLayout(self.SelectPage)
+ self.selectPageLayout.setSpacing(8)
+ self.selectPageLayout.setMargin(20)
+ self.selectPageLayout.setObjectName(u'selectPageLayout')
self.FormatSelectLayout = QtGui.QHBoxLayout()
self.FormatSelectLayout.setSpacing(8)
self.FormatSelectLayout.setObjectName(u'FormatSelectLayout')
@@ -81,7 +82,7 @@
spacerItem2 = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.FormatSelectLayout.addItem(spacerItem2)
- self.SelectPageLayout.addLayout(self.FormatSelectLayout)
+ self.selectPageLayout.addLayout(self.FormatSelectLayout)
self.FormatWidget = QtGui.QStackedWidget(self.SelectPage)
self.FormatWidget.setObjectName(u'FormatWidget')
self.OsisPage = QtGui.QWidget()
@@ -104,10 +105,7 @@
self.OsisLocationLayout.addWidget(self.OSISLocationEdit)
self.OsisFileButton = QtGui.QToolButton(self.OsisPage)
self.OsisFileButton.setMaximumSize(QtCore.QSize(32, 16777215))
- icon = QtGui.QIcon()
- icon.addPixmap(QtGui.QPixmap(u':/general/general_open.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.OsisFileButton.setIcon(icon)
+ self.OsisFileButton.setIcon(build_icon(u':/general/general_open.png'))
self.OsisFileButton.setObjectName(u'OsisFileButton')
self.OsisLocationLayout.addWidget(self.OsisFileButton)
self.OsisLayout.setLayout(1, QtGui.QFormLayout.FieldRole,
@@ -251,7 +249,7 @@
self.WebDownloadTabWidget.addTab(self.ProxyServerTab, u'')
self.WebDownloadLayout.addWidget(self.WebDownloadTabWidget)
self.FormatWidget.addWidget(self.WebDownloadPage)
- self.SelectPageLayout.addWidget(self.FormatWidget)
+ self.selectPageLayout.addWidget(self.FormatWidget)
BibleImportWizard.addPage(self.SelectPage)
self.LicenseDetailsPage = QtGui.QWizardPage()
self.LicenseDetailsPage.setObjectName(u'LicenseDetailsPage')
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2010-07-08 12:32:09 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2010-07-08 17:23:42 +0000
@@ -55,6 +55,7 @@
def __init__(self, parent, icon, title):
self.PluginNameShort = u'Bible'
+ self.pluginNameVisible = translate('BiblesPlugin.MediaItem', 'Bible')
self.IconPath = u'songs/song'
self.ListViewWithDnD_class = BibleListView
self.lastReference = []
@@ -70,9 +71,6 @@
obj = obj.toPyObject()
return unicode(obj)
- def initPluginNameVisible(self):
- self.PluginNameVisible = translate('BiblesPlugin.MediaItem', 'Bible')
-
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
self.hasImportIcon = True
@@ -238,7 +236,7 @@
self.SearchTabWidget.addTab(self.AdvancedTab,
translate('BiblesPlugin.MediaItem', 'Advanced'))
# Add the search tab widget to the page layout
- self.PageLayout.addWidget(self.SearchTabWidget)
+ self.pageLayout.addWidget(self.SearchTabWidget)
# Combo Boxes
QtCore.QObject.connect(self.AdvancedVersionComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onAdvancedVersionComboBox)
@@ -274,8 +272,8 @@
self.SearchProgress.setFormat('')
self.SearchProgress.setMinimum(0)
self.SearchProgress.setMaximum(0)
- self.SearchProgress.setGeometry(self.ListView.geometry().left(),
- self.ListView.geometry().top(), 81, 23)
+ self.SearchProgress.setGeometry(self.listView.geometry().left(),
+ self.listView.geometry().top(), 81, 23)
self.SearchProgress.setVisible(False)
self.SearchProgress.setObjectName(u'SearchProgress')
@@ -373,9 +371,9 @@
self.initialiseBible(bible)
def onListViewResize(self, width, height):
- self.SearchProgress.setGeometry(self.ListView.geometry().x(),
- (self.ListView.geometry().y() + self.ListView.geometry().height())\
- - 23, 81, 23)
+ listViewGeometry = self.listView.geometry()
+ self.SearchProgress.setGeometry(listViewGeometry.x(),
+ (listViewGeometry.y() + listViewGeometry.height()) - 23, 81, 23)
def onSearchProgressShow(self):
self.SearchProgress.setVisible(True)
@@ -439,7 +437,7 @@
chapter_to, verse_to)
self.search_results = self.parent.manager.get_verses(bible, versetext)
if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
- self.ListView.clear()
+ self.listView.clear()
self.lastReference = []
self.lastReference.append(versetext)
self.displayResults(bible)
@@ -459,7 +457,7 @@
bible = unicode(self.QuickVersionComboBox.currentText())
text = unicode(self.QuickSearchEdit.text())
if self.ClearQuickSearchComboBox.currentIndex() == 0:
- self.ListView.clear()
+ self.listView.clear()
self.lastReference = []
self.lastReference.append(text)
self.search_results = self.parent.manager.get_verses(bible, text)
@@ -468,7 +466,7 @@
def generateSlideData(self, service_item, item=None):
log.debug(u'generating slide data')
- items = self.ListView.selectedIndexes()
+ items = self.listView.selectedIndexes()
if len(items) == 0:
return False
old_chapter = u''
@@ -509,7 +507,7 @@
bible2_permission = u''
# Let's loop through the main lot, and assemble our verses
for item in items:
- bitem = self.ListView.item(item.row())
+ bitem = self.listView.item(item.row())
reference = bitem.data(QtCore.Qt.UserRole)
if isinstance(reference, QtCore.QVariant):
reference = reference.toPyObject()
@@ -657,8 +655,8 @@
'text': QtCore.QVariant(verse.text)
}
bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict))
- self.ListView.addItem(bible_verse)
- row = self.ListView.setCurrentRow(count)
+ self.listView.addItem(bible_verse)
+ row = self.listView.setCurrentRow(count)
if row:
row.setSelected(True)
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2010-06-24 15:28:42 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2010-07-08 17:23:42 +0000
@@ -25,16 +25,14 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
+from openlp.core.lib import build_icon, translate
class Ui_customEditDialog(object):
def setupUi(self, customEditDialog):
customEditDialog.setObjectName(u'customEditDialog')
customEditDialog.resize(590, 541)
- icon = QtGui.QIcon()
- icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- customEditDialog.setWindowIcon(icon)
+ customEditDialog.setWindowIcon(
+ build_icon(u':/icon/openlp.org-icon-32.bmp'))
self.gridLayout = QtGui.QGridLayout(customEditDialog)
self.gridLayout.setObjectName(u'gridLayout')
self.horizontalLayout = QtGui.QHBoxLayout()
@@ -56,20 +54,14 @@
self.verticalLayout = QtGui.QVBoxLayout()
self.verticalLayout.setObjectName(u'verticalLayout')
self.UpButton = QtGui.QPushButton(customEditDialog)
- icon1 = QtGui.QIcon()
- icon1.addPixmap(QtGui.QPixmap(u':/services/service_up.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.UpButton.setIcon(icon1)
+ self.UpButton.setIcon(build_icon(u':/services/service_up.png'))
self.UpButton.setObjectName(u'UpButton')
self.verticalLayout.addWidget(self.UpButton)
spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem)
self.DownButton = QtGui.QPushButton(customEditDialog)
- icon2 = QtGui.QIcon()
- icon2.addPixmap(QtGui.QPixmap(u':/services/service_down.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.DownButton.setIcon(icon2)
+ self.DownButton.setIcon(build_icon(u':/services/service_down.png'))
self.DownButton.setObjectName(u'DownButton')
self.verticalLayout.addWidget(self.DownButton)
self.horizontalLayout_4.addLayout(self.verticalLayout)
@@ -138,7 +130,6 @@
QtGui.QDialogButtonBox.Save)
self.buttonBox.setObjectName(u'buttonBox')
self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 1)
-
self.retranslateUi(customEditDialog)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
customEditDialog.accept)
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2010-07-03 01:33:40 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2010-07-08 17:23:42 +0000
@@ -47,6 +47,7 @@
def __init__(self, parent, icon, title):
self.PluginNameShort = u'Custom'
+ self.pluginNameVisible = translate('CustomPlugin.MediaItem', 'Custom')
self.IconPath = u'custom/custom'
# this next is a class, not an instance of a class - it will
# be instanced by the base MediaManagerItem
@@ -67,9 +68,6 @@
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'custom_preview'), self.onPreviewClick)
- def initPluginNameVisible(self):
- self.PluginNameVisible = translate('CustomPlugin.MediaItem', 'Custom')
-
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -86,12 +84,12 @@
self.onRemoteEditClear()
def loadCustomListView(self, list):
- self.ListView.clear()
+ self.listView.clear()
for customSlide in list:
custom_name = QtGui.QListWidgetItem(customSlide.title)
custom_name.setData(
QtCore.Qt.UserRole, QtCore.QVariant(customSlide.id))
- self.ListView.addItem(custom_name)
+ self.listView.addItem(custom_name)
def onNewClick(self):
self.parent.edit_custom_form.loadCustom(0)
@@ -121,10 +119,10 @@
"""
Edit a custom item
"""
- if check_item_selected(self.ListView,
+ if check_item_selected(self.listView,
translate('CustomPlugin.MediaItem',
'You must select an item to edit.')):
- item = self.ListView.currentItem()
+ item = self.listView.currentItem()
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
self.parent.edit_custom_form.loadCustom(item_id, False)
self.parent.edit_custom_form.exec_()
@@ -134,17 +132,17 @@
"""
Remove a custom item from the list and database
"""
- if check_item_selected(self.ListView,
+ if check_item_selected(self.listView,
translate('CustomPlugin.MediaItem',
'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)
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:
self.parent.custommanager.delete_object(CustomSlide, id)
for row in row_list:
- self.ListView.takeItem(row)
+ self.listView.takeItem(row)
def generateSlideData(self, service_item, item=None):
raw_slides = []
@@ -153,7 +151,7 @@
theme = None
if item is None:
if self.remoteTriggered is None:
- item = self.ListView.currentItem()
+ item = self.listView.currentItem()
if item is None:
return False
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2010-07-02 18:21:45 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2010-07-08 17:23:42 +0000
@@ -50,15 +50,13 @@
def __init__(self, parent, icon, title):
self.PluginNameShort = u'Image'
+ self.pluginNameVisible = translate('ImagePlugin.MediaItem', 'Image')
self.IconPath = u'images/image'
# this next is a class, not an instance of a class - it will
# be instanced by the base MediaManagerItem
self.ListViewWithDnD_class = ImageListView
MediaManagerItem.__init__(self, parent, icon, title)
- def initPluginNameVisible(self):
- self.PluginNameVisible = translate('ImagePlugin.MediaItem', 'Image')
-
def retranslateUi(self):
self.OnNewPrompt = translate('ImagePlugin.MediaItem',
'Select Image(s)')
@@ -75,10 +73,10 @@
def initialise(self):
log.debug(u'initialise')
- self.ListView.clear()
- self.ListView.setSelectionMode(
+ self.listView.clear()
+ self.listView.setSelectionMode(
QtGui.QAbstractItemView.ExtendedSelection)
- self.ListView.setIconSize(QtCore.QSize(88, 50))
+ self.listView.setIconSize(QtCore.QSize(88, 50))
self.servicePath = os.path.join(
AppLocation.get_section_data_path(self.settingsSection),
u'thumbnails')
@@ -89,10 +87,10 @@
def addListViewToToolBar(self):
MediaManagerItem.addListViewToToolBar(self)
- self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
- self.ListView.addAction(
+ self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
+ self.listView.addAction(
context_menu_action(
- self.ListView, u':/slides/slide_blank.png',
+ self.listView, u':/slides/slide_blank.png',
translate('ImagePlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick))
@@ -106,23 +104,23 @@
self.ImageWidget.sizePolicy().hasHeightForWidth())
self.ImageWidget.setSizePolicy(sizePolicy)
self.ImageWidget.setObjectName(u'ImageWidget')
- self.blankButton = self.Toolbar.addToolbarButton(
+ self.blankButton = self.toolbar.addToolbarButton(
u'Replace Background', u':/slides/slide_blank.png',
translate('ImagePlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick, False)
# Add the song widget to the page layout
- self.PageLayout.addWidget(self.ImageWidget)
+ self.pageLayout.addWidget(self.ImageWidget)
def onDeleteClick(self):
"""
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.')):
- 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)
for row in row_list:
- text = self.ListView.item(row)
+ text = self.listView.item(row)
if text:
try:
os.remove(os.path.join(self.servicePath,
@@ -130,7 +128,7 @@
except OSError:
#if not present do not worry
pass
- self.ListView.takeItem(row)
+ self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList())
@@ -144,14 +142,14 @@
else:
icon = build_icon(u':/general/general_delete.png')
else:
- icon = self.IconFromFile(file, thumb)
+ icon = self.iconFromFile(file, thumb)
item_name = QtGui.QListWidgetItem(filename)
item_name.setIcon(icon)
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):
- items = self.ListView.selectedIndexes()
+ items = self.listView.selectedIndexes()
if items:
service_item.title = unicode(
translate('ImagePlugin.MediaItem', 'Image(s)'))
@@ -160,7 +158,7 @@
service_item.add_capability(ItemCapabilities.AllowsLoop)
service_item.add_capability(ItemCapabilities.AllowsAdditions)
for item in items:
- bitem = self.ListView.item(item.row())
+ bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
frame = QtGui.QImage(unicode(filename))
(path, name) = os.path.split(filename)
@@ -170,12 +168,12 @@
return False
def onReplaceClick(self):
- if check_item_selected(self.ListView,
+ if check_item_selected(self.listView,
translate('ImagePlugin.MediaItem',
'You must select an item to process.')):
- items = self.ListView.selectedIndexes()
+ items = self.listView.selectedIndexes()
for item in items:
- bitem = self.ListView.item(item.row())
+ bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
frame = QtGui.QImage(unicode(filename))
self.parent.displayManager.displayImageWithText(frame)
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2010-07-02 18:21:45 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2010-07-08 17:23:42 +0000
@@ -47,6 +47,7 @@
def __init__(self, parent, icon, title):
self.PluginNameShort = u'Media'
+ self.pluginNameVisible = translate('MediaPlugin.MediaItem', 'Media')
self.IconPath = u'images/image'
self.background = False
# this next is a class, not an instance of a class - it will
@@ -56,10 +57,7 @@
u':/media/media_video.png').toImage()
MediaManagerItem.__init__(self, parent, icon, title)
self.singleServiceItem = False
- self.ServiceItemIconName = u':/media/media_video.png'
-
- def initPluginNameVisible(self):
- self.PluginNameVisible = translate('MediaPlugin.MediaItem', 'Media')
+ self.serviceItemIconName = u':/media/media_video.png'
def retranslateUi(self):
self.OnNewPrompt = translate('MediaPlugin.MediaItem', 'Select Media')
@@ -76,9 +74,9 @@
def addListViewToToolBar(self):
MediaManagerItem.addListViewToToolBar(self)
- self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
- self.ListView.addAction(
- context_menu_action(self.ListView, u':/slides/slide_blank.png',
+ self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
+ self.listView.addAction(
+ context_menu_action(self.listView, u':/slides/slide_blank.png',
translate('MediaPlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick))
@@ -93,25 +91,25 @@
self.ImageWidget.setSizePolicy(sizePolicy)
self.ImageWidget.setObjectName(u'ImageWidget')
#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',
translate('MediaPlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick, False)
# Add the song widget to the page layout
- self.PageLayout.addWidget(self.ImageWidget)
+ self.pageLayout.addWidget(self.ImageWidget)
def onReplaceClick(self):
- if check_item_selected(self.ListView,
+ if check_item_selected(self.listView,
translate('ImagePlugin.MediaItem',
'You must select an item to process.')):
- item = self.ListView.currentItem()
+ item = self.listView.currentItem()
filename = unicode(item.data(QtCore.Qt.UserRole).toString())
self.parent.displayManager.displayVideo(filename)
def generateSlideData(self, service_item, item=None):
if item is None:
- item = self.ListView.currentItem()
+ item = self.listView.currentItem()
if item is None:
return False
filename = unicode(item.data(QtCore.Qt.UserRole).toString())
@@ -124,9 +122,9 @@
return True
def initialise(self):
- self.ListView.setSelectionMode(
+ self.listView.setSelectionMode(
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.settingsSection))
@@ -134,12 +132,12 @@
"""
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.')):
- 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)
for row in row_list:
- self.ListView.takeItem(row)
+ self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList())
@@ -150,4 +148,4 @@
img = QtGui.QPixmap(u':/media/media_video.png').toImage()
item_name.setIcon(build_icon(img))
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
- self.ListView.addItem(item_name)
+ self.listView.addItem(item_name)
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2010-07-02 22:18:54 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2010-07-08 17:23:42 +0000
@@ -52,6 +52,8 @@
def __init__(self, parent, icon, title, controllers):
self.controllers = controllers
self.PluginNameShort = u'Presentation'
+ self.pluginNameVisible = translate('PresentationPlugin.MediaItem',
+ 'Presentation')
self.IconPath = u'presentations/presentation'
self.Automatic = u''
# this next is a class, not an instance of a class - it will
@@ -60,10 +62,6 @@
MediaManagerItem.__init__(self, parent, icon, title)
self.message_listener = MessageListener(self)
- def initPluginNameVisible(self):
- self.PluginNameVisible = translate('PresentationPlugin.MediaItem',
- 'Presentation')
-
def retranslateUi(self):
self.OnNewPrompt = translate('PresentationPlugin.MediaItem',
'Select Presentation(s)')
@@ -108,13 +106,13 @@
self.DisplayTypeLabel.setText(
translate('PresentationPlugin.MediaItem', 'Present using:'))
# Add the Presentation widget to the page layout
- self.PageLayout.addWidget(self.PresentationWidget)
+ self.pageLayout.addWidget(self.PresentationWidget)
def initialise(self):
self.servicePath = os.path.join(
AppLocation.get_section_data_path(self.settingsSection),
u'thumbnails')
- self.ListView.setIconSize(QtCore.QSize(88, 50))
+ self.listView.setIconSize(QtCore.QSize(88, 50))
if not os.path.exists(self.servicePath):
os.mkdir(self.servicePath)
list = SettingsManager.load_list(
@@ -165,22 +163,22 @@
u':/general/general_delete.png')
else:
os.makedirs(thumbPath)
- icon = self.IconFromFile(preview, thumb)
+ icon = self.iconFromFile(preview, thumb)
if not icon:
icon = build_icon(u':/general/general_delete.png')
item_name = QtGui.QListWidgetItem(filename)
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
item_name.setIcon(icon)
- self.ListView.addItem(item_name)
+ self.listView.addItem(item_name)
def onDeleteClick(self):
"""
Remove a presentation item from the list
"""
- if check_item_selected(self.ListView,
+ if check_item_selected(self.listView,
translate('PresentationPlugin.MediaItem',
'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.sort(reverse=True)
for item in items:
@@ -193,12 +191,12 @@
doc.presentation_deleted()
doc.close_presentation()
for row in row_list:
- self.ListView.takeItem(row)
+ self.listView.takeItem(row)
SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList())
def generateSlideData(self, service_item, item=None):
- items = self.ListView.selectedIndexes()
+ items = self.listView.selectedIndexes()
if len(items) > 1:
return False
service_item.title = unicode(self.DisplayTypeComboBox.currentText())
@@ -206,7 +204,7 @@
shortname = service_item.shortname
if shortname:
for item in items:
- bitem = self.ListView.item(item.row())
+ bitem = self.listView.item(item.row())
filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
if shortname == self.Automatic:
service_item.shortname = self.findControllerByType(filename)
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2010-06-21 16:43:59 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2010-07-08 17:23:42 +0000
@@ -25,7 +25,7 @@
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
class Ui_EditVerseDialog(object):
@@ -61,10 +61,7 @@
self.VerseNumberBox.setObjectName(u'VerseNumberBox')
self.VerseTypeLayout.addWidget(self.VerseNumberBox)
self.InsertButton = QtGui.QPushButton(EditVerseDialog)
- self.AddIcon = QtGui.QIcon()
- self.AddIcon.addPixmap(QtGui.QPixmap(u':/general/general_add.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.InsertButton.setIcon(self.AddIcon)
+ self.InsertButton.setIcon(build_icon(u':/general/general_add.png'))
self.InsertButton.setObjectName(u'InsertButton')
self.VerseTypeLayout.addWidget(self.InsertButton)
self.VerseTypeSpacer = QtGui.QSpacerItem(40, 20,
=== modified file 'openlp/plugins/songs/forms/songimportwizard.py'
--- openlp/plugins/songs/forms/songimportwizard.py 2010-06-21 16:43:59 +0000
+++ openlp/plugins/songs/forms/songimportwizard.py 2010-07-08 17:23:42 +0000
@@ -25,7 +25,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
+from openlp.core.lib import build_icon, translate
class Ui_SongImportWizard(object):
def setupUi(self, SongImportWizard):
@@ -109,21 +109,16 @@
self.OpenLyricsButtonLayout.setSpacing(8)
self.OpenLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout')
self.OpenLyricsAddButton = QtGui.QPushButton(self.OpenLyricsPage)
- self.OpenIcon = QtGui.QIcon()
- self.OpenIcon.addPixmap(QtGui.QPixmap(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.setIcon(
+ build_icon(u':/general/general_open.png'))
self.OpenLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsAddButton)
self.OpenLyricsButtonSpacer = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.OpenLyricsButtonLayout.addItem(self.OpenLyricsButtonSpacer)
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.OpenLyricsButtonLayout.addWidget(self.OpenLyricsRemoveButton)
self.OpenLyricsLayout.addLayout(self.OpenLyricsButtonLayout)
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2010-07-04 16:15:29 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2010-07-08 17:23:42 +0000
@@ -49,6 +49,7 @@
def __init__(self, parent, icon, title):
self.PluginNameShort = u'Song'
+ self.pluginNameVisible = translate('SongsPlugin.MediaItem', 'Song')
self.IconPath = u'songs/song'
self.ListViewWithDnD_class = SongListView
MediaManagerItem.__init__(self, parent, icon, title)
@@ -61,9 +62,6 @@
# which Song is required.
self.remoteSong = -1
- def initPluginNameVisible(self):
- self.PluginNameVisible = translate('SongsPlugin.MediaItem', 'Song')
-
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -75,7 +73,7 @@
translate('SongsPlugin.MediaItem',
'Maintain the lists of authors, topics and books'),
':/songs/song_maintenance.png', self.onSongMaintenanceClick)
- self.PageLayout.setSpacing(4)
+ self.pageLayout.setSpacing(4)
self.SearchLayout = QtGui.QFormLayout()
self.SearchLayout.setMargin(0)
self.SearchLayout.setSpacing(4)
@@ -100,7 +98,7 @@
self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox')
self.SearchLayout.setWidget(
1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox)
- self.PageLayout.addLayout(self.SearchLayout)
+ self.pageLayout.addLayout(self.SearchLayout)
self.SearchButtonLayout = QtGui.QHBoxLayout()
self.SearchButtonLayout.setMargin(0)
self.SearchButtonLayout.setSpacing(4)
@@ -114,7 +112,7 @@
self.ClearTextButton = QtGui.QPushButton(self)
self.ClearTextButton.setObjectName(u'ClearTextButton')
self.SearchButtonLayout.addWidget(self.ClearTextButton)
- self.PageLayout.addLayout(self.SearchButtonLayout)
+ self.pageLayout.addLayout(self.SearchButtonLayout)
# Signals and slots
QtCore.QObject.connect(self.SearchTextEdit,
QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick)
@@ -193,7 +191,7 @@
def displayResultsSong(self, searchresults):
log.debug(u'display results Song')
- self.ListView.clear()
+ self.listView.clear()
for song in searchresults:
author_list = u''
for author in song.authors:
@@ -204,11 +202,11 @@
song_detail = u'%s (%s)' % (song_title, author_list)
song_name = QtGui.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
- self.ListView.addItem(song_name)
+ self.listView.addItem(song_name)
def displayResultsAuthor(self, searchresults):
log.debug(u'display results Author')
- self.ListView.clear()
+ self.listView.clear()
for author in searchresults:
for song in author.songs:
song_detail = unicode(
@@ -216,7 +214,7 @@
(author.display_name, song.title)
song_name = QtGui.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
- self.ListView.addItem(song_name)
+ self.listView.addItem(song_name)
def onClearTextButtonClick(self):
"""
@@ -247,18 +245,6 @@
self.edit_song_form.newSong()
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):
self.song_maintenance_form.exec_()
@@ -284,9 +270,9 @@
"""
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.')):
- item = self.ListView.currentItem()
+ item = self.listView.currentItem()
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
self.edit_song_form.loadSong(item_id, False)
self.edit_song_form.exec_()
@@ -295,9 +281,9 @@
"""
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.')):
- items = self.ListView.selectedIndexes()
+ items = self.listView.selectedIndexes()
if len(items) == 1:
del_message = translate('SongsPlugin.MediaItem',
'Delete song?')
@@ -325,7 +311,7 @@
ccli = u''
if item is None:
if self.remoteTriggered is None:
- item = self.ListView.currentItem()
+ item = self.listView.currentItem()
if item is None:
return False
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2010-06-21 18:28:36 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2010-07-08 17:23:42 +0000
@@ -24,7 +24,8 @@
###############################################################################
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
+
+from openlp.core.lib import build_icon, translate
class Ui_SongUsageDetailDialog(object):
def setupUi(self, SongUsageDetailDialog):
@@ -60,10 +61,8 @@
self.FileLineEdit.setObjectName(u'FileLineEdit')
self.horizontalLayout.addWidget(self.FileLineEdit)
self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
- icon = QtGui.QIcon()
- icon.addPixmap(QtGui.QPixmap(u':/general/general_load.png'),
- QtGui.QIcon.Normal, QtGui.QIcon.Off)
- self.SaveFilePushButton.setIcon(icon)
+ self.SaveFilePushButton.setIcon(
+ build_icon(u':/general/general_load.png'))
self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
self.horizontalLayout.addWidget(self.SaveFilePushButton)
self.verticalLayout_4.addLayout(self.horizontalLayout)
=== modified file 'resources/forms/about.ui'
--- resources/forms/about.ui 2009-11-29 20:30:41 +0000
+++ resources/forms/about.ui 2010-07-08 17:23:42 +0000
@@ -23,7 +23,7 @@
<property name="modal">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" name="AboutDialogLayout">
+ <layout class="QVBoxLayout" name="aboutDialogLayout">
<property name="spacing">
<number>8</number>
</property>
@@ -47,11 +47,11 @@
</widget>
</item>
<item>
- <widget class="QTabWidget" name="AboutNotebook">
+ <widget class="QTabWidget" name="aboutNotebook">
<property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="AboutTab">
+ <widget class="QWidget" name="aboutTab">
<attribute name="title">
<string>About</string>
</attribute>
@@ -63,7 +63,7 @@
<number>8</number>
</property>
<item>
- <widget class="QPlainTextEdit" name="AboutTextEdit">
+ <widget class="QPlainTextEdit" name="aboutTextEdit">
<property name="readOnly">
<bool>true</bool>
</property>
@@ -80,11 +80,11 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="CreditsTab">
+ <widget class="QWidget" name="creditsTab">
<attribute name="title">
<string>Credits</string>
</attribute>
- <layout class="QVBoxLayout" name="CreditsTabLayout">
+ <layout class="QVBoxLayout" name="creditsTabLayout">
<property name="spacing">
<number>0</number>
</property>
@@ -92,7 +92,7 @@
<number>8</number>
</property>
<item>
- <widget class="QPlainTextEdit" name="CreditsTextEdit">
+ <widget class="QPlainTextEdit" name="creditsTextEdit">
<property name="readOnly">
<bool>true</bool>
</property>
@@ -116,11 +116,11 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="LicenseTab">
+ <widget class="QWidget" name="licenseTab">
<attribute name="title">
<string>License</string>
</attribute>
- <layout class="QVBoxLayout" name="LicenseTabLayout">
+ <layout class="QVBoxLayout" name="licenseTabLayout">
<property name="spacing">
<number>8</number>
</property>
@@ -128,7 +128,7 @@
<number>8</number>
</property>
<item>
- <widget class="QPlainTextEdit" name="LicenseTextEdit">
+ <widget class="QPlainTextEdit" name="licenseTextEdit">
<property name="readOnly">
<bool>true</bool>
</property>
@@ -272,8 +272,8 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="ButtonWidget" native="true">
- <layout class="QHBoxLayout" name="ButtonWidgetLayout">
+ <widget class="QWidget" name="buttonWidget" native="true">
+ <layout class="QHBoxLayout" name="buttonWidgetLayout">
<property name="spacing">
<number>8</number>
</property>
@@ -294,7 +294,7 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="ContributeButton">
+ <widget class="QPushButton" name="contributeButton">
<property name="text">
<string>Contribute</string>
</property>
@@ -305,7 +305,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="CloseButton">
+ <widget class="QPushButton" name="closeButton">
<property name="text">
<string>Close</string>
</property>
@@ -326,14 +326,14 @@
</action>
</widget>
<tabstops>
- <tabstop>ContributeButton</tabstop>
+ <tabstop>contributeButton</tabstop>
</tabstops>
<resources>
<include location="../images/openlp-2.qrc"/>
</resources>
<connections>
<connection>
- <sender>CloseButton</sender>
+ <sender>closeButton</sender>
<signal>clicked()</signal>
<receiver>AboutDialog</receiver>
<slot>close()</slot>
Follow ups
