76 for action in self.__manager.categoryActions(category): |
76 for action in self.__manager.categoryActions(category): |
77 item = QTreeWidgetItem(categoryItem) |
77 item = QTreeWidgetItem(categoryItem) |
78 item.setText(0, action.text()) |
78 item.setText(0, action.text()) |
79 item.setIcon(0, action.icon()) |
79 item.setIcon(0, action.icon()) |
80 item.setTextAlignment(0, Qt.AlignLeft | Qt.AlignVCenter) |
80 item.setTextAlignment(0, Qt.AlignLeft | Qt.AlignVCenter) |
81 item.setData(0, E4ToolBarDialog.ActionIdRole, long(id(action))) |
81 item.setData(0, E4ToolBarDialog.ActionIdRole, int(id(action))) |
82 item.setData(0, E4ToolBarDialog.WidgetActionRole, False) |
82 item.setData(0, E4ToolBarDialog.WidgetActionRole, False) |
83 if self.__manager.isWidgetAction(action): |
83 if self.__manager.isWidgetAction(action): |
84 item.setData(0, E4ToolBarDialog.WidgetActionRole, True) |
84 item.setData(0, E4ToolBarDialog.WidgetActionRole, True) |
85 item.setData(0, Qt.TextColorRole, QColor(Qt.blue)) |
85 item.setData(0, Qt.TextColorRole, QColor(Qt.blue)) |
86 self.__widgetActionToToolBarItemID[id(action)] = None |
86 self.__widgetActionToToolBarItemID[id(action)] = None |
87 categoryItem.setExpanded(True) |
87 categoryItem.setExpanded(True) |
88 |
88 |
89 for tbID, actions in self.__manager.toolBarsActions().items(): |
89 for tbID, actions in list(self.__manager.toolBarsActions().items()): |
90 tb = self.__manager.toolBarById(tbID) |
90 tb = self.__manager.toolBarById(tbID) |
91 default = self.__manager.isDefaultToolBar(tb) |
91 default = self.__manager.isDefaultToolBar(tb) |
92 tbItem = E4ToolBarItem(tbID, [], default) |
92 tbItem = E4ToolBarItem(tbID, [], default) |
93 self.__toolbarItems[id(tbItem)] = tbItem |
93 self.__toolbarItems[id(tbItem)] = tbItem |
94 self.__toolBarItemToWidgetActionID[id(tbItem)] = [] |
94 self.__toolBarItemToWidgetActionID[id(tbItem)] = [] |
101 actionIDs.append(aID) |
101 actionIDs.append(aID) |
102 if aID in self.__widgetActionToToolBarItemID: |
102 if aID in self.__widgetActionToToolBarItemID: |
103 self.__widgetActionToToolBarItemID[aID] = id(tbItem) |
103 self.__widgetActionToToolBarItemID[aID] = id(tbItem) |
104 self.__toolBarItemToWidgetActionID[id(tbItem)].append(aID) |
104 self.__toolBarItemToWidgetActionID[id(tbItem)].append(aID) |
105 tbItem.actionIDs = actionIDs |
105 tbItem.actionIDs = actionIDs |
106 self.toolbarComboBox.addItem(tb.windowTitle(), long(id(tbItem))) |
106 self.toolbarComboBox.addItem(tb.windowTitle(), int(id(tbItem))) |
107 if default: |
107 if default: |
108 self.toolbarComboBox.setItemData(self.toolbarComboBox.count() - 1, |
108 self.toolbarComboBox.setItemData(self.toolbarComboBox.count() - 1, |
109 QColor(Qt.darkGreen), Qt.ForegroundRole) |
109 QColor(Qt.darkGreen), Qt.ForegroundRole) |
110 self.toolbarComboBox.model().sort(0) |
110 self.toolbarComboBox.model().sort(0) |
111 |
111 |
137 tbItem = E4ToolBarItem(None, [], False) |
137 tbItem = E4ToolBarItem(None, [], False) |
138 tbItem.title = name |
138 tbItem.title = name |
139 tbItem.isChanged = True |
139 tbItem.isChanged = True |
140 self.__toolbarItems[id(tbItem)] = tbItem |
140 self.__toolbarItems[id(tbItem)] = tbItem |
141 self.__toolBarItemToWidgetActionID[id(tbItem)] = [] |
141 self.__toolBarItemToWidgetActionID[id(tbItem)] = [] |
142 self.toolbarComboBox.addItem(name, long(id(tbItem))) |
142 self.toolbarComboBox.addItem(name, int(id(tbItem))) |
143 self.toolbarComboBox.model().sort(0) |
143 self.toolbarComboBox.model().sort(0) |
144 self.toolbarComboBox.setCurrentIndex(self.toolbarComboBox.findText(name)) |
144 self.toolbarComboBox.setCurrentIndex(self.toolbarComboBox.findText(name)) |
145 |
145 |
146 @pyqtSlot() |
146 @pyqtSlot() |
147 def on_removeButton_clicked(self): |
147 def on_removeButton_clicked(self): |
239 else: |
239 else: |
240 action = self.__manager.actionById(actionID) |
240 action = self.__manager.actionById(actionID) |
241 item.setText(action.text()) |
241 item.setText(action.text()) |
242 item.setIcon(action.icon()) |
242 item.setIcon(action.icon()) |
243 item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter) |
243 item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter) |
244 item.setData(E4ToolBarDialog.ActionIdRole, long(id(action))) |
244 item.setData(E4ToolBarDialog.ActionIdRole, int(id(action))) |
245 item.setData(E4ToolBarDialog.WidgetActionRole, False) |
245 item.setData(E4ToolBarDialog.WidgetActionRole, False) |
246 if self.__manager.isWidgetAction(action): |
246 if self.__manager.isWidgetAction(action): |
247 item.setData(E4ToolBarDialog.WidgetActionRole, True) |
247 item.setData(E4ToolBarDialog.WidgetActionRole, True) |
248 item.setData(Qt.TextColorRole, QColor(Qt.blue)) |
248 item.setData(Qt.TextColorRole, QColor(Qt.blue)) |
249 self.toolbarActionsList.setCurrentRow(0) |
249 self.toolbarActionsList.setCurrentRow(0) |
333 .data(0, E4ToolBarDialog.ActionIdRole) |
333 .data(0, E4ToolBarDialog.ActionIdRole) |
334 action = self.__manager.actionById(actionID) |
334 action = self.__manager.actionById(actionID) |
335 item.setText(action.text()) |
335 item.setText(action.text()) |
336 item.setIcon(action.icon()) |
336 item.setIcon(action.icon()) |
337 item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter) |
337 item.setTextAlignment(Qt.AlignLeft | Qt.AlignVCenter) |
338 item.setData(E4ToolBarDialog.ActionIdRole, long(id(action))) |
338 item.setData(E4ToolBarDialog.ActionIdRole, int(id(action))) |
339 item.setData(E4ToolBarDialog.WidgetActionRole, False) |
339 item.setData(E4ToolBarDialog.WidgetActionRole, False) |
340 if self.__manager.isWidgetAction(action): |
340 if self.__manager.isWidgetAction(action): |
341 item.setData(E4ToolBarDialog.WidgetActionRole, True) |
341 item.setData(E4ToolBarDialog.WidgetActionRole, True) |
342 item.setData(Qt.TextColorRole, QColor(Qt.blue)) |
342 item.setData(Qt.TextColorRole, QColor(Qt.blue)) |
343 oldTbItemID = self.__widgetActionToToolBarItemID[actionID] |
343 oldTbItemID = self.__widgetActionToToolBarItemID[actionID] |
384 tb = self.__manager.toolBarById(tbID) |
384 tb = self.__manager.toolBarById(tbID) |
385 self.__manager.deleteToolBar(tb) |
385 self.__manager.deleteToolBar(tb) |
386 self.__removedToolBarIDs = [] |
386 self.__removedToolBarIDs = [] |
387 |
387 |
388 # step 2: save configured toolbars |
388 # step 2: save configured toolbars |
389 for tbItem in self.__toolbarItems.values(): |
389 for tbItem in list(self.__toolbarItems.values()): |
390 if not tbItem.isChanged: |
390 if not tbItem.isChanged: |
391 continue |
391 continue |
392 |
392 |
393 if tbItem.toolBarId is None: |
393 if tbItem.toolBarId is None: |
394 # new custom toolbar |
394 # new custom toolbar |