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

Name changes to camelCase where appropriate.

This commit is contained in:
Mattias Põldaru 2012-02-02 14:42:52 +02:00
parent 6da181834c
commit 6f219e175f
2 changed files with 123 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
openlp/core/ui/advancedtab.py
View File

@ -47,11 +47,11 @@ class AdvancedTab(SettingsTab):
self.display_changed = False self.display_changed = False
advancedTranslated = translate('OpenLP.AdvancedTab', 'Advanced') advancedTranslated = translate('OpenLP.AdvancedTab', 'Advanced')
# 7 stands for now, 0 to 6 is Monday to Sunday. # 7 stands for now, 0 to 6 is Monday to Sunday.
self.default_service_day = 7 self.defaultServiceDay = 7
# 11 o'clock is the most popular time for morning service. # 11 o'clock is the most popular time for morning service.
self.default_service_hour = 11 self.defaultServiceHour = 11
self.default_service_minute = 0 self.defaultServiceMinute = 0
self.default_service_name = unicode(translate('OpenLP.AdvancedTab', self.defaultServiceName = unicode(translate('OpenLP.AdvancedTab',
'Service %Y-%m-%d %H-%M', 'Service %Y-%m-%d %H-%M',
'This is the default default service name template, which can be ' 'This is the default default service name template, which can be '
'found under Advanced in Settings, Configure OpenLP. Please do not ' 'found under Advanced in Settings, Configure OpenLP. Please do not '
@ -100,58 +100,58 @@ class AdvancedTab(SettingsTab):
u'enableAutoCloseCheckBox') u'enableAutoCloseCheckBox')
self.uiLayout.addRow(self.enableAutoCloseCheckBox) self.uiLayout.addRow(self.enableAutoCloseCheckBox)
self.leftLayout.addWidget(self.uiGroupBox) self.leftLayout.addWidget(self.uiGroupBox)
self.defaultServiceGroupBox = QtGui.QGroupBox(self.leftColumn) self.serviceNameGroupBox = QtGui.QGroupBox(self.leftColumn)
self.defaultServiceGroupBox.setObjectName(u'defaultServiceGroupBox') self.serviceNameGroupBox.setObjectName(u'serviceNameGroupBox')
self.defaultServiceLayout = QtGui.QFormLayout( self.serviceNameLayout = QtGui.QFormLayout(
self.defaultServiceGroupBox) self.serviceNameGroupBox)
self.defaultServiceCheckBox = QtGui.QCheckBox( self.serviceNameCheckBox = QtGui.QCheckBox(
self.defaultServiceGroupBox) self.serviceNameGroupBox)
self.defaultServiceCheckBox.setObjectName(u'defaultServiceCheckBox') self.serviceNameCheckBox.setObjectName(u'serviceNameCheckBox')
self.defaultServiceLayout.setObjectName(u'defaultServiceLayout') self.serviceNameLayout.setObjectName(u'serviceNameLayout')
self.defaultServiceLayout.addRow(self.defaultServiceCheckBox) self.serviceNameLayout.addRow(self.serviceNameCheckBox)
self.defaultServiceTimeLabel = QtGui.QLabel(self.defaultServiceGroupBox) self.serviceNameTimeLabel = QtGui.QLabel(self.serviceNameGroupBox)
self.defaultServiceTimeLabel.setObjectName(u'defaultServiceTimeLabel') self.serviceNameTimeLabel.setObjectName(u'serviceNameTimeLabel')
self.defaultServiceDay = QtGui.QComboBox( self.serviceNameDay = QtGui.QComboBox(
self.defaultServiceGroupBox) self.serviceNameGroupBox)
self.defaultServiceDay.addItems( self.serviceNameDay.addItems(
[u'', u'', u'', u'', u'', u'', u'', u'']) [u'', u'', u'', u'', u'', u'', u'', u''])
self.defaultServiceDay.setObjectName( self.serviceNameDay.setObjectName(
u'defaultServiceDay') u'serviceNameDay')
self.defaultServiceTime = QtGui.QTimeEdit(self.defaultServiceGroupBox) self.serviceNameTime = QtGui.QTimeEdit(self.serviceNameGroupBox)
self.defaultServiceTime.setObjectName(u'defaultServiceTime') self.serviceNameTime.setObjectName(u'serviceNameTime')
self.defaultServiceTimeHBox = QtGui.QHBoxLayout() self.serviceNameTimeHBox = QtGui.QHBoxLayout()
self.defaultServiceTimeHBox.setObjectName(u'defaultServiceTimeHBox') self.serviceNameTimeHBox.setObjectName(u'serviceNameTimeHBox')
self.defaultServiceTimeHBox.addWidget(self.defaultServiceDay) self.serviceNameTimeHBox.addWidget(self.serviceNameDay)
self.defaultServiceTimeHBox.addWidget(self.defaultServiceTime) self.serviceNameTimeHBox.addWidget(self.serviceNameTime)
self.defaultServiceLayout.addRow(self.defaultServiceTimeLabel, self.serviceNameLayout.addRow(self.serviceNameTimeLabel,
self.defaultServiceTimeHBox) self.serviceNameTimeHBox)
self.defaultServiceLabel = QtGui.QLabel(self.defaultServiceGroupBox) self.serviceNameLabel = QtGui.QLabel(self.serviceNameGroupBox)
self.defaultServiceLabel.setObjectName(u'defaultServiceLabel') self.serviceNameLabel.setObjectName(u'serviceNameLabel')
self.defaultServiceName = QtGui.QLineEdit(self.defaultServiceGroupBox) self.serviceNameEdit = QtGui.QLineEdit(self.serviceNameGroupBox)
self.defaultServiceName.setObjectName(u'defaultServiceName') self.serviceNameEdit.setObjectName(u'serviceNameEdit')
self.defaultServiceName.setValidator(QtGui.QRegExpValidator( self.serviceNameEdit.setValidator(QtGui.QRegExpValidator(
QtCore.QRegExp(r'[^/\\?*|<>\[\]":+]+'), self)) QtCore.QRegExp(r'[^/\\?*|<>\[\]":+]+'), self))
self.defaultServiceRevertButton = QtGui.QToolButton( self.serviceNameRevertButton = QtGui.QToolButton(
self.defaultServiceGroupBox) self.serviceNameGroupBox)
self.defaultServiceRevertButton.setObjectName( self.serviceNameRevertButton.setObjectName(
u'defaultServiceRevertButton') u'serviceNameRevertButton')
self.defaultServiceRevertButton.setIcon( self.serviceNameRevertButton.setIcon(
build_icon(u':/general/general_revert.png')) build_icon(u':/general/general_revert.png'))
self.defaultServiceHBox = QtGui.QHBoxLayout() self.serviceNameHBox = QtGui.QHBoxLayout()
self.defaultServiceHBox.setObjectName(u'defaultServiceHBox') self.serviceNameHBox.setObjectName(u'serviceNameHBox')
self.defaultServiceHBox.addWidget(self.defaultServiceName) self.serviceNameHBox.addWidget(self.serviceNameEdit)
self.defaultServiceHBox.addWidget(self.defaultServiceRevertButton) self.serviceNameHBox.addWidget(self.serviceNameRevertButton)
self.defaultServiceLayout.addRow(self.defaultServiceLabel, self.serviceNameLayout.addRow(self.serviceNameLabel,
self.defaultServiceHBox) self.serviceNameHBox)
self.defaultServiceExampleLabel = QtGui.QLabel( self.serviceNameExampleLabel = QtGui.QLabel(
self.defaultServiceGroupBox) self.serviceNameGroupBox)
self.defaultServiceExampleLabel.setObjectName( self.serviceNameExampleLabel.setObjectName(
u'defaultServiceExampleLabel') u'serviceNameExampleLabel')
self.defaultServiceExample = QtGui.QLabel(self.defaultServiceGroupBox) self.serviceNameExample = QtGui.QLabel(self.serviceNameGroupBox)
self.defaultServiceExample.setObjectName(u'defaultServiceExample') self.serviceNameExample.setObjectName(u'serviceNameExample')
self.defaultServiceLayout.addRow(self.defaultServiceExampleLabel, self.serviceNameLayout.addRow(self.serviceNameExampleLabel,
self.defaultServiceExample) self.serviceNameExample)
self.leftLayout.addWidget(self.defaultServiceGroupBox) self.leftLayout.addWidget(self.serviceNameGroupBox)
self.leftLayout.addStretch() self.leftLayout.addStretch()
self.defaultImageGroupBox = QtGui.QGroupBox(self.rightColumn) self.defaultImageGroupBox = QtGui.QGroupBox(self.rightColumn)
self.defaultImageGroupBox.setObjectName(u'defaultImageGroupBox') self.defaultImageGroupBox.setObjectName(u'defaultImageGroupBox')
@ -201,21 +201,21 @@ class AdvancedTab(SettingsTab):
self.rightLayout.addWidget(self.x11GroupBox) self.rightLayout.addWidget(self.x11GroupBox)
self.rightLayout.addStretch() self.rightLayout.addStretch()
self.updateDefaultServiceExample = False self.updateserviceNameExample = False
QtCore.QObject.connect(self.defaultServiceCheckBox, QtCore.QObject.connect(self.serviceNameCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.defaultServiceCheckBoxToggled) QtCore.SIGNAL(u'toggled(bool)'), self.serviceNameCheckBoxToggled)
QtCore.QObject.connect(self.defaultServiceDay, QtCore.QObject.connect(self.serviceNameDay,
QtCore.SIGNAL(u'currentIndexChanged(int)'), QtCore.SIGNAL(u'currentIndexChanged(int)'),
self.onDefaultServiceDayChanged) self.onserviceNameDayChanged)
QtCore.QObject.connect(self.defaultServiceTime, QtCore.QObject.connect(self.serviceNameTime,
QtCore.SIGNAL(u'timeChanged(QTime)'), QtCore.SIGNAL(u'timeChanged(QTime)'),
self.updateServiceNameExample) self.updateServiceNameExample)
QtCore.QObject.connect(self.defaultServiceName, QtCore.QObject.connect(self.serviceNameEdit,
QtCore.SIGNAL(u'textChanged(QString)'), QtCore.SIGNAL(u'textChanged(QString)'),
self.updateServiceNameExample) self.updateServiceNameExample)
QtCore.QObject.connect(self.defaultServiceRevertButton, QtCore.QObject.connect(self.serviceNameRevertButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onDefaultServiceRevertButtonPressed) self.onserviceNameRevertButtonPressed)
QtCore.QObject.connect(self.defaultColorButton, QtCore.QObject.connect(self.defaultColorButton,
QtCore.SIGNAL(u'pressed()'), self.onDefaultColorButtonPressed) QtCore.SIGNAL(u'pressed()'), self.onDefaultColorButtonPressed)
QtCore.QObject.connect(self.defaultBrowseButton, QtCore.QObject.connect(self.defaultBrowseButton,
@ -245,39 +245,39 @@ class AdvancedTab(SettingsTab):
'Expand new service items on creation')) 'Expand new service items on creation'))
self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab', self.enableAutoCloseCheckBox.setText(translate('OpenLP.AdvancedTab',
'Enable application exit confirmation')) 'Enable application exit confirmation'))
self.defaultServiceGroupBox.setTitle( self.serviceNameGroupBox.setTitle(
translate('OpenLP.AdvancedTab', 'Default Service Name')) translate('OpenLP.AdvancedTab', 'Default Service Name'))
self.defaultServiceCheckBox.setText( self.serviceNameCheckBox.setText(
translate('OpenLP.AdvancedTab', 'Enable default service name')) translate('OpenLP.AdvancedTab', 'Enable default service name'))
self.defaultServiceTimeLabel.setText( self.serviceNameTimeLabel.setText(
translate('OpenLP.AdvancedTab', 'Date and Time:')) translate('OpenLP.AdvancedTab', 'Date and Time:'))
self.defaultServiceDay.setItemText(0, self.serviceNameDay.setItemText(0,
translate('OpenLP.AdvancedTab', 'Monday')) translate('OpenLP.AdvancedTab', 'Monday'))
self.defaultServiceDay.setItemText(1, self.serviceNameDay.setItemText(1,
translate('OpenLP.AdvancedTab', 'Tuesday')) translate('OpenLP.AdvancedTab', 'Tuesday'))
self.defaultServiceDay.setItemText(2, self.serviceNameDay.setItemText(2,
translate('OpenLP.AdvancedTab', 'Wednesday')) translate('OpenLP.AdvancedTab', 'Wednesday'))
self.defaultServiceDay.setItemText(3, self.serviceNameDay.setItemText(3,
translate('OpenLP.AdvancedTab', 'Thurdsday')) translate('OpenLP.AdvancedTab', 'Thurdsday'))
self.defaultServiceDay.setItemText(4, self.serviceNameDay.setItemText(4,
translate('OpenLP.AdvancedTab', 'Friday')) translate('OpenLP.AdvancedTab', 'Friday'))
self.defaultServiceDay.setItemText(5, self.serviceNameDay.setItemText(5,
translate('OpenLP.AdvancedTab', 'Saturday')) translate('OpenLP.AdvancedTab', 'Saturday'))
self.defaultServiceDay.setItemText(6, self.serviceNameDay.setItemText(6,
translate('OpenLP.AdvancedTab', 'Sunday')) translate('OpenLP.AdvancedTab', 'Sunday'))
self.defaultServiceDay.setItemText(7, self.serviceNameDay.setItemText(7,
translate('OpenLP.AdvancedTab', 'Now')) translate('OpenLP.AdvancedTab', 'Now'))
self.defaultServiceTime.setToolTip(translate('OpenLP.AdvancedTab', self.serviceNameTime.setToolTip(translate('OpenLP.AdvancedTab',
'Time when usual service starts.')) 'Time when usual service starts.'))
self.defaultServiceLabel.setText( self.serviceNameLabel.setText(
translate('OpenLP.AdvancedTab', 'Name:')) translate('OpenLP.AdvancedTab', 'Name:'))
self.defaultServiceName.setToolTip(translate('OpenLP.AdvancedTab', self.serviceNameEdit.setToolTip(translate('OpenLP.AdvancedTab',
'Consult the OpenLP manual for usage.')) 'Consult the OpenLP manual for usage.'))
self.defaultServiceRevertButton.setToolTip(unicode( self.serviceNameRevertButton.setToolTip(unicode(
translate('OpenLP.AdvancedTab', translate('OpenLP.AdvancedTab',
'Revert to the default service name "%s".')) % 'Revert to the default service name "%s".')) %
self.default_service_name) self.defaultServiceName)
self.defaultServiceExampleLabel.setText(translate('OpenLP.AdvancedTab', self.serviceNameExampleLabel.setText(translate('OpenLP.AdvancedTab',
'Example:')) 'Example:'))
self.hideMouseGroupBox.setTitle(translate('OpenLP.AdvancedTab', self.hideMouseGroupBox.setTitle(translate('OpenLP.AdvancedTab',
'Mouse Cursor')) 'Mouse Cursor'))
@ -330,21 +330,21 @@ class AdvancedTab(SettingsTab):
QtCore.QVariant(True)).toBool()) QtCore.QVariant(True)).toBool())
self.hideMouseCheckBox.setChecked( self.hideMouseCheckBox.setChecked(
settings.value(u'hide mouse', QtCore.QVariant(False)).toBool()) settings.value(u'hide mouse', QtCore.QVariant(False)).toBool())
self.defaultServiceDay.setCurrentIndex( self.serviceNameDay.setCurrentIndex(
settings.value(u'default service day', settings.value(u'default service day',
QtCore.QVariant(self.default_service_day)).toInt()[0]) QtCore.QVariant(self.defaultServiceDay)).toInt()[0])
self.defaultServiceTime.setTime(QtCore.QTime( self.serviceNameTime.setTime(QtCore.QTime(
settings.value(u'default service hour', settings.value(u'default service hour',
self.default_service_hour).toInt()[0], self.defaultServiceHour).toInt()[0],
settings.value(u'default service minute', settings.value(u'default service minute',
self.default_service_minute).toInt()[0])) self.defaultServiceMinute).toInt()[0]))
self.updateDefaultServiceExample = True self.updateserviceNameExample = True
self.defaultServiceName.setText(settings.value(u'default service name', self.serviceNameEdit.setText(settings.value(u'default service name',
self.default_service_name).toString()) self.defaultServiceName).toString())
default_service_enabled = settings.value(u'default service enabled', default_service_enabled = settings.value(u'default service enabled',
QtCore.QVariant(True)).toBool() QtCore.QVariant(True)).toBool()
self.defaultServiceCheckBox.setChecked(default_service_enabled) self.serviceNameCheckBox.setChecked(default_service_enabled)
self.defaultServiceCheckBoxToggled(default_service_enabled) self.serviceNameCheckBoxToggled(default_service_enabled)
self.x11BypassCheckBox.setChecked( self.x11BypassCheckBox.setChecked(
settings.value(u'x11 bypass wm', QtCore.QVariant(True)).toBool()) settings.value(u'x11 bypass wm', QtCore.QVariant(True)).toBool())
self.default_color = settings.value(u'default color', self.default_color = settings.value(u'default color',
@ -360,25 +360,23 @@ class AdvancedTab(SettingsTab):
""" """
Save settings to disk. Save settings to disk.
""" """
preset_is_valid = self.generate_service_name_example()[0]
service_name = unicode(self.defaultServiceName.text())
if not preset_is_valid:
service_name = self.default_service_name
self.defaultServiceName.setText(service_name)
settings = QtCore.QSettings() settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection) settings.beginGroup(self.settingsSection)
settings.setValue(u'default service enabled', settings.setValue(u'default service enabled',
self.defaultServiceCheckBox.isChecked()) self.serviceNameCheckBox.isChecked())
if service_name == self.default_service_name: service_name = unicode(self.serviceNameEdit.text())
preset_is_valid = self.generateServiceNameExample()[0]
if service_name == self.defaultServiceName or not preset_is_valid:
settings.remove(u'default service name') settings.remove(u'default service name')
self.serviceNameEdit.setText(service_name)
else: else:
settings.setValue(u'default service name', service_name) settings.setValue(u'default service name', service_name)
settings.setValue(u'default service day', settings.setValue(u'default service day',
self.defaultServiceDay.currentIndex()) self.serviceNameDay.currentIndex())
settings.setValue(u'default service hour', settings.setValue(u'default service hour',
self.defaultServiceTime.time().hour()) self.serviceNameTime.time().hour())
settings.setValue(u'default service minute', settings.setValue(u'default service minute',
self.defaultServiceTime.time().minute()) self.serviceNameTime.time().minute())
settings.setValue(u'recent file count', settings.setValue(u'recent file count',
QtCore.QVariant(self.recentSpinBox.value())) QtCore.QVariant(self.recentSpinBox.value()))
settings.setValue(u'save current plugin', settings.setValue(u'save current plugin',
@ -402,29 +400,29 @@ class AdvancedTab(SettingsTab):
Receiver.send_message(u'config_screen_changed') Receiver.send_message(u'config_screen_changed')
self.display_changed = False self.display_changed = False
def defaultServiceCheckBoxToggled(self, default_service_enabled): def serviceNameCheckBoxToggled(self, default_service_enabled):
self.defaultServiceDay.setEnabled(default_service_enabled) self.serviceNameDay.setEnabled(default_service_enabled)
time_enabled = default_service_enabled and \ time_enabled = default_service_enabled and \
self.defaultServiceDay.currentIndex() is not 7 self.serviceNameDay.currentIndex() is not 7
self.defaultServiceTime.setEnabled(time_enabled) self.serviceNameTime.setEnabled(time_enabled)
self.defaultServiceName.setEnabled(default_service_enabled) self.serviceNameEdit.setEnabled(default_service_enabled)
self.defaultServiceRevertButton.setEnabled(default_service_enabled) self.serviceNameRevertButton.setEnabled(default_service_enabled)
def generate_service_name_example(self): def generateServiceNameExample(self):
preset_is_valid = True preset_is_valid = True
if self.defaultServiceDay.currentIndex() == 7: if self.serviceNameDay.currentIndex() == 7:
time = datetime.now() time = datetime.now()
else: else:
now = datetime.now() now = datetime.now()
day_delta = self.defaultServiceDay.currentIndex() - now.weekday() day_delta = self.serviceNameDay.currentIndex() - now.weekday()
if day_delta < 0: if day_delta < 0:
day_delta += 7 day_delta += 7
time = now + timedelta(days=day_delta) time = now + timedelta(days=day_delta)
time = time.replace(hour = self.defaultServiceTime.time().hour(), time = time.replace(hour = self.serviceNameTime.time().hour(),
minute = self.defaultServiceTime.time().minute()) minute = self.serviceNameTime.time().minute())
try: try:
service_name_example = time.strftime(unicode( service_name_example = time.strftime(unicode(
self.defaultServiceName.text())) self.serviceNameEdit.text()))
except ValueError: except ValueError:
preset_is_valid = False preset_is_valid = False
service_name_example = translate('OpenLP.AdvancedTab', service_name_example = translate('OpenLP.AdvancedTab',
@ -432,18 +430,18 @@ class AdvancedTab(SettingsTab):
return preset_is_valid, service_name_example return preset_is_valid, service_name_example
def updateServiceNameExample(self, returned_value): def updateServiceNameExample(self, returned_value):
if not self.updateDefaultServiceExample: if not self.updateserviceNameExample:
return return
name_example = self.generate_service_name_example()[1] name_example = self.generateServiceNameExample()[1]
self.defaultServiceExample.setText(name_example) self.serviceNameExample.setText(name_example)
def onDefaultServiceDayChanged(self, service_day): def onserviceNameDayChanged(self, service_day):
self.defaultServiceTime.setEnabled(service_day is not 7) self.serviceNameTime.setEnabled(service_day is not 7)
self.updateServiceNameExample(None) self.updateServiceNameExample(None)
def onDefaultServiceRevertButtonPressed(self): def onserviceNameRevertButtonPressed(self):
self.defaultServiceName.setText(self.default_service_name) self.serviceNameEdit.setText(self.defaultServiceName)
self.defaultServiceName.setFocus() self.serviceNameEdit.setFocus()
def onDefaultColorButtonPressed(self): def onDefaultColorButtonPressed(self):
new_color = QtGui.QColorDialog.getColor( new_color = QtGui.QColorDialog.getColor(

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

@ -616,15 +616,15 @@ class ServiceManager(QtGui.QWidget):
default_service_enabled = QtCore.QSettings().value( default_service_enabled = QtCore.QSettings().value(
u'advanced/default service enabled', QtCore.QVariant(True)).toBool() u'advanced/default service enabled', QtCore.QVariant(True)).toBool()
if default_service_enabled: if default_service_enabled:
service_day, ok = QtCore.QSettings().value( service_day = QtCore.QSettings().value(
u'advanced/default service day', 7).toInt() u'advanced/default service day', 7).toInt()[0]
if service_day == 7: if service_day == 7:
time = datetime.now() time = datetime.now()
else: else:
service_hour, ok = QtCore.QSettings().value( service_hour = QtCore.QSettings().value(
u'advanced/default service hour', 11).toInt() u'advanced/default service hour', 11).toInt()[0]
service_minute, ok = QtCore.QSettings().value( service_minute = QtCore.QSettings().value(
u'advanced/default service minute', 0).toInt() u'advanced/default service minute', 0).toInt()[0]
now = datetime.now() now = datetime.now()
day_delta = service_day - now.weekday() day_delta = service_day - now.weekday()
if day_delta < 0: if day_delta < 0: