← Back to branch summary

~bzr-explorer-dev/bzr-explorer/ppa

« back to all changes in this revision

Viewing changes to lib/builders/toolset_builders.py

  • Committer: Andrew Starr-Bochicchio
  • Date: 2010-08-05 16:03:10 UTC
  • mfrom: (311.41.21 trunk)
  • Revision ID: a.starr.b@gmail.com-20100805160310-0idp6rop417lb5l4
Tags: 1.1.0~beta1-0ubuntu1~ppa1~maverick1
New upstream beta release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/builders/toolset_builders.py
176
176
                icon = kinds.icon_for_kind(entry.type)
177
177
            action.setIcon(icon)
178
178
        elif isinstance(entry, tools.ToolFolder):
179
 
            # TODO: turn sub-folders into menus
180
 
            toolbar.addSeparator()
 
179
            # create menu
 
180
            item = QtGui.QMenu(entry.title,toolbar)
 
181
            menu_action = QtGui.QAction(entry.title, toolbar)
 
182
            menu_action.setMenu(item)
 
183
            if entry.icon:
 
184
                icon = kinds.icon_by_resource_path(entry.icon)
 
185
                menu_action.setIcon(icon)
 
186
            toolbar.addAction(menu_action)
 
187
            # change to button behaviour if top of menu
 
188
            if isinstance(toolbar, QtGui.QToolBar):
 
189
                button = toolbar.widgetForAction(menu_action)
 
190
                button.setPopupMode(QtGui.QToolButton.InstantPopup)
 
191
            # add menu options
181
192
            for child in entry:
182
 
                self._add_tool_entry(child, toolbar, toolbars)
183
 
            toolbar.addSeparator()
 
193
                self._add_tool_entry(child, item, toolbars, folders)
184
194
        elif isinstance(entry, tools.ToolSet):
185
195
            # Lookup the folder named "toolset:...".
186
196
            # Note: project substitution is not supported here
539
549
                    if icon is not None:
540
550
                        menu_action.setIcon(icon)
541
551
                    group.addAction(menu_action)
542
 
                    button = group.widgetForAction(menu_action)
543
 
                    button.setPopupMode(QtGui.QToolButton.InstantPopup)
 
552
                    if isinstance(group, QtGui.QToolBar):
 
553
                        button = group.widgetForAction(menu_action)
 
554
                        button.setPopupMode(QtGui.QToolButton.InstantPopup)
544
555
            for child in entry:
545
556
                self._add_tool_entry(child, item, groups, default_group_icon)
546
557
        elif isinstance(entry, tools.ToolSeparator):