--- a/Preferences/ShortcutsDialog.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Preferences/ShortcutsDialog.py Fri Nov 01 15:48:48 2013 +0100 @@ -62,7 +62,8 @@ """ Private method to resort the tree. """ - self.shortcutsList.sortItems(self.shortcutsList.sortColumn(), + self.shortcutsList.sortItems( + self.shortcutsList.sortColumn(), self.shortcutsList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -96,7 +97,8 @@ @keyparam objectType type of the object (string). Objects of the same type are not checked for duplicate shortcuts. """ - itm = QTreeWidgetItem(category, + itm = QTreeWidgetItem( + category, [action.iconText(), action.shortcut().toString(), action.alternateShortcut().toString()]) itm.setIcon(0, action.icon()) @@ -308,7 +310,8 @@ itmseq = itm.text(col) # step 1: check if shortcut is already allocated if keystr == itmseq: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Edit shortcuts"), self.trUtf8( """<p><b>{0}</b> has already been""" @@ -327,7 +330,8 @@ # step 2: check if shortcut hides an already allocated if itmseq.startswith("{0}+".format(keystr)): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Edit shortcuts"), self.trUtf8( """<p><b>{0}</b> hides the <b>{1}</b>""" @@ -343,7 +347,8 @@ # step 3: check if shortcut is hidden by an # already allocated if keystr.startswith("{0}+".format(itmseq)): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Edit shortcuts"), self.trUtf8( """<p><b>{0}</b> is hidden by the """ @@ -380,27 +385,38 @@ """ Private slot to handle the OK button press. """ - self.__saveCategoryActions(self.projectItem, + self.__saveCategoryActions( + self.projectItem, e5App().getObject("Project").getActions()) - self.__saveCategoryActions(self.uiItem, + self.__saveCategoryActions( + self.uiItem, e5App().getObject("UserInterface").getActions('ui')) - self.__saveCategoryActions(self.wizardsItem, + self.__saveCategoryActions( + self.wizardsItem, e5App().getObject("UserInterface").getActions('wizards')) - self.__saveCategoryActions(self.debugItem, + self.__saveCategoryActions( + self.debugItem, e5App().getObject("DebugUI").getActions()) - self.__saveCategoryActions(self.editItem, + self.__saveCategoryActions( + self.editItem, e5App().getObject("ViewManager").getActions('edit')) - self.__saveCategoryActions(self.fileItem, + self.__saveCategoryActions( + self.fileItem, e5App().getObject("ViewManager").getActions('file')) - self.__saveCategoryActions(self.searchItem, + self.__saveCategoryActions( + self.searchItem, e5App().getObject("ViewManager").getActions('search')) - self.__saveCategoryActions(self.viewItem, + self.__saveCategoryActions( + self.viewItem, e5App().getObject("ViewManager").getActions('view')) - self.__saveCategoryActions(self.macroItem, + self.__saveCategoryActions( + self.macroItem, e5App().getObject("ViewManager").getActions('macro')) - self.__saveCategoryActions(self.bookmarkItem, + self.__saveCategoryActions( + self.bookmarkItem, e5App().getObject("ViewManager").getActions('bookmark')) - self.__saveCategoryActions(self.spellingItem, + self.__saveCategoryActions( + self.spellingItem, e5App().getObject("ViewManager").getActions('spelling')) actions = e5App().getObject("ViewManager").getActions('window') @@ -413,7 +429,8 @@ if ref is not None and hasattr(ref, "getActions"): self.__saveCategoryActions(categoryItem, ref.getActions()) - self.__saveCategoryActions(self.helpViewerItem, + self.__saveCategoryActions( + self.helpViewerItem, e5App().getObject("DummyHelpViewer").getActions()) Shortcuts.saveShortcuts()