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

Code Cleanups

Browse Source 
bzr-revno: 1090
This commit is contained in:
Andreas Preikschat 2010-10-15 16:47:16 +01:00 committed by Tim Bentley
commit da3db82d24
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/serviceitem.py
View File

@ -399,6 +399,6 @@ class ServiceItem(object):
def get_frame_path(self, row=0): def get_frame_path(self, row=0):
""" """
Returns the title of the raw frame Returns the path of the raw frame
""" """
return self._raw_frames[row][u'path'] return self._raw_frames[row][u'path']

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

@ -999,4 +999,3 @@ class SlideController(QtGui.QWidget):
self.video.hide() self.video.hide()
self.SlidePreview.clear() self.SlidePreview.clear()
self.SlidePreview.show() self.SlidePreview.show()

10
openlp/plugins/songs/lib/songbeamerimport.py
View File

@ -127,11 +127,10 @@ class SongBeamerImport(SongImport):
self.import_wizard.incrementProgressBar( self.import_wizard.incrementProgressBar(
"Importing %s" % (self.file_name)) "Importing %s" % (self.file_name))
return True return True
def parse_tags(self, line): def parse_tags(self, line):
tag_val = line.split('=') tag_val = line.split('=')
if len(tag_val[0]) == 0 or \ if len(tag_val[0]) == 0 or len(tag_val[1]) == 0:
len(tag_val[1]) == 0:
return True return True
if tag_val[0] == '#(c)': if tag_val[0] == '#(c)':
self.add_copyright(tag_val[1]) self.add_copyright(tag_val[1])
@ -225,11 +224,10 @@ class SongBeamerImport(SongImport):
else: else:
pass pass
return True return True
def check_verse_marks(self, line): def check_verse_marks(self, line):
marks = line.split(' ') marks = line.split(' ')
if len(marks) <= 2 and \ if len(marks) <= 2 and marks[0] in SongBeamerTypes.MarkTypes:
marks[0] in SongBeamerTypes.MarkTypes:
self.current_verse_type = SongBeamerTypes.MarkTypes[marks[0]] self.current_verse_type = SongBeamerTypes.MarkTypes[marks[0]]
if len(marks) == 2: if len(marks) == 2:
#TODO: may check, because of only digits are allowed #TODO: may check, because of only digits are allowed