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

Cleanups

Browse Source
This commit is contained in:
Jon Tibble 2010-07-20 21:43:42 +01:00
parent 425b80d57a
commit 3560277684
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openlp/core/ui/generaltab.py
View File

@ -287,16 +287,16 @@ class GeneralTab(SettingsTab):
Translate the general settings tab to the currently selected language Translate the general settings tab to the currently selected language
""" """
self.MonitorGroupBox.setTitle(translate('GeneralTab', 'Monitors')) self.MonitorGroupBox.setTitle(translate('GeneralTab', 'Monitors'))
self.MonitorLabel.setText( self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
translate('OpenLP.GeneralTab', 'Select monitor for output display:')) 'Select monitor for output display:'))
self.DisplayOnMonitorCheck.setText( self.DisplayOnMonitorCheck.setText(
translate('OpenLP.GeneralTab', 'Display if a single screen')) translate('OpenLP.GeneralTab', 'Display if a single screen'))
self.StartupGroupBox.setTitle( self.StartupGroupBox.setTitle(
translate('OpenLP.GeneralTab', 'Application Startup')) translate('OpenLP.GeneralTab', 'Application Startup'))
self.WarningCheckBox.setText( self.WarningCheckBox.setText(
translate('OpenLP.GeneralTab', 'Show blank screen warning')) translate('OpenLP.GeneralTab', 'Show blank screen warning'))
self.AutoOpenCheckBox.setText( self.AutoOpenCheckBox.setText(translate('OpenLP.GeneralTab',
translate('OpenLP.GeneralTab', 'Automatically open the last service')) 'Automatically open the last service'))
self.ShowSplashCheckBox.setText( self.ShowSplashCheckBox.setText(
translate('OpenLP.GeneralTab', 'Show the splash screen')) translate('OpenLP.GeneralTab', 'Show the splash screen'))
self.SettingsGroupBox.setTitle(translate('OpenLP.GeneralTab', self.SettingsGroupBox.setTitle(translate('OpenLP.GeneralTab',
@ -318,7 +318,8 @@ class GeneralTab(SettingsTab):
self.currentXValueLabel.setText(u'0') self.currentXValueLabel.setText(u'0')
self.currentYLabel.setText(translate('OpenLP.GeneralTab', 'Y')) self.currentYLabel.setText(translate('OpenLP.GeneralTab', 'Y'))
self.currentYValueLabel.setText(u'0') self.currentYValueLabel.setText(u'0')
self.currentHeightLabel.setText(translate('OpenLP.GeneralTab', 'Height')) self.currentHeightLabel.setText(
translate('OpenLP.GeneralTab', 'Height'))
self.currentHeightValueLabel.setText(u'0') self.currentHeightValueLabel.setText(u'0')
self.currentWidthLabel.setText(translate('OpenLP.GeneralTab', 'Width')) self.currentWidthLabel.setText(translate('OpenLP.GeneralTab', 'Width'))
self.currentWidthValueLabel.setText(u'0') self.currentWidthValueLabel.setText(u'0')
@ -375,10 +376,12 @@ class GeneralTab(SettingsTab):
QtCore.QVariant(self.screens.current[u'size'].x())).toString()) QtCore.QVariant(self.screens.current[u'size'].x())).toString())
self.customYValueEdit.setText(settings.value(u'y position', self.customYValueEdit.setText(settings.value(u'y position',
QtCore.QVariant(self.screens.current[u'size'].y())).toString()) QtCore.QVariant(self.screens.current[u'size'].y())).toString())
self.customHeightValueEdit.setText(settings.value(u'height', self.customHeightValueEdit.setText(
QtCore.QVariant(self.screens.current[u'size'].height())).toString()) settings.value(u'height', QtCore.QVariant(
self.customWidthValueEdit.setText(settings.value(u'width', self.screens.current[u'size'].height())).toString())
QtCore.QVariant(self.screens.current[u'size'].width())).toString()) self.customWidthValueEdit.setText(
settings.value(u'width', QtCore.QVariant(
self.screens.current[u'size'].width())).toString())
else: else:
self.customXValueEdit.setText( self.customXValueEdit.setText(
unicode(self.screens.current[u'size'].x())) unicode(self.screens.current[u'size'].x()))

3
openlp/plugins/songs/forms/editsongdialog.py
View File

@ -441,7 +441,8 @@ class Ui_EditSongDialog(object):
translate('SongsPlugin.EditSongForm', 'Song Book')) translate('SongsPlugin.EditSongForm', 'Song Book'))
self.SongTabWidget.setTabText( self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.AuthorsTab), self.SongTabWidget.indexOf(self.AuthorsTab),
translate('SongsPlugin.EditSongForm', 'Authors, Topics && Song Book')) translate('SongsPlugin.EditSongForm',
'Authors, Topics && Song Book'))
self.ThemeGroupBox.setTitle( self.ThemeGroupBox.setTitle(
translate('SongsPlugin.EditSongForm', 'Theme')) translate('SongsPlugin.EditSongForm', 'Theme'))
self.ThemeAddButton.setText( self.ThemeAddButton.setText(

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

@ -195,11 +195,12 @@ class OpenSongImport(object):
versetype is not None: versetype is not None:
words = thisline words = thisline
if versenum is not None: if versenum is not None:
versetag = u'%s%s'%(versetype,versenum) versetag = u'%s%s' % (versetype, versenum)
if not verses.has_key(versetype): if not verses.has_key(versetype):
verses[versetype] = {} verses[versetype] = {}
if not verses[versetype].has_key(versenum): if not verses[versetype].has_key(versenum):
verses[versetype][versenum] = [] # storage for lines in this verse # storage for lines in this verse
verses[versetype][versenum] = []
if not verses_seen.has_key(versetag): if not verses_seen.has_key(versetag):
verses_seen[versetag] = 1 verses_seen[versetag] = 1
our_verse_order.append(versetag) our_verse_order.append(versetag)
@ -216,10 +217,11 @@ class OpenSongImport(object):
versenums = verses[versetype].keys() versenums = verses[versetype].keys()
versenums.sort() versenums.sort()
for num in versenums: for num in versenums:
versetag = u'%s%s' %(versetype,num) versetag = u'%s%s' % (versetype, num)
lines = u'\n'.join(verses[versetype][num]) lines = u'\n'.join(verses[versetype][num])
self.song_import.verses.append([versetag, lines]) self.song_import.verses.append([versetag, lines])
versetags[versetag] = 1 # keep track of what we have for error checking later # Keep track of what we have for error checking later
versetags[versetag] = 1
# now figure out the presentation order # now figure out the presentation order
if u'presentation' in fields and root.presentation != u'': if u'presentation' in fields and root.presentation != u'':
order = unicode(root.presentation) order = unicode(root.presentation)