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

Head979

Browse Source
This commit is contained in:
Tim Bentley 2010-07-30 19:02:57 +01:00
commit c46dfab8a1
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp.pyw
View File

@ -123,7 +123,7 @@ class OpenLP(QtGui.QApplication):
show_splash = QtCore.QSettings().value(
u'general/show splash', QtCore.QVariant(True)).toBool()
if show_splash:
self.splash = SplashScreen(self.applicationVersion())
self.splash = SplashScreen()
self.splash.show()
# make sure Qt really display the splash screen
self.processEvents()

16
openlp/core/ui/servicemanager.py
View File

@ -167,39 +167,39 @@ class ServiceManager(QtGui.QWidget):
self.serviceManagerList.__class__.dropEvent = self.dropEvent
self.layout.addWidget(self.serviceManagerList)
# Add the bottom toolbar
self.OrderToolbar = OpenLPToolbar(self)
self.OrderToolbar.addToolbarButton(
self.orderToolbar = OpenLPToolbar(self)
self.orderToolbar.addToolbarButton(
translate('OpenLP.ServiceManager', 'Move to &top'),
u':/services/service_top.png',
translate('OpenLP.ServiceManager',
'Move item to the top of the service.'),
self.onServiceTop)
self.OrderToolbar.addToolbarButton(
self.orderToolbar.addToolbarButton(
translate('OpenLP.ServiceManager', 'Move &up'),
u':/services/service_up.png',
translate('OpenLP.ServiceManager',
'Move item up one position in the service.'),
self.onServiceUp)
self.OrderToolbar.addToolbarButton(
self.orderToolbar.addToolbarButton(
translate('OpenLP.ServiceManager', 'Move &down'),
u':/services/service_down.png',
translate('OpenLP.ServiceManager',
'Move item down one position in the service.'),
self.onServiceDown)
self.OrderToolbar.addToolbarButton(
self.orderToolbar.addToolbarButton(
translate('OpenLP.ServiceManager', 'Move to &bottom'),
u':/services/service_bottom.png',
translate('OpenLP.ServiceManager',
'Move item to the end of the service.'),
self.onServiceEnd)
self.OrderToolbar.addSeparator()
self.OrderToolbar.addToolbarButton(
self.orderToolbar.addSeparator()
self.orderToolbar.addToolbarButton(
translate('OpenLP.ServiceManager', '&Delete From Service'),
u':/general/general_delete.png',
translate('OpenLP.ServiceManager',
'Delete the selected item from the service.'),
self.onDeleteFromService)
self.layout.addWidget(self.OrderToolbar)
self.layout.addWidget(self.orderToolbar)
# Connect up our signals and slots
QtCore.QObject.connect(self.themeComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected)

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

@ -27,7 +27,7 @@
from PyQt4 import QtCore, QtGui
class SplashScreen(object):
def __init__(self, version):
def __init__(self):
self.splash_screen = QtGui.QSplashScreen()
self.setupUi()

12
openlp/plugins/bibles/lib/__init__.py
View File

@ -118,11 +118,11 @@ def parse_reference(reference):
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
vr2_end = check_end(match.group(6))
if int(match.group(4)) > chapter:
for x in range(chapter + 1, int(match.group(4)) + 1):
if x == int(match.group(4)):
unified_ref_list.append((book, x, 1, vr2_end))
for i in range(chapter + 1, int(match.group(4)) + 1):
if i == int(match.group(4)):
unified_ref_list.append((book, i, 1, vr2_end))
else:
unified_ref_list.append((book, x, 1, -1))
unified_ref_list.append((book, i, 1, -1))
elif match.group(4):
# Chapter range or chapter and verse range
if match.group(3):
@ -134,8 +134,8 @@ def parse_reference(reference):
log.debug(u'Ambiguous reference: %s' % reference)
return None
elif match.group(4) != u'end':
for x in range(chapter, int(match.group(4)) + 1):
unified_ref_list.append((book, x, 1, -1))
for i in range(chapter, int(match.group(4)) + 1):
unified_ref_list.append((book, i, 1, -1))
else:
log.debug(u'Unsupported reference: %s' % reference)
return None