forked from openlp/openlp
commit
8c89f5baa9
|
@ -208,40 +208,40 @@ class MediaManagerItem(QtGui.QWidget):
|
||||||
## Import Button ##
|
## Import Button ##
|
||||||
if self.hasImportIcon:
|
if self.hasImportIcon:
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'Import %s')) % \
|
unicode(translate('MediaManagerItem', 'Import %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
unicode(translate('MediaManagerItem', 'Import a %s')) % \
|
unicode(translate('MediaManagerItem', 'Import a %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
u':/general/general_import.png', self.onImportClick)
|
u':/general/general_import.png', self.onImportClick)
|
||||||
## File Button ##
|
## File Button ##
|
||||||
if self.hasFileIcon:
|
if self.hasFileIcon:
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'Load %s')) % \
|
unicode(translate('MediaManagerItem', 'Load %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
unicode(translate('MediaManagerItem', 'Load a new %s')) % \
|
unicode(translate('MediaManagerItem', 'Load a new %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
u':/general/general_open.png', self.onFileClick)
|
u':/general/general_open.png', self.onFileClick)
|
||||||
## New Button ##
|
## New Button ##
|
||||||
if self.hasNewIcon:
|
if self.hasNewIcon:
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'New %s')) % \
|
unicode(translate('MediaManagerItem', 'New %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
unicode(translate('MediaManagerItem', 'Add a new %s')) % \
|
unicode(translate('MediaManagerItem', 'Add a new %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
u':/general/general_new.png', self.onNewClick)
|
u':/general/general_new.png', self.onNewClick)
|
||||||
## Edit Button ##
|
## Edit Button ##
|
||||||
if self.hasEditIcon:
|
if self.hasEditIcon:
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'Edit %s')) % \
|
unicode(translate('MediaManagerItem', 'Edit %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
unicode(translate(
|
unicode(translate(
|
||||||
'MediaManagerItem', 'Edit the selected %s')) % \
|
'MediaManagerItem', 'Edit the selected %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
u':/general/general_edit.png', self.onEditClick)
|
u':/general/general_edit.png', self.onEditClick)
|
||||||
## Delete Button ##
|
## Delete Button ##
|
||||||
if self.hasDeleteIcon:
|
if self.hasDeleteIcon:
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'Delete %s')) % \
|
unicode(translate('MediaManagerItem', 'Delete %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
translate('MediaManagerItem', 'Delete the selected item'),
|
translate('MediaManagerItem', 'Delete the selected item'),
|
||||||
u':/general/general_delete.png', self.onDeleteClick)
|
u':/general/general_delete.png', self.onDeleteClick)
|
||||||
|
@ -249,7 +249,7 @@ class MediaManagerItem(QtGui.QWidget):
|
||||||
self.addToolbarSeparator()
|
self.addToolbarSeparator()
|
||||||
## Preview ##
|
## Preview ##
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'Preview %s')) % \
|
unicode(translate('MediaManagerItem', 'Preview %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
translate('MediaManagerItem', 'Preview the selected item'),
|
translate('MediaManagerItem', 'Preview the selected item'),
|
||||||
u':/general/general_preview.png', self.onPreviewClick)
|
u':/general/general_preview.png', self.onPreviewClick)
|
||||||
|
@ -260,7 +260,7 @@ class MediaManagerItem(QtGui.QWidget):
|
||||||
u':/general/general_live.png', self.onLiveClick)
|
u':/general/general_live.png', self.onLiveClick)
|
||||||
## Add to service Button ##
|
## Add to service Button ##
|
||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('MediaManagerItem', 'Add %s to Service')) % \
|
unicode(translate('MediaManagerItem', 'Add %s to Service')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
translate('MediaManagerItem',
|
translate('MediaManagerItem',
|
||||||
'Add the selected item(s) to the service'),
|
'Add the selected item(s) to the service'),
|
||||||
|
@ -285,7 +285,7 @@ class MediaManagerItem(QtGui.QWidget):
|
||||||
self.ListView.addAction(
|
self.ListView.addAction(
|
||||||
context_menu_action(
|
context_menu_action(
|
||||||
self.ListView, u':/general/general_edit.png',
|
self.ListView, u':/general/general_edit.png',
|
||||||
unicode(translate('MediaManagerItem', '&Edit %s')) % \
|
unicode(translate('MediaManagerItem', '&Edit %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
self.onEditClick))
|
self.onEditClick))
|
||||||
self.ListView.addAction(context_menu_separator(self.ListView))
|
self.ListView.addAction(context_menu_separator(self.ListView))
|
||||||
|
@ -293,14 +293,14 @@ class MediaManagerItem(QtGui.QWidget):
|
||||||
self.ListView.addAction(
|
self.ListView.addAction(
|
||||||
context_menu_action(
|
context_menu_action(
|
||||||
self.ListView, u':/general/general_delete.png',
|
self.ListView, u':/general/general_delete.png',
|
||||||
unicode(translate('MediaManagerItem', '&Delete %s')) % \
|
unicode(translate('MediaManagerItem', '&Delete %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
self.onDeleteClick))
|
self.onDeleteClick))
|
||||||
self.ListView.addAction(context_menu_separator(self.ListView))
|
self.ListView.addAction(context_menu_separator(self.ListView))
|
||||||
self.ListView.addAction(
|
self.ListView.addAction(
|
||||||
context_menu_action(
|
context_menu_action(
|
||||||
self.ListView, u':/general/general_preview.png',
|
self.ListView, u':/general/general_preview.png',
|
||||||
unicode(translate('MediaManagerItem', '&Preview %s')) % \
|
unicode(translate('MediaManagerItem', '&Preview %s')) %
|
||||||
self.PluginNameVisible,
|
self.PluginNameVisible,
|
||||||
self.onPreviewClick))
|
self.onPreviewClick))
|
||||||
self.ListView.addAction(
|
self.ListView.addAction(
|
||||||
|
|
|
@ -339,7 +339,8 @@ class ThemeXML(object):
|
||||||
"""
|
"""
|
||||||
Pull out the XML string formatted for human consumption
|
Pull out the XML string formatted for human consumption
|
||||||
"""
|
"""
|
||||||
return self.theme_xml.toprettyxml(indent=u' ', newl=u'\n', encoding=u'utf-8')
|
return self.theme_xml.toprettyxml(indent=u' ', newl=u'\n',
|
||||||
|
encoding=u'utf-8')
|
||||||
|
|
||||||
def parse(self, xml):
|
def parse(self, xml):
|
||||||
"""
|
"""
|
||||||
|
@ -364,7 +365,8 @@ class ThemeXML(object):
|
||||||
``xml``
|
``xml``
|
||||||
The XML string to parse.
|
The XML string to parse.
|
||||||
"""
|
"""
|
||||||
theme_xml = ElementTree(element=XML(xml.encode(u'ascii', u'xmlcharrefreplace')))
|
theme_xml = ElementTree(element=XML(xml.encode(u'ascii',
|
||||||
|
u'xmlcharrefreplace')))
|
||||||
xml_iter = theme_xml.getiterator()
|
xml_iter = theme_xml.getiterator()
|
||||||
master = u''
|
master = u''
|
||||||
for element in xml_iter:
|
for element in xml_iter:
|
||||||
|
|
|
@ -175,7 +175,8 @@ class Theme(object):
|
||||||
``xml``
|
``xml``
|
||||||
The data to apply to the theme
|
The data to apply to the theme
|
||||||
"""
|
"""
|
||||||
root = ElementTree(element=XML(xml.encode(u'ascii', u'xmlcharrefreplace')))
|
root = ElementTree(element=XML(xml.encode(u'ascii',
|
||||||
|
u'xmlcharrefreplace')))
|
||||||
xml_iter = root.getiterator()
|
xml_iter = root.getiterator()
|
||||||
for element in xml_iter:
|
for element in xml_iter:
|
||||||
delphi_color_change = False
|
delphi_color_change = False
|
||||||
|
|
|
@ -676,7 +676,7 @@ class ServiceManager(QtGui.QWidget):
|
||||||
translate('ServiceManager',
|
translate('ServiceManager',
|
||||||
'File is not a valid service.\n'
|
'File is not a valid service.\n'
|
||||||
'The content encoding is not UTF-8.'))
|
'The content encoding is not UTF-8.'))
|
||||||
log.exception(u'Filename "%s" is not valid UTF-8' % \
|
log.exception(u'Filename "%s" is not valid UTF-8' %
|
||||||
file.decode(u'utf-8', u'replace'))
|
file.decode(u'utf-8', u'replace'))
|
||||||
continue
|
continue
|
||||||
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
|
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
|
||||||
|
|
|
@ -398,7 +398,7 @@ class ThemeManager(QtGui.QWidget):
|
||||||
self, translate('ThemeManager', 'Error'),
|
self, translate('ThemeManager', 'Error'),
|
||||||
translate('ThemeManager', 'File is not a valid theme.\n'
|
translate('ThemeManager', 'File is not a valid theme.\n'
|
||||||
'The content encoding is not UTF-8.'))
|
'The content encoding is not UTF-8.'))
|
||||||
log.exception(u'Filename "%s" is not valid UTF-8' % \
|
log.exception(u'Filename "%s" is not valid UTF-8' %
|
||||||
file.decode(u'utf-8', u'replace'))
|
file.decode(u'utf-8', u'replace'))
|
||||||
continue
|
continue
|
||||||
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
|
osfile = unicode(QtCore.QDir.toNativeSeparators(ucsfile))
|
||||||
|
@ -424,8 +424,8 @@ class ThemeManager(QtGui.QWidget):
|
||||||
xml_data = xml_data.decode(u'utf-8')
|
xml_data = xml_data.decode(u'utf-8')
|
||||||
except UnicodeDecodeError:
|
except UnicodeDecodeError:
|
||||||
log.exception(u'Theme XML is not UTF-8 '
|
log.exception(u'Theme XML is not UTF-8 '
|
||||||
'encoded.')
|
u'encoded.')
|
||||||
break;
|
break
|
||||||
if self.checkVersion1(xml_data):
|
if self.checkVersion1(xml_data):
|
||||||
# upgrade theme xml
|
# upgrade theme xml
|
||||||
filexml = self.migrateVersion122(xml_data)
|
filexml = self.migrateVersion122(xml_data)
|
||||||
|
|
|
@ -294,5 +294,5 @@ class AlertsTab(SettingsTab):
|
||||||
font.setBold(True)
|
font.setBold(True)
|
||||||
font.setPointSize(self.font_size)
|
font.setPointSize(self.font_size)
|
||||||
self.FontPreview.setFont(font)
|
self.FontPreview.setFont(font)
|
||||||
self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % \
|
self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' %
|
||||||
(self.bg_color, self.font_color))
|
(self.bg_color, self.font_color))
|
||||||
|
|
|
@ -649,12 +649,13 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||||
text = text + re.sub(r'\W+', u' ',
|
text = text + re.sub(r'\W+', u' ',
|
||||||
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
|
unicode(self.VerseListWidget.item(i, 0).text())) + u' '
|
||||||
if (bits[1] > u'1') and (bits[0][0] not in multiple):
|
if (bits[1] > u'1') and (bits[0][0] not in multiple):
|
||||||
multiple.append(bits[0][0])
|
multiple.append(bits[0][0])
|
||||||
self.song.search_lyrics = text
|
self.song.search_lyrics = text
|
||||||
self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
|
self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
|
||||||
for verse in multiple:
|
for verse in multiple:
|
||||||
self.song.verse_order = re.sub(u'([' + verse.upper() +
|
self.song.verse_order = re.sub(u'([' + verse.upper() +
|
||||||
verse.lower() + u'])(\W|$)', r'\g<1>1\2', self.song.verse_order)
|
verse.lower() + u'])(\W|$)', r'\g<1>1\2',
|
||||||
|
self.song.verse_order)
|
||||||
except:
|
except:
|
||||||
log.exception(u'Problem processing song Lyrics \n%s',
|
log.exception(u'Problem processing song Lyrics \n%s',
|
||||||
sxml.dump_xml())
|
sxml.dump_xml())
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
import string
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui
|
||||||
|
|
|
@ -71,12 +71,11 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
log.debug(u'Detailed report generated')
|
log.debug(u'Detailed report generated')
|
||||||
filename = u'usage_detail_%s_%s.txt' % \
|
filename = u'usage_detail_%s_%s.txt' % (
|
||||||
(self.FromDate.selectedDate().toString(u'ddMMyyyy'),
|
self.FromDate.selectedDate().toString(u'ddMMyyyy'),
|
||||||
self.ToDate.selectedDate().toString(u'ddMMyyyy'))
|
self.ToDate.selectedDate().toString(u'ddMMyyyy'))
|
||||||
usage = self.parent.songusagemanager.get_all_songusage(\
|
usage = self.parent.songusagemanager.get_all_songusage(
|
||||||
self.FromDate.selectedDate(), \
|
self.FromDate.selectedDate(), self.ToDate.selectedDate())
|
||||||
self.ToDate.selectedDate())
|
|
||||||
outname = os.path.join(unicode(self.FileLineEdit.text()), filename)
|
outname = os.path.join(unicode(self.FileLineEdit.text()), filename)
|
||||||
file = None
|
file = None
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue