diff -r 6a90548b35b1 -r 64fa9ab70ddd E5Gui/E5ToolBarManager.py
--- a/E5Gui/E5ToolBarManager.py Fri Jan 07 10:02:23 2011 +0100
+++ b/E5Gui/E5ToolBarManager.py Fri Jan 07 11:53:06 2011 +0100
@@ -136,14 +136,16 @@
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 +385,7 @@
return
if action.isSeparator():
return
- if action in self.__allActions:
+ if id(action) in self.__allActions:
return
if action.metaObject().className() == "QWidgetAction":
@@ -676,4 +678,4 @@
"""
if tbID not in self.__defaultToolBars:
return []
- return self.__defaultToolBars[tbID][:]
\ No newline at end of file
+ return self.__defaultToolBars[tbID][:]
