← Back to branch summary

~bialix/bzr-explorer/test

« back to all changes in this revision

Viewing changes to lib/explorer.py

  • Committer: Ian Clatworthy
  • Date: 2010-02-04 10:47:31 UTC
  • mfrom: (405.1.2 explorer)
  • Revision ID: ian.clatworthy@canonical.com-20100204104731-935y38uz7yb8yz6x
add Neil's switch dialog to those defined in Al's custom dialog registry

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/explorer.py
1352
1352
            'checkout': (self._start_checkout, False, self._finish_checkout),
1353
1353
            'switch': (self._start_switch, False, self._finish_switch),
1354
1354
            }
1355
 
        if cmd_id in internal_handlers:
 
1355
        if cmd_id in internal_handlers and cmd_id in custom_dialog_registry:
1356
1356
            if self.dry_run:
1357
1357
                msg = u'Internal dialog for: %s' % (cmd_id,)
1358
1358
                details = "Working Directory: %s" % (os.getcwdu(),)
1387
1387
        except KeyError:
1388
1388
            # Use the default if the preference is no longer in the registry
1389
1389
            model = workspace_models.workspace_model_registry.get()
1390
 
        return custom_dialog_registry.get('init-workspace')(
 
1390
        return custom_dialog_registry.get('init')(
1391
1391
            default_init_location, model=model, parent=self)
1392
1392
 
1393
1393
    def _finish_init(self, result, dialog):
1427
1427
        if context:
1428
1428
            branch_location = context.get('branch-root')
1429
1429
            checkout_location = context.get('root')
1430
 
        return switch_dialog.QSwitchExplorerStyleDialog(branch_location,
 
1430
        return custom_dialog_registry.get('switch')(branch_location,
1431
1431
                                                        checkout_location,
1432
1432
                                                        parent=self)
1433
1433