openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

removed cancel button

This commit is contained in:
Andreas Preikschat 2011-04-02 18:14:43 +02:00
parent 958155e7d7
commit 61068e26a6
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/shortcutlistdialog.py
View File

@ -57,8 +57,8 @@ class Ui_ShortcutListDialog(object):
self.customLayout.addStretch() self.customLayout.addStretch()
self.dialogLayout.addLayout(self.customLayout) self.dialogLayout.addLayout(self.customLayout)
self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog) self.buttonBox = QtGui.QDialogButtonBox(shortcutListDialog)
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel | self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.RestoreDefaults) QtGui.QDialogButtonBox.RestoreDefaults)
self.buttonBox.setObjectName(u'buttonBox') self.buttonBox.setObjectName(u'buttonBox')
self.dialogLayout.addWidget(self.buttonBox) self.dialogLayout.addWidget(self.buttonBox)
self.retranslateUi(shortcutListDialog) self.retranslateUi(shortcutListDialog)

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

@ -63,11 +63,7 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
self.onRestoreDefaultsClicked) self.onRestoreDefaultsClicked)
def keyPressEvent(self, event): def keyPressEvent(self, event):
if self.shortcutButton.isChecked(): event.ignore()
event.ignore()
elif event.key() == QtCore.Qt.Key_Escape:
event.accept()
self.close()
def keyReleaseEvent(self, event): def keyReleaseEvent(self, event):
Qt = QtCore.Qt Qt = QtCore.Qt