OpenLP

Merge lp:~raoul-snyman/openlp/songmaintenance into lp:openlp

  1. songmaintenance
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: not available
Proposed branch: lp:~raoul-snyman/openlp/songmaintenance
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~raoul-snyman/openlp/songmaintenance
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+9841@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Looks good

review: Approve
lp:~raoul-snyman/openlp/songmaintenance updated
502. By Raoul Snyman

Merge from songmaintenance branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/maindisplay.py'
2--- openlp/core/ui/maindisplay.py 2009-08-06 14:51:38 +0000
3+++ openlp/core/ui/maindisplay.py 2009-08-06 21:30:14 +0000
4@@ -145,7 +145,7 @@
5 painter.setFont(font)
6 painter.setPen(QtGui.QColor(self.alertTab.font_color))
7 x, y = (0, top)
8- metrics=QtGui.QFontMetrics(font)
9+ metrics = QtGui.QFontMetrics(font)
10 painter.drawText(
11 x, y + metrics.height() - metrics.descent() - 1, self.alerttext)
12 painter.end()
13
14=== modified file 'openlp/core/ui/mainwindow.py'
15--- openlp/core/ui/mainwindow.py 2009-08-06 13:17:36 +0000
16+++ openlp/core/ui/mainwindow.py 2009-08-06 21:30:14 +0000
17@@ -129,20 +129,11 @@
18 Hook to close the main window and display windows on exit
19 """
20 if self.oosNotSaved == True:
21- ret = QtGui.QMessageBox.question(self,
22+ ret = QtGui.QMessageBox.question(None,
23 translate(u'mainWindow', u'Save Changes to Service?'),
24 translate(u'mainWindow', u'Your service has been changed, do you want to save those changes?'),
25 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Save),
26 QtGui.QMessageBox.Save)
27-#
28-#
29-# box = QtGui.QMessageBox()
30-# box.setWindowTitle(translate(u'mainWindow', u'Question?'))
31-# box.setText(translate(u'mainWindow', u'Save changes to Order of Service?'))
32-# box.setIcon(QtGui.QMessageBox.Question)
33-# box.setStandardButtons(QtGui.QMessageBox.Save | QtGui.QMessageBox.Discard | QtGui.QMessageBox.Cancel);
34-# box.setDefaultButton(QtGui.QMessageBox.Save);
35-# ret = box.exec_()
36 if ret == QtGui.QMessageBox.Save:
37 self.ServiceManagerContents.onSaveService()
38 self.mainDisplay.close()
39
40=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
41--- openlp/plugins/songs/forms/editsongdialog.py 2009-08-04 20:23:33 +0000
42+++ openlp/plugins/songs/forms/editsongdialog.py 2009-08-06 21:30:14 +0000
43@@ -1,346 +1,390 @@
44 # -*- coding: utf-8 -*-
45-
46-# Form implementation generated from reading ui file '/home/raoul/Projects/openlp/songmaintenance/resources/forms/editsongdialog.ui'
47-#
48-# Created: Mon Jul 27 22:18:20 2009
49-# by: PyQt4 UI code generator 4.4.4
50-#
51-# WARNING! All changes made in this file will be lost!
52+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
53+"""
54+OpenLP - Open Source Lyrics Projection
55+Copyright (c) 2008 Raoul Snyman
56+Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
57+
58+This program is free software; you can redistribute it and/or modify it under
59+the terms of the GNU General Public License as published by the Free Software
60+Foundation; version 2 of the License.
61+
62+This program is distributed in the hope that it will be useful, but WITHOUT ANY
63+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
64+PARTICULAR PURPOSE. See the GNU General Public License for more details.
65+
66+You should have received a copy of the GNU General Public License along with
67+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
68+Place, Suite 330, Boston, MA 02111-1307 USA
69+"""
70
71 from PyQt4 import QtCore, QtGui
72
73+from openlp.core.lib import translate
74+
75 class Ui_EditSongDialog(object):
76 def setupUi(self, EditSongDialog):
77- EditSongDialog.setObjectName("EditSongDialog")
78+ EditSongDialog.setObjectName(u'EditSongDialog')
79 EditSongDialog.resize(645, 417)
80 icon = QtGui.QIcon()
81- icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
82+ icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'),
83+ QtGui.QIcon.Normal, QtGui.QIcon.Off)
84 EditSongDialog.setWindowIcon(icon)
85 EditSongDialog.setModal(True)
86 self.verticalLayout = QtGui.QVBoxLayout(EditSongDialog)
87 self.verticalLayout.setMargin(8)
88- self.verticalLayout.setObjectName("verticalLayout")
89+ self.verticalLayout.setObjectName(u'verticalLayout')
90 self.SongTabWidget = QtGui.QTabWidget(EditSongDialog)
91- self.SongTabWidget.setObjectName("SongTabWidget")
92+ self.SongTabWidget.setObjectName(u'SongTabWidget')
93 self.LyricsTab = QtGui.QWidget()
94- self.LyricsTab.setObjectName("LyricsTab")
95+ self.LyricsTab.setObjectName(u'LyricsTab')
96 self.LyricsTabLayout = QtGui.QGridLayout(self.LyricsTab)
97 self.LyricsTabLayout.setMargin(8)
98 self.LyricsTabLayout.setSpacing(8)
99- self.LyricsTabLayout.setObjectName("LyricsTabLayout")
100+ self.LyricsTabLayout.setObjectName(u'LyricsTabLayout')
101 self.TitleLabel = QtGui.QLabel(self.LyricsTab)
102- self.TitleLabel.setObjectName("TitleLabel")
103+ self.TitleLabel.setObjectName(u'TitleLabel')
104 self.LyricsTabLayout.addWidget(self.TitleLabel, 0, 0, 1, 1)
105 self.TitleEditItem = QtGui.QLineEdit(self.LyricsTab)
106- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
107+ sizePolicy = QtGui.QSizePolicy(
108+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
109 sizePolicy.setHorizontalStretch(0)
110 sizePolicy.setVerticalStretch(0)
111- sizePolicy.setHeightForWidth(self.TitleEditItem.sizePolicy().hasHeightForWidth())
112+ sizePolicy.setHeightForWidth(
113+ self.TitleEditItem.sizePolicy().hasHeightForWidth())
114 self.TitleEditItem.setSizePolicy(sizePolicy)
115- self.TitleEditItem.setObjectName("TitleEditItem")
116+ self.TitleEditItem.setObjectName(u'TitleEditItem')
117 self.LyricsTabLayout.addWidget(self.TitleEditItem, 0, 1, 1, 2)
118 self.AlternativeTitleLabel = QtGui.QLabel(self.LyricsTab)
119- self.AlternativeTitleLabel.setObjectName("AlternativeTitleLabel")
120+ self.AlternativeTitleLabel.setObjectName(u'AlternativeTitleLabel')
121 self.LyricsTabLayout.addWidget(self.AlternativeTitleLabel, 1, 0, 1, 1)
122 self.AlternativeEdit = QtGui.QLineEdit(self.LyricsTab)
123- self.AlternativeEdit.setObjectName("AlternativeEdit")
124+ self.AlternativeEdit.setObjectName(u'AlternativeEdit')
125 self.LyricsTabLayout.addWidget(self.AlternativeEdit, 1, 1, 1, 2)
126 self.LyricsLabel = QtGui.QLabel(self.LyricsTab)
127- self.LyricsLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
128- self.LyricsLabel.setObjectName("LyricsLabel")
129+ self.LyricsLabel.setAlignment(
130+ QtCore.Qt.AlignLeading | QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
131+ self.LyricsLabel.setObjectName(u'LyricsLabel')
132 self.LyricsTabLayout.addWidget(self.LyricsLabel, 2, 0, 1, 1)
133 self.VerseListWidget = QtGui.QListWidget(self.LyricsTab)
134 self.VerseListWidget.setSpacing(2)
135 self.VerseListWidget.setAlternatingRowColors(True)
136- self.VerseListWidget.setObjectName("VerseListWidget")
137+ self.VerseListWidget.setObjectName(u'VerseListWidget')
138 self.LyricsTabLayout.addWidget(self.VerseListWidget, 2, 1, 1, 1)
139 self.VerseOrderLabel = QtGui.QLabel(self.LyricsTab)
140- self.VerseOrderLabel.setObjectName("VerseOrderLabel")
141+ self.VerseOrderLabel.setObjectName(u'VerseOrderLabel')
142 self.LyricsTabLayout.addWidget(self.VerseOrderLabel, 4, 0, 1, 1)
143 self.VerseOrderEdit = QtGui.QLineEdit(self.LyricsTab)
144- self.VerseOrderEdit.setObjectName("VerseOrderEdit")
145+ self.VerseOrderEdit.setObjectName(u'VerseOrderEdit')
146 self.LyricsTabLayout.addWidget(self.VerseOrderEdit, 4, 1, 1, 2)
147 self.VerseButtonWidget = QtGui.QWidget(self.LyricsTab)
148- self.VerseButtonWidget.setObjectName("VerseButtonWidget")
149+ self.VerseButtonWidget.setObjectName(u'VerseButtonWidget')
150 self.VerseButtonsLayout = QtGui.QVBoxLayout(self.VerseButtonWidget)
151 self.VerseButtonsLayout.setSpacing(8)
152 self.VerseButtonsLayout.setMargin(0)
153- self.VerseButtonsLayout.setObjectName("VerseButtonsLayout")
154+ self.VerseButtonsLayout.setObjectName(u'VerseButtonsLayout')
155 self.VerseAddButton = QtGui.QPushButton(self.VerseButtonWidget)
156- self.VerseAddButton.setObjectName("VerseAddButton")
157+ self.VerseAddButton.setObjectName(u'VerseAddButton')
158 self.VerseButtonsLayout.addWidget(self.VerseAddButton)
159 self.VerseEditButton = QtGui.QPushButton(self.VerseButtonWidget)
160- self.VerseEditButton.setObjectName("VerseEditButton")
161+ self.VerseEditButton.setObjectName(u'VerseEditButton')
162 self.VerseButtonsLayout.addWidget(self.VerseEditButton)
163 self.VerseEditAllButton = QtGui.QPushButton(self.VerseButtonWidget)
164- self.VerseEditAllButton.setObjectName("VerseEditAllButton")
165+ self.VerseEditAllButton.setObjectName(u'VerseEditAllButton')
166 self.VerseButtonsLayout.addWidget(self.VerseEditAllButton)
167 self.VerseDeleteButton = QtGui.QPushButton(self.VerseButtonWidget)
168- self.VerseDeleteButton.setObjectName("VerseDeleteButton")
169+ self.VerseDeleteButton.setObjectName(u'VerseDeleteButton')
170 self.VerseButtonsLayout.addWidget(self.VerseDeleteButton)
171- spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
172+ spacerItem = QtGui.QSpacerItem(20, 40,
173+ QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
174 self.VerseButtonsLayout.addItem(spacerItem)
175 self.LyricsTabLayout.addWidget(self.VerseButtonWidget, 2, 2, 1, 1)
176- self.SongTabWidget.addTab(self.LyricsTab, "")
177+ self.SongTabWidget.addTab(self.LyricsTab, u'')
178 self.AuthorsTab = QtGui.QWidget()
179- self.AuthorsTab.setObjectName("AuthorsTab")
180+ self.AuthorsTab.setObjectName(u'AuthorsTab')
181 self.AuthorsTabLayout = QtGui.QHBoxLayout(self.AuthorsTab)
182 self.AuthorsTabLayout.setSpacing(8)
183 self.AuthorsTabLayout.setMargin(8)
184- self.AuthorsTabLayout.setObjectName("AuthorsTabLayout")
185+ self.AuthorsTabLayout.setObjectName(u'AuthorsTabLayout')
186 self.AuthorsMaintenanceWidget = QtGui.QWidget(self.AuthorsTab)
187- self.AuthorsMaintenanceWidget.setObjectName("AuthorsMaintenanceWidget")
188+ self.AuthorsMaintenanceWidget.setObjectName(u'AuthorsMaintenanceWidget')
189 self.AuthorsMaintenanceLayout = QtGui.QVBoxLayout(self.AuthorsMaintenanceWidget)
190 self.AuthorsMaintenanceLayout.setSpacing(8)
191 self.AuthorsMaintenanceLayout.setMargin(0)
192- self.AuthorsMaintenanceLayout.setObjectName("AuthorsMaintenanceLayout")
193+ self.AuthorsMaintenanceLayout.setObjectName(u'AuthorsMaintenanceLayout')
194 self.AuthorsGroupBox = QtGui.QGroupBox(self.AuthorsMaintenanceWidget)
195- self.AuthorsGroupBox.setObjectName("AuthorsGroupBox")
196+ self.AuthorsGroupBox.setObjectName(u'AuthorsGroupBox')
197 self.AuthorsLayout = QtGui.QVBoxLayout(self.AuthorsGroupBox)
198 self.AuthorsLayout.setSpacing(8)
199 self.AuthorsLayout.setMargin(8)
200- self.AuthorsLayout.setObjectName("AuthorsLayout")
201+ self.AuthorsLayout.setObjectName(u'AuthorsLayout')
202 self.AuthorAddWidget = QtGui.QWidget(self.AuthorsGroupBox)
203- self.AuthorAddWidget.setObjectName("AuthorAddWidget")
204+ self.AuthorAddWidget.setObjectName(u'AuthorAddWidget')
205 self.AuthorAddLayout = QtGui.QHBoxLayout(self.AuthorAddWidget)
206 self.AuthorAddLayout.setSpacing(8)
207 self.AuthorAddLayout.setMargin(0)
208- self.AuthorAddLayout.setObjectName("AuthorAddLayout")
209+ self.AuthorAddLayout.setObjectName(u'AuthorAddLayout')
210 self.AuthorsSelectionComboItem = QtGui.QComboBox(self.AuthorAddWidget)
211- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
212+ sizePolicy = QtGui.QSizePolicy(
213+ QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
214 sizePolicy.setHorizontalStretch(0)
215 sizePolicy.setVerticalStretch(0)
216- sizePolicy.setHeightForWidth(self.AuthorsSelectionComboItem.sizePolicy().hasHeightForWidth())
217+ sizePolicy.setHeightForWidth(
218+ self.AuthorsSelectionComboItem.sizePolicy().hasHeightForWidth())
219 self.AuthorsSelectionComboItem.setSizePolicy(sizePolicy)
220 self.AuthorsSelectionComboItem.setEditable(False)
221- self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
222- self.AuthorsSelectionComboItem.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength)
223+ self.AuthorsSelectionComboItem.setInsertPolicy(
224+ QtGui.QComboBox.InsertAlphabetically)
225+ self.AuthorsSelectionComboItem.setSizeAdjustPolicy(
226+ QtGui.QComboBox.AdjustToMinimumContentsLength)
227 self.AuthorsSelectionComboItem.setMinimumContentsLength(8)
228- self.AuthorsSelectionComboItem.setObjectName("AuthorsSelectionComboItem")
229+ self.AuthorsSelectionComboItem.setObjectName(u'AuthorsSelectionComboItem')
230 self.AuthorAddLayout.addWidget(self.AuthorsSelectionComboItem)
231 self.AuthorAddButton = QtGui.QPushButton(self.AuthorAddWidget)
232 self.AuthorAddButton.setMaximumSize(QtCore.QSize(110, 16777215))
233- self.AuthorAddButton.setObjectName("AuthorAddButton")
234+ self.AuthorAddButton.setObjectName(u'AuthorAddButton')
235 self.AuthorAddLayout.addWidget(self.AuthorAddButton)
236 self.AuthorsLayout.addWidget(self.AuthorAddWidget)
237 self.AuthorsListView = QtGui.QListWidget(self.AuthorsGroupBox)
238 self.AuthorsListView.setAlternatingRowColors(True)
239- self.AuthorsListView.setObjectName("AuthorsListView")
240+ self.AuthorsListView.setObjectName(u'AuthorsListView')
241 self.AuthorsLayout.addWidget(self.AuthorsListView)
242 self.AuthorRemoveWidget = QtGui.QWidget(self.AuthorsGroupBox)
243- self.AuthorRemoveWidget.setObjectName("AuthorRemoveWidget")
244+ self.AuthorRemoveWidget.setObjectName(u'AuthorRemoveWidget')
245 self.AuthorRemoveLayout = QtGui.QHBoxLayout(self.AuthorRemoveWidget)
246 self.AuthorRemoveLayout.setSpacing(8)
247 self.AuthorRemoveLayout.setMargin(0)
248- self.AuthorRemoveLayout.setObjectName("AuthorRemoveLayout")
249- spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
250+ self.AuthorRemoveLayout.setObjectName(u'AuthorRemoveLayout')
251+ spacerItem1 = QtGui.QSpacerItem(40, 20,
252+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
253 self.AuthorRemoveLayout.addItem(spacerItem1)
254 self.AuthorRemoveButton = QtGui.QPushButton(self.AuthorRemoveWidget)
255- self.AuthorRemoveButton.setObjectName("AuthorRemoveButton")
256+ self.AuthorRemoveButton.setObjectName(u'AuthorRemoveButton')
257 self.AuthorRemoveLayout.addWidget(self.AuthorRemoveButton)
258 self.AuthorsLayout.addWidget(self.AuthorRemoveWidget)
259 self.AuthorsMaintenanceLayout.addWidget(self.AuthorsGroupBox)
260 self.MaintenanceWidget = QtGui.QWidget(self.AuthorsMaintenanceWidget)
261- self.MaintenanceWidget.setObjectName("MaintenanceWidget")
262+ self.MaintenanceWidget.setObjectName(u'MaintenanceWidget')
263 self.MaintenanceLayout = QtGui.QHBoxLayout(self.MaintenanceWidget)
264 self.MaintenanceLayout.setSpacing(0)
265 self.MaintenanceLayout.setMargin(0)
266- self.MaintenanceLayout.setObjectName("MaintenanceLayout")
267+ self.MaintenanceLayout.setObjectName(u'MaintenanceLayout')
268 self.MaintenanceButton = QtGui.QPushButton(self.MaintenanceWidget)
269- self.MaintenanceButton.setObjectName("MaintenanceButton")
270+ self.MaintenanceButton.setObjectName(u'MaintenanceButton')
271 self.MaintenanceLayout.addWidget(self.MaintenanceButton)
272- spacerItem2 = QtGui.QSpacerItem(66, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
273+ spacerItem2 = QtGui.QSpacerItem(66, 20,
274+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
275 self.MaintenanceLayout.addItem(spacerItem2)
276 self.AuthorsMaintenanceLayout.addWidget(self.MaintenanceWidget)
277 self.AuthorsTabLayout.addWidget(self.AuthorsMaintenanceWidget)
278 self.TopicBookWidget = QtGui.QWidget(self.AuthorsTab)
279- self.TopicBookWidget.setObjectName("TopicBookWidget")
280+ self.TopicBookWidget.setObjectName(u'TopicBookWidget')
281 self.TopicBookLayout = QtGui.QVBoxLayout(self.TopicBookWidget)
282 self.TopicBookLayout.setSpacing(8)
283 self.TopicBookLayout.setMargin(0)
284- self.TopicBookLayout.setObjectName("TopicBookLayout")
285+ self.TopicBookLayout.setObjectName(u'TopicBookLayout')
286 self.TopicGroupBox = QtGui.QGroupBox(self.TopicBookWidget)
287- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
288+ sizePolicy = QtGui.QSizePolicy(
289+ QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
290 sizePolicy.setHorizontalStretch(0)
291 sizePolicy.setVerticalStretch(0)
292- sizePolicy.setHeightForWidth(self.TopicGroupBox.sizePolicy().hasHeightForWidth())
293+ sizePolicy.setHeightForWidth(
294+ self.TopicGroupBox.sizePolicy().hasHeightForWidth())
295 self.TopicGroupBox.setSizePolicy(sizePolicy)
296- self.TopicGroupBox.setObjectName("TopicGroupBox")
297+ self.TopicGroupBox.setObjectName(u'TopicGroupBox')
298 self.TopicLayout = QtGui.QVBoxLayout(self.TopicGroupBox)
299 self.TopicLayout.setSpacing(8)
300 self.TopicLayout.setMargin(8)
301- self.TopicLayout.setObjectName("TopicLayout")
302+ self.TopicLayout.setObjectName(u'TopicLayout')
303 self.TopicAddWidget = QtGui.QWidget(self.TopicGroupBox)
304- self.TopicAddWidget.setObjectName("TopicAddWidget")
305+ self.TopicAddWidget.setObjectName(u'TopicAddWidget')
306 self.TopicAddLayout = QtGui.QHBoxLayout(self.TopicAddWidget)
307 self.TopicAddLayout.setSpacing(8)
308 self.TopicAddLayout.setMargin(0)
309- self.TopicAddLayout.setObjectName("TopicAddLayout")
310+ self.TopicAddLayout.setObjectName(u'TopicAddLayout')
311 self.SongTopicCombo = QtGui.QComboBox(self.TopicAddWidget)
312- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
313+ sizePolicy = QtGui.QSizePolicy(
314+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
315 sizePolicy.setHorizontalStretch(0)
316 sizePolicy.setVerticalStretch(0)
317- sizePolicy.setHeightForWidth(self.SongTopicCombo.sizePolicy().hasHeightForWidth())
318+ sizePolicy.setHeightForWidth(
319+ self.SongTopicCombo.sizePolicy().hasHeightForWidth())
320 self.SongTopicCombo.setSizePolicy(sizePolicy)
321- self.SongTopicCombo.setObjectName("SongTopicCombo")
322+ self.SongTopicCombo.setObjectName(u'SongTopicCombo')
323 self.TopicAddLayout.addWidget(self.SongTopicCombo)
324 self.TopicAddButton = QtGui.QPushButton(self.TopicAddWidget)
325- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
326+ sizePolicy = QtGui.QSizePolicy(
327+ QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
328 sizePolicy.setHorizontalStretch(0)
329 sizePolicy.setVerticalStretch(0)
330- sizePolicy.setHeightForWidth(self.TopicAddButton.sizePolicy().hasHeightForWidth())
331+ sizePolicy.setHeightForWidth(
332+ self.TopicAddButton.sizePolicy().hasHeightForWidth())
333 self.TopicAddButton.setSizePolicy(sizePolicy)
334- self.TopicAddButton.setObjectName("TopicAddButton")
335+ self.TopicAddButton.setObjectName(u'TopicAddButton')
336 self.TopicAddLayout.addWidget(self.TopicAddButton)
337 self.TopicLayout.addWidget(self.TopicAddWidget)
338 self.TopicsListView = QtGui.QListWidget(self.TopicGroupBox)
339 self.TopicsListView.setAlternatingRowColors(True)
340- self.TopicsListView.setObjectName("TopicsListView")
341+ self.TopicsListView.setObjectName(u'TopicsListView')
342 self.TopicLayout.addWidget(self.TopicsListView)
343 self.TopicRemoveWidget = QtGui.QWidget(self.TopicGroupBox)
344- self.TopicRemoveWidget.setObjectName("TopicRemoveWidget")
345+ self.TopicRemoveWidget.setObjectName(u'TopicRemoveWidget')
346 self.TopicRemoveLayout = QtGui.QHBoxLayout(self.TopicRemoveWidget)
347 self.TopicRemoveLayout.setSpacing(8)
348 self.TopicRemoveLayout.setMargin(0)
349- self.TopicRemoveLayout.setObjectName("TopicRemoveLayout")
350- spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
351+ self.TopicRemoveLayout.setObjectName(u'TopicRemoveLayout')
352+ spacerItem3 = QtGui.QSpacerItem(40, 20,
353+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
354 self.TopicRemoveLayout.addItem(spacerItem3)
355 self.TopicRemoveButton = QtGui.QPushButton(self.TopicRemoveWidget)
356- self.TopicRemoveButton.setObjectName("TopicRemoveButton")
357+ self.TopicRemoveButton.setObjectName(u'TopicRemoveButton')
358 self.TopicRemoveLayout.addWidget(self.TopicRemoveButton)
359 self.TopicLayout.addWidget(self.TopicRemoveWidget)
360 self.TopicBookLayout.addWidget(self.TopicGroupBox)
361 self.SongBookGroup = QtGui.QGroupBox(self.TopicBookWidget)
362- self.SongBookGroup.setObjectName("SongBookGroup")
363+ self.SongBookGroup.setObjectName(u'SongBookGroup')
364 self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup)
365 self.SongbookLayout.setMargin(8)
366 self.SongbookLayout.setSpacing(8)
367- self.SongbookLayout.setObjectName("SongbookLayout")
368+ self.SongbookLayout.setObjectName(u'SongbookLayout')
369 self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup)
370- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
371+ sizePolicy = QtGui.QSizePolicy(
372+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed)
373 sizePolicy.setHorizontalStretch(0)
374 sizePolicy.setVerticalStretch(0)
375 sizePolicy.setHeightForWidth(self.SongbookCombo.sizePolicy().hasHeightForWidth())
376 self.SongbookCombo.setSizePolicy(sizePolicy)
377- self.SongbookCombo.setObjectName("SongbookCombo")
378+ self.SongbookCombo.setObjectName(u'SongbookCombo')
379 self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1)
380 self.TopicBookLayout.addWidget(self.SongBookGroup)
381 self.AuthorsTabLayout.addWidget(self.TopicBookWidget)
382- self.SongTabWidget.addTab(self.AuthorsTab, "")
383+ self.SongTabWidget.addTab(self.AuthorsTab, u'')
384 self.ThemeTab = QtGui.QWidget()
385- self.ThemeTab.setObjectName("ThemeTab")
386+ self.ThemeTab.setObjectName(u'ThemeTab')
387 self.ThemeTabLayout = QtGui.QVBoxLayout(self.ThemeTab)
388 self.ThemeTabLayout.setSpacing(8)
389 self.ThemeTabLayout.setMargin(8)
390- self.ThemeTabLayout.setObjectName("ThemeTabLayout")
391+ self.ThemeTabLayout.setObjectName(u'ThemeTabLayout')
392 self.ThemeCopyCommentsWidget = QtGui.QWidget(self.ThemeTab)
393- self.ThemeCopyCommentsWidget.setObjectName("ThemeCopyCommentsWidget")
394+ self.ThemeCopyCommentsWidget.setObjectName(u'ThemeCopyCommentsWidget')
395 self.ThemeCopyCommentsLayout = QtGui.QHBoxLayout(self.ThemeCopyCommentsWidget)
396 self.ThemeCopyCommentsLayout.setSpacing(8)
397 self.ThemeCopyCommentsLayout.setMargin(0)
398- self.ThemeCopyCommentsLayout.setObjectName("ThemeCopyCommentsLayout")
399+ self.ThemeCopyCommentsLayout.setObjectName(u'ThemeCopyCommentsLayout')
400 self.TextWidget = QtGui.QWidget(self.ThemeCopyCommentsWidget)
401- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
402+ sizePolicy = QtGui.QSizePolicy(
403+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
404 sizePolicy.setHorizontalStretch(0)
405 sizePolicy.setVerticalStretch(0)
406 sizePolicy.setHeightForWidth(self.TextWidget.sizePolicy().hasHeightForWidth())
407 self.TextWidget.setSizePolicy(sizePolicy)
408- self.TextWidget.setObjectName("TextWidget")
409+ self.TextWidget.setObjectName(u'TextWidget')
410 self.DetailsLayout = QtGui.QVBoxLayout(self.TextWidget)
411 self.DetailsLayout.setSpacing(8)
412 self.DetailsLayout.setMargin(0)
413- self.DetailsLayout.setObjectName("DetailsLayout")
414+ self.DetailsLayout.setObjectName(u'DetailsLayout')
415 self.ThemeGroupBox = QtGui.QGroupBox(self.TextWidget)
416- self.ThemeGroupBox.setObjectName("ThemeGroupBox")
417+ self.ThemeGroupBox.setObjectName(u'ThemeGroupBox')
418 self.ThemeLayout = QtGui.QHBoxLayout(self.ThemeGroupBox)
419 self.ThemeLayout.setSpacing(8)
420 self.ThemeLayout.setMargin(8)
421- self.ThemeLayout.setObjectName("ThemeLayout")
422+ self.ThemeLayout.setObjectName(u'ThemeLayout')
423 self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
424- self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem")
425+ self.ThemeSelectionComboItem.setObjectName(u'ThemeSelectionComboItem')
426 self.ThemeLayout.addWidget(self.ThemeSelectionComboItem)
427 self.ThemeAddButton = QtGui.QPushButton(self.ThemeGroupBox)
428 self.ThemeAddButton.setMaximumSize(QtCore.QSize(110, 16777215))
429- self.ThemeAddButton.setObjectName("ThemeAddButton")
430+ self.ThemeAddButton.setObjectName(u'ThemeAddButton')
431 self.ThemeLayout.addWidget(self.ThemeAddButton)
432 self.DetailsLayout.addWidget(self.ThemeGroupBox)
433 self.CopyrightGroupBox = QtGui.QGroupBox(self.TextWidget)
434- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
435+ sizePolicy = QtGui.QSizePolicy(
436+ QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred)
437 sizePolicy.setHorizontalStretch(0)
438 sizePolicy.setVerticalStretch(0)
439- sizePolicy.setHeightForWidth(self.CopyrightGroupBox.sizePolicy().hasHeightForWidth())
440+ sizePolicy.setHeightForWidth(
441+ self.CopyrightGroupBox.sizePolicy().hasHeightForWidth())
442 self.CopyrightGroupBox.setSizePolicy(sizePolicy)
443- self.CopyrightGroupBox.setObjectName("CopyrightGroupBox")
444+ self.CopyrightGroupBox.setObjectName(u'CopyrightGroupBox')
445 self.CopyrightLayout = QtGui.QVBoxLayout(self.CopyrightGroupBox)
446 self.CopyrightLayout.setSpacing(8)
447 self.CopyrightLayout.setMargin(8)
448- self.CopyrightLayout.setObjectName("CopyrightLayout")
449+ self.CopyrightLayout.setObjectName(u'CopyrightLayout')
450 self.CopyrightWidget = QtGui.QWidget(self.CopyrightGroupBox)
451- self.CopyrightWidget.setObjectName("CopyrightWidget")
452+ self.CopyrightWidget.setObjectName(u'CopyrightWidget')
453 self.CopyLayout = QtGui.QHBoxLayout(self.CopyrightWidget)
454 self.CopyLayout.setSpacing(8)
455 self.CopyLayout.setMargin(0)
456- self.CopyLayout.setObjectName("CopyLayout")
457+ self.CopyLayout.setObjectName(u'CopyLayout')
458 self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightWidget)
459- self.CopyrightEditItem.setObjectName("CopyrightEditItem")
460+ self.CopyrightEditItem.setObjectName(u'CopyrightEditItem')
461 self.CopyLayout.addWidget(self.CopyrightEditItem)
462 self.CopyrightInsertButton = QtGui.QPushButton(self.CopyrightWidget)
463 self.CopyrightInsertButton.setMaximumSize(QtCore.QSize(29, 16777215))
464- self.CopyrightInsertButton.setObjectName("CopyrightInsertButton")
465+ self.CopyrightInsertButton.setObjectName(u'CopyrightInsertButton')
466 self.CopyLayout.addWidget(self.CopyrightInsertButton)
467 self.CopyrightLayout.addWidget(self.CopyrightWidget)
468 self.CcliWidget = QtGui.QWidget(self.CopyrightGroupBox)
469- self.CcliWidget.setObjectName("CcliWidget")
470+ self.CcliWidget.setObjectName(u'CcliWidget')
471 self.CCLILayout = QtGui.QHBoxLayout(self.CcliWidget)
472 self.CCLILayout.setSpacing(8)
473 self.CCLILayout.setMargin(0)
474- self.CCLILayout.setObjectName("CCLILayout")
475+ self.CCLILayout.setObjectName(u'CCLILayout')
476 self.CCLILabel = QtGui.QLabel(self.CcliWidget)
477- self.CCLILabel.setObjectName("CCLILabel")
478+ self.CCLILabel.setObjectName(u'CCLILabel')
479 self.CCLILayout.addWidget(self.CCLILabel)
480 self.CCLNumberEdit = QtGui.QLineEdit(self.CcliWidget)
481- self.CCLNumberEdit.setObjectName("CCLNumberEdit")
482+ self.CCLNumberEdit.setObjectName(u'CCLNumberEdit')
483 self.CCLILayout.addWidget(self.CCLNumberEdit)
484 self.CopyrightLayout.addWidget(self.CcliWidget)
485 self.DetailsLayout.addWidget(self.CopyrightGroupBox)
486- spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
487+ spacerItem4 = QtGui.QSpacerItem(20, 40,
488+ QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
489 self.DetailsLayout.addItem(spacerItem4)
490 self.ThemeCopyCommentsLayout.addWidget(self.TextWidget)
491 self.CommentsGroupBox = QtGui.QGroupBox(self.ThemeCopyCommentsWidget)
492- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
493+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
494+ QtGui.QSizePolicy.Preferred)
495 sizePolicy.setHorizontalStretch(0)
496 sizePolicy.setVerticalStretch(0)
497- sizePolicy.setHeightForWidth(self.CommentsGroupBox.sizePolicy().hasHeightForWidth())
498+ sizePolicy.setHeightForWidth(
499+ self.CommentsGroupBox.sizePolicy().hasHeightForWidth())
500 self.CommentsGroupBox.setSizePolicy(sizePolicy)
501- self.CommentsGroupBox.setObjectName("CommentsGroupBox")
502+ self.CommentsGroupBox.setObjectName(u'CommentsGroupBox')
503 self.CommentsLayout = QtGui.QVBoxLayout(self.CommentsGroupBox)
504 self.CommentsLayout.setSpacing(0)
505 self.CommentsLayout.setMargin(8)
506- self.CommentsLayout.setObjectName("CommentsLayout")
507+ self.CommentsLayout.setObjectName(u'CommentsLayout')
508 self.CommentsEdit = QtGui.QTextEdit(self.CommentsGroupBox)
509- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
510+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
511+ QtGui.QSizePolicy.Preferred)
512 sizePolicy.setHorizontalStretch(0)
513 sizePolicy.setVerticalStretch(0)
514- sizePolicy.setHeightForWidth(self.CommentsEdit.sizePolicy().hasHeightForWidth())
515+ sizePolicy.setHeightForWidth(
516+ self.CommentsEdit.sizePolicy().hasHeightForWidth())
517 self.CommentsEdit.setSizePolicy(sizePolicy)
518 self.CommentsEdit.setMaximumSize(QtCore.QSize(16777215, 16777215))
519- self.CommentsEdit.setObjectName("CommentsEdit")
520+ self.CommentsEdit.setObjectName(u'CommentsEdit')
521 self.CommentsLayout.addWidget(self.CommentsEdit)
522 self.ThemeCopyCommentsLayout.addWidget(self.CommentsGroupBox)
523 self.ThemeTabLayout.addWidget(self.ThemeCopyCommentsWidget)
524- spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
525+ spacerItem5 = QtGui.QSpacerItem(20, 40,
526+ QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
527 self.ThemeTabLayout.addItem(spacerItem5)
528- self.SongTabWidget.addTab(self.ThemeTab, "")
529+ self.SongTabWidget.addTab(self.ThemeTab, u'')
530 self.verticalLayout.addWidget(self.SongTabWidget)
531 self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog)
532- self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
533- self.ButtonBox.setObjectName("ButtonBox")
534+ self.ButtonBox.setStandardButtons(
535+ QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Save)
536+ self.ButtonBox.setObjectName(u'ButtonBox')
537 self.verticalLayout.addWidget(self.ButtonBox)
538
539 self.retranslateUi(EditSongDialog)
540 self.SongTabWidget.setCurrentIndex(0)
541- QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongDialog.close)
542- QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditSongDialog.close)
543+ QtCore.QObject.connect(self.ButtonBox,
544+ QtCore.SIGNAL(u'rejected()'), EditSongDialog.close)
545+ QtCore.QObject.connect(self.ButtonBox,
546+ QtCore.SIGNAL(u'accepted()'), EditSongDialog.close)
547 QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
548 EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
549 EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)
550@@ -369,30 +413,33 @@
551 EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox)
552
553 def retranslateUi(self, EditSongDialog):
554- EditSongDialog.setWindowTitle(QtGui.QApplication.translate("EditSongDialog", "Song Editor", None, QtGui.QApplication.UnicodeUTF8))
555- self.TitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Title:", None, QtGui.QApplication.UnicodeUTF8))
556- self.AlternativeTitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Alternative Title:", None, QtGui.QApplication.UnicodeUTF8))
557- self.LyricsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Lyrics:", None, QtGui.QApplication.UnicodeUTF8))
558- self.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8))
559- self.VerseAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add", None, QtGui.QApplication.UnicodeUTF8))
560- self.VerseEditButton.setText(QtGui.QApplication.translate("EditSongDialog", "Edit", None, QtGui.QApplication.UnicodeUTF8))
561- self.VerseEditAllButton.setText(QtGui.QApplication.translate("EditSongDialog", "Edit All", None, QtGui.QApplication.UnicodeUTF8))
562- self.VerseDeleteButton.setText(QtGui.QApplication.translate("EditSongDialog", "Delete", None, QtGui.QApplication.UnicodeUTF8))
563- self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.LyricsTab), QtGui.QApplication.translate("EditSongDialog", "Title && Lyrics", None, QtGui.QApplication.UnicodeUTF8))
564- self.AuthorsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Authors", None, QtGui.QApplication.UnicodeUTF8))
565- self.AuthorAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Add to Song", None, QtGui.QApplication.UnicodeUTF8))
566- self.AuthorRemoveButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Remove", None, QtGui.QApplication.UnicodeUTF8))
567- self.MaintenanceButton.setText(QtGui.QApplication.translate("EditSongDialog", "&Manage Authors, Topics, Books", None, QtGui.QApplication.UnicodeUTF8))
568- self.TopicGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Topic", None, QtGui.QApplication.UnicodeUTF8))
569- self.TopicAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "A&dd to Song", None, QtGui.QApplication.UnicodeUTF8))
570- self.TopicRemoveButton.setText(QtGui.QApplication.translate("EditSongDialog", "R&emove", None, QtGui.QApplication.UnicodeUTF8))
571- self.SongBookGroup.setTitle(QtGui.QApplication.translate("EditSongDialog", "Song Book", None, QtGui.QApplication.UnicodeUTF8))
572- self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.AuthorsTab), QtGui.QApplication.translate("EditSongDialog", "Authors, Topics && Book", None, QtGui.QApplication.UnicodeUTF8))
573- self.ThemeGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8))
574- self.ThemeAddButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8))
575- self.CopyrightGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Copyright Information", None, QtGui.QApplication.UnicodeUTF8))
576- self.CopyrightInsertButton.setText(QtGui.QApplication.translate("EditSongDialog", "©", None, QtGui.QApplication.UnicodeUTF8))
577- self.CCLILabel.setText(QtGui.QApplication.translate("EditSongDialog", "CCLI Number:", None, QtGui.QApplication.UnicodeUTF8))
578- self.CommentsGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Comments", None, QtGui.QApplication.UnicodeUTF8))
579- self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.ThemeTab), QtGui.QApplication.translate("EditSongDialog", "Theme, Copyright Info && Comments", None, QtGui.QApplication.UnicodeUTF8))
580+ EditSongDialog.setWindowTitle(translate(u'EditSongDialog', u'Song Editor'))
581+ self.TitleLabel.setText(translate(u'EditSongDialog', u'Title:'))
582+ self.AlternativeTitleLabel.setText(translate(u'EditSongDialog', u'Alternative Title:'))
583+ self.LyricsLabel.setText(translate(u'EditSongDialog', u'Lyrics:'))
584+ self.VerseOrderLabel.setText(translate(u'EditSongDialog', u'Verse Order:'))
585+ self.VerseAddButton.setText(translate(u'EditSongDialog', u'Add'))
586+ self.VerseEditButton.setText(translate(u'EditSongDialog', u'Edit'))
587+ self.VerseEditAllButton.setText(translate(u'EditSongDialog', u'Edit All'))
588+ self.VerseDeleteButton.setText(translate(u'EditSongDialog', u'Delete'))
589+ self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.LyricsTab),
590+ translate(u'EditSongDialog', u'Title && Lyrics'))
591+ self.AuthorsGroupBox.setTitle(translate(u'EditSongDialog', u'Authors'))
592+ self.AuthorAddButton.setText(translate(u'EditSongDialog', u'&Add to Song'))
593+ self.AuthorRemoveButton.setText(translate(u'EditSongDialog', u'&Remove'))
594+ self.MaintenanceButton.setText(translate(u'EditSongDialog', u'&Manage Authors, Topics, Books'))
595+ self.TopicGroupBox.setTitle(translate(u'EditSongDialog', u'Topic'))
596+ self.TopicAddButton.setText(translate(u'EditSongDialog', u'A&dd to Song'))
597+ self.TopicRemoveButton.setText(translate(u'EditSongDialog', u'R&emove'))
598+ self.SongBookGroup.setTitle(translate(u'EditSongDialog', u'Song Book'))
599+ self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.AuthorsTab),
600+ translate(u'EditSongDialog', u'Authors, Topics && Book'))
601+ self.ThemeGroupBox.setTitle(translate(u'EditSongDialog', u'Theme'))
602+ self.ThemeAddButton.setText(translate(u'EditSongDialog', u'Add a Theme'))
603+ self.CopyrightGroupBox.setTitle(translate(u'EditSongDialog', u'Copyright Information'))
604+ self.CopyrightInsertButton.setText(translate(u'EditSongDialog', '©'))
605+ self.CCLILabel.setText(translate(u'EditSongDialog', u'CCLI Number:'))
606+ self.CommentsGroupBox.setTitle(translate(u'EditSongDialog', u'Comments'))
607+ self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.ThemeTab),
608+ translate(u'EditSongDialog', u'Theme, Copyright Info && Comments'))
609
610
611=== modified file 'openlp/plugins/songs/forms/editsongform.py'
612--- openlp/plugins/songs/forms/editsongform.py 2009-08-06 14:51:38 +0000
613+++ openlp/plugins/songs/forms/editsongform.py 2009-08-06 21:30:14 +0000
614@@ -17,6 +17,7 @@
615 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
616 Place, Suite 330, Boston, MA 02111-1307 USA
617 """
618+
619 import logging
620
621 from PyQt4 import Qt, QtCore, QtGui
622@@ -219,7 +220,7 @@
623 self.AuthorRemoveButton.setEnabled(True)
624
625 def onAuthorRemoveButtonClicked(self):
626- self.AuthorRemoveItem.setEnabled(False)
627+ self.AuthorRemoveButton.setEnabled(False)
628 item = self.AuthorsListView.currentItem()
629 author_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
630 author = self.songmanager.get_author(author_id)
631@@ -358,40 +359,41 @@
632
633 def processLyrics(self):
634 log.debug(u'processLyrics')
635- sxml=SongXMLBuilder()
636+ sxml = SongXMLBuilder()
637 sxml.new_document()
638 sxml.add_lyrics_to_song()
639 count = 1
640 text = u' '
641 verse_order = u''
642 for i in range (0, self.VerseListWidget.count()):
643- sxml.add_verse_to_lyrics(u'Verse', unicode(count), unicode(self.VerseListWidget.item(i).text()))
644+ sxml.add_verse_to_lyrics(u'Verse', unicode(count),
645+ unicode(self.VerseListWidget.item(i).text()))
646 text = text + unicode(self.VerseListWidget.item(i).text()) + u' '
647- verse_order = verse_order +unicode(count) + u' '
648+ verse_order = verse_order + unicode(count) + u' '
649 count += 1
650 if self.song.verse_order is None:
651 self.song.verse_order = verse_order
652- text = text.replace(u'\'', u'')
653- text = text.replace(u',', u'')
654- text = text.replace(u';', u'')
655- text = text.replace(u':', u'')
656- text = text.replace(u'(', u'')
657- text = text.replace(u')', u'')
658- text = text.replace(u'{', u'')
659- text = text.replace(u'}', u'')
660- text = text.replace(u'?', u'')
661+ text = text.replace(u'\'', u'')
662+ text = text.replace(u',', u'')
663+ text = text.replace(u';', u'')
664+ text = text.replace(u':', u'')
665+ text = text.replace(u'(', u'')
666+ text = text.replace(u')', u'')
667+ text = text.replace(u'{', u'')
668+ text = text.replace(u'}', u'')
669+ text = text.replace(u'?', u'')
670 self.song.search_lyrics = unicode(text)
671 self.song.lyrics = unicode(sxml.extract_xml())
672
673 def processTitle(self):
674 log.debug(u'processTitle')
675- self.song.search_title = self.song.search_title.replace(u'\'', u'')
676- self.song.search_title = self.song.search_title.replace(u',', u'')
677- self.song.search_title = self.song.search_title.replace(u';', u'')
678- self.song.search_title = self.song.search_title.replace(u':', u'')
679- self.song.search_title = self.song.search_title.replace(u'(', u'')
680- self.song.search_title = self.song.search_title.replace(u')', u'')
681- self.song.search_title = self.song.search_title.replace(u'{', u'')
682- self.song.search_title = self.song.search_title.replace(u'}', u'')
683- self.song.search_title = self.song.search_title.replace(u'?', u'')
684- self.song.search_title = unicode(self.song.search_title)
685+ self.song.search_title = self.song.search_title.replace(u'\'', u'')
686+ self.song.search_title = self.song.search_title.replace(u',', u'')
687+ self.song.search_title = self.song.search_title.replace(u';', u'')
688+ self.song.search_title = self.song.search_title.replace(u':', u'')
689+ self.song.search_title = self.song.search_title.replace(u'(', u'')
690+ self.song.search_title = self.song.search_title.replace(u')', u'')
691+ self.song.search_title = self.song.search_title.replace(u'{', u'')
692+ self.song.search_title = self.song.search_title.replace(u'}', u'')
693+ self.song.search_title = self.song.search_title.replace(u'?', u'')
694+ self.song.search_title = unicode(self.song.search_title)
695
696=== modified file 'openlp/plugins/songs/songsplugin.py'
697--- openlp/plugins/songs/songsplugin.py 2009-08-06 14:51:38 +0000
698+++ openlp/plugins/songs/songsplugin.py 2009-08-06 21:30:14 +0000
699@@ -17,6 +17,7 @@
700 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
701 Place, Suite 330, Boston, MA 02111-1307 USA
702 """
703+
704 import logging
705
706 from PyQt4 import QtCore, QtGui