forked from openlp/openlp
- shortcuts only for live controller
- removed v shortcut
This commit is contained in:
Andreas Preikschat
parent
cc186aff9d
commit
a42940b6bb
|
|
@ -322,129 +322,110 @@ class SlideController(QtGui.QWidget):
|
||||||
self.slideLayout.insertWidget(0, self.slidePreview)
|
self.slideLayout.insertWidget(0, self.slidePreview)
|
||||||
self.grid.addLayout(self.slideLayout, 0, 0, 1, 1)
|
self.grid.addLayout(self.slideLayout, 0, 0, 1, 1)
|
||||||
if self.isLive:
|
if self.isLive:
|
||||||
category = UiStrings().LiveToolbar
|
self.verseShortcut1 = shortcut_action(self, u'verseShortcut1',
|
||||||
else:
|
[QtGui.QKeySequence(u'1')], self.slideShortcutActivated,
|
||||||
category = UiStrings().PreviewToolbar
|
category=UiStrings().LiveToolbar,
|
||||||
self.verseShortcut1 = shortcut_action(
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self, u'verseShortcut1%s' % self.typePrefix.capitalize(),
|
self.verseShortcut1.setText(translate(
|
||||||
[QtGui.QKeySequence(u'V'), QtGui.QKeySequence(u'1')],
|
'OpenLP.SlideController', 'Go to "1. Verse"'))
|
||||||
self.slideShortcutActivated, category=category,
|
self.verseShortcut2 = shortcut_action(self, u'verseShortcut2',
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
[QtGui.QKeySequence(u'2')], self.slideShortcutActivated,
|
||||||
self.verseShortcut1.setText(translate(
|
category=UiStrings().LiveToolbar,
|
||||||
'OpenLP.SlideController', 'Go to "1. Verse"'))
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self.verseShortcut2 = shortcut_action(
|
self.verseShortcut2.setText(translate(
|
||||||
self, u'verseShortcut2%s' % self.typePrefix.capitalize(),
|
'OpenLP.SlideController', 'Go to "2. Verse"'))
|
||||||
[QtGui.QKeySequence(u'2')], self.slideShortcutActivated,
|
self.verseShortcut3 = shortcut_action(self, u'verseShortcut3',
|
||||||
category=category,
|
[QtGui.QKeySequence(u'3')], self.slideShortcutActivated,
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
category=UiStrings().LiveToolbar,
|
||||||
self.verseShortcut2.setText(translate(
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
'OpenLP.SlideController', 'Go to "2. Verse"'))
|
self.verseShortcut3.setText(translate(
|
||||||
self.verseShortcut3 = shortcut_action(
|
'OpenLP.SlideController', 'Go to "3. Verse"'))
|
||||||
self, u'verseShortcut3%s' % self.typePrefix.capitalize(),
|
self.verseShortcut4 = shortcut_action(self, u'verseShortcut4',
|
||||||
[QtGui.QKeySequence(u'3')], self.slideShortcutActivated,
|
[QtGui.QKeySequence(u'4')], self.slideShortcutActivated,
|
||||||
category=category,
|
category=UiStrings().LiveToolbar,
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self.verseShortcut3.setText(translate(
|
self.verseShortcut4.setText(translate(
|
||||||
'OpenLP.SlideController', 'Go to "3. Verse"'))
|
'OpenLP.SlideController', 'Go to "4. Verse"'))
|
||||||
self.verseShortcut4 = shortcut_action(
|
self.verseShortcut5 = shortcut_action(self, u'verseShortcut5',
|
||||||
self, u'verseShortcut4%s' % self.typePrefix.capitalize(),
|
[QtGui.QKeySequence(u'5')], self.slideShortcutActivated,
|
||||||
[QtGui.QKeySequence(u'4')], self.slideShortcutActivated,
|
category=UiStrings().LiveToolbar,
|
||||||
category=category,
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
self.verseShortcut5.setText(translate(
|
||||||
self.verseShortcut4.setText(translate(
|
'OpenLP.SlideController', 'Go to "5. Verse"'))
|
||||||
'OpenLP.SlideController', 'Go to "4. Verse"'))
|
self.verseShortcut6 = shortcut_action(self, u'verseShortcut6',
|
||||||
self.verseShortcut5 = shortcut_action(
|
[QtGui.QKeySequence(u'6')], self.slideShortcutActivated,
|
||||||
self, u'verseShortcut5%s' % self.typePrefix.capitalize(),
|
category=UiStrings().LiveToolbar,
|
||||||
[QtGui.QKeySequence(u'5')], self.slideShortcutActivated,
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
category=category,
|
self.verseShortcut6.setText(translate(
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
'OpenLP.SlideController', 'Go to "6. Verse"'))
|
||||||
self.verseShortcut5.setText(translate(
|
self.verseShortcut7 = shortcut_action(self, u'verseShortcut7',
|
||||||
'OpenLP.SlideController', 'Go to "5. Verse"'))
|
[QtGui.QKeySequence(u'7')], self.slideShortcutActivated,
|
||||||
self.verseShortcut6 = shortcut_action(
|
category=UiStrings().LiveToolbar,
|
||||||
self, u'verseShortcut6%s' % self.typePrefix.capitalize(),
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
[QtGui.QKeySequence(u'6')], self.slideShortcutActivated,
|
self.verseShortcut7.setText(translate(
|
||||||
category=category,
|
'OpenLP.SlideController', 'Go to "7. Verse"'))
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
self.verseShortcut8 = shortcut_action(self, u'verseShortcut8',
|
||||||
self.verseShortcut6.setText(translate(
|
[QtGui.QKeySequence(u'8')], self.slideShortcutActivated,
|
||||||
'OpenLP.SlideController', 'Go to "6. Verse"'))
|
category=UiStrings().LiveToolbar,
|
||||||
self.verseShortcut7 = shortcut_action(
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self, u'verseShortcut7%s' % self.typePrefix.capitalize(),
|
self.verseShortcut8.setText(translate(
|
||||||
[QtGui.QKeySequence(u'7')], self.slideShortcutActivated,
|
'OpenLP.SlideController', 'Go to "8. Verse"'))
|
||||||
category=category,
|
self.verseShortcut9 = shortcut_action(self, u'verseShortcut9',
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
[QtGui.QKeySequence(u'9')], self.slideShortcutActivated,
|
||||||
self.verseShortcut7.setText(translate(
|
category=UiStrings().LiveToolbar,
|
||||||
'OpenLP.SlideController', 'Go to "7. Verse"'))
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self.verseShortcut8 = shortcut_action(
|
self.verseShortcut9.setText(translate(
|
||||||
self, u'verseShortcut8%s' % self.typePrefix.capitalize(),
|
'OpenLP.SlideController', 'Go to "9. Verse"'))
|
||||||
[QtGui.QKeySequence(u'8')], self.slideShortcutActivated,
|
self.verseShortcut10 = shortcut_action(self, u'verseShortcut10',
|
||||||
category=category,
|
[QtGui.QKeySequence(u'0')], self.slideShortcutActivated,
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
category=UiStrings().LiveToolbar,
|
||||||
self.verseShortcut8.setText(translate(
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
'OpenLP.SlideController', 'Go to "8. Verse"'))
|
self.verseShortcut10.setText(translate(
|
||||||
self.verseShortcut9 = shortcut_action(
|
'OpenLP.SlideController', 'Go to "10. Verse"'))
|
||||||
self, u'verseShortcut9%s' % self.typePrefix.capitalize(),
|
self.chorusShortcut = shortcut_action(self, u'chorusShortcut',
|
||||||
[QtGui.QKeySequence(u'9')], self.slideShortcutActivated,
|
[QtGui.QKeySequence(u'C')], self.slideShortcutActivated,
|
||||||
category=category,
|
category=UiStrings().LiveToolbar,
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self.verseShortcut9.setText(translate(
|
self.chorusShortcut.setText(translate(
|
||||||
'OpenLP.SlideController', 'Go to "9. Verse"'))
|
'OpenLP.SlideController', 'Go to "Chorus"'))
|
||||||
self.verseShortcut10 = shortcut_action(
|
self.bridgeShortcut = shortcut_action(self, u'bridgeShortcut',
|
||||||
self, u'verseShortcut10%s' % self.typePrefix.capitalize(),
|
[QtGui.QKeySequence(u'B')], self.slideShortcutActivated,
|
||||||
[QtGui.QKeySequence(u'0')], self.slideShortcutActivated,
|
category=UiStrings().LiveToolbar,
|
||||||
category=category,
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
self.bridgeShortcut.setText(translate(
|
||||||
self.verseShortcut10.setText(translate(
|
'OpenLP.SlideController', 'Go to "Bridge"'))
|
||||||
'OpenLP.SlideController', 'Go to "10. Verse"'))
|
self.preChorusShortcut = shortcut_action(self, u'preChorusShortcut',
|
||||||
self.chorusShortcut = shortcut_action(
|
[QtGui.QKeySequence(u'P')], self.slideShortcutActivated,
|
||||||
self, u'chorusShortcut%s' % self.typePrefix.capitalize(),
|
category=UiStrings().LiveToolbar,
|
||||||
[QtGui.QKeySequence(u'C')], self.slideShortcutActivated,
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
category=category,
|
self.preChorusShortcut.setText(translate(
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
'OpenLP.SlideController', 'Go to "Pre-Chorus"'))
|
||||||
self.chorusShortcut.setText(translate(
|
self.introShortcut = shortcut_action(self, u'introShortcut',
|
||||||
'OpenLP.SlideController', 'Go to "Chorus"'))
|
[QtGui.QKeySequence(u'I')], self.slideShortcutActivated,
|
||||||
self.bridgeShortcut = shortcut_action(
|
category=UiStrings().LiveToolbar,
|
||||||
self, u'bridgeShortcut%s' % self.typePrefix.capitalize(),
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
[QtGui.QKeySequence(u'B')], self.slideShortcutActivated,
|
self.introShortcut.setText(translate(
|
||||||
category=category,
|
'OpenLP.SlideController', 'Go to "Intro"'))
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
self.endingShortcut = shortcut_action(self, u'endingShortcut',
|
||||||
self.bridgeShortcut.setText(translate(
|
[QtGui.QKeySequence(u'E')], self.slideShortcutActivated,
|
||||||
'OpenLP.SlideController', 'Go to "Bridge"'))
|
category=UiStrings().LiveToolbar,
|
||||||
self.preChorusShortcut = shortcut_action(
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self, u'preChorusShortcut%s' % self.typePrefix.capitalize(),
|
self.endingShortcut.setText(translate(
|
||||||
[QtGui.QKeySequence(u'P')], self.slideShortcutActivated,
|
'OpenLP.SlideController', 'Go to "Ending"'))
|
||||||
category=category,
|
self.otherShortcut = shortcut_action(self, u'otherShortcut',
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
[QtGui.QKeySequence(u'O')], self.slideShortcutActivated,
|
||||||
self.preChorusShortcut.setText(translate(
|
category=UiStrings().LiveToolbar,
|
||||||
'OpenLP.SlideController', 'Go to "Pre-Chorus"'))
|
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
||||||
self.introShortcut = shortcut_action(
|
self.otherShortcut.setText(translate(
|
||||||
self, u'introShortcut%s' % self.typePrefix.capitalize(),
|
'OpenLP.SlideController', 'Go to "Other"'))
|
||||||
[QtGui.QKeySequence(u'I')], self.slideShortcutActivated,
|
self.previewListWidget.addActions([
|
||||||
category=category,
|
self.verseShortcut1, self.verseShortcut2, self.verseShortcut3,
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
self.verseShortcut4, self.verseShortcut5, self.verseShortcut6,
|
||||||
self.introShortcut.setText(translate(
|
self.verseShortcut7, self.verseShortcut8, self.verseShortcut9,
|
||||||
'OpenLP.SlideController', 'Go to "Intro"'))
|
self.verseShortcut10, self.chorusShortcut, self.bridgeShortcut,
|
||||||
self.endingShortcut = shortcut_action(
|
self.preChorusShortcut, self.introShortcut, self.endingShortcut,
|
||||||
self, u'endingShortcut%s' % self.typePrefix.capitalize(),
|
self.otherShortcut
|
||||||
[QtGui.QKeySequence(u'E')], self.slideShortcutActivated,
|
])
|
||||||
category=category,
|
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
|
||||||
self.endingShortcut.setText(translate(
|
|
||||||
'OpenLP.SlideController', 'Go to "Ending"'))
|
|
||||||
self.otherShortcut = shortcut_action(
|
|
||||||
self, u'otherShortcut%s' % self.typePrefix.capitalize(),
|
|
||||||
[QtGui.QKeySequence(u'O')], self.slideShortcutActivated,
|
|
||||||
category=category,
|
|
||||||
context=QtCore.Qt.WidgetWithChildrenShortcut)
|
|
||||||
self.otherShortcut.setText(translate(
|
|
||||||
'OpenLP.SlideController', 'Go to "Other"'))
|
|
||||||
self.previewListWidget.addActions([
|
|
||||||
self.verseShortcut1, self.verseShortcut2, self.verseShortcut3,
|
|
||||||
self.verseShortcut4, self.verseShortcut5, self.verseShortcut6,
|
|
||||||
self.verseShortcut7, self.verseShortcut8, self.verseShortcut9,
|
|
||||||
self.verseShortcut10, self.chorusShortcut, self.bridgeShortcut,
|
|
||||||
self.preChorusShortcut, self.introShortcut, self.endingShortcut,
|
|
||||||
self.otherShortcut
|
|
||||||
])
|
|
||||||
# Signals
|
# Signals
|
||||||
QtCore.QObject.connect(self.previewListWidget,
|
QtCore.QObject.connect(self.previewListWidget,
|
||||||
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
|
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
|
||||||
|
|
@ -498,8 +479,6 @@ class SlideController(QtGui.QWidget):
|
||||||
"""
|
"""
|
||||||
#FIXME: translatable verse types
|
#FIXME: translatable verse types
|
||||||
verse_type = unicode(self.sender().objectName())
|
verse_type = unicode(self.sender().objectName())
|
||||||
# Remove the "Live" or "Preview" suffix.
|
|
||||||
verse_type = verse_type[:-len(self.typePrefix)]
|
|
||||||
key = u''
|
key = u''
|
||||||
if verse_type.startswith(u'verseShortcut'):
|
if verse_type.startswith(u'verseShortcut'):
|
||||||
key = u'V%s' % verse_type[13:]
|
key = u'V%s' % verse_type[13:]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue