OpenLP

Merge lp:~meths/openlp/userinterface into lp:openlp

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

Reduce dead space in the UI (not including NACKd button resizing)

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tim Bentley (trb143) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-07-13 20:08:43 +0000
3+++ .bzrignore 2009-09-15 18:56:56 +0000
4@@ -1,6 +1,5 @@
5 *.pyc
6 *.*~
7-*.log
8 \#*\#
9 *.eric4project
10 *.ropeproject
11@@ -10,3 +9,4 @@
12 openlp.org 2.0.e4*
13 documentation/build/html
14 documentation/build/doctrees
15+*.log*
16
17=== modified file 'openlp/core/lib/toolbar.py'
18--- openlp/core/lib/toolbar.py 2009-09-12 17:24:16 +0000
19+++ openlp/core/lib/toolbar.py 2009-09-15 18:56:56 +0000
20@@ -39,11 +39,13 @@
21 QtGui.QToolBar.__init__(self, None)
22 # useful to be able to reuse button icons...
23 self.icons = {}
24+ self.setIconSize(QtCore.QSize(20, 20))
25 self.actions = {}
26 self.log = logging.getLogger(u'OpenLPToolbar')
27 self.log.debug(u'Init done')
28
29- def addToolbarButton(self, title, icon, tooltip=None, slot=None, objectname=None):
30+ def addToolbarButton(self, title, icon, tooltip=None, slot=None,
31+ objectname=None):
32 """
33 A method to help developers easily add a button to the toolbar.
34
35@@ -73,8 +75,8 @@
36 ButtonIcon.addPixmap(QtGui.QPixmap(icon), QtGui.QIcon.Normal,
37 QtGui.QIcon.Off)
38 else:
39- ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)),
40- QtGui.QIcon.Normal, QtGui.QIcon.Off)
41+ ButtonIcon.addPixmap(QtGui.QPixmap.fromImage(
42+ QtGui.QImage(icon)), QtGui.QIcon.Normal, QtGui.QIcon.Off)
43 if ButtonIcon is not None:
44 if slot is not None:
45 ToolbarButton = self.addAction(ButtonIcon, title, slot)
46
47=== modified file 'openlp/core/ui/slidecontroller.py'
48--- openlp/core/ui/slidecontroller.py 2009-09-15 19:06:40 +0000
49+++ openlp/core/ui/slidecontroller.py 2009-09-15 20:06:39 +0000
50@@ -157,13 +157,13 @@
51 self.DelaySpinBox.setSuffix(translate(u'SlideController', u's'))
52
53 self.ControllerLayout.addWidget(self.Toolbar)
54- sizeToolbarPolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
55- QtGui.QSizePolicy.Fixed)
56- sizeToolbarPolicy.setHorizontalStretch(0)
57- sizeToolbarPolicy.setVerticalStretch(0)
58- sizeToolbarPolicy.setHeightForWidth(
59- self.Toolbar.sizePolicy().hasHeightForWidth())
60- self.Toolbar.setSizePolicy(sizeToolbarPolicy)
61+ #sizeToolbarPolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
62+ # QtGui.QSizePolicy.Fixed)
63+ #sizeToolbarPolicy.setHorizontalStretch(0)
64+ #sizeToolbarPolicy.setVerticalStretch(0)
65+ #sizeToolbarPolicy.setHeightForWidth(
66+ # self.Toolbar.sizePolicy().hasHeightForWidth())
67+ #self.Toolbar.setSizePolicy(sizeToolbarPolicy)
68 # Screen preview area
69 self.PreviewFrame = QtGui.QFrame(self.Splitter)
70 self.PreviewFrame.setGeometry(QtCore.QRect(0, 0, 300, 225))
71
72=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
73--- openlp/plugins/bibles/lib/mediaitem.py 2009-09-12 17:24:16 +0000
74+++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-16 10:50:13 +0000
75@@ -59,42 +59,43 @@
76 self.addToolbar()
77 # Create buttons for the toolbar
78 ## New Bible Button ##
79- self.addToolbarButton(
80- translate(u'BibleMediaItem',u'New Bible'),
81- translate(u'BibleMediaItem',u'Register a new Bible'),
82+ self.addToolbarButton(translate(u'BibleMediaItem', u'New Bible'),
83+ translate(u'BibleMediaItem', u'Register a new Bible'),
84 u':/themes/theme_import.png', self.onBibleNewClick, u'BibleNewItem')
85 ## Separator Line ##
86 self.addToolbarSeparator()
87 ## Preview Bible Button ##
88- self.addToolbarButton(
89- translate(u'BibleMediaItem',u'Preview Bible'),
90- translate(u'BibleMediaItem',u'Preview the selected Bible Verse'),
91- u':/system/system_preview.png', self.onPreviewClick, u'BiblePreviewItem')
92+ self.addToolbarButton(translate(u'BibleMediaItem', u'Preview Bible'),
93+ translate(u'BibleMediaItem', u'Preview the selected Bible Verse'),
94+ u':/system/system_preview.png', self.onPreviewClick,
95+ u'BiblePreviewItem')
96 ## Live Bible Button ##
97- self.addToolbarButton(
98- translate(u'BibleMediaItem',u'Go Live'),
99- translate(u'BibleMediaItem',u'Send the selected Bible Verse(s) live'),
100+ self.addToolbarButton(translate(u'BibleMediaItem',u'Go Live'),
101+ translate(u'BibleMediaItem',
102+ u'Send the selected Bible Verse(s) live'),
103 u':/system/system_live.png', self.onLiveClick, u'BibleLiveItem')
104 ## Add Bible Button ##
105 self.addToolbarButton(
106- translate(u'BibleMediaItem',u'Add Bible Verse(s) To Service'),
107- translate(u'BibleMediaItem',u'Add the selected Bible(s) to the service'),
108- u':/system/system_add.png',
109- self.onAddClick, u'BibleAddItem')
110+ translate(u'BibleMediaItem', u'Add Bible Verse(s) To Service'),
111+ translate(u'BibleMediaItem',
112+ u'Add the selected Bible(s) to the service'),
113+ u':/system/system_add.png', self.onAddClick, u'BibleAddItem')
114 # Create the tab widget
115 self.SearchTabWidget = QtGui.QTabWidget(self)
116- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
117+ sizePolicy = QtGui.QSizePolicy(
118+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
119 sizePolicy.setHorizontalStretch(0)
120 sizePolicy.setVerticalStretch(0)
121- sizePolicy.setHeightForWidth(self.SearchTabWidget.sizePolicy().hasHeightForWidth())
122+ sizePolicy.setHeightForWidth(
123+ self.SearchTabWidget.sizePolicy().hasHeightForWidth())
124 self.SearchTabWidget.setSizePolicy(sizePolicy)
125 self.SearchTabWidget.setObjectName(u'SearchTabWidget')
126 # Add the Quick Search tab
127 self.QuickTab = QtGui.QWidget()
128 self.QuickTab.setObjectName(u'QuickTab')
129 self.QuickLayout = QtGui.QGridLayout(self.QuickTab)
130- self.QuickLayout.setMargin(8)
131- self.QuickLayout.setSpacing(8)
132+ self.QuickLayout.setMargin(5)
133+ self.QuickLayout.setSpacing(4)
134 self.QuickLayout.setObjectName(u'QuickLayout')
135 self.QuickVersionLabel = QtGui.QLabel(self.QuickTab)
136 self.QuickVersionLabel.setObjectName(u'QuickVersionLabel')
137@@ -137,8 +138,8 @@
138 self.AdvancedTab = QtGui.QWidget()
139 self.AdvancedTab.setObjectName(u'AdvancedTab')
140 self.AdvancedLayout = QtGui.QGridLayout(self.AdvancedTab)
141- self.AdvancedLayout.setMargin(8)
142- self.AdvancedLayout.setSpacing(8)
143+ self.AdvancedLayout.setMargin(5)
144+ self.AdvancedLayout.setSpacing(4)
145 self.AdvancedLayout.setObjectName(u'AdvancedLayout')
146 self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab)
147 self.AdvancedVersionLabel.setObjectName(u'AdvancedVersionLabel')
148@@ -180,8 +181,10 @@
149 self.AdvancedClearLabel.setObjectName(u'QuickSearchLabel')
150 self.AdvancedLayout.addWidget(self.AdvancedClearLabel, 5, 0, 1, 1)
151 self.ClearAdvancedSearchComboBox = QtGui.QComboBox(self.QuickTab)
152- self.ClearAdvancedSearchComboBox.setObjectName(u'ClearAdvancedSearchComboBox')
153- self.AdvancedLayout.addWidget(self.ClearAdvancedSearchComboBox, 5, 2, 1, 1)
154+ self.ClearAdvancedSearchComboBox.setObjectName(
155+ u'ClearAdvancedSearchComboBox')
156+ self.AdvancedLayout.addWidget(
157+ self.ClearAdvancedSearchComboBox, 5, 2, 1, 1)
158 self.AdvancedSearchButton = QtGui.QPushButton(self.AdvancedTab)
159 self.AdvancedSearchButton.setObjectName(u'AdvancedSearchButton')
160 self.AdvancedLayout.addWidget(self.AdvancedSearchButton, 5, 3, 1, 1)
161@@ -190,7 +193,8 @@
162 self.PageLayout.addWidget(self.SearchTabWidget)
163 self.ListView = BibleListView()
164 self.ListView.setAlternatingRowColors(True)
165- self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
166+ self.ListView.setSelectionMode(
167+ QtGui.QAbstractItemView.ExtendedSelection)
168 self.ListView.setDragEnabled(True)
169 self.PageLayout.addWidget(self.ListView)
170 # Combo Boxes
171@@ -215,7 +219,8 @@
172 self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
173 self.ListView.addAction(contextMenuAction(
174 self.ListView, u':/system/system_preview.png',
175- translate(u'BibleMediaItem',u'&Preview Verse'), self.onPreviewClick))
176+ translate(u'BibleMediaItem',u'&Preview Verse'),
177+ self.onPreviewClick))
178 self.ListView.addAction(contextMenuAction(
179 self.ListView, u':/system/system_live.png',
180 translate(u'BibleMediaItem',u'&Show Live'), self.onLiveClick))
181@@ -225,25 +230,37 @@
182
183 def retranslateUi(self):
184 log.debug(u'retranslateUi')
185- self.QuickVersionLabel.setText(translate(u'BibleMediaItem', u'Version:'))
186- self.QuickSearchLabel.setText(translate(u'BibleMediaItem', u'Search Type:'))
187+ self.QuickVersionLabel.setText(
188+ translate(u'BibleMediaItem', u'Version:'))
189+ self.QuickSearchLabel.setText(
190+ translate(u'BibleMediaItem', u'Search Type:'))
191 self.QuickSearchLabel.setText(translate(u'BibleMediaItem', u'Find:'))
192 self.QuickSearchButton.setText(translate(u'BibleMediaItem', u'Search'))
193 self.QuickClearLabel.setText(translate(u'BibleMediaItem', u'Results:'))
194- self.AdvancedVersionLabel.setText(translate(u'BibleMediaItem', u'Version:'))
195+ self.AdvancedVersionLabel.setText(
196+ translate(u'BibleMediaItem', u'Version:'))
197 self.AdvancedBookLabel.setText(translate(u'BibleMediaItem', u'Book:'))
198- self.AdvancedChapterLabel.setText(translate(u'BibleMediaItem', u'Chapter:'))
199+ self.AdvancedChapterLabel.setText(
200+ translate(u'BibleMediaItem', u'Chapter:'))
201 self.AdvancedVerseLabel.setText(translate(u'BibleMediaItem', u'Verse:'))
202 self.AdvancedFromLabel.setText(translate(u'BibleMediaItem', u'From:'))
203 self.AdvancedToLabel.setText(translate(u'BibleMediaItem', u'To:'))
204- self.AdvancedClearLabel.setText(translate(u'BibleMediaItem', u'Results:'))
205- self.AdvancedSearchButton.setText(translate(u'BibleMediaItem', u'Search'))
206- self.QuickSearchComboBox.addItem(translate(u'BibleMediaItem', u'Verse Search'))
207- self.QuickSearchComboBox.addItem(translate(u'BibleMediaItem', u'Text Search'))
208- self.ClearQuickSearchComboBox.addItem(translate(u'BibleMediaItem', u'Clear'))
209- self.ClearQuickSearchComboBox.addItem(translate(u'BibleMediaItem', u'Keep'))
210- self.ClearAdvancedSearchComboBox.addItem(translate(u'BibleMediaItem', u'Clear'))
211- self.ClearAdvancedSearchComboBox.addItem(translate(u'BibleMediaItem', u'Keep'))
212+ self.AdvancedClearLabel.setText(
213+ translate(u'BibleMediaItem', u'Results:'))
214+ self.AdvancedSearchButton.setText(
215+ translate(u'BibleMediaItem', u'Search'))
216+ self.QuickSearchComboBox.addItem(
217+ translate(u'BibleMediaItem', u'Verse Search'))
218+ self.QuickSearchComboBox.addItem(
219+ translate(u'BibleMediaItem', u'Text Search'))
220+ self.ClearQuickSearchComboBox.addItem(
221+ translate(u'BibleMediaItem', u'Clear'))
222+ self.ClearQuickSearchComboBox.addItem(
223+ translate(u'BibleMediaItem', u'Keep'))
224+ self.ClearAdvancedSearchComboBox.addItem(
225+ translate(u'BibleMediaItem', u'Clear'))
226+ self.ClearAdvancedSearchComboBox.addItem(
227+ translate(u'BibleMediaItem', u'Keep'))
228
229 def initialise(self):
230 log.debug(u'initialise')
231@@ -279,14 +296,17 @@
232 self.initialiseBible(bible)
233
234 def onAdvancedVersionComboBox(self):
235- self.initialiseBible(unicode(self.AdvancedVersionComboBox.currentText()))
236+ self.initialiseBible(
237+ unicode(self.AdvancedVersionComboBox.currentText()))
238
239 def onAdvancedBookComboBox(self):
240- self.initialiseChapterVerse(unicode(self.AdvancedVersionComboBox.currentText()),
241+ self.initialiseChapterVerse(
242+ unicode(self.AdvancedVersionComboBox.currentText()),
243 unicode(self.AdvancedBookComboBox.currentText()))
244
245 def onBibleNewClick(self):
246- self.bibleimportform = BibleImportForm(self.parent.config, self.parent.biblemanager, self)
247+ self.bibleimportform = BibleImportForm(
248+ self.parent.config, self.parent.biblemanager, self)
249 self.bibleimportform.exec_()
250 self.reloadBibles()
251
252@@ -301,8 +321,9 @@
253 bible = unicode(self.AdvancedVersionComboBox.currentText())
254 book = unicode(self.AdvancedBookComboBox.currentText())
255 # get the verse count for new chapter
256- vse = self.parent.biblemanager.get_book_verse_count(bible, book, int(t2))[0]
257- self.adjustComboBox(1, vse, self.AdvancedToVerse)
258+ verses = self.parent.biblemanager.get_book_verse_count(
259+ bible, book, int(t2))[0]
260+ self.adjustComboBox(1, verses, self.AdvancedToVerse)
261
262 def onAdvancedSearchButton(self):
263 log.debug(u'Advanced Search Button pressed')
264@@ -312,8 +333,8 @@
265 chapter_to = int(self.AdvancedToChapter.currentText())
266 verse_from = int(self.AdvancedFromVerse.currentText())
267 verse_to = int(self.AdvancedToVerse.currentText())
268- self.search_results = self.parent.biblemanager.get_verse_text(bible, book,
269- chapter_from, chapter_to, verse_from, verse_to)
270+ self.search_results = self.parent.biblemanager.get_verse_text(
271+ bible, book, chapter_from, chapter_to, verse_from, verse_to)
272 if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
273 self.ListView.clear()
274 self.displayResults(bible)
275
276=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
277--- openlp/plugins/songs/lib/mediaitem.py 2009-09-08 19:58:05 +0000
278+++ openlp/plugins/songs/lib/mediaitem.py 2009-09-16 10:50:13 +0000
279@@ -50,7 +50,8 @@
280 self.ConfigSection = u'song'
281 MediaManagerItem.__init__(self, parent, icon, title)
282 self.edit_song_form = EditSongForm(self.parent.songmanager, self)
283- self.song_maintenance_form = SongMaintenanceForm(self.parent.songmanager, self)
284+ self.song_maintenance_form = SongMaintenanceForm(
285+ self.parent.songmanager, self)
286
287 def setupUi(self):
288 # Add a toolbar
289@@ -73,30 +74,39 @@
290 ## Preview Song Button ##
291 self.addToolbarButton(translate(u'SongMediaItem', u'Preview Song'),
292 translate(u'SongMediaItem', u'Preview the selected song'),
293- ':/system/system_preview.png', self.onPreviewClick, 'SongPreviewItem')
294+ ':/system/system_preview.png', self.onPreviewClick,
295+ 'SongPreviewItem')
296 ## Live Song Button ##
297 self.addToolbarButton(translate(u'SongMediaItem', u'Go Live'),
298 translate(u'SongMediaItem', u'Send the selected song live'),
299 ':/system/system_live.png', self.onLiveClick, 'SongLiveItem')
300 ## Add Song Button ##
301- self.addToolbarButton(translate(u'SongMediaItem', u'Add Song To Service'),
302- translate(u'SongMediaItem', u'Add the selected song(s) to the service'),
303+ self.addToolbarButton(
304+ translate(u'SongMediaItem', u'Add Song To Service'),
305+ translate(u'SongMediaItem',
306+ u'Add the selected song(s) to the service'),
307 ':/system/system_add.png', self.onAddClick, 'SongAddItem')
308 self.addToolbarSeparator()
309 ## Song Maintenance Button ##
310 self.addToolbarButton(translate(u'SongMediaItem', u'Song Maintenance'),
311- translate(u'SongMediaItem', u'Maintain the lists of authors, topics and books'),
312- ':/songs/song_maintenance.png', self.onSongMaintenanceClick, 'SongMaintenanceItem')
313+ translate(u'SongMediaItem',
314+ u'Maintain the lists of authors, topics and books'),
315+ ':/songs/song_maintenance.png', self.onSongMaintenanceClick,
316+ 'SongMaintenanceItem')
317 ## Add the SongListView widget ##
318 # Create the tab widget
319 self.SongWidget = QtGui.QWidget(self)
320- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
321+ sizePolicy = QtGui.QSizePolicy(
322+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
323 sizePolicy.setHorizontalStretch(0)
324 sizePolicy.setVerticalStretch(0)
325- sizePolicy.setHeightForWidth(self.SongWidget.sizePolicy().hasHeightForWidth())
326+ sizePolicy.setHeightForWidth(
327+ self.SongWidget.sizePolicy().hasHeightForWidth())
328 self.SongWidget.setSizePolicy(sizePolicy)
329 self.SongWidget.setObjectName(u'SongWidget')
330 self.SearchLayout = QtGui.QGridLayout(self.SongWidget)
331+ self.SearchLayout.setMargin(5)
332+ self.SearchLayout.setSpacing(4)
333 self.SearchLayout.setObjectName(u'SearchLayout')
334 self.SearchTypeComboBox = QtGui.QComboBox(self.SongWidget)
335 self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox')
336@@ -130,7 +140,8 @@
337 QtCore.QObject.connect(self.ClearTextButton,
338 QtCore.SIGNAL(u'pressed()'), self.onClearTextButtonClick)
339 QtCore.QObject.connect(self.SearchTextEdit,
340- QtCore.SIGNAL(u'textChanged(const QString&)'), self.onSearchTextEditChanged)
341+ QtCore.SIGNAL(u'textChanged(const QString&)'),
342+ self.onSearchTextEditChanged)
343 QtCore.QObject.connect(self.ListView,
344 QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onPreviewClick)
345 QtCore.QObject.connect(Receiver.get_receiver(),
346@@ -143,18 +154,20 @@
347 self.onSongEditClick))
348 self.ListView.addAction(contextMenuSeparator(self.ListView))
349 self.ListView.addAction(contextMenuAction(self.ListView,
350- ':/system/system_preview.png', translate(u'SongMediaItem', u'&Preview Song'),
351- self.onPreviewClick))
352- self.ListView.addAction(contextMenuAction(self.ListView,
353- ':/system/system_live.png', translate(u'SongMediaItem', u'&Show Live'),
354- self.onLiveClick))
355- self.ListView.addAction(contextMenuAction(self.ListView,
356- ':/system/system_add.png', translate(u'SongMediaItem', u'&Add to Service'),
357- self.onAddClick))
358+ ':/system/system_preview.png',
359+ translate(u'SongMediaItem', u'&Preview Song'), self.onPreviewClick))
360+ self.ListView.addAction(contextMenuAction(self.ListView,
361+ ':/system/system_live.png',
362+ translate(u'SongMediaItem', u'&Show Live'), self.onLiveClick))
363+ self.ListView.addAction(contextMenuAction(self.ListView,
364+ ':/system/system_add.png',
365+ translate(u'SongMediaItem', u'&Add to Service'), self.onAddClick))
366
367 def retranslateUi(self):
368- self.SearchTypeLabel.setText(translate(u'SongMediaItem', u'Search Type:'))
369- self.SearchTextLabel.setText(translate(u'SongMediaItem', u'Search Text:'))
370+ self.SearchTypeLabel.setText(
371+ translate(u'SongMediaItem', u'Search Type:'))
372+ self.SearchTextLabel.setText(
373+ translate(u'SongMediaItem', u'Search Text:'))
374 self.ClearTextButton.setText(translate(u'SongMediaItem', u'Clear'))
375 self.SearchTextButton.setText(translate(u'SongMediaItem', u'Search'))
376
377@@ -169,15 +182,18 @@
378 search_type = self.SearchTypeComboBox.currentIndex()
379 if search_type == 0:
380 log.debug(u'Titles Search')
381- search_results = self.parent.songmanager.search_song_title(search_keywords)
382+ search_results = self.parent.songmanager.search_song_title(
383+ search_keywords)
384 self.displayResultsSong(search_results)
385 elif search_type == 1:
386 log.debug(u'Lyrics Search')
387- search_results = self.parent.songmanager.search_song_lyrics(search_keywords)
388+ search_results = self.parent.songmanager.search_song_lyrics(
389+ search_keywords)
390 self.displayResultsSong(search_results)
391 elif search_type == 2:
392 log.debug(u'Authors Search')
393- search_results = self.parent.songmanager.get_song_from_author(search_keywords)
394+ search_results = self.parent.songmanager.get_song_from_author(
395+ search_keywords)
396 self.displayResultsAuthor(search_results)
397
398 def displayResultsSong(self, searchresults):
399@@ -190,7 +206,8 @@
400 if author_list != u'':
401 author_list = author_list + u', '
402 author_list = author_list + author.display_name
403- song_detail = unicode(u'%s (%s)' % (unicode(song.title), unicode(author_list)))
404+ song_detail = unicode(u'%s (%s)' % \
405+ (unicode(song.title), unicode(author_list)))
406 song_name = QtGui.QListWidgetItem(song_detail)
407 song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
408 self.ListView.addItem(song_name)
409@@ -200,7 +217,8 @@
410 self.ListView.clear()
411 for author in searchresults:
412 for song in author.songs:
413- song_detail = unicode(u'%s (%s)' % (unicode(author.display_name), unicode(song.title)))
414+ song_detail = unicode(u'%s (%s)' % \
415+ (unicode(author.display_name), unicode(song.title)))
416 song_name = QtGui.QListWidgetItem(song_detail)
417 song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
418 self.ListView.addItem(song_name)
419@@ -291,7 +309,8 @@
420 raw_footer.append(song.title)
421 raw_footer.append(author_list)
422 raw_footer.append(song.copyright )
423- raw_footer.append(unicode(translate(u'SongMediaItem', u'CCL Licence: ') + ccl ))
424+ raw_footer.append(unicode(
425+ translate(u'SongMediaItem', u'CCL Licence: ') + ccl ))
426 service_item.raw_footer = raw_footer
427 return True
428