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

Preview Works

Browse Source
This commit is contained in:
Tim Bentley 2010-07-18 15:08:17 +01:00
parent 0d7f81c020
commit ea2d0cdb72
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -693,6 +693,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
"""
QtGui.QWidget.show(self)
self.LiveController.display.setup()
self.PreviewController.display.setup()
if self.LiveController.display.isVisible():
self.LiveController.display.setFocus()
self.activateWindow()

8
openlp/core/ui/slidecontroller.py
View File

@ -574,7 +574,7 @@ class SlideController(QtGui.QWidget):
self.slideList[tag1] = framenumber
self.SongMenu.menu().addAction(tag1,
self.onSongBarHandler)
item.setText(frame[u'text'])
item.setText(self.clean(frame[u'text']))
else:
label = QtGui.QLabel()
label.setMargin(4)
@ -981,3 +981,9 @@ class SlideController(QtGui.QWidget):
self.video.hide()
self.SlidePreview.clear()
self.SlidePreview.show()
def clean(self, text):
text = text.replace(u'<br>', u'\n').replace(u'<p>', u'')\
.replace(u'</p>', u'').replace(u'<sup>', u'')\
.replace(u'</sup>', u'')
return text