/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-02-03 17:19:29 UTC
  • mto: (157.1.2 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 160.
  • Revision ID: szilveszter.farkas@gmail.com-20070203171929-6egi16ulzmkg9g1g
Implemented Conflicts dialog. Added gconflicts command.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
389
389
 
390
390
register_command(cmd_gstatus)
391
391
 
 
392
class cmd_gconflicts(Command):
 
393
    """ GTK+ push.
 
394
    
 
395
    """
 
396
    def run(self):
 
397
        (wt, path) = WorkingTree.open_containing('.')
 
398
        
 
399
        pygtk = import_pygtk()
 
400
        try:
 
401
            import gtk
 
402
        except RuntimeError, e:
 
403
            if str(e) == "could not open display":
 
404
                raise NoDisplayError
 
405
 
 
406
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
 
407
 
 
408
        set_ui_factory()
 
409
        dialog = ConflictsDialog(wt)
 
410
        dialog.run()
 
411
 
 
412
register_command(cmd_gconflicts)
392
413
 
393
414
import gettext
394
415
gettext.install('olive-gtk')