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

- shortcuts only for live controller

Browse Source 
- removed v shortcut
This commit is contained in:
Andreas Preikschat 2011-10-24 17:36:59 +02:00
parent cc186aff9d
commit a42940b6bb
1 changed files with 104 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
openlp/core/ui/slidecontroller.py
View File

@ -322,118 +322,99 @@ 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(
self, u'verseShortcut1%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'V'), QtGui.QKeySequence(u'1')],
self.slideShortcutActivated, category=category,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut1.setText(translate( self.verseShortcut1.setText(translate(
'OpenLP.SlideController', 'Go to "1. Verse"')) 'OpenLP.SlideController', 'Go to "1. Verse"'))
self.verseShortcut2 = shortcut_action( self.verseShortcut2 = shortcut_action(self, u'verseShortcut2',
self, u'verseShortcut2%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'2')], self.slideShortcutActivated, [QtGui.QKeySequence(u'2')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut2.setText(translate( self.verseShortcut2.setText(translate(
'OpenLP.SlideController', 'Go to "2. Verse"')) 'OpenLP.SlideController', 'Go to "2. Verse"'))
self.verseShortcut3 = shortcut_action( self.verseShortcut3 = shortcut_action(self, u'verseShortcut3',
self, u'verseShortcut3%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'3')], self.slideShortcutActivated, [QtGui.QKeySequence(u'3')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut3.setText(translate( self.verseShortcut3.setText(translate(
'OpenLP.SlideController', 'Go to "3. Verse"')) 'OpenLP.SlideController', 'Go to "3. Verse"'))
self.verseShortcut4 = shortcut_action( self.verseShortcut4 = shortcut_action(self, u'verseShortcut4',
self, u'verseShortcut4%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'4')], self.slideShortcutActivated, [QtGui.QKeySequence(u'4')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut4.setText(translate( self.verseShortcut4.setText(translate(
'OpenLP.SlideController', 'Go to "4. Verse"')) 'OpenLP.SlideController', 'Go to "4. Verse"'))
self.verseShortcut5 = shortcut_action( self.verseShortcut5 = shortcut_action(self, u'verseShortcut5',
self, u'verseShortcut5%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'5')], self.slideShortcutActivated, [QtGui.QKeySequence(u'5')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut5.setText(translate( self.verseShortcut5.setText(translate(
'OpenLP.SlideController', 'Go to "5. Verse"')) 'OpenLP.SlideController', 'Go to "5. Verse"'))
self.verseShortcut6 = shortcut_action( self.verseShortcut6 = shortcut_action(self, u'verseShortcut6',
self, u'verseShortcut6%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'6')], self.slideShortcutActivated, [QtGui.QKeySequence(u'6')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut6.setText(translate( self.verseShortcut6.setText(translate(
'OpenLP.SlideController', 'Go to "6. Verse"')) 'OpenLP.SlideController', 'Go to "6. Verse"'))
self.verseShortcut7 = shortcut_action( self.verseShortcut7 = shortcut_action(self, u'verseShortcut7',
self, u'verseShortcut7%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'7')], self.slideShortcutActivated, [QtGui.QKeySequence(u'7')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut7.setText(translate( self.verseShortcut7.setText(translate(
'OpenLP.SlideController', 'Go to "7. Verse"')) 'OpenLP.SlideController', 'Go to "7. Verse"'))
self.verseShortcut8 = shortcut_action( self.verseShortcut8 = shortcut_action(self, u'verseShortcut8',
self, u'verseShortcut8%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'8')], self.slideShortcutActivated, [QtGui.QKeySequence(u'8')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut8.setText(translate( self.verseShortcut8.setText(translate(
'OpenLP.SlideController', 'Go to "8. Verse"')) 'OpenLP.SlideController', 'Go to "8. Verse"'))
self.verseShortcut9 = shortcut_action( self.verseShortcut9 = shortcut_action(self, u'verseShortcut9',
self, u'verseShortcut9%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'9')], self.slideShortcutActivated, [QtGui.QKeySequence(u'9')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut9.setText(translate( self.verseShortcut9.setText(translate(
'OpenLP.SlideController', 'Go to "9. Verse"')) 'OpenLP.SlideController', 'Go to "9. Verse"'))
self.verseShortcut10 = shortcut_action( self.verseShortcut10 = shortcut_action(self, u'verseShortcut10',
self, u'verseShortcut10%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'0')], self.slideShortcutActivated, [QtGui.QKeySequence(u'0')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.verseShortcut10.setText(translate( self.verseShortcut10.setText(translate(
'OpenLP.SlideController', 'Go to "10. Verse"')) 'OpenLP.SlideController', 'Go to "10. Verse"'))
self.chorusShortcut = shortcut_action( self.chorusShortcut = shortcut_action(self, u'chorusShortcut',
self, u'chorusShortcut%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'C')], self.slideShortcutActivated, [QtGui.QKeySequence(u'C')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.chorusShortcut.setText(translate( self.chorusShortcut.setText(translate(
'OpenLP.SlideController', 'Go to "Chorus"')) 'OpenLP.SlideController', 'Go to "Chorus"'))
self.bridgeShortcut = shortcut_action( self.bridgeShortcut = shortcut_action(self, u'bridgeShortcut',
self, u'bridgeShortcut%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'B')], self.slideShortcutActivated, [QtGui.QKeySequence(u'B')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.bridgeShortcut.setText(translate( self.bridgeShortcut.setText(translate(
'OpenLP.SlideController', 'Go to "Bridge"')) 'OpenLP.SlideController', 'Go to "Bridge"'))
self.preChorusShortcut = shortcut_action( self.preChorusShortcut = shortcut_action(self, u'preChorusShortcut',
self, u'preChorusShortcut%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'P')], self.slideShortcutActivated, [QtGui.QKeySequence(u'P')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.preChorusShortcut.setText(translate( self.preChorusShortcut.setText(translate(
'OpenLP.SlideController', 'Go to "Pre-Chorus"')) 'OpenLP.SlideController', 'Go to "Pre-Chorus"'))
self.introShortcut = shortcut_action( self.introShortcut = shortcut_action(self, u'introShortcut',
self, u'introShortcut%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'I')], self.slideShortcutActivated, [QtGui.QKeySequence(u'I')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.introShortcut.setText(translate( self.introShortcut.setText(translate(
'OpenLP.SlideController', 'Go to "Intro"')) 'OpenLP.SlideController', 'Go to "Intro"'))
self.endingShortcut = shortcut_action( self.endingShortcut = shortcut_action(self, u'endingShortcut',
self, u'endingShortcut%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'E')], self.slideShortcutActivated, [QtGui.QKeySequence(u'E')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.endingShortcut.setText(translate( self.endingShortcut.setText(translate(
'OpenLP.SlideController', 'Go to "Ending"')) 'OpenLP.SlideController', 'Go to "Ending"'))
self.otherShortcut = shortcut_action( self.otherShortcut = shortcut_action(self, u'otherShortcut',
self, u'otherShortcut%s' % self.typePrefix.capitalize(),
[QtGui.QKeySequence(u'O')], self.slideShortcutActivated, [QtGui.QKeySequence(u'O')], self.slideShortcutActivated,
category=category, category=UiStrings().LiveToolbar,
context=QtCore.Qt.WidgetWithChildrenShortcut) context=QtCore.Qt.WidgetWithChildrenShortcut)
self.otherShortcut.setText(translate( self.otherShortcut.setText(translate(
'OpenLP.SlideController', 'Go to "Other"')) 'OpenLP.SlideController', 'Go to "Other"'))
@ -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:]