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

head706

Browse Source
This commit is contained in:
Tim Bentley 2010-02-17 18:49:43 +00:00
commit 40c0f18fd4
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,7 @@ class SlideController(QtGui.QWidget):
tag = None
#If verse handle verse number else tag only
if bits[0] == self.trUtf8('Verse'):
tag = u'%s%s' % (bits[0][0], bits[1][0] )
tag = u'%s%s' % (bits[0][0], bits[1][0:] )
else:
tag = bits[0]
try:

6
openlp/core/ui/thememanager.py
View File

@ -236,7 +236,7 @@ class ThemeManager(QtGui.QWidget):
log.info(u'New Themes %s', unicode(files))
if len(files) > 0:
for file in files:
self.config.set_last_dir(filename)
self.config.set_last_dir(unicode(file))
self.unzipTheme(file, self.path)
self.loadThemes()
@ -343,7 +343,7 @@ class ThemeManager(QtGui.QWidget):
self, self.trUtf8('Error'),
self.trUtf8('File is not a valid theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
log.exception(u'Importing theme from zip file failed')
log.exception(u'Importing theme from zip file failed %s' % filename)
finally:
if zip:
zip.close()
@ -400,7 +400,7 @@ class ThemeManager(QtGui.QWidget):
newtheme.add_display(unicode(shadow), unicode(theme.ShadowColor.name()),
unicode(outline), unicode(theme.OutlineColor.name()),
unicode(theme.HorizontalAlign), unicode(theme.VerticalAlign),
unicode(theme.WrapStyle), 0)
unicode(theme.WrapStyle), unicode(0))
return newtheme.extract_xml()
def saveTheme(self, name, theme_xml, theme_pretty_xml, image_from,

2
openlp/plugins/presentations/lib/powerpointcontroller.py
View File

@ -208,7 +208,7 @@ class PowerpointController(PresentationController):
self.presentation.SlideShowSettings.Run()
self.presentation.SlideShowWindow.View.GotoSlide(1)
rendermanager = self.plugin.render_manager
rect = rendermanager.screen_list[rendermanager.current_display][u'size']
rect = rendermanager.screens.current[u'size']
self.presentation.SlideShowWindow.Top = rect.y() * 72 / dpi
self.presentation.SlideShowWindow.Height = rect.height() * 72 / dpi
self.presentation.SlideShowWindow.Left = rect.x() * 72 / dpi

2
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -108,7 +108,7 @@ class PptviewController(PresentationController):
if self.pptid >= 0:
self.close_presentation()
rendermanager = self.plugin.render_manager
rect = rendermanager.screen_list[rendermanager.current_display][u'size']
rect = rendermanager.screens.current[u'size']
rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
filepath = str(presentation.replace(u'/', u'\\'));
try:

2
openlp/plugins/songs/forms/editsongform.py
View File

@ -410,7 +410,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.AuthorsListView.setFocus()
#split the verse list by space and mark lower case for testing
for verse in unicode(self.VerseOrderEdit.text()).lower().split(u' '):
if len(verse) == 2:
if len(verse) > 1:
if verse[0:1] == u'v' and verse[1:].isdigit():
pass
else:

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -310,7 +310,7 @@ class SongMediaItem(MediaManagerItem):
for verse in verseList:
if verse[1]:
if verse[0][u'type'] == "Verse":
if verse[0][u'label'][0] == order[1:]:
if verse[0][u'label'] == order[1:]:
verseTag = u'%s:%s' % \
(verse[0][u'type'], verse[0][u'label'])
service_item.add_from_text\

2
version.txt
View File

@ -1 +1 @@
1.9.0-702
1.9.0-706