diff -r 4c4a4525e69a -r 360e007523bd E5Gui/E5ToolBarManager.py
--- a/E5Gui/E5ToolBarManager.py Fri Jan 07 10:01:24 2011 +0100
+++ b/E5Gui/E5ToolBarManager.py Fri Jan 07 12:08:01 2011 +0100
@@ -129,21 +129,21 @@
"""
if toolBar is None:
return
- if toolBar in self.__toolBars:
- return
newActions = []
newActionsWithSeparators = []
actions = toolBar.actions()
for action in actions:
+ actID = id(action)
self.addAction(action, category)
- if id(action) in self.__widgetActions:
- self.__widgetActions[id(action)] = toolBar
+ if actID in self.__widgetActions:
+ self.__widgetActions[actID] = toolBar
newActionsWithSeparators.append(action)
if action.isSeparator():
action = None
else:
- self.__actionToToolBars[id(action)].append(toolBar)
+ if toolBar not in self.__actionToToolBars[actID]:
+ self.__actionToToolBars[actID].append(toolBar)
newActions.append(action)
tbID = id(toolBar)
self.__defaultToolBars[tbID] = newActions
@@ -383,7 +383,7 @@
return
if action.isSeparator():
return
- if action in self.__allActions:
+ if id(action) in self.__allActions:
return
if action.metaObject().className() == "QWidgetAction":
