forked from openlp/openlp
More cleanups
This commit is contained in:
parent
2eca9bffac
commit
c2b1dd9f2f
@ -102,7 +102,8 @@ def translate(context, text, comment=None,
|
|||||||
An identifying string for when the same text is used in different roles
|
An identifying string for when the same text is used in different roles
|
||||||
within the same context.
|
within the same context.
|
||||||
"""
|
"""
|
||||||
return QtCore.QCoreApplication.translate(context, text, comment, encoding, n)
|
return QtCore.QCoreApplication.translate(context, text, comment, encoding,
|
||||||
|
n)
|
||||||
|
|
||||||
def get_text_file_string(text_file):
|
def get_text_file_string(text_file):
|
||||||
"""
|
"""
|
||||||
|
@ -176,7 +176,8 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
# break compatability), but it makes sense for the icon to
|
# break compatability), but it makes sense for the icon to
|
||||||
# come before the tooltip (as you have to have an icon, but
|
# come before the tooltip (as you have to have an icon, but
|
||||||
# not neccesarily a tooltip)
|
# not neccesarily a tooltip)
|
||||||
return self.toolbar.addToolbarButton(title, icon, tooltip, slot, checkable)
|
return self.toolbar.addToolbarButton(title, icon, tooltip, slot,
|
||||||
|
checkable)
|
||||||
|
|
||||||
def addToolbarSeparator(self):
|
def addToolbarSeparator(self):
|
||||||
"""
|
"""
|
||||||
|
@ -28,7 +28,6 @@ import os
|
|||||||
import logging
|
import logging
|
||||||
import cPickle
|
import cPickle
|
||||||
import zipfile
|
import zipfile
|
||||||
from pprint import pformat
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -986,8 +985,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
u'expanded':expand})
|
u'expanded':expand})
|
||||||
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
self.repaintServiceList(len(self.serviceItems) + 1, 0)
|
||||||
else:
|
else:
|
||||||
self.serviceItems.insert(self.dropPosition, {u'service_item': item,
|
self.serviceItems.insert(self.dropPosition,
|
||||||
u'order': self.dropPosition,
|
{u'service_item': item, u'order': self.dropPosition,
|
||||||
u'expanded':expand})
|
u'expanded':expand})
|
||||||
self.repaintServiceList(self.dropPosition, 0)
|
self.repaintServiceList(self.dropPosition, 0)
|
||||||
# if rebuilding list make sure live is fixed.
|
# if rebuilding list make sure live is fixed.
|
||||||
|
@ -249,7 +249,8 @@ class Ui_ThemeWizard(object):
|
|||||||
self.footerSizeSpinBox.setMaximum(999)
|
self.footerSizeSpinBox.setMaximum(999)
|
||||||
self.footerSizeSpinBox.setValue(10)
|
self.footerSizeSpinBox.setValue(10)
|
||||||
self.footerSizeSpinBox.setObjectName(u'FooterSizeSpinBox')
|
self.footerSizeSpinBox.setObjectName(u'FooterSizeSpinBox')
|
||||||
self.footerAreaLayout.addRow(self.footerSizeLabel, self.footerSizeSpinBox)
|
self.footerAreaLayout.addRow(self.footerSizeLabel,
|
||||||
|
self.footerSizeSpinBox)
|
||||||
ThemeWizard.addPage(self.footerAreaPage)
|
ThemeWizard.addPage(self.footerAreaPage)
|
||||||
# Alignment Page
|
# Alignment Page
|
||||||
self.alignmentPage = QtGui.QWizardPage()
|
self.alignmentPage = QtGui.QWizardPage()
|
||||||
@ -317,9 +318,11 @@ class Ui_ThemeWizard(object):
|
|||||||
self.areaPositionLayout.addWidget(self.mainPositionGroupBox)
|
self.areaPositionLayout.addWidget(self.mainPositionGroupBox)
|
||||||
self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage)
|
self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage)
|
||||||
self.footerPositionGroupBox.setObjectName(u'FooterPositionGroupBox')
|
self.footerPositionGroupBox.setObjectName(u'FooterPositionGroupBox')
|
||||||
self.footerPositionLayout = QtGui.QFormLayout(self.footerPositionGroupBox)
|
self.footerPositionLayout = QtGui.QFormLayout(
|
||||||
|
self.footerPositionGroupBox)
|
||||||
self.footerPositionLayout.setObjectName(u'FooterPositionLayout')
|
self.footerPositionLayout.setObjectName(u'FooterPositionLayout')
|
||||||
self.footerPositionCheckBox = QtGui.QCheckBox(self.footerPositionGroupBox)
|
self.footerPositionCheckBox = QtGui.QCheckBox(i
|
||||||
|
self.footerPositionGroupBox)
|
||||||
self.footerPositionCheckBox.setObjectName(u'FooterPositionCheckBox')
|
self.footerPositionCheckBox.setObjectName(u'FooterPositionCheckBox')
|
||||||
self.footerPositionLayout.addRow(self.footerPositionCheckBox)
|
self.footerPositionLayout.addRow(self.footerPositionCheckBox)
|
||||||
self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox)
|
self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox)
|
||||||
|
@ -273,10 +273,10 @@ class BibleManager(object):
|
|||||||
Receiver.send_message(u'openlp_information_message', {
|
Receiver.send_message(u'openlp_information_message', {
|
||||||
u'title': translate('BiblesPlugin.BibleManager',
|
u'title': translate('BiblesPlugin.BibleManager',
|
||||||
'Scripture Reference Error'),
|
'Scripture Reference Error'),
|
||||||
u'message': translate('BiblesPlugin.BibleManager', 'Your scripture '
|
u'message': translate('BiblesPlugin.BibleManager',
|
||||||
'reference is either not supported by OpenLP or is invalid. '
|
'Your scripture reference is either not supported by OpenLP '
|
||||||
'Please make sure your reference conforms to one of the '
|
'or is invalid. Please make sure your reference conforms to '
|
||||||
'following patterns:\n\n'
|
'one of the following patterns:\n\n'
|
||||||
'Book Chapter\n'
|
'Book Chapter\n'
|
||||||
'Book Chapter-Chapter\n'
|
'Book Chapter-Chapter\n'
|
||||||
'Book Chapter:Verse-Verse\n'
|
'Book Chapter:Verse-Verse\n'
|
||||||
|
@ -116,7 +116,8 @@ class PresentationTab(SettingsTab):
|
|||||||
if controller.available:
|
if controller.available:
|
||||||
checkbox = self.PresenterCheckboxes[controller.name]
|
checkbox = self.PresenterCheckboxes[controller.name]
|
||||||
setting_key = self.settingsSection + u'/' + controller.name
|
setting_key = self.settingsSection + u'/' + controller.name
|
||||||
if QtCore.QSettings().value(setting_key) != checkbox.checkState():
|
if QtCore.QSettings().value(setting_key) != \
|
||||||
|
checkbox.checkState():
|
||||||
changed = True
|
changed = True
|
||||||
QtCore.QSettings().setValue(setting_key,
|
QtCore.QSettings().setValue(setting_key,
|
||||||
QtCore.QVariant(checkbox.checkState()))
|
QtCore.QVariant(checkbox.checkState()))
|
||||||
|
Loading…
Reference in New Issue
Block a user