diff -r 0a02c433f52d -r 5883ce99ee12 Preferences/ShortcutsDialog.py --- a/Preferences/ShortcutsDialog.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Preferences/ShortcutsDialog.py Sun Nov 03 15:58:22 2013 +0100 @@ -260,9 +260,9 @@ """ if not noCheck and \ (not self.__checkShortcut( - keysequence, objectType, self.__editTopItem) or \ + keysequence, objectType, self.__editTopItem) or not self.__checkShortcut( - altKeysequence, objectType, self.__editTopItem)): + altKeysequence, objectType, self.__editTopItem)): return self.shortcutsList.currentItem().setText(1, keysequence.toString()) @@ -317,7 +317,7 @@ """<p><b>{0}</b> has already been""" """ allocated to the <b>{1}</b> action. """ """Remove this binding?</p>""") - .format(keystr, itm.text(0)), + .format(keystr, itm.text(0)), icon=E5MessageBox.Warning) if res: itm.setText(col, "") @@ -336,7 +336,7 @@ self.trUtf8( """<p><b>{0}</b> hides the <b>{1}</b>""" """ action. Remove this binding?</p>""") - .format(keystr, itm.text(0)), + .format(keystr, itm.text(0)), icon=E5MessageBox.Warning) if res: itm.setText(col, "") @@ -354,7 +354,7 @@ """<p><b>{0}</b> is hidden by the """ """<b>{1}</b> action. """ """Remove this binding?</p>""") - .format(keystr, itm.text(0)), + .format(keystr, itm.text(0)), icon=E5MessageBox.Warning) if res: itm.setText(col, "") @@ -451,12 +451,12 @@ childHiddenCount = 0 for index in range(topItem.childCount()): itm = topItem.child(index) - if (self.actionButton.isChecked() and \ + if (self.actionButton.isChecked() and not QRegExp(txt, Qt.CaseInsensitive).indexIn(itm.text(0)) > -1) or \ - (self.shortcutButton.isChecked() and \ - not txt.lower() in itm.text(1).lower() and \ - not txt.lower() in itm.text(2).lower()): + (self.shortcutButton.isChecked() and + not txt.lower() in itm.text(1).lower() and + not txt.lower() in itm.text(2).lower()): itm.setHidden(True) childHiddenCount += 1 else: