forked from openlp/openlp
change
This commit is contained in:
commit
52c9b9e53a
@ -116,18 +116,19 @@ class Renderer(object):
|
|||||||
html_text = u''
|
html_text = u''
|
||||||
styled_text = u''
|
styled_text = u''
|
||||||
for line in text:
|
for line in text:
|
||||||
styled_line = expand_tags(line)
|
styled_line = expand_tags(line) + line_end
|
||||||
if styled_text:
|
styled_text += styled_line
|
||||||
styled_text += line_end + styled_line
|
|
||||||
html = self.page_shell + styled_text + u'</div></body></html>'
|
html = self.page_shell + styled_text + u'</div></body></html>'
|
||||||
self.web.setHtml(html)
|
self.web.setHtml(html)
|
||||||
# Text too long so go to next page
|
# Text too long so go to next page
|
||||||
if self.web_frame.contentsSize().height() > self.page_height:
|
if self.web_frame.contentsSize().height() > self.page_height:
|
||||||
|
if html_text.endswith(u'<br>'):
|
||||||
|
html_text = html_text[:len(html_text)-4]
|
||||||
formatted.append(html_text)
|
formatted.append(html_text)
|
||||||
html_text = u''
|
html_text = u''
|
||||||
styled_text = styled_line
|
styled_text = styled_line
|
||||||
html_text += line + line_end
|
html_text += line + line_end
|
||||||
if line_break:
|
if html_text.endswith(u'<br>'):
|
||||||
html_text = html_text[:len(html_text)-4]
|
html_text = html_text[:len(html_text)-4]
|
||||||
formatted.append(html_text)
|
formatted.append(html_text)
|
||||||
log.debug(u'format_slide - End')
|
log.debug(u'format_slide - End')
|
||||||
|
@ -794,7 +794,8 @@ class SlideController(QtGui.QWidget):
|
|||||||
row = self.PreviewListWidget.currentRow()
|
row = self.PreviewListWidget.currentRow()
|
||||||
self.selectedRow = 0
|
self.selectedRow = 0
|
||||||
if row > -1 and row < self.PreviewListWidget.rowCount():
|
if row > -1 and row < self.PreviewListWidget.rowCount():
|
||||||
if self.serviceItem.is_command() and self.isLive:
|
if self.serviceItem.is_command():
|
||||||
|
if self.isLive:
|
||||||
Receiver.send_message(u'%s_slide' % self.serviceItem.name.lower(),
|
Receiver.send_message(u'%s_slide' % self.serviceItem.name.lower(),
|
||||||
[self.serviceItem, self.isLive, row])
|
[self.serviceItem, self.isLive, row])
|
||||||
self.updatePreview()
|
self.updatePreview()
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import mimetypes
|
||||||
|
|
||||||
from PyQt4.phonon import Phonon
|
from PyQt4.phonon import Phonon
|
||||||
|
|
||||||
@ -45,6 +46,7 @@ class MediaPlugin(Plugin):
|
|||||||
self.dnd_id = u'Media'
|
self.dnd_id = u'Media'
|
||||||
self.audio_list = u''
|
self.audio_list = u''
|
||||||
self.video_list = u''
|
self.video_list = u''
|
||||||
|
mimetypes.init()
|
||||||
for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
|
for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
|
||||||
mimetype = unicode(mimetype)
|
mimetype = unicode(mimetype)
|
||||||
type = mimetype.split(u'audio/x-')
|
type = mimetype.split(u'audio/x-')
|
||||||
@ -60,13 +62,18 @@ class MediaPlugin(Plugin):
|
|||||||
self.video_list, mimetype = self._addToList(self.video_list,
|
self.video_list, mimetype = self._addToList(self.video_list,
|
||||||
type, mimetype)
|
type, mimetype)
|
||||||
|
|
||||||
def _addToList(self, list, value, type):
|
def _addToList(self, list, value, mimetype):
|
||||||
|
# Is it a media type
|
||||||
if len(value) == 2:
|
if len(value) == 2:
|
||||||
if list.find(value[1]) == -1:
|
extensions = mimetypes.guess_all_extensions(unicode(mimetype))
|
||||||
list += u'*.%s ' % value[1]
|
# we have an extension
|
||||||
self.serviceManager.supportedSuffixes(value[1])
|
if extensions:
|
||||||
type = u''
|
for extension in extensions:
|
||||||
return list, type
|
if list.find(extension) == -1:
|
||||||
|
list += u'*%s ' % extension
|
||||||
|
self.serviceManager.supportedSuffixes(extension[1:])
|
||||||
|
mimetype = u''
|
||||||
|
return list, mimetype
|
||||||
|
|
||||||
def getSettingsTab(self):
|
def getSettingsTab(self):
|
||||||
return MediaTab(self.name)
|
return MediaTab(self.name)
|
||||||
|
Loading…
Reference in New Issue
Block a user