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

Fix oops

Browse Source
This commit is contained in:
Ken Roberts 2016-05-15 10:32:04 -07:00
parent f51132e876
commit 07468f0093
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/common/actions.py
View File

@ -284,9 +284,9 @@ class ActionList(object):
actions.append(action) actions.append(action)
ActionList.shortcut_map[shortcuts[0]] = actions ActionList.shortcut_map[shortcuts[0]] = actions
else: else:
log.warning('Shortcut "{shortcut}" is removed from "{action}" '' log.warning('Shortcut "{shortcut}" is removed from "{action}" '
because another action already uses this shortcut.'.format(shortcut=shortcuts[0], 'because another action already uses this shortcut.'.format(shortcut=shortcuts[0],
action=action.objectName())) action=action.objectName()))
shortcuts.remove(shortcuts[0]) shortcuts.remove(shortcuts[0])
action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts]) action.setShortcuts([QtGui.QKeySequence(shortcut) for shortcut in shortcuts])

2
openlp/core/common/settings.py
View File

@ -496,7 +496,7 @@ class Settings(QtCore.QSettings):
item = settings.value('{name} {counter:d}'.format(name=plugin.name, counter=counter), '') item = settings.value('{name} {counter:d}'.format(name=plugin.name, counter=counter), '')
if item: if item:
files_list.append(item) files_list.append(item)
settings.remove('{name} {counter:d}'.format=(plugin.name, counter)) settings.remove('{name} {counter:d}'.format(name=plugin.name, counter=counter))
settings.remove('{name} count'.format(name=plugin.name)) settings.remove('{name} count'.format(name=plugin.name))
settings.endGroup() settings.endGroup()
return files_list return files_list

2
tests/functional/openlp_core_lib/test_projectordb.py
View File

@ -218,5 +218,5 @@ class TestProjectorDB(TestCase):
model.name = 'OpenLP Test' model.name = 'OpenLP Test'
# THEN: __repr__ should return a proper string # THEN: __repr__ should return a proper string
self.assertEqual(str(model), '<Model(name="OpenLP Test")>', self.assertEqual(str(model), '<Model(name='"OpenLP Test"')>',
'Model.__repr__() should have returned a proper representation string') 'Model.__repr__() should have returned a proper representation string')