forked from openlp/openlp
Cleanups
bzr-revno: 979
This commit is contained in:
commit
02912ed7ea
@ -122,7 +122,7 @@ class OpenLP(QtGui.QApplication):
|
|||||||
show_splash = QtCore.QSettings().value(
|
show_splash = QtCore.QSettings().value(
|
||||||
u'general/show splash', QtCore.QVariant(True)).toBool()
|
u'general/show splash', QtCore.QVariant(True)).toBool()
|
||||||
if show_splash:
|
if show_splash:
|
||||||
self.splash = SplashScreen(self.applicationVersion())
|
self.splash = SplashScreen()
|
||||||
self.splash.show()
|
self.splash.show()
|
||||||
# make sure Qt really display the splash screen
|
# make sure Qt really display the splash screen
|
||||||
self.processEvents()
|
self.processEvents()
|
||||||
|
@ -167,39 +167,39 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.serviceManagerList.__class__.dropEvent = self.dropEvent
|
self.serviceManagerList.__class__.dropEvent = self.dropEvent
|
||||||
self.layout.addWidget(self.serviceManagerList)
|
self.layout.addWidget(self.serviceManagerList)
|
||||||
# Add the bottom toolbar
|
# Add the bottom toolbar
|
||||||
self.OrderToolbar = OpenLPToolbar(self)
|
self.orderToolbar = OpenLPToolbar(self)
|
||||||
self.OrderToolbar.addToolbarButton(
|
self.orderToolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', 'Move to &top'),
|
translate('OpenLP.ServiceManager', 'Move to &top'),
|
||||||
u':/services/service_top.png',
|
u':/services/service_top.png',
|
||||||
translate('OpenLP.ServiceManager',
|
translate('OpenLP.ServiceManager',
|
||||||
'Move item to the top of the service.'),
|
'Move item to the top of the service.'),
|
||||||
self.onServiceTop)
|
self.onServiceTop)
|
||||||
self.OrderToolbar.addToolbarButton(
|
self.orderToolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', 'Move &up'),
|
translate('OpenLP.ServiceManager', 'Move &up'),
|
||||||
u':/services/service_up.png',
|
u':/services/service_up.png',
|
||||||
translate('OpenLP.ServiceManager',
|
translate('OpenLP.ServiceManager',
|
||||||
'Move item up one position in the service.'),
|
'Move item up one position in the service.'),
|
||||||
self.onServiceUp)
|
self.onServiceUp)
|
||||||
self.OrderToolbar.addToolbarButton(
|
self.orderToolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', 'Move &down'),
|
translate('OpenLP.ServiceManager', 'Move &down'),
|
||||||
u':/services/service_down.png',
|
u':/services/service_down.png',
|
||||||
translate('OpenLP.ServiceManager',
|
translate('OpenLP.ServiceManager',
|
||||||
'Move item down one position in the service.'),
|
'Move item down one position in the service.'),
|
||||||
self.onServiceDown)
|
self.onServiceDown)
|
||||||
self.OrderToolbar.addToolbarButton(
|
self.orderToolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', 'Move to &bottom'),
|
translate('OpenLP.ServiceManager', 'Move to &bottom'),
|
||||||
u':/services/service_bottom.png',
|
u':/services/service_bottom.png',
|
||||||
translate('OpenLP.ServiceManager',
|
translate('OpenLP.ServiceManager',
|
||||||
'Move item to the end of the service.'),
|
'Move item to the end of the service.'),
|
||||||
self.onServiceEnd)
|
self.onServiceEnd)
|
||||||
self.OrderToolbar.addSeparator()
|
self.orderToolbar.addSeparator()
|
||||||
self.OrderToolbar.addToolbarButton(
|
self.orderToolbar.addToolbarButton(
|
||||||
translate('OpenLP.ServiceManager', '&Delete From Service'),
|
translate('OpenLP.ServiceManager', '&Delete From Service'),
|
||||||
u':/general/general_delete.png',
|
u':/general/general_delete.png',
|
||||||
translate('OpenLP.ServiceManager',
|
translate('OpenLP.ServiceManager',
|
||||||
'Delete the selected item from the service.'),
|
'Delete the selected item from the service.'),
|
||||||
self.onDeleteFromService)
|
self.onDeleteFromService)
|
||||||
self.layout.addWidget(self.OrderToolbar)
|
self.layout.addWidget(self.orderToolbar)
|
||||||
# Connect up our signals and slots
|
# Connect up our signals and slots
|
||||||
QtCore.QObject.connect(self.themeComboBox,
|
QtCore.QObject.connect(self.themeComboBox,
|
||||||
QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected)
|
QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected)
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
class SplashScreen(object):
|
class SplashScreen(object):
|
||||||
def __init__(self, version):
|
def __init__(self):
|
||||||
self.splash_screen = QtGui.QSplashScreen()
|
self.splash_screen = QtGui.QSplashScreen()
|
||||||
self.setupUi()
|
self.setupUi()
|
||||||
|
|
||||||
|
@ -118,11 +118,11 @@ def parse_reference(reference):
|
|||||||
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
|
unified_ref_list.append((book, chapter, vr1_start, vr1_end))
|
||||||
vr2_end = check_end(match.group(6))
|
vr2_end = check_end(match.group(6))
|
||||||
if int(match.group(4)) > chapter:
|
if int(match.group(4)) > chapter:
|
||||||
for x in range(chapter + 1, int(match.group(4)) + 1):
|
for i in range(chapter + 1, int(match.group(4)) + 1):
|
||||||
if x == int(match.group(4)):
|
if i == int(match.group(4)):
|
||||||
unified_ref_list.append((book, x, 1, vr2_end))
|
unified_ref_list.append((book, i, 1, vr2_end))
|
||||||
else:
|
else:
|
||||||
unified_ref_list.append((book, x, 1, -1))
|
unified_ref_list.append((book, i, 1, -1))
|
||||||
elif match.group(4):
|
elif match.group(4):
|
||||||
# Chapter range or chapter and verse range
|
# Chapter range or chapter and verse range
|
||||||
if match.group(3):
|
if match.group(3):
|
||||||
@ -134,8 +134,8 @@ def parse_reference(reference):
|
|||||||
log.debug(u'Ambiguous reference: %s' % reference)
|
log.debug(u'Ambiguous reference: %s' % reference)
|
||||||
return None
|
return None
|
||||||
elif match.group(4) != u'end':
|
elif match.group(4) != u'end':
|
||||||
for x in range(chapter, int(match.group(4)) + 1):
|
for i in range(chapter, int(match.group(4)) + 1):
|
||||||
unified_ref_list.append((book, x, 1, -1))
|
unified_ref_list.append((book, i, 1, -1))
|
||||||
else:
|
else:
|
||||||
log.debug(u'Unsupported reference: %s' % reference)
|
log.debug(u'Unsupported reference: %s' % reference)
|
||||||
return None
|
return None
|
||||||
|
Loading…
Reference in New Issue
Block a user