--- a/eric6/E5Gui/E5ToolBarDialog.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ToolBarDialog.py Sat Sep 21 15:37:43 2019 +0200 @@ -10,8 +10,10 @@ from PyQt5.QtCore import pyqtSlot, Qt from PyQt5.QtGui import QColor -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ - QInputDialog, QLineEdit, QListWidgetItem, QAbstractButton +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QTreeWidgetItem, QInputDialog, QLineEdit, + QListWidgetItem, QAbstractButton +) from E5Gui import E5MessageBox @@ -75,8 +77,8 @@ self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) - self.__restoreDefaultsButton = \ - self.buttonBox.button(QDialogButtonBox.RestoreDefaults) + self.__restoreDefaultsButton = self.buttonBox.button( + QDialogButtonBox.RestoreDefaults) self.__resetButton = self.buttonBox.button(QDialogButtonBox.Reset) self.actionsTree.header().hide() @@ -114,8 +116,8 @@ actionIDs.append(aID) if aID in self.__widgetActionToToolBarItemID: self.__widgetActionToToolBarItemID[aID] = id(tbItem) - self.__toolBarItemToWidgetActionID[id(tbItem)]\ - .append(aID) + self.__toolBarItemToWidgetActionID[id(tbItem)].append( + aID) tbItem.actionIDs = actionIDs self.toolbarComboBox.addItem(tb.windowTitle(), int(id(tbItem))) if default: @@ -176,8 +178,10 @@ index = self.toolbarComboBox.currentIndex() tbItemID = self.toolbarComboBox.itemData(index) tbItem = self.__toolbarItems[tbItemID] - if tbItem.toolBarId is not None and \ - tbItem.toolBarId not in self.__removedToolBarIDs: + if ( + tbItem.toolBarId is not None and + tbItem.toolBarId not in self.__removedToolBarIDs + ): self.__removedToolBarIDs.append(tbItem.toolBarId) del self.__toolbarItems[tbItemID] for widgetActionID in self.__toolBarItemToWidgetActionID[tbItemID]: @@ -212,8 +216,7 @@ return index = self.toolbarComboBox.currentIndex() self.toolbarComboBox.setItemText(index, newName) - tbItem = \ - self.__toolbarItems[self.toolbarComboBox.itemData(index)] + tbItem = self.__toolbarItems[self.toolbarComboBox.itemData(index)] tbItem.title = newName tbItem.isChanged = True @@ -238,8 +241,10 @@ self.upButton.setEnabled(row > 0) self.downButton.setEnabled(row < self.toolbarActionsList.count() - 1) self.leftButton.setEnabled(self.toolbarActionsList.count() > 0) - rightEnable = self.actionsTree.currentItem().parent() is not None or \ + rightEnable = ( + self.actionsTree.currentItem().parent() is not None or self.actionsTree.currentItem().text(0) == self.__separatorText + ) self.rightButton.setEnabled(rightEnable) @pyqtSlot(int) @@ -338,8 +343,8 @@ self.__currentToolBarItem.isChanged = True if actionID in self.__widgetActionToToolBarItemID: self.__widgetActionToToolBarItemID[actionID] = None - self.__toolBarItemToWidgetActionID[id(self.__currentToolBarItem)]\ - .remove(actionID) + self.__toolBarItemToWidgetActionID[ + id(self.__currentToolBarItem)].remove(actionID) itm = self.toolbarActionsList.takeItem(row) del itm self.toolbarActionsList.setCurrentRow(row) @@ -357,8 +362,8 @@ item.setText(self.__separatorText) actionID = None else: - actionID = self.actionsTree.currentItem()\ - .data(0, E5ToolBarDialog.ActionIdRole) + actionID = self.actionsTree.currentItem().data( + 0, E5ToolBarDialog.ActionIdRole) action = self.__manager.actionById(actionID) item.setText(action.text()) item.setIcon(action.icon()) @@ -372,10 +377,10 @@ if oldTbItemID is not None: self.__toolbarItems[oldTbItemID].actionIDs.remove(actionID) self.__toolbarItems[oldTbItemID].isChanged = True - self.__toolBarItemToWidgetActionID[oldTbItemID]\ - .remove(actionID) - self.__widgetActionToToolBarItemID[actionID] = \ - id(self.__currentToolBarItem) + self.__toolBarItemToWidgetActionID[oldTbItemID].remove( + actionID) + self.__widgetActionToToolBarItemID[actionID] = id( + self.__currentToolBarItem) self.__toolBarItemToWidgetActionID[ id(self.__currentToolBarItem)].append(actionID) self.toolbarActionsList.insertItem(row, item)