mirror of
https://gitlab.com/openlp/openlp.git
synced 2024-09-28 10:57:36 +00:00
Whitespace
This commit is contained in:
parent
e29f3d30c0
commit
871640c374
@ -230,7 +230,8 @@ class ThemeXML(object):
|
||||
#Create indentation name element
|
||||
self.child_element(background, u'indentation', unicode(indentation))
|
||||
#Create indentation name element
|
||||
self.child_element(background, u'line_adjustment', unicode(line_adjustment))
|
||||
self.child_element(
|
||||
background, u'line_adjustment', unicode(line_adjustment))
|
||||
|
||||
#Create Location element
|
||||
element = self.theme_xml.createElement(u'location')
|
||||
|
@ -222,8 +222,8 @@ class DisplayTab(SettingsTab):
|
||||
self.postSetUp()
|
||||
|
||||
def postSetUp(self):
|
||||
self.screens.override[u'size'] = QtCore.QRect(int(self.XposEdit.text()),\
|
||||
int(self.YposEdit.text()), int(self.WidthEdit.text()),\
|
||||
self.screens.override[u'size'] = QtCore.QRect(int(self.XposEdit.text()),
|
||||
int(self.YposEdit.text()), int(self.WidthEdit.text()),
|
||||
int(self.HeightEdit.text()))
|
||||
if self.amend_display:
|
||||
self.screens.set_override_display()
|
||||
@ -233,3 +233,4 @@ class DisplayTab(SettingsTab):
|
||||
if self.amend_display_start != self.amend_display:
|
||||
self.amend_display_start = self.amend_display
|
||||
Receiver.send_message(u'config_screen_changed')
|
||||
|
||||
|
@ -352,11 +352,13 @@ class Ui_MainWindow(object):
|
||||
translate('MainWindow', 'Theme Manager'))
|
||||
self.FileNewItem.setText(translate('MainWindow', '&New'))
|
||||
self.FileNewItem.setToolTip(translate('MainWindow', 'New Service'))
|
||||
self.FileNewItem.setStatusTip(translate('MainWindow', 'Create a new Service'))
|
||||
self.FileNewItem.setStatusTip(
|
||||
translate('MainWindow', 'Create a new Service'))
|
||||
self.FileNewItem.setShortcut(translate('MainWindow', 'Ctrl+N'))
|
||||
self.FileOpenItem.setText(translate('MainWindow', '&Open'))
|
||||
self.FileOpenItem.setToolTip(translate('MainWindow', 'Open Service'))
|
||||
self.FileOpenItem.setStatusTip(translate('MainWindow', 'Open an existing service'))
|
||||
self.FileOpenItem.setStatusTip(
|
||||
translate('MainWindow', 'Open an existing service'))
|
||||
self.FileOpenItem.setShortcut(translate('MainWindow', 'Ctrl+O'))
|
||||
self.FileSaveItem.setText(translate('MainWindow', '&Save'))
|
||||
self.FileSaveItem.setToolTip(translate('MainWindow', 'Save Service'))
|
||||
@ -364,9 +366,10 @@ class Ui_MainWindow(object):
|
||||
translate('MainWindow', 'Save the current service to disk'))
|
||||
self.FileSaveItem.setShortcut(translate('MainWindow', 'Ctrl+S'))
|
||||
self.FileSaveAsItem.setText(translate('MainWindow', 'Save &As...'))
|
||||
self.FileSaveAsItem.setToolTip(translate('MainWindow', 'Save Service As'))
|
||||
self.FileSaveAsItem.setStatusTip(
|
||||
translate('MainWindow', 'Save the current service under a new name'))
|
||||
self.FileSaveAsItem.setToolTip(
|
||||
translate('MainWindow', 'Save Service As'))
|
||||
self.FileSaveAsItem.setStatusTip(translate('MainWindow',
|
||||
'Save the current service under a new name'))
|
||||
self.FileSaveAsItem.setShortcut(translate('MainWindow', 'F12'))
|
||||
self.FileExitItem.setText(translate('MainWindow', 'E&xit'))
|
||||
self.FileExitItem.setStatusTip(translate('MainWindow', 'Quit OpenLP'))
|
||||
@ -377,34 +380,40 @@ class Ui_MainWindow(object):
|
||||
self.ExportLanguageItem.setText(translate('MainWindow', '&Language'))
|
||||
self.actionLook_Feel.setText(translate('MainWindow', 'Look && &Feel'))
|
||||
self.OptionsSettingsItem.setText(translate('MainWindow', '&Settings'))
|
||||
self.ViewMediaManagerItem.setText(translate('MainWindow', '&Media Manager'))
|
||||
self.ViewMediaManagerItem.setText(
|
||||
translate('MainWindow', '&Media Manager'))
|
||||
self.ViewMediaManagerItem.setToolTip(
|
||||
translate('MainWindow', 'Toggle Media Manager'))
|
||||
self.ViewMediaManagerItem.setStatusTip(
|
||||
translate('MainWindow', 'Toggle the visibility of the Media Manager'))
|
||||
self.ViewMediaManagerItem.setStatusTip(translate('MainWindow',
|
||||
'Toggle the visibility of the Media Manager'))
|
||||
self.ViewMediaManagerItem.setShortcut(translate('MainWindow', 'F8'))
|
||||
self.ViewThemeManagerItem.setText(translate('MainWindow', '&Theme Manager'))
|
||||
self.ViewThemeManagerItem.setText(
|
||||
translate('MainWindow', '&Theme Manager'))
|
||||
self.ViewThemeManagerItem.setToolTip(
|
||||
translate('MainWindow', 'Toggle Theme Manager'))
|
||||
self.ViewThemeManagerItem.setStatusTip(
|
||||
translate('MainWindow', 'Toggle the visibility of the Theme Manager'))
|
||||
self.ViewThemeManagerItem.setStatusTip(translate('MainWindow',
|
||||
'Toggle the visibility of the Theme Manager'))
|
||||
self.ViewThemeManagerItem.setShortcut(translate('MainWindow', 'F10'))
|
||||
self.ViewServiceManagerItem.setText(translate('MainWindow', '&Service Manager'))
|
||||
self.ViewServiceManagerItem.setText(
|
||||
translate('MainWindow', '&Service Manager'))
|
||||
self.ViewServiceManagerItem.setToolTip(
|
||||
translate('MainWindow', 'Toggle Service Manager'))
|
||||
self.ViewServiceManagerItem.setStatusTip(
|
||||
translate('MainWindow', 'Toggle the visibility of the Service Manager'))
|
||||
self.ViewServiceManagerItem.setStatusTip(translate('MainWindow',
|
||||
'Toggle the visibility of the Service Manager'))
|
||||
self.ViewServiceManagerItem.setShortcut(translate('MainWindow', 'F9'))
|
||||
self.action_Preview_Panel.setText(translate('MainWindow', '&Preview Panel'))
|
||||
self.action_Preview_Panel.setText(
|
||||
translate('MainWindow', '&Preview Panel'))
|
||||
self.action_Preview_Panel.setToolTip(
|
||||
translate('MainWindow', 'Toggle Preview Panel'))
|
||||
self.action_Preview_Panel.setStatusTip(
|
||||
translate('MainWindow', 'Toggle the visibility of the Preview Panel'))
|
||||
self.action_Preview_Panel.setStatusTip(translate('MainWindow',
|
||||
'Toggle the visibility of the Preview Panel'))
|
||||
self.action_Preview_Panel.setShortcut(translate('MainWindow', 'F11'))
|
||||
self.PluginItem.setText(translate('MainWindow', '&Plugin List'))
|
||||
self.PluginItem.setStatusTip(translate('MainWindow', 'List the Plugins'))
|
||||
self.PluginItem.setStatusTip(
|
||||
translate('MainWindow', 'List the Plugins'))
|
||||
self.PluginItem.setShortcut(translate('MainWindow', 'Alt+F7'))
|
||||
self.HelpDocumentationItem.setText(translate('MainWindow', '&User Guide'))
|
||||
self.HelpDocumentationItem.setText(
|
||||
translate('MainWindow', '&User Guide'))
|
||||
self.HelpAboutItem.setText(translate('MainWindow', '&About'))
|
||||
self.HelpAboutItem.setStatusTip(
|
||||
translate('MainWindow', 'More information about OpenLP'))
|
||||
@ -417,12 +426,13 @@ class Ui_MainWindow(object):
|
||||
translate('MainWindow', 'Choose System language, if available'))
|
||||
for item in self.LanguageGroup.actions():
|
||||
item.setText(item.objectName())
|
||||
item.setStatusTip(
|
||||
translate('MainWindow', 'Set the interface language to %1').arg(item.objectName()))
|
||||
item.setStatusTip(translate('MainWindow',
|
||||
'Set the interface language to %1').arg(item.objectName()))
|
||||
self.ToolsAddToolItem.setText(translate('MainWindow', 'Add &Tool...'))
|
||||
self.ToolsAddToolItem.setStatusTip(
|
||||
translate('MainWindow', 'Add an application to the list of tools'))
|
||||
self.action_Preview_Panel.setText(translate('MainWindow', '&Preview Pane'))
|
||||
self.action_Preview_Panel.setText(
|
||||
translate('MainWindow', '&Preview Pane'))
|
||||
self.ModeLiveItem.setText(translate('MainWindow', '&Live'))
|
||||
|
||||
|
||||
|
@ -67,7 +67,7 @@ class AlertsManager(QtCore.QObject):
|
||||
- self.alertHeight
|
||||
self.alertHeight = self.screen[u'size'].height() \
|
||||
- self.alertScreenPosition
|
||||
self.parent.maindisplay.setAlertSize(self.alertScreenPosition,\
|
||||
self.parent.maindisplay.setAlertSize(self.alertScreenPosition,
|
||||
self.alertHeight)
|
||||
|
||||
def onAlertText(self, message):
|
||||
|
@ -277,7 +277,7 @@ class Ui_BibleImportWizard(object):
|
||||
self.CopyrightEdit)
|
||||
self.PermissionLabel = QtGui.QLabel(self.LicenseDetailsPage)
|
||||
self.PermissionLabel.setObjectName(u'PermissionLabel')
|
||||
self.LicenseDetailsLayout.setWidget(2, QtGui.QFormLayout.LabelRole,\
|
||||
self.LicenseDetailsLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
|
||||
self.PermissionLabel)
|
||||
self.PermissionEdit = QtGui.QLineEdit(self.LicenseDetailsPage)
|
||||
self.PermissionEdit.setObjectName(u'PermissionEdit')
|
||||
|
@ -93,11 +93,9 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
||||
del_func(item.id)
|
||||
reset_func()
|
||||
else:
|
||||
QtGui.QMessageBox.critical(self, dlg_title, err_text,
|
||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
|
||||
QtGui.QMessageBox.critical(self, dlg_title, err_text)
|
||||
else:
|
||||
QtGui.QMessageBox.critical(self, dlg_title, sel_text,
|
||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
|
||||
QtGui.QMessageBox.critical(self, dlg_title, sel_text)
|
||||
|
||||
def resetAuthors(self):
|
||||
self.AuthorsListWidget.clear()
|
||||
@ -197,8 +195,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
||||
else:
|
||||
QtGui.QMessageBox.critical(
|
||||
self, self.trUtf8('Error'),
|
||||
self.trUtf8('Couldn\'t save your topic.'),
|
||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
|
||||
self.trUtf8('Couldn\'t save your topic.'))
|
||||
|
||||
def onBookEditButtonClick(self):
|
||||
book_id = self._getCurrentItemId(self.BooksListWidget)
|
||||
@ -208,14 +205,14 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
||||
self.bookform.PublisherEdit.setText(book.publisher)
|
||||
if self.bookform.exec_(False):
|
||||
book.name = unicode(self.bookform.NameEdit.text(), u'utf-8')
|
||||
book.publisher = unicode(self.bookform.PublisherEdit.text(), u'utf-8')
|
||||
book.publisher = unicode(
|
||||
self.bookform.PublisherEdit.text(), u'utf-8')
|
||||
if self.songmanager.save_book(book):
|
||||
self.resetBooks()
|
||||
else:
|
||||
QtGui.QMessageBox.critical(
|
||||
self, self.trUtf8('Error'),
|
||||
self.trUtf8('Couldn\'t save your book.'),
|
||||
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
|
||||
self.trUtf8('Couldn\'t save your book.'))
|
||||
|
||||
def onAuthorDeleteButtonClick(self):
|
||||
"""
|
||||
|
@ -332,105 +332,205 @@ class SofImport(OooImport):
|
||||
Because someone at Kingsway forgot to check the 1+2 RTF file,
|
||||
some verses were not formatted correctly.
|
||||
"""
|
||||
if song_number == 11: return 8
|
||||
if song_number == 18: return 5
|
||||
if song_number == 21: return 6
|
||||
if song_number == 23: return 4
|
||||
if song_number == 24: return 7
|
||||
if song_number == 27: return 4
|
||||
if song_number == 31: return 6
|
||||
if song_number == 49: return 4
|
||||
if song_number == 50: return 8
|
||||
if song_number == 70: return 4
|
||||
if song_number == 75: return 8
|
||||
if song_number == 79: return 6
|
||||
if song_number == 97: return 7
|
||||
if song_number == 107: return 4
|
||||
if song_number == 109: return 4
|
||||
if song_number == 133: return 4
|
||||
if song_number == 155: return 10
|
||||
if song_number == 156: return 8
|
||||
if song_number == 171: return 4
|
||||
if song_number == 188: return 7
|
||||
if song_number == 192: return 4
|
||||
if song_number == 208: return 8
|
||||
if song_number == 215: return 8
|
||||
if song_number == 220: return 4
|
||||
if song_number == 247: return 6
|
||||
if song_number == 248: return 6
|
||||
if song_number == 251: return 8
|
||||
if song_number == 295: return 8
|
||||
if song_number == 307: return 5
|
||||
if song_number == 314: return 6
|
||||
if song_number == 325: return 8
|
||||
if song_number == 386: return 6
|
||||
if song_number == 415: return 4
|
||||
if song_number == 426: return 4
|
||||
if song_number == 434: return 5
|
||||
if song_number == 437: return 4
|
||||
if song_number == 438: return 6
|
||||
if song_number == 456: return 8
|
||||
if song_number == 461: return 4
|
||||
if song_number == 469: return 4
|
||||
if song_number == 470: return 5
|
||||
if song_number == 476: return 6
|
||||
if song_number == 477: return 7
|
||||
if song_number == 480: return 8
|
||||
if song_number == 482: return 4
|
||||
if song_number == 512: return 4
|
||||
if song_number == 513: return 8
|
||||
if song_number == 518: return 5
|
||||
if song_number == 520: return 4
|
||||
if song_number == 523: return 6
|
||||
if song_number == 526: return 8
|
||||
if song_number == 527: return 4
|
||||
if song_number == 529: return 4
|
||||
if song_number == 537: return 4
|
||||
if song_number == 555: return 6
|
||||
if song_number == 581: return 4
|
||||
if song_number == 589: return 6
|
||||
if song_number == 590: return 4
|
||||
if song_number == 593: return 8
|
||||
if song_number == 596: return 4
|
||||
if song_number == 610: return 6
|
||||
if song_number == 611: return 6
|
||||
if song_number == 619: return 8
|
||||
if song_number == 645: return 5
|
||||
if song_number == 653: return 6
|
||||
if song_number == 683: return 7
|
||||
if song_number == 686: return 4
|
||||
if song_number == 697: return 8
|
||||
if song_number == 698: return 4
|
||||
if song_number == 704: return 6
|
||||
if song_number == 716: return 4
|
||||
if song_number == 717: return 6
|
||||
if song_number == 730: return 4
|
||||
if song_number == 731: return 8
|
||||
if song_number == 732: return 8
|
||||
if song_number == 738: return 4
|
||||
if song_number == 756: return 9
|
||||
if song_number == 815: return 6
|
||||
if song_number == 830: return 8
|
||||
if song_number == 831: return 4
|
||||
if song_number == 876: return 6
|
||||
if song_number == 877: return 6
|
||||
if song_number == 892: return 4
|
||||
if song_number == 894: return 6
|
||||
if song_number == 902: return 8
|
||||
if song_number == 905: return 8
|
||||
if song_number == 921: return 6
|
||||
if song_number == 940: return 7
|
||||
if song_number == 955: return 9
|
||||
if song_number == 968: return 8
|
||||
if song_number == 972: return 7
|
||||
if song_number == 974: return 4
|
||||
if song_number == 988: return 6
|
||||
if song_number == 991: return 5
|
||||
if song_number == 1002: return 8
|
||||
if song_number == 1024: return 8
|
||||
if song_number == 1044: return 9
|
||||
if song_number == 1088: return 6
|
||||
if song_number == 1117: return 6
|
||||
if song_number == 1119: return 7
|
||||
if song_number == 11:
|
||||
return 8
|
||||
if song_number == 18:
|
||||
return 5
|
||||
if song_number == 21:
|
||||
return 6
|
||||
if song_number == 23:
|
||||
return 4
|
||||
if song_number == 24:
|
||||
return 7
|
||||
if song_number == 27:
|
||||
return 4
|
||||
if song_number == 31:
|
||||
return 6
|
||||
if song_number == 49:
|
||||
return 4
|
||||
if song_number == 50:
|
||||
return 8
|
||||
if song_number == 70:
|
||||
return 4
|
||||
if song_number == 75:
|
||||
return 8
|
||||
if song_number == 79:
|
||||
return 6
|
||||
if song_number == 97:
|
||||
return 7
|
||||
if song_number == 107:
|
||||
return 4
|
||||
if song_number == 109:
|
||||
return 4
|
||||
if song_number == 133:
|
||||
return 4
|
||||
if song_number == 155:
|
||||
return 10
|
||||
if song_number == 156:
|
||||
return 8
|
||||
if song_number == 171:
|
||||
return 4
|
||||
if song_number == 188:
|
||||
return 7
|
||||
if song_number == 192:
|
||||
return 4
|
||||
if song_number == 208:
|
||||
return 8
|
||||
if song_number == 215:
|
||||
return 8
|
||||
if song_number == 220:
|
||||
return 4
|
||||
if song_number == 247:
|
||||
return 6
|
||||
if song_number == 248:
|
||||
return 6
|
||||
if song_number == 251:
|
||||
return 8
|
||||
if song_number == 295:
|
||||
return 8
|
||||
if song_number == 307:
|
||||
return 5
|
||||
if song_number == 314:
|
||||
return 6
|
||||
if song_number == 325:
|
||||
return 8
|
||||
if song_number == 386:
|
||||
return 6
|
||||
if song_number == 415:
|
||||
return 4
|
||||
if song_number == 426:
|
||||
return 4
|
||||
if song_number == 434:
|
||||
return 5
|
||||
if song_number == 437:
|
||||
return 4
|
||||
if song_number == 438:
|
||||
return 6
|
||||
if song_number == 456:
|
||||
return 8
|
||||
if song_number == 461:
|
||||
return 4
|
||||
if song_number == 469:
|
||||
return 4
|
||||
if song_number == 470:
|
||||
return 5
|
||||
if song_number == 476:
|
||||
return 6
|
||||
if song_number == 477:
|
||||
return 7
|
||||
if song_number == 480:
|
||||
return 8
|
||||
if song_number == 482:
|
||||
return 4
|
||||
if song_number == 512:
|
||||
return 4
|
||||
if song_number == 513:
|
||||
return 8
|
||||
if song_number == 518:
|
||||
return 5
|
||||
if song_number == 520:
|
||||
return 4
|
||||
if song_number == 523:
|
||||
return 6
|
||||
if song_number == 526:
|
||||
return 8
|
||||
if song_number == 527:
|
||||
return 4
|
||||
if song_number == 529:
|
||||
return 4
|
||||
if song_number == 537:
|
||||
return 4
|
||||
if song_number == 555:
|
||||
return 6
|
||||
if song_number == 581:
|
||||
return 4
|
||||
if song_number == 589:
|
||||
return 6
|
||||
if song_number == 590:
|
||||
return 4
|
||||
if song_number == 593:
|
||||
return 8
|
||||
if song_number == 596:
|
||||
return 4
|
||||
if song_number == 610:
|
||||
return 6
|
||||
if song_number == 611:
|
||||
return 6
|
||||
if song_number == 619:
|
||||
return 8
|
||||
if song_number == 645:
|
||||
return 5
|
||||
if song_number == 653:
|
||||
return 6
|
||||
if song_number == 683:
|
||||
return 7
|
||||
if song_number == 686:
|
||||
return 4
|
||||
if song_number == 697:
|
||||
return 8
|
||||
if song_number == 698:
|
||||
return 4
|
||||
if song_number == 704:
|
||||
return 6
|
||||
if song_number == 716:
|
||||
return 4
|
||||
if song_number == 717:
|
||||
return 6
|
||||
if song_number == 730:
|
||||
return 4
|
||||
if song_number == 731:
|
||||
return 8
|
||||
if song_number == 732:
|
||||
return 8
|
||||
if song_number == 738:
|
||||
return 4
|
||||
if song_number == 756:
|
||||
return 9
|
||||
if song_number == 815:
|
||||
return 6
|
||||
if song_number == 830:
|
||||
return 8
|
||||
if song_number == 831:
|
||||
return 4
|
||||
if song_number == 876:
|
||||
return 6
|
||||
if song_number == 877:
|
||||
return 6
|
||||
if song_number == 892:
|
||||
return 4
|
||||
if song_number == 894:
|
||||
return 6
|
||||
if song_number == 902:
|
||||
return 8
|
||||
if song_number == 905:
|
||||
return 8
|
||||
if song_number == 921:
|
||||
return 6
|
||||
if song_number == 940:
|
||||
return 7
|
||||
if song_number == 955:
|
||||
return 9
|
||||
if song_number == 968:
|
||||
return 8
|
||||
if song_number == 972:
|
||||
return 7
|
||||
if song_number == 974:
|
||||
return 4
|
||||
if song_number == 988:
|
||||
return 6
|
||||
if song_number == 991:
|
||||
return 5
|
||||
if song_number == 1002:
|
||||
return 8
|
||||
if song_number == 1024:
|
||||
return 8
|
||||
if song_number == 1044:
|
||||
return 9
|
||||
if song_number == 1088:
|
||||
return 6
|
||||
if song_number == 1117:
|
||||
return 6
|
||||
if song_number == 1119:
|
||||
return 7
|
||||
return None
|
||||
|
||||
|
@ -122,8 +122,9 @@ class SongImport(object):
|
||||
or text.lower().find(self.copyright_symbol) >= 0:
|
||||
copyright_found = False
|
||||
for line in lines:
|
||||
if copyright_found or line.lower().find(self.copyright_string) >= 0\
|
||||
or line.lower().find(self.copyright_symbol) >= 0:
|
||||
if (copyright_found or
|
||||
line.lower().find(self.copyright_string) >= 0 or
|
||||
line.lower().find(self.copyright_symbol) >= 0):
|
||||
copyright_found = True
|
||||
self.add_copyright(line)
|
||||
else:
|
||||
|
@ -35,10 +35,11 @@ from songusagedetaildialog import Ui_SongUsageDetailDialog
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
|
||||
log.info(u'SongUsage Detail Form loaded')
|
||||
"""
|
||||
Class documentation goes here.
|
||||
"""
|
||||
log.info(u'SongUsage Detail Form Loaded')
|
||||
|
||||
def __init__(self, parent=None):
|
||||
"""
|
||||
Constructor
|
||||
|
Loading…
Reference in New Issue
Block a user