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

check if shortcut is already assigned, refreshing list, double click event, started resetting the selected action

Browse Source
This commit is contained in:
Andreas Preikschat 2011-03-31 14:50:38 +02:00
parent 4ca738e9b3
commit 0c9b839e91
1 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
openlp/core/ui/shortcutlistform.py
View File

@ -42,9 +42,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
The shortcut list dialog The shortcut list dialog
""" """
#TODO: do not close on ESC #TODO: do not close on ESC
#TODO: Fix Preview/Live controller (have the same shortcut) #TODO: Fix Preview/Live controller (have the same shortcut
#TODO: double click event
#TODO: refresh self.assingedShortcuts
def __init__(self, parent=None): def __init__(self, parent=None):
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
self.setupUi(self) self.setupUi(self)
@ -56,6 +54,11 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
QtCore.QObject.connect(self.treeWidget, QtCore.QObject.connect(self.treeWidget,
QtCore.SIGNAL(u'itemPressed(QTreeWidgetItem*, int)'), QtCore.SIGNAL(u'itemPressed(QTreeWidgetItem*, int)'),
self.onItemPressed) self.onItemPressed)
QtCore.QObject.connect(self.treeWidget,
QtCore.SIGNAL(u'itemDoubleClicked(QTreeWidgetItem*, int)'),
self.onItemDoubleClicked)
QtCore.QObject.connect(self.clearShortcutButton,
QtCore.SIGNAL(u'clicked(bool)'), self.onClearShortcutButtonClicked)
def keyReleaseEvent(self, event): def keyReleaseEvent(self, event):
Qt = QtCore.Qt Qt = QtCore.Qt
@ -87,34 +90,50 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
self.shortcutButton.setChecked(False) self.shortcutButton.setChecked(False)
def exec_(self): def exec_(self):
self.reloadActionList() self.reloadShortcutList()
return QtGui.QDialog.exec_(self) return QtGui.QDialog.exec_(self)
def reloadActionList(self): def reloadShortcutList(self):
""" """
Reload the ``treeWidget`` list to add new and remove old actions. Reload the ``treeWidget`` list to add new and remove old actions.
""" """
self.assingedShortcuts = []
self.treeWidget.clear() self.treeWidget.clear()
for category in ActionList.categories: for category in ActionList.categories:
item = QtGui.QTreeWidgetItem([category.name]) item = QtGui.QTreeWidgetItem([category.name])
for action in category.actions: for action in category.actions:
self.assingedShortcuts.extend(action.shortcuts())
actionText = REMOVE_AMPERSAND.sub('', unicode(action.text())) actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
if len(action.shortcuts()) == 2: actionItem = QtGui.QTreeWidgetItem([actionText])
shortcutText = action.shortcuts()[0].toString()
alternateText = action.shortcuts()[1].toString()
else:
shortcutText = action.shortcut().toString()
alternateText = u''
actionItem = QtGui.QTreeWidgetItem(
[actionText, shortcutText, alternateText])
actionItem.setIcon(0, action.icon()) actionItem.setIcon(0, action.icon())
actionItem.setData(0, actionItem.setData(0,
QtCore.Qt.UserRole, QtCore.QVariant(action)) QtCore.Qt.UserRole, QtCore.QVariant(action))
item.addChild(actionItem) item.addChild(actionItem)
item.setExpanded(True) item.setExpanded(True)
self.treeWidget.addTopLevelItem(item) self.treeWidget.addTopLevelItem(item)
self.refreshShortcutList()
def refreshShortcutList(self):
"""
This refreshes the item's shortcuts shown in the list. Note, this
neither adds new actions nor removes old actions.
"""
self.assingedShortcuts = []
iterator = QtGui.QTreeWidgetItemIterator(self.treeWidget)
while iterator.value():
item = iterator.value()
iterator += 1
action = item.data(0, QtCore.Qt.UserRole).toPyObject()
if action is None:
continue
self.assingedShortcuts.extend(action.shortcuts())
if len(action.shortcuts()) == 0:
item.setText(1, u'')
item.setText(2, u'')
elif len(action.shortcuts()) == 1:
item.setText(1, action.shortcuts()[0].toString())
item.setText(2, u'')
else:
item.setText(1, action.shortcuts()[0].toString())
item.setText(2, action.shortcuts()[1].toString())
def onShortcutButtonClicked(self, toggled): def onShortcutButtonClicked(self, toggled):
""" """
@ -127,25 +146,30 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
if action is None: if action is None:
return return
shortcuts = [] shortcuts = []
if self.column == 1:
# We are changing the primary shortcut. # We are changing the primary shortcut.
if self.column == 1:
shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text())) shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
if len(action.shortcuts()) == 2: if len(action.shortcuts()) == 2:
shortcuts.append(action.shortcuts()[1]) shortcuts.append(action.shortcuts()[1])
else:
shortcuts.append(0)
item.setText(1, self.shortcutButton.text())
elif self.column == 2:
# We are changing the secondary shortcut. # We are changing the secondary shortcut.
elif self.column == 2:
if len(action.shortcuts()) == 1: if len(action.shortcuts()) == 1:
shortcuts.append(action.shortcuts()[0]) shortcuts.append(action.shortcuts()[0])
else:
shortcuts.append(0)
shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text())) shortcuts.append(QtGui.QKeySequence(self.shortcutButton.text()))
item.setText(2, self.shortcutButton.text())
else: else:
return return
action.setShortcuts(shortcuts) action.setShortcuts(shortcuts)
self.refreshShortcutList()
def onItemDoubleClicked(self, item, column):
"""
"""
item = self.treeWidget.currentItem()
action = item.data(0, QtCore.Qt.UserRole).toPyObject()
self.shortcutButton.setChecked(True)
if action is None or column not in [1, 2]:
self.shortcutButton.setChecked(False)
self.onItemPressed(item, column)
def onItemPressed(self, item, column): def onItemPressed(self, item, column):
""" """
@ -165,6 +189,22 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
text = action.shortcuts()[1].toString() text = action.shortcuts()[1].toString()
self.shortcutButton.setText(text) self.shortcutButton.setText(text)
def onClearShortcutButtonClicked(self, toggled):
"""
Restore the defaults of this
"""
item = self.treeWidget.currentItem()
if item is None:
return
action = item.data(0, QtCore.Qt.UserRole).toPyObject()
if action is None:
return
#FIXME: defaultShortcuts
action.setShortcuts(action.defaultShortcuts)
self.shortcutButton.setChecked(False)
self.shortcutButton.setText(u'')
self.refreshShortcutList()
def save(self): def save(self):
""" """
Save the shortcuts. **Note**, that we do not have to load the shortcuts, Save the shortcuts. **Note**, that we do not have to load the shortcuts,