forked from openlp/openlp
Enter and save end times
This commit is contained in:
parent
5e7fa59407
commit
7fc84ad2b2
|
@ -109,6 +109,7 @@ class ServiceItem(object):
|
||||||
self.edit_id = None
|
self.edit_id = None
|
||||||
self.xml_version = None
|
self.xml_version = None
|
||||||
self.start_time = 0
|
self.start_time = 0
|
||||||
|
self.end_time = 0
|
||||||
self.media_length = 0
|
self.media_length = 0
|
||||||
self._new_item()
|
self._new_item()
|
||||||
|
|
||||||
|
@ -260,6 +261,7 @@ class ServiceItem(object):
|
||||||
u'data': self.data_string,
|
u'data': self.data_string,
|
||||||
u'xml_version': self.xml_version,
|
u'xml_version': self.xml_version,
|
||||||
u'start_time': self.start_time,
|
u'start_time': self.start_time,
|
||||||
|
u'end_time': self.end_time,
|
||||||
u'media_length': self.media_length
|
u'media_length': self.media_length
|
||||||
}
|
}
|
||||||
service_data = []
|
service_data = []
|
||||||
|
@ -306,6 +308,8 @@ class ServiceItem(object):
|
||||||
self.xml_version = header[u'xml_version']
|
self.xml_version = header[u'xml_version']
|
||||||
if u'start_time' in header:
|
if u'start_time' in header:
|
||||||
self.start_time = header[u'start_time']
|
self.start_time = header[u'start_time']
|
||||||
|
if u'end_time' in header:
|
||||||
|
self.end_time = header[u'end_time']
|
||||||
if u'media_length' in header:
|
if u'media_length' in header:
|
||||||
self.media_length = header[u'media_length']
|
self.media_length = header[u'media_length']
|
||||||
if self.service_item_type == ServiceItemType.Text:
|
if self.service_item_type == ServiceItemType.Text:
|
||||||
|
|
|
@ -652,10 +652,6 @@ class ServiceManager(QtGui.QWidget):
|
||||||
item = self.findServiceItem()[0]
|
item = self.findServiceItem()[0]
|
||||||
self.startTimeForm.item = self.serviceItems[item]
|
self.startTimeForm.item = self.serviceItems[item]
|
||||||
if self.startTimeForm.exec_():
|
if self.startTimeForm.exec_():
|
||||||
self.serviceItems[item][u'service_item'].start_time = \
|
|
||||||
self.startTimeForm.hourSpinBox.value() * 3600 + \
|
|
||||||
self.startTimeForm.minuteSpinBox.value() * 60 + \
|
|
||||||
self.startTimeForm.secondSpinBox.value()
|
|
||||||
self.repaintServiceList(item, -1)
|
self.repaintServiceList(item, -1)
|
||||||
|
|
||||||
def onServiceItemEditForm(self):
|
def onServiceItemEditForm(self):
|
||||||
|
|
|
@ -27,7 +27,9 @@
|
||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui
|
||||||
|
|
||||||
from starttimedialog import Ui_StartTimeDialog
|
from starttimedialog import Ui_StartTimeDialog
|
||||||
from openlp.core.lib.ui import UiStrings
|
|
||||||
|
from openlp.core.lib import translate
|
||||||
|
from openlp.core.lib.ui import UiStrings, critical_error_message_box
|
||||||
|
|
||||||
class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
|
class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
|
||||||
"""
|
"""
|
||||||
|
@ -59,6 +61,28 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
|
||||||
return QtGui.QDialog.exec_(self)
|
return QtGui.QDialog.exec_(self)
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
|
start = self.hourSpinBox.value() * 3600 + \
|
||||||
|
self.minuteSpinBox.value() * 60 + \
|
||||||
|
self.secondSpinBox.value()
|
||||||
|
end = self.hourFinishSpinBox.value() * 3600 + \
|
||||||
|
self.minuteFinishSpinBox.value() * 60 + \
|
||||||
|
self.secondFinishSpinBox.value()
|
||||||
|
if end > self.item[u'service_item'].media_length:
|
||||||
|
critical_error_message_box(
|
||||||
|
title=translate('OpenLP.StartTimeForm',
|
||||||
|
'Time Validation Error'),
|
||||||
|
message=translate('OpenLP.StartTimeForm',
|
||||||
|
'End time is after the end of the Media Item'))
|
||||||
|
return
|
||||||
|
elif start > end:
|
||||||
|
critical_error_message_box(
|
||||||
|
title=translate('OpenLP.StartTimeForm',
|
||||||
|
'Time Validation Error'),
|
||||||
|
message=translate('OpenLP.StartTimeForm',
|
||||||
|
'Start time is after the End of the Media Item'))
|
||||||
|
return
|
||||||
|
self.item[u'service_item'].start_time = start
|
||||||
|
self.item[u'service_item'].end_time = end
|
||||||
return QtGui.QDialog.accept(self)
|
return QtGui.QDialog.accept(self)
|
||||||
|
|
||||||
def _time_split(self, seconds):
|
def _time_split(self, seconds):
|
||||||
|
@ -67,4 +91,3 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog):
|
||||||
minutes = seconds / 60
|
minutes = seconds / 60
|
||||||
seconds -= 60 * minutes
|
seconds -= 60 * minutes
|
||||||
return hours, minutes, seconds
|
return hours, minutes, seconds
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue