openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #00199
[Merge] lp:~raoul-snyman/openlp/songmaintenance into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/songmaintenance into lp:openlp.
Requested reviews:
openlp.org Core (openlp-core)
--
https://code.launchpad.net/~raoul-snyman/openlp/songmaintenance/+merge/9841
Your team openlp.org Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2009-08-06 14:51:38 +0000
+++ openlp/core/ui/maindisplay.py 2009-08-06 21:30:14 +0000
@@ -145,7 +145,7 @@
painter.setFont(font)
painter.setPen(QtGui.QColor(self.alertTab.font_color))
x, y = (0, top)
- metrics=QtGui.QFontMetrics(font)
+ metrics = QtGui.QFontMetrics(font)
painter.drawText(
x, y + metrics.height() - metrics.descent() - 1, self.alerttext)
painter.end()
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2009-08-06 13:17:36 +0000
+++ openlp/core/ui/mainwindow.py 2009-08-06 21:30:14 +0000
@@ -129,20 +129,11 @@
Hook to close the main window and display windows on exit
"""
if self.oosNotSaved == True:
- ret = QtGui.QMessageBox.question(self,
+ ret = QtGui.QMessageBox.question(None,
translate(u'mainWindow', u'Save Changes to Service?'),
translate(u'mainWindow', u'Your service has been changed, do you want to save those changes?'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Save),
QtGui.QMessageBox.Save)
-#
-#
-# box = QtGui.QMessageBox()
-# box.setWindowTitle(translate(u'mainWindow', u'Question?'))
-# box.setText(translate(u'mainWindow', u'Save changes to Order of Service?'))
-# box.setIcon(QtGui.QMessageBox.Question)
-# box.setStandardButtons(QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel);
-# box.setDefaultButton(QtGui.QMessageBox.Save);
-# ret = box.exec_()
if ret == QtGui.QMessageBox.Save:
self.ServiceManagerContents.onSaveService()
self.mainDisplay.close()
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2009-08-04 20:23:33 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2009-08-06 21:30:14 +0000
@@ -1,346 +1,390 @@
# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file '/home/raoul/Projects/openlp/songmaintenance/resources/forms/editsongdialog.ui'
-#
-# Created: Mon Jul 27 22:18:20 2009
-# by: PyQt4 UI code generator 4.4.4
-#
-# WARNING! All changes made in this file will be lost!
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+"""
+OpenLP - Open Source Lyrics Projection
+Copyright (c) 2008 Raoul Snyman
+Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+"""
from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
+
class Ui_EditSongDialog(object):
def setupUi(self, EditSongDialog):
- EditSongDialog.setObjectName("EditSongDialog")
+ EditSongDialog.setObjectName(u'EditSongDialog')
EditSongDialog.resize(645, 417)
icon = QtGui.QIcon()
- icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'),
+ QtGui.QIcon.Normal, QtGui.QIcon.Off)
EditSongDialog.setWindowIcon(icon)
EditSongDialog.setModal(True)
self.verticalLayout = QtGui.QVBoxLayout(EditSongDialog)
self.verticalLayout.setMargin(8)
- self.verticalLayout.setObjectName("verticalLayout")
+ self.verticalLayout.setObjectName(u'verticalLayout')
self.SongTabWidget = QtGui.QTabWidget(EditSongDialog)
- self.SongTabWidget.setObjectName("SongTabWidget")
+ self.SongTabWidget.setObjectName(u'SongTabWidget')
self.LyricsTab = QtGui.QWidget()
- self.LyricsTab.setObjectName("LyricsTab")
+ self.LyricsTab.setObjectName(u'LyricsTab')
self.LyricsTabLayout = QtGui.QGridLayout(self.LyricsTab)
self.LyricsTabLayout.setMargin(8)
self.LyricsTabLayout.setSpacing(8)
- self.LyricsTabLayout.setObjectName("LyricsTabLayout")
+ self.LyricsTabLayout.setObjectName(u'LyricsTabLayout')
self.TitleLabel = QtGui.QLabel(self.LyricsTab)
- self.TitleLabel.setObjectName("TitleLabel")
+ self.TitleLabel.setObjectName(u'TitleLabel')
self.LyricsTabLayout.addWidget(self.TitleLabel, 0, 0, 1, 1)
self.TitleEditItem = QtGui.QLineEdit(self.LyricsTab)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.TitleEditItem.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.TitleEditItem.sizePolicy().hasHeightForWidth())
self.TitleEditItem.setSizePolicy(sizePolicy)
- self.TitleEditItem.setObjectName("TitleEditItem")
+ self.TitleEditItem.setObjectName(u'TitleEditItem')
self.LyricsTabLayout.addWidget(self.TitleEditItem, 0, 1, 1, 2)
self.AlternativeTitleLabel = QtGui.QLabel(self.LyricsTab)
- self.AlternativeTitleLabel.setObjectName("AlternativeTitleLabel")
+ self.AlternativeTitleLabel.setObjectName(u'AlternativeTitleLabel')
self.LyricsTabLayout.addWidget(self.AlternativeTitleLabel, 1, 0, 1, 1)
self.AlternativeEdit = QtGui.QLineEdit(self.LyricsTab)
- self.AlternativeEdit.setObjectName("AlternativeEdit")
+ self.AlternativeEdit.setObjectName(u'AlternativeEdit')
self.LyricsTabLayout.addWidget(self.AlternativeEdit, 1, 1, 1, 2)
self.LyricsLabel = QtGui.QLabel(self.LyricsTab)
- self.LyricsLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
- self.LyricsLabel.setObjectName("LyricsLabel")
+ self.LyricsLabel.setAlignment(
+ QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
+ self.LyricsLabel.setObjectName(u'LyricsLabel')
self.LyricsTabLayout.addWidget(self.LyricsLabel, 2, 0, 1, 1)
self.VerseListWidget = QtGui.QListWidget(self.LyricsTab)
self.VerseListWidget.setSpacing(2)
self.VerseListWidget.setAlternatingRowColors(True)
- self.VerseListWidget.setObjectName("VerseListWidget")
+ self.VerseListWidget.setObjectName(u'VerseListWidget')
self.LyricsTabLayout.addWidget(self.VerseListWidget, 2, 1, 1, 1)
self.VerseOrderLabel = QtGui.QLabel(self.LyricsTab)
- self.VerseOrderLabel.setObjectName("VerseOrderLabel")
+ self.VerseOrderLabel.setObjectName(u'VerseOrderLabel')
self.LyricsTabLayout.addWidget(self.VerseOrderLabel, 4, 0, 1, 1)
self.VerseOrderEdit = QtGui.QLineEdit(self.LyricsTab)
- self.VerseOrderEdit.setObjectName("VerseOrderEdit")
+ self.VerseOrderEdit.setObjectName(u'VerseOrderEdit')
self.LyricsTabLayout.addWidget(self.VerseOrderEdit, 4, 1, 1, 2)
self.VerseButtonWidget = QtGui.QWidget(self.LyricsTab)
- self.VerseButtonWidget.setObjectName("VerseButtonWidget")
+ self.VerseButtonWidget.setObjectName(u'VerseButtonWidget')
self.VerseButtonsLayout = QtGui.QVBoxLayout(self.VerseButtonWidget)
self.VerseButtonsLayout.setSpacing(8)
self.VerseButtonsLayout.setMargin(0)
- self.VerseButtonsLayout.setObjectName("VerseButtonsLayout")
+ self.VerseButtonsLayout.setObjectName(u'VerseButtonsLayout')
self.VerseAddButton = QtGui.QPushButton(self.VerseButtonWidget)
- self.VerseAddButton.setObjectName("VerseAddButton")
+ self.VerseAddButton.setObjectName(u'VerseAddButton')
self.VerseButtonsLayout.addWidget(self.VerseAddButton)
self.VerseEditButton = QtGui.QPushButton(self.VerseButtonWidget)
- self.VerseEditButton.setObjectName("VerseEditButton")
+ self.VerseEditButton.setObjectName(u'VerseEditButton')
self.VerseButtonsLayout.addWidget(self.VerseEditButton)
self.VerseEditAllButton = QtGui.QPushButton(self.VerseButtonWidget)
- self.VerseEditAllButton.setObjectName("VerseEditAllButton")
+ self.VerseEditAllButton.setObjectName(u'VerseEditAllButton')
self.VerseButtonsLayout.addWidget(self.VerseEditAllButton)
self.VerseDeleteButton = QtGui.QPushButton(self.VerseButtonWidget)
- self.VerseDeleteButton.setObjectName("VerseDeleteButton")
+ self.VerseDeleteButton.setObjectName(u'VerseDeleteButton')
self.VerseButtonsLayout.addWidget(self.VerseDeleteButton)
- spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ spacerItem = QtGui.QSpacerItem(20, 40,
+ QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.VerseButtonsLayout.addItem(spacerItem)
self.LyricsTabLayout.addWidget(self.VerseButtonWidget, 2, 2, 1, 1)
- self.SongTabWidget.addTab(self.LyricsTab, "")
+ self.SongTabWidget.addTab(self.LyricsTab, u'')
self.AuthorsTab = QtGui.QWidget()
- self.AuthorsTab.setObjectName("AuthorsTab")
+ self.AuthorsTab.setObjectName(u'AuthorsTab')
self.AuthorsTabLayout = QtGui.QHBoxLayout(self.AuthorsTab)
self.AuthorsTabLayout.setSpacing(8)
self.AuthorsTabLayout.setMargin(8)
- self.AuthorsTabLayout.setObjectName("AuthorsTabLayout")
+ self.AuthorsTabLayout.setObjectName(u'AuthorsTabLayout')
self.AuthorsMaintenanceWidget = QtGui.QWidget(self.AuthorsTab)
- self.AuthorsMaintenanceWidget.setObjectName("AuthorsMaintenanceWidget")
+ self.AuthorsMaintenanceWidget.setObjectName(u'AuthorsMaintenanceWidget')
self.AuthorsMaintenanceLayout = QtGui.QVBoxLayout(self.AuthorsMaintenanceWidget)
self.AuthorsMaintenanceLayout.setSpacing(8)
self.AuthorsMaintenanceLayout.setMargin(0)
- self.AuthorsMaintenanceLayout.setObjectName("AuthorsMaintenanceLayout")
+ self.AuthorsMaintenanceLayout.setObjectName(u'AuthorsMaintenanceLayout')
self.AuthorsGroupBox = QtGui.QGroupBox(self.AuthorsMaintenanceWidget)
- self.AuthorsGroupBox.setObjectName("AuthorsGroupBox")
+ self.AuthorsGroupBox.setObjectName(u'AuthorsGroupBox')
self.AuthorsLayout = QtGui.QVBoxLayout(self.AuthorsGroupBox)
self.AuthorsLayout.setSpacing(8)
self.AuthorsLayout.setMargin(8)
- self.AuthorsLayout.setObjectName("AuthorsLayout")
+ self.AuthorsLayout.setObjectName(u'AuthorsLayout')
self.AuthorAddWidget = QtGui.QWidget(self.AuthorsGroupBox)
- self.AuthorAddWidget.setObjectName("AuthorAddWidget")
+ self.AuthorAddWidget.setObjectName(u'AuthorAddWidget')
self.AuthorAddLayout = QtGui.QHBoxLayout(self.AuthorAddWidget)
self.AuthorAddLayout.setSpacing(8)
self.AuthorAddLayout.setMargin(0)
- self.AuthorAddLayout.setObjectName("AuthorAddLayout")
+ self.AuthorAddLayout.setObjectName(u'AuthorAddLayout')
self.AuthorsSelectionComboItem = QtGui.QComboBox(self.AuthorAddWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.AuthorsSelectionComboItem.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.AuthorsSelectionComboItem.sizePolicy().hasHeightForWidth())
self.AuthorsSelectionComboItem.setSizePolicy(sizePolicy)
self.AuthorsSelectionComboItem.setEditable(False)
- self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
- self.AuthorsSelectionComboItem.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength)
+ self.AuthorsSelectionComboItem.setInsertPolicy(
+ QtGui.QComboBox.InsertAlphabetically)
+ self.AuthorsSelectionComboItem.setSizeAdjustPolicy(
+ QtGui.QComboBox.AdjustToMinimumContentsLength)
self.AuthorsSelectionComboItem.setMinimumContentsLength(8)
- self.AuthorsSelectionComboItem.setObjectName("AuthorsSelectionComboItem")
+ self.AuthorsSelectionComboItem.setObjectName(u'AuthorsSelectionComboItem')
self.AuthorAddLayout.addWidget(self.AuthorsSelectionComboItem)
self.AuthorAddButton = QtGui.QPushButton(self.AuthorAddWidget)
self.AuthorAddButton.setMaximumSize(QtCore.QSize(110, 16777215))
- self.AuthorAddButton.setObjectName("AuthorAddButton")
+ self.AuthorAddButton.setObjectName(u'AuthorAddButton')
self.AuthorAddLayout.addWidget(self.AuthorAddButton)
self.AuthorsLayout.addWidget(self.AuthorAddWidget)
self.AuthorsListView = QtGui.QListWidget(self.AuthorsGroupBox)
self.AuthorsListView.setAlternatingRowColors(True)
- self.AuthorsListView.setObjectName("AuthorsListView")
+ self.AuthorsListView.setObjectName(u'AuthorsListView')
self.AuthorsLayout.addWidget(self.AuthorsListView)
self.AuthorRemoveWidget = QtGui.QWidget(self.AuthorsGroupBox)
- self.AuthorRemoveWidget.setObjectName("AuthorRemoveWidget")
+ self.AuthorRemoveWidget.setObjectName(u'AuthorRemoveWidget')
self.AuthorRemoveLayout = QtGui.QHBoxLayout(self.AuthorRemoveWidget)
self.AuthorRemoveLayout.setSpacing(8)
self.AuthorRemoveLayout.setMargin(0)
- self.AuthorRemoveLayout.setObjectName("AuthorRemoveLayout")
- spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.AuthorRemoveLayout.setObjectName(u'AuthorRemoveLayout')
+ spacerItem1 = QtGui.QSpacerItem(40, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.AuthorRemoveLayout.addItem(spacerItem1)
self.AuthorRemoveButton = QtGui.QPushButton(self.AuthorRemoveWidget)
- self.AuthorRemoveButton.setObjectName("AuthorRemoveButton")
+ self.AuthorRemoveButton.setObjectName(u'AuthorRemoveButton')
self.AuthorRemoveLayout.addWidget(self.AuthorRemoveButton)
self.AuthorsLayout.addWidget(self.AuthorRemoveWidget)
self.AuthorsMaintenanceLayout.addWidget(self.AuthorsGroupBox)
self.MaintenanceWidget = QtGui.QWidget(self.AuthorsMaintenanceWidget)
- self.MaintenanceWidget.setObjectName("MaintenanceWidget")
+ self.MaintenanceWidget.setObjectName(u'MaintenanceWidget')
self.MaintenanceLayout = QtGui.QHBoxLayout(self.MaintenanceWidget)
self.MaintenanceLayout.setSpacing(0)
self.MaintenanceLayout.setMargin(0)
- self.MaintenanceLayout.setObjectName("MaintenanceLayout")
+ self.MaintenanceLayout.setObjectName(u'MaintenanceLayout')
self.MaintenanceButton = QtGui.QPushButton(self.MaintenanceWidget)
- self.MaintenanceButton.setObjectName("MaintenanceButton")
+ self.MaintenanceButton.setObjectName(u'MaintenanceButton')
self.MaintenanceLayout.addWidget(self.MaintenanceButton)
- spacerItem2 = QtGui.QSpacerItem(66, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ spacerItem2 = QtGui.QSpacerItem(66, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.MaintenanceLayout.addItem(spacerItem2)
self.AuthorsMaintenanceLayout.addWidget(self.MaintenanceWidget)
self.AuthorsTabLayout.addWidget(self.AuthorsMaintenanceWidget)
self.TopicBookWidget = QtGui.QWidget(self.AuthorsTab)
- self.TopicBookWidget.setObjectName("TopicBookWidget")
+ self.TopicBookWidget.setObjectName(u'TopicBookWidget')
self.TopicBookLayout = QtGui.QVBoxLayout(self.TopicBookWidget)
self.TopicBookLayout.setSpacing(8)
self.TopicBookLayout.setMargin(0)
- self.TopicBookLayout.setObjectName("TopicBookLayout")
+ self.TopicBookLayout.setObjectName(u'TopicBookLayout')
self.TopicGroupBox = QtGui.QGroupBox(self.TopicBookWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.TopicGroupBox.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.TopicGroupBox.sizePolicy().hasHeightForWidth())
self.TopicGroupBox.setSizePolicy(sizePolicy)
- self.TopicGroupBox.setObjectName("TopicGroupBox")
+ self.TopicGroupBox.setObjectName(u'TopicGroupBox')
self.TopicLayout = QtGui.QVBoxLayout(self.TopicGroupBox)
self.TopicLayout.setSpacing(8)
self.TopicLayout.setMargin(8)
- self.TopicLayout.setObjectName("TopicLayout")
+ self.TopicLayout.setObjectName(u'TopicLayout')
self.TopicAddWidget = QtGui.QWidget(self.TopicGroupBox)
- self.TopicAddWidget.setObjectName("TopicAddWidget")
+ self.TopicAddWidget.setObjectName(u'TopicAddWidget')
self.TopicAddLayout = QtGui.QHBoxLayout(self.TopicAddWidget)
self.TopicAddLayout.setSpacing(8)
self.TopicAddLayout.setMargin(0)
- self.TopicAddLayout.setObjectName("TopicAddLayout")
+ self.TopicAddLayout.setObjectName(u'TopicAddLayout')
self.SongTopicCombo = QtGui.QComboBox(self.TopicAddWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.SongTopicCombo.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.SongTopicCombo.sizePolicy().hasHeightForWidth())
self.SongTopicCombo.setSizePolicy(sizePolicy)
- self.SongTopicCombo.setObjectName("SongTopicCombo")
+ self.SongTopicCombo.setObjectName(u'SongTopicCombo')
self.TopicAddLayout.addWidget(self.SongTopicCombo)
self.TopicAddButton = QtGui.QPushButton(self.TopicAddWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.TopicAddButton.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.TopicAddButton.sizePolicy().hasHeightForWidth())
self.TopicAddButton.setSizePolicy(sizePolicy)
- self.TopicAddButton.setObjectName("TopicAddButton")
+ self.TopicAddButton.setObjectName(u'TopicAddButton')
self.TopicAddLayout.addWidget(self.TopicAddButton)
self.TopicLayout.addWidget(self.TopicAddWidget)
self.TopicsListView = QtGui.QListWidget(self.TopicGroupBox)
self.TopicsListView.setAlternatingRowColors(True)
- self.TopicsListView.setObjectName("TopicsListView")
+ self.TopicsListView.setObjectName(u'TopicsListView')
self.TopicLayout.addWidget(self.TopicsListView)
self.TopicRemoveWidget = QtGui.QWidget(self.TopicGroupBox)
- self.TopicRemoveWidget.setObjectName("TopicRemoveWidget")
+ self.TopicRemoveWidget.setObjectName(u'TopicRemoveWidget')
self.TopicRemoveLayout = QtGui.QHBoxLayout(self.TopicRemoveWidget)
self.TopicRemoveLayout.setSpacing(8)
self.TopicRemoveLayout.setMargin(0)
- self.TopicRemoveLayout.setObjectName("TopicRemoveLayout")
- spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.TopicRemoveLayout.setObjectName(u'TopicRemoveLayout')
+ spacerItem3 = QtGui.QSpacerItem(40, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.TopicRemoveLayout.addItem(spacerItem3)
self.TopicRemoveButton = QtGui.QPushButton(self.TopicRemoveWidget)
- self.TopicRemoveButton.setObjectName("TopicRemoveButton")
+ self.TopicRemoveButton.setObjectName(u'TopicRemoveButton')
self.TopicRemoveLayout.addWidget(self.TopicRemoveButton)
self.TopicLayout.addWidget(self.TopicRemoveWidget)
self.TopicBookLayout.addWidget(self.TopicGroupBox)
self.SongBookGroup = QtGui.QGroupBox(self.TopicBookWidget)
- self.SongBookGroup.setObjectName("SongBookGroup")
+ self.SongBookGroup.setObjectName(u'SongBookGroup')
self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup)
self.SongbookLayout.setMargin(8)
self.SongbookLayout.setSpacing(8)
- self.SongbookLayout.setObjectName("SongbookLayout")
+ self.SongbookLayout.setObjectName(u'SongbookLayout')
self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.SongbookCombo.sizePolicy().hasHeightForWidth())
self.SongbookCombo.setSizePolicy(sizePolicy)
- self.SongbookCombo.setObjectName("SongbookCombo")
+ self.SongbookCombo.setObjectName(u'SongbookCombo')
self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1)
self.TopicBookLayout.addWidget(self.SongBookGroup)
self.AuthorsTabLayout.addWidget(self.TopicBookWidget)
- self.SongTabWidget.addTab(self.AuthorsTab, "")
+ self.SongTabWidget.addTab(self.AuthorsTab, u'')
self.ThemeTab = QtGui.QWidget()
- self.ThemeTab.setObjectName("ThemeTab")
+ self.ThemeTab.setObjectName(u'ThemeTab')
self.ThemeTabLayout = QtGui.QVBoxLayout(self.ThemeTab)
self.ThemeTabLayout.setSpacing(8)
self.ThemeTabLayout.setMargin(8)
- self.ThemeTabLayout.setObjectName("ThemeTabLayout")
+ self.ThemeTabLayout.setObjectName(u'ThemeTabLayout')
self.ThemeCopyCommentsWidget = QtGui.QWidget(self.ThemeTab)
- self.ThemeCopyCommentsWidget.setObjectName("ThemeCopyCommentsWidget")
+ self.ThemeCopyCommentsWidget.setObjectName(u'ThemeCopyCommentsWidget')
self.ThemeCopyCommentsLayout = QtGui.QHBoxLayout(self.ThemeCopyCommentsWidget)
self.ThemeCopyCommentsLayout.setSpacing(8)
self.ThemeCopyCommentsLayout.setMargin(0)
- self.ThemeCopyCommentsLayout.setObjectName("ThemeCopyCommentsLayout")
+ self.ThemeCopyCommentsLayout.setObjectName(u'ThemeCopyCommentsLayout')
self.TextWidget = QtGui.QWidget(self.ThemeCopyCommentsWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.TextWidget.sizePolicy().hasHeightForWidth())
self.TextWidget.setSizePolicy(sizePolicy)
- self.TextWidget.setObjectName("TextWidget")
+ self.TextWidget.setObjectName(u'TextWidget')
self.DetailsLayout = QtGui.QVBoxLayout(self.TextWidget)
self.DetailsLayout.setSpacing(8)
self.DetailsLayout.setMargin(0)
- self.DetailsLayout.setObjectName("DetailsLayout")
+ self.DetailsLayout.setObjectName(u'DetailsLayout')
self.ThemeGroupBox = QtGui.QGroupBox(self.TextWidget)
- self.ThemeGroupBox.setObjectName("ThemeGroupBox")
+ self.ThemeGroupBox.setObjectName(u'ThemeGroupBox')
self.ThemeLayout = QtGui.QHBoxLayout(self.ThemeGroupBox)
self.ThemeLayout.setSpacing(8)
self.ThemeLayout.setMargin(8)
- self.ThemeLayout.setObjectName("ThemeLayout")
+ self.ThemeLayout.setObjectName(u'ThemeLayout')
self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
- self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem")
+ self.ThemeSelectionComboItem.setObjectName(u'ThemeSelectionComboItem')
self.ThemeLayout.addWidget(self.ThemeSelectionComboItem)
self.ThemeAddButton = QtGui.QPushButton(self.ThemeGroupBox)
self.ThemeAddButton.setMaximumSize(QtCore.QSize(110, 16777215))
- self.ThemeAddButton.setObjectName("ThemeAddButton")
+ self.ThemeAddButton.setObjectName(u'ThemeAddButton')
self.ThemeLayout.addWidget(self.ThemeAddButton)
self.DetailsLayout.addWidget(self.ThemeGroupBox)
self.CopyrightGroupBox = QtGui.QGroupBox(self.TextWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
+ sizePolicy = QtGui.QSizePolicy(
+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.CopyrightGroupBox.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.CopyrightGroupBox.sizePolicy().hasHeightForWidth())
self.CopyrightGroupBox.setSizePolicy(sizePolicy)
- self.CopyrightGroupBox.setObjectName("CopyrightGroupBox")
+ self.CopyrightGroupBox.setObjectName(u'CopyrightGroupBox')
self.CopyrightLayout = QtGui.QVBoxLayout(self.CopyrightGroupBox)
self.CopyrightLayout.setSpacing(8)
self.CopyrightLayout.setMargin(8)
- self.CopyrightLayout.setObjectName("CopyrightLayout")
+ self.CopyrightLayout.setObjectName(u'CopyrightLayout')
self.CopyrightWidget = QtGui.QWidget(self.CopyrightGroupBox)
- self.CopyrightWidget.setObjectName("CopyrightWidget")
+ self.CopyrightWidget.setObjectName(u'CopyrightWidget')
self.CopyLayout = QtGui.QHBoxLayout(self.CopyrightWidget)
self.CopyLayout.setSpacing(8)
self.CopyLayout.setMargin(0)
- self.CopyLayout.setObjectName("CopyLayout")
+ self.CopyLayout.setObjectName(u'CopyLayout')
self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightWidget)
- self.CopyrightEditItem.setObjectName("CopyrightEditItem")
+ self.CopyrightEditItem.setObjectName(u'CopyrightEditItem')
self.CopyLayout.addWidget(self.CopyrightEditItem)
self.CopyrightInsertButton = QtGui.QPushButton(self.CopyrightWidget)
self.CopyrightInsertButton.setMaximumSize(QtCore.QSize(29, 16777215))
- self.CopyrightInsertButton.setObjectName("CopyrightInsertButton")
+ self.CopyrightInsertButton.setObjectName(u'CopyrightInsertButton')
self.CopyLayout.addWidget(self.CopyrightInsertButton)
self.CopyrightLayout.addWidget(self.CopyrightWidget)
self.CcliWidget = QtGui.QWidget(self.CopyrightGroupBox)
- self.CcliWidget.setObjectName("CcliWidget")
+ self.CcliWidget.setObjectName(u'CcliWidget')
self.CCLILayout = QtGui.QHBoxLayout(self.CcliWidget)
self.CCLILayout.setSpacing(8)
self.CCLILayout.setMargin(0)
- self.CCLILayout.setObjectName("CCLILayout")
+ self.CCLILayout.setObjectName(u'CCLILayout')
self.CCLILabel = QtGui.QLabel(self.CcliWidget)
- self.CCLILabel.setObjectName("CCLILabel")
+ self.CCLILabel.setObjectName(u'CCLILabel')
self.CCLILayout.addWidget(self.CCLILabel)
self.CCLNumberEdit = QtGui.QLineEdit(self.CcliWidget)
- self.CCLNumberEdit.setObjectName("CCLNumberEdit")
+ self.CCLNumberEdit.setObjectName(u'CCLNumberEdit')
self.CCLILayout.addWidget(self.CCLNumberEdit)
self.CopyrightLayout.addWidget(self.CcliWidget)
self.DetailsLayout.addWidget(self.CopyrightGroupBox)
- spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ spacerItem4 = QtGui.QSpacerItem(20, 40,
+ QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.DetailsLayout.addItem(spacerItem4)
self.ThemeCopyCommentsLayout.addWidget(self.TextWidget)
self.CommentsGroupBox = QtGui.QGroupBox(self.ThemeCopyCommentsWidget)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
+ QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.CommentsGroupBox.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.CommentsGroupBox.sizePolicy().hasHeightForWidth())
self.CommentsGroupBox.setSizePolicy(sizePolicy)
- self.CommentsGroupBox.setObjectName("CommentsGroupBox")
+ self.CommentsGroupBox.setObjectName(u'CommentsGroupBox')
self.CommentsLayout = QtGui.QVBoxLayout(self.CommentsGroupBox)
self.CommentsLayout.setSpacing(0)
self.CommentsLayout.setMargin(8)
- self.CommentsLayout.setObjectName("CommentsLayout")
+ self.CommentsLayout.setObjectName(u'CommentsLayout')
self.CommentsEdit = QtGui.QTextEdit(self.CommentsGroupBox)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
+ QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.CommentsEdit.sizePolicy().hasHeightForWidth())
+ sizePolicy.setHeightForWidth(
+ self.CommentsEdit.sizePolicy().hasHeightForWidth())
self.CommentsEdit.setSizePolicy(sizePolicy)
self.CommentsEdit.setMaximumSize(QtCore.QSize(16777215, 16777215))
- self.CommentsEdit.setObjectName("CommentsEdit")
+ self.CommentsEdit.setObjectName(u'CommentsEdit')
self.CommentsLayout.addWidget(self.CommentsEdit)
self.ThemeCopyCommentsLayout.addWidget(self.CommentsGroupBox)
self.ThemeTabLayout.addWidget(self.ThemeCopyCommentsWidget)
- spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ spacerItem5 = QtGui.QSpacerItem(20, 40,
+ QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.ThemeTabLayout.addItem(spacerItem5)
- self.SongTabWidget.addTab(self.ThemeTab, "")
+ self.SongTabWidget.addTab(self.ThemeTab, u'')
self.verticalLayout.addWidget(self.SongTabWidget)
self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog)
- self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
- self.ButtonBox.setObjectName("ButtonBox")
+ self.ButtonBox.setStandardButtons(
+ QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Save)
+ self.ButtonBox.setObjectName(u'ButtonBox')
self.verticalLayout.addWidget(self.ButtonBox)
self.retranslateUi(EditSongDialog)
self.SongTabWidget.setCurrentIndex(0)
- QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongDialog.close)
- QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditSongDialog.close)
+ QtCore.QObject.connect(self.ButtonBox,
+ QtCore.SIGNAL(u'rejected()'), EditSongDialog.close)
+ QtCore.QObject.connect(self.ButtonBox,
+ QtCore.SIGNAL(u'accepted()'), EditSongDialog.close)
QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)
@@ -369,30 +413,33 @@
EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox)
def retranslateUi(self, EditSongDialog):
- EditSongDialog.setWindowTitle(QtGui.QApplication.translate("EditSongDialog", "Song Editor", None, QtGui.QApplication.UnicodeUTF8))
- self.TitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Title:", None, QtGui.QApplication.UnicodeUTF8))
- self.AlternativeTitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Alternative Title:", None, QtGui.QApplication.UnicodeUTF8))
- self.LyricsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Lyrics:", None, QtGui.QApplication.UnicodeUTF8))
- self.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8))
- self.VerseAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add", None, QtGui.QApplication.UnicodeUTF8))
- self.VerseEditButton.setText(QtGui.QApplication.translate("EditSongDialog", "Edit", None, QtGui.QApplication.UnicodeUTF8))
- self.VerseEditAllButton.setText(QtGui.QApplication.translate("EditSongDialog", "Edit All", None, QtGui.QApplication.UnicodeUTF8))
- self.VerseDeleteButton.setText(QtGui.QApplication.translate("EditSongDialog", "Delete", None, QtGui.QApplication.UnicodeUTF8))
- self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.LyricsTab), QtGui.QApplication.translate("EditSongDialog", "Title && Lyrics", None, QtGui.QApplication.UnicodeUTF8))
- self.AuthorsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Authors", None, QtGui.QApplication.UnicodeUTF8))
- self.AuthorAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Add to Song", None, QtGui.QApplication.UnicodeUTF8))
- self.AuthorRemoveButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Remove", None, QtGui.QApplication.UnicodeUTF8))
- self.MaintenanceButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Manage Authors, Topics, Books", None, QtGui.QApplication.UnicodeUTF8))
- self.TopicGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Topic", None, QtGui.QApplication.UnicodeUTF8))
- self.TopicAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "A&dd to Song", None, QtGui.QApplication.UnicodeUTF8))
- self.TopicRemoveButton.setText(QtGui.QApplication.translate("EditSongDialog", "R&emove", None, QtGui.QApplication.UnicodeUTF8))
- self.SongBookGroup.setTitle(QtGui.QApplication.translate("EditSongDialog", "Song Book", None, QtGui.QApplication.UnicodeUTF8))
- self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.AuthorsTab), QtGui.QApplication.translate("EditSongDialog", "Authors, Topics && Book", None, QtGui.QApplication.UnicodeUTF8))
- self.ThemeGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8))
- self.ThemeAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8))
- self.CopyrightGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Copyright Information", None, QtGui.QApplication.UnicodeUTF8))
- self.CopyrightInsertButton.setText(QtGui.QApplication.translate("EditSongDialog", "©", None, QtGui.QApplication.UnicodeUTF8))
- self.CCLILabel.setText(QtGui.QApplication.translate("EditSongDialog", "CCLI Number:", None, QtGui.QApplication.UnicodeUTF8))
- self.CommentsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Comments", None, QtGui.QApplication.UnicodeUTF8))
- self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.ThemeTab), QtGui.QApplication.translate("EditSongDialog", "Theme, Copyright Info && Comments", None, QtGui.QApplication.UnicodeUTF8))
+ EditSongDialog.setWindowTitle(translate(u'EditSongDialog', u'Song Editor'))
+ self.TitleLabel.setText(translate(u'EditSongDialog', u'Title:'))
+ self.AlternativeTitleLabel.setText(translate(u'EditSongDialog', u'Alternative Title:'))
+ self.LyricsLabel.setText(translate(u'EditSongDialog', u'Lyrics:'))
+ self.VerseOrderLabel.setText(translate(u'EditSongDialog', u'Verse Order:'))
+ self.VerseAddButton.setText(translate(u'EditSongDialog', u'Add'))
+ self.VerseEditButton.setText(translate(u'EditSongDialog', u'Edit'))
+ self.VerseEditAllButton.setText(translate(u'EditSongDialog', u'Edit All'))
+ self.VerseDeleteButton.setText(translate(u'EditSongDialog', u'Delete'))
+ self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.LyricsTab),
+ translate(u'EditSongDialog', u'Title && Lyrics'))
+ self.AuthorsGroupBox.setTitle(translate(u'EditSongDialog', u'Authors'))
+ self.AuthorAddButton.setText(translate(u'EditSongDialog', u'&Add to Song'))
+ self.AuthorRemoveButton.setText(translate(u'EditSongDialog', u'&Remove'))
+ self.MaintenanceButton.setText(translate(u'EditSongDialog', u'&Manage Authors, Topics, Books'))
+ self.TopicGroupBox.setTitle(translate(u'EditSongDialog', u'Topic'))
+ self.TopicAddButton.setText(translate(u'EditSongDialog', u'A&dd to Song'))
+ self.TopicRemoveButton.setText(translate(u'EditSongDialog', u'R&emove'))
+ self.SongBookGroup.setTitle(translate(u'EditSongDialog', u'Song Book'))
+ self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.AuthorsTab),
+ translate(u'EditSongDialog', u'Authors, Topics && Book'))
+ self.ThemeGroupBox.setTitle(translate(u'EditSongDialog', u'Theme'))
+ self.ThemeAddButton.setText(translate(u'EditSongDialog', u'Add a Theme'))
+ self.CopyrightGroupBox.setTitle(translate(u'EditSongDialog', u'Copyright Information'))
+ self.CopyrightInsertButton.setText(translate(u'EditSongDialog', '©'))
+ self.CCLILabel.setText(translate(u'EditSongDialog', u'CCLI Number:'))
+ self.CommentsGroupBox.setTitle(translate(u'EditSongDialog', u'Comments'))
+ self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.ThemeTab),
+ translate(u'EditSongDialog', u'Theme, Copyright Info && Comments'))
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2009-08-06 14:51:38 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2009-08-06 21:30:14 +0000
@@ -17,6 +17,7 @@
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
"""
+
import logging
from PyQt4 import Qt, QtCore, QtGui
@@ -219,7 +220,7 @@
self.AuthorRemoveButton.setEnabled(True)
def onAuthorRemoveButtonClicked(self):
- self.AuthorRemoveItem.setEnabled(False)
+ self.AuthorRemoveButton.setEnabled(False)
item = self.AuthorsListView.currentItem()
author_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
author = self.songmanager.get_author(author_id)
@@ -358,40 +359,41 @@
def processLyrics(self):
log.debug(u'processLyrics')
- sxml=SongXMLBuilder()
+ sxml = SongXMLBuilder()
sxml.new_document()
sxml.add_lyrics_to_song()
count = 1
text = u' '
verse_order = u''
for i in range (0, self.VerseListWidget.count()):
- sxml.add_verse_to_lyrics(u'Verse', unicode(count), unicode(self.VerseListWidget.item(i).text()))
+ sxml.add_verse_to_lyrics(u'Verse', unicode(count),
+ unicode(self.VerseListWidget.item(i).text()))
text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
- verse_order = verse_order +unicode(count) + u' '
+ verse_order = verse_order + unicode(count) + u' '
count += 1
if self.song.verse_order is None:
self.song.verse_order = verse_order
- text = text.replace(u'\'', u'')
- text = text.replace(u',', u'')
- text = text.replace(u';', u'')
- text = text.replace(u':', u'')
- text = text.replace(u'(', u'')
- text = text.replace(u')', u'')
- text = text.replace(u'{', u'')
- text = text.replace(u'}', u'')
- text = text.replace(u'?', u'')
+ text = text.replace(u'\'', u'')
+ text = text.replace(u',', u'')
+ text = text.replace(u';', u'')
+ text = text.replace(u':', u'')
+ text = text.replace(u'(', u'')
+ text = text.replace(u')', u'')
+ text = text.replace(u'{', u'')
+ text = text.replace(u'}', u'')
+ text = text.replace(u'?', u'')
self.song.search_lyrics = unicode(text)
self.song.lyrics = unicode(sxml.extract_xml())
def processTitle(self):
log.debug(u'processTitle')
- self.song.search_title = self.song.search_title.replace(u'\'', u'')
- self.song.search_title = self.song.search_title.replace(u',', u'')
- self.song.search_title = self.song.search_title.replace(u';', u'')
- self.song.search_title = self.song.search_title.replace(u':', u'')
- self.song.search_title = self.song.search_title.replace(u'(', u'')
- self.song.search_title = self.song.search_title.replace(u')', u'')
- self.song.search_title = self.song.search_title.replace(u'{', u'')
- self.song.search_title = self.song.search_title.replace(u'}', u'')
- self.song.search_title = self.song.search_title.replace(u'?', u'')
- self.song.search_title = unicode(self.song.search_title)
+ self.song.search_title = self.song.search_title.replace(u'\'', u'')
+ self.song.search_title = self.song.search_title.replace(u',', u'')
+ self.song.search_title = self.song.search_title.replace(u';', u'')
+ self.song.search_title = self.song.search_title.replace(u':', u'')
+ self.song.search_title = self.song.search_title.replace(u'(', u'')
+ self.song.search_title = self.song.search_title.replace(u')', u'')
+ self.song.search_title = self.song.search_title.replace(u'{', u'')
+ self.song.search_title = self.song.search_title.replace(u'}', u'')
+ self.song.search_title = self.song.search_title.replace(u'?', u'')
+ self.song.search_title = unicode(self.song.search_title)
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2009-08-06 14:51:38 +0000
+++ openlp/plugins/songs/songsplugin.py 2009-08-06 21:30:14 +0000
@@ -17,6 +17,7 @@
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
"""
+
import logging
from PyQt4 import QtCore, QtGui
Follow ups
