Merge lp:~simon-kersey/bzr-explorer/564811-fix into lp:bzr-explorer

[Simon Kersey]

Fixes bug with nested folders in toolbars.xml by adding support for nested folders as menus. Also fixes common error in handling of nested folders as menus in ToolBoxBuilder.

[Ian Clatworthy (ian-clatworthy)]

Thanks.

review: Approve

=== modified file 'lib/builders/toolset_builders.py'
--- lib/builders/toolset_builders.py	2010-03-07 05:08:57 +0000
+++ lib/builders/toolset_builders.py	2010-04-16 16:35:26 +0000
@@ -176,11 +176,21 @@
                 icon = kinds.icon_for_kind(entry.type)
             action.setIcon(icon)
         elif isinstance(entry, tools.ToolFolder):
-            # TODO: turn sub-folders into menus
-            toolbar.addSeparator()
+            # create menu
+            item = QtGui.QMenu(entry.title,toolbar)
+            menu_action = QtGui.QAction(entry.title, toolbar)
+            menu_action.setMenu(item)
+            if entry.icon:
+                icon = kinds.icon_by_resource_path(entry.icon)
+                menu_action.setIcon(icon)
+            toolbar.addAction(menu_action)
+            # change to button behaviour if top of menu
+            if isinstance(toolbar, QtGui.QToolBar):
+                button = toolbar.widgetForAction(menu_action)
+                button.setPopupMode(QtGui.QToolButton.InstantPopup)
+            # add menu options
             for child in entry:
-                self._add_tool_entry(child, toolbar, toolbars)
-            toolbar.addSeparator()
+                self._add_tool_entry(child, item, toolbars, folders)
         elif isinstance(entry, tools.ToolSet):
             # Lookup the folder named "toolset:...".
             # Note: project substitution is not supported here
@@ -539,8 +549,9 @@
                     if icon is not None:
                         menu_action.setIcon(icon)
                     group.addAction(menu_action)
-                    button = group.widgetForAction(menu_action)
-                    button.setPopupMode(QtGui.QToolButton.InstantPopup)
+                    if isinstance(group, QtGui.QToolBar):
+                        button = group.widgetForAction(menu_action)
+                        button.setPopupMode(QtGui.QToolButton.InstantPopup)
             for child in entry:
                 self._add_tool_entry(child, item, groups, default_group_icon)
         elif isinstance(entry, tools.ToolSeparator):