forked from openlp/openlp
r1161
This commit is contained in:
commit
503ff9f259
@ -23,7 +23,7 @@
|
|||||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
import logging
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
@ -59,6 +59,8 @@ from openlp.core.lib.mailto import mailto
|
|||||||
|
|
||||||
from exceptiondialog import Ui_ExceptionDialog
|
from exceptiondialog import Ui_ExceptionDialog
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
||||||
"""
|
"""
|
||||||
The exception dialog
|
The exception dialog
|
||||||
@ -103,7 +105,8 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
filename = QtGui.QFileDialog.getSaveFileName(self,
|
filename = QtGui.QFileDialog.getSaveFileName(self,
|
||||||
translate('OpenLP.ExceptionForm', 'Save Crash Report'),
|
translate('OpenLP.ExceptionForm', 'Save Crash Report'),
|
||||||
SettingsManager.get_last_dir(self.settingsSection),
|
SettingsManager.get_last_dir(self.settingsSection),
|
||||||
translate('OpenLP.ExceptionForm', 'Text files (*.txt *.log *.text)'))
|
translate('OpenLP.ExceptionForm',
|
||||||
|
'Text files (*.txt *.log *.text)'))
|
||||||
if filename:
|
if filename:
|
||||||
filename = unicode(QtCore.QDir.toNativeSeparators(filename))
|
filename = unicode(QtCore.QDir.toNativeSeparators(filename))
|
||||||
SettingsManager.set_last_dir(self.settingsSection, os.path.dirname(
|
SettingsManager.set_last_dir(self.settingsSection, os.path.dirname(
|
||||||
@ -140,4 +143,5 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
|
|||||||
if u':' in line:
|
if u':' in line:
|
||||||
exception = line.split(u'\n')[-1].split(u':')[0]
|
exception = line.split(u'\n')[-1].split(u':')[0]
|
||||||
subject = u'Bug report: %s in %s' % (exception, source)
|
subject = u'Bug report: %s in %s' % (exception, source)
|
||||||
mailto(address=u'bugs@openlp.org', subject=subject, body=body % content)
|
mailto(address=u'bugs@openlp.org', subject=subject,
|
||||||
|
body=body % content)
|
||||||
|
@ -332,7 +332,8 @@ class SlideController(QtGui.QWidget):
|
|||||||
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
|
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
|
||||||
if not self.isLive:
|
if not self.isLive:
|
||||||
QtCore.QObject.connect(self.PreviewListWidget,
|
QtCore.QObject.connect(self.PreviewListWidget,
|
||||||
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onGoLiveClick)
|
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
|
||||||
|
self.onGoLiveClick)
|
||||||
if isLive:
|
if isLive:
|
||||||
QtCore.QObject.connect(Receiver.get_receiver(),
|
QtCore.QObject.connect(Receiver.get_receiver(),
|
||||||
QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
|
QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
|
||||||
|
@ -555,7 +555,8 @@ class Ui_ThemeWizard(object):
|
|||||||
u'footerDefaultPositionCheckBox')
|
u'footerDefaultPositionCheckBox')
|
||||||
self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
|
self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
|
||||||
self.footerDefaultPositionCheckBox)
|
self.footerDefaultPositionCheckBox)
|
||||||
self.areaPositionLayout.addWidget(self.footerPositionGroupBox, 1, 1, 1, 1)
|
self.areaPositionLayout.addWidget(
|
||||||
|
self.footerPositionGroupBox, 1, 1, 1, 1)
|
||||||
ThemeWizard.addPage(self.areaPositionPage)
|
ThemeWizard.addPage(self.areaPositionPage)
|
||||||
self.previewPage = QtGui.QWizardPage()
|
self.previewPage = QtGui.QWizardPage()
|
||||||
self.previewPage.setObjectName(u'previewPage')
|
self.previewPage.setObjectName(u'previewPage')
|
||||||
@ -733,18 +734,24 @@ class Ui_ThemeWizard(object):
|
|||||||
self.mainWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.mainWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.mainWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
|
self.mainWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
|
||||||
self.mainHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.mainHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.mainHeightLabel.setText(translate('OpenLP.ThemeWizard', 'Height:'))
|
self.mainHeightLabel.setText(
|
||||||
|
translate('OpenLP.ThemeWizard', 'Height:'))
|
||||||
self.footerPositionGroupBox.setTitle(
|
self.footerPositionGroupBox.setTitle(
|
||||||
translate('OpenLP.ThemeWizard', 'Footer Area'))
|
translate('OpenLP.ThemeWizard', 'Footer Area'))
|
||||||
self.footerXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:'))
|
self.footerXLabel.setText(
|
||||||
|
translate('OpenLP.ThemeWizard', 'X position:'))
|
||||||
self.footerXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.footerXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerYLabel.setText(translate('OpenLP.ThemeWizard', 'Y position:'))
|
self.footerYLabel.setText(
|
||||||
|
translate('OpenLP.ThemeWizard', 'Y position:'))
|
||||||
self.footerYSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.footerYSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerWidthLabel.setText(translate('OpenLP.ThemeWizard', 'Width:'))
|
self.footerWidthLabel.setText(
|
||||||
self.footerWidthSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
translate('OpenLP.ThemeWizard', 'Width:'))
|
||||||
|
self.footerWidthSpinBox.setSuffix(
|
||||||
|
translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerHeightLabel.setText(
|
self.footerHeightLabel.setText(
|
||||||
translate('OpenLP.ThemeWizard', 'Height:'))
|
translate('OpenLP.ThemeWizard', 'Height:'))
|
||||||
self.footerHeightSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
|
self.footerHeightSpinBox.setSuffix(
|
||||||
|
translate('OpenLP.ThemeWizard', 'px'))
|
||||||
self.footerDefaultPositionCheckBox.setText(
|
self.footerDefaultPositionCheckBox.setText(
|
||||||
translate('OpenLP.ThemeWizard', 'Use default location'))
|
translate('OpenLP.ThemeWizard', 'Use default location'))
|
||||||
self.previewPage.setTitle(
|
self.previewPage.setTitle(
|
||||||
|
@ -171,11 +171,10 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
# We found '<>' in the alert text, but the ParameterEdit field is
|
# We found '<>' in the alert text, but the ParameterEdit field is
|
||||||
# empty.
|
# empty.
|
||||||
if text.find(u'<>') != -1 and not self.ParameterEdit.text() and \
|
if text.find(u'<>') != -1 and not self.ParameterEdit.text() and \
|
||||||
QtGui.QMessageBox.question(self, translate(
|
QtGui.QMessageBox.question(self,
|
||||||
'AlertPlugin.AlertForm', 'No Parameter found'),
|
translate('AlertPlugin.AlertForm', 'No Parameter found'),
|
||||||
translate('AlertPlugin.AlertForm', 'You have not entered a '
|
translate('AlertPlugin.AlertForm', 'You have not entered a '
|
||||||
'parameter to be replaced.\nDo you want to continue '
|
'parameter to be replaced.\nDo you want to continue anyway?'),
|
||||||
'anyway?'),
|
|
||||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
||||||
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
|
QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
|
||||||
self.ParameterEdit.setFocus()
|
self.ParameterEdit.setFocus()
|
||||||
@ -183,8 +182,8 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
|
|||||||
# The ParameterEdit field is not empty, but we have not found '<>'
|
# The ParameterEdit field is not empty, but we have not found '<>'
|
||||||
# in the alert text.
|
# in the alert text.
|
||||||
elif text.find(u'<>') == -1 and self.ParameterEdit.text() and \
|
elif text.find(u'<>') == -1 and self.ParameterEdit.text() and \
|
||||||
QtGui.QMessageBox.question(self, translate(
|
QtGui.QMessageBox.question(self,
|
||||||
'AlertPlugin.AlertForm', 'No Placeholder found'),
|
translate('AlertPlugin.AlertForm', 'No Placeholder found'),
|
||||||
translate('AlertPlugin.AlertForm', 'The alert text does not'
|
translate('AlertPlugin.AlertForm', 'The alert text does not'
|
||||||
' contain \'<>\'.\nDo want to continue anyway?'),
|
' contain \'<>\'.\nDo want to continue anyway?'),
|
||||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
|
||||||
|
@ -71,7 +71,8 @@ class VerseType(object):
|
|||||||
The string to return a VerseType for
|
The string to return a VerseType for
|
||||||
"""
|
"""
|
||||||
verse_type = verse_type.lower()
|
verse_type = verse_type.lower()
|
||||||
if verse_type == unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
|
if verse_type == \
|
||||||
|
unicode(VerseType.to_string(VerseType.Verse)).lower()[0]:
|
||||||
return translate('SongsPlugin.VerseType', 'Verse')
|
return translate('SongsPlugin.VerseType', 'Verse')
|
||||||
elif verse_type == \
|
elif verse_type == \
|
||||||
unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]:
|
unicode(VerseType.to_string(VerseType.Chorus)).lower()[0]:
|
||||||
|
Loading…
Reference in New Issue
Block a user