diff -r 9986ec0e559a -r 10516539f238 E5Gui/E5ToolBarManager.py
--- a/E5Gui/E5ToolBarManager.py Tue Oct 15 22:03:54 2013 +0200
+++ b/E5Gui/E5ToolBarManager.py Fri Oct 18 23:00:41 2013 +0200
@@ -35,19 +35,30 @@
self.__mainWindow = None
self.__ui = ui
- self.__toolBars = {} # maps toolbar IDs to actions
- self.__toolBarsWithSeparators = {} # maps toolbar IDs to actions incl. separators
- self.__defaultToolBars = {} # maps default toolbar IDs to actions
- self.__customToolBars = [] # list of custom toolbars
- self.__allToolBars = {} # maps toolbar IDs to toolbars
+ self.__toolBars = {}
+ # maps toolbar IDs to actions
+ self.__toolBarsWithSeparators = {}
+ # maps toolbar IDs to actions incl. separators
+ self.__defaultToolBars = {}
+ # maps default toolbar IDs to actions
+ self.__customToolBars = []
+ # list of custom toolbars
+ self.__allToolBars = {}
+ # maps toolbar IDs to toolbars
- self.__categoryToActions = {} # maps categories to actions
- self.__actionToCategory = {} # maps action IDs to categories
- self.__allActions = {} # maps action IDs to actions
- self.__actionToToolBars = {} # maps action IDs to toolbars
+ self.__categoryToActions = {}
+ # maps categories to actions
+ self.__actionToCategory = {}
+ # maps action IDs to categories
+ self.__allActions = {}
+ # maps action IDs to actions
+ self.__actionToToolBars = {}
+ # maps action IDs to toolbars
- self.__widgetActions = {} # maps widget action IDs to toolbars
- self.__allWidgetActions = {} # maps widget action IDs to widget actions
+ self.__widgetActions = {}
+ # maps widget action IDs to toolbars
+ self.__allWidgetActions = {}
+ # maps widget action IDs to widget actions
######################################################
## Private methods
@@ -290,6 +301,7 @@
Public method to check, if a toolbar was added with addToolBar().
@param toolBar reference to the toolbar to be checked (QToolBar)
+ @return flag indicating an added toolbar (boolean)
"""
return toolBar is not None and \
id(toolBar) in self.__defaultToolBars
@@ -592,7 +604,8 @@
removedActions = []
for action in actions[tbID]:
- if action in newActions and self.toolBarWidgetAction(action) == toolBar:
+ if action in newActions and \
+ self.toolBarWidgetAction(action) == toolBar:
newActions.remove(action)
newActionsWithSeparators.remove(action)
removedActions.append(action)
