forked from openlp/openlp
Merge differing trees and remove whitspaces
This commit is contained in:
commit
b952b2cdbc
@ -31,7 +31,6 @@ import logging
|
|||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import build_icon
|
|
||||||
from openlp.core.lib.ui import create_widget_action
|
from openlp.core.lib.ui import create_widget_action
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -1386,12 +1386,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.recentFilesMenu.clear()
|
self.recentFilesMenu.clear()
|
||||||
for fileId, filename in enumerate(recentFilesToDisplay):
|
for fileId, filename in enumerate(recentFilesToDisplay):
|
||||||
log.debug('Recent file name: %s', filename)
|
log.debug('Recent file name: %s', filename)
|
||||||
action = create_action(self, u'',
|
action = create_action(self, u'',
|
||||||
text=u'&%d %s' % (fileId + 1, os.path.splitext(os.path.basename(
|
text=u'&%d %s' % (fileId + 1, os.path.splitext(os.path.basename(
|
||||||
unicode(filename)))[0]), data=filename,
|
unicode(filename)))[0]), data=filename,
|
||||||
triggers=self.serviceManagerContents.onRecentServiceClicked)
|
triggers=self.serviceManagerContents.onRecentServiceClicked)
|
||||||
self.recentFilesMenu.addAction(action)
|
self.recentFilesMenu.addAction(action)
|
||||||
clearRecentFilesAction = create_action(self, u'',
|
clearRecentFilesAction = create_action(self, u'',
|
||||||
text=translate('OpenLP.MainWindow', 'Clear List',
|
text=translate('OpenLP.MainWindow', 'Clear List',
|
||||||
'Clear List of recent files'),
|
'Clear List of recent files'),
|
||||||
statustip=translate('OpenLP.MainWindow',
|
statustip=translate('OpenLP.MainWindow',
|
||||||
|
@ -126,7 +126,7 @@ class VLCException(Exception):
|
|||||||
try:
|
try:
|
||||||
_Ints = (int, long)
|
_Ints = (int, long)
|
||||||
except NameError: # no long in Python 3+
|
except NameError: # no long in Python 3+
|
||||||
_Ints = int
|
_Ints = int
|
||||||
|
|
||||||
# Default instance. It is used to instanciate classes directly in the
|
# Default instance. It is used to instanciate classes directly in the
|
||||||
# OO-wrapper.
|
# OO-wrapper.
|
||||||
|
@ -49,7 +49,7 @@ from openlp.core.ui.media import MediaState
|
|||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
AUDIO_EXT = [
|
AUDIO_EXT = [
|
||||||
u'*.mp3'
|
u'*.mp3'
|
||||||
, u'*.wav'
|
, u'*.wav'
|
||||||
, u'*.ogg'
|
, u'*.ogg'
|
||||||
|
@ -246,7 +246,7 @@ VIDEO_EXT = [
|
|||||||
, u'*.swf'
|
, u'*.swf'
|
||||||
]
|
]
|
||||||
|
|
||||||
AUDIO_EXT = [
|
AUDIO_EXT = [
|
||||||
u'*.mp3'
|
u'*.mp3'
|
||||||
, u'*.ogg'
|
, u'*.ogg'
|
||||||
]
|
]
|
||||||
|
@ -39,7 +39,7 @@ class ThemesTab(SettingsTab):
|
|||||||
self.mainwindow = mainwindow
|
self.mainwindow = mainwindow
|
||||||
generalTranslated = translate('OpenLP.ThemesTab', 'Themes')
|
generalTranslated = translate('OpenLP.ThemesTab', 'Themes')
|
||||||
SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
|
SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
|
||||||
self.icon_path = u':/themes/theme_new.png'
|
self.icon_path = u':/themes/theme_new.png'
|
||||||
|
|
||||||
def setupUi(self):
|
def setupUi(self):
|
||||||
self.setObjectName(u'ThemesTab')
|
self.setObjectName(u'ThemesTab')
|
||||||
|
@ -137,7 +137,7 @@ class AlertsPlugin(Plugin):
|
|||||||
text=translate('AlertsPlugin', '&Alert'),
|
text=translate('AlertsPlugin', '&Alert'),
|
||||||
icon=u':/plugins/plugin_alerts.png',
|
icon=u':/plugins/plugin_alerts.png',
|
||||||
statustip=translate('AlertsPlugin', 'Show an alert message.'),
|
statustip=translate('AlertsPlugin', 'Show an alert message.'),
|
||||||
visible=False, shortcuts=u'F7', triggers=self.onAlertsTrigger)
|
visible=False, shortcuts=[u'F7'], triggers=self.onAlertsTrigger)
|
||||||
self.serviceManager.mainwindow.toolsMenu.addAction(self.toolsAlertItem)
|
self.serviceManager.mainwindow.toolsMenu.addAction(self.toolsAlertItem)
|
||||||
|
|
||||||
def initialise(self):
|
def initialise(self):
|
||||||
|
@ -89,7 +89,7 @@ def update_reference_separators():
|
|||||||
while u'||' in source_string:
|
while u'||' in source_string:
|
||||||
source_string = source_string.replace(u'||', u'|')
|
source_string = source_string.replace(u'||', u'|')
|
||||||
if role != u'e':
|
if role != u'e':
|
||||||
REFERENCE_SEPARATORS[u'sep_%s_display' % role] = \
|
REFERENCE_SEPARATORS[u'sep_%s_display' % role] = \
|
||||||
source_string.split(u'|')[0]
|
source_string.split(u'|')[0]
|
||||||
# escape reserved characters
|
# escape reserved characters
|
||||||
for character in u'\\.^$*+?{}[]()':
|
for character in u'\\.^$*+?{}[]()':
|
||||||
|
@ -238,7 +238,7 @@ class OpenSongImport(SongImport):
|
|||||||
verse_tag = match.group(1)
|
verse_tag = match.group(1)
|
||||||
verse_num = match.group(2)
|
verse_num = match.group(2)
|
||||||
if not len(verse_tag):
|
if not len(verse_tag):
|
||||||
verse_tag = VerseType.Tags[VerseType.Verse]
|
verse_tag = VerseType.Tags[VerseType.Verse]
|
||||||
else:
|
else:
|
||||||
# Assume it's no.1 if there are no digits
|
# Assume it's no.1 if there are no digits
|
||||||
verse_tag = verse_def
|
verse_tag = verse_def
|
||||||
|
Loading…
Reference in New Issue
Block a user